Changeset 0c9b2d28611409caa44eafff14e701168785fe99

Timestamp:

25/02/08 01:28:43 (8 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1203899323 +0000

git-parent:

[234bf661a935ad204e089486a0db7e92847ff071]

git-author:

Rafaël Carré <funman@videolan.org> 1203899323 +0000

Message:

fix update code in macosx gui

Files:

• extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib (modified) (1 diff)
• extras/package/macosx/Resources/English.lproj/Update.nib/info.nib (modified) (2 diffs)
• extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib (modified) (previous)
• modules/gui/macosx/intf.m (modified) (4 diffs)
• modules/gui/macosx/update.h (modified) (5 diffs)
• modules/gui/macosx/update.m (modified) (8 diffs)

extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

extras/package/macosx/Resources/English.lproj/Update.nib/info.nib

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
- Computer
+
-<plist version="1.0">
-<dict>
-    <key>IBDocumentLocation</key>
-    <string>16 51 356 240 0 0 1280 778 </string>
-    <key>IBFramework Version</key>
-
+
+
+
-    <key>IBOpenObjects</key>
-    <array>
@@ -12 +12 @@
-    </array>
-    <key>IBSystem Version</key>
-
+
+
+
-</dict>
-</plist>

modules/gui/macosx/intf.m

@@ -32 +32 @@
-#include <string.h>
-#include <vlc_keys.h>
+
+#ifdef HAVE_CONFIG_H
+#   include "config.h"
+#endif
-
-#import "intf.h"
@@ -421 +425 @@
-    o_sfilters = nil;
-#ifdef UPDATE_CHECK
-//FIXME 
+
-#endif
-
@@ -866 +870 @@
-        nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
-
-
-
-
+
+
-#endif
-
@@ -2020 +2023 @@
-    if( !nib_update_loaded )
-        nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
-
-    [o_update showUpdateWindow];
+#else
+    msg_Err( VLCIntf, "Updates checking was not enabled in this build" );
-#endif
-}

modules/gui/macosx/update.h

@@ -2 +2 @@
- * update.h: MacOS X Check-For-Update window
- *****************************************************************************
-(C) 2005-2007
+© 2005-2008
- * $Id$
- *
- * Authors: Felix Kühne <fkuehne@users.sf.net>
+ *          Rafaël Carré <funman@videolanorg>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -22 +23 @@
- *****************************************************************************/
-
+#ifdef HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
-#ifdef UPDATE_CHECK
-#import <Cocoa/Cocoa.h>
@@ -31 +36 @@
-    IBOutlet id o_btn_okay;
-    IBOutlet id o_fld_releaseNote;
-
-
+
-    IBOutlet id o_fld_status;
-    IBOutlet id o_update_window;
@@ -38 +42 @@
-    IBOutlet id o_chk_updateOnStartup;
-
-    NSString * o_urlOfBinary;
-    update_t * p_u;
-intf_thread_t * p_intf
+vlc_bool_t b_checked
-}
-
@@ -50 +53 @@
-
-- (void)showUpdateWindow;
-- (void)initInterface;
-- (void)checkForUpdate;
+- (void)updateManagement: (vlc_bool_t) b_success;
-- (void)performDownload:(NSString *)path;
-

modules/gui/macosx/update.m

