Merge pull request #24 from jimbojsb/gh-24

Status is wrong after rescan
jimbojsb · Mar 8, 2014 · ef34427 · ef34427
2 parents 366cd22 + d85f599
commit ef34427
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/LaunchRocket/LaunchRocket-Info.plist b/LaunchRocket/LaunchRocket-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6b1</string>
+	<string>0.6b2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.6b1</string>
+	<string>0.6b2</string>
 	<key>NSHumanReadableCopyright</key>
 	<string></string>
 	<key>NSMainNibFile</key>
@@ -34,6 +34,8 @@
 	<string>Fonts</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
+	<key>PreferenceFileVersion</key>
+	<string>2</string>
 	<key>NSPrincipalClass</key>
 	<string>LaunchRocket</string>
 </dict>

diff --git a/LaunchRocket/LaunchRocket.m b/LaunchRocket/LaunchRocket.m
@@ -34,6 +34,9 @@ - (void)mainViewDidLoad
     self.launchRocketLabel.font = [OpenSansFont getFontWithSize:16];
     self.versionNumber.font = [OpenSansFont getFontWithSize:13];
     [sm renderList];
+
+    [self.versionNumber setStringValue: [NSString stringWithFormat:@"Version %@", [[[self bundle] infoDictionary] valueForKey:@"CFBundleVersion"]]];
+
 }
 
 - (void)didUnselect {

diff --git a/LaunchRocket/ServiceController.m b/LaunchRocket/ServiceController.m
@@ -148,6 +148,9 @@ -(void) handleSudoClick:(id)sender {
         self.service.useSudo = NO;
     }
     [self.serviceManager saveService:self.service];
+    [self isStarted];
+    [self updateStartStopStatus];
+    [self updateStatusIndicator];
 }
 
 -(void) handleRunAtLoginClick:(id)sender {

diff --git a/LaunchRocket/ServiceManager.m b/LaunchRocket/ServiceManager.m
@@ -41,7 +41,7 @@ -(void) createPreferencesFile {
     if (![fm fileExistsAtPath:self.preferencesFile]) {
         NSLog(@"Creating preferences file");
         NSMutableDictionary *prefs = [[NSMutableDictionary alloc] init];
-        NSString *version =[[[self bundle] infoDictionary] valueForKey:@"CFBundleVersion"];
+        NSString *version =[[[self bundle] infoDictionary] valueForKey:@"PreferenceFileVersion"];
         [prefs setObject:version forKey:@"version"];
         [prefs setObject:[[NSDictionary alloc] init] forKey:@"services"];
         [prefs writeToFile:self.preferencesFile atomically:YES];
@@ -58,7 +58,7 @@ -(void) loadPreferences {
 
     if ([fm fileExistsAtPath:self.preferencesFile]) {
         NSMutableDictionary *prefs = [NSMutableDictionary dictionaryWithContentsOfFile:self.preferencesFile];
-        NSString *version = [[[self bundle] infoDictionary] valueForKey:@"CFBundleVersion"];
+        NSString *version = [[[self bundle] infoDictionary] valueForKey:@"PreferenceFileVersion"];
         if (![version isEqualToString:[prefs objectForKey:@"version"]]) {
             [fm removeItemAtPath:self.preferencesFile error:nil];
             NSLog(@"Killing preferences file, versions did not match");
@@ -206,7 +206,6 @@ -(IBAction) handleAddPlistClick:(id)sender {
 }
 
 -(void) addService:(NSString *)plistFile {
-    NSLog(@"%@%@", @"Adding services", plistFile);
     NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
     NSArray *pathComponents = [plistFile componentsSeparatedByString:@"/"];
     NSArray *filenameComponents = [[pathComponents lastObject] componentsSeparatedByString:@"."];
@@ -215,7 +214,12 @@ -(void) addService:(NSString *)plistFile {
     [dict setObject:plistFile forKey:@"plist"];
     [dict setObject:serviceName forKey:@"name"];
 
-    [[self.preferences objectForKey:@"services"] setObject:dict forKey:identifier];
+    if ([[self.preferences objectForKey:@"services"] objectForKey:identifier] == nil) {
+        NSLog(@"Adding %@", plistFile);
+        [[self.preferences objectForKey:@"services"] setObject:dict forKey:identifier];
+    } else {
+        NSLog(@"%@ already exists -- preserving", plistFile);
+    }
     [self writePreferences];
 }
 

diff --git a/LaunchRocket/en.lproj/LaunchRocket.xib b/LaunchRocket/en.lproj/LaunchRocket.xib
@@ -44,7 +44,7 @@
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" id="139">
                         <rect key="frame" x="17" y="174" width="104" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Version 0.6b1" id="140">
+                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Version ###" id="140">
                             <font key="font" metaFont="system" size="10"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>