]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/update.m
Fix MacOSX update checking - inverted behavior
[vlc] / modules / gui / macosx / update.m
index 33fd09f795121009c7f2e0b15381afaed7a4de4d..e201cb26fce40a539d911571b98a106a480677d0 100644 (file)
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * update.m: MacOS X Check-For-Update window
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright © 2005-2008 the VideoLAN team
  * $Id$
  *
- * Authors: Felix K\9fhne <fkuehne@users.sf.net>
+ * 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
  * it under the terms of the GNU General Public License as published by
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#import "update.h"
 
-/*****************************************************************************
- * Note: 
- * the code used to bind with VLC's core and the download of files is heavily 
- * based upon ../wxwidgets/updatevlc.cpp, written by Antoine Cellerier. 
- * (he is a member of the VideoLAN team) 
- *****************************************************************************/
-
+#ifdef UPDATE_CHECK
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#import "update.h"
-#import "intf.h"
-
-#import <vlc/vlc.h>
-#import <vlc/intf.h>
 
-#import "vlc_block.h"
-#import "vlc_stream.h"
-#import "vlc_xml.h"
-
-#define UPDATE_VLC_OS "macosx"
-
-#ifdef i386
-#define UPDATE_VLC_ARCH "i386"
-#else
-#define UPDATE_VLC_ARCH "ppc"
-#endif
-
-#define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status"
-#define UPDATE_VLC_MIRRORS_URL "http://update.videolan.org/mirrors"
-
-#define UPDATE_VLC_DOWNLOAD_BUFFER_SIZE 2048
+static NSString * kPrefUpdateOnStartup = @"UpdateOnStartup";
+static NSString * kPrefUpdateLastTimeChecked = @"UpdateLastTimeChecked";
 
 /*****************************************************************************
  * VLCExtended implementation
@@ -71,10 +48,20 @@ static VLCUpdate *_o_sharedInstance = nil;
 
 - (id)init
 {
-    if (_o_sharedInstance) {
+    if( _o_sharedInstance ) {
         [self dealloc];
     } else {
         _o_sharedInstance = [super init];
+        b_checked = 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")];
     }
 
     return _o_sharedInstance;
@@ -82,32 +69,42 @@ static VLCUpdate *_o_sharedInstance = nil;
 
 - (void)awakeFromNib
 {
-    /* clean the interface */
-    [o_fld_userVersion setStringValue: [[[NSBundle mainBundle] infoDictionary] \
-        objectForKey:@"CFBundleVersion"]];
-    [o_fld_releaseNote setString: @""];
-    [o_fld_size setStringValue: @""];
-    [o_fld_currentVersion setStringValue: @""];
-    
-    [self initStrings];
+    /* we don't use - (BOOL)shouldCheckUpdateOnStartup because we don't want
+     * the Alert panel to pop up at this time */
+    [o_chk_updateOnStartup setState: [[NSUserDefaults standardUserDefaults] boolForKey: kPrefUpdateOnStartup]];
 }
 
-- (void)initStrings
+- (void)setShouldCheckUpdate: (BOOL)check
 {
-    /* translate strings to the user's language */
-    [o_update_window setTitle: _NS("Check for update")];
-    [o_btn_cancel setTitle: _NS("Cancel")];
-    [o_btn_DownloadNow setTitle: _NS("Download now")];
-    [o_btn_okay setTitle: _NS("OK")];
-    [o_lbl_currentVersion setStringValue: [_NS("Current version") \
-        stringByAppendingString: @":"]];
-    [o_lbl_size setStringValue: [_NS("Size") \
-        stringByAppendingString: @":"]];
-    [o_lbl_userVersion setStringValue: [_NS("Your version") \
-        stringByAppendingString: @":"]];
-    [o_lbl_mirror setStringValue: [_NS("Mirror") \
-        stringByAppendingString: @":"]];
-    [o_lbl_checkForUpdate setStringValue: _NS("Checking for update...")];
+    [[NSUserDefaults standardUserDefaults] setBool: check forKey: kPrefUpdateOnStartup];
+    [o_chk_updateOnStartup setState: check];
+}
+
+- (BOOL)shouldCheckForUpdate
+{
+    NSDate *o_last_update;
+    NSDate *o_next_update;
+    if( ![[NSUserDefaults standardUserDefaults] objectForKey: kPrefUpdateOnStartup] )
+    {
+        /* We don't have any preferences stored, ask the user. */
+        int res = NSRunInformationalAlertPanel( _NS("Do you want VLC to check for updates automatically?"),
+              _NS("You can change this option in VLC's update window later on."), _NS("Yes"), _NS("No"), nil );
+        [self setShouldCheckUpdate: res];
+    }
+
+    if( ![[NSUserDefaults standardUserDefaults] boolForKey: kPrefUpdateOnStartup] )
+        return NO;
+
+    o_last_update = [[NSUserDefaults standardUserDefaults] objectForKey: kPrefUpdateLastTimeChecked];
+    if( !o_last_update )
+        return YES;
+
+    o_next_update = [[[NSDate alloc] initWithTimeInterval: 60*60*24*2 /* every two days */ sinceDate: o_last_update] autorelease];
+    if( !o_next_update )
+        return YES;
+
+    return [o_next_update compare: [NSDate date]] == NSOrderedAscending;
 }
 
 - (void)showUpdateWindow
