Merge branch 'main' into main-2

votify/__init__.py

@@ -1 +1 @@
-__version__ = "1.3"
+__version__ = "1.3.2"

votify/cli.py

@@ -364,7 +364,7 @@ def main(
             continue
         for index, download_queue_item in enumerate(download_queue, start=1):
             queue_progress = (
-                f"Track {index}/{len(download_queue)}" f" from URL {url}/{len(urls)}"
+                f"Track {index}/{len(download_queue)} from URL {url_index}/{len(urls)}"
             )
             media_metadata = download_queue_item.media_metadata
             try:

votify/downloader_episode.py

@@ -117,7 +117,6 @@ class DownloaderEpisode:
         decrypted_path = None
         if final_path.exists() and not self.downloader.overwrite:
             logger.warning(f'Track already exists at "{final_path}", skipping')
-            return
         else:
             if not decryption_key:
                 logger.debug("Getting decryption key")
@@ -138,11 +137,9 @@ class DownloaderEpisode:
             and not self.downloader.overwrite
         ):
             logger.debug(f'Cover already exists at "{cover_path}", skipping')
-            return
         elif self.downloader.save_cover and cover_url is not None:
             logger.debug(f'Saving cover to "{cover_path}"')
             self.downloader.save_cover_file(cover_path, cover_url)
-            return
         if decrypted_path:
             logger.debug("Applying tags")
             self.downloader.apply_tags(decrypted_path, tags, cover_url)

votify/downloader_song.py

@@ -237,7 +237,6 @@ class DownloaderSong:
         elif self.downloader.save_cover and cover_url is not None:
             logger.debug(f'Saving cover to "{cover_path}"')
             self.downloader.save_cover_file(cover_path, cover_url)
-            return
         if decrypted_path:
             logger.debug("Applying tags")
             self.downloader.apply_tags(decrypted_path, tags, cover_url)