Merge pull request #342 from ytdl-org/master

[pull] master from ytdl-org:master
joedborg · Jul 31, 2019 · e8a28f5 · e8a28f5
2 parents b204647 + 826dcff
commit e8a28f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
@@ -94,7 +94,7 @@ def _real_main(argv=None):
             if opts.verbose:
                 write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n')
         except IOError:
-            sys.exit('ERROR: batch file could not be read')
+            sys.exit('ERROR: batch file %s could not be read' % opts.batchfile)
     all_urls = batch_urls + [url.strip() for url in args]  # batch_urls are already striped in read_batch_urls
     _enc = preferredencoding()
     all_urls = [url.decode(_enc, 'ignore') if isinstance(url, bytes) else url for url in all_urls]

diff --git a/youtube_dl/extractor/mgtv.py b/youtube_dl/extractor/mgtv.py
@@ -82,6 +82,7 @@ def _real_extract(self, url):
                 'http_headers': {
                     'Referer': url,
                 },
+                'format_note': stream.get('name'),
             })
         self._sort_formats(formats)