ipodsync 0.1.8__tar.gz → 0.1.10__tar.gz

{ipodsync-0.1.8 → ipodsync-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipodsync
-Version: 0.1.8
+Version: 0.1.10
 Summary: Upload music to an iPod nano 6G/7G without iTunes: SQLite library, hashAB signing, cover art (pure-Python).
 Project-URL: Homepage, https://github.com/buldiei/ipodsync
 Project-URL: Repository, https://github.com/buldiei/ipodsync
@@ -97,9 +97,11 @@ ipodsync add "Song.mp3"             # + cover auto
 ipodsync add a.mp3 b.mp3 c.mp3      # several at once (one library write)
 ipodsync add -f ~/Music/album       # a whole folder (recursively)
 ipodsync add "Song.mp3" --no-cover
-ipodsync export ~/Music/ipod --by-album
+ipodsync export ~/Music/ipod --by-album          # download everything, in Artist/Album/ folders
+ipodsync export ~/Music/ipod --album "Breakdown" # download one album (or --artist NAME / --pid PID)
 ipodsync cover 123456789 --image cover.jpg
-ipodsync rm 123456789 --delete-file
+ipodsync rm 123456789               # removes the track and its audio file
+ipodsync rm 123456789 --keep-file   # …but leave the audio file on the iPod
 ipodsync -b add "Song.mp3"          # -b: back up the library first (off by default)
 ```
 

{ipodsync-0.1.8 → ipodsync-0.1.10}/README.md

@@ -65,9 +65,11 @@ ipodsync add "Song.mp3"             # + cover auto
 ipodsync add a.mp3 b.mp3 c.mp3      # several at once (one library write)
 ipodsync add -f ~/Music/album       # a whole folder (recursively)
 ipodsync add "Song.mp3" --no-cover
-ipodsync export ~/Music/ipod --by-album
+ipodsync export ~/Music/ipod --by-album          # download everything, in Artist/Album/ folders
+ipodsync export ~/Music/ipod --album "Breakdown" # download one album (or --artist NAME / --pid PID)
 ipodsync cover 123456789 --image cover.jpg
-ipodsync rm 123456789 --delete-file
+ipodsync rm 123456789               # removes the track and its audio file
+ipodsync rm 123456789 --keep-file   # …but leave the audio file on the iPod
 ipodsync -b add "Song.mp3"          # -b: back up the library first (off by default)
 ```
 

{ipodsync-0.1.8 → ipodsync-0.1.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ipodsync"
-version = "0.1.8"
+version = "0.1.10"
 description = "Upload music to an iPod nano 6G/7G without iTunes: SQLite library, hashAB signing, cover art (pure-Python)."
 readme = "README.md"
 requires-python = ">=3.9"

{ipodsync-0.1.8 → ipodsync-0.1.10}/src/ipodsync/__init__.py

@@ -13,7 +13,7 @@ from .library import ItlpLibrary
 from .models import Track
 from .transport import IPod, IPodNotFound, find_ipod
 
-__version__ = "0.1.8"
+__version__ = "0.1.10"
 
 __all__ = [
     "find_ipod",

{ipodsync-0.1.8 → ipodsync-0.1.10}/src/ipodsync/cli.py

@@ -2,9 +2,9 @@
 
     ipodsync list                     # show tracks
     ipodsync export DEST [--by-album] [--no-tag]   # download everything from the iPod
-    ipodsync export DEST --pid PID     # download a single track
+    ipodsync export DEST --album NAME  # download one album (--artist / --pid also filter)
     ipodsync add FILE [--no-cover]     # upload a track (+cover auto)
-    ipodsync rm PID [--delete-file]    # remove a track (+resign)
+    ipodsync rm PID [--keep-file]      # remove a track + its file (+resign)
     ipodsync cover PID [--image IMG]   # attach a cover to a track
 
 Export is read-only. add/rm/cover write to the database; pass -b to back the library
@@ -54,6 +54,17 @@ def cmd_export(ipod, args):
     tracks = lib.list_tracks()
     if args.pid is not None:
         tracks = [t for t in tracks if t["pid"] == args.pid]
+    if args.album:
+        q = args.album.casefold()
+        tracks = [t for t in tracks if q in (t["album"] or "").casefold()]
+    if args.artist:
+        q = args.artist.casefold()
+        tracks = [t for t in tracks if q in (t["artist"] or "").casefold()]
+    if not tracks:
+        filt = ", ".join(f"{k}={v!r}" for k, v in
+                         (("pid", args.pid), ("album", args.album), ("artist", args.artist)) if v)
+        print(f"⚠️  no tracks match ({filt or 'empty library'}). Try `ipodsync list`.")
+        lib.close(); return
     dest = Path(args.dest)
     layout = "artist_album" if args.by_album else "flat"
     ok = 0
@@ -79,9 +90,12 @@ def cmd_rm(ipod, args):
     if args.backup:
         _backup_artwork(ipod, stamp)
 
+    if args.delete_file:  # deprecated: deleting the file is the default now
+        print("  note: --delete-file is now the default; drop it, or use --keep-file to keep the file.")
+
     guid = read_firewire_guid(ipod.sysinfo_extended, ipod.sysinfo, mount=ipod.root)
     lib = ItlpLibrary(itlp)
-    music = ipod.music_dir if args.delete_file else None
+    music = None if args.keep_file else ipod.music_dir   # delete the file unless --keep-file
     lib.remove_track(args.pid, music_dir=music)
     lib.resign(guid)
     live = {t["pid"] for t in lib.list_tracks()}   # remaining tracks, after removal
@@ -90,8 +104,8 @@ def cmd_rm(ipod, args):
     # drop the removed track's thumbnails from ArtworkDB + repack the .ithmb files
     stats = compact(ipod.control / "Artwork", live)
 
-    print(f"✓ Removed track pid {args.pid}"
-          f"{' (+ deleted the file)' if args.delete_file else ''}. Eject the iPod.")
+    tail = " (kept the audio file)" if args.keep_file else " (+ deleted the file)"
+    print(f"✓ Removed track pid {args.pid}{tail}. Eject the iPod.")
     if stats["removed"]:
         print(f"  Reclaimed cover art for {stats['removed']} track"
               f"{'s' if stats['removed'] != 1 else ''}.")
@@ -330,12 +344,17 @@ def main() -> int:
     pe = sub.add_parser("export", help="download tracks from the iPod (read-only)")
     pe.add_argument("dest", help="destination directory")
     pe.add_argument("--pid", type=int, help="export only this track (by pid)")
+    pe.add_argument("--album", help="only tracks whose album contains this (case-insensitive)")
+    pe.add_argument("--artist", help="only tracks whose artist contains this (case-insensitive)")
     pe.add_argument("--by-album", action="store_true", help="lay out as Artist/Album/")
     pe.add_argument("--no-tag", action="store_true", help="don't write ID3/MP4 tags")
 
     pr = sub.add_parser("rm", help="remove a track from the iPod")
     pr.add_argument("pid", type=int, help="track pid (see `list`)")
-    pr.add_argument("--delete-file", action="store_true", help="also delete the audio file")
+    pr.add_argument("--keep-file", action="store_true",
+                    help="keep the audio file on the iPod (default: delete it too)")
+    pr.add_argument("--delete-file", action="store_true",
+                    help=argparse.SUPPRESS)  # deprecated: deletion is the default now
 
     pa = sub.add_parser("add", help="upload a track (or a whole folder); cover attached automatically")
     pa.add_argument("file", nargs="*", help="path(s) to the audio file(s) to upload")