From 35dfeb8f7d35ca128a2adfc23ac98b7e1f96e9a4 Mon Sep 17 00:00:00 2001 From: chu23465 <130033130+chu23465@users.noreply.github.com> Date: Wed, 9 Apr 2025 10:38:13 +0530 Subject: [PATCH] Fixed 640kbps audio AMZN --- README.md | 2 +- vinetrimmer/commands/dl.py | 19 +++++++++++------- .../hisense_smarttv_he55a7000euwts_sl3000.prd | Bin 2108 -> 2108 bytes vinetrimmer/key_store.db | Bin 331776 -> 331776 bytes vinetrimmer/services/amazon.py | 4 ++-- vinetrimmer/utils/io.py | 3 ++- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 5d282c1..6c00263 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ I AM NOT taking credit for the entirety of this project. This project is based o 1. Install Microsoft Visual C++ Redistributable - [link](https://aka.ms/vs/17/release/vc_redist.x64.exe). -2. Ensure Python is installed in your system (cannot be from the the Microsoft Store). Refer to [link](https://www.python.org/downloads/) or on Ubuntu -> `sudo apt install python3`. I recommend python 3.10 or higher. +2. Ensure Python is installed in your system (cannot be from the the Microsoft Store). Refer to [link](https://www.python.org/downloads/) or on Ubuntu -> `sudo apt install python3`. I recommend python 3.10.11 (or higher). 3. Make sure git is installed in your system by running `git --version`. If not refer to [link](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) diff --git a/vinetrimmer/commands/dl.py b/vinetrimmer/commands/dl.py index a50be7f..44bdcdc 100644 --- a/vinetrimmer/commands/dl.py +++ b/vinetrimmer/commands/dl.py @@ -126,6 +126,7 @@ def get_cdm(log, service, profile=None, cdm_name=None): def get_service_config(service): """Get both service config and service secrets as one merged dictionary.""" + print(filenames.service_config.format(service=service.lower())) service_config = load_yaml(filenames.service_config.format(service=service.lower())) user_config = (load_yaml(filenames.user_service_config.format(service=service.lower())) or load_yaml(filenames.user_service_config.format(service=service))) @@ -499,24 +500,28 @@ def result(ctx, service, quality, range_, wanted, alang, slang, audio_only, subs session_id=session_id ) or ctx.obj.cdm.common_privacy_cert ) - ctx.obj.cdm.parse_license( - session_id, - service.license( + license = service.license( challenge=ctx.obj.cdm.get_license_challenge(session_id=session_id, pssh=PSSHWV(track.psshWV)), title=title, track=track, session_id=session_id ) + assert license + ctx.obj.cdm.parse_license( + session_id, + license ) elif "common_privacy_cert" not in dir(ctx.obj.cdm) and track.psshPR: challenge = ctx.obj.cdm.get_license_challenge(session_id, PSSH(track.psshPR).wrm_headers[0]) - ctx.obj.cdm.parse_license( - session_id, - service.license( + license = service.license( challenge=challenge, title=title, track=track, - ) # expects the XML License not base64 encoded str. + ) + assert license + ctx.obj.cdm.parse_license( + session_id, + license # expects the XML License not base64 encoded str. ) else: raise log.exit("Unable to license") diff --git a/vinetrimmer/devices/hisense_smarttv_he55a7000euwts_sl3000.prd b/vinetrimmer/devices/hisense_smarttv_he55a7000euwts_sl3000.prd index 50da1920784f09e327185f198dbe565b5cc17960..0c1b3a23b23438cb323a3410956dfe2cb525426c 100644 GIT binary patch delta 516 zcmdlZut#7*O1*bPBC$2H3W$=7bII)JIh*cKQLk0ial4B&ps_4 zDarSA%d|;s`X0*-e>uebDR(tjTCqQFRB zzEx@9s<87%mfV%Knk9i6Dea%uEnc%p@9N(t6D;}q71MGmdekFo53@X)J|knl(IWZh zLP|oHCaW+S1V}CMRo%W+%f&mXC+@#{S`7mO_YMXKV2b#oC+X7ir%+ztyuX*{&Mk4O zxl__F8hKAO$v&xee({|DKrrF#OZ|=a4i%am%Gi>=FyYbUC5#UBl)4OPKO-13GJ%~! zVo*wAgeBBKrpX2@E)MJePb|E6dW-$k2a{h`G8c#J5vts!_(Jc`&MvHBhx$#BwmTh9TVFdsNj^PIY delta 516 zcmdlZut#7*O1-{d=jU+!b0!R|srPPd^ScsXzTsJ1!gVX(AIaul1sCjTzy99i4-dEd z^6;mR7cNq@DAd`#Xy3fmdcU0}&F|d5e4}3U#SN=O{3gtLay==+OL|txIjLVaPN~k6 zE_(A}hStjKm5~?b>0R4b9&p{>v(BYBW+hVs`+UKWvcs0eU78829luXB7U#N`9JgL7 zYv}@0X|@kXj#ie>o?4d~R?t;!{xxO$p+lLu3oiCos+7MyvPElZ`00-BS```-4#mP$;9qK7{8PI-4FlJ-| zJB7rcl*9;2sDVtA4Omvo{-qZ@6+P#~DE5t5* o?K=LXINVr^o|{1p{SPe;IkYAI3ohU9@P*I!%eU3fw))wJ9nk3J4nSj2yDNie_*35Q z1J)B~o+QlHBzPr`#2b+f>oX<*qxbq-GPq1M=2^1E6^~KOneHmCPqEL5%w0uW2%+59 zJfd2vPaW5{38#!P6;$+apXd{jwL=lRXK1Sp4dxUn+w-QMsmT70w>Bn>~ v^^(d<1BoZ!lE!eekWZHC?V=bn&5KpX1%HPC7u&`XCa-w!5*F%vLiG6$4^@l? delta 169 zcmV;a09OBipcH_h6p$MMc##}K0eG=sicbN>v+GY8paC|M1@L7I1`Gmn1;qt^1vdn$ zvv%+|1ObhcuJlNkody9%m!4h$KZAVrw|w;hh*}CW0apP5o&!b-d6y7S0$>6Fg12x` z0@Mcqj+cB@1CWQ+SOT}zSOYI-14RYcw+FxjivqEcMgzCl#RDvA6bKAB01t-`4i1$L X91WulDh#m str: """ diff --git a/vinetrimmer/utils/io.py b/vinetrimmer/utils/io.py index be5ea1b..484a385 100644 --- a/vinetrimmer/utils/io.py +++ b/vinetrimmer/utils/io.py @@ -19,8 +19,9 @@ from sys import platform def load_yaml(path): if not os.path.isfile(path): + #print(f"Service config does not exist -> {path}") return {} - with open(path) as fd: + with open(path, 'r') as fd: return yaml.safe_load(fd)