Uncommented the multisource playlist chooser.

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index f47c01b..2400f9e 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -2,6 +2,7 @@
 #import "MenuController.h"
 #import "PreferencesController.h"
 #import "NetworkController.h"
 #import "MenuController.h"
 #import "PreferencesController.h"
 #import "NetworkController.h"

+#import "NetworkObject.h"

 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITHotKey.h>
 #import <ITKit/ITKeyCombo.h>
 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITHotKey.h>
 #import <ITKit/ITKeyCombo.h>


@@ -13,7 +14,6 @@
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;

-- (void)showCurrentTrackInfo;

 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end


@@ -38,6 +38,7 @@ static MainController *sharedController;
         sharedController = self;
         
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         sharedController = self;
         
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];

+        [[PreferencesController sharedPrefs] setController:self];

         statusWindowController = [StatusWindowController sharedController];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
         statusWindowController = [StatusWindowController sharedController];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];


@@ -54,6 +55,13 @@ static MainController *sharedController;
         SetITDebugMode(YES);
     }
     
         SetITDebugMode(YES);
     }
     

+    if (([df integerForKey:@"appVersion"] < 1200) && ([df integerForKey:@"SongsInAdvance"] > 0)) {
+        [df removePersistentDomainForName:@"com.ithinksw.menutunes"];
+        [df synchronize];
+        [[PreferencesController sharedPrefs] registerDefaults];
+        [[StatusWindowController sharedController] showPreferencesUpdateWindow];
+    }
+    

     currentRemote = [self loadRemote];
     [[self currentRemote] begin];
     
     currentRemote = [self loadRemote];
     [[self currentRemote] begin];
     


@@ -61,8 +69,10 @@ static MainController *sharedController;
     networkController = [[NetworkController alloc] init];
     if ([df boolForKey:@"enableSharing"]) {
         [self setServerStatus:YES];
     networkController = [[NetworkController alloc] init];
     if ([df boolForKey:@"enableSharing"]) {
         [self setServerStatus:YES];

-    } else if ([df boolForKey:@"useSharedPlayer"] && [df boolForKey:@"alwaysUseSharedPlayer"]) {
-        [self connectToServer];
+    } else if ([df boolForKey:@"useSharedPlayer"]) {
+        if ([self connectToServer] == 0) {
+            [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
+        }

     }
     
     //Setup for notification of the remote player launching or quitting
     }
     
     //Setup for notification of the remote player launching or quitting


@@ -82,10 +92,14 @@ static MainController *sharedController;
         [[PreferencesController sharedPrefs] registerDefaults];
     }
     
         [[PreferencesController sharedPrefs] registerDefaults];
     }
     

-    [StatusItemHack install];
-    statusItem = [[ITStatusItem alloc]
-            initWithStatusBar:[NSStatusBar systemStatusBar]
-            withLength:NSSquareStatusItemLength];
+    if ([df boolForKey:@"ITMTNoStatusItem"]) {
+        statusItem = nil;
+    } else {
+        [StatusItemHack install];
+        statusItem = [[ITStatusItem alloc]
+                initWithStatusBar:[NSStatusBar systemStatusBar]
+                withLength:NSSquareStatusItemLength];
+    }

     
     bling = [[MTBlingController alloc] init];
     [self blingTime];
     
     bling = [[MTBlingController alloc] init];
     [self blingTime];