@@ -2 +2 @@
- * update.m: MacOS X Check-For-Update window
- *****************************************************************************
-(C) 2005-2007
+© 2005-2008
- * $Id$
- *
- * Authors: Felix Kühne <fkuehne@users.sf.net>
+ *          Rafaël Carré <funman@videolanorg>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -22 +23 @@
- *****************************************************************************/
-
-
-
-
-
-
+
+
+
-
-#ifdef UPDATE_CHECK
@@ -58 +57 @@
-    } else {
-        _o_sharedInstance = [super init];
+        b_checked = VLC_FALSE;
+
+        /* clean the interface */
+        [o_fld_releaseNote setString: @""];
+        [o_fld_currentVersion setString: @""];
+        /* translate strings to the user's language */
+        [o_update_window setTitle: _NS("Check for Updates")];
+        [o_btn_DownloadNow setTitle: _NS("Download now")];
+        [o_btn_okay setTitle: _NS("OK")];
+        [o_chk_updateOnStartup setTitle: _NS("Automatically check for updates")];
-    }
-
@@ -65 +74 @@
-- (void)awakeFromNib
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    [o_chk_updateOnStartup setState: [[NSUserDefaults standardUserDefaults] boolForKey: kPrefUpdateOnStartup]];
-}
@@ -130 +115 @@
-{
-    /* show the window and check for a potential update */
-    [o_fld_status setStringValue: _NS("Checking for Updates...")];
-    [o_fld_currentVersionAndSize setStringValue: @""];
-    [o_fld_releaseNote setString: @""];
-
-    [o_update_window center];
-    [o_update_window displayIfNeeded];
-    [o_update_window makeKeyAndOrderFront:nil];
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -148 +133 @@
-    SEL sel = @selector(getLocationForSaving:returnCode:contextInfo:);
-    NSSavePanel * saveFilePanel = [[NSSavePanel alloc] init];
-
+
-    [saveFilePanel setRequiredFileType: @"dmg"];
-    [saveFilePanel setCanSelectHiddenExtension: YES];
-    [saveFilePanel setCanCreateDirectories: YES];
-    [saveFilePanel beginSheetForDirectory:nil file:
-o_urlOfBinary
+[NSString stringWithUTF8String: p_u->release.psz_url]
-                           modalForWindow: o_update_window 
-                            modalDelegate:self
@@ -174 +159 @@
-- (IBAction)okay:(id)sender
-{
-close
-close
+hides
+orderOut: self
-}
-
@@ -183 +168 @@
-}
-
+- (void)updateManagement:(vlc_bool_t)b_success
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    if( !b_success ||
+        update_CompareReleaseToCurrent( p_u ) != UpdateReleaseStatusNewer )
+    {
+        [o_fld_status setStringValue: _NS("This version of VLC is the latest available.")];
+        [o_btn_DownloadNow setEnabled: NO];
+    }
+    else
+    {
+        [o_fld_releaseNote setString: [NSString stringWithUTF8String: (p_u->release.psz_desc)]];
+        [o_fld_status setStringValue: _NS("This version of VLC is outdated.")];
+        [o_fld_currentVersion setStringValue: [NSString stringWithFormat:
+            _NS("The current release is %d.%d.%d%c."), p_u->release.i_major,
+            p_u->release.i_minor, p_u->release.i_revision, p_u->release.extra]];
+        [o_btn_DownloadNow setEnabled: YES];
+        /* Make sure the update window is showed in case we have something */
+        [o_update_window center];
+        [o_update_window displayIfNeeded];
+        [o_update_window makeKeyAndOrderFront: self];
+    }
+
+    [pool release];
+}
+
+static void updateCallback( void * p_data, vlc_bool_t b_success )
+{
+    [(id)p_data updateManagement: b_success];
+}
+
-- (void)checkForUpdate
-{
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    [[NSUserDefaults standardUserDefaults] setObject: [NSDate date] forKey: kPrefUpdateLastTimeChecked];
-
-    if( p_uit )
-    {
-        p_uit->i_rs = UPDATE_RELEASE_STATUS_NEWER;
-        p_uit->i_t = UPDATE_FILE_TYPE_ALL;
-        update_iterator_Action( p_uit, UPDATE_MIRROR );
- 
-        while( update_iterator_Action( p_uit, UPDATE_FILE) != UPDATE_FAIL )
-        {
-            msg_Dbg( p_intf, "parsing available updates, run %i", x );
-            /* if the announced item is of the type "binary", keep it and display
-             * its details to the user. Do similar stuff on "info". Do both
-             * only if the file is announced as stable */
-            if( p_uit->release.i_type == UPDATE_RELEASE_TYPE_STABLE )
-            {
-                if( p_uit->file.i_type == UPDATE_FILE_TYPE_INFO )
-                {
-                    msg_Dbg( p_intf, "release note found, desc = %s",
-                        p_uit->file.psz_description );
-                    [o_fld_releaseNote setString:
-                        [NSString stringWithUTF8String:
-                        (p_uit->file.psz_description)]];
-                    /* download our release note
-                     * We will read the temp file after this loop */
-                    update_download( p_uit, (char *)[pathToReleaseNote UTF8String] );
-                    gettingReleaseNote = YES;
-                }
-                else if( p_uit->file.i_type == UPDATE_FILE_TYPE_BINARY )
-                {
-                    msg_Dbg( p_intf, "binary found, version = %s, "
-                        "url=%s, size=%i MB", p_uit->release.psz_version,
-                        p_uit->file.psz_url,
-                        (int)((p_uit->file.l_size / 1024) / 1024) );
-                    [o_fld_currentVersionAndSize setStringValue: 
-                        [NSString stringWithFormat:
-                        _NS("The latest VLC media player release "
-                            "is %s (%i MB to download)."),
-                        p_uit->release.psz_version, ((p_uit->file.l_size
-                        / 1024) / 1024)]];
- 
-                    if( o_urlOfBinary )
-                        [o_urlOfBinary release];
-                    o_urlOfBinary = [[NSString alloc] initWithUTF8String:
-                        p_uit->file.psz_url];
-                }
-                if( p_uit->release.i_status == UPDATE_RELEASE_STATUS_NEWER &&
-                    !releaseChecked )
-                {
-                    /* our version is outdated, let the user download the new
-                     * release */
-                    [o_fld_status setStringValue: _NS("This version of VLC "
-                        "is outdated.")];
-                    [o_btn_DownloadNow setEnabled: YES];
-                    msg_Dbg( p_intf, "this version of VLC is outdated" );
-                    /* put the mirror information */
-                    msg_Dbg( p_intf, "used mirror: %s, %s [%s]",
-                            p_uit->mirror.psz_name, p_uit->mirror.psz_location,\
-                            p_uit->mirror.psz_type );
-                    /* make sure that we perform this check only once */
-                    releaseChecked = YES;
-                    /* Make sure the update window is showed in case we have something */
-                    [o_update_window center];
-                    [o_update_window displayIfNeeded];
-                    [o_update_window makeKeyAndOrderFront: self];
-
-                }
-                else if(! releaseChecked )
-                {
-                    [o_fld_status setStringValue: _NS("This version of VLC "
-                        "is the latest available.")];
-                    [o_btn_DownloadNow setEnabled: NO];
-                    msg_Dbg( p_intf, "current version is up-to-date" );
-                    releaseChecked = YES;
-                }
-            }
-            x += 1;
-        }
-
-        update_iterator_Delete( p_uit );
-
-        /* wait for our release notes if necessary, since the download is done
-         * by another thread -- this does usually take 300000 to 500000 ms */
-        if( gettingReleaseNote )
-        {
-            int i = 0;
-            while( [[NSFileManager defaultManager] fileExistsAtPath: pathToReleaseNote] == NO )
-            {
-                msleep( 100000 );
-                i += 1;
-                if( i == 150 )
-                {
-                    /* if this takes more than 15 sec, exit */
-                    msg_Warn( p_intf, "download took more than 15 sec, exiting" );
-                    break;
-                }
-            }
-            msg_Dbg( p_intf, "waited %i ms for the release notes", (i * 100000) );
-            msleep( 500000 );
-
-            /* let's open our cached release note and display it
-             * we can't use NSString stringWithContentsOfFile:encoding:error:
-             * since it is Tiger only */
-            NSString * releaseNote = [[NSString alloc] initWithData:
-                [NSData dataWithContentsOfFile: pathToReleaseNote]
-                encoding: NSISOLatin1StringEncoding];
-            if( releaseNote )
-                [o_fld_releaseNote setString: releaseNote];
- 
-            /* delete the file since it isn't needed anymore */
-            BOOL myBOOL = NO;
-            myBOOL = [[NSFileManager defaultManager] removeFileAtPath:
-                pathToReleaseNote handler: nil];
-        }
-        else
-        {
-            /* don't confuse the user, but make her happy */
-            [o_fld_status setStringValue: _NS("This version of VLC "
-                "is the latest available.")];
-            [o_btn_DownloadNow setEnabled: NO];
-            msg_Dbg( p_intf, "current version is up-to-date" );
-        }
-    }
-    [pool release];
-}
-
-- (void)performDownload:(NSString *)path
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-