From b73b43163c0a71cea06ed7b4b873d42f8c540eec Mon Sep 17 00:00:00 2001 From: chu23465 <130033130+chu23465@users.noreply.github.com> Date: Wed, 16 Apr 2025 18:08:11 +0530 Subject: [PATCH] Another possible fix for DSNP KID --- vinetrimmer/commands/dl.py | 6 +++--- vinetrimmer/key_store.db | Bin 352256 -> 356352 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vinetrimmer/commands/dl.py b/vinetrimmer/commands/dl.py index 7e08eab..903d4f1 100644 --- a/vinetrimmer/commands/dl.py +++ b/vinetrimmer/commands/dl.py @@ -594,7 +594,7 @@ def result(ctx, service, quality, closest_resolution, range_, wanted, alang, sla # TODO: Move decryption code to Track if not config.decrypter: raise log.exit(" - No decrypter specified") - if config.decrypter == "packager" and not (track.descriptor == Track.Descriptor.ISM): + if service_name == "DisneyPlus" or (config.decrypter == "packager" and not (track.descriptor == Track.Descriptor.ISM)) : platform = {"win32": "win", "darwin": "osx"}.get(sys.platform, sys.platform) names = ["shaka-packager", "packager", f"packager-{platform}"] executable = next((x for x in (shutil.which(x) for x in names) if x), None) @@ -617,13 +617,13 @@ def result(ctx, service, quality, closest_resolution, range_, wanted, alang, sla f"label=0:key_id={track.kid.lower()}:key={track.key.lower()}", # Apple TV+ needs this as shaka pulls the incorrect KID, idk why f"label=1:key_id=00000000000000000000000000000000:key={track.key.lower()}", - ]), + ]) if service_name != "DisneyPlus" else ",".join(["label={index}:key_id={key}:key={content_keys[key]}" for index, key in enumerate(content_keys)]), "--temp_dir", directories.temp ], check=True) except subprocess.CalledProcessError: raise log.exit(" - Failed!") - elif config.decrypter == "mp4decrypt" or (track.descriptor == Track.Descriptor.ISM): + elif service_name != "DisneyPlus" or (config.decrypter == "mp4decrypt" or (track.descriptor == Track.Descriptor.ISM)): executable = shutil.which("mp4decrypt") if not executable: raise log.exit(" - Unable to find mp4decrypt binary") diff --git a/vinetrimmer/key_store.db b/vinetrimmer/key_store.db index 7d8b9880d257489523c9e0bc821b82f96e202038..83073a19971cdc578ea88f8fb9e64084bd5f6ed4 100644 GIT binary patch delta 329 zcmZoTAlmRibb>VN5(Wl_@QDicj7v5q)cP|%X};&*e$Sr~h?%zE^JiB3AjHc51gM4~ zoc}lfH~tU&ulS#A7js}a$Ik{73}{TA{>q<4isuRE0|x#-5CxkB6b>+M7IYBc*#5wh zNr7!!0t-unf+3SV1K&cvXg(3%bG+@m4m`hjHuL20sBv&Go#lSOWWQbM0gE)#bo&Ta zR;NV6Bn#t|M5AO=Q-f3sL*qnC3!}so^AroiG@yuCqD6{nlBs1VNVg?3=u!#!xjEgrW)cP|%ZocQ=e$Sr~h?%zE^JiB3Ai%=^3aEx5 zfd4oDH~tU&ueOU6uw3Jx{>q<4isv!s3kLo_5b@0d3i}v03pz+~On(r`!n*x!B#U^P zoB>lC1K&cvXg(3%bG+@m4m`hjHuL20sBv&Go#lS8UF89bG}B}S2hZvDkAQl*AF-6y F0sx9?H+BF3