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

Refactor download object creation and retry handling

Browse source 
Refactor download creation and retry logic for better clarity and maintainability.
This commit is contained in:
Shiva Sai K 2026-01-04 19:53:07 +05:30 committed by GitHub
parent 0acffbf190
commit 5f67aa8a2f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
app/ytdl.py
View file

@ -320,7 +320,8 @@ class DownloadQueue:
async with self.seq_lock: async with self.seq_lock:
log.info("Starting sequential download.") log.info("Starting sequential download.")
await download.start(self.notifier) await download.start(self.notifier)
self._post_download_cleanup(download) # lock released here
self._post_download_cleanup(download)
elif self.config.DOWNLOAD_MODE == 'limited' and self.semaphore is not None: elif self.config.DOWNLOAD_MODE == 'limited' and self.semaphore is not None:
await self.__limited_concurrent_download(download) await self.__limited_concurrent_download(download)
else: else:
@ -368,25 +369,15 @@ class DownloadQueue:
download.info.percent = None download.info.percent = None
download.info.speed = None download.info.speed = None
download.info.eta = None download.info.eta = None
asyncio.create_task(self.notifier.updated(download.info)) # Create a new download with the same info via helper
# Create a new download with the same info new_download, err = self._create_download_object(download.info)
dldirectory, _ = self.__calc_download_path(download.info.quality, download.info.format, download.info.folder) if err is not None:
output = self.config.OUTPUT_TEMPLATE if len(download.info.custom_name_prefix) == 0 else f'{download.info.custom_name_prefix}.{self.config.OUTPUT_TEMPLATE}' log.error(f"Retry failed: cannot create download object: {err}")
output_chapter = self.config.OUTPUT_TEMPLATE_CHAPTER if not download.info.split_by_chapters else download.info.chapter_template self.done.put(download)
entry = getattr(download.info, 'entry', None) asyncio.create_task(self.notifier.completed(download.info))
if entry is not None and 'playlist' in entry and entry['playlist'] is not None: else:
if len(self.config.OUTPUT_TEMPLATE_PLAYLIST): self.queue.put(new_download)
output = self.config.OUTPUT_TEMPLATE_PLAYLIST asyncio.create_task(self.__start_download(new_download))
for property, value in entry.items():
if property.startswith("playlist"):
output = output.replace(f"%({property})s", str(value))
ytdl_options = dict(self.config.YTDL_OPTIONS)
playlist_item_limit = getattr(download.info, 'playlist_item_limit', 0)
if playlist_item_limit > 0:
ytdl_options['playlistend'] = playlist_item_limit
new_download = Download(dldirectory, self.config.TEMP_DIR, output, output_chapter, download.info.quality, download.info.format, ytdl_options, download.info)
self.queue.put(new_download)
asyncio.create_task(self.__start_download(new_download))
else: else:
# No more retries, mark as completed (failed) # No more retries, mark as completed (failed)
self.done.put(download) self.done.put(download)
@ -423,13 +414,17 @@ class DownloadQueue:
dldirectory = base_directory dldirectory = base_directory
return dldirectory, None return dldirectory, None
async def __add_download(self, dl, auto_start): def _create_download_object(self, info):
dldirectory, error_message = self.__calc_download_path(dl.quality, dl.format, dl.folder) """Create a Download object from a DownloadInfo-like object.
Returns (download, error_message). On success error_message is None.
"""
dldirectory, error_message = self.__calc_download_path(info.quality, info.format, info.folder)
if error_message is not None: if error_message is not None:
return error_message return None, error_message
output = self.config.OUTPUT_TEMPLATE if len(dl.custom_name_prefix) == 0 else f'{dl.custom_name_prefix}.{self.config.OUTPUT_TEMPLATE}' output = self.config.OUTPUT_TEMPLATE if len(info.custom_name_prefix) == 0 else f'{info.custom_name_prefix}.{self.config.OUTPUT_TEMPLATE}'
output_chapter = self.config.OUTPUT_TEMPLATE_CHAPTER output_chapter = self.config.OUTPUT_TEMPLATE_CHAPTER if not info.split_by_chapters else info.chapter_template
entry = getattr(dl, 'entry', None) entry = getattr(info, 'entry', None)
if entry is not None and 'playlist' in entry and entry['playlist'] is not None: if entry is not None and 'playlist' in entry and entry['playlist'] is not None:
if len(self.config.OUTPUT_TEMPLATE_PLAYLIST): if len(self.config.OUTPUT_TEMPLATE_PLAYLIST):
output = self.config.OUTPUT_TEMPLATE_PLAYLIST output = self.config.OUTPUT_TEMPLATE_PLAYLIST
@ -437,11 +432,16 @@ class DownloadQueue:
if property.startswith("playlist"): if property.startswith("playlist"):
output = output.replace(f"%({property})s", str(value)) output = output.replace(f"%({property})s", str(value))
ytdl_options = dict(self.config.YTDL_OPTIONS) ytdl_options = dict(self.config.YTDL_OPTIONS)
playlist_item_limit = getattr(dl, 'playlist_item_limit', 0) playlist_item_limit = getattr(info, 'playlist_item_limit', 0)
if playlist_item_limit > 0: if playlist_item_limit > 0:
log.info(f'playlist limit is set. Processing only first {playlist_item_limit} entries')
ytdl_options['playlistend'] = playlist_item_limit ytdl_options['playlistend'] = playlist_item_limit
download = Download(dldirectory, self.config.TEMP_DIR, output, output_chapter, dl.quality, dl.format, ytdl_options, dl) download = Download(dldirectory, self.config.TEMP_DIR, output, output_chapter, info.quality, info.format, ytdl_options, info)
return download, None
async def __add_download(self, dl, auto_start):
download, error_message = self._create_download_object(dl)
if error_message is not None:
return error_message
if auto_start is True: if auto_start is True:
self.queue.put(download) self.queue.put(download)
asyncio.create_task(self.__start_download(download)) asyncio.create_task(self.__start_download(download))