Merge branch 'staging' into development

Merged Staging to the Development Branch

README.md

@@ -25,7 +25,7 @@ structured and accessible format.
 To install the application you must issue the command:
 
 ```bash
- pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple Pilgrim
+pip install pilgrim
 ```
 
 ## Usage

requirements.txt

@@ -3,4 +3,4 @@ SQLAlchemy==2.0.41
 typing_extensions==4.14.1
 
 
-textual~=4.0.0
+textual~=3.6.0

src/pilgrim/ui/screens/diary_list_screen.py

@@ -203,36 +203,35 @@ class DiaryListScreen(Screen):
             self.action_open_diary()
 
     def action_new_diary(self):
-        """
+        """Action to create new diary"""
-        Opens the modal dialog to create a new diary and registers a callback for submission.
-        """
         self.app.push_screen(NewDiaryModal(),self._on_new_diary_submitted)
 
-    def _on_new_diary_submitted(self, result):
+    def _on_new_diary_submitted(self,result):
-        """
+        self.notify(str(result))
-        Handles the callback after a new diary is submitted.
+        if result:
-        
+            self.notify(f"Creating Diary:{result}'...")
-        If a diary was created (non-empty result), notifies the user and refreshes the diary list; otherwise, notifies that creation was canceled.
+            self.call_later(self._async_create_diary,result)
-        """
-        if result:  # Se result não é string vazia, o diário foi criado
-            self.notify(f"Returning to diary list...")
-            # Atualiza a lista de diários
-            self.refresh_diaries()
         else:
-            self.notify(f"Creation canceled...")
+            self.notify(f"Canceled...")
+
+    async def _async_create_diary(self,name: str):
+
+        try:
+            service = self.app.service_manager.get_travel_diary_service()
+            created_diary = await service.async_create(name)
+            if created_diary:
+                self.diary_id_map[created_diary.id] = created_diary.id
+                await self.async_refresh_diaries()
+                self.notify(f"Diary: '{name}' created!")
+            else:
+                self.notify("Error Creating the diary")
+        except Exception as e:
+            self.notify(f"Exception on creating the diary: {str(e)}")
+
 
-    def _on_screen_resume(self) -> None:
-        """
-        Refreshes the diary list when the screen resumes.
-        """
-        self.refresh_diaries()
 
     def action_edit_selected_diary(self):
-        """
+        """Action to edit selected diary"""
-        Opens the edit dialog for the currently selected diary.
-        
-        If a diary is selected, displays the edit modal and registers a callback for when the edit is submitted. Notifies the user if no diary is selected.
-        """
         if self.selected_diary_index is not None:
             diary_id = self.diary_id_map.get(self.selected_diary_index)
             if diary_id:

src/pilgrim/ui/screens/edit_diary_modal.py

@@ -8,13 +8,9 @@ from textual.widgets import Label, Input, Button
 class EditDiaryModal(ModalScreen[tuple[int,str]]):
     BINDINGS = [
         Binding("escape", "cancel", "Cancel"),
-        Binding("enter", "edit_diary", "Save",priority=True),
     ]
 
     def __init__(self, diary_id: int):
-        """
-        Initialize the EditDiaryModal with the specified diary ID, pre-filling the input field with the current diary name.
-        """
         super().__init__()
         self.diary_id = diary_id
         self.current_diary_name = self.app.service_manager.get_travel_diary_service().read_by_id(self.diary_id).name
@@ -35,29 +31,7 @@ class EditDiaryModal(ModalScreen[tuple[int,str]]):
         self.name_input.cursor_position = len(self.name_input.value)
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
-        """
-        Handle button press events in the modal.
-        
-        Triggers the save action if the "Save" button is pressed, or cancels and dismisses the modal if the "Cancel" button is pressed.
-        """
         if event.button.id == "save_diary_button":
-            self.action_edit_diary()
-        elif event.button.id == "cancel_button":
-            self.dismiss(None)
-    def on_key(self, event):
-        """
-        Handles the Enter key press event by triggering the diary save action and preventing the default behavior.
-        """
-        if event.key == "enter":
-            self.action_edit_diary()
-            event.prevent_default()
-
-    def action_edit_diary(self) -> None:
-        """
-        Attempts to save the edited diary name, validating input and providing user feedback.
-        
-        If the new name is non-empty and different from the current name, dismisses the modal and returns the diary ID and new name. If the name is unchanged, notifies the user and dismisses without changes. If the input is empty, notifies the user and refocuses the input field.
-        """
             new_diary_name = self.name_input.value.strip()
             if new_diary_name and new_diary_name != self.current_diary_name:
                 self.dismiss((self.diary_id, new_diary_name))
@@ -67,16 +41,8 @@ class EditDiaryModal(ModalScreen[tuple[int,str]]):
             else:
                 self.notify("Diary name cannot be empty.", severity="warning")
                 self.name_input.focus()
