diff --git a/install.sh b/install.sh index 8077696..a2b7edf 100644 --- a/install.sh +++ b/install.sh @@ -5,9 +5,7 @@ poetry config virtualenvs.in-project true poetry lock --no-update poetry install sudo apt update -sudo apt install ffmpeg -sudo apt-get install aria2 -sudo apt install mkvtoolnix +sudo apt-get install ffmpeg aria2 mkvtoolnix libmediainfo0v5 ffmpeg --version ffprobe --version ffplay --version diff --git a/vinetrimmer/commands/dl.py b/vinetrimmer/commands/dl.py index 34d01ae..035d0ae 100644 --- a/vinetrimmer/commands/dl.py +++ b/vinetrimmer/commands/dl.py @@ -168,11 +168,11 @@ def get_cookie_jar(service, profile): return cookie_jar return None -def save_cookies(service, profile): +def save_cookies(service_name, service, profile): """Save cookies from service session to profile's cookies.""" - cookie_file = os.path.join(directories.cookies, service.lower(), f"{profile}.txt") + cookie_file = os.path.join(directories.cookies, service_name.lower(), f"{profile}.txt") if not os.path.isfile(cookie_file): - cookie_file = os.path.join(directories.cookies, service, f"{profile}.txt") + cookie_file = os.path.join(directories.cookies, service_name , f"{profile}.txt") if os.path.isfile(cookie_file): cookie_jar = MozillaCookieJar(cookie_file) @@ -489,7 +489,7 @@ def result(ctx, service, quality, closest_resolution, range_, wanted, alang, sla proxy = None if service: - save_cookies(service, ctx.obj.profile) + save_cookies(service_name, service, ctx.obj.profile) track.download(directories.temp, headers=service.session.headers, proxy=proxy) log.info(" + Downloaded") if isinstance(track, VideoTrack) and track.needs_ccextractor_first and not no_subs: @@ -563,7 +563,7 @@ def result(ctx, service, quality, closest_resolution, range_, wanted, alang, sla raise log.exit("Unable to license") if service: - save_cookies(service, ctx.obj.profile) + save_cookies(service_name, service, ctx.obj.profile) content_keys = [ (str(x.kid).replace("-", ""), x.key.hex()) for x in ctx.obj.cdm.get_keys(session_id) if x.type == "CONTENT" ] if "common_privacy_cert" in dir(ctx.obj.cdm) else [ diff --git a/vinetrimmer/devices/mtc_mtc_atv_atv_sl3000.prd b/vinetrimmer/devices/mtc_mtc_atv_atv_sl3000.prd index 6cd7466..0cd006c 100644 Binary files a/vinetrimmer/devices/mtc_mtc_atv_atv_sl3000.prd and b/vinetrimmer/devices/mtc_mtc_atv_atv_sl3000.prd differ diff --git a/vinetrimmer/key_store.db b/vinetrimmer/key_store.db index 50ae261..5151307 100644 Binary files a/vinetrimmer/key_store.db and b/vinetrimmer/key_store.db differ