[chronojump] Continuation of last commits

[Xavier de Blas <xaviblas src gnome org>]

commit 295b0bfa3fc1e088298057bdffd5815a426d4663
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Aug 20 15:26:48 2021 +0200

    Continuation of last commits

 src/sqlite/main.cs |  8 +-------
 src/util.cs        | 12 ++++++++++--
 2 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/src/sqlite/main.cs b/src/sqlite/main.cs
index c326050bd..b1efef56b 100644
--- a/src/sqlite/main.cs
+++ b/src/sqlite/main.cs
@@ -404,13 +404,7 @@ class Sqlite
                                return true;
                        }
                } else {
-                       if (File.Exists(sqlFile)){
-                               //backup the database
-                               Util.BackupDirCreateIfNeeded();
-                               Util.BackupDatabase();
-                               LogB.SQL ("made a database backup"); //not compressed yet, it seems 
System.IO.Compression.DeflateStream and
-                               //System.IO.Compression.GZipStream are not in mono
-
+                       if (File.Exists(sqlFile)) {
                                File.Move(Util.GetDatabaseDir() + Path.DirectorySeparatorChar + 
"chronojump.db",
                                        Util.GetDatabaseTempDir() + Path.DirectorySeparatorChar + 
"chronojump.db");
                                return true;
diff --git a/src/util.cs b/src/util.cs
index 4d95b2c12..ef2297cdb 100644
--- a/src/util.cs
+++ b/src/util.cs
@@ -1381,16 +1381,24 @@ public class Util
 
                if(File.Exists(System.IO.Path.Combine(homeDir, "chronojump.db")))
                        File.Copy(System.IO.Path.Combine(homeDir, "chronojump.db"), 
-                               System.IO.Path.Combine(backupDir, "chronojump_" + dateParsed + ".db"));
+                               System.IO.Path.Combine(backupDirOld, "chronojump_" + dateParsed + ".db"));
                else {
                        LogB.Error("Error, chronojump.db file doesn't exist!");
                }
        }
+       */
 
        //size of the "backups" dir (used for automatic backups on start < 2.1.3)
        public static void GetBackupsSize (out int files, out int sizeInKB)
        {
-               DirectoryInfo info = new DirectoryInfo(backupDir);
+               if(! Directory.Exists(backupDirOld))
+               {
+                       files = 0;
+                       sizeInKB = 0;
+                       return;
+               }
+
+               DirectoryInfo info = new DirectoryInfo(backupDirOld);
                //long totalSize = info.EnumerateFiles().Sum(file => file.Length);      //LinQ 4.0
                //long totalSize = info.GetFiles().Sum(file => file.Length);            //LinQ 3.5