From: Antonio Ospite Date: Fri, 15 Jan 2016 19:08:27 +0000 (+0100) Subject: smooth-dl.py: only create dest_dir once X-Git-Url: https://git.ao2.it/smooth-dl.git/commitdiff_plain/3c5d261bdf46670b00120423be912ea65c7ea2a0?ds=sidebyside smooth-dl.py: only create dest_dir once --- diff --git a/smooth-dl.py b/smooth-dl.py index eda931a..44ef722 100755 --- a/smooth-dl.py +++ b/smooth-dl.py @@ -109,12 +109,9 @@ def download_file(src_url, dest_file, mode): return data -def get_manifest(url, dest_dir=tempfile.gettempdir()): +def get_manifest(url, dest_dir): """Returns the manifest element and the base content URL""" - if not os.path.exists(dest_dir): - os.mkdir(dest_dir, 0755) - # Remove the querystring if present manifest_url = urlunparse(urlparse(url)._replace(query='')) @@ -207,10 +204,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 +346,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 +431,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)