Sync Update: Simplified Removal Process (#438)

* Simplified Removal Process * v2.7.4 * - Fix removing lossless tracks - Print removed files * Fix typo --------- Co-authored-by: HunkyBurrito3 <[email protected]> Co-authored-by: 7x11x13 <[email protected]>
scdl-org · Apr 28, 2024 · a95b8d6 · a95b8d6
1 parent e8a0f92
commit a95b8d6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/scdl/__init__.py b/scdl/__init__.py
@@ -1,3 +1,3 @@
 # -*- encoding: utf-8 -*-
 """Python Soundcloud Music Downloader."""
-__version__ = "v2.7.5"
+__version__ = "v2.7.6"
diff --git a/scdl/scdl.py b/scdl/scdl.py
@@ -389,11 +389,12 @@ def remove_files():
     """
     Removes any pre-existing tracks that were not just downloaded
     """
-    logger.info("Removing local track files that were not downloaded...")
+    logger.info("Removing local track files...")
     files = [f for f in os.listdir(".") if os.path.isfile(f)]
     for f in files:
         if f not in fileToKeep:
             os.remove(f)
+            logger.info(f'Removed {f}')
 
 def sync(client: SoundCloud, playlist: BasicAlbumPlaylist, playlist_info, **kwargs):
     """
@@ -416,19 +417,22 @@ def sync(client: SoundCloud, playlist: BasicAlbumPlaylist, playlist_info, **kwar
     new = [track.id for track in playlist.tracks]
     add = set(new).difference(old) # find tracks to download
     rem = set(old).difference(new) # find tracks to remove
+    for track_id in new:
+        if (
+            client.get_track(track_id).downloadable
+            and not kwargs["onlymp3"]
+            and not kwargs.get("no_original")
+        ):
+            fileToKeep.append(get_original_filename(client, client.get_track(track_id), playlist_info, **kwargs))
+        else:
+            fileToKeep.append(get_filename(client.get_track(track_id), playlist_info=playlist_info, **kwargs))
 
     if not (add or rem):
         logger.info("No changes found. Exiting...")
         sys.exit(0)
 
     if rem:
-        for track_id in rem:
-            filename = get_filename(client.get_track(track_id),playlist_info=playlist_info,**kwargs)
-            if filename in os.listdir('.'):
-                os.remove(filename)
-                logger.info(f'Removed {filename}')
-            else:
-                logger.info(f'Could not find {filename} to remove')
+        remove_files()
         with open(archive,'w') as f:
           for track_id in old:
             if track_id not in rem:
@@ -527,10 +531,7 @@ def get_filename(track: BasicTrack, original_filename=None, aac=False, playlist_
     filename = sanitize_filename(filename)
     return filename
 
-
-def download_original_file(client: SoundCloud, track: BasicTrack, title: str, playlist_info=None, **kwargs):
-    logger.info("Downloading the original file.")
-
+def get_original_filename(client: SoundCloud, track: BasicTrack, playlist_info=None, **kwargs):
     # Get the requests stream
     url = client.get_track_original_download(track.id, track.secret_token)
 
@@ -567,7 +568,12 @@ def download_original_file(client: SoundCloud, track: BasicTrack, title: str, pl
         filename += ext
 
         filename = get_filename(track, filename, playlist_info=playlist_info, **kwargs)
+        return filename
+
+def download_original_file(client: SoundCloud, track: BasicTrack, title: str, playlist_info=None, **kwargs):
+    logger.info("Downloading the original file.")
 
+    filename = get_original_filename(client, track, playlist_info, **kwargs)
     logger.debug(f"filename : {filename}")
 
     # Skip if file ID or filename already exists