Bug fixes

libgenapps · Jan 27, 2019 · 339defb · 339defb
1 parent b04bb64
commit 339defb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/LibgenDesktop.Setup/Constants.cs b/LibgenDesktop.Setup/Constants.cs
@@ -2,8 +2,8 @@
 {
     internal static class Constants
     {
-        public const string CURRENT_VERSION = "1.2.3";
-        public const string TITLE_VERSION = "1.2.3";
+        public const string CURRENT_VERSION = "1.2.4";
+        public const string TITLE_VERSION = "1.2.4";
         public const string PRODUCT_TITLE_FORMAT = "Libgen Desktop " + TITLE_VERSION + " ({0}-bit)";
         public const string SHORTCUT_TITLE_FORMAT = "Libgen Desktop ({0}-bit)";
         public const string PRODUCT_COMPANY = "Libgen Apps";

diff --git a/LibgenDesktop/Common/Constants.cs b/LibgenDesktop/Common/Constants.cs
@@ -5,9 +5,9 @@ namespace LibgenDesktop.Common
     internal static class Constants
     {
         public const string DATABASE_METADATA_APP_NAME = "LibgenDesktop";
-        public const string CURRENT_VERSION = "1.2.3";
-        public const string CURRENT_GITHUB_RELEASE_NAME = "1.2.3";
-        public static readonly DateTime CURRENT_GITHUB_RELEASE_DATE = new DateTime(2019, 1, 2);
+        public const string CURRENT_VERSION = "1.2.4";
+        public const string CURRENT_GITHUB_RELEASE_NAME = "1.2.4";
+        public static readonly DateTime CURRENT_GITHUB_RELEASE_DATE = new DateTime(2019, 1, 27);
         public const string CURRENT_DATABASE_VERSION = "1.2.1";
 
         public const string APP_SETTINGS_FILE_NAME = "libgen.config";

diff --git a/LibgenDesktop/Models/Database/LocalDatabase.cs b/LibgenDesktop/Models/Database/LocalDatabase.cs
@@ -72,7 +72,7 @@ public DatabaseMetadata GetMetadata()
                     while (dataReader.Read())
                     {
                         string key = dataReader.GetString(0);
-                        string value = dataReader.GetString(1);
+                        string value = ParseNullableDbString(dataReader.GetValue(1));
                         if (DatabaseMetadata.FieldDefinitions.TryGetValue(key.ToLower(), out DatabaseMetadata.FieldDefinition field))
                         {
                             field.Setter(result, value);
@@ -1511,7 +1511,7 @@ private LibraryFile ReadFile(SQLiteDataReader dataReader)
             LibraryFile file = new LibraryFile();
             file.Id = dataReader.GetInt32(0);
             file.FilePath = dataReader.GetString(1);
-            file.ArchiveEntry = ParseStringScalarResult(dataReader.GetValue(2));
+            file.ArchiveEntry = ParseNullableDbString(dataReader.GetValue(2));
             file.ObjectType = (LibgenObjectType)dataReader.GetInt32(3);
             file.ObjectId = dataReader.GetInt32(4);
             return file;
@@ -1546,7 +1546,7 @@ private int ExecuteIntScalarCommand(string commandText)
 
         private string ExecuteStringScalarCommand(string commandText)
         {
-            return ParseStringScalarResult(ExecuteScalarCommand(commandText));
+            return ParseNullableDbString(ExecuteScalarCommand(commandText));
         }
 
         private object ExecuteScalarCommand(string commandText)
@@ -1568,9 +1568,9 @@ private int ParseIntScalarResult(object objectResult)
             return objectResult != DBNull.Value ? (int?)(long)objectResult : null;
         }
 
-        private string ParseStringScalarResult(object objectResult)
+        private string ParseNullableDbString(object input)
         {
-            return objectResult != DBNull.Value ? objectResult.ToString() : null;
+            return input != DBNull.Value ? input.ToString() : null;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/LibgenDesktop/Models/MainModel.cs b/LibgenDesktop/Models/MainModel.cs
@@ -700,8 +700,9 @@ public bool OpenDatabase(string databaseFilePath)
                         UpdateFictionBookCount();
                         UpdateSciMagArticleCount();
                     }
-                    catch
+                    catch (Exception exception)
                     {
+                        Logger.Exception(exception);
                         LocalDatabaseStatus = DatabaseStatus.CORRUPTED;
                         return false;
                     }
@@ -748,8 +749,9 @@ public bool CreateDatabase(string databaseFilePath)
                 SciMagArticleCount = 0;
                 return true;
             }
-            catch
+            catch (Exception exception)
             {
+                Logger.Exception(exception);
                 LocalDatabaseStatus = DatabaseStatus.CORRUPTED;
                 return false;
             }