Don't need this anymore, it's been set in the XIB

[notipod] / notipod_gui.py

diff --git a/notipod_gui.py b/notipod_gui.py
index 4c175a909f2cfd94625c9d334cf30e2f54c9cb74..e5ea98b83574ec6360ef11232aca53f9281410f3 100644 (file)
--- a/notipod_gui.py
+++ b/notipod_gui.py
@@ -3,6 +3,9 @@
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
 import logging
+import os
+import sys
+import traceback
 
 import objc
 from Foundation import *
@@ -135,7 +138,9 @@ class NotiPodController(NSObject):
                self.library = libnotipod.ITunesLibrary.alloc().init()
                def finish():
                        self.playlistModel.setPlaylists(self.library.get_playlists())
-               self.runGenerator(lambda: self.library.load_(None), finish)
+               def fail():
+                       sys.exit(0)
+               self.runGenerator(lambda: self.library.load_(None), finish, fail)
 
        def applicationWillTerminate_(self, _):
                self.prefs().synchronize()
@@ -145,32 +150,37 @@ class NotiPodController(NSObject):
 
 
        # Utility methods
-       def runGenerator(self, func, finish):
+       def runGenerator(self, func, finish, fail):
                assert not self.runningGenerator
                self.runningGenerator = True
                self.loadingIndicator.startAnimation_(self)
                NSApp.beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_(self.loadingSheet, self.window, None, None, None)
-               arg = (func(), finish)
+               arg = (func(), finish, fail)
                self.performSelectorInBackground_withObject_(self.runGeneratorThread, arg)
 
-       def runGeneratorThread(self, (gen, finish)):
+       def runGeneratorThread(self, (gen, finish, fail)):
                pool = NSAutoreleasePool.alloc().init()
-               for msg in gen:
-                       if not self.runningGenerator:
-                               break
-                       self.loadingLabel.performSelectorOnMainThread_withObject_waitUntilDone_(
-                               self.loadingLabel.setStringValue_, msg, True)
+               try:
+                       for msg in gen:
+                               if not self.runningGenerator:
+                                       break
+                               self.loadingLabel.performSelectorOnMainThread_withObject_waitUntilDone_(
+                                       self.loadingLabel.setStringValue_, msg, True)
+               except Exception, e:
+                       NSRunAlertPanel("Error!", str(e), "Ok", None, None)
+                       traceback.print_exc()
+                       finish = fail
                self.performSelectorOnMainThread_withObject_waitUntilDone_(
                        self.stopGenerator, finish, True)
                self.runningGenerator = False
-               del pool
 
        def stopGenerator(self, finish):
                self.runningGenerator = False
                NSApp.endSheet_(self.loadingSheet)
                self.loadingSheet.orderOut_(self)
                self.loadingIndicator.stopAnimation_(self)
-               finish()
+               if finish:
+                       finish()
 
        @objc.IBAction
        def doCancel_(self, sender):
@@ -180,11 +190,15 @@ class NotiPodController(NSObject):
                yield "Calculating changes..."
 
                folder = self.folders()[0]
-               playlists = [self.library.get_playlist_pid(pid) for pid in self.playlists()]
+               if not os.path.isdir(folder.encode("utf-8")):
+                       NSRunAlertPanel("Error!", "Destination " + folder + " does not exist, try mounting it first?", "Ok", None, None)
+                       return
 
                all_tracks = []
-               for playlist in playlists:
-                       all_tracks.extend(playlist.tracks)
+               for playlist_id in self.playlists():
+                       playlist = self.library.get_playlist_pid(playlist_id)
+                       if playlist is not None:
+                               all_tracks.extend(playlist.tracks)
 
                gen = libnotipod.sync(
                        dry_run=True,
@@ -204,15 +218,22 @@ class NotiPodController(NSObject):
                        self.previewWindow.center()
                        self.previewWindow.makeKeyAndOrderFront_(self)
 
-               self.runGenerator(self.doPreviewThread, finish)
+               self.runGenerator(self.doPreviewThread, finish, None)
 
        @objc.IBAction
        def doSync_(self, sender):
                folder = self.folders()[0]
-               playlists = [self.library.get_playlist_pid(pid) for pid in self.playlists()]
+               if not os.path.isdir(folder.encode("utf-8")):
+                       NSRunAlertPanel("Error!", "Destination " + folder + " does not exist, try mounting it first?", "Ok", None, None)
+                       return
 
                all_tracks = []
-               for playlist in playlists:
+               for playlist_id in self.playlists():
+                       playlist = self.library.get_playlist_pid(playlist_id)
+                       if playlist is None:
+                               print "Forgetting unknown playlist:", playlist_id
+                               self.setPlaylist_selected_(playlist_id, False)
+                               continue
                        all_tracks.extend(playlist.tracks)
                        libnotipod.export_m3u(dry_run=False, dest=folder, path_prefix="",
                                        playlist_name=playlist.name, files=playlist.tracks)
@@ -228,7 +249,8 @@ class NotiPodController(NSObject):
                                        files_to_copy=all_tracks
                                )
                        ,
-                       finish
+                       finish,
+                       None
                )