Fixed playlist

[notipod] / libsyncitunes.py

diff --git a/libsyncitunes.py b/libsyncitunes.py
index c8d330ccd3c5a6af4ffae0e1cb60b0cbc53cc07b..80f6a0d02ab65695b2410af833b9a24293313c57 100644 (file)
--- a/libsyncitunes.py
+++ b/libsyncitunes.py
@@ -133,19 +133,6 @@ def encode_filename(filename):
        encoded_names[orig_filename] = filename
        return filename
 
-def export_m3u(dry_run, dest, path_prefix, playlist_name, files):
-       if dry_run:
-               return
-       playlist_file = os.path.join(dest, playlist_name) + ".m3u"
-       logging.info("Writing: " + playlist_file)
-       f = open(playlist_file, "w")
-       for filename in files:
-               if path_prefix.find("\\") > 0:
-                       filename = filename.replace("/", "\\")
-               filename = encode_filename(filename)
-               f.write("%s%s\n" % (path_prefix, filename))
-       f.close()
-
 def strip_prefix(s, prefix):
        assert s.startswith(prefix)
        s = s[len(prefix):]
@@ -166,16 +153,37 @@ def mkdirhier(path):
                except OSError:
                        pass
 
-def sync(dry_run, source, dest, files):
+def export_m3u(dry_run, dest, path_prefix, playlist_name, files):
+       if dry_run:
+               return
+       if not path_prefix:
+               path_prefix = "../"
+       playlist_file = os.path.join(dest, "-Playlists-", playlist_name) + ".m3u"
+       mkdirhier(os.path.dirname(playlist_file))
+       logging.info("Writing: " + playlist_file)
+       f = open(playlist_file, "w")
+       for filename in files:
+               if path_prefix.find("\\") > 0:
+                       filename = filename.replace("/", "\\")
+               filename = encode_filename(filename)
+               f.write("%s%s\n" % (path_prefix, filename))
+       f.close()
+
+def sync(dry_run, source, dest, files_to_copy):
        join = os.path.join
 
        logging.info("Calculating files to sync and deleting old files")
        source = source.encode("utf-8")
        dest = dest.encode("utf-8")
        filemap = {}
-       for f in files:
-               filemap[encode_filename(f)] = f.encode("utf-8")
-       files = set(filemap.keys())
+       class SyncFile(object): pass
+       for f in files_to_copy:
+               sf = SyncFile()
+               sf.orig_filename = f.encode("utf-8")
+               sf.encoded_filename = encode_filename(f)
+               filemap[sf.encoded_filename.lower()] = sf
+       files_to_copy = set(filemap)
+
        for dirpath, dirnames, filenames in os.walk(dest):
                full_dirpath = dirpath
                dirpath = strip_prefix(dirpath, dest)
@@ -187,18 +195,19 @@ def sync(dry_run, source, dest, files):
                        if not os.path.exists(join(dest, filename)):
                                continue
 
-                       if filename in files:
-                               sourcestat = os.stat(join(source, filemap[filename]))
+                       if filename.lower() in files_to_copy:
+                               source_filename = filemap[filename.lower()].orig_filename
+                               sourcestat = os.stat(join(source, source_filename))
                                deststat = os.stat(join(dest, filename))
                                same_time = abs(sourcestat.st_mtime - deststat.st_mtime) < 5
                                same_size = sourcestat.st_size == deststat.st_size
                                if same_time and same_size:
-                                       files.remove(filename)
+                                       files_to_copy.remove(filename.lower())
                                        yield "Keep: " + filename
                                else:
                                        yield "Update: " + filename
 
-                       elif not filename.endswith(".m3u"):
+                       elif not filename.startswith("-Playlists-"):
                                yield "Delete: " + filename
                                if not dry_run:
                                        os.unlink(join(dest, filename))
@@ -210,12 +219,15 @@ def sync(dry_run, source, dest, files):
 
 
        logging.info("Copying new files")
-       files = list(files)
-       files.sort()
-       for filename in files:
-               yield "Copy: " + filename
+       files_to_copy = list(files_to_copy)
+       files_to_copy.sort()
+       for filename in files_to_copy:
+               yield "Copy: " + filemap[filename].orig_filename
                if not dry_run:
                        mkdirhier(os.path.dirname(join(dest, filename)))
-                       shutil.copy2(join(source, filemap[filename]), join(dest, filename))
+                       shutil.copy2(
+                               join(source, filemap[filename].orig_filename),
+                               join(dest, filemap[filename].encoded_filename)
+                       )