Make sure notes folder always exists

Philip-Scott · Dec 21, 2018 · fa0cf30 · fa0cf30
1 parent aa25453
commit fa0cf30
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Application.vala b/src/Application.vala
@@ -80,10 +80,15 @@ public class ENotes.Application : Granite.Application {
             ENotes.app = this;
             settings = ENotes.Services.Settings.get_instance ();
 
+            var notes_path = Path.build_filename (GLib.Environment.get_home_dir (), "/.local/share/notes-up/");
+            var notes_dir = File.new_for_path (notes_path);
+
+            if (!notes_dir.query_exists ()) {
+                DirUtils.create_with_parents (notes_path, 0766);
+            }
+
             if (settings.notes_database == "") { // Init databases
-                var notes_dir = GLib.Environment.get_home_dir () + "/.local/share/notes-up/";
-                DirUtils.create_with_parents (notes_dir, 0766);
-                settings.notes_database = notes_dir + "NotesUp.db";
+                settings.notes_database = Path.build_filename (notes_path, "NotesUp.db");
             }
 
             ENotes.NOTES_DIR = settings.notes_location;

diff --git a/src/Services/DatabaseTable.vala b/src/Services/DatabaseTable.vala
@@ -70,7 +70,6 @@ public abstract class DatabaseTable {
         // Open DB.
         int res = Sqlite.Database.open_v2 (filename, out db, Sqlite.OPEN_READWRITE | Sqlite.OPEN_CREATE,
                                            null);
-        assert (res == Sqlite.OK);
 
         // Check if we have write access to database.
         if (filename != Db.IN_MEMORY_NAME) {
@@ -448,4 +447,3 @@ public abstract class DatabaseTable {
             throw_error ("commit_transaction", res);
     }
 }
-