-
+        elif event.button.id == "cancel_button":
-    def on_input_submitted(self, event: Input.Submitted) -> None:
+            self.dismiss(None)
-        """
-        Handles submission of the diary name input field by triggering the save action if the relevant input is submitted.
-        """
-        if event.input.id == "edit_diary_name_input":
-            self.action_edit_diary()
 
     def action_cancel(self) -> None:
-        """
-        Dismisses the modal without saving changes or returning any data.
-        """
         self.dismiss(None)

src/pilgrim/ui/screens/edit_entry_screen.py

@@ -24,33 +24,26 @@ class EditEntryScreen(Screen):
     BINDINGS = [
         Binding("ctrl+q", "quit", "Quit"),
         Binding("ctrl+s", "save", "Save"),
-        Binding("shift+f5", "new_entry", "New Entry"),
+        Binding("ctrl+n", "new_entry", "New Entry"),
-        Binding("f5", "next_entry", "Next Entry"),
+        Binding("ctrl+shift+n", "next_entry", "Next Entry"),
-        Binding("f4", "prev_entry", "Previous Entry"),
+        Binding("ctrl+shift+p", "prev_entry", "Previous Entry"),
         Binding("ctrl+r", "rename_entry", "Rename Entry"),
         Binding("f8", "toggle_sidebar", "Toggle Photos"),
         Binding("f9", "toggle_focus", "Toggle Focus"),
         Binding("escape", "back_to_list", "Back to List"),
     ]
 
-    def __init__(self, diary_id: int = 1,create_new: bool = True):
+    def __init__(self, diary_id: int = 1):
         super().__init__()
-
-        if create_new:
-            self.current_entry_index = -1
-            self.is_new_entry = True
-            self.next_entry_id = None
-
-        else:
-            self.is_new_entry = False
-            self.current_entry_index = 0
-            self.next_entry_id = 1
-        self.new_entry_title = ""
-        self.new_entry_content = ""
         self.diary_id = diary_id
         self.diary_name = f"Diary {diary_id}"
+        self.current_entry_index = 0
         self.entries: List[Entry] = []
+        self.is_new_entry = False
         self.has_unsaved_changes = False
+        self.new_entry_content = ""
+        self.new_entry_title = "New Entry"
+        self.next_entry_id = 1
         self._updating_display = False
         self._original_content = ""
         self.is_refreshing = False
@@ -913,22 +906,11 @@ class EditEntryScreen(Screen):
                 self.notify("Empty entry cannot be saved")
                 return
             # Passe a lista de fotos para o método de criação
-            if self.new_entry_title == "":
-               self.app.push_screen(RenameEntryModal(current_name=""), lambda result: self._handle_save_after_rename(result,content,
-                                                                                               photos_to_link))
-            else:
             self.call_later(self._async_create_entry, content, photos_to_link)
         else:
             # Passe a lista de fotos para o método de atualização
             self.call_later(self._async_update_entry, content, photos_to_link)
 
-    def _handle_save_after_rename(self, result: str | None, content: str, photos_to_link: List[Photo]) -> None:
-        if result is None:
-            self.notify("Save cancelled")
-            return
-        self.new_entry_title = result
-        self.call_later(self._async_create_entry, content, photos_to_link)
-
     async def _async_create_entry(self, content: str, photos_to_link: List[Photo]):
         """Creates a new entry and links the referenced photos."""
         try:
@@ -955,7 +937,7 @@ class EditEntryScreen(Screen):
                 self.is_new_entry = False
                 self.has_unsaved_changes = False
                 self._original_content = new_entry.text
-                self.new_entry_title = ""
+                self.new_entry_title = "New Entry"
                 self.next_entry_id = max(entry.id for entry in self.entries) + 1
 
                 self._update_entry_display()
@@ -1000,36 +982,28 @@ class EditEntryScreen(Screen):
         except Exception as e:
             self.notify(f"Error updating entry: {str(e)}")
 
-    def check_key(self, event):
+    def on_key(self, event):
-        """Check for custom key handling before bindings are processed"""
+        # Sidebar contextual shortcuts
-
-        # Sidebar shortcuts
         if self.sidebar_focused and self.sidebar_visible:
-            sidebar_keys = ["i", "n", "d", "e"]
+
-            if event.key in sidebar_keys:
             if event.key == "i":
+
                 self.action_insert_photo()
+                event.stop()
             elif event.key == "n":
+
                 self.action_ingest_new_photo()
+                event.stop()
             elif event.key == "d":
+
                 self.action_delete_photo()
+                event.stop()
             elif event.key == "e":
+
                 self.action_edit_photo()
