Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-27 21:54:17 +01:00
Code Issues Projects Releases Wiki Activity

Viafree: Added check to prevent crash while naming clips

Browse Source 
Added check to only get parent season and episode number if derived_from_id actually is set. Prevent crashes on some clips.
This commit is contained in:
qnorsten 2017-02-11 10:19:57 +01:00
parent 1f49d84664
commit 9cfb4e5f1e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,8 +230,7 @@ class Viaplay(Service, OpenGraphThumbMixin):
if season:
if len(dataj["format_position"]["episode"]) > 0:
episode = dataj["format_position"]["episode"]
if dataj["type"] == "clip":
#Removes the show name from the end of the filename
#e.g. Showname.S0X.title instead of Showname.S07.title-showname
@ -240,15 +239,16 @@ class Viaplay(Service, OpenGraphThumbMixin):
title = filenamify(match.group(1))
else:
title = filenamify(dataj["title"])
if dataj["derived_from_id"] > 0:
parent_id = dataj["derived_from_id"]
parent_episode = self.http.request("get", "http://playapi.mtgx.tv/v3/videos/%s" % parent_id)
if parentepisode.status_code != 403: #if not geoblocked
datajparent = json.loads(parent_episode.text)
if not season and datajparent["format_position"]["season"] > 0:
season = datajparent["format_position"]["season"]
if len(datajparent["format_position"]["episode"]) > 0:
episode = datajparent["format_position"]["episode"]
if "derived_from_id" in dataj:
if dataj["derived_from_id"]:
parent_id = dataj["derived_from_id"]
parent_episode = self.http.request("get", "http://playapi.mtgx.tv/v3/videos/%s" % parent_id)
if parent_episode.status_code != 403: #if not geoblocked
datajparent = json.loads(parent_episode.text)
if not season and datajparent["format_position"]["season"] > 0:
season = datajparent["format_position"]["season"]
if len(datajparent["format_position"]["episode"]) > 0:
episode = datajparent["format_position"]["episode"]
name = filenamify(program)
if season: