From: Antonio Ospite <ao2@ao2.it>
Date: Fri, 15 Jan 2016 20:53:05 +0000 (+0100)
Subject: smooth-dl.py: update to python3
X-Git-Url: https://git.ao2.it/smooth-dl.git/commitdiff_plain/e5fcd65651d541ee43bd92c7e5eec1a721f2cc0c?ds=sidebyside;hp=5823e17e70b2fe749ce6d5998b8f01cc0db1537e

smooth-dl.py: update to python3
---

diff --git a/smooth-dl.py b/smooth-dl.py
index 60c3e00..d983a28 100755
--- a/smooth-dl.py
+++ b/smooth-dl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # smooth-dl - download videos served using Smooth Streaming technology
 #
@@ -34,11 +34,13 @@ import os
 import re
 import sys
 import xml.etree.ElementTree as etree
-import urllib2
+import urllib.request
+import urllib.error
+import urllib.parse
 import struct
 import tempfile
 from optparse import OptionParser
-from urlparse import urlparse, urlunparse
+from urllib.parse import urlparse, urlunparse
 
 __description__ = "Download videos served using Smooth Streaming technology"
 __version__ = "0.x"
@@ -62,11 +64,7 @@ def get_chunk_data(data):
 
 
 def hexstring_to_bytes(hex_string):
-    res = ""
-    for i in range(0, len(hex_string), 2):
-        res += chr(int(hex_string[i:i + 2], 16))
-
-    return res
+    return bytearray.fromhex(hex_string)
 
 
 def write_wav_header(out_file, fmt, codec_private_data, data_len):
@@ -77,9 +75,9 @@ def write_wav_header(out_file, fmt, codec_private_data, data_len):
     fmt_len = 18 + fmt['cbSize']
     wave_len = len("WAVEfmt ") + 4 + fmt_len + len('data') + 4
 
-    out_file.write("RIFF")
+    out_file.write(bytes("RIFF", "ascii"))
     out_file.write(struct.pack('<L', wave_len))
-    out_file.write("WAVEfmt ")
+    out_file.write(bytes("WAVEfmt ", "ascii"))
     out_file.write(struct.pack('<L', fmt_len))
     out_file.write(struct.pack('<H', fmt['wFormatTag']))
     out_file.write(struct.pack('<H', fmt['nChannels']))
@@ -89,7 +87,7 @@ def write_wav_header(out_file, fmt, codec_private_data, data_len):
     out_file.write(struct.pack('<H', fmt['wBitsPerSample']))
     out_file.write(struct.pack('<H', fmt['cbSize']))
     out_file.write(extradata)
-    out_file.write("data")
+    out_file.write(bytes("data", "ascii"))
     out_file.write(struct.pack('<L', data_len))
 
 
@@ -101,9 +99,9 @@ def download_file(src_url, dest_file, mode):
         f.close()
     else:
         try:
-            response = urllib2.urlopen(src_url)
+            response = urllib.request.urlopen(src_url)
             data = response.read()
-        except urllib2.HTTPError:
+        except urllib.error.HTTPError:
             sys.stderr.write("Error while dowloading URL: %s\n" % src_url)
             raise
 
@@ -125,7 +123,7 @@ def get_manifest(url, dest_dir):
         manifest_url += '/Manifest'
 
     local_manifest_path = os.path.join(dest_dir, 'Manifest')
-    download_file(manifest_url, local_manifest_path, "w")
+    download_file(manifest_url, local_manifest_path, "wb")
 
     manifest = etree.parse(local_manifest_path)
 
@@ -143,7 +141,7 @@ def get_manifest(url, dest_dir):
             # set the new values only if the dowload succeded
             manifest_url = tmp_manifest_url
             manifest = tmp_manifest
-        except urllib2.HTTPError:
+        except urllib.error.HTTPError:
             pass
 
     manifest_pattern = re.compile("/manifest$", re.IGNORECASE)
@@ -159,9 +157,9 @@ def print_manifest_info(manifest):
     for i, s in enumerate(streams):
         stream_type = s.attrib["Type"]
 
-        print "Stream: %s Type: %s" % (i, stream_type)
+        print("Stream: %s Type: %s" % (i, stream_type))
 
-        print "\tQuality Levels:"
+        print("\tQuality Levels:")
         qualities = s.findall("QualityLevel")
         for i, q in enumerate(qualities):
             bitrate = q.attrib["Bitrate"]
@@ -169,16 +167,16 @@ def print_manifest_info(manifest):
 
             if stream_type == "video":
                 size = "%sx%s" % (q.attrib["MaxWidth"], q.attrib["MaxHeight"])
-                print "\t%2s: %4s %10s @ %7s bps" % (i, fourcc, size, bitrate)
+                print("\t%2s: %4s %10s @ %7s bps" % (i, fourcc, size, bitrate))
             if stream_type == "audio":
                 channels = q.attrib["Channels"]
                 sampling_rate = q.attrib["SamplingRate"]
                 bits_per_sample = q.attrib["BitsPerSample"]
-                print "\t%2s: %4s %sHz %sbits %sch @ %7s bps" % \
-                    (i, fourcc, sampling_rate, bits_per_sample, channels,
-                     bitrate)
+                print("\t%2s: %4s %sHz %sbits %sch @ %7s bps" %
+                      (i, fourcc, sampling_rate, bits_per_sample, channels,
+                       bitrate))
 
-    print
+    print()
 
 
 def get_chunk_quality_string(stream, quality_level):
@@ -218,12 +216,12 @@ def download_chunks(base_url, manifest, stream_index, quality_level, dest_dir):
 
     chunks_dest_dir = os.path.join(dest_dir, chunks_quality)
     if not os.path.exists(chunks_dest_dir):
-        os.mkdir(chunks_dest_dir, 0755)
+        os.mkdir(chunks_dest_dir, 0o755)
 
     chunks = stream.findall("c")
     data_size = 0
-    print "\nDownloading Stream %d" % stream_index
-    print "\tChunks %10d/%-10d" % (0, len(chunks)), "\r",
+    print("\nDownloading Stream %d" % stream_index)
+    print("\tChunks %10d/%-10d" % (0, len(chunks)), "\r", end=' ')
     sys.stdout.flush()
 
     stream_duration = 0
@@ -247,9 +245,9 @@ def download_chunks(base_url, manifest, stream_index, quality_level, dest_dir):
             f.close()
 
         data_size += len(data)
-        print "\tChunks %10d/%-10d" % (i + 1, len(chunks)), "\r",
+        print("\tChunks %10d/%-10d" % (i + 1, len(chunks)), "\r", end=' ')
         sys.stdout.flush()
-    print "\tDownloaded size:", data_size
+    print("\tDownloaded size:", data_size)
 
 
 def rebuild_stream(manifest, stream_index, quality_level, src_dir,
@@ -268,8 +266,8 @@ def rebuild_stream(manifest, stream_index, quality_level, src_dir,
 
     chunks = stream.findall("c")
     data_size = 0
-    print "\nRebuilding Stream %d" % stream_index
-    print "\tChunks %10d/%-10d" % (0, len(chunks)), "\r",
+    print("\nRebuilding Stream %d" % stream_index)
+    print("\tChunks %10d/%-10d" % (0, len(chunks)), "\r", end=' ')
     sys.stdout.flush()
 
     stream_duration = 0
@@ -289,7 +287,7 @@ def rebuild_stream(manifest, stream_index, quality_level, src_dir,
         f.close()
         dest_file.write(data)
         data_size += len(data)
-        print "\tChunks %10d/%-10d" % (i + 1, len(chunks)), "\r",
+        print("\tChunks %10d/%-10d" % (i + 1, len(chunks)), "\r", end=' ')
         sys.stdout.flush()
 
     # Add a nice WAV header
@@ -301,7 +299,7 @@ def rebuild_stream(manifest, stream_index, quality_level, src_dir,
         fmt['wFormatTag'] = int(quality.attrib['AudioTag'])
         fmt['nChannels'] = int(quality.attrib['Channels'])
         fmt['nSamplesPerSec'] = int(quality.attrib['SamplingRate'])
-        fmt['nAvgBytesPerSec'] = int(quality.attrib['Bitrate']) / 8
+        fmt['nAvgBytesPerSec'] = int(quality.attrib['Bitrate']) // 8
         fmt['wBitsPerSample'] = int(quality.attrib['BitsPerSample'])
         fmt['nBlockAlign'] = int(quality.attrib['PacketSize'])
         fmt['cbSize'] = 0
@@ -314,8 +312,8 @@ def rebuild_stream(manifest, stream_index, quality_level, src_dir,
         f.close()
         dest_file.close()
 
-    print
-    print "Stream %d, actual data size: %d\n" % (stream_index, data_size)
+    print()
+    print("Stream %d, actual data size: %d\n" % (stream_index, data_size))
 
 
 def calc_tracks_delay(manifest, stream1_index, stream2_index):
@@ -389,7 +387,7 @@ def smooth_download(url, manifest, dest_dir,
                    "  -vcodec copy -acodec copy ffout.mkv") % \
         (dest_video, delay, dest_audio + '.wav')
 
-    print mux_command
+    print(mux_command)
 
 
 def options_parser():
@@ -440,7 +438,7 @@ def main():
         parser.exit(1)
 
     if not os.path.exists(options.dest_dir):
-        os.mkdir(options.dest_dir, 0755)
+        os.mkdir(options.dest_dir, 0o755)
 
     url = args[0]
     manifest, url = get_manifest(url, options.dest_dir)
@@ -449,9 +447,9 @@ def main():
         parser.exit(0)
 
     if options.sync_delay:
-        print calc_tracks_delay(manifest,
+        print(calc_tracks_delay(manifest,
                                 options.video_stream_index,
-                                options.audio_stream_index)
+                                options.audio_stream_index))
         parser.exit(0)
 
     if options.info_only: