Revert fucky changes and rewrite from scratch

Author: teamcons

.gitignore

@@ -8,4 +8,5 @@ builddir
 
 # subprojects/*/
 .flatpak-builder
-.vscode
+.vscode
+.flatpak/meson.sh

meson.build

@@ -48,3 +48,8 @@ executable(
 
 subdir('data')
 subdir('po')
+
+gnome.post_install(
+  gtk_update_icon_cache: true,
+  update_desktop_database: true
+  )

src/Application.vala

@@ -43,86 +43,112 @@ public class Application : Gtk.Application {
                                                              "new-document",
                                                              null
         );
-
-        new_document_action.activate.connect (() => {
-            var name = get_new_document_name ();
-            var path = Path.build_filename (Environment.get_user_data_dir (), name);
-            var file = File.new_for_path (path);
-            debug (
-                   "Document is unsaved, creating an save location at: %s",
-                   path
-            );
-
-            var new_window = new AppWindow () {
-                is_new = true,
-            };
-            new_window.open_file (file);
-
-            debug ("Created new window with name %s", name);
-            add_window (new_window);
-            new_window.present ();
-        });
+        new_document_action.activate.connect (on_new_document);
         this.add_action (new_document_action);
 
         SimpleAction open_document_action = new SimpleAction (
                                                               "open-document",
                                                               null
         );
-        open_document_action.activate.connect (() => {
-            var open_dialog = new Gtk.FileDialog ();
-            var new_window = new AppWindow ();
-
-            open_dialog.open.begin (new_window, null, (obj, res) => {
-                try {
-                    var file = open_dialog.open.end (res);
-                    new_window.open_file (file);
-                    add_window (new_window);
-                    new_window.present ();
-                } catch (Error err) {
-                    warning ("Failed to select file to open: %s", err.message);
-                }
-            });
-        });
+        open_document_action.activate.connect (on_open_document);
         this.add_action (open_document_action);
     }
 
     protected override void activate () {
 
-        Slate.Utils.check_if_datadir ();
-        saved_unsaved_documents = Environment.get_user_data_dir ();
-        pile_unsaved_documents = saved_unsaved_documents.open ();
-
-        // Conveniently, if there is no unsaved document, we just get NULL
-        // Which AppWindow will process as a new unsaved doc
-        foreach (var unsaved_document in pile_unsaved_documents.read_name () ) {
-
-            debug (
-                "Document is unsaved, creating an save location at: %s",
-                path
-            );
-
-            var new_window = new AppWindow (unsaved_document) {
-                is_new = true,
-            };
+        // Reopen all the unsaved documents we have in datadir
+        check_if_datadir ();
+        var datadir = Environment.get_user_data_dir ();
+        try {
+            var pile_unsaved_documents = Dir.open (datadir);
+
+            string? unsaved_doc = null;
+		    while ((unsaved_doc = pile_unsaved_documents.read_name ()) != null) {
+                print (unsaved_doc);
+                string path = Path.build_filename (datadir, unsaved_doc);
+                File file = File.new_for_path (path);
+                open_file (file);
+                created_documents++;
+            }
+
+        } catch (Error e) {
+            warning ("Cannot read datadir! Is the disk okay? %s\n", e.message);
+        }
 
-            add_window (new_window);
-            new_window.present ();
+        // What if there was none ? The loop wouldnt happen at all.
+        if (created_documents == 1) {
+            on_new_document ();
         }
+        
     }
 
     protected override void open (File[] files, string hint) {
         foreach (var file in files) {
             debug ("Creating window with file: %s", file.get_basename ());
-            var window = new AppWindow ();
-            window.open_file (file);
+            open_file (file);
+        }
+    }
+
+    string get_new_document_name () {
+        var name = _("New Document");
+        if (created_documents > 1) {
+            name = name + " " + created_documents.to_string ();
+        }
 
-            debug ("Adding new window to application");
-            add_window (window);
-            window.present ();
+        debug ("New document name is: %s",name);
+
+        created_documents++;
+
+        return name;
+    }
+
+    public void check_if_datadir () {
+        debug ("do we have a data directory?");
+        var data_directory = File.new_for_path (Environment.get_user_data_dir ());
+        try {
+            if (!data_directory.query_exists ()) {
+                data_directory.make_directory ();
+            }
+        } catch (Error e) {
+            warning ("Failed to prepare target data directory %s\n", e.message);
         }
     }
 
     public static int main (string[] args) {
         return new Application ().run (args);
     }
+
+    public void on_new_document () {
+        var name = get_new_document_name ();
+        var path = Path.build_filename (Environment.get_user_data_dir (), name);
+        var file = File.new_for_path (path);
+
+        check_if_datadir ();
+        try {
+            file.create_readwrite (GLib.FileCreateFlags.REPLACE_DESTINATION);
+        } catch (Error e) {
+            warning ("Failed to prepare target file %s\n", e.message);
+        }
+
+        open_file (file);
+
+    }
+
+    public void open_file (File file) {
+        var new_window = new AppWindow (file);
+        add_window (new_window);
+        new_window.present ();
+    }
+
+    public void on_open_document() {
+        var open_dialog = new Gtk.FileDialog ();
+        open_dialog.open.begin (this.active_window, null, (obj, res) => {
+            try {
+                var file = open_dialog.open.end (res);
+                open_file (file);
+            } catch (Error err) {
+                warning ("Failed to select file to open: %s", err.message);
+            }
+        });
+    }
 }

