]> git.bitcoin.ninja Git - youtube-dl/commitdiff
--load-info: Use the fileinput module
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 1 Mar 2015 10:46:57 +0000 (11:46 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 1 Mar 2015 10:54:48 +0000 (11:54 +0100)
It automatically handles the '-' filename as stdin

youtube_dl/YoutubeDL.py

index d7c6db0ffcb3c13baef3079aa0beb9ca3070a273..15367c4e36edbdd52c2fbf2096913dc7bb08b658 100755 (executable)
@@ -4,8 +4,10 @@
 from __future__ import absolute_import, unicode_literals
 
 import collections
+import contextlib
 import datetime
 import errno
+import fileinput
 import io
 import itertools
 import json
@@ -1452,8 +1454,11 @@ class YoutubeDL(object):
         return self._download_retcode
 
     def download_with_info_file(self, info_filename):
-        with io.open(info_filename, 'r', encoding='utf-8') as f:
-            info = json.load(f)
+        with contextlib.closing(fileinput.FileInput(
+                [info_filename], mode='r',
+                openhook=fileinput.hook_encoded('utf-8'))) as f:
+            # FileInput doesn't have a read method, we can't call json.load
+            info = json.loads('\n'.join(f))
         try:
             self.process_ie_result(info, download=True)
         except DownloadError: