Added a status field to the audioscrobbler preferences. Using alloc'd NSTimers in...

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index cfc9518..b39d34d 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -9,6 +9,7 @@
 #import <ITKit/ITCategory-NSMenu.h>
 #import "StatusWindow.h"
 #import "StatusWindowController.h"
 #import <ITKit/ITCategory-NSMenu.h>
 #import "StatusWindow.h"
 #import "StatusWindowController.h"

+#import "AudioscrobblerController.h"

 #import "StatusItemHack.h"
 
 @interface NSMenu (MenuImpl)
 #import "StatusItemHack.h"
 
 @interface NSMenu (MenuImpl)


@@ -88,6 +89,7 @@ static MainController *sharedController;
         sharedController = self;
         
                _statusWindowUpdateTimer = nil;
         sharedController = self;
         
                _statusWindowUpdateTimer = nil;

+               _audioscrobblerTimer = nil;

                
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         [[PreferencesController sharedPrefs] setController:self];
                
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         [[PreferencesController sharedPrefs] setController:self];


@@ -138,6 +140,8 @@ static MainController *sharedController;
     currentRemote = [self loadRemote];
     [[self currentRemote] begin];
     
     currentRemote = [self loadRemote];
     [[self currentRemote] begin];
     

+       [[self currentRemote] currentSongElapsed];
+       

     //Turn on network stuff if needed
     networkController = [[NetworkController alloc] init];
     if ([df boolForKey:@"enableSharing"]) {
     //Turn on network stuff if needed
     networkController = [[NetworkController alloc] init];
     if ([df boolForKey:@"enableSharing"]) {


@@ -196,6 +200,12 @@ static MainController *sharedController;
     [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
 
     [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
 

+       if ([df boolForKey:@"audioscrobblerEnabled"]) {
+               if ([PreferencesController getKeychainItemPasswordForUser:[df stringForKey:@"audioscrobblerUser"]] != nil) {
+                       [[AudioscrobblerController sharedController] attemptHandshake:NO];
+               }
+       }
+

     [networkController startRemoteServerSearch];
     [NSApp deactivate];
        [self performSelector:@selector(rawr) withObject:nil afterDelay:1.0];
     [networkController startRemoteServerSearch];
     [NSApp deactivate];
        [self performSelector:@selector(rawr) withObject:nil afterDelay:1.0];


@@ -402,7 +412,12 @@ static MainController *sharedController;
 
 - (void)timerUpdate
 {
 
 - (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."];
        if (refreshTimer && identifier == nil) {
                if ([statusItem isEnabled]) {
                        [statusItem setToolTip:@"iTunes not responding."];


@@ -461,6 +476,19 @@ static MainController *sharedController;
                                        [statusItem setToolTip:nil];
                                }
                        }
                                        [statusItem setToolTip:nil];
                                }
                        }

+                       
+                       if ([df boolForKey:@"audioscrobblerEnabled"]) {
+                               int length = [[self currentRemote] currentSongDuration];
+                               if (length > 30) {
+                                       _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;
+                       }

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


@@ -575,6 +603,19 @@ static MainController *sharedController;
                                [statusItem setToolTip:nil];
                        }
                }
                                [statusItem setToolTip:nil];
                        }
                }

+               
+               if ([df boolForKey:@"audioscrobblerEnabled"]) {
+                       int length = [[self currentRemote] currentSongDuration];
+                       if (length > 30) {
+                               _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;
+               }

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


@@ -586,6 +627,35 @@ static MainController *sharedController;
     }
 }
 
     }
 }
 

+- (void)submitAudioscrobblerTrack:(NSTimer *)timer
+{
+       ITDebugLog(@"Audioscrobbler: Attempting to submit current track");
+       [timer invalidate];
+       if ([df boolForKey:@"audioscrobblerEnabled"]) {
+               NS_DURING
+                       int elapsed = [[self currentRemote] currentSongPlayed];
+                       if ((abs(elapsed - _audioscrobblerInterval) < 5) && ([[self currentRemote] playerPlayingState] == ITMTRemotePlayerPlaying)) {
+                               NSString *title = [[self currentRemote] currentSongTitle], *artist = [[self currentRemote] currentSongArtist];
+                               if (title && artist) {
+                                       ITDebugLog(@"Audioscrobbler: Submitting current track");
+                                       [[AudioscrobblerController sharedController] submitTrack:title
+                                                                                                                                       artist:artist
+                                                                                                                                       album:[[self currentRemote] currentSongAlbum]
+                                                                                                                                       length:[[self currentRemote] currentSongDuration]];
+                               }
+                       } else if (_audioscrobblerInterval - elapsed > 0) {
+                               ITDebugLog(@"Audioscrobbler: Creating a new timer that will run in %i seconds", _audioscrobblerInterval - elapsed);
+                               _audioscrobblerInterval -= elapsed;
+                               [_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];
+                       }
+               NS_HANDLER
+                       [self networkError:localException];
+               NS_ENDHANDLER
+       }
+}
+

 //
 //
 // Menu Selectors
 //
 //
 // Menu Selectors


