[xtube] Fix extraction (Closes #9953, closes #9961)

[youtube-dl.git] / youtube_dl / options.py

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 14051b7143d3003098d59b40362116447c156a3e..c9033e3cb230e4019b49c0fa6903ce1e8c65d556 100644 (file)
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -26,9 +26,7 @@ def parseOpts(overrideArguments=None):
         except IOError:
             return default  # silently skip if file is not present
         try:
-            res = []
-            for l in optionf:
-                res += compat_shlex_split(l, comments=True)
+            res = compat_shlex_split(optionf.read(), comments=True)
         finally:
             optionf.close()
         return res
@@ -668,7 +666,7 @@ def parseOpts(overrideArguments=None):
         action='store_true', dest='writeannotations', default=False,
         help='Write video annotations to a .annotations.xml file')
     filesystem.add_option(
-        '--load-info',
+        '--load-info-json', '--load-info',
         dest='load_info_filename', metavar='FILE',
         help='JSON file containing the video information (created with the "--write-info-json" option)')
     filesystem.add_option(