X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/259ae5fac769954c7db5974b86e791a929fe6700..276579746a9cbe94b358155d6eb1aff0b07760a0:/AudioscrobblerController.m

diff --git a/AudioscrobblerController.m b/AudioscrobblerController.m
index 6206ad8..29c8ecf 100644
--- a/AudioscrobblerController.m
+++ b/AudioscrobblerController.m
@@ -51,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;
@@ -64,10 +65,17 @@ 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) {
@@ -126,7 +134,7 @@ static AudioscrobblerController *_sharedController = nil;
 	char *pass = (char *)[passString UTF8String];
 	
 	if (passString == nil) {
-		NSLog(@"Audioscrobbler: Access denied to user password");
+		ITDebugLog(@"Audioscrobbler: Access denied to user password");
 		return;
 	}
 	
@@ -185,8 +193,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];
 	}
 	
+	ITDebugLog(@"Audioscrobbler: Sending track submission request");
+	
 	//Create and send the request
 	NSMutableURLRequest *request = [[NSURLRequest requestWithURL:_postURL cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:15] mutableCopy];
 	[request setHTTPMethod:@"POST"];
@@ -230,7 +241,7 @@ 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
@@ -245,17 +256,29 @@ static AudioscrobblerController *_sharedController = nil;
 				//We have a protocol error
 			}
 		} 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 {
+			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
 		}
 	}