fix some more bugs
This commit is contained in:
parent
8c56e8caef
commit
4e3d62c879
|
@ -317,7 +317,7 @@ while True:
|
||||||
|
|
||||||
msg = f'Found {len(downloaded_videos)} downloaded videos for playlist "{playlist["title"]}" ({playlist["id"]}). {"Ignoring." if args.ignore_downloaded else ""}'
|
msg = f'Found {len(downloaded_videos)} downloaded videos for playlist "{playlist["title"]}" ({playlist["id"]}). {"Ignoring." if args.ignore_downloaded else ""}'
|
||||||
if args.daemon:
|
if args.daemon:
|
||||||
print(msg)
|
logger.info(msg)
|
||||||
else:
|
else:
|
||||||
progress_bar.write(msg)
|
progress_bar.write(msg)
|
||||||
download_archive_logger = setup_file_logger('download_archive', download_archive_file, format_str='%(message)s')
|
download_archive_logger = setup_file_logger('download_archive', download_archive_file, format_str='%(message)s')
|
||||||
|
@ -359,8 +359,8 @@ while True:
|
||||||
for line in result['video_error_logger_msg']:
|
for line in result['video_error_logger_msg']:
|
||||||
file_msg = f"{result['video_id']} - {ansi_escape_regex.sub('', line)}"
|
file_msg = f"{result['video_id']} - {ansi_escape_regex.sub('', line)}"
|
||||||
term_msg = f"{result['video_id']} - {line}"
|
term_msg = f"{result['video_id']} - {line}"
|
||||||
video_error_logger.error(msg)
|
video_error_logger.error(file_msg)
|
||||||
file_logger.error(msg)
|
file_logger.error(file_msg)
|
||||||
encountered_errors += 1
|
encountered_errors += 1
|
||||||
if not args.silence_errors:
|
if not args.silence_errors:
|
||||||
if args.daemon:
|
if args.daemon:
|
||||||
|
|
|
@ -49,7 +49,7 @@ class YDL:
|
||||||
# When downloading a channel youtube-dl returns a playlist for videos and another for shorts.
|
# When downloading a channel youtube-dl returns a playlist for videos and another for shorts.
|
||||||
# We need to combine all the videos into one list
|
# We need to combine all the videos into one list
|
||||||
for item in info['entries']:
|
for item in info['entries']:
|
||||||
if item['_type'] == 'video':
|
if item['_type'] in ('video', 'url'):
|
||||||
entries.append(item)
|
entries.append(item)
|
||||||
elif item['_type'] == 'playlist':
|
elif item['_type'] == 'playlist':
|
||||||
for video in ydl.sanitize_info(ydl.extract_info(item['webpage_url'], download=False))['entries']:
|
for video in ydl.sanitize_info(ydl.extract_info(item['webpage_url'], download=False))['entries']:
|
||||||
|
|
Reference in New Issue