X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/9cebb1f7452afe422cb940e970c9f30b5180a239..1af988c977ca8d22248b17fc55323d39dff50228:/MainController.m?ds=sidebyside

diff --git a/MainController.m b/MainController.m
index 8784dd1..4f5fd13 100755
--- a/MainController.m
+++ b/MainController.m
@@ -11,6 +11,10 @@
 #import "StatusWindowController.h"
 #import "StatusItemHack.h"
 
+@interface NSMenu (MenuImpl)
+- (id)_menuImpl;
+@end
+
 @interface NSCarbonMenuImpl:NSObject
 {
     NSMenu *_menu;
@@ -169,6 +173,19 @@ static MainController *sharedController;
 
     [networkController startRemoteServerSearch];
     [NSApp deactivate];
+	[self performSelector:@selector(rawr) withObject:nil afterDelay:1.0];
+}
+
+- (void)rawr
+{
+	_open = YES;
+}
+
+- (void)applicationWillBecomeActive:(NSNotification *)note
+{
+	if (_open) {
+		[[MainController sharedController] showPreferences];
+	}
 }
 
 - (ITMTRemote *)loadRemote
@@ -274,6 +291,8 @@ static MainController *sharedController;
             [self clearHotKeys];
             if ([refreshTimer isValid]) {
                 [refreshTimer invalidate];
+				[refreshTimer release];
+				refreshTimer = nil;
             }
             [statusWindowController showRegistrationQueryWindow];
         }
