ayuspie/VT-PR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1487ca2626 into 6f35e17fdd

Browse Source
This commit is contained in:
TR-TDN 2025-05-13 12:24:26 +02:00 committed by GitHub
commit 6f601de6f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vinetrimmer/config/__init__.py
View File

@ -39,7 +39,7 @@ class Filenames:
self.log = os.path.join(directories.logs, "vinetrimmer_{time}.log")
self.root_config = os.path.join(directories.configuration, "vinetrimmer.yml")
self.user_root_config = os.path.join(directories.user_configs, "vinetrimmer.yml")
self.service_config = os.path.join(directories.configuration, "services", "{service}.yml")
self.service_config = os.path.join(directories.configuration, "Services", "{service}.yml")
self.user_service_config = os.path.join(directories.service_configs, "{service}.yml")
self.subtitles = os.path.join(directories.temp, "TextTrack_{id}_{language_code}.srt")
self.chapters = os.path.join(directories.temp, "{filename}_chapters.txt")

8
vinetrimmer/services/appletvplus.py
View File

@ -150,7 +150,7 @@ class AppleTVPlus(BaseService):
'utsk': '6e3013c6d6fae3c2::::::9318c17fb39d6b9c',
'caller': 'web',
'sf': self.storefront,
'v': '82',
'v': '46',
'pfm': 'appletv',
'mfr': 'Apple',
'locale': 'en-US',
@ -159,7 +159,7 @@ class AppleTVPlus(BaseService):
'count': '100',
'skip': '0',
}
r = self.session.get(url=self.config["endpoints"]["title"].format(type={0: "shows", 1: "movies", 2: "sporting-events"}[self.type], id=self.title),
r = self.session.get(url=self.config["endpoints"]["manifest"].format(id=title.service_data["id"]),
params=self.params
)
try:
@ -167,12 +167,14 @@ class AppleTVPlus(BaseService):
#print(stream_data)
except json.JSONDecodeError:
raise ValueError(f"Failed to load stream data: {r.text}")
stream_data = stream_data["data"]["playables"]
stream_data = stream_data["data"]["content"]["playables"][0]
"""
if self.condensed == True:
tvs_sbd = list(stream_data.keys())[1]
else:
tvs_sbd = list(stream_data.keys())[0]
stream_data = stream_data[tvs_sbd]
"""
if not stream_data["isEntitledToPlay"]:
raise self.log.exit(" - User is not entitled to play this title")

2
vinetrimmer/utils/MSL/__init__.py
View File

@ -347,7 +347,7 @@ class MSL:
def send_message(self, endpoint, params, application_data, userauthdata=None):
message = self.create_message(application_data, userauthdata)
res = self.session.post(url=endpoint, data=message, params=params, verify=True) # verify=True?
res = self.session.post(url=endpoint, data=message, params=params) # verify=True?
header, payload_data = self.parse_message(res.text)
if "errordata" in header:
raise self.log.exit(