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

diff --git a/AudioscrobblerController.m b/AudioscrobblerController.m
index 6206ad8..a3d3b6b 100644
--- a/AudioscrobblerController.m
+++ b/AudioscrobblerController.m
@@ -23,15 +23,6 @@ static AudioscrobblerController *_sharedController = nil;
 
 @implementation AudioscrobblerController
 
-/*+ (void)load
-{
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	[[AudioscrobblerController sharedController] submitTrack:@"Immigrant Song" artist:@"Led Zeppelin" album:@"How The West Was Won" length:221];
-	[[AudioscrobblerController sharedController] submitTrack:@"Comfortably Numb" artist:@"Pink Floyd" album:@"The Wall" length:384];
-	[[AudioscrobblerController sharedController] submitTracks];
-	[pool release];
-}*/
-
 + (AudioscrobblerController *)sharedController
 {
 	if (!_sharedController) {
@@ -51,9 +42,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 +56,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 +125,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;
 	}
 	
@@ -180,15 +179,35 @@ static AudioscrobblerController *_sharedController = nil;
 	//We can only submit ten tracks at a time
 	for (i = 0; (i < [_tracks count]) && (i < 10); i++) {
 		NSDictionary *nextTrack = [_tracks objectAtIndex:i];
-		NSString *trackString;
+		NSString *artistEscaped, *titleEscaped, *albumEscaped, *timeEscaped, *ampersand = @"&";
+		
+		//Escape each of the individual parameters we're sending
+		artistEscaped = (NSString *)CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)[nextTrack objectForKey:@"artist"], NULL, (CFStringRef)ampersand, kCFStringEncodingUTF8);
+		titleEscaped = (NSString *)CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)[nextTrack objectForKey:@"title"], NULL, (CFStringRef)ampersand, kCFStringEncodingUTF8);
+		albumEscaped = (NSString *)CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)[nextTrack objectForKey:@"album"], NULL, (CFStringRef)ampersand, kCFStringEncodingUTF8);
+		timeEscaped = (NSString *)CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)[nextTrack objectForKey:@"time"], NULL, (CFStringRef)ampersand, kCFStringEncodingUTF8);
 		
-		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];
+		[requestString appendString:[NSString stringWithFormat:@"&a[%i]=%@&t[%i]=%@&b[%i]=%@&m[%i]=&l[%i]=%@&i[%i]=%@", i, artistEscaped,
+																														i, titleEscaped,
+																														i, albumEscaped,
+																														i,
+																														i, [nextTrack objectForKey:@"length"],
+																														i, timeEscaped]];
+		
+		//Release the escaped strings
+		[artistEscaped release];
+		[titleEscaped release];
+		[albumEscaped release];
+		[timeEscaped 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];
+	NSLog(@"Posting Audioscrobbler URL request: %@", requestString);
 	[request setHTTPMethod:@"POST"];
 	[request setHTTPBody:[requestString dataUsingEncoding:NSUTF8StringEncoding]];
 	_currentStatus = AudioscrobblerSubmittingTracksStatus;
@@ -230,7 +249,8 @@ static AudioscrobblerController *_sharedController = nil;
 	if ([lines count] > 0) {
 		responseAction = [lines objectAtIndex:0];
 	}
-	
+	ITDebugLog(@"Audioscrobbler: Response %@", string);
+	NSLog(@"Audioscrobbler: Response %@", string);
 	if (_currentStatus == AudioscrobblerRequestingHandshakeStatus) {
 		if ([lines count] < 2) {
 			//We have a protocol error
@@ -245,17 +265,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
 		}
 	}