]> code.delx.au - webdl/commitdiff
webdl: sanify HLS filenames
authorJames Bunton <jamesbunton@delx.net.au>
Sun, 31 Aug 2014 10:59:25 +0000 (20:59 +1000)
committerJames Bunton <jamesbunton@delx.net.au>
Sun, 31 Aug 2014 10:59:25 +0000 (20:59 +1000)
common.py

index accd6dd506eab83f6e6d2acf14ca94241f000731..2f2cf5f48d2a76053e63730dac0bb058566c7bdd 100644 (file)
--- a/common.py
+++ b/common.py
@@ -316,13 +316,14 @@ def download_hls_fetch_segment(outf, segment_url):
             pass
 
 def download_hls(filename, m3u8_master_url, hack_url_func=None):
             pass
 
 def download_hls(filename, m3u8_master_url, hack_url_func=None):
+    filename = sanify_filename(filename)
+    print "Downloading: %s" % filename
+
     if hack_url_func is None:
         hack_url_func = lambda url: url
 
     tmpdir = tempfile.mkdtemp(prefix="webdl-hls")
 
     if hack_url_func is None:
         hack_url_func = lambda url: url
 
     tmpdir = tempfile.mkdtemp(prefix="webdl-hls")
 
-    print "Downloading: %s" % filename
-
     try:
         best_stream_url = download_hls_get_stream(hack_url_func(m3u8_master_url))
         ts_file = open(filename, "w")
     try:
         best_stream_url = download_hls_get_stream(hack_url_func(m3u8_master_url))
         ts_file = open(filename, "w")