mirrors/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-23 06:42:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix --download-archive (Fixes #1826)

Browse Source
This commit is contained in:
Philipp Hagemeister 2013-11-25 15:46:54 +01:00
parent ea36cbac5e
commit 5db07df634
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
youtube_dl/YoutubeDL.py
View File

@ -836,20 +836,26 @@ class YoutubeDL(object):
except (IOError, OSError): except (IOError, OSError):
self.report_warning(u'Unable to remove downloaded video file') self.report_warning(u'Unable to remove downloaded video file')
def in_download_archive(self, info_dict): def _make_archive_id(self, info_dict):
fn = self.params.get('download_archive') # Future-proof against any change in case
if fn is None: # and backwards compatibility with prior versions
return False extractor = info_dict.get('extractor')
extractor = info_dict.get('extractor_id')
if extractor is None: if extractor is None:
if 'id' in info_dict: if 'id' in info_dict:
extractor = info_dict.get('ie_key') # key in a playlist extractor = info_dict.get('ie_key') # key in a playlist
if extractor is None: if extractor is None:
return None # Incomplete video information
return extractor.lower() + u' ' + info_dict['id']
def in_download_archive(self, info_dict):
fn = self.params.get('download_archive')
if fn is None:
return False
vid_id = self._make_archive_id(info_dict)
if vid_id is None:
return False # Incomplete video information return False # Incomplete video information
# Future-proof against any change in case
# and backwards compatibility with prior versions
extractor = extractor.lower()
vid_id = extractor + u' ' + info_dict['id']
try: try:
with locked_file(fn, 'r', encoding='utf-8') as archive_file: with locked_file(fn, 'r', encoding='utf-8') as archive_file:
for line in archive_file: for line in archive_file:
@ -864,7 +870,8 @@ class YoutubeDL(object):
fn = self.params.get('download_archive') fn = self.params.get('download_archive')
if fn is None: if fn is None:
return return
vid_id = info_dict['extractor'] + u' ' + info_dict['id'] vid_id = self._make_archive_id(info_dict)
assert vid_id
with locked_file(fn, 'a', encoding='utf-8') as archive_file: with locked_file(fn, 'a', encoding='utf-8') as archive_file:
archive_file.write(vid_id + u'\n') archive_file.write(vid_id + u'\n')