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

svtplay: Check if Rss link is valid, and make tab work again

Browse Source 
fixes: https://github.com/spaam/svtplay-dl/issues/584
Makes: https://github.com/spaam/svtplay-dl/issues/514 work again. 
Adds basic check if linked rss is valid (as svtplay started including rss links again) also bypasses rss if a tab is supplied or include-clips is set.
This commit is contained in:
qnorsten 2017-04-12 21:23:56 +02:00
parent 0b2b528a6d
commit 9fe6b951cc
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/svtplay_dl/service/svtplay.py
View File

@ -164,14 +164,37 @@ class Svtplay(Service, OpenGraphThumbMixin):
parse = urlparse(self._url) parse = urlparse(self._url)
if len(parse.path) > 7 and parse.path[-7:] == "rss.xml": if len(parse.path) > 7 and parse.path[-7:] == "rss.xml":
match = self.url rss_url = self.url
else: else:
match = re.search(r'<link rel="alternate" type="application/rss\+xml" [^>]*href="([^"]+)"', rss_url = re.search(r'<link rel="alternate" type="application/rss\+xml" [^>]*href="([^"]+)"', self.get_urldata())
self.get_urldata()) if rss_url:
rss_url = rss_url.group(1)
valid_rss = False
tab = None
if parse.query:
match = re.search("tab=(.+)", parse.query)
if match: if match:
match = match.group(1) tab = match.group(1)
if match is None: #Clips and tab can not be used with RSS-feed
if rss_url and not self.options.include_clips and not tab:
rss_data = self.http.request("get", rss_url).content
try:
xml = ET.XML(rss_data)
episodes = [x.text for x in xml.findall(".//item/link")]
#TODO add better checks for valid RSS-feed here
valid_rss = True
except ET.ParseError:
log.info("Error parsing RSS-feed at %s, make sure it is a valid RSS-feed, will use other method to find episodes" % rss_url)
else:
#if either tab or include_clips is set remove rss.xml from url if set manually.
if len(parse.path) > 7 and parse.path[-7:] == "rss.xml":
self._url = self.url.replace("rss.xml","")
if not valid_rss:
videos = [] videos = []
tab = None tab = None
match = re.search("__svtplay'] = ({.*});", self.get_urldata()) match = re.search("__svtplay'] = ({.*});", self.get_urldata())
@ -205,10 +228,6 @@ class Svtplay(Service, OpenGraphThumbMixin):
videos = self.videos_to_list(i["videos"], videos) videos = self.videos_to_list(i["videos"], videos)
episodes = [urljoin("http://www.svtplay.se", x) for x in videos] episodes = [urljoin("http://www.svtplay.se", x) for x in videos]
else:
data = self.http.request("get", match).content
xml = ET.XML(data)
episodes = [x.text for x in xml.findall(".//item/link")]
if options.all_last > 0: if options.all_last > 0:
return sorted(episodes[-options.all_last:]) return sorted(episodes[-options.all_last:])