diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-12-23 15:48:00 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-12-23 15:49:21 +0100 |
| commit | 1538eff6d8ee73f2ae4ac1dd832a9ef978c63074 (patch) | |
| tree | 92aafe41ebfb72668063c4f927f44361dd3a963f /youtube_dl/YoutubeDL.py | |
| parent | 00b2685b9ceecbeb5a5ea1cb7bd1ff2772e941de (diff) | |
| download | youtube-dl-1538eff6d8ee73f2ae4ac1dd832a9ef978c63074.tar.xz | |
[bliptv] Remove support for direct downloads
This is now handled by the generic IE
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
| -rw-r--r-- | youtube_dl/YoutubeDL.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index ac4627c4e..41a9114ad 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -542,7 +542,7 @@ class YoutubeDL(object): def make_result(embedded_info): new_result = ie_result.copy() for f in ('_type', 'url', 'ext', 'player_url', 'formats', - 'entries', 'urlhandle', 'ie_key', 'duration', + 'entries', 'ie_key', 'duration', 'subtitles', 'annotations', 'format', 'thumbnail', 'thumbnails'): if f in new_result: @@ -856,8 +856,7 @@ class YoutubeDL(object): else: self.to_screen(u'[info] Writing video description metadata as JSON to: ' + infofn) try: - json_info_dict = dict((k, v) for k, v in info_dict.items() if not k in ['urlhandle']) - write_json_file(json_info_dict, encodeFilename(infofn)) + write_json_file(info_dict, encodeFilename(infofn)) except (OSError, IOError): self.report_error(u'Cannot write metadata to JSON file ' + infofn) return |