@@ -905,7 +975,7 @@ static MainController *sharedController;
         [hotKey setName:@"TrackInfo"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]];
         [hotKey setTarget:self];
         [hotKey setName:@"TrackInfo"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]];
         [hotKey setTarget:self];

-        [hotKey setAction:@selector(showCurrentTrackInfo)];
+        [hotKey setAction:@selector(showCurrentTrackInfoHotKey)];

         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     


@@ -1015,6 +1085,18 @@ static MainController *sharedController;
     ITDebugLog(@"Finished setting up hot keys.");
 }
 
     ITDebugLog(@"Finished setting up hot keys.");
 }
 

+- (void)showCurrentTrackInfoHotKey
+{
+       //If we're already visible and the setting says so, vanish instead of displaying again.
+       if ([df boolForKey:@"ToggleTrackInfoWithHotKey"] && [statusWindowController currentStatusWindowType] == StatusWindowTrackInfoType && [[StatusWindow sharedWindow] visibilityState] == ITWindowVisibleState) {
+               ITDebugLog(@"Track window is already visible, hiding track window.");
+               [self invalidateStatusWindowUpdateTimer];
+               [[StatusWindow sharedWindow] vanish:nil];
+               return;
+       }
+       [self showCurrentTrackInfo];
+}
+

 - (void)showCurrentTrackInfo
 {
     ITMTRemotePlayerSource  source      = 0;
 - (void)showCurrentTrackInfo
 {
     ITMTRemotePlayerSource  source      = 0;


@@ -1039,16 +1121,18 @@ static MainController *sharedController;
     
     if ( title ) {
         if ( [df boolForKey:@"showAlbumArtwork"] ) {
     
     if ( title ) {
         if ( [df boolForKey:@"showAlbumArtwork"] ) {

-           NSSize oldSize, newSize;
-             NS_DURING
-                art = [[self currentRemote] currentSongAlbumArt];
-                oldSize = [art size];
-                if (oldSize.width > oldSize.height) newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width));
-                else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110);
-                art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
-            NS_HANDLER
-                [self networkError:localException];
-            NS_ENDHANDLER
+                       NSSize oldSize, newSize;
+                       NS_DURING
+                               art = [[self currentRemote] currentSongAlbumArt];
+                               oldSize = [art size];
+                               if (oldSize.width > oldSize.height) {
+                                       newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width));
+                               }
+                               else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110);
+                               art = [[[[NSImage alloc] initWithData:[art TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
+                       NS_HANDLER
+                               [self networkError:localException];
+                       NS_ENDHANDLER

         }
         
         if ( [df boolForKey:@"showAlbum"] ) {
         }
         
         if ( [df boolForKey:@"showAlbum"] ) {


@@ -1145,9 +1229,9 @@ static MainController *sharedController;
 
 - (void)updateTime:(NSTimer *)timer
 {
 
 - (void)updateTime:(NSTimer *)timer
 {

-       StatusWindow *sw = [StatusWindow sharedWindow];
+       StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];

        _timeUpdateCount++;
        _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];
                NSString *time = nil, *length;
                NS_DURING
                        length = [[self currentRemote] currentSongLength];


@@ -1329,9 +1413,11 @@ static MainController *sharedController;
 
 - (void)setRating:(ITHotKey *)sender
 {
 
 - (void)setRating:(ITHotKey *)sender
 {

-    int stars = [[sender name] characterAtIndex:9] - 48;
-    [self selectSongRating:stars * 20];
-    [statusWindowController showRatingWindowWithRating:(float)stars / 5.0];
+       if ([self songIsPlaying]) {
+               int stars = [[sender name] characterAtIndex:9] - 48;
+               [self selectSongRating:stars * 20];
+               [statusWindowController showRatingWindowWithRating:(float)stars / 5.0];
+       }

 }
 
 - (void)toggleLoop
 }
 
 - (void)toggleLoop


@@ -1443,12 +1529,14 @@ static MainController *sharedController;
                        if (refreshTimer) {
                                [refreshTimer invalidate];
                        }
                        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;
         [self timerUpdate];
         ITDebugLog(@"Connection successful.");
         return 1;


@@ -1473,10 +1561,12 @@ static MainController *sharedController;
     [networkController disconnect];
     
     if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
     [networkController disconnect];
     
     if ([[self currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {

+               refreshTimer = nil;

         [self applicationLaunched:nil];
     } else {
         [self applicationTerminated:nil];
     }
         [self applicationLaunched:nil];
     } else {
         [self applicationTerminated:nil];
     }

+       

     if (refreshTimer) {
                [self timerUpdate];
        };
     if (refreshTimer) {
                [self timerUpdate];
        };