Updated prefpane build to handle current pre-hackday Playdar

Also automated sparkle steps Also run tagger after scan so Boffin will work
mxcl · Nov 23, 2009 · f7b5b19 · f7b5b19
1 parent 01a140e
commit f7b5b19
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 151 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
-playdar.prefPane.xcodeproj/*.mode*v3
-playdar.prefPane.xcodeproj/*.pbxuser
-build
+/Playdar.prefPane.xcodeproj/*.mode*v3
+/Playdar.prefPane.xcodeproj/*.pbxuser
+/build/
diff --git a/English.lproj/main.xib b/English.lproj/main.xib
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9G55</string>
+		<string key="IBDocument.SystemVersion">9J61</string>
 		<string key="IBDocument.InterfaceBuilderVersion">670</string>
-		<string key="IBDocument.AppKitVersion">949.43</string>
+		<string key="IBDocument.AppKitVersion">949.46</string>
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -651,14 +651,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					</object>
 					<int key="connectionID">284</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">resume_text</string>
-						<reference key="source" ref="294453543"/>
-						<reference key="destination" ref="1034468664"/>
-					</object>
-					<int key="connectionID">285</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">demos</string>

diff --git a/Info.plist b/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>playdar.prefPane</string>
+	<string>PlaydarPrefPanePlugin</string>
 	<key>CFBundleIconFile</key>
 	<string>playdar.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleVersion</key>
-	<string>0.1.4</string>
+	<string>0.1.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>NSMainNibFile</key>

diff --git a/playdar.prefPane.xcodeproj/project.pbxproj → Playdar.prefPane.xcodeproj/project.pbxproj b/playdar.prefPane.xcodeproj/project.pbxproj → Playdar.prefPane.xcodeproj/project.pbxproj
diff --git a/install_name_tool.rb b/install_name_tool.rb
diff --git a/main.m b/main.m
@@ -87,16 +87,19 @@ @implementation OrgPlaydarPreferencePane
 -(void)mainViewDidLoad
 {   
     NSFileManager* fm = [NSFileManager defaultManager];
-    if([fm fileExistsAtPath:daemon_script_path()] == false)
+    NSString* scriptpath = daemon_script_path();
+    if([fm fileExistsAtPath:scriptpath] == false){
+        [fm createDirectoryAtPath:[scriptpath stringByDeletingLastPathComponent] attributes:nil];
         [self writeDaemonScript];
+    }
     NSString* ini = ini_path();
     if([fm fileExistsAtPath:ini] == false){
         NSArray* args = [NSArray arrayWithObjects: fullname(), db_path(), ini, nil];
         [self execScript:@"playdar.conf.rb" withArgs:args];
     }
 
     [[popup menu] addItem:[NSMenuItem separatorItem]];
-    [[[popup menu] addItemWithTitle:@"Other..." action:@selector(onSelect:) keyEquivalent:@""] setTarget:self];
+    [[[popup menu] addItemWithTitle:@"Other…" action:@selector(onSelect:) keyEquivalent:@""] setTarget:self];
 
     NSString* home = NSHomeDirectory();
     [self addFolder:[home stringByAppendingPathComponent:@"Music"] setSelected:true];
@@ -292,7 +295,11 @@ -(NSTask*)execScript:(NSString*)script_name withArgs:(NSArray*)args
     }
     @catch (NSException* e)
     {
-        [[NSAlert alertWithMessageText:[e reason]] runModal];
+        [[NSAlert alertWithMessageText:[e reason]
+                         defaultButton:nil
+                       alternateButton:nil
+                           otherButton:nil
+             informativeTextWithFormat:nil] runModal];
     }
     return task;
 }

diff --git a/scanner.sh b/scanner.sh
@@ -9,6 +9,8 @@ sqlite3 "$2" < schema.sql
 
 # go
 tmp=`mktemp -t playdar`
-echo "'"`pwd`"/../MacOS/scanner' '$2' '$1'; rm '$tmp'" >> "$tmp"
+echo "'"`pwd`"/../MacOS/scanner' '$2' '$1'" > "$tmp"
+echo "'"`pwd`"/../MacOS/tagger' '$2' '$d/boffin.db'" >> "$tmp"
+echo "rm '$tmp'" >> "$tmp"
 chmod u+x "$tmp"
 open -a Terminal "$tmp"