git.ithinksw.org / MenuTunes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Handshake is attempted at launch and when the username is changed. Lowered timeout...
[MenuTunes.git] / AudioscrobblerController.m
diff --git a/AudioscrobblerController.m b/AudioscrobblerController.m
index 62653ba..6206ad8 100644 (file)
--- a/AudioscrobblerController.m
+++ b/AudioscrobblerController.m
@@ -12,21 +12,25 @@
  */
 
 #import "AudioscrobblerController.h"
  */
 
 #import "AudioscrobblerController.h"
+#import "PreferencesController.h"
 #import <openssl/evp.h>
 #import <ITFoundation/ITDebug.h>
 
 #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
 
 static AudioscrobblerController *_sharedController = nil;
 
 @implementation AudioscrobblerController
 
-+ (void)load
+/*+ (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];
 {
        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
 {
 
 + (AudioscrobblerController *)sharedController
 {
@@ -39,13 +43,13 @@ static AudioscrobblerController *_sharedController = nil;
 - (id)init
 {
        if ( (self = [super init]) ) {
 - (id)init
 {
        if ( (self = [super init]) ) {
-               /*_handshakeCompleted = NO;
+               _handshakeCompleted = NO;
                _md5Challenge = nil;
                _md5Challenge = nil;
-               _postURL = nil;*/
+               _postURL = nil;
                
                
-               _handshakeCompleted = YES;
+               /*_handshakeCompleted = YES;
                _md5Challenge = @"rawr";
                _md5Challenge = @"rawr";
-               _postURL = [NSURL URLWithString:@"http://audioscrobbler.com/"];
+               _postURL = [NSURL URLWithString:@"http://audioscrobbler.com/"];*/
                
                _delayDate = nil;
                _responseData = nil;
                
                _delayDate = nil;
                _responseData = nil;
@@ -64,8 +68,12 @@ static AudioscrobblerController *_sharedController = nil;
        [super dealloc];
 }
 
        [super dealloc];
 }
 
-- (void)attemptHandshake
+- (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) {
        //Delay if we haven't met the interval time limit
        NSTimeInterval interval = [_delayDate timeIntervalSinceNow];
        if (interval > 0) {
@@ -74,13 +82,13 @@ static AudioscrobblerController *_sharedController = nil;
                return;
        }
        
                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]];
-               NSURLConnection *connection;
+       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;
                
                _currentStatus = AudioscrobblerRequestingHandshakeStatus;
-               connection = [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30] delegate:self];
+               _responseData = [[NSMutableData alloc] init];
+               [NSURLConnection connectionWithRequest:[NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:15] delegate:self];
        }
 }
 
        }
 }
 
