Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-24 04:05:39 +01:00
Code Issues Projects Releases Wiki Activity

viafree: handle multiple subs better

Browse Source
This commit is contained in:
Johan Andersson 2021-05-09 21:52:46 +02:00
parent 2175e8d6a5
commit dcf0e6fa70
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/svtplay_dl/service/viaplay.py
View File

@ -72,8 +72,6 @@ class Viaplay(Service, OpenGraphThumbMixin):
output=copy.copy(self.output), output=copy.copy(self.output),
m3u8=m3u8s, m3u8=m3u8s,
) )
else:
yield subtitle(copy.copy(self.config), "wrst", video["_embedded"]["program"]["subtitles"]["subtitlesWebvtt"], output=self.output)
res = self.http.get(video["_embedded"]["program"]["_links"]["streamLink"]["href"]) res = self.http.get(video["_embedded"]["program"]["_links"]["streamLink"]["href"])
janson = res.json() janson = res.json()
@ -98,15 +96,22 @@ class Viaplay(Service, OpenGraphThumbMixin):
if not self.config.get("get_all_subtitles"): if not self.config.get("get_all_subtitles"):
if not language: if not language:
yield subtitle(copy.copy(self.config), "wrst", janson["embedded"]["subtitles"][0]["link"]["href"], output=self.output) yield subtitle(copy.deepcopy(self.config), "wrst", janson["embedded"]["subtitles"][0]["link"]["href"], output=self.output)
else: else:
for i in janson["embedded"]["subtitles"]: for i in janson["embedded"]["subtitles"]:
if i["data"]["language"] == language: if i["data"]["language"] == language and i["data"]["sdh"] is False:
yield subtitle(copy.copy(self.config), "wrst", i["link"]["href"], output=self.output) yield subtitle(copy.deepcopy(self.config), "wrst", i["link"]["href"], output=self.output)
else: else:
substitles = {}
for i in janson["embedded"]["subtitles"]: for i in janson["embedded"]["subtitles"]:
yield subtitle(copy.copy(self.config), "wrst", i["link"]["href"], i["data"]["language"], output=copy.copy(self.output)) substitles[(i["data"]["language"], i["data"]["sdh"])] = i["link"]["href"]
for i in substitles:
lang, shd = i
if shd:
lang = f"{lang}-shd"
yield subtitle(copy.deepcopy(self.config), "wrst", substitles[i], lang, output=copy.copy(self.output))
def find_all_episodes(self, config): def find_all_episodes(self, config):
episodes = [] episodes = []