X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/d33e9b61891ddd4d4e70422f3f20c693d0ee030c..57e47909ea593126a1055a5b077e7531c2fafb30:/PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index 638be40..0a796dc 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -16,25 +16,11 @@
 #import <sys/types.h>
 #import <sys/stat.h>
 
-#import <ITKit/ITLoginItem.h>
-
-#import <ITKit/ITHotKeyCenter.h>
-#import <ITKit/ITKeyCombo.h>
-#import <ITKit/ITKeyComboPanel.h>
-#import <ITKit/ITWindowPositioning.h>
-#import <ITKit/ITKeyBroadcaster.h>
-
+#import <ITKit/ITKit.h>
 #import <ITKit/ITTSWBackgroundView.h>
-#import <ITKit/ITWindowEffect.h>
-#import <ITKit/ITCutWindowEffect.h>
-#import <ITKit/ITDissolveWindowEffect.h>
-#import <ITKit/ITSlideHorizontallyWindowEffect.h>
-#import <ITKit/ITSlideVerticallyWindowEffect.h>
-#import <ITKit/ITPivotWindowEffect.h>
-
 
 #define SENDER_STATE (([sender state] == NSOnState) ? YES : NO)
-#define AUDIOSCROBBLER_KEYCHAIN_SERVICE "MenuTunes: Audioscrobbler"
+#define AUDIOSCROBBLER_KEYCHAIN_SERVICE(user) [[NSString stringWithFormat:@"Audioscrobbler: %@", user] UTF8String]
 #define AUDIOSCROBBLER_KEYCHAIN_KIND "application password"
 
 /*************************************************************************/
@@ -98,8 +84,8 @@ static PreferencesController *prefs = nil;
 	attributes[1].data = AUDIOSCROBBLER_KEYCHAIN_KIND;
 	attributes[1].length = strlen(AUDIOSCROBBLER_KEYCHAIN_KIND);
 	attributes[2].tag = kSecLabelItemAttr;
-	attributes[2].data = AUDIOSCROBBLER_KEYCHAIN_SERVICE;
-	attributes[2].length = strlen(AUDIOSCROBBLER_KEYCHAIN_SERVICE);
+	attributes[2].data = (char *)AUDIOSCROBBLER_KEYCHAIN_SERVICE(user);
+	attributes[2].length = strlen(AUDIOSCROBBLER_KEYCHAIN_SERVICE(user));
 	list.count = 3;
 	list.attr = attributes;
 
@@ -145,8 +131,8 @@ static PreferencesController *prefs = nil;
 	attributes[1].data = AUDIOSCROBBLER_KEYCHAIN_KIND;
 	attributes[1].length = strlen(AUDIOSCROBBLER_KEYCHAIN_KIND);
 	attributes[2].tag = kSecLabelItemAttr;
-	attributes[2].data = AUDIOSCROBBLER_KEYCHAIN_SERVICE;
-	attributes[2].length = strlen(AUDIOSCROBBLER_KEYCHAIN_SERVICE);
+	attributes[2].data = (char *)AUDIOSCROBBLER_KEYCHAIN_SERVICE(user);
+	attributes[2].length = strlen(AUDIOSCROBBLER_KEYCHAIN_SERVICE(user));
 	list.count = 3;
 	list.attr = attributes;
 
@@ -176,7 +162,7 @@ static PreferencesController *prefs = nil;
 	OSStatus status = errSecNotAvailable;
 	SecKeychainItemRef item = [PreferencesController keychainItemForUser:user];
 	if (item != nil) {
-		status = SecKeychainItemModifyContent(item, NULL, [password length], [password cString]);
+		status = SecKeychainItemModifyContent(item, NULL, [password length], [password UTF8String]);
 		if (status != noErr) {
 			ITDebugLog(@"Audioscrobbler: Error deleting keychain item: %i", status);
 		}
@@ -197,18 +183,17 @@ static PreferencesController *prefs = nil;
 		if (status != noErr) {
 			ITDebugLog(@"Audioscrobbler: Error getting keychain item password: %i", status);
 		} else {
-			if ([NSString respondsToSelector:@selector(stringWithCString:encoding:)]) {
-				pass = [NSString stringWithCString:buffer encoding:NSASCIIStringEncoding];
-			} else {
-				pass = [NSString stringWithCString:buffer];
-			}
+			NSLog(@"Audioscrobbler: password buffer: \"%s\" \"Length: %i\"", buffer, length);
+			pass = [[NSString alloc] initWithBytes:buffer length:length encoding:NSUTF8StringEncoding];
 		}
 		if (status != noErr) {
 			ITDebugLog(@"Audioscrobbler: Error deleting keychain item: %i", status);
 		}
+		SecKeychainItemFreeContent(NULL, buffer);
 		CFRelease(item);
 	}
-	return pass;
+	NSLog(@"Audioscrobbler: Retrieved password: \"%@\"", pass);
+	return [pass autorelease];
 }
 
 /*************************************************************************/
