X-Git-Url: https://git.ao2.it/smooth-dl.git/blobdiff_plain/5a4d002ae168b131ab3fa90c3b773cdff99af7e9..9bae22079909dbca77e3244df6c53575c9be07d8:/smooth-dl.py

diff --git a/smooth-dl.py b/smooth-dl.py
index 36ba345..29115b3 100755
--- a/smooth-dl.py
+++ b/smooth-dl.py
@@ -92,8 +92,7 @@ def write_wav_header(out_file, fmt, codec_private_data, data_len):
     out_file.write(struct.pack('<L', data_len))
 
 
-def get_manifest(base_url, dest_dir=tempfile.gettempdir(),
-        manifest_file='Manifest'):
+def get_manifest(base_url, dest_dir=tempfile.gettempdir()):
     """Returns the manifest and the new URL if this is changed"""
 
     if os.path.exists(dest_dir) == False:
@@ -108,7 +107,7 @@ def get_manifest(base_url, dest_dir=tempfile.gettempdir(),
         response = urllib2.urlopen(manifest_url)
         data = response.read()
 
-        manifest_path = os.path.join(dest_dir, manifest_file)
+        manifest_path = os.path.join(dest_dir, 'Manifest')
         f = open(manifest_path, "w")
         f.write(data)
         f.close()
@@ -134,7 +133,7 @@ def get_manifest(base_url, dest_dir=tempfile.gettempdir(),
 
 def print_manifest_info(manifest):
 
-    streams = manifest.findall('//StreamIndex')
+    streams = manifest.findall('.//StreamIndex')
 
     for i, s in enumerate(streams):
         stream_type = s.attrib["Type"]
@@ -161,21 +160,45 @@ def print_manifest_info(manifest):
     print
 
 
-def download_chunks(base_url, manifest, stream_index, quality_level, dest_dir):
-
-    if os.path.exists(dest_dir) == False:
-        os.mkdir(dest_dir, 0755)
-
-    stream = manifest.findall('//StreamIndex')[stream_index]
-
+def get_chunk_quality_string(stream, quality_level):
     quality = stream.findall("QualityLevel")[quality_level]
     bitrate = quality.attrib["Bitrate"]
 
+    quality_attributes = quality.findall("CustomAttributes/Attribute")
+    custom_attributes = ""
+    for i in quality_attributes:
+        custom_attributes += "%s=%s," % (i.attrib["Name"], i.attrib["Value"])
+    custom_attributes = custom_attributes.rstrip(',')
+
     # Assume URLs are in this form:
     # Url="QualityLevels({bitrate})/Fragments(video={start time})"
+    # or
+    # Url="QualityLevels({bitrate},{CustomAttributes})/Fragments(video={start time})"
     url = stream.attrib["Url"]
 
     chunks_quality = url.split('/')[0].replace("{bitrate}", bitrate)
+    chunks_quality = chunks_quality.replace("{CustomAttributes}", custom_attributes)
+
+    return chunks_quality
+
+
+def get_chunk_name_string(stream, chunk):
+    t = chunk.attrib["t"]
+    url = stream.attrib["Url"]
+    chunk_name = url.split('/')[1].replace("{start time}", t)
+
+    return chunk_name
+
+
+def download_chunks(base_url, manifest, stream_index, quality_level, dest_dir):
+
+    if os.path.exists(dest_dir) == False:
+        os.mkdir(dest_dir, 0755)
+
+    stream = manifest.findall('.//StreamIndex')[stream_index]
+
+    chunks_quality = get_chunk_quality_string(stream, quality_level)
+
     chunks_dest_dir = os.path.join(dest_dir, chunks_quality)
     if os.path.exists(chunks_dest_dir) == False:
         os.mkdir(chunks_dest_dir, 0755)
@@ -186,19 +209,22 @@ def download_chunks(base_url, manifest, stream_index, quality_level, dest_dir):
     print "\tChunks %10d/%-10d" % (0, len(chunks)), "\r",
     sys.stdout.flush()
     for i, c in enumerate(chunks):
-        t = c.attrib["t"]
 
-        chunk_name = url.split('/')[1].replace("{start time}", t)
+        chunk_name = get_chunk_name_string(stream, c)
         chunk_file = os.path.join(dest_dir,  chunks_quality, chunk_name)
 
         if os.path.exists(chunk_file) == False:
             chunk_url = base_url + '/' + chunks_quality + '/' + chunk_name
-            response = urllib2.urlopen(chunk_url)
-            data = response.read()
+            try:
+                response = urllib2.urlopen(chunk_url)
+                data = response.read()
+
+                f = open(chunk_file, "wb")
+                f.write(data)
+                f.close()
+            except Exception as e:
+                print e
 
-            f = open(chunk_file, "wb")
-            f.write(data)
-            f.close()
         else:
             f = open(chunk_file, "rb")
             data = f.read()
@@ -216,16 +242,10 @@ def rebuild_stream(manifest, stream_index, quality_level, src_dir,
     if final_dest_file == None:
         final_dest_file = dest_file_name
 
-    stream = manifest.findall('//StreamIndex')[stream_index]
+    stream = manifest.findall('.//StreamIndex')[stream_index]
 
-    quality = stream.findall("QualityLevel")[quality_level]
-    bitrate = quality.attrib["Bitrate"]
+    chunks_quality = get_chunk_quality_string(stream, quality_level)
 
-    # Assume URLs are in this form:
-    # Url="QualityLevels({bitrate})/Fragments(video={start time})"
-    url = stream.attrib["Url"]
-
-    chunks_quality = url.split('/')[0].replace("{bitrate}", bitrate)
     chunks_src_dir = os.path.join(src_dir, chunks_quality)
 
     dest_file = open(dest_file_name, "wb")
@@ -236,9 +256,8 @@ def rebuild_stream(manifest, stream_index, quality_level, src_dir,
     print "\tChunks %10d/%-10d" % (0, len(chunks)), "\r",
     sys.stdout.flush()
     for i, c in enumerate(chunks):
-        t = c.attrib["t"]
 
-        chunk_name = url.split('/')[1].replace("{start time}", t)
+        chunk_name = get_chunk_name_string(stream, c)
         chunk_file = os.path.join(chunks_src_dir, chunk_name)
 
         f = open(chunk_file, "rb")
@@ -251,6 +270,7 @@ def rebuild_stream(manifest, stream_index, quality_level, src_dir,
 
     # Add a nice WAV header
     if stream.attrib['Type'] == "audio":
+        quality = stream.findall("QualityLevel")[quality_level]
         codec_private_data = quality.attrib['CodecPrivateData']
 
         fmt = {}
@@ -275,7 +295,7 @@ def rebuild_stream(manifest, stream_index, quality_level, src_dir,
 
 
 def calc_tracks_delay(manifest, stream1_index, stream2_index):
-    streams = manifest.findall('//StreamIndex')
+    streams = manifest.findall('.//StreamIndex')
 
     s1 = streams[stream1_index]
     s2 = streams[stream2_index]