@@ -240,7 +254,7 @@ static MainController *sharedController;
 
 - (BOOL)songIsPlaying
 {
 
 - (BOOL)songIsPlaying
 {

-    NSString *identifier;
+    NSString *identifier = nil;

     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER
     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER


@@ -251,7 +265,7 @@ static MainController *sharedController;
 
 - (BOOL)radioIsPlaying
 {
 
 - (BOOL)radioIsPlaying
 {

-    ITMTRemotePlayerPlaylistClass class;
+    ITMTRemotePlayerPlaylistClass class = nil;

     NS_DURING
         class = [[self currentRemote] currentPlaylistClass];
     NS_HANDLER
     NS_DURING
         class = [[self currentRemote] currentPlaylistClass];
     NS_HANDLER


@@ -262,7 +276,7 @@ static MainController *sharedController;
 
 - (BOOL)songChanged
 {
 
 - (BOOL)songChanged
 {

-    NSString *identifier;
+    NSString *identifier = nil;

     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER
     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER


@@ -289,8 +303,23 @@ static MainController *sharedController;
         [statusItem setMenu:[menuController menu]];
     }
     
         [statusItem setMenu:[menuController menu]];
     }
     

-    if ( [self songChanged] && (timerUpdating != YES) ) {
+    if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {

         ITDebugLog(@"The song changed.");
         ITDebugLog(@"The song changed.");

+        
+        if ([df boolForKey:@"runScripts"] && [[self currentRemote] currentSongTitle]) {
+            NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
+            NSEnumerator *scriptsEnum = [scripts objectEnumerator];
+            NSString *nextScript;
+            while ( (nextScript = [scriptsEnum nextObject]) ) {
+                NSDictionary *error;
+                NSAppleScript *currentScript = [[NSAppleScript alloc] initWithContentsOfURL:[NSURL fileURLWithPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] stringByAppendingPathComponent:nextScript]] error:&error];
+                if (!currentScript || ![currentScript executeAndReturnError:nil]) {
+                    ITDebugLog(@"Error running script %@.", nextScript);
+                }
+                [currentScript release];
+            }
+        }
+        

         timerUpdating = YES;
         
         NS_DURING
         timerUpdating = YES;
         
         NS_DURING


@@ -302,6 +331,18 @@ static MainController *sharedController;
             }
             
             [self setLatestSongIdentifier:[[self currentRemote] playerStateUniqueIdentifier]];
             }
             
             [self setLatestSongIdentifier:[[self currentRemote] playerStateUniqueIdentifier]];

+            
+            NSString *artist = [[self currentRemote] currentSongArtist];
+            NSString *title = [[self currentRemote] currentSongTitle];
+            NSString *toolTip;
+            if (artist) {
+                toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
+            } else if (title) {
+                toolTip = title;
+            } else {
+                toolTip = @"No Song Playing";
+            }
+            [statusItem setToolTip:toolTip];

         NS_HANDLER
             [self networkError:localException];
         NS_ENDHANDLER
         NS_HANDLER
             [self networkError:localException];
         NS_ENDHANDLER


@@ -403,7 +444,8 @@ static MainController *sharedController;
 {
     ITDebugLog(@"Selecting playlist %i", index);
     NS_DURING
 {
     ITDebugLog(@"Selecting playlist %i", index);
     NS_DURING

-        [[self currentRemote] switchToPlaylistAtIndex:index];
+        [[self currentRemote] switchToPlaylistAtIndex:(index % 1000) ofSourceAtIndex:(index / 1000)];
+        //[[self currentRemote] switchToPlaylistAtIndex:index];

     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER


@@ -469,10 +511,23 @@ static MainController *sharedController;
 - (void)showPreferences
 {
     ITDebugLog(@"Show preferences.");
 - (void)showPreferences
 {
     ITDebugLog(@"Show preferences.");

-    [[PreferencesController sharedPrefs] setController:self];

     [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 

+- (void)showPreferencesAndClose
+{
+    ITDebugLog(@"Show preferences.");
+    [[PreferencesController sharedPrefs] showPrefsWindow:self];
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
+}
+
+- (void)showTestWindow
+{
+    [self showCurrentTrackInfo];
+}
+

 - (void)quitMenuTunes
 {
     ITDebugLog(@"Quitting MenuTunes.");
 - (void)quitMenuTunes
 {
     ITDebugLog(@"Quitting MenuTunes.");


@@ -492,6 +547,10 @@ static MainController *sharedController;
 
 - (ITMTRemote *)currentRemote
 {
 
 - (ITMTRemote *)currentRemote
 {

+    if ([networkController isConnectedToServer] && ![[networkController networkObject] isValid]) {
+        [self networkError:nil];
+        return nil;
+    }

     return currentRemote;
 }
 
     return currentRemote;
 }
 


@@ -645,12 +704,13 @@ static MainController *sharedController;
 
 - (void)showCurrentTrackInfo
 {
 
 - (void)showCurrentTrackInfo
 {

-    ITMTRemotePlayerSource  source;
-    NSString               *title;
+    ITMTRemotePlayerSource  source      = 0;
+    NSString               *title       = nil;

     NSString               *album       = nil;
     NSString               *artist      = nil;
     NSString               *time        = nil;
     NSString               *track       = nil;
     NSString               *album       = nil;
     NSString               *artist      = nil;
     NSString               *time        = nil;
     NSString               *track       = nil;

+    NSImage                *art         = nil;

     int                     rating      = -1;
     
     NS_DURING
     int                     rating      = -1;
     
     NS_DURING


@@ -692,8 +752,8 @@ static MainController *sharedController;
         }
 
         if ( [df boolForKey:@"showTrackNumber"] ) {
         }
 
         if ( [df boolForKey:@"showTrackNumber"] ) {

-            int trackNo;
-            int trackCount;
+            int trackNo    = 0;
+            int trackCount = 0;

             
             NS_DURING
                 trackNo    = [[self currentRemote] currentSongTrack];
             
             NS_DURING
                 trackNo    = [[self currentRemote] currentSongTrack];


@@ -709,7 +769,7 @@ static MainController *sharedController;
         }
 
         if ( [df boolForKey:@"showTrackRating"] ) {
         }
 
         if ( [df boolForKey:@"showTrackRating"] ) {

-            float currentRating;
+            float currentRating = 0;

             
             NS_DURING
                 currentRating = [[self currentRemote] currentSongRating];
             
             NS_DURING
                 currentRating = [[self currentRemote] currentSongRating];


@@ -722,6 +782,14 @@ static MainController *sharedController;
             }
         }
         
             }
         }
         

+        if ( [df boolForKey:@"showAlbumArtwork"] ) {
+             NS_DURING
+                art = [[self currentRemote] currentSongAlbumArt];
+            NS_HANDLER
+                [self networkError:localException];
+            NS_ENDHANDLER
+        }
+        

     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }


@@ -732,13 +800,13 @@ static MainController *sharedController;
                                                   artist:artist
                                                     time:time
                                                    track:track
                                                   artist:artist
                                                     time:time
                                                    track:track

-                                                  rating:rating];
+                                                  rating:rating
+                                                   image:art];

 }
 
 - (void)showUpcomingSongs
 {
 }
 
 - (void)showUpcomingSongs
 {

-    int numSongs;
-    
+    int numSongs = 0;

     NS_DURING
         numSongs = [[self currentRemote] numberOfSongsInPlaylistAtIndex:[[self currentRemote] currentPlaylistIndex]];
     NS_HANDLER
     NS_DURING
         numSongs = [[self currentRemote] numberOfSongsInPlaylistAtIndex:[[self currentRemote] currentPlaylistIndex]];
     NS_HANDLER


@@ -748,8 +816,8 @@ static MainController *sharedController;
     ITDebugLog(@"Showing upcoming songs status window.");
     NS_DURING
         if (numSongs > 0) {
     ITDebugLog(@"Showing upcoming songs status window.");
     NS_DURING
         if (numSongs > 0) {

-            NSMutableArray *songList = [NSMutableArray arrayWithCapacity:5];

             int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"];
             int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"];

+            NSMutableArray *songList = [NSMutableArray arrayWithCapacity:numSongsInAdvance];

             int curTrack = [[self currentRemote] currentSongIndex];
             int i;
     
             int curTrack = [[self currentRemote] currentSongIndex];
             int i;
     


@@ -759,6 +827,10 @@ static MainController *sharedController;
                 }
             }
             
                 }
             }
             

+            if ([songList count] == 0) {
+                [songList addObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")];
+            }
+            

             [statusWindowController showUpcomingSongsWindowWithTitles:songList];
         } else {
             [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
             [statusWindowController showUpcomingSongsWindowWithTitles:songList];
         } else {
             [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];


@@ -940,36 +1012,90 @@ static MainController *sharedController;
     }
 }
 
     }
 }
 

