]> code.delx.au - webdl/commitdiff
webdl: close file before converting with ffmpeg
authorJames Bunton <jamesbunton@delx.net.au>
Wed, 9 Apr 2014 13:15:29 +0000 (23:15 +1000)
committerJames Bunton <jamesbunton@delx.net.au>
Wed, 9 Apr 2014 13:15:29 +0000 (23:15 +1000)
common.py

index f77c86c04e27397590133cea44960bee4fe2ce53..e6191e74a7e067b7e4a26b2a15a52b04cd5418c2 100644 (file)
--- a/common.py
+++ b/common.py
@@ -235,10 +235,9 @@ def download_urllib(filename, url, referrer=None):
                        sys.stdout.write(".")
                        sys.stdout.flush()
                print
-               convert_filename(filename)
-               return True
        except KeyboardInterrupt:
                print "\nCancelled", url
+               return False
        finally:
                try:
                        src.close()
@@ -248,7 +247,9 @@ def download_urllib(filename, url, referrer=None):
                        dst.close()
                except:
                        pass
-       return False
+
+       convert_filename(filename)
+       return True
 
 def natural_sort(l, key=None):
        ignore_list = ["a", "the"]