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

updating downloadQueue log messages.

Browse source
This commit is contained in:
ArabCoders 2024-03-07 17:47:22 +03:00
parent 31e6ed87e4
commit 1b07a421e6
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/DownloadQueue.py
View file

@ -211,11 +211,13 @@ class DownloadQueue:
LOG.info(f'Adding {url=} {quality=} {format=} {folder=} {output_template=} {ytdlp_cookies=} {ytdlp_config=}') LOG.info(f'Adding {url=} {quality=} {format=} {folder=} {output_template=} {ytdlp_cookies=} {ytdlp_config=}')
already = set() if already is None else already already = set() if already is None else already
if url in already: if url in already:
LOG.info('recursion detected, skipping') LOG.info('recursion detected, skipping.')
return {'status': 'ok'} return {'status': 'ok'}
else:
already.add(url) already.add(url)
try: try:
LOG.debug(f'extracting info from {url=}') LOG.debug(f'extracting info from {url=}')
entry = await asyncio.wait_for( entry = await asyncio.wait_for(
@ -289,31 +291,37 @@ class DownloadQueue:
LOG.warning(f'Requested cancel for non-existent download {id=}. {str(e)}') LOG.warning(f'Requested cancel for non-existent download {id=}. {str(e)}')
continue continue
itemMessage = f"{id=} {item.info.id=} {item.info.title=}"
if item.started() is True: if item.started() is True:
LOG.info(f'Canceling {id=} {item.info.title=}') LOG.debug(f'Canceling {itemMessage}')
item.cancel() item.cancel()
LOG.info(f'Cancelled {itemMessage}')
else: else:
item.close() item.close()
LOG.info(f'Deleting from queue {id=} {item.info.title=}') LOG.debug(f'Deleting from queue {itemMessage}')
self.queue.delete(id) self.queue.delete(id)
await self.notifier.canceled(id) await self.notifier.canceled(id)
self.done.put(item) self.done.put(item)
await self.notifier.completed(item) await self.notifier.completed(item)
LOG.info(f'Deleted from queue {itemMessage}')
return {'status': 'ok'} return {'status': 'ok'}
async def clear(self, ids): async def clear(self, ids):
for id in ids: for id in ids:
try: try:
item = self.done.get(key=id) item = self.done.get(key=id)
except KeyError as e: except KeyError as e:
LOG.warning(f'Requested delete for non-existent download {id=}. {str(e)}') LOG.warning(f'Requested delete for non-existent download {id=}. {str(e)}')
continue continue
LOG.info(f'Deleting completed download {id=} {item.info.title=}') itemMessage = f"{id=} {item.info.id=} {item.info.title=}"
LOG.debug(f'Deleting completed download {itemMessage}')
self.done.delete(id) self.done.delete(id)
await self.notifier.cleared(id) await self.notifier.cleared(id)
LOG.info(f'Deleted completed download {itemMessage}')
return {'status': 'ok'} return {'status': 'ok'}