@@ -357,18 +376,23 @@ static MainController *sharedController;
 
 - (void)timerUpdate
 {
-	if ([[self currentRemote] playerStateUniqueIdentifier] == nil) {
+	NSString *identifier = [[self currentRemote] playerStateUniqueIdentifier];
+	if (refreshTimer && identifier == nil) {
+		if ([statusItem isEnabled]) {
+			[statusItem setToolTip:@"iTunes not responding."];
+			[[ITHotKeyCenter sharedCenter] setEnabled:NO];
+		}
 		[statusItem setEnabled:NO];
-		[statusItem setToolTip:@"iTunes not responding."];
 		return;
 	} else if (![statusItem isEnabled]) {
 		[statusItem setEnabled:YES];
 		[statusItem setToolTip:_toolTip];
+		[[ITHotKeyCenter sharedCenter] setEnabled:YES];
 		return;
 	}
 	
 	if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {
-        ITDebugLog(@"The song changed.");
+        ITDebugLog(@"The song changed. '%@'", _latestSongIdentifier);
         if ([df boolForKey:@"runScripts"]) {
             NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
             NSEnumerator *scriptsEnum = [scripts objectEnumerator];
@@ -387,41 +411,39 @@ static MainController *sharedController;
         
         timerUpdating = YES;
         [statusItem setEnabled:NO];
-        
+		
         NS_DURING
             latestPlaylistClass = [[self currentRemote] currentPlaylistClass];
-            [menuController rebuildSubmenus];
-    
-            if ( [df boolForKey:@"showSongInfoOnChange"] ) {
-                [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
-            }
-            
-            [self setLatestSongIdentifier:[[self currentRemote] playerStateUniqueIdentifier]];
-            
-            //Create the tooltip for the status item
-            if ( [df boolForKey:@"showToolTip"] ) {
-                NSString *artist = [[self currentRemote] currentSongArtist];
-                NSString *title = [[self currentRemote] currentSongTitle];
-                ITDebugLog(@"Creating status item tooltip.");
-                if (artist) {
-                    _toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
-                } else if (title) {
-                    _toolTip = title;
-                } else {
-                    _toolTip = @"No Song Playing";
-                }
-                [statusItem setToolTip:_toolTip];
-            } else {
-                [statusItem setToolTip:nil];
-            }
+			
+			if ([menuController rebuildSubmenus]) {
+				if ( [df boolForKey:@"showSongInfoOnChange"] ) {
+					[self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
+				}
+				[self setLatestSongIdentifier:identifier];
+				//Create the tooltip for the status item
+				if ( [df boolForKey:@"showToolTip"] ) {
+					NSString *artist = [[self currentRemote] currentSongArtist];
+					NSString *title = [[self currentRemote] currentSongTitle];
+					ITDebugLog(@"Creating status item tooltip.");
+					if (artist) {
+						_toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
+					} else if (title) {
+						_toolTip = title;
+					} else {
+						_toolTip = @"No Song Playing";
+					}
+					[statusItem setToolTip:_toolTip];
+				} else {
+					[statusItem setToolTip:nil];
+				}
+			}
         NS_HANDLER
             [self networkError:localException];
         NS_ENDHANDLER
-        
         timerUpdating = NO;
         [statusItem setEnabled:YES];
     }
-    
+	
     if ([networkController isConnectedToServer]) {
         [statusItem setMenu:([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) ? [menuController menu] : [menuController menuForNoPlayer]];
     }
@@ -430,6 +452,27 @@ static MainController *sharedController;
 - (void)menuClicked
 {
     ITDebugLog(@"Menu clicked.");
+	
+	if (([[self currentRemote] playerStateUniqueIdentifier] == nil) && playerRunningState == ITMTRemotePlayerRunning) {
+		if (refreshTimer) {
+			if ([statusItem isEnabled]) {
+				[statusItem setToolTip:@"iTunes not responding."];
+				[[ITHotKeyCenter sharedCenter] setEnabled:NO];
+			}
+			[statusItem setEnabled:NO];
+		} else {
+			NSMenu *menu = [[NSMenu alloc] init];
+			[menu addItemWithTitle:@"iTunes Not Responding" action:nil keyEquivalent:@""];
+			[statusItem setMenu:[menu autorelease]];
+		}
+		return;
+	} else if (![statusItem isEnabled]) {
+		[statusItem setEnabled:YES];
+		[statusItem setToolTip:_toolTip];
+		[[ITHotKeyCenter sharedCenter] setEnabled:YES];
+		return;
+	}
+	
     if ([networkController isConnectedToServer]) {
         //Used the cached version
         return;
@@ -446,6 +489,81 @@ static MainController *sharedController;
     NS_ENDHANDLER
 }
 
+- (void)trackChanged:(NSNotification *)note
+{
+	//If we're running the timer, shut it off since we don't need it!
+	if (refreshTimer && [refreshTimer isValid]) {
+		ITDebugLog(@"Invalidating refresh timer.");
+		[refreshTimer invalidate];
+		[refreshTimer release];
+		refreshTimer = nil;
+	}
+	
+	if (![self songChanged]) {
+		return;
+	}
+	NSString *identifier = [[self currentRemote] playerStateUniqueIdentifier];
+	if ( [df boolForKey:@"showSongInfoOnChange"] ) {
+		[self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
+	}
+	[_lastTrackInfo release];
+	_lastTrackInfo = [[note userInfo] retain];
+	
+	[self setLatestSongIdentifier:identifier];
+	ITDebugLog(@"The song changed. '%@'", _latestSongIdentifier);
+	if ([df boolForKey:@"runScripts"]) {
+		NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
+		NSEnumerator *scriptsEnum = [scripts objectEnumerator];
+		NSString *nextScript;
+		ITDebugLog(@"Running AppleScripts for song change.");
+		while ( (nextScript = [scriptsEnum nextObject]) ) {
+			NSDictionary *error;
+			NSAppleScript *currentScript = [[NSAppleScript alloc] initWithContentsOfURL:[NSURL fileURLWithPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] stringByAppendingPathComponent:nextScript]] error:&error];
+			ITDebugLog(@"Running script: %@", nextScript);
+			if (!currentScript || ![currentScript executeAndReturnError:nil]) {
+				ITDebugLog(@"Error running script %@.", nextScript);
+			}
+			[currentScript release];
+		}
+	}
+	
+	[statusItem setEnabled:NO];
+	
+	NS_DURING
+		latestPlaylistClass = [[self currentRemote] currentPlaylistClass];
+		
+		if ([menuController rebuildSubmenus]) {
+			/*if ( [df boolForKey:@"showSongInfoOnChange"] ) {
+				[self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
+			}*/
+			[self setLatestSongIdentifier:identifier];
+			//Create the tooltip for the status item
+			if ( [df boolForKey:@"showToolTip"] ) {
+				ITDebugLog(@"Creating status item tooltip.");
+				NSString *artist = [_lastTrackInfo objectForKey:@"Artist"], *title = [_lastTrackInfo objectForKey:@"Name"];
+				if (artist) {
+					_toolTip = [NSString stringWithFormat:@"%@ - %@", artist, title];
+				} else if (title) {
+					_toolTip = title;
+				} else {
+					_toolTip = @"No Song Playing";
+				}
+				[statusItem setToolTip:_toolTip];
+			} else {
+				[statusItem setToolTip:nil];
+			}
+		}
+	NS_HANDLER
+		[self networkError:localException];
+	NS_ENDHANDLER
+	timerUpdating = NO;
+	[statusItem setEnabled:YES];
+	
+	if ([networkController isConnectedToServer]) {
+        [statusItem setMenu:([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) ? [menuController menu] : [menuController menuForNoPlayer]];
+    }
+}
+
 //
 //
 // Menu Selectors
@@ -469,7 +587,9 @@ static MainController *sharedController;
         [self networkError:localException];
     NS_ENDHANDLER
     
-    [self timerUpdate];
+	if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)nextSong
@@ -480,7 +600,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)prevSong
@@ -491,7 +613,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)fastForward
@@ -502,7 +626,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)rewind
@@ -513,7 +639,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)selectPlaylistAtIndex:(int)index
@@ -525,7 +653,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)selectSongAtIndex:(int)index
@@ -536,7 +666,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)selectSongRating:(int)rating
@@ -547,7 +679,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)selectEQPresetAtIndex:(int)index
@@ -562,7 +696,9 @@ static MainController *sharedController;
     NS_HANDLER
         [self networkError:localException];
     NS_ENDHANDLER
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	}
 }
 
 - (void)makePlaylistWithTerm:(NSString *)term ofType:(int)type
