From bb3087750fb3c72d83756310c61abf8001432c70 Mon Sep 17 00:00:00 2001
From: chu23465 <130033130+chu23465@users.noreply.github.com>
Date: Wed, 30 Apr 2025 18:44:40 +0530
Subject: [PATCH] Fix for m3u8 ATVP + DSNP

---
 vinetrimmer/key_store.db            | Bin 442368 -> 442368 bytes
 vinetrimmer/parsers/m3u8.py         |  56 ++++++++++++----------------
 vinetrimmer/services/appletvplus.py |  19 ++++------
 vinetrimmer/vinetrimmer.yml         |   1 +
 4 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/vinetrimmer/key_store.db b/vinetrimmer/key_store.db
index d127a0555b37dc36d05474bc36430c24190e1f9c..133f37a9e7c4aa726dcd2365b77451f90d207baf 100644
GIT binary patch
delta 1207
zcmbu7KX21O7>DgRu>?|l=^O?mBu097@BOhSkO~7s$S0`8-T4fZmZnXdMl6ns6xLQq
zMa<9-07E*kWQK)LkckCYn3#w}BGLwnSV6)k52w?;&%M9*>G$jXe*LKKPL8i^xRbZ{
z-`uSE=+r}F^bLJNBQ!*(XKP2LW3+~R@0zPxt!>-swzku@|7_TNK5V*Y!)EE;t(spw
zanLJ7gO5R6om5X|w+^eB^(#)J(ZKT$xU`beSO9Q}7fVTwxiCgU7+OUz<6+E6L?XaR
zINhW>=7yR64?2(WUeuvGs%5s?lE*;0-TgMTmF1WWKrAQ}GaZwN#aa`l65vMi1Vm^E
z7{ax+bS0;}oC84r#8?oD7|@U<I22kal`tb?uu;Mw!BVf}czKSdI-=H2W6N={VOjzg
zoJ(av#!N)oh9;IaWLQI#X7k((^d6>^?;o(OUa$9bkL^C%740XfEfsNcv0-JHr39ps
z)5fHLm>Z5G!*wVr26EocUzqHi;}&sp8idqpOA-Z<)&hqdG`ARo6|q)SC%BL^$6R(C
z$46ra{X{>|ck~r`pV4?`;s^9{yk5Cp^Mg$%_!4XeuhBYskJ8!M-QWd!=V$+EsDG#2
zXt+x}&jnfRU-nzTN>Q2I+%Nnp(5sxU@-OyeOZ4%I%H(=lB}eJ@G?_~m$t)g|8~xQ)
QvmcB~gON8Fl?S8BFGZ_J&Hw-a

delta 70
zcmV-M0J;BwfE$2-8;~0T_mLb!0r#<Bq(2S?54Hmj-Vf^!&=0^5wznam0;CUvwoiw)
cPXV{KPXbOrwFCzIFNVMZhQI@czyyZC1;C9Pi2wiq

diff --git a/vinetrimmer/parsers/m3u8.py b/vinetrimmer/parsers/m3u8.py
index 9cc1262..c6aebb0 100644
--- a/vinetrimmer/parsers/m3u8.py
+++ b/vinetrimmer/parsers/m3u8.py
@@ -37,40 +37,14 @@ def parse(master, source=None):
 	# uses master.session_keys instead of master.keys as master.keys is ONLY EXT-X-KEYS and
 	# doesn't include EXT-X-SESSION-KEYS which is whats used for variant playlist M3U8.
 	try:
-		psshPR = [
-			session_key.uri.split(",")[-1] 
-			for session_key in master.session_keys 
-			if (
-				session_key.keyformat.lower() == "com.microsoft.playready" 
-				and 
-				source == "DSNP"
-				and
-				x.stream_info.characteristics.lower().replace('"', "") in session_key.characteristics.lower().split(",")
-				)
-			][0]
-	except:
-		try:
-			psshPR = [x.uri.split(",")[-1] for x in master.session_keys if x.keyformat.lower() == "com.microsoft.playready"][0]
-		except IndexError:
-			psshPR = [x.uri.split(",")[-1] for x in master.session_keys if x.keyformat.lower() == "com.microsoft.playready"]
+		psshPR = [x.uri.split(",")[-1] for x in master.session_keys if x.keyformat.lower() == "com.microsoft.playready"][0]
+	except IndexError:
+		psshPR = [x.uri.split(",")[-1] for x in master.session_keys if x.keyformat.lower() == "com.microsoft.playready"]
 
 	try:
-		psshWV = [
-		session_key.uri.split(",")[-1] 
-			for session_key in master.session_keys 
-			if (
-				session_key.keyformat.lower() == "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed" 
-				and 
-				source == "DSNP"
-				and
-				x.stream_info.characteristics.lower().replace('"', "") in session_key.characteristics.lower().split(",")
-				)
-			][0]
+		psshWV = [x.uri.split(",")[-1] for x in master.session_keys if x.keyformat.lower() == "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"][0]
 	except IndexError:
-		try:
-			psshWV = [x.uri.split(",")[-1] for x in master.session_keys if x.keyformat.lower() == "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"][0]
-		except IndexError:
-			psshWV = [x.uri.split(",")[-1] for x in master.session_keys if x.keyformat.lower() == "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"]
+		psshWV = [x.uri.split(",")[-1] for x in master.session_keys if x.keyformat.lower() == "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"]
 	# if pssh:
 		# pssh = base64.b64decode(pssh)
 		# # noinspection PyBroadException
@@ -108,8 +82,24 @@ def parse(master, source=None):
 			descriptor=Track.Descriptor.M3U,
 			# decryption
 			encrypted=bool(master.keys or master.session_keys),
-			psshWV=psshWV,
-			psshPR=psshPR,
+			psshWV= [
+				session_key.uri.split(",")[-1] 
+				for session_key in master.session_keys 
+				if (
+					session_key.keyformat.lower() == "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed" 
+					and
+					x.stream_info.characteristics.lower().replace('"', "") in session_key.characteristics.lower().split(",")
+				)
+			][0] if source == "DSNP" else (psshWV if psshWV != [] else None),
+			psshPR=[
+				session_key.uri.split(",")[-1] 
+				for session_key in master.session_keys 
+				if (
+					session_key.keyformat.lower() == "com.microsoft.playready" 
+					and
+					x.stream_info.characteristics.lower().replace('"', "") in session_key.characteristics.lower().split(",")
+				)
+			][0] if source == "DSNP" else (psshPR if psshPR != [] else None),
 			# extra
 			extra=x
 		) for x in master.playlists],
diff --git a/vinetrimmer/services/appletvplus.py b/vinetrimmer/services/appletvplus.py
index a98e7e2..01fea51 100644
--- a/vinetrimmer/services/appletvplus.py
+++ b/vinetrimmer/services/appletvplus.py
@@ -106,7 +106,7 @@ class AppleTVPlus(BaseService):
                 id_=self.title,
                 type_=Title.Types.MOVIE,
                 name=title_information["title"],
-                #year=datetime.utcfromtimestamp(title_information["releaseDate"] / 1000).year,
+                year=datetime.utcfromtimestamp(title_information["releaseDate"] / 1000).year,
                 original_lang=title_information["originalSpokenLanguages"][0]["locale"],
                 source=self.ALIASES[0],
                 service_data=title_information
@@ -117,8 +117,8 @@ class AppleTVPlus(BaseService):
                 id_=self.title,
                 type_=Title.Types.MOVIE,
                 name=title_information["title"],
-                #year=datetime.utcfromtimestamp(title_information["releaseDate"] / 1000).year,
-                #original_lang=title_information["originalSpokenLanguages"][0]["locale"],
+                year=datetime.utcfromtimestamp(title_information["releaseDate"] / 1000).year,
+                original_lang=title_information["originalSpokenLanguages"][0]["locale"],
                 source=self.ALIASES[0],
                 service_data=title_information
             )
@@ -243,13 +243,7 @@ class AppleTVPlus(BaseService):
                 )
             ])
         except:
-            return Tracks([
-                # multiple CDNs, only want one
-                x for x in tracks
-                #if any(
-                #    cdn in as_list(x.url)[0].split("?")[1].split("&") for cdn in ["cdn=ak", "cdn=vod-ak-aoc.tv.apple.com"]
-                #)
-            ])
+            return Tracks([x for x in tracks])
 
     def get_chapters(self, title):
         return []
@@ -284,7 +278,10 @@ class AppleTVPlus(BaseService):
             if not e.response.text:
                 raise self.log.exit(" - No license returned!")
             raise self.log.exit(f" - Unable to obtain license (error code: {e.response.json()['errorCode']})")
-        return base64.b64decode(res['streaming-response']['streaming-keys'][0]["license"])
+        try:
+            return base64.b64decode(res['streaming-response']['streaming-keys'][0]["license"])
+        except:
+            raise self.log.exit(res['streaming-response'])
 
     # Service specific functions
 
diff --git a/vinetrimmer/vinetrimmer.yml b/vinetrimmer/vinetrimmer.yml
index 700fccc..6ce06aa 100644
--- a/vinetrimmer/vinetrimmer.yml
+++ b/vinetrimmer/vinetrimmer.yml
@@ -8,6 +8,7 @@ aria2c:
 cdm:
   default: 'hisense_smarttv_he55a7000euwts_sl3000'
   Amazon: 'hisense_smarttv_he55a7000euwts_sl3000'
+  AppleTVPlus: 'mtc_mtc_atv_atv_sl3000'
   Hotstar: 'xiaomi_mi_a1_15.0.0_60ceee88_8159_l3'
   Jio: 'xiaomi_mi_a1_15.0.0_60ceee88_8159_l3'
   DisneyPlus: 'mtc_mtc_atv_atv_sl3000'