#import <openssl/evp.h>
#import <ITFoundation/ITDebug.h>
+#define AUDIOSCROBBLER_ID @"tst"
+#define AUDIOSCROBBLER_VERSION [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]
+
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) {
_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;
[_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) {
+ return;
+ }
+
//Delay if we haven't met the interval time limit
NSTimeInterval interval = [_delayDate timeIntervalSinceNow];
if (interval > 0) {
return;
}
- if (!_handshakeCompleted) {
- NSString *version = [[[NSBundle bundleWithPath:[[NSWorkspace sharedWorkspace] fullPathForApplication:@"iTunes.app"]] infoDictionary] objectForKey:@"CFBundleVersion"], *user = @"Tristrex";
- NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://post.audioscrobbler.com/?hs=true&p=1.1&c=tst&v=%@&u=%@", version, user]];
+ NSString *user = [[NSUserDefaults standardUserDefaults] stringForKey:@"audioscrobblerUser"];
+ 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]];
_currentStatus = AudioscrobblerRequestingHandshakeStatus;
_responseData = [[NSMutableData alloc] init];
- [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30] delegate:self];
+ [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:15] delegate:self];
}
}
- (void)submitTracks
{
if (!_handshakeCompleted) {
- [self attemptHandshake];
+ [self attemptHandshake:NO];
+ return;
+ }
+
+ NSString *user = [[NSUserDefaults standardUserDefaults] stringForKey:@"audioscrobblerUser"], *passString = [PreferencesController getKeychainItemPasswordForUser:user];
+ char *pass = (char *)[passString UTF8String];
+
+ if (passString == nil) {
+ ITDebugLog(@"Audioscrobbler: Access denied to user password");
return;
}
int i;
NSMutableString *requestString;
NSString *authString, *responseHash = @"";
- NSString *user = [[NSUserDefaults standardUserDefaults] stringForKey:@"audioscrobblerUser"];
- char *pass = (char *)[[PreferencesController getKeychainItemPasswordForUser:user] UTF8String];
unsigned char *buffer;
EVP_MD_CTX ctx;
//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);
+
+ [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]];
- 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];
+ //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:30] mutableCopy];
+ 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;
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
}
- if ([responseAction isEqualToString:@"UPTODATE"]) {
+ if ([responseAction isEqualToString:@"UPTODATE"] || (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"UPDATE"])) {
if ([lines count] >= 4) {
_md5Challenge = [[lines objectAtIndex:1] retain];
_postURL = [[NSURL alloc] initWithString:[lines objectAtIndex:2]];
} else {
//We have a protocol error
}
- //Something
- } else if (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"UPDATE"]) {
- //Something plus update action
} 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 {
- //We have a protocol
+ 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
}
}
git.ithinksw.org / MenuTunes.git / blobdiff