Added lots of debug messages.

[MenuTunes.git] / AudioscrobblerController.m

diff --git a/AudioscrobblerController.m b/AudioscrobblerController.m
index 4addcaf..29c8ecf 100644 (file)
--- a/AudioscrobblerController.m
+++ b/AudioscrobblerController.m
@@ -16,6 +16,9 @@
 #import <openssl/evp.h>
 #import <ITFoundation/ITDebug.h>
 
+#define AUDIOSCROBBLER_ID @"tst"
+#define AUDIOSCROBBLER_VERSION [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]
+
 static AudioscrobblerController *_sharedController = nil;
 
 @implementation AudioscrobblerController
@@ -48,9 +51,10 @@ static AudioscrobblerController *_sharedController = nil;
                _md5Challenge = @"rawr";
                _postURL = [NSURL URLWithString:@"http://audioscrobbler.com/"];*/
                
-               _delayDate = nil;
+               _delayDate = [[NSDate date] retain];
                _responseData = nil;
                _tracks = [[NSMutableArray alloc] init];
+               _submitTracks = [[NSMutableArray alloc] init];
                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAudioscrobblerNotification:) name:nil object:self];
        }
        return self;
@@ -61,12 +65,23 @@ static AudioscrobblerController *_sharedController = nil;
        [_md5Challenge release];
        [_postURL release];
        [_responseData release];
+       [_submitTracks release];
        [_tracks release];
+       [_delayDate release];
        [super dealloc];
 }
 
 - (void)attemptHandshake
 {
+       [self attemptHandshake:NO];
+}
+
+- (void)attemptHandshake:(BOOL)force
+{
+       if (_handshakeCompleted && !force) {
+               return;
+       }
+       
        //Delay if we haven't met the interval time limit
        NSTimeInterval interval = [_delayDate timeIntervalSinceNow];
        if (interval > 0) {
@@ -75,13 +90,13 @@ static AudioscrobblerController *_sharedController = nil;
                return;
        }
        
-       if (!_handshakeCompleted) {
-               NSString *version = [[[NSBundle bundleWithPath:[[NSWorkspace sharedWorkspace] fullPathForApplication:@"iTunes.app"]] infoDictionary] objectForKey:@"CFBundleVersion"], *user = @"Tristrex";
-               NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://post.audioscrobbler.com/?hs=true&p=1.1&c=tst&v=%@&u=%@", version, user]];
+       NSString *user = [[NSUserDefaults standardUserDefaults] stringForKey:@"audioscrobblerUser"];
+       if (!_handshakeCompleted && user) {
+               NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://post.audioscrobbler.com/?hs=true&p=1.1&c=%@&v=%@&u=%@", AUDIOSCROBBLER_ID, AUDIOSCROBBLER_VERSION, user]];
                
                _currentStatus = AudioscrobblerRequestingHandshakeStatus;
                _responseData = [[NSMutableData alloc] init];
-               [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30] delegate:self];
+               [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:15] delegate:self];
        }
 }
 
@@ -111,7 +126,15 @@ static AudioscrobblerController *_sharedController = nil;
 - (void)submitTracks
 {
        if (!_handshakeCompleted) {
-               [self attemptHandshake];
+               [self attemptHandshake:NO];
+               return;
+       }
+       
+       NSString *user = [[NSUserDefaults standardUserDefaults] stringForKey:@"audioscrobblerUser"], *passString = [PreferencesController getKeychainItemPasswordForUser:user];
+       char *pass = (char *)[passString UTF8String];
+       
+       if (passString == nil) {
+               ITDebugLog(@"Audioscrobbler: Access denied to user password");
                return;
        }
        
@@ -125,8 +148,6 @@ static AudioscrobblerController *_sharedController = nil;
        int i;
        NSMutableString *requestString;
        NSString *authString, *responseHash = @"";
-       NSString *user = [[NSUserDefaults standardUserDefaults] stringForKey:@"audioscrobblerUser"];
-       char *pass = (char *)[[PreferencesController getKeychainItemPasswordForUser:user] UTF8String];
        unsigned char *buffer;
        EVP_MD_CTX ctx;
        
@@ -172,10 +193,13 @@ static AudioscrobblerController *_sharedController = nil;
                trackString = (NSString *)CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)[NSString stringWithFormat:@"&a[%i]=%@&t[%i]=%@&b[%i]=%@&m[%i]=&l[%i]=%@&i[%i]=%@", i, [nextTrack objectForKey:@"artist"], i, [nextTrack objectForKey:@"title"], i, [nextTrack objectForKey:@"album"], i, i, [nextTrack objectForKey:@"length"], i, [nextTrack objectForKey:@"time"]], NULL, NULL, kCFStringEncodingUTF8);
                [requestString appendString:trackString];
                [trackString release];
