danvics/ytptube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Do not log the entire extract_info data while in debug mode.

Browse source
This commit is contained in:
ArabCoders 2024-03-04 16:12:51 +03:00
parent fb2d8fb442
commit 3ca1c981d2
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/DownloadQueue.py
View file

@ -257,7 +257,7 @@ class DownloadQueue:
if self.isDownloaded(entry): if self.isDownloaded(entry):
raise yt_dlp.utils.ExistingVideoReached() raise yt_dlp.utils.ExistingVideoReached()
LOG.debug(f'entry: extract info says: {entry}') LOG.debug(f'extract_info length: {len(entry)}')
except yt_dlp.utils.ExistingVideoReached: except yt_dlp.utils.ExistingVideoReached:
return {'status': 'error', 'msg': 'Video has been downloaded already and recorded in archive.log file.'} return {'status': 'error', 'msg': 'Video has been downloaded already and recorded in archive.log file.'}
except yt_dlp.utils.YoutubeDLError as exc: except yt_dlp.utils.YoutubeDLError as exc:
@ -345,13 +345,13 @@ class DownloadQueue:
break break
if time.time() - lastLog > 120: if time.time() - lastLog > 120:
lastLog = time.time() lastLog = time.time()
LOG.info(f'Waiting for workers to be free.') LOG.info(f'Waiting for worker to be free.')
await asyncio.sleep(1) await asyncio.sleep(1)
LOG.debug(f"Has '{executor.get_available_workers()}' free workers.") LOG.debug(f"Has '{executor.get_available_workers()}' free workers.")
while not self.queue.hasDownloads(): while not self.queue.hasDownloads():
LOG.info(f'Waiting for item to download.') LOG.info('Waiting for item to download.')
await self.event.wait() await self.event.wait()
self.event.clear() self.event.clear()
LOG.debug(f"Cleared wait event.") LOG.debug(f"Cleared wait event.")
@ -359,6 +359,9 @@ class DownloadQueue:
entry = self.queue.getNextDownload() entry = self.queue.getNextDownload()
await asyncio.sleep(0.2) await asyncio.sleep(0.2)
if entry is None:
continue
LOG.debug(f"Pushing {entry=} to executor.") LOG.debug(f"Pushing {entry=} to executor.")
if entry.started() is False and entry.is_canceled() is False: if entry.started() is False and entry.is_canceled() is False:
@ -404,5 +407,7 @@ class DownloadQueue:
self.done.put(value=entry) self.done.put(value=entry)
await self.notifier.completed(entry.info) await self.notifier.completed(entry.info)
self.event.set()
def isDownloaded(self, info: dict) -> bool: def isDownloaded(self, info: dict) -> bool:
return self.config.keep_archive and isDownloaded(self.config.ytdl_options.get('download_archive', None), info) return self.config.keep_archive and isDownloaded(self.config.ytdl_options.get('download_archive', None), info)