-- (BOOL)connectToServer
+- (int)connectToServer

 {
 {

+    int result;
+    ITDebugLog(@"Attempting to connect to shared remote.");
+    result = [networkController connectToHost:[df stringForKey:@"sharedPlayerHost"]];

     //Connect
     //Connect

-    if ([networkController connectToHost:[df stringForKey:@"sharedPlayerHost"]]) {
-        currentRemote = [networkController sharedRemote];
+    if (result == 1) {
+        [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
+        currentRemote = [[[networkController networkObject] remote] retain];

         [refreshTimer invalidate];
         [refreshTimer invalidate];

-        return YES;
+        refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
+                                target:self
+                                selector:@selector(timerUpdate)
+                                userInfo:nil
+                                repeats:YES] retain];
+        [self timerUpdate];
+        ITDebugLog(@"Connection successful.");
+        return 1;
+    } else if (result == 0) {
+        ITDebugLog(@"Connection failed.");
+        currentRemote = [remoteArray objectAtIndex:0];
+        return 0;

     } else {
     } else {

+        //Do something about the password being invalid
+        ITDebugLog(@"Connection failed.");

         currentRemote = [remoteArray objectAtIndex:0];
         currentRemote = [remoteArray objectAtIndex:0];

-        return NO;
+        return -1;

     }
 }
 
 - (BOOL)disconnectFromServer
 {
     }
 }
 
 - (BOOL)disconnectFromServer
 {

+    ITDebugLog(@"Disconnecting from shared remote.");

     //Disconnect
     //Disconnect

+    [currentRemote release];

     currentRemote = [remoteArray objectAtIndex:0];
     [networkController disconnect];
     [self timerUpdate];
     return YES;
 }
 
     currentRemote = [remoteArray objectAtIndex:0];
     [networkController disconnect];
     [self timerUpdate];
     return YES;
 }
 

