X-Git-Url: https://code.delx.au/notipod/blobdiff_plain/9b9d4091c893e58ee0f3a39b243fac098f11a4d6..2a63113c140f7b0d41c5980fab90af8510129d34:/syncitunes.py

diff --git a/syncitunes.py b/syncitunes.py
index 1de4fae..32ed08c 100755
--- a/syncitunes.py
+++ b/syncitunes.py
@@ -30,7 +30,7 @@ def parse_options():
 	if len(args) < 2:
 		parser.print_usage()
 		sys.exit(1)
-	opts.dest = args[0]
+	opts.dest = args[0].decode("utf-8")
 	opts.playlists = args[1:]
 
 	return opts
@@ -52,11 +52,10 @@ def main():
 		sys.exit(1)
 
 	logging.info("Loading library")
-	library = libsyncitunes.ITunesLibrary.alloc()
-	if opts.itunes_library:
-		library = library.initWithFilename_(opts.itunes_library)
-	else:
-		library = library.init()
+	library = libsyncitunes.ITunesLibrary.alloc().init()
+	gen = library.load_(opts.itunes_library)
+	for msg in gen:
+		logging.debug(msg)
 
 	for playlist in opts.playlists:
 		if not library.has_playlist_name(playlist):
@@ -68,11 +67,13 @@ def main():
 	for playlist in opts.playlists:
 		tracks = library.get_playlist_name(playlist).tracks
 		all_tracks.extend(tracks)
-		libsyncitunes.export_m3u(opts.dry_run, opts.dest, opts.path_prefix,
-				playlist, tracks)
+		libsyncitunes.export_m3u(opts.dry_run, opts.dest,
+			opts.path_prefix, playlist, tracks)
 
 	logging.info("Synchronising")
-	libsyncitunes.sync(opts.dry_run, library.folder, opts.dest, all_tracks)
+	gen = libsyncitunes.sync(opts.dry_run, library.folder, opts.dest, all_tracks)
+	for msg in gen:
+		logging.debug(msg)
 
 
 if __name__ == "__main__":