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

HDS: show an error message when we see DRM files.

Browse Source
This commit is contained in:
Johan Andersson 2014-10-12 23:31:02 +02:00
parent 401bb08a78
commit 0e65654a5a
8 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/svtplay_dl/fetcher/hds.py
View File

@ -52,6 +52,9 @@ def hdsparse(options, manifest):
bootstrapIter = xml.iter("{http://ns.adobe.com/f4m/1.0}bootstrapInfo")
mediaIter = xml.iter("{http://ns.adobe.com/f4m/1.0}media")
if xml.find("{http://ns.adobe.com/f4m/1.0}drmAdditionalHeader") is not None:
log.error("HDS DRM protected content.")
return
for i in bootstrapIter:
if "id" in i.attrib:
bootstrap[i.attrib["id"]] = i.text

5
lib/svtplay_dl/service/bigbrother.py
View File

@ -52,8 +52,9 @@ class Bigbrother(Service):
if i["defaultURL"].endswith("f4m"):
manifest = "%s?hdcore=3.3.0" % i["defaultURL"]
streams = hdsparse(copy.copy(options), manifest)
for n in list(streams.keys()):
yield streams[n]
if streams:
for n in list(streams.keys()):
yield streams[n]
if i["defaultURL"].endswith("m3u8"):
streams = hlsparse(i["defaultURL"])

5
lib/svtplay_dl/service/dr.py
View File

@ -44,8 +44,9 @@ class Dr(Service, OpenGraphThumbMixin):
if stream["Target"] == "HDS":
manifest = "%s?hdcore=2.8.0&g=hejsan" % stream["Uri"]
streams = hdsparse(copy.copy(options), manifest)
for n in list(streams.keys()):
yield streams[n]
if streams:
for n in list(streams.keys()):
yield streams[n]
if stream["Target"] == "HLS":
streams = hlsparse(stream["Uri"])
for n in list(streams.keys()):

5
lib/svtplay_dl/service/nrk.py
View File

@ -53,5 +53,6 @@ class Nrk(Service, OpenGraphThumbMixin):
manifest_url = "%s?hdcore=2.8.0&g=hejsan" % manifest_url
streams = hdsparse(copy.copy(options), manifest_url)
for n in list(streams.keys()):
yield streams[n]
if streams:
for n in list(streams.keys()):
yield streams[n]

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

@ -87,8 +87,9 @@ class Svtplay(Service, OpenGraphThumbMixin):
parse = urlparse(i["url"])
manifest = "%s://%s%s?%s&hdcore=3.3.0" % (parse.scheme, parse.netloc, parse.path, parse.query)
streams = hdsparse(copy.copy(options), manifest)
for n in list(streams.keys()):
yield streams[n]
if streams:
for n in list(streams.keys()):
yield streams[n]
elif parse.scheme == "rtmp":
embedurl = "%s?type=embed" % url
data = get_http_data(embedurl)

5
lib/svtplay_dl/service/tv4play.py
View File

@ -84,8 +84,9 @@ class Tv4play(Service, OpenGraphThumbMixin):
query = "?"
manifest = "%s%shdcore=2.8.0&g=hejsan" % (i.find("url").text, query)
streams = hdsparse(copy.copy(options), manifest)
for n in list(streams.keys()):
yield streams[n]
if streams:
for n in list(streams.keys()):
yield streams[n]
elif i.find("mediaFormat").text == "smi":
yield subtitle_smi(i.find("url").text)

5
lib/svtplay_dl/service/vg.py
View File

@ -40,8 +40,9 @@ class Vg(Service, OpenGraphThumbMixin):
parse = urlparse(jsondata["streamUrls"]["hds"])
manifest = "%s://%s%s?%s&hdcore=3.3.0" % (parse.scheme, parse.netloc, parse.path, parse.query)
streams = hdsparse(copy.copy(options), manifest)
for n in list(streams.keys()):
yield streams[n]
if streams:
for n in list(streams.keys()):
yield streams[n]
if "hls" in jsondata["streamUrls"]:
streams = hlsparse(jsondata["streamUrls"]["hls"])
for n in list(streams.keys()):

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

@ -97,8 +97,9 @@ class Viaplay(Service, OpenGraphThumbMixin):
if filename[len(filename)-3:] == "f4m":
manifest = "%s?hdcore=2.8.0&g=hejsan" % filename
streams = hdsparse(copy.copy(options), manifest)
for n in list(streams.keys()):
yield streams[n]
if streams:
for n in list(streams.keys()):
yield streams[n]
else:
parse = urlparse(filename)
match = re.search("^(/[^/]+)/(.*)", parse.path)