fix for file location persistence not saving correctly

package/ui/controllers/file_dialog.py

@@ -47,29 +47,28 @@ def set_filename(self, value):
             raise FileNotFoundError(f'File {value} does not exist')
         self.filename = os.path.abspath(value)
         self.view.filename.set(os.path.basename(value))
-        self.persistence.set_location(value)
+        if self.persistence:
+            self.persistence.set_location(value)
 
     def open_selection_dialog(self):
         """
         Open a file dialog to select an existing file
         @In, None
         @Out, None
         """
-        initial_dir = self.persistence.get_location() if self.persistence else None
+        initial_dir = self.persistence.get_location() if self.persistence else os.getcwd()
         filetypes = [(self.file_type.upper(), f'*.{self.file_type.strip().lower()}') if self.file_type else ('All Files', '*.*')]
         filename = filedialog.askopenfilename(initialdir=initial_dir, filetypes=filetypes)
         if filename:
-            self.filename = filename
-            self.view.filename.set(os.path.basename(filename))
+            self.set_filename(filename)
 
     def open_save_dialog(self):
         """
         Open a file dialog to save a new file
         @In, None
         @Out, None
         """
-        initial_dir = self.persistence.get_location() if self.persistence else None
+        initial_dir = self.persistence.get_location() if self.persistence else os.getcwd()
         filename = filedialog.asksaveasfilename(initialdir=initial_dir, defaultextension=f'.{self.file_type}')
         if filename:
-            self.filename = filename
-            self.view.filename.set(os.path.basename(filename))
+            self.set_filename(filename)

package/ui/controllers/file_location_persistence.py

@@ -14,9 +14,9 @@ def __init__(self, path: str):
         if os.path.exists(self.path):
             self.read()
 
-    def __exit__(self):
+    def close(self):
         """
-        Destructor
+        Save and close the dotfile
         @In, None
         @Out, None
         """
@@ -62,4 +62,12 @@ def set_location(self, value):
         @In, value, str, the last file location (file path or directory)
         @Out, None
         """
-        self.rcfile['DEFAULT_DIR'] = os.path.dirname(value)
+        self.rcfile['DEFAULT_DIR'] = os.path.abspath(os.path.dirname(value))
+
+    def close(self):
+        """
+        Closes the file location persistence
+        @In, None
+        @Out, None
+        """
+        self.rcfile.close()

package/ui/controllers/file_selection.py

@@ -109,6 +109,14 @@ def get_sys_args_from_file_selection(self):
         args.extend(self.unknown_args)
         return args
 
+    def close_persistence(self):
+        """
+        Closes the file location persistence
+        @In, None
+        @Out, None
+        """
+        self.persistence.close()
+
     def _parse_cli_args(self):
         """
         Parse arguments provided from the command line

package/ui/controllers/main.py

@@ -16,7 +16,7 @@ def __init__(self, model, view):
         # Bind the run button to the model
         self.view.frames["run_abort"].run_button.config(command=self.run_model)
         # Bind the abort button to closing the window
-        self.view.frames["run_abort"].abort_button.config(command=self.view.quit)
+        self.view.frames["run_abort"].abort_button.config(command=self.quit)
 
     def run_model(self):
         # Construct sys.argv from the file selectors
@@ -26,3 +26,12 @@ def run_model(self):
 
     def start(self):
         self.view.mainloop()
+
+    def quit(self, showdialog: bool = True):
+        """
+        Quit the application
+        @In, showdialog, bool, optional, whether to show a dialog before quitting, default is True
+        @Out, None
+        """
+        self.file_selection_controller.close_persistence()
+        self.view.quit(showdialog)

package/ui/main.py

@@ -19,3 +19,5 @@ def run_from_gui(func: Callable, **kwargs):
     view = View()
     controller = Controller(model, view)
     controller.start()
+    # Let the controller know to clean up when the view is closed
+    controller.quit(showdialog=False)

package/ui/views/main.py

@@ -48,13 +48,12 @@ def mainloop(self):
         """
         self.root.mainloop()
 
-    def quit(self):
+    def quit(self, showdialog: bool = True):
         """
         Quit the application
-        @In, None
+        @In, showdialog, bool, optional, whether to show a dialog before quitting, default is True
         @Out, None
         """
-        response = askokcancel('Abort run', 'Are you sure you want to abort? '
-                               'This will close the window and any text output will be lost.')
-        if response:
+        if not showdialog or askokcancel('Abort run', 'Are you sure you want to abort? '
+                                         'This will close the window and any text output will be lost.'):
             self.root.quit()