@@ -91,16 +99,12 @@ static AudioscrobblerController *_sharedController = nil;
 
 - (void)submitTrack:(NSString *)title artist:(NSString *)artist album:(NSString *)album length:(int)length
 {
 
 - (void)submitTrack:(NSString *)title artist:(NSString *)artist album:(NSString *)album length:(int)length
 {
-       if (!_handshakeCompleted) {
-               [self attemptHandshake];
-               return;
-       }
        ITDebugLog(@"Audioscrobbler: Adding a new track to the submission queue.");
        NSDictionary *newTrack = [NSDictionary dictionaryWithObjectsAndKeys:title,
                                                                                                                                                @"title",
                                                                                                                                                artist,
                                                                                                                                                @"artist",
        ITDebugLog(@"Audioscrobbler: Adding a new track to the submission queue.");
        NSDictionary *newTrack = [NSDictionary dictionaryWithObjectsAndKeys:title,
                                                                                                                                                @"title",
                                                                                                                                                artist,
                                                                                                                                                @"artist",
-                                                                                                                                               album,
+                                                                                                                                               (album == nil) ? @"" : album,
                                                                                                                                                @"album",
                                                                                                                                                [NSString stringWithFormat:@"%i", length],
                                                                                                                                                @"length",
                                                                                                                                                @"album",
                                                                                                                                                [NSString stringWithFormat:@"%i", length],
                                                                                                                                                @"length",
@@ -108,29 +112,37 @@ static AudioscrobblerController *_sharedController = nil;
                                                                                                                                                @"time",
                                                                                                                                                nil, nil];
        [_tracks addObject:newTrack];
                                                                                                                                                @"time",
                                                                                                                                                nil, nil];
        [_tracks addObject:newTrack];
+       [self submitTracks];
 }
 
 - (void)submitTracks
 {
 }
 
 - (void)submitTracks
 {
+       if (!_handshakeCompleted) {
+               [self attemptHandshake:NO];
+               return;
+       }
+       
+       NSString *user = [[NSUserDefaults standardUserDefaults] stringForKey:@"audioscrobblerUser"], *passString = [PreferencesController getKeychainItemPasswordForUser:user];
+       char *pass = (char *)[passString UTF8String];
+       
+       if (passString == nil) {
+               NSLog(@"Audioscrobbler: Access denied to user password");
+               return;
+       }
+       
        NSTimeInterval interval = [_delayDate timeIntervalSinceNow];
        if (interval > 0) {
        NSTimeInterval interval = [_delayDate timeIntervalSinceNow];
        if (interval > 0) {
-               ITDebugLog(@"Audioscrobbler: Delaying track submission for %i seconds", interval);
-               [self performSelector:@selector(attemptHandshake) withObject:nil afterDelay:interval + 1];
+               ITDebugLog(@"Audioscrobbler: Delaying track submission for %f seconds", interval);
+               [self performSelector:@selector(submitTracks) withObject:nil afterDelay:interval + 1];
                return;
        }
        
        int i;
        NSMutableString *requestString;
                return;
        }
        
        int i;
        NSMutableString *requestString;
-       NSString *authString, *responseHash;
-       char *pass = "waffles";
+       NSString *authString, *responseHash = @"";
        unsigned char *buffer;
        EVP_MD_CTX ctx;
        
        unsigned char *buffer;
        EVP_MD_CTX ctx;
        
-       if (!_handshakeCompleted) {
-               [self attemptHandshake];
-               return;
-       }
-       
        ITDebugLog(@"Audioscrobbler: Submitting queued tracks");
        
        if ([_tracks count] == 0) {
        ITDebugLog(@"Audioscrobbler: Submitting queued tracks");
        
        if ([_tracks count] == 0) {
@@ -161,12 +173,12 @@ static AudioscrobblerController *_sharedController = nil;
        }
        free(buffer);
        
        }
        free(buffer);
        
-       authString = (NSString *)CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)[NSString stringWithFormat:@"u=%@&s=%@", @"Tristrex", responseHash], NULL, NULL, kCFStringEncodingUTF8);
+       authString = (NSString *)CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)[NSString stringWithFormat:@"u=%@&s=%@", user, responseHash], NULL, NULL, kCFStringEncodingUTF8);
        requestString = [[NSMutableString alloc] initWithString:authString];
        [authString release];
        
        //We can only submit ten tracks at a time
        requestString = [[NSMutableString alloc] initWithString:authString];
        [authString release];
        
        //We can only submit ten tracks at a time