+- (void)checkForRemoteServer:(NSTimer *)timer
+{
+    ITDebugLog(@"Checking for remote server.");
+    if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
+        ITDebugLog(@"Remote server found.");
+        [timer invalidate];
+        if (![networkController isServerOn] && ![networkController isConnectedToServer]) {
+            [[StatusWindowController sharedController] showReconnectQueryWindow];
+        }
+    } else {
+        ITDebugLog(@"Remote server not found.");
+    }
+}
+

 - (void)networkError:(NSException *)exception
 {
     ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);
 - (void)networkError:(NSException *)exception
 {
     ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);

-    NSRunAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil);
-    if ([networkController isConnectedToServer] && [self disconnectFromServer]) {
-    } else {
-        ITDebugLog(@"CRITICAL ERROR DISCONNECTING!");
+    if ( ((exception == nil) || [[exception name] isEqualToString:NSPortTimeoutException]) && [networkController isConnectedToServer]) {
+        NSRunCriticalAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil);
+        if ([self disconnectFromServer]) {
+            [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
+            [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
+        } else {
+            ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");
+        }
+    }
+}
+
+- (void)reconnect
+{
+    if ([self connectToServer] == 0) {
+        [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];

     }
     }

+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
+}
+
+- (void)cancelReconnect
+{
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];

 }
 
 /*************************************************************************/
 }
 
 /*************************************************************************/


@@ -1004,12 +1130,23 @@ static MainController *sharedController;
     NS_DURING
         if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]) {
             ITDebugLog(@"Remote application terminated.");
     NS_DURING
         if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]) {
             ITDebugLog(@"Remote application terminated.");

+            playerRunningState = ITMTRemotePlayerNotRunning;

             [[self currentRemote] halt];
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
             [self clearHotKeys];
             [[self currentRemote] halt];
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
             [self clearHotKeys];

-            playerRunningState = ITMTRemotePlayerNotRunning;
+            
+            if ([df objectForKey:@"ShowPlayer"] != nil) {
+                ITHotKey *hotKey;
+                ITDebugLog(@"Setting up show player hot key.");
+                hotKey = [[ITHotKey alloc] init];
+                [hotKey setName:@"ShowPlayer"];
+                [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]];
+                [hotKey setTarget:self];
+                [hotKey setAction:@selector(showPlayer)];
+                [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+            }

         }
     NS_HANDLER
         [self networkError:localException];
         }
     NS_HANDLER
         [self networkError:localException];


@@ -1024,8 +1161,8 @@ static MainController *sharedController;
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {

-    [self clearHotKeys];

     [networkController stopRemoteServerSearch];
     [networkController stopRemoteServerSearch];

+    [self clearHotKeys];

     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
 }
 
     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
 }
 


@@ -1046,5 +1183,4 @@ static MainController *sharedController;
     [super dealloc];
 }
 
     [super dealloc];
 }
 

-

 @end
\ No newline at end of file
 @end
\ No newline at end of file