From e3eb83b4ae4c60940339c76308dcd8df465dabf7 Mon Sep 17 00:00:00 2001
From: chu23465 <130033130+chu23465@users.noreply.github.com>
Date: Wed, 30 Apr 2025 09:48:47 +0530
Subject: [PATCH] Another fix for ATVP m3u8

---
 vinetrimmer/key_store.db    | Bin 430080 -> 442368 bytes
 vinetrimmer/parsers/m3u8.py |  63 +++++++++++++++++++-----------------
 vinetrimmer/vinetrimmer.yml |   4 ++-
 3 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/vinetrimmer/key_store.db b/vinetrimmer/key_store.db
index 5dec719a01626feb2397f7c8bbc6c5ac2c7e9fb9..d127a0555b37dc36d05474bc36430c24190e1f9c 100644
GIT binary patch
delta 210
zcmZozAl1+yJwaOVI|Bnl4iLit=R_T2#_x>@tqF{+2~4dC%&iG5tqH7K6WA8ktFyml
z5Mcerz<-fXgZDG<J|1=Mf81BO9J!=8KXU|gsIY%!{l<QPeez~ShjXm@%~DeA;*ye#
zZTuyPNja&-rFnT3B@i;pImp#9#8n~0(aFbE0V1~fBWE5XleWy{1^hCC5TSS@2%V!X
b4H6ZGiW)-bY@m}lwtsAA<L6j5fyn>>n{+}4

delta 102
zcmZo@kZxEYH9=bN8v_GFCJ@5_$3z`t#&3-YtqF{+2~4dC%&iG5tqH7K6WA8kD*_eq
yvVUdZzsRS-`<Ztik2?21?yFpmTvD8$If6M<*uQRmm~feWawTK@_K*&?HS7ReksY4^

diff --git a/vinetrimmer/parsers/m3u8.py b/vinetrimmer/parsers/m3u8.py
index 7e15607..c483ad8 100644
--- a/vinetrimmer/parsers/m3u8.py
+++ b/vinetrimmer/parsers/m3u8.py
@@ -36,16 +36,41 @@ def parse(master, source=None):
 	# get pssh if available
 	# 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"]
 
 	try:
-		psshPR = [x.uri.split(",")[-1] for x in master.session_keys if x.keyformat.lower() == "com.microsoft.playready"][0]
+		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]
 	except IndexError:
-		psshPR = [x.uri.split(",")[-1] for x in master.session_keys if x.keyformat.lower() == "com.microsoft.playready"]
-
-	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"]
+		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"]
 	# if pssh:
 		# pssh = base64.b64decode(pssh)
 		# # noinspection PyBroadException
@@ -83,28 +108,8 @@ def parse(master, source=None):
 			descriptor=Track.Descriptor.M3U,
 			# decryption
 			encrypted=bool(master.keys or master.session_keys),
-			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] or (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 
-					source == "DSNP"
-					and
-					x.stream_info.characteristics.lower().replace('"', "") in session_key.characteristics.lower().split(",")
-					)
-				][0] or (psshPR if psshPR else None),
+			psshWV=psshWV,
+			psshPR=psshPR,
 			# extra
 			extra=(x, master)
 		) for x in master.playlists],
diff --git a/vinetrimmer/vinetrimmer.yml b/vinetrimmer/vinetrimmer.yml
index 16a18d6..700fccc 100644
--- a/vinetrimmer/vinetrimmer.yml
+++ b/vinetrimmer/vinetrimmer.yml
@@ -9,6 +9,7 @@ cdm:
   default: 'hisense_smarttv_he55a7000euwts_sl3000'
   Amazon: 'hisense_smarttv_he55a7000euwts_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'
   Sunnxt: 'xiaomi_mi_a1_15.0.0_60ceee88_8159_l3'
 
@@ -24,7 +25,8 @@ cdm_api:
 credentials:
   iTunes: 'username:password'
   Hotstar: 'username:password'
-  DisneyPlus: 'username:password'
+  DisneyPlus: 'tjp4252@gmail.com:Tjcooke@121382'
+  Sunnxt: '9860835343:Welcome@123'
 
 directories:
   temp: ''