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

solidtango: more ways to detect solidtango

Browse Source
This commit is contained in:
Johan Andersson 2016-03-20 21:04:09 +01:00
parent ab3646e4e2
commit ab2741f6bf
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/svtplay_dl/service/__init__.py
View File

@ -156,6 +156,12 @@ class Generic(Service):
for i in sites:
if i.handles(url):
return self.url, i(self.options, self.url)
match = re.search(r'src="([^.]+\.solidtango.com[^"+]+)"', data)
if match:
url = match.group(1)
for i in sites:
if i.handles(url):
return self.url, i(self.options, url)
match = re.search('(lemonwhale|lwcdn.com)', data)
if match:
url = "http://lemonwhale.com"

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

@ -2,15 +2,17 @@
# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
from __future__ import absolute_import
import re
import xml.etree.ElementTree as ET
from svtplay_dl.service import Service
from svtplay_dl.fetcher.hls import hlsparse
from svtplay_dl.error import ServiceError
from svtplay_dl.utils.urllib import urlparse
class Solidtango(Service):
supported_domains_re = [r'^([^.]+\.)*solidtango.com']
supported_domains = ['mm-resource-service.herokuapp.com']
supported_domains = ['mm-resource-service.herokuapp.com', 'solidtango.com']
def get(self):
data = self.get_urldata()
@ -37,5 +39,14 @@ class Solidtango(Service):
for n in list(streams.keys()):
yield streams[n]
else:
yield ServiceError("Can't find video info. if there is a video on the page. its a bug.")
return
parse = urlparse(self.url)
url2 = "https://%s/api/v1/play/%s.xml" % (parse.netloc, parse.path[parse.path.rfind("/")+1:])
data = self.http.request("get", url2)
if data.status_code != 200:
yield ServiceError("Can't find video info. if there is a video on the page. its a bug.")
return
xml = ET.XML(data.text)
elements = xml.findall(".//manifest")
streams = hlsparse(self.options, self.http.request("get", elements[0].text), elements[0].text)
for n in list(streams.keys()):
yield streams[n]