X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/259ae5fac769954c7db5974b86e791a929fe6700..247185755806e3a693fef80a25094ad9e446f104:/MainController.m

diff --git a/MainController.m b/MainController.m
index 7a8c874..20f4381 100755
--- a/MainController.m
+++ b/MainController.m
@@ -140,6 +140,8 @@ static MainController *sharedController;
     currentRemote = [self loadRemote];
     [[self currentRemote] begin];
     
+	[[self currentRemote] currentSongElapsed];
+	
     //Turn on network stuff if needed
     networkController = [[NetworkController alloc] init];
     if ([df boolForKey:@"enableSharing"]) {
@@ -199,7 +201,9 @@ static MainController *sharedController;
     [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
 
 	if ([df boolForKey:@"audioscrobblerEnabled"]) {
-		[[AudioscrobblerController sharedController] attemptHandshake:NO];
+		if ([PreferencesController getKeychainItemPasswordForUser:[df stringForKey:@"audioscrobblerUser"]] != nil) {
+			[[AudioscrobblerController sharedController] attemptHandshake:NO];
+		}
 	}
 
     [networkController startRemoteServerSearch];
@@ -408,7 +412,12 @@ static MainController *sharedController;
 
 - (void)timerUpdate
 {
-	NSString *identifier = [[self currentRemote] playerStateUniqueIdentifier];
+	NSString *identifier = nil;
+	NS_DURING
+		identifier = [[self currentRemote] playerStateUniqueIdentifier];
+	NS_HANDLER
+		[self networkError:localException];
+	NS_ENDHANDLER
 	if (refreshTimer && identifier == nil) {
 		if ([statusItem isEnabled]) {
 			[statusItem setToolTip:@"iTunes not responding."];
@@ -470,11 +479,12 @@ static MainController *sharedController;
 			
 			if ([df boolForKey:@"audioscrobblerEnabled"]) {
 				int length = [[self currentRemote] currentSongDuration];
-				if (_audioscrobblerTimer) {
-					[_audioscrobblerTimer invalidate];
-				}
 				if (length > 30) {
-					_audioscrobblerTimer = [NSTimer scheduledTimerWithTimeInterval:((length < 240) ? length / 2 : 120) target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:YES];
+					_audioscrobblerInterval = ((length / 2 < 240) ? length / 2 : 240);
+					[_audioscrobblerTimer invalidate];
+					[_audioscrobblerTimer release];
+					_audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:nil target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+					[[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
 				}
 			} else {
 				_audioscrobblerTimer = nil;
@@ -596,11 +606,12 @@ static MainController *sharedController;
 		
 		if ([df boolForKey:@"audioscrobblerEnabled"]) {
 			int length = [[self currentRemote] currentSongDuration];
-			if (_audioscrobblerTimer) {
-				[_audioscrobblerTimer invalidate];
-			}
 			if (length > 30) {
-				_audioscrobblerTimer = [NSTimer scheduledTimerWithTimeInterval:((length < 240) ? length / 2 : 120) target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:YES];
+				_audioscrobblerInterval = ((length / 2 < 240) ? length / 2 : 240);
+				[_audioscrobblerTimer invalidate];
+				[_audioscrobblerTimer release];
+				_audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:1.0 target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+				[[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
 			}
 		} else {
 			_audioscrobblerTimer = nil;
@@ -618,15 +629,14 @@ static MainController *sharedController;
 
 - (void)submitAudioscrobblerTrack:(NSTimer *)timer
 {
-	int interval = [timer timeInterval];
-	[timer invalidate];
-	_audioscrobblerTimer = nil;
 	ITDebugLog(@"Audioscrobbler: Attempting to submit current track");
+	[timer invalidate];
 	if ([df boolForKey:@"audioscrobblerEnabled"]) {
 		NS_DURING
-			int elapsed = [[self currentRemote] currentSongPlayed];
-			if ((abs(elapsed - interval) < 5) && ([[self currentRemote] playerPlayingState] == ITMTRemotePlayerPlaying)) {
+			int elapsed = [[self currentRemote] currentSongPlayed], length = [[self currentRemote] currentSongDuration], requiredInterval = ((length / 2 < 240) ? length / 2 : 240);
+			if ((abs(elapsed - requiredInterval) < 5) && ([[self currentRemote] playerPlayingState] == ITMTRemotePlayerPlaying)) {
 				NSString *title = [[self currentRemote] currentSongTitle], *artist = [[self currentRemote] currentSongArtist];
+				NSLog(@"Audioscrobbler: Submitting");
 				if (title && artist) {
 					ITDebugLog(@"Audioscrobbler: Submitting current track");
 					[[AudioscrobblerController sharedController] submitTrack:title
@@ -634,9 +644,15 @@ static MainController *sharedController;
 																	album:[[self currentRemote] currentSongAlbum]
 																	length:[[self currentRemote] currentSongDuration]];
 				}
-			} else if (interval - elapsed > 0) {
-				ITDebugLog(@"Audioscrobbler: Creating a new timer that will run in %i seconds", interval - elapsed);
-				_audioscrobblerTimer = [NSTimer scheduledTimerWithTimeInterval:(interval - elapsed) target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:YES];
+			} else if (requiredInterval - elapsed > 0) {
+				_audioscrobblerInterval = requiredInterval - elapsed;
+				[_audioscrobblerTimer release];
+				NSLog(@"Audioscrobbler: Creating a new timer that will run in %i seconds", _audioscrobblerInterval);
+				ITDebugLog(@"Audioscrobbler: Creating a new timer that will run in %i seconds", _audioscrobblerInterval);
+				_audioscrobblerTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:_audioscrobblerInterval] interval:1.0 target:self selector:@selector(submitAudioscrobblerTrack:) userInfo:nil repeats:NO];
+				[[NSRunLoop currentRunLoop] addTimer:_audioscrobblerTimer forMode:NSDefaultRunLoopMode];
+			} else {
+				NSLog(@"Audioscrobbler: Skipping submission. %i, %i", requiredInterval, elapsed);
 			}
 		NS_HANDLER
 			[self networkError:localException];
@@ -1217,9 +1233,9 @@ static MainController *sharedController;
 
 - (void)updateTime:(NSTimer *)timer
 {
-	StatusWindow *sw = [StatusWindow sharedWindow];
+	StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
 	_timeUpdateCount++;
-	if (_timeUpdateCount < (int)[sw exitDelay] + (int)[[sw exitEffect] effectTime] + (int)[[sw entryEffect] effectTime]) {
+	if ([sw visibilityState] != ITWindowHiddenState) {
 		NSString *time = nil, *length;
 		NS_DURING
 			length = [[self currentRemote] currentSongLength];
@@ -1517,12 +1533,14 @@ static MainController *sharedController;
 			if (refreshTimer) {
 				[refreshTimer invalidate];
 			}
-			refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
-									 target:self
-									 selector:@selector(timerUpdate)
-									 userInfo:nil
-									 repeats:YES] retain];
 		}
+		
+		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;
@@ -1547,10 +1565,12 @@ static MainController *sharedController;
     [networkController disconnect];
     
     if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
+		refreshTimer = nil;
         [self applicationLaunched:nil];
     } else {
         [self applicationTerminated:nil];
     }
+	
     if (refreshTimer) {
 		[self timerUpdate];
 	};