Fixing the Editor & File Management Bugs

Author: AkshajSinghal

atoffice_shell/project.py

@@ -54,18 +54,16 @@ class AtonEditor(App):
         ("ctrl+shift+q", "quit_app", "Ctrl+Shift+Q Quit"),
     ]
 
-    def __init__(self, file_path: str, **kwargs) -> None:
+    def __init__(self, file_path: str, initial_text: str | None = None, **kwargs) -> None:
         super().__init__(**kwargs)
         self.file_path = file_path
-        self.file_content = ""
+        self.file_content = initial_text if initial_text is not None else ""
 
-        import os
-
-        if os.path.exists(file_path):
+        if initial_text is None and os.path.exists(file_path):
             try:
                 with open(file_path, "r", encoding="utf-8") as handle:
                     self.file_content = handle.read()
-            except Exception as error:
+            except OSError as error:
                 self.file_content = f"Error reading file: {error}"
 
     def compose(self) -> ComposeResult:
@@ -81,8 +79,8 @@ def action_save_file(self) -> None:
         try:
             with open(self.file_path, "w", encoding="utf-8") as handle:
                 handle.write(text_area.text)
-        except Exception:
-            pass
+        except (PermissionError, OSError) as error:
+            self.notify(f"Failed to save file: {error}", severity="error")
 
     def action_quit_app(self) -> None:
         self.exit()
@@ -139,7 +137,7 @@ def _handle_edit_command(raw_command: str) -> bool:
     initial_text = file_path.read_text(encoding="utf-8") if file_path.exists() else ""
 
     try:
-        AtonEditor(str(file_path), initial_text).run()
+        AtonEditor(str(file_path), initial_text=initial_text).run()
     except Exception as error:
         typer.secho(f"Editor error: {error}", fg=typer.colors.RED)
 

tests/test_cli.py

@@ -4,7 +4,7 @@
 from typer.testing import CliRunner
 
 from atoffice_shell.cli import app
-from atoffice_shell.project import _handle_cd_command, _handle_edit_command, _handle_local_command, _handle_os_fallback
+from atoffice_shell.project import AtonEditor, _handle_cd_command, _handle_edit_command, _handle_local_command, _handle_os_fallback
 
 
 runner = CliRunner()
@@ -118,3 +118,34 @@ def run(self) -> None:
 
     assert _handle_edit_command(f"edit {file_path}") is True
     assert calls == {"filename": str(file_path), "initial_text": "hello", "ran": True}
+
+
+def test_aton_editor_uses_initial_text_without_re_reading_file(tmp_path) -> None:
+    file_path = tmp_path / "note.txt"
+    file_path.write_text("from-disk", encoding="utf-8")
+
+    editor = AtonEditor(str(file_path), initial_text="from-arg")
+
+    assert editor.file_content == "from-arg"
+
+
+def test_action_save_file_notifies_on_permission_error(monkeypatch, tmp_path) -> None:
+    file_path = tmp_path / "readonly.txt"
+    editor = AtonEditor(str(file_path), initial_text="draft")
+
+    notifications = []
+
+    class FakeTextArea:
+        text = "draft"
+
+    monkeypatch.setattr(editor, "query_one", lambda *_args, **_kwargs: FakeTextArea())
+    monkeypatch.setattr(editor, "notify", lambda message, severity=None: notifications.append((message, severity)))
+
+    def fail_open(*_args, **_kwargs):
+        raise PermissionError("read-only")
+
+    monkeypatch.setattr("builtins.open", fail_open)
+
+    editor.action_save_file()
+
+    assert notifications and "Failed to save file" in notifications[0][0]