@@ -116,408 +113,107 @@ static VLCUpdate *_o_sharedInstance = nil;
     [o_update_window center];
     [o_update_window displayIfNeeded];
     [o_update_window makeKeyAndOrderFront:nil];
-    
-    /* alloc some dictionaries first */
-    o_mirrors = [[NSMutableArray alloc] init];
-    o_files = [[NSMutableDictionary alloc] init];
-    
-    [o_bar_checking startAnimation:nil];
-    [self getData];
-    [o_bar_checking stopAnimation:nil];
+
+    if( !b_checked )
+    {
+        [o_bar_checking startAnimation: self];
+        [self checkForUpdate];
+        b_checked = true;
+        [o_bar_checking stopAnimation: self];
+    }
 }
 
-- (IBAction)cancel:(id)sender
+- (IBAction)download:(id)sender
 {
-    /* cancel the download and close the sheet */
+    /* provide a save dialogue */
+    SEL sel = @selector(getLocationForSaving:returnCode:contextInfo:);
+    NSSavePanel * saveFilePanel = [[NSSavePanel alloc] init];
+
+    [saveFilePanel setRequiredFileType: @"dmg"];
+    [saveFilePanel setCanSelectHiddenExtension: YES];
+    [saveFilePanel setCanCreateDirectories: YES];
+    [saveFilePanel beginSheetForDirectory:nil file:
+        [[[NSString stringWithUTF8String: p_u->release.psz_url] componentsSeparatedByString:@"/"] lastObject]
+                           modalForWindow: o_update_window 
+                            modalDelegate:self
+                           didEndSelector:sel
+                              contextInfo:nil];
 }
 
-- (IBAction)download:(id)sender
+- (void)getLocationForSaving: (NSSavePanel *)sheet 
+                  returnCode: (int)returnCode 
+                 contextInfo: (void *)contextInfo
 {
-    /* open the sheet and start the download */
+    if( returnCode == NSOKButton )
+    {
+        /* perform download and pass the selected path */
+        [self performDownload: [sheet filename]];
+    }
+    [sheet release];
 }
 
 - (IBAction)okay:(id)sender
 {
-    /* just close the window */
-    [o_update_window close];
+    /* just hides the window */
+    [o_update_window orderOut: self];
 }
 
-
-
-- (void)getData
+- (IBAction)changeCheckUpdateOnStartup:(id)sender
 {
-    /* This function gets all the info from the xml files hosted on
-    http://update.videolan.org/ and stores it in appropriate lists.
-    It was taken from the WX-interface and ported from C++ to Obj-C. */
-
-    stream_t *p_stream = NULL;
-    char *psz_eltname = NULL;
-    char *psz_name = NULL;
-    char *psz_value = NULL;
-    char *psz_eltvalue = NULL;
-    xml_t *p_xml = NULL;
-    xml_reader_t *p_xml_reader = NULL;
-    bool b_os = false;
-    bool b_arch = false;
-    
-    intf_thread_t * p_intf = VLCIntf;
-
-    if( UPDATE_VLC_ARCH == "i386" )
-    {
-        /* since we don't provide any binaries for MacTel atm, doing the
-         * update-check is not necessary (this would fail in fact). That's why 
-         * we just provide a sheet telling the user about that and skip 
-         * the rest. */
-        /* FIXME: remove me, if a i386-binary is available */
-        NSBeginInformationalAlertSheet(_NS("Unsupported architecture"), \
-                    _NS("OK"), @"", @"", o_update_window, nil, nil, nil, nil, \
-                    _NS("Binary builds are only available for Mac OS X on " \
-                    "the PowerPC-platform. Official builds for Intel-Macs " \
-                    "are not available at this time. \n\n If you want to " \
-                    "help us here, feel free to contact us."));
-        return;
-    }
-    
-    NSMutableDictionary * temp_version;
-    temp_version = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary * temp_file;
-    temp_file = [[NSMutableDictionary alloc] init];
-    NSMutableDictionary * temp_mirror;
-    temp_mirror = [[NSMutableDictionary alloc] init];
-
-    //struct update_mirror_t tmp_mirror;
-
-    p_xml = xml_Create( p_intf );
-    if( !p_xml )
-    {
-        msg_Err( p_intf, "Failed to open XML parser" );
-        // FIXME: display error message in dialog
-        return;
-    }
-
-    p_stream = stream_UrlNew( p_intf, UPDATE_VLC_STATUS_URL );
-    if( !p_stream )
-    {
-        msg_Err( p_intf, "Failed to open %s for reading",
-                 UPDATE_VLC_STATUS_URL );
-        // FIXME: display error message in dialog
-        return;
-    }
+    [self setShouldCheckUpdate: [sender state]];
+}
 
