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

FEAT: Enhance DownloadQueue to handle archived items

Browse source
This commit is contained in:
arabcoders 2025-09-03 18:36:08 +03:00
parent 86952200b5
commit 0abaf98b53
1 changed files with 41 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
app/library/DownloadQueue.py
View file

@ -676,11 +676,43 @@ class DownloadQueue(metaclass=Singleton):
item.extras.update({"external_downloader": True}) item.extras.update({"external_downloader": True})
if item.is_archived(): if item.is_archived():
if archive_id := item.get_archive_id():
store_type, _ = self.get_item(archive_id=archive_id)
if not store_type:
dlInfo = Download(
info=ItemDTO(
id=archive_id.split()[1],
title=archive_id,
url=item.url,
preset=item.preset,
folder=item.folder,
status="skip",
cookies=item.cookies,
template=item.template,
msg="URL is already downloaded.",
extras=item.extras,
)
)
if archive_file := dlInfo.info.get_ytdlp_opts().get_all().get("download_archive"):
dlInfo.info.msg += f" Found in archive '{archive_file}'."
self.done.put(dlInfo)
await self._notify.emit(
Events.ITEM_MOVED,
data={"to": "history", "preset": dlInfo.info.preset, "item": dlInfo.info},
title="Download History Update",
message=f"Download history updated with '{item.url}'.",
)
return {"status": "ok"}
message: str = f"The URL '{item.url}' is already downloaded and recorded in archive." message: str = f"The URL '{item.url}' is already downloaded and recorded in archive."
LOG.error(message) LOG.error(message)
await self._notify.emit( await self._notify.emit(
Events.LOG_INFO, data={"preset": item.preset}, title="Already Downloaded", message=message Events.LOG_INFO, data={"preset": item.preset}, title="Already Downloaded", message=message
) )
return {"status": "error", "msg": message} return {"status": "error", "msg": message}
started: float = time.perf_counter() started: float = time.perf_counter()
@ -908,26 +940,24 @@ class DownloadQueue(metaclass=Singleton):
return items return items
def get_item(self, id: str) -> Download | None: def get_item(self, **kwargs) -> tuple[StoreType, Download] | tuple[None, None]:
""" """
Get a specific item from the download queue or history. Get a specific item from the download queue or history.
Args: Args:
id (str): The ID of the item to retrieve. **kwargs: The key-value pair to search for. Supported keys are 'id', 'url'.
Returns: Returns:
Download | None: The requested item if found, otherwise None. (StoreType, Download) | None: The requested item if found, otherwise None.
""" """
try: if item := self.queue.get_item(**kwargs):
return self.queue.get(key=id) return (StoreType.QUEUE, item)
except KeyError:
pass
try: if item := self.done.get_item(**kwargs):
return self.done.get(key=id) return (StoreType.HISTORY, item)
except KeyError:
return None return (None, None)
async def _download_pool(self) -> None: async def _download_pool(self) -> None:
""" """