Now removing items from the submission queue after success.

[MenuTunes.git] / AudioscrobblerController.m

diff --git a/AudioscrobblerController.m b/AudioscrobblerController.m
index 79bad7b..552d949 100644 (file)
--- a/AudioscrobblerController.m
+++ b/AudioscrobblerController.m
@@ -54,6 +54,7 @@ static AudioscrobblerController *_sharedController = nil;
                _delayDate = nil;
                _responseData = nil;
                _tracks = [[NSMutableArray alloc] init];
+               _submitTracks = [[NSMutableArray alloc] init];
                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAudioscrobblerNotification:) name:nil object:self];
        }
        return self;
@@ -64,12 +65,17 @@ static AudioscrobblerController *_sharedController = nil;
        [_md5Challenge release];
        [_postURL release];
        [_responseData release];
+       [_submitTracks release];
        [_tracks release];
        [super dealloc];
 }
 
-- (void)attemptHandshake
+- (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) {
@@ -84,7 +90,7 @@ static AudioscrobblerController *_sharedController = nil;
                
                _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];
        }
 }
 
@@ -114,7 +120,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) {
+               NSLog(@"Audioscrobbler: Access denied to user password");
                return;
        }
        
@@ -128,8 +142,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;
        
@@ -175,10 +187,11 @@ 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];
        }
        
        //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;
@@ -225,7 +238,7 @@ static AudioscrobblerController *_sharedController = nil;
                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]];
@@ -234,18 +247,17 @@ 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"]) {
                        //We have a error
                } else if ([responseAction isEqualToString:@"BADUSER"]) {
                        //We have a bad user
                } else {
-                       //We have a protocol
+                       //We have a protocol error
                }
        } else if (_currentStatus == AudioscrobblerSubmittingTracksStatus) {
                if ([responseAction isEqualToString:@"OK"]) {
+                       [_tracks removeObjectsInArray:_submitTracks];
+                       [_submitTracks removeAllObjects];
                } else if ([responseAction isEqualToString:@"BADAUTH"]) {
                        //Bad auth
                } else if (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"FAILED"]) {