@interface AudioscrobblerController : NSObject {
BOOL _handshakeCompleted;
AudioscrobblerStatus _currentStatus;
- NSMutableArray *_tracks;
+ NSMutableArray *_tracks, *_submitTracks;
NSDate *_delayDate;
NSString *_md5Challenge;
_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;
[_md5Challenge release];
[_postURL release];
[_responseData release];
+ [_submitTracks release];
[_tracks release];
[super dealloc];
}
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
}
} 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"]) {
[statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
if ([df boolForKey:@"audioscrobblerEnabled"]) {
- [[AudioscrobblerController sharedController] attemptHandshake:NO];
+ if ([PreferencesController getKeychainItemPasswordForUser:[df stringForKey:@"audioscrobblerUser"]] != nil) {
+ [[AudioscrobblerController sharedController] attemptHandshake:NO];
+ }
}
[networkController startRemoteServerSearch];
SecKeychainAttribute attributes[3];
SecKeychainAttributeList list;
+ if ((user == nil) || ([user length] == 0)) {
+ return nil;
+ }
+
ITDebugLog(@"Audioscrobbler: Searching for keychain item for %@.", user);
attributes[0].tag = kSecAccountItemAttr;
attributes[0].data = (char *)[user UTF8String];