src/Utils.vala

@@ -6,14 +6,14 @@
 public class AppWindow : Gtk.Window {
     public File file { get; set; }
     private Gtk.TextBuffer buf;
-    public string? file_name { get; set; default = null; }
-    public bool is_new;
+    public string file_name { get; set; }
+    public bool is_new { get; set; default = false; }
 
     // Add a debounce so we aren't writing the entire buffer every character input
     public int interval = 500; // ms
     public uint debounce_timer_id = 0;
 
-    public AppWindow (File? document) {
+    public AppWindow (File file) {
         debug ("Constructing GUI");
 
         Intl.setlocale ();
@@ -63,6 +63,7 @@ public class AppWindow : Gtk.Window {
             wrap_mode = WORD_CHAR,
         };
         buf = text_view.buffer;
+        buf.text = "";
 
 
         var scrolled_view = new Gtk.ScrolledWindow () {
@@ -90,47 +91,25 @@ public class AppWindow : Gtk.Window {
 
         debug ("Success!");
 
-        open_file (document);
+        open_file (file);
     }
 
-    /* ---------------- FILE OPERATIONS ---------------- */
-    public void open_file (File? file = this.file) {
-            debug ("Attempting to open file %s", file.get_basename ());
-
-        if (file = null) {
-            is_new = true;
-
-            this.file_name = Slate.Utils.get_new_document_name ();
-            this.file = File.new_for_path (Environment.get_user_data_dir () + '/' + name);
-
-            try {
-                this.file.create (GLib.FileCreateFlags.REPLACE_DESTINATION);
-            } catch (Error err) {
-                    warning ("Couldn't create file: %s", err.message);
-            }
 
-        } else {
-            this.file = file;
-
-            try {
-                this.file_name = file.get_basename ();
-                var distream = new DataInputStream (file.read (null));
-                var contents = distream.read_upto ("", -1, null);
-                buf.set_text (contents);
-            } catch (Error err) {
-                warning ("Couldn't open file: %s", err.message);
-            }
+    /* ---------------- FILE OPERATIONS ---------------- */
+    public void open_file (File file = this.file) {
+        this.file = file;
+        debug ("Attempting to open file %s", file.get_basename ());
+        try {
+            this.file_name = file.get_basename ();
+            var distream = new DataInputStream (file.read (null));
+            var contents = distream.read_upto ("", -1, null);
+            buf.set_text (contents);
+        } catch (Error err) {
+            warning ("Couldn't open file: %s", err.message);
         }
     }
 
     public void save_file (File file = this.file) {
-
-        // We have to always check if nothing happened to datadir
-        // This way if the user deleted in the meantime everything, we still can save unsaved docs
-        if (is_new) {
-            Slate.Utils.check_if_datadir ();
-        }
-
         try {
             debug ("Attempting to save the buffer to disk..");
             DataOutputStream dostream;
@@ -149,22 +128,36 @@ public class AppWindow : Gtk.Window {
         }
     }
 
+
     /* ---------------- HANDLERS ---------------- */
     public void on_save_as () {
         debug ("Save event!");
         var save_dialog = new Gtk.FileDialog () { initial_name = file_name };
+        File oldfile = this.file;
+        bool delete_after = false;
+
+        if (Environment.get_user_data_dir () in this.file.get_path ()) {
+            delete_after = true;
+        }
 
         save_dialog.save.begin (this, null, (obj, res) => {
             try {
+
+
                 file = save_dialog.save.end (res);
                 file_name = file.get_basename ();
-                if (is_new) { is_new = false; }
                 save_file (file);
 
+                if ((delete_after) && (oldfile != file)) {
+                    oldfile.delete ();
+                }
+ 
             } catch (Error err) {
                     warning ("Failed to save file: %s", err.message);
             }
         });
+
+
     }
 
     public void on_buffer_changed () {
@@ -184,20 +177,24 @@ public class AppWindow : Gtk.Window {
 
     }
 
-    public void on_close () {
+    public bool on_close () {
         debug ("Close event!");
-        save_file ();
 
-        if (is_new) {
+        bool is_unsaved_doc = (Environment.get_user_data_dir () in this.file.get_path ());
+
+        // We want to delete empty unsaved documents
+        if ((is_unsaved_doc) && (buf.text == "")) {
+
             try {
                 this.file.delete ();
             } catch (Error err) {
-                warning (
-                    "The persistent file couldn't be deleted: %s",
-                    err.message
-                        );
+                    warning ("Failed to delete empty temp file: %s", err.message);
             }
+
+        } else {
+            save_file ();
         }
+
         return false;
     }
 }

src/Window.vala

@@ -1,5 +1,4 @@
 sources += files(
     'Window.vala',
     'Application.vala',
-    'Utils.vala',
 )