@@ -1211,8 +1347,9 @@ static MainController *sharedController;
         [self setupHotKeys];
         //playerRunningState = ITMTRemotePlayerRunning;
         playerRunningState = [[self currentRemote] playerRunningState];
-        
-        [refreshTimer invalidate];
+		if (refreshTimer) {
+			[refreshTimer invalidate];
+		}
         refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
                                 target:self
                                 selector:@selector(timerUpdate)
@@ -1246,7 +1383,9 @@ static MainController *sharedController;
     } else {
         [self applicationTerminated:nil];
     }
-    [self timerUpdate];
+    if (refreshTimer) {
+		[self timerUpdate];
+	};
     return YES;
 }
 
@@ -1357,6 +1496,9 @@ static MainController *sharedController;
                                 userInfo:nil
                                 repeats:YES] retain];
             //[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
+			if (![df boolForKey:@"UsePollingOnly"]) {
+				[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(trackChanged:) name:@"ITMTTrackChanged" object:nil];
+			}
             [self setupHotKeys];
         }
     NS_HANDLER
@@ -1374,8 +1516,12 @@ static MainController *sharedController;
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
+			[[NSNotificationCenter defaultCenter] removeObserver:self];
+			[statusItem setEnabled:YES];
+			[statusItem setToolTip:@"iTunes not running."];
             [self clearHotKeys];
-            
+
+			
             if ([df objectForKey:@"ShowPlayer"] != nil) {
                 ITHotKey *hotKey;
                 ITDebugLog(@"Setting up show player hot key.");
@@ -1400,6 +1546,7 @@ static MainController *sharedController;
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {
+	[[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
     [networkController stopRemoteServerSearch];
     [self clearHotKeys];
     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];