smooth-dl.py: improve getting the manifest of Clip elements

[smooth-dl.git] / smooth-dl.py

diff --git a/smooth-dl.py b/smooth-dl.py
index 4fdbca1..a496bc7 100755 (executable)
--- a/smooth-dl.py
+++ b/smooth-dl.py
@@ -109,11 +109,8 @@ def download_file(src_url, dest_file, mode):
     return data
 
 
-def get_manifest(url, dest_dir=tempfile.gettempdir()):
-    """Returns the manifest and the new URL if this is changed"""
-
-    if not os.path.exists(dest_dir):
-        os.mkdir(dest_dir, 0755)
+def get_manifest(url, dest_dir):
+    """Returns the manifest element and the base content URL"""
 
     # Remove the querystring if present
     manifest_url = urlunparse(urlparse(url)._replace(query=''))
@@ -121,11 +118,11 @@ def get_manifest(url, dest_dir=tempfile.gettempdir()):
     if not manifest_url.lower().endswith(('/manifest', '.ismc', '.csm')):
         manifest_url += '/Manifest'
 
-    if manifest_url.startswith('http://'):
+    if os.path.exists(url):
+        local_manifest_path = url
+    else:
         local_manifest_path = os.path.join(dest_dir, 'Manifest')
         download_file(manifest_url, local_manifest_path, "w")
-    else:
-        local_manifest_path = url
 
     manifest = etree.parse(local_manifest_path)
 
@@ -133,13 +130,18 @@ def get_manifest(url, dest_dir=tempfile.gettempdir()):
     if version != "2":
         raise Exception('Only Smooth Streaming version 2 supported')
 
-    try:
-        # if some intermediate client Manifest is used, like in Rai Replay
-        clip = manifest.find("Clip")
-        manifest_url = clip.attrib["Url"]
-        manifest = download_file(manifest_url, None, None)
-    except AttributeError:
-        pass
+    # if some intermediate client Manifest is used, like in Rai Replay
+    # then get the final manifest
+    clip = manifest.find("Clip")
+    if clip is not None and "Url" in clip.attrib:
+        tmp_manifest_url = clip.attrib["Url"]
+        try:
+            tmp_manifest = download_file(tmp_manifest_url, None, None)
+            # set the new values only if the dowload succeded
+            manifest_url = tmp_manifest_url
+            manifest = tmp_manifest
+        except urllib2.HTTPError:
+            pass
 
     manifest_pattern = re.compile("/manifest$", re.IGNORECASE)
     base_url = manifest_pattern.sub("", manifest_url)
@@ -207,10 +209,6 @@ def get_chunk_name_string(stream, chunk_time):
 
 
 def download_chunks(base_url, manifest, stream_index, quality_level, dest_dir):
-
-    if not os.path.exists(dest_dir):
-        os.mkdir(dest_dir, 0755)
-
     stream = manifest.findall('.//StreamIndex')[stream_index]
 
     chunks_quality = get_chunk_quality_string(stream, quality_level)
@@ -353,7 +351,7 @@ def get_clip_duration(manifest):
     return float(duration) / 10000000  # here is the default timescale
 
 
-def smooth_download(url, manifest, dest_dir=tempfile.gettempdir(),
+def smooth_download(url, manifest, dest_dir,
                     video_stream_index=0, audio_stream_index=1,
                     video_quality_level=0, audio_quality_level=0,
                     chunks_dir=None, download=True,
@@ -438,6 +436,9 @@ def main():
         parser.print_help()
         parser.exit(1)
 
+    if not os.path.exists(options.dest_dir):
+        os.mkdir(options.dest_dir, 0755)
+
     url = args[0]
     manifest, url = get_manifest(url, options.dest_dir)