This commit is contained in:
parent
6aa5656a6f
commit
979582fdc3
|
@ -72,7 +72,7 @@ create_directories(args.output, log_dir)
|
|||
|
||||
file_logger = setup_file_logger('youtube_dl', log_dir / f'youtube_dl-{str(int(log_time))}.log', level=logging.INFO)
|
||||
video_error_logger = setup_file_logger('youtube_dl_video_errors', log_dir / f'youtube_dl-errors-{int(log_time)}.log', level=logging.INFO)
|
||||
logger = get_silent_logger('yt-dl', silent=not args.daemon)
|
||||
logger = get_silent_logger('yt-dl', silent=args.daemon)
|
||||
|
||||
|
||||
def log_info_twice(msg):
|
||||
|
@ -97,7 +97,7 @@ print('Found', len(downloaded_videos), 'downloaded videos.')
|
|||
# Create this object AFTER reading in the download_archive.
|
||||
download_archive_logger = setup_file_logger('download_archive', download_archive_file, format_str='%(message)s')
|
||||
|
||||
status_bar = tqdm(position=2, bar_format='{desc}', disable=not args.daemon)
|
||||
status_bar = tqdm(position=2, bar_format='{desc}', disable=args.daemon)
|
||||
|
||||
|
||||
def log_bar(msg, level):
|
||||
|
@ -167,7 +167,7 @@ thread_opts = dict(ydl_opts, **{'logger': ydl.ytdl_no_logger()})
|
|||
yt_dlp = ydl.YDL(main_opts)
|
||||
|
||||
# Init bars
|
||||
playlist_bar = tqdm(position=1, desc='Playlist', disable=not args.daemon)
|
||||
playlist_bar = tqdm(position=1, desc='Playlist', disable=args.daemon)
|
||||
video_bars = manager.list()
|
||||
if args.daemon:
|
||||
for i in range(args.threads):
|
||||
|
@ -176,7 +176,7 @@ if args.daemon:
|
|||
manager.Lock()
|
||||
])
|
||||
|
||||
for i, target_url in tqdm(enumerate(url_list), total=len(url_list), position=0, desc='Inputs', disable=not args.daemon):
|
||||
for i, target_url in tqdm(enumerate(url_list), total=len(url_list), position=0, desc='Inputs', disable=args.daemon):
|
||||
logger.info('Fetching playlist...')
|
||||
playlist = yt_dlp.playlist_contents(target_url)
|
||||
download_queue = playlist['entries']
|
||||
|
@ -189,7 +189,7 @@ for i, target_url in tqdm(enumerate(url_list), total=len(url_list), position=0,
|
|||
# Remove already downloaded files from the to-do list.
|
||||
for p, video in enumerate(download_queue):
|
||||
if video['id'] in downloaded_videos:
|
||||
del playlist[p]
|
||||
del download_queue[p]
|
||||
playlist_bar.update(len(download_queue))
|
||||
|
||||
if len(download_queue): # Don't mess with multiprocessing if all videos are already downloaded
|
||||
|
|
Reference in New Issue