+               [_submitTracks addObject:nextTrack];
        }
        
+       ITDebugLog(@"Audioscrobbler: Sending track submission request");
+       
        //Create and send the request
-       NSMutableURLRequest *request = [[NSURLRequest requestWithURL:_postURL cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30] mutableCopy];
+       NSMutableURLRequest *request = [[NSURLRequest requestWithURL:_postURL cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:15] mutableCopy];
        [request setHTTPMethod:@"POST"];
        [request setHTTPBody:[requestString dataUsingEncoding:NSUTF8StringEncoding]];
        _currentStatus = AudioscrobblerSubmittingTracksStatus;
@@ -217,12 +241,12 @@ static AudioscrobblerController *_sharedController = nil;
        if ([lines count] > 0) {
                responseAction = [lines objectAtIndex:0];
        }
-       
+       ITDebugLog(@"Audioscrobbler: Response %@", string);
        if (_currentStatus == AudioscrobblerRequestingHandshakeStatus) {
                if ([lines count] < 2) {
                        //We have a protocol error
                }
-               if ([responseAction isEqualToString:@"UPTODATE"]) {
+               if ([responseAction isEqualToString:@"UPTODATE"] || (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"UPDATE"])) {
                        if ([lines count] >= 4) {
                                _md5Challenge = [[lines objectAtIndex:1] retain];
                                _postURL = [[NSURL alloc] initWithString:[lines objectAtIndex:2]];
@@ -231,21 +255,30 @@ static AudioscrobblerController *_sharedController = nil;
                        } else {
                                //We have a protocol error
                        }
-                       //Something
-               } else if (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"UPDATE"]) {
-                       //Something plus update action
                } else if (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"FAILED"]) {
+                       ITDebugLog(@"Audioscrobbler: Handshake failed (%@)", [responseAction substringFromIndex:6]);
                        //We have a error
                } else if ([responseAction isEqualToString:@"BADUSER"]) {
+                       ITDebugLog(@"Audioscrobbler: Bad user name");
                        //We have a bad user
                } else {
-                       //We have a protocol
+                       ITDebugLog(@"Audioscrobbler: Handshake failed, protocol error");
+                       //We have a protocol error
                }
        } else if (_currentStatus == AudioscrobblerSubmittingTracksStatus) {
                if ([responseAction isEqualToString:@"OK"]) {
+                       ITDebugLog(@"Audioscrobbler: Submission successful, clearing queue.");
+                       [_tracks removeObjectsInArray:_submitTracks];
+                       [_submitTracks removeAllObjects];
+                       if ([_tracks count] > 0) {
+                               ITDebugLog(@"Audioscrobbler: Tracks remaining in queue, submitting remaining tracks");
+                               [self performSelector:@selector(submitTracks) withObject:nil afterDelay:2];
+                       }
                } else if ([responseAction isEqualToString:@"BADAUTH"]) {
+                       ITDebugLog(@"Audioscrobbler: Bad password");
                        //Bad auth
                } else if (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"FAILED"]) {
+                       ITDebugLog(@"Audioscrobbler: Submission failed (%@)", [responseAction substringFromIndex:6]);
                        //Failed
                }
        }