@@ -239,6 +224,7 @@ static PreferencesController *prefs = nil;
                                                        @"Rewind",
                                                        @"ShowPlayer",
                                                        @"TrackInfo",
+													   @"AlbumArt",
                                                        @"UpcomingSongs",
                                                        @"IncrementVolume",
                                                        @"DecrementVolume",
@@ -263,6 +249,7 @@ static PreferencesController *prefs = nil;
                                                        @"Rewind",
                                                        @"Show Player",
                                                        @"Track Info",
+													   @"Album Art",
                                                        @"Upcoming Songs",
                                                        @"Increment Volume",
                                                        @"Decrement Volume",
@@ -277,7 +264,7 @@ static PreferencesController *prefs = nil;
                                                        [NSString stringWithUTF8String:"Set Rating: ★★☆☆☆"],
                                                        [NSString stringWithUTF8String:"Set Rating: ★★★☆☆"],
                                                        [NSString stringWithUTF8String:"Set Rating: ★★★★☆"],
-                                                       [NSString stringWithUTF8String:"Set Rating: ★★★★★"],
+                                                       [NSString stringWithUTF8String:"Set Rating: ★★★★"],
                                                        nil];
         hotKeysDictionary = [[NSMutableDictionary alloc] init];
         controller = nil;
@@ -418,7 +405,7 @@ static PreferencesController *prefs = nil;
             [showScriptsButton setEnabled:NO];
         }
     } else if ( [sender tag] == 1120) {
-        mkdir([[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] cString], 0744);
+        mkdir([[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] UTF8String], 0744);
         [[NSWorkspace sharedWorkspace] openFile:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
     } else if ( [sender tag] == 6010) {
 		//Toggle the other Audioscrobbler options
@@ -426,6 +413,9 @@ static PreferencesController *prefs = nil;
 		[audioscrobblerUseCacheCheckbox setEnabled:SENDER_STATE];
 		[audioscrobblerUserTextField setEnabled:SENDER_STATE];
 		[audioscrobblerPasswordTextField setEnabled:SENDER_STATE];
+		if (SENDER_STATE) {
+			[[AudioscrobblerController sharedController] attemptHandshake:NO];
+		}
 	} else if ( [sender tag ] == 6015) {
 		//Here we create a new keychain item if needed and deletes the keychain item if the field is cleared.
 		NSString *currentAccount = [df stringForKey:@"audioscrobblerUser"], *newAccount = [sender stringValue];
@@ -607,7 +597,7 @@ static PreferencesController *prefs = nil;
 
 - (IBAction)changeStatusWindowSetting:(id)sender
 {
-    StatusWindow *sw = [StatusWindow sharedWindow];
+    StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
     ITDebugLog(@"Changing status window setting of tag %i", [sender tag]);
     
     if ( [sender tag] == 2010) {
@@ -890,6 +880,11 @@ static PreferencesController *prefs = nil;
 #pragma mark PRIVATE METHOD IMPLEMENTATIONS
 /*************************************************************************/
 
+- (void)audioscrobblerStatusChanged:(NSNotification *)note
+{
+	[audioscrobblerStatusTextField setStringValue:[[note userInfo] objectForKey:@"StatusString"]];
+}
+
 - (void)setupWindow
 {
     ITDebugLog(@"Loading Preferences.nib.");
@@ -975,6 +970,12 @@ static PreferencesController *prefs = nil;
     int selectedBGStyle;
     id anItem;
 	
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(audioscrobblerStatusChanged:) name:@"AudioscrobblerStatusChanged" object:nil];
+	if ([df boolForKey:@"audioscrobblerEnabled"]) {
+		NSString *status = [[AudioscrobblerController sharedController] lastStatus];
+		[audioscrobblerStatusTextField setStringValue:(status == nil) ? @"Idle" : status];
+	}
+	
     [df setInteger:MT_CURRENT_VERSION forKey:@"appVersion"];
     
     ITDebugLog(@"Setting up preferences UI.");
@@ -1166,7 +1167,7 @@ static PreferencesController *prefs = nil;
 
 - (void)setStatusWindowEntryEffect:(Class)effectClass
 {
-    StatusWindow *sw = [StatusWindow sharedWindow];
+    StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
     
     float time = ([df floatForKey:@"statusWindowAppearanceSpeed"] ? [df floatForKey:@"statusWindowAppearanceSpeed"] : 0.8);
     [df setObject:NSStringFromClass(effectClass) forKey:@"statusWindowAppearanceEffect"];
@@ -1177,7 +1178,7 @@ static PreferencesController *prefs = nil;
 
 - (void)setStatusWindowExitEffect:(Class)effectClass
 {
-    StatusWindow *sw = [StatusWindow sharedWindow];
+    StatusWindow *sw = (StatusWindow *)[StatusWindow sharedWindow];
     
     float time = ([df floatForKey:@"statusWindowVanishSpeed"] ? [df floatForKey:@"statusWindowVanishSpeed"] : 0.8);
     [df setObject:NSStringFromClass(effectClass) forKey:@"statusWindowVanishEffect"];