Bumped revision number

[notipod] / libnotipod.py

diff --git a/libnotipod.py b/libnotipod.py
index 80f6a0d02ab65695b2410af833b9a24293313c57..caf3b72bd208760eeb7b2c60fa4e00be913843f5 100644 (file)
--- a/libnotipod.py
+++ b/libnotipod.py
@@ -27,9 +27,10 @@ class Playlist(NSObject):
        def init(self):
                return self
 
-       def set(self, name, pid, tracks, parent):
+       def set(self, name, pid, ptype, tracks, parent):
                self.name = name
                self.pid = pid
+               self.ptype = ptype
                self.children = []
                self.tracks = tracks
                self.parent = parent
@@ -45,22 +46,51 @@ class ITunesLibrary(NSObject):
                plist = read_plist(os.path.expanduser(filename))
                self.folder = self.loc2name(plist["Music Folder"])
                pl_tracks = plist["Tracks"]
-               self.playlists = {}
+               pl_lookup = {}
+               self.playlists = []
                for pl_playlist in plist["Playlists"]:
-                       playlist = self.make_playlist(pl_playlist, pl_tracks)
+                       playlist = self.make_playlist(pl_playlist, pl_tracks, pl_lookup)
+                       if not playlist:
+                               continue
                        yield "Read playlist: " + playlist.name
-                       self.playlists[playlist.pid] = playlist
+                       self.playlists.append(playlist)
+                       pl_lookup[playlist.pid] = playlist
 
        def loc2name(self, location):
                return urllib.splithost(urllib.splittype(urllib.unquote(location))[1])[1]
-       
-       def make_playlist(self, pl_playlist, pl_tracks):
+
+       def make_playlist(self, pl_playlist, pl_tracks, pl_lookup):
+               if int(pl_playlist.get("Master", 0)):
+                       return
+               kind = int(pl_playlist.get("Distinguished Kind", -1))
+               if kind == 26:
+                       # Don't do genius
+                       return
+
                name = pl_playlist["Name"]
                pid = pl_playlist["Playlist Persistent ID"]
+               if kind > 0:
+                       ptype = {
+                               2: "movies",
+                               3: "tv-shows",
+                               4: "music",
+                               5: "books",
+                               10: "podcasts",
+                               19: "purchased",
+                               22: "itunes-dj",
+                               31: "itunes-u",
+                       }.get(kind, "playlist")
+               elif pl_playlist.has_key("Smart Info"):
+                       ptype = "smart-playlist"
+               elif int(pl_playlist.get("Folder", 0)):
+                       ptype = "folder"
+               else:
+                       ptype = "playlist"
+
                parent = None
                try:
                        parent_pid = pl_playlist["Parent Persistent ID"]
-                       parent = self.playlists.get(parent_pid)
+                       parent = pl_lookup[parent_pid]
                except KeyError:
                        pass
                tracks = []
@@ -75,7 +105,7 @@ class ITunesLibrary(NSObject):
                        filename = strip_prefix(filename, self.folder)
                        tracks.append(filename)
                playlist = Playlist.alloc().init()
-               playlist.set(name, pid, tracks, parent)
+               playlist.set(name, pid, ptype, tracks, parent)
                return playlist
 
        def has_playlist_name(self, name):
@@ -88,32 +118,14 @@ class ITunesLibrary(NSObject):
                for playlist in self.get_playlists():
                        if playlist.name == name:
                                return playlist
-       
+
        def get_playlist_pid(self, pid):
                for playlist in self.get_playlists():
                        if playlist.pid == pid:
                                return playlist
 
        def get_playlists(self):
-               return self.playlists.values()
-
-       def outlineView_numberOfChildrenOfItem_(self, view, item):
-               if item == None:
-                       return len(self.playlists)
-               else:
-                       return 0
-
-       def outlineView_isItemExpandable_(self, view, item):
-               return False
-
-       def outlineView_child_ofItem_(self, view, index, item):
-               if item == None:
-                       return self.playlists[index]
-               else:
-                       return None
-
-       def outlineView_objectValueForTableColumn_byItem_(self, view, column, item):
-               return item.name
+               return self.playlists
 
 
 encoded_names = {}
@@ -224,10 +236,9 @@ def sync(dry_run, source, dest, files_to_copy):
        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].orig_filename),
-                               join(dest, filemap[filename].encoded_filename)
-                       )
+                       source_file = join(source, filemap[filename].orig_filename)
+                       dest_file = join(dest, filemap[filename].encoded_filename)
+                       mkdirhier(os.path.dirname(dest_file))
+                       shutil.copy2(source_file, dest_file)