Fixed bug that prevented DB from being updated in Windows. Added supp…

…ort for Updates texts.
ruben-gut · Nov 24, 2011 · f505ee2 · f505ee2
1 parent 37e0ac7
commit f505ee2
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 23 deletions.
diff --git a/app.xml b/app.xml
@@ -1,6 +1,6 @@
 <application xmlns="http://ns.adobe.com/air/application/2.6">
     <id>freevana.freevanaPlayer</id>
-    <versionNumber>1.1</versionNumber>
+    <versionNumber>1.1.1</versionNumber>
     <filename>FreevanaPlayer</filename>
     <name>Freevana Player</name>
     <description>Freevana Player</description>

diff --git a/freevanaPlayer.mxml b/freevanaPlayer.mxml
@@ -103,13 +103,13 @@
                 if (!databaseBtn.enabled) {
                     databaseBtn.enabled = true;
                     databaseBtn.addEventListener(MouseEvent.CLICK, function(ev:Event):void {
-                       resources.copyDB(function ():void {
-                           _db = new FreevanaDB(Resources.DATABASE_FILE_PATH);
-                           databaseLbl.text = _db.getVersionName();
-                           databaseError.text = "";
-                           settingsStartBtn.enabled = true;
-                           _settings.markSetupCompleted();
-                       });
+                        resources.copyDB(function ():void {
+                            _db = new FreevanaDB(Resources.DATABASE_FILE_PATH);
+                            databaseLbl.text = _db.getVersionName();
+                            databaseError.text = "";
+                            settingsStartBtn.enabled = true;
+                            _settings.markSetupCompleted();
+                        });
                     });
                 }
 
