Changeset 917

Timestamp:

07/29/08 16:35:01 (4 months ago)

Author:

astrange

Message:

Delete progress indicators from the prefpane, they're ugly and pointless.
Get rid of alert panels in the update checker and use IPC to show them in the prefpane instead.
Fix the update checker never cleaning up its locks.
Synchronize user defaults more often since it seems necessary.
Delete code for not running too often in the update checker, it's a duplicate of the same more-maintained code in Perian.

This requires merging the nib into release branch again...

Files:

• trunk/CPFPerianPrefPaneController.h (modified) (1 diff)
• trunk/CPFPerianPrefPaneController.m (modified) (4 diffs)
• trunk/PerianPrefPane.nib/classes.nib (modified) (2 diffs)
• trunk/PerianPrefPane.nib/info.nib (modified) (1 diff)
• trunk/PerianPrefPane.nib/keyedobjects.nib (modified) (previous)
• trunk/Update Checker Sources/UpdateCheckerAppDelegate.h (modified) (1 diff)
• trunk/Update Checker Sources/UpdateCheckerAppDelegate.m (modified) (4 diffs)
• trunk/Update Checker Sources/main.m (modified) (2 diffs)

trunk/CPFPerianPrefPaneController.h

@@ -56 +56 @@
-        IBOutlet NSButton                                       *button_install;
-        IBOutlet NSTextField                            *textField_installStatus;
-        IBOutlet NSProgressIndicator            *progress_install;
-        
-        IBOutlet NSTextField                            *textField_currentVersion;
+        IBOutlet NSTextField                            *textField_updateStatus;
-        IBOutlet NSButton                                       *button_updateCheck;
-        IBOutlet NSProgressIndicator            *progress_updateCheck;
-        IBOutlet NSButton                                       *button_autoUpdateCheck;
-        

trunk/CPFPerianPrefPaneController.m

@@ -401 +401 @@
-
-- (void) dealloc {
+        [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:UPDATE_STATUS_NOTIFICATION object:nil];
-        [perianForumURL release];
-        [perianDonateURL release];
@@ -654 +655 @@
-                auth = nil;
-        
-        int tag = 0;
-        componentPath = [[self quickTimeComponentDir:userInstalled] stringByAppendingPathComponent:@"Perian.component"];
-        if(auth != nil && !userInstalled)
@@ -685 +685 @@
-- (IBAction)installUninstall:(id)sender
-{
-        [progress_install startAnimation:sender];
-        if(installStatus == InstallStatusInstalled)
-                [NSThread detachNewThreadSelector:@selector(uninstall:) toTarget:self withObject:nil];
@@ -694 +693 @@
-- (void)installComplete:(id)sender
-{
-        [progress_install stopAnimation:sender];
-        [self checkForInstallation];
-}
-
-#pragma mark Check Updates
+- (void)updateCheckStatusChanged:(NSNotification*)notification
+{
+        NSString *status = [notification object];
+        
+        //FIXME localize these
+        if ([status isEqualToString:@"Starting"]) {
+                [textField_updateStatus setStringValue:@"Checking..."];
+        } else if ([status isEqualToString:@"Error"]) {
+                [textField_updateStatus setStringValue:@"Couldn't reach the update server."];
+        } else if ([status isEqualToString:@"NoUpdates"]) {
+                [textField_updateStatus setStringValue:@"There are no updates."];
+        } else if ([status isEqualToString:@"NoUpdates"]) {
+                [textField_updateStatus setStringValue:@"Updates found!"];
+        }
+}
+
-- (IBAction)updateCheck:(id)sender 
-{
-        FSRef updateCheckRef;
-        
+        [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:UPDATE_STATUS_NOTIFICATION object:nil];
+        [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(updateCheckStatusChanged:) name:UPDATE_STATUS_NOTIFICATION object:nil];
-        CFPreferencesSetAppValue((CFStringRef)NEXT_RUN_KEY, NULL, perianAppID);
-        CFPreferencesSetAppValue((CFStringRef)MANUAL_RUN_KEY, [NSNumber numberWithBool:YES], perianAppID);

trunk/PerianPrefPane.nib/classes.nib

@@ -73 +73 @@
-                                <key>popup_outputMode</key>
-                                <string>NSPopUpButton</string>
-                                <key>progress_install</key>
-                                <string>NSProgressIndicator</string>
-                                <key>progress_updateCheck</key>
-                                <string>NSProgressIndicator</string>
-                                <key>slider_ac3DynamicRangeSlider</key>
-                                <string>NSSlider</string>
@@ -84 +80 @@
-                                <string>NSTextField</string>
-                                <key>textField_installStatus</key>
+                                <string>NSTextField</string>
+                                <key>textField_updateStatus</key>
-                                <string>NSTextField</string>
-                                <key>textView_about</key>

trunk/PerianPrefPane.nib/info.nib

@@ -4 +4 @@
-<dict>
-        <key>IBFramework Version</key>
-29
+70
-        <key>IBLastKnownRelativeProjectPath</key>
-../
+
-        <key>IBOldestOS</key>
-        <integer>5</integer>
-        <key>IBOpenObjects</key>
-        <array>
-133
+32
-        </array>
-        <key>IBSystem Version</key>
-B18
+E17
-        <key>targetFramework</key>
-        <string>IBCocoaFramework</string>

trunk/Update Checker Sources/UpdateCheckerAppDelegate.h

@@ -18 +18 @@
-#define UPDATE_URL_KEY @"UpdateFeedURL"
-#define SKIPPED_VERSION_KEY @"SkippedVersion"
+#define UPDATE_STATUS_NOTIFICATION @"org.perian.UpdateCheckStatus"
-#define TIME_INTERVAL_TIL_NEXT_RUN 7*24*60*60
-

trunk/Update Checker Sources/UpdateCheckerAppDelegate.m

@@ -35 +35 @@
-        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        lastRunDate = [[defaults objectForKey:NEXT_RUN_KEY] retain];
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -56 +52 @@
-        updateUrlString = [[updateUrlString substringToIndex:[updateUrlString length]-4] stringByAppendingFormat:@"-%@.xml", betaAppcastUrl];
-#endif
+        if(manualRun)
+                [[NSDistributedNotificationCenter defaultCenter] postNotificationName:UPDATE_STATUS_NOTIFICATION object:@"Starting"];
-        
-        SUAppcast *appcast = [[SUAppcast alloc] init];
@@ -81 +79 @@
-    NSString *panePath = [[[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByDeletingLastPathComponent] stringByDeletingLastPathComponent];
-        updateAvailable = (updateAvailable && (SUStandardVersionComparison([latest fileVersion], [[NSBundle bundleWithPath:panePath] objectForInfoDictionaryKey:@"CFBundleVersion"]) == NSOrderedAscending));
+        
+        if (![panePath isEqualToString:@"Perian.prefPane"]) {
+                NSLog(@"The update checker needs to be run from inside the preference pane, quitting...");
+                updateAvailable = 0;
+        }
+        
-        NSString *skippedVersion = [[NSUserDefaults standardUserDefaults] objectForKey:SKIPPED_VERSION_KEY];
-        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        if (updateAvailable && (!skippedVersion || 
-                (skippedVersion && ![skippedVersion isEqualToString:[latest versionString]]))) {
+                if(manualRun)
+                        [[NSDistributedNotificationCenter defaultCenter] postNotificationName:UPDATE_STATUS_NOTIFICATION object:@"YesUpdates"];
-                [self showUpdatePanelForItem:latest];
-        } else {
-                if(manualRun)
-NSRunAlertPanel(SULocalizedString(@"No Update Found!", nil), SULocalizedString(@"Your copy of Perian is up to date", nil), nil, nil, nil)
+[[NSDistributedNotificationCenter defaultCenter] postNotificationName:UPDATE_STATUS_NOTIFICATION object:@"NoUpdates"]
-                [[NSApplication sharedApplication] terminate:self];
-        }
@@ -99 +105 @@
-        [self updateFailed];
-        if(manualRun)
-self showUpdateErrorAlertWithInfo:SULocalizedString(@"An error occurred while trying to load Perian's version info. Please try again later.", nil)
+[NSDistributedNotificationCenter defaultCenter] postNotificationName:UPDATE_STATUS_NOTIFICATION object:@"Error"
-    [appcast release];
-        [[NSApplication sharedApplication] terminate:self];     

trunk/Update Checker Sources/main.m

@@ -13 +13 @@
-#define lockPath "/tmp/PerianUpdateLock"
-
+static int fp = -1;
+
+static void deleteLock()
+{
+        close(fp);
+        unlink(lockPath);
+}
+
-int main(int argc, char *argv[])
-{
-int 
+
-        if(fp == -1)
-        {
@@ -31 +39 @@
-        if(fp == -1)
-                return 0;
+        
+        atexit(deleteLock);
-
-        int ret = NSApplicationMain(argc,  (const char **) argv);
-        
-    close(fp);
-        unlink(lockPath);
-        
-        return ret;
-}