From: Jaime Marquínez Ferrándiz Date: Mon, 26 Jan 2015 11:01:43 +0000 (+0100) Subject: [YoutubeDL] Always set the '_filename' field in the info_dict (reported in #4053) X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=e72c7e41238681338c92427f6731c74947645308;hp=2b1bd292ae72fdea4ab731f93777a99b3729b31d;p=youtube-dl [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. --- 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):