@@ -325,6 +325,10 @@
                         (_updateData[Updates.PLAYER] != _settings.getLastUpdateShown())) {
                         var _title:String = resourceManager.getString('Strings', 'UPDATES_NEW_PLAYER_VERSION') + ': ' + _updateData[Updates.PLAYER];
                         var _text:String = resourceManager.getString('Strings', 'UPDATES_DOWNLOAD_NEW_PLAYER');
+                        // Add extra text if it's available
+                        if (typeof _updateData[Updates.PLAYER_TEXT] != 'undefined') {
+                            _text += "\n" + _updateData[Updates.PLAYER_TEXT];
+                        }
                         Alert.show(_text, _title, Alert.YES|Alert.NO, null, function(ev:*):void {
                             if (ev.detail == Alert.YES) {
                                 navigateToURL(new URLRequest(_updateData[Updates.PLAYER_LINK]));
@@ -347,6 +351,10 @@
                         (_updateData[Updates.DATABASE] != _settings.getLastDBUpdateShown())) {
                         var _title:String = resourceManager.getString('Strings', 'UPDATES_NEW_DATABASE_VERSION') + ': ' + _updateData[Updates.DATABASE];
                         var _text:String = resourceManager.getString('Strings', 'UPDATES_DOWNLOAD_NEW_DATABASE');
+                        // Add extra text if it's available
+                        if (typeof _updateData[Updates.DATABASE_TEXT] != 'undefined') {
+                            _text += "\n" + _updateData[Updates.DATABASE_TEXT];
+                        }
                         Alert.show(_text, _title, Alert.YES|Alert.NO, null, function(ev:*):void {
                             if (ev.detail == Alert.YES) {
                                 navigateToURL(new URLRequest(_updateData[Updates.DATABASE_LINK]));

diff --git a/locale/en_US/Strings.properties b/locale/en_US/Strings.properties
@@ -31,7 +31,7 @@ SETTINGS_DATABASE_INFO=In order yo use Freevana Player you need to get a copy of
 SETTINGS_DATABASE_LABEL=Freevana's database
 SETTINGS_DATABASE_NONE_LABEL=None
 SETTINGS_DATABASE_NONE_ERROR=‹‹ You need to set a database
-SETTINGS_DATABASE_SET_LABEL=Change
+SETTINGS_DATABASE_SET_LABEL=Update
 # Settings - Subs
 SETTINGS_SUBTITLES_INFO=The best way to enjoy Freevana Player is to have a local copy of the subtitles. You may be able to obtain a copy at <a href='http://tirino.github.com/freevana'>http://tirino.github.com/freevana/</a>
 SETTINGS_SUBTITLES_LABEL=Subtitles
@@ -49,6 +49,6 @@ DOWNLOAD_SEPARATOR_LABEL=Or you can download the video and subtitles!
 DOWNLOAD_SUBTITLE_LABEL=Open Subtitle Folder
 # Updates
 UPDATES_NEW_PLAYER_VERSION=New version of Freevana Player
-UPDATES_DOWNLOAD_NEW_PLAYER=Download new version
+UPDATES_DOWNLOAD_NEW_PLAYER=Download new version?
 UPDATES_NEW_DATABASE_VERSION=New version of Freevana Database
-UPDATES_DOWNLOAD_NEW_DATABASE=Download new version
+UPDATES_DOWNLOAD_NEW_DATABASE=Download new version?
diff --git a/locale/es_ES/Strings.properties b/locale/es_ES/Strings.properties
@@ -30,7 +30,7 @@ SETTINGS_DATABASE_INFO=Para usar Freevana Player necesitas una copia de la base
 SETTINGS_DATABASE_LABEL=Freevana's database
 SETTINGS_DATABASE_NONE_LABEL=Ninguna
 SETTINGS_DATABASE_NONE_ERROR=‹‹ Necesita una base de datos
-SETTINGS_DATABASE_SET_LABEL=Cambiar
+SETTINGS_DATABASE_SET_LABEL=Actualizar
 # Settings - Subs
 SETTINGS_SUBTITLES_INFO=Para disfrutar mejor de Freevana Player es recomendable tener una copia local de los subtítulos. Es posible conseguir una copia en <a href='http://tirino.github.com/freevana'>http://tirino.github.com/freevana/</a>
 SETTINGS_SUBTITLES_LABEL=Subtítulos
@@ -48,6 +48,6 @@ DOWNLOAD_SEPARATOR_LABEL=O, puede bajar el video y acceder al subtitulo:
 DOWNLOAD_SUBTITLE_LABEL=Ver carpeta con Subtítulo
 # Updates
 UPDATES_NEW_PLAYER_VERSION=Nueva versión de Freevana Player
-UPDATES_DOWNLOAD_NEW_PLAYER=Descargar la nueva versión
+UPDATES_DOWNLOAD_NEW_PLAYER=Descargar la nueva versión?
 UPDATES_NEW_DATABASE_VERSION=Nueva versión de la Base de Datos
-UPDATES_DOWNLOAD_NEW_DATABASE=Descargar la nueva versión
+UPDATES_DOWNLOAD_NEW_DATABASE=Descargar la nueva versión?
diff --git a/src/freevana/util/FreevanaDB.as b/src/freevana/util/FreevanaDB.as
@@ -12,19 +12,33 @@ package freevana.util
 
         public function FreevanaDB(dbFile:String):void
         {
-            _dbFile = File.applicationStorageDirectory.resolvePath(dbFile);
+            _dbFile = Resources.DATA_STORAGE_DIR.resolvePath(dbFile);
             trace("[FreevanaDB] dbFile: " + _dbFile.nativePath);
-            _sqlConn.open(_dbFile);
             _dbVersionNumber = getVersionNumber();
         }
 
+        public function close():void
+        {
+            if (_sqlConn != null)
+            {
+                try {
+                    _sqlConn.close();
+                } catch (error:*) {
+                    trace(error);
+                }
+            }
+        }
+
         public function runQuery(query:String):Array
         {
+            _sqlConn.open(_dbFile);
             var statement:SQLStatement = new SQLStatement();
             statement.sqlConnection = _sqlConn;
             statement.text = query;
             statement.execute();
-            return statement.getResult().data;
+            var queryData:Array = statement.getResult().data;
+            _sqlConn.close();
+            return queryData;
         }
 
         public function getVersionNumber():String

diff --git a/src/freevana/util/Resources.as b/src/freevana/util/Resources.as
@@ -11,6 +11,7 @@ package freevana.util
     [ResourceBundle("Strings")]
     public class Resources
     {
+        public static var DATA_STORAGE_DIR:File = File.applicationStorageDirectory;
         public static var DATABASE_FILE_DIR:String = "db";
         public static var DATABASE_FILE_NAME:String = "freevana.db";
         public static var DATABASE_FILE_PATH:String = DATABASE_FILE_DIR + File.separator + DATABASE_FILE_NAME;
@@ -65,7 +66,7 @@ package freevana.util
 
         public function checkDB():Boolean
         {
-            var db:File = File.applicationStorageDirectory.resolvePath(DATABASE_FILE_PATH);
+            var db:File = DATA_STORAGE_DIR.resolvePath(DATABASE_FILE_PATH);
             return db.exists;
         }
 
@@ -82,16 +83,27 @@ package freevana.util
         private function doCopyDB(event:Event):void
         {
             var selectedFile:File = (event.target as File);
-            var targetFile:File = File.applicationStorageDirectory.resolvePath(DATABASE_FILE_PATH);
+            var targetFile:File = DATA_STORAGE_DIR.resolvePath(DATABASE_FILE_PATH);
 
             trace("[Resources] " + selectedFile.nativePath + " => " + targetFile.nativePath);
+            // Delete old one
+            try {
+                if (targetFile.exists) {
+                    targetFile.deleteFile();
+                }
+            } catch (error:Error) {
+                //Alert.show(error.message);
+                trace("[Resources] Error Deleting: " + error.message);
+            }
+            // Copy
             try {
                 selectedFile.copyTo(targetFile, true);
                 if (_dbCopyCallback != null) {
                     _dbCopyCallback();
                 }
             } catch (error:Error) {
-                trace("[Resources] Error: " + error.message);
+                Alert.show(error.message);
+                trace("[Resources] Error Copying: " + error.message);
             }
         }
 

diff --git a/src/freevana/util/Subtitles.as b/src/freevana/util/Subtitles.as
@@ -90,7 +90,7 @@ package freevana.util
 
         private function buildLocalStoragePathForSubs(itemId:int, isMovie:Boolean, lang:String):File
         {
-            return buildPathForSubs(File.applicationStorageDirectory, itemId, isMovie, lang);
+            return buildPathForSubs(Resources.DATA_STORAGE_DIR, itemId, isMovie, lang);
         }
 
         private function buildPathForSubs(baseFolder:File, itemId:int, isMovie:Boolean, lang:String):File

diff --git a/src/freevana/util/Updates.as b/src/freevana/util/Updates.as
@@ -9,11 +9,13 @@ package freevana.util
     {
         public static const PLAYER:String = 'player';
         public static const PLAYER_LINK:String = 'player_link';
+        public static const PLAYER_TEXT:String = 'player_text';
         public static const DATABASE:String = 'db';
         public static const DATABASE_LINK:String = 'db_link';
+        public static const DATABASE_TEXT:String = 'db_text';
 
         private static const UPDATES_URL:String = 'http://tirino.github.com/freevana/updates.json';
-        private static const CHECK_INTERVAL:int = 60 * 60 * 24; // 24 hours
+        private static const CHECK_INTERVAL:int = 60 * 60 * 12; // 24 hours
 
         private var _urlLoader:URLLoader;
         private var _settings:Settings;
@@ -63,7 +65,8 @@ package freevana.util
                     trace("[Updates] download > Event error: " + event);
                 }
             }
-            _urlLoader.load(new URLRequest(UPDATES_URL));
+            var _time:Date = new Date();
+            _urlLoader.load(new URLRequest(UPDATES_URL + '?' + _time.time));
         }
    }
 }