summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2015-01-26 12:01:43 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2015-01-26 12:01:43 +0100
commite72c7e41238681338c92427f6731c74947645308 (patch)
tree661cdc77eb920c97ad0feda2c9a6d18ec409a382
parent2b1bd292ae72fdea4ab731f93777a99b3729b31d (diff)
downloadyoutube-dl-e72c7e41238681338c92427f6731c74947645308.tar.gz
youtube-dl-e72c7e41238681338c92427f6731c74947645308.tar.xz
youtube-dl-e72c7e41238681338c92427f6731c74947645308.zip
[YoutubeDL] Always set the '_filename' field in the info_dict (reported in #4053)
It's also useful when you use the '--write-info-json' option.
-rwxr-xr-xyoutube_dl/YoutubeDL.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index b772f87f1..ae62432c6 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -1130,7 +1130,7 @@ class YoutubeDL(object):
 
         self._num_downloads += 1
 
-        filename = self.prepare_filename(info_dict)
+        info_dict['_filename'] = filename = self.prepare_filename(info_dict)
 
         # Forced printings
         if self.params.get('forcetitle', False):
@@ -1155,10 +1155,7 @@ class YoutubeDL(object):
         if self.params.get('forceformat', False):
             self.to_stdout(info_dict['format'])
         if self.params.get('forcejson', False):
-            info_dict['_filename'] = filename
             self.to_stdout(json.dumps(info_dict))
-        if self.params.get('dump_single_json', False):
-            info_dict['_filename'] = filename
 
         # Do nothing else if in simulate mode
         if self.params.get('simulate', False):