X-Git-Url: https://code.delx.au/notipod/blobdiff_plain/0a7016b7baca033b5fc78fd7dba085e9e38da628..940330ce5a487a919446ee62f920646c2e38fee5:/notipod_cli.py

diff --git a/notipod_cli.py b/notipod_cli.py
index 3d61c2c..72d2936 100755
--- a/notipod_cli.py
+++ b/notipod_cli.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-VERSION = "1.3"
+VERSION = "1.12"
 
 import logging
 import optparse
@@ -11,7 +11,7 @@ import libnotipod
 
 
 def parse_options():
-	parser = optparse.OptionParser(version="%prog " + VERSION, 
+	parser = optparse.OptionParser(version="%prog " + VERSION,
 		description = "Synchronise an iTunes playlist with a directory",
 		usage = "%prog destination playlist [playlist ...]"
 	)
@@ -62,16 +62,25 @@ def main():
 			logging.fatal("Could not find playlist: " + playlist)
 			sys.exit(1)
 
+	logging.info("Deleting playlists")
+	libnotipod.delete_playlists(opts.dry_run, opts.dest)
+
 	logging.info("Loading playlists")
-	all_tracks = []
+	all_filenames = []
 	for playlist in opts.playlists:
 		tracks = library.get_playlist_name(playlist).tracks
-		all_tracks.extend(tracks)
-		libnotipod.export_m3u(opts.dry_run, opts.dest,
-			opts.path_prefix, playlist, tracks)
+		filenames = [library.get_track_filename(trackID) for trackID in tracks]
+		all_filenames.extend(filenames)
+		libnotipod.export_m3u(
+			opts.dry_run,
+			opts.dest,
+			opts.path_prefix,
+			playlist,
+			filenames
+		)
 
 	logging.info("Synchronising")
-	gen = libnotipod.sync(opts.dry_run, library.folder, opts.dest, all_tracks)
+	gen = libnotipod.sync(opts.dry_run, library.folder, opts.dest, all_filenames)
 	for msg in gen:
 		logging.debug(msg)