X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/34a2a6ce5cce484c5b8dcd413efa1181130fbab0..b837b70f50ce4d33628f406380c447ff8e70d85a:/AudioscrobblerController.m diff --git a/AudioscrobblerController.m b/AudioscrobblerController.m index 270704b..05a3a07 100644 --- a/AudioscrobblerController.m +++ b/AudioscrobblerController.m @@ -43,7 +43,7 @@ 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:@"AudioscrobblerHandshakeComplete" object:self]; @@ -96,7 +96,7 @@ static AudioscrobblerController *_sharedController = nil; [[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]; } } @@ -220,11 +220,11 @@ static AudioscrobblerController *_sharedController = nil; //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]; @@ -248,7 +248,7 @@ static AudioscrobblerController *_sharedController = nil; - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { - [_responseData release]; + [_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"]]; @@ -270,7 +270,6 @@ static AudioscrobblerController *_sharedController = nil; responseAction = [lines objectAtIndex:0]; } ITDebugLog(@"Audioscrobbler: Response %@", string); - NSLog(@"Audioscrobbler: Response %@", string); if (_currentStatus == AudioscrobblerRequestingHandshakeStatus) { if ([lines count] < 2) { //We have a protocol error @@ -320,7 +319,6 @@ static AudioscrobblerController *_sharedController = nil; //Bad auth } else if (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"FAILED"]) { ITDebugLog(@"Audioscrobbler: Submission failed (%@)", [responseAction substringFromIndex:6]); - NSLog(@"Audioscrobbler: Submission failed (%@)", [responseAction substringFromIndex:6]); key = @"audioscrobbler_submission_failed"; comment = @"Last track submission failed - see console for error"; //Failed @@ -341,7 +339,7 @@ static AudioscrobblerController *_sharedController = nil; _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