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

download_hls: adding support for baseurl.

Browse Source 
Now ruv can use download_hls instead of download_m3u8
This commit is contained in:
Johan Andersson 2013-01-12 14:52:35 +01:00
parent 2d69eb199a
commit 39ddc44aca
1 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
svtplay_dl.py
View File

@ -386,7 +386,7 @@ def download_hds(options, url, swf=None):
file_d.close() file_d.close()
progress_stream.write('\n') progress_stream.write('\n')
def download_hls(options, url): def download_hls(options, url, baseurl=None):
data = get_http_data(url) data = get_http_data(url)
globaldata, files = parsem3u(data) globaldata, files = parsem3u(data)
streams = {} streams = {}
@ -427,9 +427,12 @@ def download_hls(options, url):
start = time.time() start = time.time()
estimated = "" estimated = ""
for i in files: for i in files:
item = i[0]
if options.output != "-": if options.output != "-":
progressbar(len(files), n, estimated) progressbar(len(files), n, estimated)
data = get_http_data(i[0]) if item[0:5] != "http:":
item = "%s/%s" % (baseurl, item)
data = get_http_data(item)
if encrypted: if encrypted:
lots = StringIO.StringIO(data) lots = StringIO.StringIO(data)
@ -455,45 +458,6 @@ def download_hls(options, url):
file_d.close() file_d.close()
progress_stream.write('\n') progress_stream.write('\n')
def download_m3u8(options, url, base_url = None):
data = get_http_data(url)
globaldata, files = parsem3u(data)
n = 1
if options.output != "-":
extension = re.search("(\.[a-z0-9]+)$", options.output)
if not extension:
options.output = "%s.ts" % options.output
log.info("Outfile: %s", options.output)
file_d = open(options.output, "wb")
else:
file_d = sys.stdout
start = time.time()
estimated = ""
for n, i in enumerate( files ):
if options.output != "-":
progressbar(len(files), n, estimated)
file_url = i[0]
if not file_url.startswith( "http" ) and base_url :
file_url = base_url + "/" + file_url
response = urlopen( file_url )
while True :
chunk = response.read( 8192 )
if not chunk :
break
file_d.write( chunk )
now = time.time()
dt = now - start
et = dt / ( n + 1 ) * len( files )
rt = et - dt
td = timedelta( seconds = int( rt ) )
estimated = "Estimated Remaining: " + str( td )
if options.output != "-":
file_d.close()
progress_stream.write('\n')
def download_http(options, url): def download_http(options, url):
""" Get the stream from HTTP """ """ Get the stream from HTTP """
response = urlopen(url) response = urlopen(url)
@ -907,12 +871,8 @@ class Ruv ( object ) :
tengipunktur = js.split( '"' )[1] tengipunktur = js.split( '"' )[1]
match = re.search( r"http.*tengipunktur [+] '([:]1935.*)'", data ) match = re.search( r"http.*tengipunktur [+] '([:]1935.*)'", data )
m3u8_url = "http://" + tengipunktur + match.group( 1 ) m3u8_url = "http://" + tengipunktur + match.group( 1 )
m3u8_data = get_http_data( m3u8_url )
g, f = parsem3u( m3u8_data )
if len( f ) == 1 :
m3u8_url = f[0][0]
base_url = m3u8_url.rsplit( "/", 1 )[0] base_url = m3u8_url.rsplit( "/", 1 )[0]
download_m3u8( options, m3u8_url, base_url ) download_hls( options, m3u8_url, base_url )
def progressbar(total, pos, msg=""): def progressbar(total, pos, msg=""):
""" """