-    p_xml_reader = xml_ReaderCreate( p_xml, p_stream );
+- (void)setUpToDate:(BOOL)uptodate
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-    if( !p_xml_reader )
+    if( uptodate )
     {
-        msg_Err( p_intf, "Failed to open %s for parsing",
-                 UPDATE_VLC_STATUS_URL );
-        // FIXME: display error message in dialog
-        return;
+        [o_fld_releaseNote setString: @""];
+        [o_fld_currentVersion setStringValue: @""];
+        [o_fld_status setStringValue: _NS("This version of VLC is the latest available.")];
+        [o_btn_DownloadNow setEnabled: NO];
     }
-
-    /* build tree */
-    while( xml_ReaderRead( p_xml_reader ) == 1 )
+    else
     {
-        switch( xml_ReaderNodeType( p_xml_reader ) )
-        {
-            // Error
-            case -1:
-                // TODO: print message
-                return;
-
-            case XML_READER_STARTELEM:
-                psz_eltname = xml_ReaderName( p_xml_reader );
-                if( !psz_eltname )
-                {
-                    // TODO: print message
-                    return;
-                }
-                msg_Dbg( p_intf, "element name: %s", psz_eltname );
-                while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
-                {
-                    psz_name = xml_ReaderName( p_xml_reader );
-                    psz_value = xml_ReaderValue( p_xml_reader );
-                    if( !psz_name || !psz_value )
-                    {
-                        // TODO: print message
-                        free( psz_eltname );
-                        return;
-                    }
-                    msg_Dbg( p_intf, "  attribute %s = %s",
-                             psz_name, psz_value );
-                    
-                    if( !strcmp( psz_name, "name" )
-                        && ( !strcmp( psz_value, "macosx" ) 
-                            || !strcmp( psz_value, "*" ) )
-                        && !strcmp( psz_eltname, "os" ) )
-                    {
-                        b_os = true;
-                    }
-                    if( b_os && !strcmp( psz_name, "name" )
-                        && ( !strcmp( psz_value, UPDATE_VLC_ARCH ) 
-                            || !strcmp( psz_value, "*" ) )
-                        && !strcmp( psz_eltname, "arch" ) )
-                    {
-                        b_arch = true;
-                    }
-                    
-                    if( b_os && b_arch )
-                    {
-                        if( strcmp( psz_eltname, "version" ) == 0 )
-                        {
-                            [temp_version setObject: [NSString \
-                                stringWithUTF8String: psz_value] forKey: \
-                                [NSString stringWithUTF8String: psz_name]];
-                        }
-                        if( !strcmp( psz_eltname, "file" ) )
-                        {
-                            [temp_file setObject: [NSString \
-                                stringWithUTF8String: psz_value] forKey: \
-                                [NSString stringWithUTF8String: psz_name]];
-                        }
-                    }
-                    free( psz_name );
-                    free( psz_value );
-                }
-                if( ( b_os && b_arch && strcmp( psz_eltname, "arch" ) ) )
-                {
-                    /*if( !strcmp( psz_eltname, "version" ) )
-                    {
-                        it = m_versions.begin();
-                        while( it != m_versions.end() )
-                        {
-                            if( it->type == tmp_version.type
-                                && it->major == tmp_version.major
-                                && it->minor == tmp_version.minor
-                                && it->revision == tmp_version.revision
-                                && it->extra == tmp_version.extra )
-                            {
-                                break;
-                            }
-                            it++;
-                        }
-                        if( it == m_versions.end() )
-                        {
-                            m_versions.push_back( tmp_version );
-                            it = m_versions.begin();
-                            while( it != m_versions.end() )
-                            {
-                                if( it->type == tmp_version.type
-                                    && it->major == tmp_version.major
-                                    && it->minor == tmp_version.minor
-                                    && it->revision == tmp_version.revision
-                                    && it->extra == tmp_version.extra )
-                                {
-                                    break;
-                                }
-                                it++;
-                            }
-                        }
-                        tmp_version.type = wxT( "" );
-                        tmp_version.major = wxT( "" );
-                        tmp_version.minor = wxT( "" );
-                        tmp_version.revision = wxT( "" );
-                        tmp_version.extra = wxT( "" );
-                    }
-                    if( !strcmp( psz_eltname, "file" ) )
-                    {
-                        it->m_files.push_back( tmp_file );
-                        tmp_file.type = wxT( "" );
-                        tmp_file.md5 = wxT( "" );
-                        tmp_file.size = wxT( "" );
-                        tmp_file.url = wxT( "" );
-                        tmp_file.description = wxT( "" );
-                    }*/
-                     
-                    if(! [temp_version objectForKey: @"extra"] == @"0")
-                    {
-                        [o_fld_currentVersion setStringValue: [NSString \
-                            stringWithFormat: @"%@.%@.%@-%@ (%@)", \
-                            [temp_version objectForKey: @"major"], \
-                            [temp_version objectForKey: @"minor"], \
-                            [temp_version objectForKey: @"revision"], \
-                            [temp_version objectForKey: @"extra"], \
-                            [temp_version objectForKey: @"type"]]];
-                    }
-                    else
-                    {
-                        [o_fld_currentVersion setStringValue: [NSString \
-                            stringWithFormat: @"%@.%@.%@ (%@)", \
-                            [temp_version objectForKey: @"major"], \
-                            [temp_version objectForKey: @"minor"], \
-                            [temp_version objectForKey: @"revision"], \
-                            [temp_version objectForKey: @"type"]]];
-                    }
-                }
-                free( psz_eltname );
-                break;
-
-            case XML_READER_ENDELEM:
-                psz_eltname = xml_ReaderName( p_xml_reader );
-                if( !psz_eltname )
-                {
-                    // TODO: print message
-                    return;
-                }
-                msg_Dbg( p_intf, "element end: %s", psz_eltname );
-                if( !strcmp( psz_eltname, "os" ) )
-                    b_os = false;
-                if( !strcmp( psz_eltname, "arch" ) )
-                    b_arch = false;
-                    
-                if( !strcmp( psz_eltname, "file") )
-                {
-                    if( [temp_file objectForKey: @"type"] == @"info" )
-                    {
-                        /* this is the announce file, store it correctly */
-                        [o_files setObject: temp_file forKey: @"announce"];
-                    }
-                    else if( [temp_file objectForKey: @"type"] == @"binary" )
-                    {
-                        /* that's our binary */
-                        [o_files setObject: temp_file forKey: @"binary"];
-                    }
-                    else if( [temp_file objectForKey: @"type"] == @"source" )
-                    {
-                        /* that's the source. not needed atm, but store it 
-                         * anyway to make possible enhancement of this dialogue
-                         * a bit easier */
-                        [o_files setObject: temp_file forKey: @"source"];
-                    }
-                    
-                    /* clean the temp-dict */
-                    [temp_file removeAllObjects];
-                }
-                free( psz_eltname );
-                break;
-
-            case XML_READER_TEXT:
-                /* you can check the content of a file here (e.g. \
-                 * "Installer-less binaries", "Disk-Image", etc.). That's not
-                 * needed on OSX atm, but print debug-info anyway. */
-                psz_eltvalue = xml_ReaderValue( p_xml_reader );
-                msg_Dbg( p_intf, "  text: %s", psz_eltvalue );
-                free( psz_eltvalue );
-                break;
-        }
+        [o_fld_releaseNote setString: [NSString stringWithUTF8String: (p_u->release.psz_desc ? 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];
     }
 
-    if( p_xml_reader && p_xml ) xml_ReaderDelete( p_xml, p_xml_reader );
-    if( p_stream ) stream_Delete( p_stream );
-
-    p_stream = stream_UrlNew( p_intf, UPDATE_VLC_MIRRORS_URL );
-    if( !p_stream )
-    {
-        msg_Err( p_intf, "Failed to open %s for reading",
-                 UPDATE_VLC_MIRRORS_URL );
-        // FIXME: display error message in dialog
-        return;
-    }
+    [pool release];
+}
 
-    p_xml_reader = xml_ReaderCreate( p_xml, p_stream );
+static void updateCallback( void * p_data, bool b_success )
+{
+    [(id)p_data setUpToDate: !b_success || !update_NeedUpgrade( ((VLCUpdate*)p_data)->p_u )];
+}
 
-    if( !p_xml_reader )
-    {
-        msg_Err( p_intf, "Failed to open %s for parsing",
-                 UPDATE_VLC_MIRRORS_URL );
-        // FIXME: display error message in dialog
+- (void)checkForUpdate
+{
+    p_u = update_New( VLCIntf );
+    if( !p_u )
         return;
-    }
-    
-    /* build list */
-    while( xml_ReaderRead( p_xml_reader ) == 1 )
-    {
-        switch( xml_ReaderNodeType( p_xml_reader ) )
-        {
-            // Error
-            case -1:
-                // TODO: print message
-                return;
-
-            case XML_READER_STARTELEM:
-                psz_eltname = xml_ReaderName( p_xml_reader );
-                if( !psz_eltname )
-                {
-                    // TODO: print message
-                    return;
-                }
-                msg_Dbg( p_intf, "element name: %s", psz_eltname );
-                while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
-                {
-                    psz_name = xml_ReaderName( p_xml_reader );
-                    psz_value = xml_ReaderValue( p_xml_reader );
-                    if( !psz_name || !psz_value )
-                    {
-                        // TODO: print message
-                        free( psz_eltname );
-                        return;
-                    }
-                    msg_Dbg( p_intf, "  attribute %s = %s",
-                             psz_name, psz_value );
-                    
-                    if( !strcmp( psz_eltname, "mirror" ) )
-                    {
-                        [temp_mirror setObject: [NSString stringWithUTF8String: psz_name] forKey: [NSString stringWithUTF8String: psz_value]];
-                    
-                        /*if( !strcmp( psz_name, "name" ) )
-                            tmp_mirror.name = wxU( psz_value );
-                        if( !strcmp( psz_name, "location" ) )
-                            tmp_mirror.location = wxU( psz_value );*/
-                    }
-                    if( !strcmp( psz_eltname, "url" ) )
-                    {
-                        [temp_mirror setObject: [NSString stringWithUTF8String: psz_name] forKey: [NSString stringWithUTF8String: psz_value]];
-                        
-                        /*
-                        if( !strcmp( psz_name, "type" ) )
-                            tmp_mirror.type = wxU( psz_value );
-                        if( !strcmp( psz_name, "base" ) )
-                            tmp_mirror.base_url = wxU( psz_value );*/
-                    }
-                    free( psz_name );
-                    free( psz_value );
-                }
-                /*if( !strcmp( psz_eltname, "url" ) )
-                {
-                    m_mirrors.push_back( tmp_mirror );
-                    tmp_mirror.type = wxT( "" );
-                    tmp_mirror.base_url = wxT( "" );
-                }*/
-                free( psz_eltname );
-                break;
-
-            case XML_READER_ENDELEM:
-                psz_eltname = xml_ReaderName( p_xml_reader );
-                if( !psz_eltname )
-                {
-                    // TODO: print message
-                    return;
-                }
-                msg_Dbg( p_intf, "element end: %s", psz_eltname );
-                /*if( !strcmp( psz_eltname, "mirror" ) )
-                {
-                    tmp_mirror.name = wxT( "" );
-                    tmp_mirror.location = wxT( "" );
-                }*/
-                
-                /* store our mirror correctly */
-                [o_mirrors addObject: temp_mirror];
-                [temp_mirror removeAllObjects];
-                
-                free( psz_eltname );
-                break;
-
-            case XML_READER_TEXT:
-                psz_eltvalue = xml_ReaderValue( p_xml_reader );
-                msg_Dbg( p_intf, "  text: %s", psz_eltvalue );
-                free( psz_eltvalue );
-                break;
-        }
-    }
+    update_Check( p_u, updateCallback, self );
 
+    [[NSUserDefaults standardUserDefaults] setObject: [NSDate date] forKey: kPrefUpdateLastTimeChecked];
+}
 
-    if( p_xml_reader && p_xml ) xml_ReaderDelete( p_xml, p_xml_reader );
-    if( p_stream ) stream_Delete( p_stream );
-    if( p_xml ) xml_Delete( p_xml );
+- (void)performDownload:(NSString *)path
+{
+    update_Download( p_u, [path UTF8String] );
+    [o_btn_DownloadNow setEnabled: NO];
+    [o_update_window orderOut: self];
+    update_Delete( p_u );
 }
 
 @end
+
+#endif