-                return True  # Indica que o evento foi processado
+                event.stop()
-
+        # Shift+Tab: remove indent
-        # Text area shortcuts
+        elif self.focused is self.text_entry and event.key == "shift+tab":
-        elif self.focused is self.text_entry:
-            if event.key in ["tab", "shift+tab"]:
-                if event.key == "shift+tab":
-                    self._handle_shift_tab()
-                elif event.key == "tab":
-                    self.text_entry.insert('\t')
-                return True  # Indica que o evento foi processado
-
-        return False  # Não foi processado, continuar com bindings
-
-    def _handle_shift_tab(self):
-        """Handle shift+tab for removing indentation"""
             textarea = self.text_entry
             row, col = textarea.cursor_location
             lines = textarea.text.splitlines()
@@ -1049,11 +1023,11 @@ class EditEntryScreen(Screen):
                     lines[row] = line[to_remove:]
                     textarea.text = '\n'.join(lines)
                     textarea.cursor_location = (row, max(col - to_remove, 0))
-
-    def on_key(self, event):
-        if self.check_key(event):
             event.stop()
-            return
+        # Tab: insert tab
+        elif self.focused is self.text_entry and event.key == "tab":
+            self.text_entry.insert('\t')
+            event.stop()
 
     def on_footer_action(self, event) -> None:
         """Handle clicks on footer actions (Textual 3.x)."""

src/pilgrim/ui/screens/new_diary_modal.py

@@ -4,33 +4,17 @@ from textual.containers import Vertical, Horizontal
 from textual.screen import ModalScreen
 from textual.widgets import Label, Input, Button
 
-from pilgrim.ui.screens.edit_entry_screen import EditEntryScreen
-
 
 class NewDiaryModal(ModalScreen[str]):
     BINDINGS = [
         Binding("escape", "cancel", "Cancel"),
-        Binding("enter", "create_diary", "Create",priority=True),
     ]
-    def __init__(self,autoopen=True):
+    def __init__(self):
-        """
-        Initialize the NewDiaryModal with optional automatic opening of the created diary.
-        
-        Parameters:
-            autoopen (bool): If True, the newly created diary will open automatically after creation. Defaults to True.
-        """
         super().__init__()
-        self.auto_open = autoopen
         self.name_input = Input(id="NewDiaryModal-NameInput",classes="NewDiaryModal-NameInput") # This ID is fine, it's specific to the input
 
     def compose(self) -> ComposeResult:
 
-        """
-        Constructs and yields the UI layout for the new diary modal dialog.
-        
-        Returns:
-            ComposeResult: An iterable of widgets forming the modal, including title, input field, and action buttons.
-        """
         with Vertical(id="new_diary_dialog",classes="NewDiaryModal-Dialog"):
             yield Label("Create a new diary", classes="NewDiaryModal-Title")
             yield Label("Diary Name:")
@@ -45,67 +29,17 @@ class NewDiaryModal(ModalScreen[str]):
           self.name_input.focus()
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
-        """
+        """Handles button clicks."""
-        Handle button press events for the modal.
-        
-        Triggers diary creation when the "Create" button is pressed, or dismisses the modal when the "Cancel" button is pressed.
-        """
         if event.button.id == "create_diary_button":
-            self.action_create_diary()
-        elif event.button.id == "cancel_button":
-            self.dismiss()
-
-    def action_cancel(self) -> None:
-        """
-        Cancels the modal dialog and dismisses it without returning a diary name.
-        """
-        self.dismiss("")
-
-    def action_create_diary(self) -> None:
-        """
-        Validates the diary name input and initiates asynchronous diary creation if valid.
-        
-        If the input is empty, displays a warning notification and refocuses the input field.
-        """
             diary_name = self.name_input.value.strip()
             if diary_name:
-
+                self.dismiss(diary_name)
-            self.call_later(self._async_create_diary, diary_name)
-
             else:
                 self.notify("Diary name cannot be empty.", severity="warning")
                 self.name_input.focus()
+        elif event.button.id == "cancel_button":
+            self.dismiss("")
 
-    def on_input_submitted(self, event: Input.Submitted) -> None:
+    def action_cancel(self) -> None:
-        """
+        """Action to cancel the modal."""
-        Handles submission of the diary name input field and initiates diary creation if triggered from the correct input.
+        self.dismiss("")
-        """
-        if event.input.id == "NewDiaryModal-NameInput":
-            self.action_create_diary()
-
-    async def _async_create_diary(self, name: str):
-
-        """
-        Asynchronously creates a new diary entry with the given name and handles post-creation actions.
-        
-        If creation succeeds, dismisses the modal with the diary name, optionally opens the diary for editing, and shows a success notification. If creation fails or an exception occurs, displays an error notification.
-        """
-        try:
-            service = self.app.service_manager.get_travel_diary_service()
-            created_diary = await service.async_create(name)
-            if created_diary:
-                self.dismiss(name)
-
-                if self.auto_open:
-                    self.app.push_screen(EditEntryScreen(diary_id=created_diary.id))
-
-                self.notify(f"Diary: '{name}' created!")
-            else:
-                self.notify("Error Creating the diary")
-        except Exception as e:
-            self.notify(f"Exception on creating the diary: {str(e)}")
-
-
-
-
-