-       for (i = 0; ([_tracks count] > 0) && (i < 10); i++) {
+       for (i = 0; (i < [_tracks count]) && (i < 10); i++) {
                NSDictionary *nextTrack = [_tracks objectAtIndex:i];
                NSString *trackString;
                
                NSDictionary *nextTrack = [_tracks objectAtIndex:i];
                NSString *trackString;
                
@@ -176,11 +188,12 @@ static AudioscrobblerController *_sharedController = nil;
        }
        
        //Create and send the 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];
        [request setHTTPMethod:@"POST"];
        [request setHTTPBody:[requestString dataUsingEncoding:NSUTF8StringEncoding]];
        _currentStatus = AudioscrobblerSubmittingTracksStatus;
        [request setHTTPMethod:@"POST"];
        [request setHTTPBody:[requestString dataUsingEncoding:NSUTF8StringEncoding]];
        _currentStatus = AudioscrobblerSubmittingTracksStatus;
-       //[NSURLConnection connectionWithRequest:request delegate:self];
+       _responseData = [[NSMutableData alloc] init];
+       [NSURLConnection connectionWithRequest:request delegate:self];
        [requestString release];
        [request release];
        
        [requestString release];
        [request release];
        
@@ -191,11 +204,8 @@ static AudioscrobblerController *_sharedController = nil;
 {
        if ([[note name] isEqualToString:@"AudioscrobblerHandshakeComplete"]) {
                if ([_tracks count] > 0) {
 {
        if ([[note name] isEqualToString:@"AudioscrobblerHandshakeComplete"]) {
                if ([_tracks count] > 0) {
-                       [self submitTracks];
+                       [self performSelector:@selector(submitTracks) withObject:nil afterDelay:2];
                }
                }
-               [self submitTrack:@"Immigrant Song" artist:@"Led Zeppelin" album:@"How The West Was Won" length:221];
-               [self submitTrack:@"Comfortably Numb" artist:@"Pink Floyd" album:@"The Wall" length:384];
-               [self submitTracks];
        }
 }
 
        }
 }
 
@@ -225,7 +235,7 @@ static AudioscrobblerController *_sharedController = nil;
                if ([lines count] < 2) {
                        //We have a protocol error
                }
                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]];
                        if ([lines count] >= 4) {
                                _md5Challenge = [[lines objectAtIndex:1] retain];
                                _postURL = [[NSURL alloc] initWithString:[lines objectAtIndex:2]];
@@ -234,15 +244,12 @@ static AudioscrobblerController *_sharedController = nil;
                        } else {
                                //We have a protocol error
                        }
                        } 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"]) {
                        //We have a error
                } else if ([responseAction isEqualToString:@"BADUSER"]) {
                        //We have a bad user
                } else {
                } else if (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"FAILED"]) {
                        //We have a error
                } else if ([responseAction isEqualToString:@"BADUSER"]) {
                        //We have a bad user
                } else {
-                       //We have a protocol
+                       //We have a protocol error
                }
        } else if (_currentStatus == AudioscrobblerSubmittingTracksStatus) {
                if ([responseAction isEqualToString:@"OK"]) {
                }
        } else if (_currentStatus == AudioscrobblerSubmittingTracksStatus) {
                if ([responseAction isEqualToString:@"OK"]) {
@@ -251,15 +258,16 @@ static AudioscrobblerController *_sharedController = nil;
                } else if (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"FAILED"]) {
                        //Failed
                }
                } else if (([responseAction length] > 5) && [[responseAction substringToIndex:5] isEqualToString:@"FAILED"]) {
                        //Failed
                }
-               NSLog(string);
        }
        
        //Handle the final INTERVAL response
        }
        
        //Handle the final INTERVAL response
-       if (([responseAction length] > 9) && [[responseAction substringToIndex:7] isEqualToString:@"INTERVAL"]) {
-               int seconds = [[[lines objectAtIndex:[lines count] - 1] substringFromIndex:9] intValue];
+       if (([[lines objectAtIndex:[lines count] - 2] length] > 9) && [[[lines objectAtIndex:[lines count] - 2] substringToIndex:8] isEqualToString:@"INTERVAL"]) {
+               int seconds = [[[lines objectAtIndex:[lines count] - 2] substringFromIndex:9] intValue];
                ITDebugLog(@"Audioscrobbler: INTERVAL %i", seconds);
                ITDebugLog(@"Audioscrobbler: INTERVAL %i", seconds);
-               _delayDate = [NSDate dateWithTimeIntervalSinceNow:seconds];
+               [_delayDate release];
+               _delayDate = [[NSDate dateWithTimeIntervalSinceNow:seconds] retain];
        } else {
        } else {
+               ITDebugLog(@"No interval response.");
                //We have a protocol error
        }
        
                //We have a protocol error
        }
        
@@ -267,12 +275,4 @@ static AudioscrobblerController *_sharedController = nil;
        [_responseData release];
 }
 
        [_responseData release];
 }
 
--(NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse
-{
-       ITDebugLog(@"Audioscrobbler: Sending URL request.");
-       NSLog(@"Sending request.");
-       _responseData = [[NSMutableData alloc] init];
-       return request;
-}
-
 @end
 @end
Menu-based iTunes controller.