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

diff --git a/AudioscrobblerController.m b/AudioscrobblerController.m
index a3d3b6b..05a3a07 100644
--- a/AudioscrobblerController.m
+++ b/AudioscrobblerController.m
@@ -16,7 +16,7 @@
 #import <openssl/evp.h>
 #import <ITFoundation/ITDebug.h>
 
-#define AUDIOSCROBBLER_ID @"tst"
+#define AUDIOSCROBBLER_ID @"mtu"
 #define AUDIOSCROBBLER_VERSION [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]
 
 static AudioscrobblerController *_sharedController = nil;
@@ -43,16 +43,17 @@ static AudioscrobblerController *_sharedController = nil;
 		_postURL = [NSURL URLWithString:@"http://audioscrobbler.com/"];*/
 		
 		_delayDate = [[NSDate date] retain];
-		_responseData = nil;
+		_responseData = [[NSMutableData alloc] init];
 		_tracks = [[NSMutableArray alloc] init];
 		_submitTracks = [[NSMutableArray alloc] init];
-		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAudioscrobblerNotification:) name:nil object:self];
+		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAudioscrobblerNotification:) name:@"AudioscrobblerHandshakeComplete" object:self];
 	}
 	return self;
 }
 
 - (void)dealloc
 {
+	[_lastStatus release];
 	[_md5Challenge release];
 	[_postURL release];
 	[_responseData release];
@@ -62,6 +63,11 @@ static AudioscrobblerController *_sharedController = nil;
 	[super dealloc];
 }
 
+- (NSString *)lastStatus
+{
+	return _lastStatus;
+}
+
 - (void)attemptHandshake
 {
 	[self attemptHandshake:NO];
@@ -85,8 +91,12 @@ static AudioscrobblerController *_sharedController = nil;
 	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]];
 		
+		[_lastStatus release];
+		_lastStatus = [NSLocalizedString(@"audioscrobbler_handshaking", @"Attempting to handshake with server") retain];
+		[[NSNotificationCenter defaultCenter] postNotificationName:@"AudioscrobblerStatusChanged" object:nil userInfo:[NSDictionary dictionaryWithObject:_lastStatus forKey:@"StatusString"]];
+		
 		_currentStatus = AudioscrobblerRequestingHandshakeStatus;
-		_responseData = [[NSMutableData alloc] init];
+		//_responseData = [[NSMutableData alloc] init];
 		[NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:15] delegate:self];
 	}
 }
@@ -204,27 +214,33 @@ static AudioscrobblerController *_sharedController = nil;
 	}
 	
 	ITDebugLog(@"Audioscrobbler: Sending track submission request");
+	[_lastStatus release];
+	_lastStatus = [NSLocalizedString(@"audioscrobbler_submitting", @"Submitting tracks to server") retain];
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"AudioscrobblerStatusChanged" object:nil userInfo:[NSDictionary dictionaryWithObject:_lastStatus forKey:@"StatusString"]];
 	
 	//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;
-	_responseData = [[NSMutableData alloc] init];
+	//_responseData = [[NSMutableData alloc] init];
+	[_responseData setData:nil];
 	[NSURLConnection connectionWithRequest:request delegate:self];
 	[requestString release];
 	[request release];
 	
+	//For now we're not going to cache results, as it is less of a headache
+	//[_tracks removeObjectsInArray:_submitTracks];
+	[_tracks removeAllObjects];
+	[_submitTracks removeAllObjects];
+	
 	//If we have tracks left, submit again after the interval seconds
 }
 
 - (void)handleAudioscrobblerNotification:(NSNotification *)note
 {
-	if ([[note name] isEqualToString:@"AudioscrobblerHandshakeComplete"]) {
-		if ([_tracks count] > 0) {
-			[self performSelector:@selector(submitTracks) withObject:nil afterDelay:2];
-		}
+	if ([_tracks count] > 0) {
+		[self performSelector:@selector(submitTracks) withObject:nil afterDelay:2];
 	}
 }
 
@@ -232,6 +248,10 @@ static AudioscrobblerController *_sharedController = nil;
 
 - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
 {
+	[_responseData setData:nil];
+	[_lastStatus release];
+	_lastStatus = [[NSString stringWithFormat:NSLocalizedString(@"audioscrobbler_error", @"Error - %@"), [error localizedDescription]] retain];
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"AudioscrobblerStatusChanged" object:self userInfo:[NSDictionary dictionaryWithObject:_lastStatus forKey:@"StatusString"]];
 	ITDebugLog(@"Audioscrobbler: Connection error \"%@\"", error);
 }
 
@@ -244,13 +264,12 @@ static AudioscrobblerController *_sharedController = nil;
 {
 	NSString *string = [[NSString alloc] initWithData:_responseData encoding:NSASCIIStringEncoding];
 	NSArray *lines = [string componentsSeparatedByString:@"\n"];
-	NSString *responseAction = nil;
+	NSString *responseAction = nil, *key = nil, *comment = 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
@@ -261,33 +280,47 @@ static AudioscrobblerController *_sharedController = nil;
 				_postURL = [[NSURL alloc] initWithString:[lines objectAtIndex:2]];
 				_handshakeCompleted = YES;
 				[[NSNotificationCenter defaultCenter] postNotificationName:@"AudioscrobblerHandshakeComplete" object:self];
+				key = @"audioscrobbler_handshake_complete";
+				comment = @"Handshake complete";
 			} else {
 				//We have a protocol error
 			}
 		} else if (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"FAILED"]) {
 			ITDebugLog(@"Audioscrobbler: Handshake failed (%@)", [responseAction substringFromIndex:6]);
+			key = @"audioscrobbler_handshake_failed";
+			comment = @"Handshake failed";
 			//We have a error
 		} else if ([responseAction isEqualToString:@"BADUSER"]) {
 			ITDebugLog(@"Audioscrobbler: Bad user name");
+			key = @"audioscrobbler_bad_user";
+			comment = @"Handshake failed - invalid user name";
 			//We have a bad user
 		} else {
 			ITDebugLog(@"Audioscrobbler: Handshake failed, protocol error");
+			key = @"audioscrobbler_protocol_error";
+			comment = @"Internal 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];
+			/*[_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];
 			}
+			key = @"audioscrobbler_submission_ok";
+			comment = @"Last track submission successful";
 		} else if ([responseAction isEqualToString:@"BADAUTH"]) {
 			ITDebugLog(@"Audioscrobbler: Bad password");
+			key = @"audioscrobbler_bad_password";
+			comment = @"Last track submission failed - invalid password";
 			//Bad auth
 		} else if (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"FAILED"]) {
 			ITDebugLog(@"Audioscrobbler: Submission failed (%@)", [responseAction substringFromIndex:6]);
+			key = @"audioscrobbler_submission_failed";
+			comment = @"Last track submission failed - see console for error";
 			//Failed
 		}
 	}
@@ -302,9 +335,17 @@ static AudioscrobblerController *_sharedController = nil;
 		ITDebugLog(@"No interval response.");
 		//We have a protocol error
 	}
-	
+	[_lastStatus release];
+	_lastStatus = [NSLocalizedString(key, comment) retain];
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"AudioscrobblerStatusChanged" object:nil userInfo:[NSDictionary dictionaryWithObject:_lastStatus forKey:@"StatusString"]];
 	[string release];
-	[_responseData release];
+	[_responseData setData:nil];
+}
+
+-(NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse
+{
+	//Don't cache any Audioscrobbler communication
+	return nil;
 }
 
 @end