From 4e3d62c8795f54257c9cbf2cd1cf00a563aaaf74 Mon Sep 17 00:00:00 2001 From: Cyberes Date: Mon, 6 Feb 2023 23:20:28 -0700 Subject: [PATCH] fix some more bugs --- downloader.py | 6 +++--- ydl/yt_dlp.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/downloader.py b/downloader.py index 3016054..27e0930 100755 --- a/downloader.py +++ b/downloader.py @@ -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 ""}' if args.daemon: - print(msg) + logger.info(msg) else: progress_bar.write(msg) 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']: file_msg = f"{result['video_id']} - {ansi_escape_regex.sub('', line)}" term_msg = f"{result['video_id']} - {line}" - video_error_logger.error(msg) - file_logger.error(msg) + video_error_logger.error(file_msg) + file_logger.error(file_msg) encountered_errors += 1 if not args.silence_errors: if args.daemon: diff --git a/ydl/yt_dlp.py b/ydl/yt_dlp.py index 0353c54..3d3ea45 100644 --- a/ydl/yt_dlp.py +++ b/ydl/yt_dlp.py @@ -49,7 +49,7 @@ class YDL: # 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 for item in info['entries']: - if item['_type'] == 'video': + if item['_type'] in ('video', 'url'): entries.append(item) elif item['_type'] == 'playlist': for video in ydl.sanitize_info(ydl.extract_info(item['webpage_url'], download=False))['entries']: