Merge 1beeb39b95 into 8f36e5a770

Bump typing-extensions from 4.14.0 to 4.14.1

.github/workflows/pylint.yml

@@ -0,0 +1,24 @@
+name: Pylint
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10"]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        pip install pylint
+    - name: Analysing the code with pylint
+      run: |
+        pylint --disable=C0114,C0115,C0116 --exit-zero $(git ls-files '*.py')

.github/workflows/pylint_sonarqube.yml

@@ -1,63 +0,0 @@
-name: Pylint and SonarCloud
-on: 
-  push:
-    branches: [ main, master, staging ]
-  pull_request:
-    branches: [ main, master, staging ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.10"]
-    
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # Necessário para SonarCloud
-    
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-    
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        pip install pylint ruff coverage pytest
-    
-    - name: Analysing the code with pylint (console output)
-      run: |
-        pylint --disable=C0114,C0115,C0116 --exit-zero $(git ls-files '*.py') || true
-    
-    - name: Generate Pylint report for SonarCloud
-      run: |
-        pylint --disable=C0114,C0115,C0116 --output-format=json --exit-zero $(git ls-files '*.py') > pylint-report.json || true
-    
-    - name: Run Ruff
-      run: |
-        ruff check --output-format=json . > ruff-report.json || true
-    
-    - name: Run tests with coverage (if you have tests)
-      run: |
-        if [ -d "tests" ] || [ -f "test_*.py" ] || [ -f "*_test.py" ]; then
-          coverage run -m pytest || true
-          coverage xml || true
-        else
-          echo "No tests found, skipping coverage"
-        fi
-    
-    - name: SonarCloud Scan
-      uses: SonarSource/sonarqube-scan-action@v5.0.0
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      with:
-        args: >
-          -Dsonar.projectKey=gmbrax_Pilgrim
-          -Dsonar.organization=gmbrax
-          -Dsonar.python.pylint.reportPaths=pylint-report.json
-          -Dsonar.python.ruff.reportPaths=ruff-report.json
-          -Dsonar.python.coverage.reportPaths=coverage.xml

CHANGELOG.md

@@ -1,68 +1,51 @@
 # Changelog
 
 All notable changes to this project will be documented in this file.
-The format is based on Keep a Changelog, and this project adheres to Semantic Versioning.
 
-## Unreleased
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Planned
+## [Unreleased]
-* Installation Method 1 (repository compilation)
-* Organization of trips by date, location, or theme
-* Enhanced photo management features
-* Search functionality
-* Export features
-* Testing implementation
 
-## [0.0.4] - 2025-07-19
+### Planned
 
-### Added
+- Installation Method 1 (repository compilation)
-* Support for creating new diaries asynchronously, with an option to automatically open the newly created diary
+- Organization of trips by date, location, or theme
-* Unified "Enter" key support for saving or creating diaries across relevant modals
+- Enhanced photo management features
-* Automatic diary list refresh when returning to the diary screen
+- Search functionality
-* Application configuration management with a new centralized config system
+- Export features
-* Database location and initialization now configurable via the new config manager
+- Testing implementation
-* Automatic migration of database file to the configuration directory
-* Display of database URL on application startup for transparency
-* Duplicate photo detection before photo creation to prevent redundant entries
-* Photo hash indexing to improve photo lookup performance
-
-### Changed
-* Enhanced feedback and validation when editing or creating diary names
-* Streamlined and unified save logic for diary modals, reducing duplicated behavior
-* About screen now displays the actual installed application version dynamically
-* Sidebar and photo-related UI text updated to remove emoji icons for a cleaner appearance
-* Sidebar layout and scrolling behavior improved for better usability
-* Photo hash generation now relies on existing service-provided hashes instead of local computation
-
-### Improved
-* Enhanced feedback and validation when editing or creating diary names
-* Streamlined and unified save logic for diary modals, reducing duplicated behavior
-* Sidebar layout and scrolling behavior for better usability
 
 ## [0.0.3] - 2025-07-07
 
 ### Changed
-* Removed the dependency on textual-dev from pyproject.toml
+- Removed the dependency on textual-dev from pyproject.toml
 
 ## [0.0.2] - 2025-07-07
 
 ### Changed
-* Changed the license in pyproject.toml to BSD
+- Changed the license in pyproject.toml to BSD
 
 ## [0.0.1] - 2025-07-06
 
 ### Added
-* Initial alpha release of Pilgrim travel diary application
+
-* Create and edit travel diaries
+- Initial alpha release of Pilgrim travel diary application
-* Create and edit diary entries
+- Create and edit travel diaries
-* Photo ingestion system
+- Create and edit diary entries
-* Photo addition and reference via sidebar
+- Photo ingestion system
-* Text User Interface (TUI) built with Textual framework
+- Photo addition and reference via sidebar
-* Pre-compiled binary installation method (Method 2)
+- Text User Interface (TUI) built with Textual framework
-* Support for Linux operating systems
+- Pre-compiled binary installation method (Method 2)
-* Basic project documentation (README)
+- Support for Linux operating systems
+- Basic project documentation (README)
 
 ### Known Issues
-* Installation Method 1 not yet implemented
+
-* No testing suite implemented yet
+- Installation Method 1 not yet implemented
-* Some features may be unstable in an alpha version
+- No testing suite implemented yet
+- Some features may be unstable in an alpha version
+
+[Unreleased]: https://github.com/username/pilgrim/compare/v0.0.1...HEAD
+
+[0.0.1]: https://github.com/username/pilgrim/releases/tag/v0.0.1

pyproject.toml

@@ -1,32 +1,33 @@
-[build-system]
+    [build-system]
-requires = ["hatchling"]
+    requires = ["hatchling"]
-build-backend = "hatchling.build"
+    build-backend = "hatchling.build"
 
-[project]
-name = "pilgrim"
-version = "0.0.4"
-authors = [
-  { name="Gustavo Henrique Santos Souza de Miranda", email="gustavohssmiranda@gmail.com" }
-]
-description = "Pilgrim's Travel Log"
-readme = "README.md"
-requires-python = ">=3.10"
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: BSD License",
-    "Operating System :: OS Independent",
-]
-dependencies = [
-    "sqlalchemy",
-    "textual",
-    "tomli",
-    "tomli_w",
-    "unidecode"
-]
 
-[project.urls]
+    [project]
-Homepage = "https://github.com/gmbrax/Pilgrim/"
+    name = "Pilgrim"
-Issues = "https://github.com/gmbrax/Pilgrim/issues"
+    version = "0.0.3"
+    authors = [
+      { name="Gustavo Henrique Santos Souza de Miranda", email="gustavohssmiranda@gmail.com" }
+    ]
+    description = "Pilgrim's Travel Log"
+    readme = "README.md"
+    requires-python = ">=3.10"
+    classifiers = [
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: BSD License",
+        "Operating System :: OS Independent",
+    ]
+    dependencies = [
+      "sqlalchemy",
+        "textual",
 
-[project.scripts]
+    ]
-pilgrim = "pilgrim.command:main"
+    [template.plugins.default]
+    src-layout = true
+    [project.urls]
+    Homepage = "https://github.com/gmbrax/Pilgrim/"
+    Issues = "https://github.com/gmbrax/Pilgrim/issues"
+    [tool.hatch.build.targets.wheel]
+    packages = ["src/pilgrim"]
+    [project.scripts]
+    pilgrim = "pilgrim:main"

src/pilgrim/application.py

@@ -1,21 +1,19 @@
 from pilgrim.database import Database
 from pilgrim.service.servicemanager import ServiceManager
 from pilgrim.ui.ui import UIApp
-from pilgrim.utils import ConfigManager
+from pilgrim.utils import DirectoryManager
 
 
 class Application:
     def __init__(self):
-        self.config_manager = ConfigManager()
+        self.config_dir = DirectoryManager.get_config_directory()
-        self.config_manager.read_config()  # Chamar antes de criar o Database
+        self.database = Database()
-        self.database = Database(self.config_manager)
         session = self.database.session()
         session_manager = ServiceManager()
         session_manager.set_session(session)
-        self.ui = UIApp(session_manager, self.config_manager)
+        self.ui = UIApp(session_manager)
 
     def run(self):
-        print(f"URL do banco: {self.config_manager.database_url}")
         self.database.create()
         self.ui.run()
 

src/pilgrim/database.py

@@ -1,28 +1,42 @@
 from sqlalchemy import create_engine
-from sqlalchemy.orm import declarative_base
+from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 from pathlib import Path
 import os
 import shutil
 
-from pilgrim.utils import ConfigManager
-
 Base = declarative_base()
 
+def get_database_path() -> Path:
+    """
+    Get the database file path following XDG Base Directory specification.
+    Creates the directory if it doesn't exist.
+    """
+    # Get home directory
+    home = Path.home()
     
+    # Create .pilgrim directory if it doesn't exist
+    pilgrim_dir = home / ".pilgrim"
+    pilgrim_dir.mkdir(exist_ok=True)
+    
+    # Database file path
+    db_path = pilgrim_dir / "database.db"
+    
+    # If database doesn't exist in new location but exists in current directory,
+    # migrate it
+    if not db_path.exists():
+        current_db = Path("database.db")
+        if current_db.exists():
+            shutil.copy2(current_db, db_path)
+            print(f"Database migrated from {current_db} to {db_path}")
+    
+    return db_path
 
 class Database:
-
+    def __init__(self):
-    def __init__(self, config_manager: ConfigManager):
+        db_path = get_database_path()
-        self.db_path = config_manager.database_url
-
-        # Garantir que o diretório existe
-        db_dir = os.path.dirname(self.db_path)
-        if not os.path.exists(db_dir):
-            os.makedirs(db_dir, exist_ok=True)
-
         self.engine = create_engine(
-            f"sqlite:///{self.db_path}",
+            f"sqlite:///{db_path}",
             echo=False,
             connect_args={"check_same_thread": False},
         )

src/pilgrim/models/entry.py

@@ -4,16 +4,15 @@ from pilgrim.models.photo_in_entry import photo_entry_association
 from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
 from sqlalchemy.orm import relationship
 
-from pilgrim.database import Base
+from ..database import Base
-
 
 
 class Entry(Base):
     __tablename__ = "entries"
     id = Column(Integer, primary_key=True)
-    title = Column(String,nullable=False)
+    title = Column(String)
     text = Column(String)
-    date = Column(DateTime,nullable=False)
+    date = Column(DateTime)
     photos = relationship(
         "Photo",
         secondary=photo_entry_association,

src/pilgrim/models/photo.py

@@ -4,11 +4,9 @@ from pathlib import Path
 
 from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
 from sqlalchemy.orm import relationship
-from sqlalchemy.sql.schema import Index
 
 from pilgrim.models.photo_in_entry import photo_entry_association
-from pilgrim.database import Base
+from ..database import Base
-
 
 
 class Photo(Base):
@@ -25,11 +23,7 @@ class Photo(Base):
         back_populates="photos"
     )
 
-    fk_travel_diary_id = Column(Integer, ForeignKey("travel_diaries.id"), nullable=False)
+    fk_travel_diary_id = Column(Integer, ForeignKey("travel_diaries.id"),nullable=False)
-    travel_diary = relationship("TravelDiary", back_populates="photos")
-    __table_args__ = (
-        Index('idx_photo_hash_diary', 'hash', 'fk_travel_diary_id'),
-    )
 
     def __init__(self, filepath, name, photo_hash, addition_date=None, caption=None, entries=None, fk_travel_diary_id=None, **kw: Any):
         super().__init__(**kw)

src/pilgrim/models/photo_in_entry.py

@@ -1,6 +1,6 @@
 from sqlalchemy import Table, Column, Integer, ForeignKey
 
-from pilgrim.database import Base
+from ..database import Base
 
 photo_entry_association = Table('photo_entry_association', Base.metadata,
 Column('id', Integer, primary_key=True, autoincrement=True),

src/pilgrim/models/travel_diary.py

@@ -3,17 +3,15 @@ from typing import Any
 from sqlalchemy import Column, Integer, String, UniqueConstraint
 from sqlalchemy.orm import relationship
 
-from pilgrim.database import Base
+from .. import database
 
 
-
+class TravelDiary(database.Base):
-class TravelDiary(Base):
     __tablename__ = "travel_diaries"
     id = Column(Integer, primary_key=True)
     name = Column(String, nullable=False)
     directory_name = Column(String, nullable=False, unique=True)
     entries = relationship("Entry", back_populates="travel_diary", cascade="all, delete-orphan")
-    photos = relationship("Photo", back_populates="travel_diary", cascade="all, delete-orphan")
 
     __table_args__ = (
         UniqueConstraint('directory_name', name='uq_travel_diary_directory_name'),

src/pilgrim/service/entry_service.py

@@ -1,10 +1,9 @@
-import re
 from datetime import datetime
 from typing import List
 
-from pilgrim.models.entry import Entry
+from ..models.entry import Entry
-from pilgrim.models.travel_diary import TravelDiary
+from ..models.travel_diary import TravelDiary
-from pilgrim.models.photo import Photo  # ✨ Importe o modelo Photo
+from ..models.photo import Photo  # ✨ Importe o modelo Photo
 
 
 class EntryService:
@@ -55,24 +54,3 @@ class EntryService:
             self.session.commit()
             return excluded
         return None
-
-
-    def delete_references_for_specific_photo(self, entry: Entry, photo_hash: str) -> Entry:
-        regex = r"\[\[photo::" + re.escape(photo_hash) + r"\]\]"
-        entry.text = re.sub(regex, lambda match: ' ' * len(match.group(0)), entry.text)
-
-        self.session.commit()
-        self.session.refresh(entry)
-
-        return entry
-
-    def delete_all_photo_references(self, entry: Entry, commit=True) -> Entry:
-        if not entry.photos:
-            return entry
-        photo_hashes = {photo.photo_hash[:8] for photo in entry.photos}
-        regex = r"\[\[photo::(" + "|".join(re.escape(h) for h in photo_hashes) + r")\]\]"
-        entry.text = re.sub(regex, lambda match: ' ' * len(match.group(0)), entry.text)
-        if commit:
-            self.session.commit()
-            self.session.refresh(entry)
-        return entry

src/pilgrim/service/photo_service.py

@@ -14,9 +14,8 @@ class PhotoService:
     def __init__(self, session):
         self.session = session
 
-    @staticmethod
+    def _hash_file(self, filepath: Path) -> str:
-    def hash_file(filepath: Path) -> str:
+        """Calculate hash of a file using SHA3-384."""
-        """Calculate the hash of a file using SHA3-384."""
         hash_func = hashlib.new('sha3_384')
         with open(filepath, 'rb') as f:
             while chunk := f.read(8192):
@@ -65,18 +64,10 @@ class PhotoService:
 
         return dest_path
 
-    def check_photo_by_hash(self, photohash:str, traveldiaryid:int):
-        photo = (self.session.query(Photo).filter(Photo.photo_hash == photohash,Photo.fk_travel_diary_id == traveldiaryid)
-                 .first())
-        return photo
-
     def create(self, filepath: Path, name: str, travel_diary_id: int, caption=None, addition_date=None) -> Photo | None:
         travel_diary = self.session.query(TravelDiary).filter(TravelDiary.id == travel_diary_id).first()
         if not travel_diary:
             return None
-        photo_hash = self.hash_file(filepath)
-        if self.check_photo_by_hash(photo_hash, travel_diary_id):
-            return None
 
         # Copy photo to diary's images directory
         copied_path = self._copy_photo_to_diary(filepath, travel_diary)
@@ -88,6 +79,8 @@ class PhotoService:
             except ValueError:
                 addition_date = None
 
+        # Calculate hash from the copied file
+        photo_hash = self._hash_file(copied_path)
         
         new_photo = Photo(
             filepath=str(copied_path),  # Store the path to the copied file
@@ -125,7 +118,7 @@ class PhotoService:
                         old_path.unlink()
                     original.filepath = str(new_path)
                     # Update hash based on the new copied file
-                    original.photo_hash = self.hash_file(new_path)
+                    original.photo_hash = self._hash_file(new_path)
             
             original.name = photo_dst.name
             original.addition_date = photo_dst.addition_date
@@ -141,7 +134,7 @@ class PhotoService:
             return original
         return None
 
-    def delete(self, photo_src: Photo, commit=True) -> Photo | None:
+    def delete(self, photo_src: Photo) -> Photo | None:
         excluded = self.read_by_id(photo_src.id)
         if excluded:
             # Store photo data before deletion
@@ -162,8 +155,7 @@ class PhotoService:
                 file_path.unlink()
             
             self.session.delete(excluded)
-            if commit:
+            self.session.commit()
-                self.session.commit()
             
             return deleted_photo
         return None

src/pilgrim/service/travel_diary_service.py

@@ -3,15 +3,11 @@ import re
 import shutil
 from pathlib import Path
 
-from pilgrim.models.entry import Entry
 from pilgrim.utils import DirectoryManager
 from sqlalchemy.exc import IntegrityError
 
-from pilgrim.models.travel_diary import TravelDiary
+from ..models.travel_diary import TravelDiary
-from unidecode import unidecode
 
-from pilgrim.service.photo_service import PhotoService
-from pilgrim.service.entry_service import EntryService
 
 class TravelDiaryService:
     def __init__(self, session):
@@ -24,10 +20,8 @@ class TravelDiaryService:
         - Replaces spaces with underscores
         - Ensures name is unique by adding a suffix if needed
         """
-        transliterated_name = unidecode(name)
-
         # Remove special characters and replace spaces
-        safe_name = re.sub(r'[^\w\s-]', '', transliterated_name)
+        safe_name = re.sub(r'[^\w\s-]', '', name)
         safe_name = safe_name.strip().replace(' ', '_').lower()
 
         # Ensure we have a valid name
@@ -151,32 +145,3 @@ class TravelDiaryService:
                 self.session.rollback()
                 raise ValueError(f"Could not delete diary: {str(e)}")
         return None
-
-    def delete_all_entries(self,travel_diary: TravelDiary):
-        diary = self.read_by_id(travel_diary.id)
-        if diary is not None:
-           diary.entries = []
-           self.session.commit()
-
-
-           return True
-
-        return False
-
-    def delete_all_photos(self,travel_diary: TravelDiary):
-        diary = self.read_by_id(travel_diary.id)
-        photo_service = PhotoService(self.session)
-        entry_service = EntryService(self.session)
-        if diary is not None:
-
-           for entry in list(diary.entries):
-               entry_service.delete_all_photo_references(entry,commit=False)
-
-           for photo in list(diary.photos):
-               photo_service.delete(photo,commit=False)
-
-           self.session.commit()
-
-           return True
-
-        return False

src/pilgrim/ui/screens/about_screen.py

@@ -3,7 +3,7 @@ from textual.binding import Binding
 from textual.screen import Screen
 from textual.widgets import Header, Footer, Button, Label, TextArea
 from textual.containers import Container
-from importlib.metadata import version
+
 class AboutScreen(Screen[bool]):
     """Screen to display application information."""
 
@@ -20,7 +20,7 @@ class AboutScreen(Screen[bool]):
         self.app_title = Label("Pilgrim", id="AboutScreen_AboutTitle",classes="AboutScreen_AboutTitle")
         self.content = Label("A TUI Based Travel Diary Application", id="AboutScreen_AboutContent",
                              classes="AboutScreen_AboutContent")
-        self.version = Label(f"Version: {version('Pilgrim')}", id="AboutScreen_AboutVersion",
+        self.version = Label("Version: 0.0.1", id="AboutScreen_AboutVersion",
                              classes="AboutScreen_AboutVersion")
         self.developer = Label("Developed By: Gustavo Henrique Miranda ", id="AboutScreen_AboutAuthor")
         self.contact = Label("git.gustavomiranda.xyz", id="AboutScreen_AboutContact",

src/pilgrim/ui/screens/diary_list_screen.py

@@ -9,7 +9,6 @@ from textual.containers import Vertical, Container, Horizontal
 
 from pilgrim.models.travel_diary import TravelDiary
 from pilgrim.ui.screens.about_screen import AboutScreen
-from pilgrim.ui.screens.diary_settings_screen import SettingsScreen
 from pilgrim.ui.screens.edit_diary_modal import EditDiaryModal
 from pilgrim.ui.screens.new_diary_modal import NewDiaryModal
 from pilgrim.ui.screens.edit_entry_screen import EditEntryScreen
@@ -24,7 +23,6 @@ class DiaryListScreen(Screen):
         Binding("enter", "open_selected_diary", "Open diary"),
         Binding("e", "edit_selected_diary", "Edit diary"),
         Binding("r", "force_refresh", "Force refresh"),
-        Binding("s", "diary_settings", "Open The Selected Diary Settings"),
     ]
 
     def __init__(self):
@@ -218,7 +216,6 @@ class DiaryListScreen(Screen):
             self.notify(f"Creation canceled...")
 
     def _on_screen_resume(self) -> None:
-        super()._on_screen_resume()
         self.refresh_diaries()
 
     def action_edit_selected_diary(self):
@@ -288,13 +285,3 @@ class DiaryListScreen(Screen):
     def action_quit(self):
         """Action to quit the application"""
         self.app.exit()
-
-    def action_diary_settings(self):
-        if self.selected_diary_index is not None:
-            diary_id = self.diary_id_map.get(self.selected_diary_index)
-            if diary_id:
-                self.app.push_screen(SettingsScreen(diary_id=diary_id))
-            else:
-                self.notify("Invalid diary ID")
-        else:
-            self.notify("Select a diary to open the settings")

src/pilgrim/ui/screens/diary_settings_screen.py

@@ -1,274 +0,0 @@
-
-from textual.widgets import Static
-from textual.containers import Container
-from textual.widgets import Header, Footer, Label, Button,Checkbox,Input
-from textual.screen import Screen
-from textual.reactive import reactive
-from textual.binding import Binding
-from textual import on
-
-from pilgrim.models.travel_diary import TravelDiary
-from pilgrim.ui.screens.modals.delete_all_entries_from_diary_modal import DeleteAllEntriesModal
-from pilgrim.ui.screens.modals.delete_all_photos_from_diary_modal import DeleteAllPhotosModal
-from pilgrim.ui.screens.modals.delete_diary_modal import DeleteDiaryModal
-
-
-class SettingsScreen(Screen):
-    is_changed = reactive(False)
-    BINDINGS = [
-        Binding("escape","cancel","Cancel"),
-    ]
-
-    def __init__(self,diary_id:int):
-        super().__init__()
-        self.current_diary = self.app.service_manager.get_travel_diary_service().read_by_id(diary_id)
-
-        self.header = Header()
-        self.footer = Footer()
-        self.title = "Settings"
-
-        self.diary_name = Static(self.current_diary.name,id="DiarySettingsScreen-DiaryName")
-        self.notify(str(self.app.config_manager))
-        self.is_the_diary_set_to_auto_open =  self.app.config_manager.get_auto_open_diary() == self.current_diary.name
-        self.diary_entry_count = Static(str(len(self.current_diary.entries)))
-        self.diary_photo_count = Static(str(len(self.current_diary.photos)))
-        self.save_button = Button("Save",id="DiarySettingsScreen-SaveButton" )
-        self.cancel_button = Button("Cancel",id="DiarySettingsScreen-cancel_button")
-        self.apply_button = Button("Apply",id="DiarySettingsScreen-ApplyButton")
-
-        self.delete_diary_button = Button("Delete Diary",id="DiarySettingsScreen-DeleteDiaryButton")
-        self.delete_all_entries_button = Button("Delete All Entries",id="DiarySettingsScreen-DeleteAllEntriesButton")
-        self.delete_all_photos_button = Button("Delete All Photos",id="DiarySettingsScreen-DeleteAllPhotosButton")
-        self.set_auto_open_to_this_diary = Checkbox(id="set_auto_open_to_this_diary",value=self.is_the_diary_set_to_auto_open)
-        self.delete_diary_button_container = Container(
-            Label("Delete Diary:"),
-
-            self.delete_diary_button,
-            id="DiarySettingsScreen-DeleteDiaryButtonContainer",
-            classes="DiarySettingsScreen-DeleteDiaryButtonContainer Button_Container"
-        )
-        self.delete_all_entries_button_container = Container(
-            Label("Delete All Entries:"),
-            self.delete_all_entries_button,
-
-            id="DiarySettingsScreen-DeleteAllEntriesButtonContainer",
-            classes="DiarySettingsScreen-DeleteAllEntriesButtonContainer Button_Container"
-        )
-        self.delete_all_photos_button_container = Container(
-            Label("Delete All Photos:"),
-            self.delete_all_photos_button,
-
-
-            id="DiarySettingsScreen-DeleteAllPhotosButtonContainer",
-            classes="DiarySettingsScreen-DeleteAllPhotosButtonContainer Button_Container"
-        )
-        self.diary_name_container = Container(
-            Label("Diary Name:"),
-            self.diary_name,
-            id="DiarySettingsScreen-DiaryNameContainer",
-            classes="DiarySettingsScreen-DiaryNameContainer Data_Container"
-
-        )
-        self.diary_entry_count_container = Container(
-            Label("Diary Entries:"),
-            self.diary_entry_count,
-            id="DiarySettingsScreen-DiaryEntryCountContainer",
-            classes="DiarySettingsScreen-DiaryEntryCountContainer Data_Container"
-        )
-        self.set_auto_open_to_this_diary_container = Container(
-            Label("Set Open This Diary On App Start?:"),
-            self.set_auto_open_to_this_diary,
-            id="DiarySettingsScreen-SetAutoOpenToThisDiaryContainer",
-            classes="DiarySettingsScreen-SetAutoOpenToThisDiaryContainer Data_Container"
-
-        )
-        self.diary_photo_count_container = Container(
-            Label("Diary Photos:"),
-            self.diary_photo_count,
-            id="DiarySettingsScreen-DiaryPhotoCountContainer",
-            classes="DiarySettingsScreen-DiaryPhotoCountContainer Data_Container"
-        )
-
-        self.diary_info_container = Container(
-
-            self.diary_name_container,
-            self.diary_entry_count_container,
-            self.diary_photo_count_container,
-            self.set_auto_open_to_this_diary_container,
-            id="DiarySettingsScreen-DiaryInfoContainer",
-            classes="DiarySettingsScreen-DiaryInfoContainer",
-                                              )
-
-        self.diary_denger_zone_container = Container(
-            self.backup_diary_button_container,
-            self.delete_diary_button_container,
-            self.delete_all_entries_button_container,
-            self.delete_all_photos_button_container,
-            id="DiarySettingsScreen-DiaryDengerZoneContainer",
-            classes="DiarySettingsScreen-DiaryDengerZoneContainer"
-        )
-        self.button_container = Container(
-            self.save_button,
-            self.apply_button,
-            self.cancel_button,
-            id="DiarySettingsScreen-ButtonContainer",
-            classes="DiarySettingsScreen-ButtonContainer"
-        )
-        self.main = Container(
-            self.diary_info_container,
-            self.diary_denger_zone_container,
-            self.button_container,
-            id="DiarySettingsScreen-MainContainer",
-            classes="DiarySettingsScreen-MainContainer"
-        )
-        self.diary_info_container.border_title = "Diary Info"
-        self.diary_denger_zone_container.border_title = "Denger Zone"
-
-    @on(Checkbox.Changed, "#set_auto_open_to_this_diary")
-    def on_checkbox_changed(self, event):
-        self.is_changed =  not self.is_changed
-
-
-    @on(Button.Pressed, "#DiarySettingsScreen-cancel_button")
-    def on_cancel_button_pressed(self, event):
-        self.action_cancel()
-
-    @on(Button.Pressed, "#DiarySettingsScreen-DeleteDiaryButton")
-    def on_delete_diary_button_pressed(self, event):
-        self.app.push_screen(DeleteDiaryModal(diary_id=self.current_diary.id,diary_name=self.current_diary.name))
-
-    @on(Button.Pressed, "#DiarySettingsScreen-DeleteAllEntriesButton")
-    def on_delete_all_entries_button_pressed(self, event):
-        self.app.push_screen(DeleteAllEntriesModal(diary_id=self.current_diary.id))
-
-    @on(Button.Pressed, "#DiarySettingsScreen-DeleteAllPhotosButton")
-    def on_delete_all_photos_button_pressed(self, event):
-        self.app.push_screen(DeleteAllPhotosModal(diary_id=self.current_diary.id))
-
-    def action_cancel(self):
-        if self.is_changed:
-            self.notify("Cancel button pressed, but changes are not saved",severity="error")
-            return
-        self.dismiss()
-
-    @on(Button.Pressed, "#DiarySettingsScreen-SaveButton")
-    def on_save_button_pressed(self, event):
-        self.action_save()
-
-    @on(Button.Pressed, "#DiarySettingsScreen-ApplyButton")
-    def on_apply_button_pressed(self, event):
-        self.action_apply()
-
-
-    def watch_is_changed(self, value):
-        label = self.set_auto_open_to_this_diary_container.query_one(Label)
-        if value:
-            label.add_class("DiarySettingsScreen-SetAutoOpenToThisDiaryContainer-Not-Saved-Label")
-        else:
-            label.remove_class("DiarySettingsScreen-SetAutoOpenToThisDiaryContainer-Not-Saved-Label")
-
-    def compose(self):
-        yield Header()
-        yield self.main
-        yield Footer()
-
-    def on_mount(self):
-        if self.app.config_manager.get_auto_open_diary() == self.current_diary.name:
-            self.call_after_refresh(self.set_checkbox_state)
-
-    def set_checkbox_state(self):
-        self.set_auto_open_to_this_diary.value = True
-
-    def _set_auto_open_diary(self,value):
-
-        self.app.config_manager.set_auto_open_diary(value)
-        self.app.config_manager.save_config()
-        self.is_changed = False
-
-    def _get_auto_open_diary(self):
-        return self.app.config_manager.get_auto_open_diary()
-
-    def _make_auto_open_diary_value(self):
-        value = None
-        if self.set_auto_open_to_this_diary.value:
-            value = self.current_diary.name
-        return value
-
-
-    def action_save(self):
-
-        if not self.is_changed:
-            self.dismiss()
-            return
-
-        value = self._make_auto_open_diary_value()
-        current_auto_open = self._get_auto_open_diary()
-
-
-        if current_auto_open is None:
-            self._set_auto_open_diary(value)
-            self.notify("Settings saved")
-            self.dismiss()
-            return
-
-
-        if current_auto_open == self.current_diary.name:
-            if value is None:
-
-                self._set_auto_open_diary(None)
-                self.notify("Auto-open disabled")
-            else:
-
-                self.is_changed = False
-                self.notify("No changes made")
-            self.dismiss()
-            return
-
-
-        if value is not None:
-
-            self._set_auto_open_diary(value)
-            self.notify(f"Auto-open changed from '{current_auto_open}' to '{self.current_diary.name}'")
-            self.dismiss()
-        else:
-
-            self.is_changed = False
-            self.notify("No changes made")
-            self.dismiss()
-
-
-    def action_apply(self):
-
-        if not self.is_changed:
-            return
-
-        value = self._make_auto_open_diary_value()
-        current_auto_open = self._get_auto_open_diary()
-
-
-        if current_auto_open is None:
-            self._set_auto_open_diary(value)
-            self.notify("Settings applied")
-            return
-
-
-        if current_auto_open == self.current_diary.name:
-            if value is None:
-
-                self._set_auto_open_diary(None)
-                self.notify("Auto-open disabled")
-            else:
-
-                self.is_changed = False
-                self.notify("No changes made")
-            return
-
-
-        if value is not None:
-
-            self._set_auto_open_diary(value)
-            self.notify(f"Auto-open changed from '{current_auto_open}' to '{self.current_diary.name}'")
-        else:
-
-            self.is_changed = False
-            self.notify("No changes made")

src/pilgrim/ui/screens/edit_entry_screen.py

@@ -87,7 +87,7 @@ class EditEntryScreen(Screen):
         self.text_entry = TextArea(id="text_entry", classes="EditEntryScreen-text-entry")
 
         # Sidebar widgets
-        self.sidebar_title = Static("Photos", classes="EditEntryScreen-sidebar-title")
+        self.sidebar_title = Static("📸 Photos", classes="EditEntryScreen-sidebar-title")
         self.photo_list = OptionList(id="photo_list", classes="EditEntryScreen-sidebar-photo-list")
         self.photo_info = Static("", classes="EditEntryScreen-sidebar-photo-info")
         self.help_text = Static("", classes="EditEntryScreen-sidebar-help")
@@ -296,28 +296,30 @@ class EditEntryScreen(Screen):
 
             if not self.cached_photos:
                 self.photo_info.update("No photos found for this diary")
-                self.help_text.update("No photos available\n\nUse Photo Manager to add photos")
+                self.help_text.update("📸 No photos available\n\nUse Photo Manager to add photos")
                 return
 
             # Add photos to the list with hash
             for photo in self.cached_photos:
                 # Show name and hash in the list
                 photo_hash = str(photo.photo_hash)[:8]
-                self.photo_list.add_option(f"{photo.name} \\[{photo_hash}\]")
+                self.photo_list.add_option(f"📷 {photo.name} \\[{photo_hash}\]")
 
-            self.photo_info.update(f"{len(self.cached_photos)} photos in diary")
+            self.photo_info.update(f"📸 {len(self.cached_photos)} photos in diary")
 
             # Updated help a text with hash information
             help_text = (
-                "[b]Sidebar Shortcuts[/b]\n"
+                "[b]⌨️  Sidebar Shortcuts[/b]\n"
                 "[b][green]i[/green][/b]: Insert photo into entry\n"
                 "[b][green]n[/green][/b]: Add new photo\n"
                 "[b][green]d[/green][/b]: Delete selected photo\n"
                 "[b][green]e[/green][/b]: Edit selected photo\n"
                 "[b][yellow]Tab[/yellow][/b]: Back to editor\n"
                 "[b][yellow]F8[/yellow][/b]: Show/hide sidebar\n"
+                "[b][yellow]F9[/yellow][/b]: Switch focus (if needed)\n\n"
                 "[b]📝 Photo References[/b]\n"
-                "\\[\\[photo::hash\\]\\]"
+                "Use: \\[\\[photo:name:hash\\]\\]\n"
+                "Or: \\[\\[photo::hash\\]\\]"
             )
             self.help_text.update(help_text)
         except Exception as e:
@@ -427,7 +429,9 @@ class EditEntryScreen(Screen):
         photo_details += f"🔗 {photo_hash}\n"
         photo_details += f"📅 {selected_photo.addition_date}\n"
         photo_details += f"💬 {selected_photo.caption or 'No caption'}\n"
+        photo_details += f"📁 {selected_photo.filepath}\n\n"
         photo_details += f"[b]Reference formats:[/b]\n"
+        photo_details += f"\\[\\[photo:{selected_photo.name}:{photo_hash}\\]\\]\n"
         photo_details += f"\\[\\[photo::{photo_hash}\\]\\]"
 
         self.photo_info.update(photo_details)
@@ -611,8 +615,7 @@ class EditEntryScreen(Screen):
                 addition_date=original_photo.addition_date,
                 caption=photo_data["caption"],
                 entries=original_photo.entries if original_photo.entries is not None else [],
-                id=original_photo.id,
+                id=original_photo.id
-                photo_hash=original_photo.photo_hash,
             )
 
             result = photo_service.update(original_photo, updated_photo)
@@ -739,15 +742,15 @@ class EditEntryScreen(Screen):
         self.notify(f"Selected photo: {selected_photo.name} \\[{photo_hash}\\]")
 
         # Update photo info with details including hash
-        photo_details = f"Name: {selected_photo.name}\n"
+        photo_details = f"📷 {selected_photo.name}\n"
-        photo_details += f"Hash: {photo_hash}\n"
+        photo_details += f"🔗 {photo_hash}\n"
-        photo_details += f"Date: {selected_photo.addition_date}\n"
+        photo_details += f"📅 {selected_photo.addition_date}\n"
         if selected_photo.caption:
-            photo_details += f"Caption: {selected_photo.caption}\n"
+            photo_details += f"💬 {selected_photo.caption}\n"
-        else:
+        photo_details += f"📁 {selected_photo.filepath}\n\n"
-            photo_details += f"Caption: No Caption\n"
         photo_details += f"[b]Reference formats:[/b]\n"
-        photo_details += f"\\[\\[photo::{photo_hash}]]"
+        photo_details += f"\\[\\[photo:{selected_photo.name}:{photo_hash}\\]\\]\n"
+        photo_details += f"\\[\\[photo::{photo_hash}\\]\\]"
 
         self.photo_info.update(photo_details)
 

src/pilgrim/ui/screens/modals/add_photo_modal.py

@@ -15,6 +15,12 @@ class AddPhotoModal(Screen):
         self.result = None
         self.created_photo = None
 
+    def _generate_photo_hash(self, photo_data: dict) -> str:
+        """Generate a short, unique hash for a photo"""
+        # Use temporary data for hash generation
+        unique_string = f"{photo_data['name']}_{photo_data.get('photo_id', 0)}_new"
+        hash_object = hashlib.md5(unique_string.encode())
+        return hash_object.hexdigest()[:8]
 
     def compose(self) -> ComposeResult:
         yield Container(
@@ -63,16 +69,10 @@ class AddPhotoModal(Screen):
 
     async def _async_create_photo(self, photo_data: dict):
         """Creates a new photo asynchronously using PhotoService"""
-
-
         try:
             service_manager = self.app.service_manager
             photo_service = service_manager.get_photo_service()
 
-            if photo_service.check_photo_by_hash(photo_service.hash_file(photo_data["filepath"]),self.diary_id):
-                self.notify("Photo already exists in database", severity="error")
-                return
-
             new_photo = photo_service.create(
                 filepath=Path(photo_data["filepath"]),
                 name=photo_data["name"],
@@ -82,9 +82,13 @@ class AddPhotoModal(Screen):
 
             if new_photo:
                 self.created_photo = new_photo
+                # Generate hash for the new photo
+                photo_hash = self._generate_photo_hash({
+                    "name": new_photo.name,
+                    "photo_id": new_photo.id
+                })
                 
-                
+                self.notify(f"Photo '{new_photo.name}' added successfully!\nHash: {photo_hash}\nReference: \\[\\[photo:{new_photo.name}:{photo_hash}\\]\\]", 
-                self.notify(f"Photo '{new_photo.name}' added successfully!\nHash: {new_photo.photo_hash[:8]}\nReference: \\[\\[photo:{new_photo.name}:{new_photo.photo_hash[:8]}\\]\\]",
                            severity="information", timeout=5)
                 
                 # Return the created photo data to the calling screen
@@ -93,7 +97,7 @@ class AddPhotoModal(Screen):
                     "name": photo_data["name"],
                     "caption": photo_data["caption"],
                     "photo_id": new_photo.id,
-                    "hash": new_photo.photo_hash
+                    "hash": photo_hash
                 }
                 self.dismiss(self.result)
             else:

src/pilgrim/ui/screens/modals/delete_all_entries_from_diary_modal.py

@@ -1,33 +0,0 @@
-
-from textual.widgets import Button
-
-from textual import on
-
-
-from pilgrim.ui.screens.modals.delete_yes_confirmation_modal import DeleteYesConfirmationModal
-
-
-class DeleteAllEntriesModal(DeleteYesConfirmationModal):
-    def __init__(self,diary_id:int):
-        super().__init__(diary_id)
-        self.head_text.update("Are you sure you want to delete all entries from this diary?")
-        self.delete_button.add_class("DeleteDiaryModal-DeleteButton")
-
-
-
-    @on(Button.Pressed, ".DeleteDiaryModal-DeleteButton")
-    def on_delete_button_pressed(self, event):
-
-        from pilgrim.ui.screens.diary_list_screen import DiaryListScreen
-
-        self.result = True
-        self._delete_entries()
-        self.dismiss()
-        self.app.push_screen(DiaryListScreen())
-
-    def _delete_entries(self):
-        diary = self.app.service_manager.get_travel_diary_service().read_by_id(self.diary_id)
-        if self.app.service_manager.get_travel_diary_service().delete_all_entries(diary):
-            self.notify("All entries deleted successfully")
-        else:
-            self.notify("Failed to delete all entries")

src/pilgrim/ui/screens/modals/delete_all_photos_from_diary_modal.py

@@ -1,32 +0,0 @@
-
-from textual.widgets import Button
-
-from textual import on
-
-from pilgrim.ui.screens.modals.delete_yes_confirmation_modal import DeleteYesConfirmationModal
-
-
-class DeleteAllPhotosModal(DeleteYesConfirmationModal):
-    def __init__(self,diary_id:int):
-        super().__init__(diary_id)
-        self.head_text.update("Are you sure you want to delete all photos from this diary?")
-        self.delete_button.add_class("DeleteDiaryModal-DeleteButton")
-
-
-
-    @on(Button.Pressed, ".DeleteDiaryModal-DeleteButton")
-    def on_delete_button_pressed(self, event):
-
-        from pilgrim.ui.screens.diary_list_screen import DiaryListScreen
-
-        self.result = True
-        self._delete_all_photo()
-        self.dismiss()
-        self.app.push_screen(DiaryListScreen())
-        
-    def _delete_all_photo(self):
-        diary = self.app.service_manager.get_travel_diary_service().read_by_id(self.diary_id)
-        if self.app.service_manager.get_travel_diary_service().delete_all_photos(diary):
-            self.notify("All photos deleted successfully")
-        else:
-            self.notify("Failed to delete all photos")

src/pilgrim/ui/screens/modals/delete_diary_modal.py

@@ -1,77 +0,0 @@
-from textual.containers import Container
-from textual.widgets import Header, Footer, Label, Button,Input
-from textual.screen import Screen
-from textual.binding import Binding
-from textual import on
-
-
-
-
-class DeleteDiaryModal(Screen):
-
-    BINDINGS = [
-        Binding("escape","cancel","Cancel"),
-    ]
-    def __init__(self, diary_id: int,diary_name:str):
-        super().__init__()
-        self.diary_id = diary_id
-        self.diary_name = diary_name
-        self.user_input = Input(placeholder=f"Type diary name to confirm: ({self.diary_name})",id="DeleteDiaryModal-UserInput")
-        self.delete_button = Button("Delete Diary",id="DeleteDiaryModal-DeleteButton",disabled=True)
-        self.cancel_button = Button("Cancel",id="DeleteDiaryModal-CancelButton")
-        self.result = None
-
-    def compose(self):
-        yield Header()
-        yield Container(
-            Label("Are you sure you want to delete this diary?"),
-            self.user_input,
-            Container(
-                self.delete_button,
-                self.cancel_button,
-                id="DeleteDiaryModal-ButtonContainer",
-                classes="DeleteDiaryModal-ButtonContainer"
-            ),
-            id="DeleteDiaryModal-MainContainer",
-            classes="DeleteDiaryModal-MainContainer"
-        )
-        yield Footer()
-
-    @on(Input.Changed,"#DeleteDiaryModal-UserInput")
-    def on_user_input_changed(self, event):
-        input_text = event.value.strip()
-
-        if input_text == self.diary_name:
-            self.delete_button.disabled = False
-        else:
-            self.delete_button.disabled = True
-
-
-    @on(Button.Pressed,"#DeleteDiaryModal-DeleteButton")
-    def on_delete_button_pressed(self, event):
-
-        self.result = True
-        self._delete_diary()
-        self.dismiss()
-
-        from pilgrim.ui.screens.diary_list_screen import DiaryListScreen
-
-        self.app.push_screen(DiaryListScreen())
-
-
-
-    @on(Button.Pressed,"#DeleteDiaryModal-CancelButton")
-    def on_cancel_button_pressed(self, event):
-        self.action_cancel()
-
-
-    def action_cancel(self):
-        self.dismiss()
-
-    def _delete_diary(self):
-        diary = self.app.service_manager.get_travel_diary_service().read_by_id(self.diary_id)
-        self.app.service_manager.get_travel_diary_service().delete(diary)
-        if self.app.config_manager.get_auto_open_diary() == self.diary_name:
-            self.app.config_manager.set_auto_open_diary(None)
-            self.app.config_manager.save_config()
-

src/pilgrim/ui/screens/modals/delete_yes_confirmation_modal.py

@@ -1,57 +0,0 @@
-from textual.containers import Container
-from textual.widgets import Header, Footer, Label, Button,Input
-from textual.screen import Screen
-from textual.binding import Binding
-from textual import on
-
-
-
-
-class DeleteYesConfirmationModal(Screen):
-    BINDINGS = [
-        Binding("escape", "cancel", "Cancel"),
-    ]
-    def __init__(self,diary_id:int):
-        super().__init__()
-        self.diary_id = diary_id
-        self.user_input = Input(placeholder="Type 'Yes, I do ' to confirm",id="DeleteYesConfirmationModal-UserInput")
-        self.delete_button = Button("Delete",id="DeleteYesConfirmationModal-DeleteButton",disabled=True)
-        self.cancel_button = Button("Cancel",id="DeleteYesConfirmationModal-CancelButton")
-        self.head_text = Label("Are you sure you want to delete this diary?",id="DeleteYesConfirmationModal-HeadText")
-        self.second_head_text = Label("This action cannot be undone.",id="DeleteYesConfirmationModal-SecondHeadText")
-        self.delete_modal_container = Container(
-            self.head_text,
-            self.second_head_text,
-            self.user_input,
-            Container(
-                self.delete_button,
-                self.cancel_button,
-                id="DeleteYesConfirmationModal-DeleteButtonContainer",
-                classes="DeleteYesConfirmationModal-DeleteButtonContainer"
-            ),
-            id="DeleteYesConfirmationModal-DeleteModalContainer",
-            classes="DeleteYesConfirmationModal-DeleteModalContainer"
-        )
-        self.result = None
-
-    @on(Input.Changed,"#DeleteYesConfirmationModal-UserInput")
-    def on_user_input_changed(self, event):
-        input_text = event.value.strip()
-        if input_text == "Yes, I do":
-            self.delete_button.disabled = False
-        else:
-            self.delete_button.disabled = True
-
-    @on(Button.Pressed,"#DeleteYesConfirmationModal-CancelButton")
-    def on_cancel_button_pressed(self, event):
-        self.action_cancel()
-
-    def action_cancel(self):
-        from pilgrim.ui.screens.diary_settings_screen import SettingsScreen
-        self.dismiss()
-        self.app.push_screen(SettingsScreen(self.diary_id))
-
-    def compose(self):
-        yield Header()
-        yield Footer()
-        yield self.delete_modal_container

src/pilgrim/ui/screens/modals/edit_photo_modal.py

@@ -3,7 +3,7 @@ from textual.screen import Screen
 from textual.widgets import Static, Input, Button
 from textual.containers import Container, Horizontal
 from pilgrim.models.photo import Photo
-
+import hashlib
 
 class EditPhotoModal(Screen):
     """Modal for editing an existing photo (name and caption only)"""
@@ -12,11 +12,15 @@ class EditPhotoModal(Screen):
         self.photo = photo
         self.result = None
 
-
+    def _generate_photo_hash(self, photo: Photo) -> str:
+        """Generate a short, unique hash for a photo"""
+        unique_string = f"{photo.name}_{photo.id}_{photo.addition_date}"
+        hash_object = hashlib.md5(unique_string.encode())
+        return hash_object.hexdigest()[:8]
 
     def compose(self) -> ComposeResult:
         # Generate hash for this photo
-
+        photo_hash = self._generate_photo_hash(self.photo)
         
         yield Container(
             Static("✏️ Edit Photo", classes="EditPhotoModal-Title"),
@@ -41,9 +45,10 @@ class EditPhotoModal(Screen):
                 id="caption-input", 
                 classes="EditPhotoModal-Input"
             ),
-            Static(f"🔗 Photo Hash: {self.photo.photo_hash[:8]}", classes="EditPhotoModal-Hash"),
+            Static(f"🔗 Photo Hash: {photo_hash}", classes="EditPhotoModal-Hash"),
             Static("Reference formats:", classes="EditPhotoModal-Label"),
-            Static(f"\\[\\[photo::{self.photo.photo_hash[:8]}\\]\\]", classes="EditPhotoModal-Reference"),
+            Static(f"\\[\\[photo:{self.photo.name}:{photo_hash}\\]\\]", classes="EditPhotoModal-Reference"),
+            Static(f"\\[\\[photo::{photo_hash}\\]\\]", classes="EditPhotoModal-Reference"),
             Horizontal(
                 Button("Save Changes", id="save-button", classes="EditPhotoModal-Button"),
                 Button("Cancel", id="cancel-button", classes="EditPhotoModal-Button"),

src/pilgrim/ui/screens/new_diary_modal.py

@@ -12,9 +12,9 @@ class NewDiaryModal(ModalScreen[str]):
         Binding("escape", "cancel", "Cancel"),
         Binding("enter", "create_diary", "Create",priority=True),
     ]
-    def __init__(self):
+    def __init__(self,autoopen=True):
         super().__init__()
-        self.auto_open = self.app.config_manager.auto_open_new_diary
+        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:

src/pilgrim/ui/styles/pilgrim.css

@@ -1,8 +1,7 @@
 Screen {
     layout: vertical;
-    background: $primary-background-darken-3;
+    background: $surface-darken-1;
     align: center middle;
-    hatch: right $secondary-background-darken-3;
 }
 
 .EditEntryScreen-sub-header {
@@ -390,10 +389,22 @@ Screen.-modal {
     width: 1fr;
 }
 
-.EditEntryScreen-sidebar{
+.EditEntryScreen-sidebar {
-    background: $primary-darken-1;
+    width: 40;
-    width: 45%;
+    min-height: 10;
+    border-left: solid green;
+    padding: 1;
+    background: $surface-darken-2;
+    color: $primary;
+    text-style: bold;
+    content-align: left top;
 }
+
+.EditEntryScreen-content-container {
+    layout: horizontal;
+    height: 1fr;
+}
+
 .EditEntryScreen-sidebar-title {
     text-align: center;
     text-style: bold;
@@ -406,39 +417,30 @@ Screen.-modal {
 .EditEntryScreen-sidebar-content {
     height: 1fr;
     layout: vertical;
-    margin-left: 1;
-    margin-right: 1;
-
 }
 
 .EditEntryScreen-sidebar-photo-list {
-    height: 2fr; /* Pega o espaço restante disponível */
+    height: 1fr;
-    min-height: 5; /* Garante altura mínima para não sumir */
     border: solid $accent;
     margin-bottom: 1;
-    overflow-y: auto; /* Adiciona scroll vertical se necessário */
 }
 
 .EditEntryScreen-sidebar-photo-info {
-    height: 1fr;
+    height: auto;
-    max-height: 15; /* Limita altura máxima */
+    min-height: 3;
-    min-height: 13;
-    padding: 1;
     border: solid $warning;
+    padding: 1;
     margin-bottom: 1;
     background: $surface-darken-1;
-    overflow-y: auto; /* Adiciona scroll se exceder max-height */
 }
 
 .EditEntryScreen-sidebar-help {
-    height: 1fr;
+    height: auto;
-    max-height: 10; /* Altura máxima menor que info */
+    min-height: 8;
-    min-height: 8; /* Altura mínima menor */
     border: solid $success;
     padding: 1;
     background: $surface-darken-1;
     text-style: italic;
-    overflow-y: auto; /* Adiciona scroll se exceder max-height */
 }
 
 /* Photo Modal Styles */
@@ -625,264 +627,3 @@ Screen.-modal {
     margin: 0 1;
     width: 1fr;
 }
-
-.DeleteYesConfirmationModal-DeleteModalContainer,
-.DeleteDiaryModal-MainContainer {
-    align: center middle;
-    layout: vertical;
-    margin: 2;
-    padding: 2;
-    background: $primary-background;
-    height: auto;
-    width: auto;
-    min-width: 80%;
-    max-width: 95%;
-    border: solid $primary;
-}
-
-/* Labels de texto */
-.DeleteYesConfirmationModal-DeleteModalContainer > Label,
-.DeleteDiaryModal-MainContainer > Label {
-    margin: 1 0;
-    padding: 0 1;
-    color: $error;
-    text-align: center;
-    width: 100%;
-}
-
-/* Input fields */
-.DeleteYesConfirmationModal-DeleteModalContainer > Input,
-.DeleteDiaryModal-MainContainer > Input {
-    margin: 1 0;
-    width: 100%;
-    height: 3;
-}
-
-/* Container dos botões */
-.DeleteYesConfirmationModal-DeleteButtonContainer,
-.DeleteDiaryModal-ButtonContainer {
-    layout: horizontal;
-    align: center middle;
-    margin: 2 0 0 0;
-    height: auto;
-    width: 100%;
-    padding: 0;
-}
-
-/* Botões individuais */
-.DeleteYesConfirmationModal-DeleteButtonContainer > Button,
-.DeleteDiaryModal-ButtonContainer > Button {
-    width: 45%;
-    margin: 0 1;
-    height: 3;
-}
-
-/* Botão de delete (primeiro botão) */
-.DeleteYesConfirmationModal-DeleteButtonContainer > Button:first-child,
-.DeleteDiaryModal-ButtonContainer > Button:first-child {
-    background: $error-darken-1;
-}
-
-/* Botão de cancel */
-.DeleteYesConfirmationModal-DeleteButtonContainer > Button:last-child,
-.DeleteDiaryModal-ButtonContainer > Button:last-child {
-    background: $surface;
-}
-
-/* Estados disabled para botões de delete */
-.DeleteYesConfirmationModal-DeleteButtonContainer > Button:first-child:disabled,
-.DeleteDiaryModal-ButtonContainer > Button:first-child:disabled {
-    background: $surface-lighten-1;
-    color: $text-muted;
-}
-
-/* Espaçamento específico para labels secundários */
-#DeleteYesConfirmationModal-SecondHeadText {
-    margin: 1 0;
-    padding: 0 1;
-    color: $warning;
-    text-align: center;
-    text-style: italic;
-}
-
-
-
-
-.Data_Container{
-    width: 100%;
-    layout: grid;
-    grid-size: 2 1; /* 2 colunas, 1 linha */
-    height:auto;
-
-
-}
-
-.Button_Container{
-    width: 100%;
-    layout: grid;
-    grid-size: 2 2;
-    height: auto;
-
-
-}
-
-
-.DiarySettingsScreen-DeleteDiaryButtonContainer{
-    grid-size: 2 1;
-    padding: 0 1;
-    content-align: center middle;
-    padding-bottom:1;
-
-}
-
-.DiarySettingsScreen-DeleteAllEntriesButtonContainer{
-
-    margin:0;
-    padding: 0 1;
-    height:auto;
-    padding-bottom:1;
-
-
-}
-
-.DiarySettingsScreen-DeleteAllPhotosButtonContainer{
-        margin:0;
-    padding: 0 1;
-    height:auto;
-    padding-bottom:1;
-
-}
-.DiarySettingsScreen-DeleteAllPhotosButtonContainer > Label,
-.DiarySettingsScreen-DeleteAllEntriesButtonContainer > Label{
-color: $error-lighten-3;
-padding:1;
-
-}
-
-.DiarySettingsScreen-BackupDiaryButtonContainer{
-margin:0;
-padding:0 1;
-padding-bottom:1
-
-}
-
-.DiarySettingsScreen-BackupDiaryButtonContainer > Label{
-padding:1;
-color: $success-darken-1;
-}
-
-.DiarySettingsScreen-BackupDiaryButtonContainer > Button{
-    background: $success;
-}
-
-.DiarySettingsScreen-DeleteDiaryButtonContainer > Label{
-    color: $error-lighten-3;
-    content-align: left middle;
-    padding:1
-
-
-
-}
-
-.DiarySettingsScreen-DeleteAllPhotosButtonContainer > Button,
-.DiarySettingsScreen-DeleteAllEntriesButtonContainer > Button,
-.DiarySettingsScreen-DeleteDiaryButtonContainer Button{
-
-    background: $error;
-
-    }
-
-.DiarySettingsScreen-MainContainer{
-
-    align: center top;
-    layout: vertical;
-    margin:1;
-    padding:1;
-    background: $primary-background
-
-
-}
-
-.DiarySettingsScreen-DiaryInfoContainer{
-
-    padding:1 2;
-    border:round grey;
-    height:auto;
-    width: 90%;
-    padding-bottom: 0;
-}
-
-.DiarySettingsScreen-ButtonContainer{
-    height:auto;
-    layout: grid;
-    grid-size: 3 1;
-    grid-gutter:2;
-    dock:bottom;
-}
-
-.DiarySettingsScreen-ButtonContainer > Button:first-child {
-
-    margin-left:2
-
-}
-
-.DiarySettingsScreen-ButtonContainer > Button:last-child {
-
-    margin-right:2
-
-}
-
-.DiarySettingsScreen-ButtonContainer > Button {
-    width: 100%;
-
-
-
-}
-
-
-#DiarySettingsScreen-DiaryPhotoCountContainer > Static:first-child,
-#DiarySettingsScreen-DiaryEntryCountContainer > Static:first-child,
-#DiarySettingsScreen-DiaryNameContainer >  Static:first-child{
-
-    text-align: left;
-
-    padding: 0 1;
-    padding-bottom:1
-
-}
-
-
-
-#DiarySettingsScreen-DiaryPhotoCountContainer > Static:last-child,
-#DiarySettingsScreen-DiaryEntryCountContainer > Static:last-child,
-#DiarySettingsScreen-DiaryNameContainer >  Static:last-child{
-
-    text-align: right;
-    padding:0 1
-
-}
-
-.DiarySettingsScreen-SetAutoOpenToThisDiaryContainer > Checkbox{
-
-    margin:0;
-    padding:1;
-    background: $primary-background;
-    border:none;
-
-
-
-}
-
-.DiarySettingsScreen-SetAutoOpenToThisDiaryContainer-Not-Saved-Label{
-    text-style:bold;
-    color:$warning-lighten-2;
-
-}
-
-.DiarySettingsScreen-DiaryDengerZoneContainer{
-    border: round $error-darken-1;
-    width: 90%;
-    padding: 0 1;
-    height: auto;
-    padding-bottom: 0;
-}

src/pilgrim/ui/ui.py

@@ -9,7 +9,6 @@ from pilgrim.service.servicemanager import ServiceManager
 from pilgrim.ui.screens.about_screen import AboutScreen
 from pilgrim.ui.screens.diary_list_screen import DiaryListScreen
 from pilgrim.ui.screens.edit_entry_screen import EditEntryScreen
-from pilgrim.utils import ConfigManager
 
 CSS_FILE_PATH = Path(__file__).parent / "styles" / "pilgrim.css"
 
@@ -17,10 +16,9 @@ CSS_FILE_PATH = Path(__file__).parent / "styles" / "pilgrim.css"
 class UIApp(App):
     CSS_PATH = CSS_FILE_PATH
 
-    def __init__(self,service_manager: ServiceManager, config_manager: ConfigManager, **kwargs):
+    def __init__(self,service_manager: ServiceManager, **kwargs):
         super().__init__(**kwargs)
         self.service_manager = service_manager
-        self.config_manager = config_manager
 
 
     def on_mount(self) -> None:

src/pilgrim/utils/__init__.py

@@ -1,4 +1,3 @@
 from .directory_manager import DirectoryManager
-from .config_manager import ConfigManager
 
-__all__ = ['DirectoryManager', 'ConfigManager']
+__all__ = ['DirectoryManager']

src/pilgrim/utils/config_manager.py

@@ -1,112 +0,0 @@
-import os.path
-from os import PathLike
-from threading import Lock
-
-import tomli
-import tomli_w
-
-from pilgrim.utils import DirectoryManager
-
-
-class SingletonMeta(type):
-    _instances = {}
-    _lock: Lock = Lock()
-
-    def __call__(cls, *args, **kwargs):
-        with cls._lock:
-            if cls not in cls._instances:
-                instance = super().__call__(*args, **kwargs)
-                cls._instances[cls] = instance
-        return cls._instances[cls]
-
-
-class ConfigManager(metaclass=SingletonMeta):
-    def __init__(self):
-        self.database_url = None
-        self.database_type = None
-        self.auto_open_diary = None
-        self.auto_open_new_diary = None
-        self.config_dir = DirectoryManager.get_config_directory()
-        self.__data = None
-
-    def read_config(self):
-        if os.path.exists(f"{DirectoryManager.get_config_directory()}/config.toml"):
-            try:
-                with open(f"{DirectoryManager.get_config_directory()}/config.toml", "rb") as f:
-                    data = tomli.load(f)
-
-            except tomli.TOMLDecodeError as e:
-                raise ValueError(f"Invalid TOML configuration: {e}")
-            except Exception as e:
-                raise RuntimeError(f"Error reading configuration: {e}")
-
-            self.__data = data
-            self.database_url = self.__data["database"]["url"]
-            self.database_type = self.__data["database"]["type"]
-
-            if self.__data["settings"]["diary"]["auto_open_diary_on_startup"] == "":
-                self.auto_open_diary = None
-            else:
-                self.auto_open_diary = self.__data["settings"]["diary"]["auto_open_diary_on_startup"]
-            self.auto_open_new_diary = self.__data["settings"]["diary"]["auto_open_on_creation"]
-        else:
-            print("Error: config.toml not found.")
-            self.create_config()
-            self.read_config()
-
-    def create_config(self, config: dict = None):
-        # Garantir que o diretório de configuração existe
-        config_dir = DirectoryManager.get_config_directory()
-        if not os.path.exists(config_dir):
-            os.makedirs(config_dir, exist_ok=True)
-
-        default = {
-            "database": {
-                "url": f"{config_dir}/database.db",
-                "type": "sqlite"
-            },
-            "settings": {
-                "diary": {
-                    "auto_open_diary_on_startup": "",
-                    "auto_open_on_creation": False
-                }
-            }
-        }
-        if config is None:
-            config = default
-
-        try:
-            with open(f"{config_dir}/config.toml", "wb") as f:
-                tomli_w.dump(config, f)
-        except Exception as e:
-            raise RuntimeError(f"Error creating configuration: {e}")
-
-    def save_config(self):
-        if self.__data is None:
-            self.read_config()
-        if self.__data is None:
-            raise RuntimeError("Error reading configuration.")
-
-        self.__data["database"]["url"] = self.database_url
-        self.__data["database"]["type"] = self.database_type
-        self.__data["settings"]["diary"]["auto_open_diary_on_startup"] = self.auto_open_diary or ""
-        self.__data["settings"]["diary"]["auto_open_on_creation"] = self.auto_open_new_diary
-        try:
-            self.create_config(self.__data)
-        except Exception as e:
-            raise RuntimeError(f"Error saving configuration: {e}")
-
-    def set_config_dir(self, value):
-        self.config_dir = value
-
-    def set_database_url(self, value: str):
-        self.database_url = value
-
-    def set_auto_open_diary(self, value: str):
-        self.auto_open_diary = value
-
-    def get_auto_open_diary(self):
-        return self.auto_open_diary
-
-    def set_auto_open_new_diary(self, value: bool):
-        self.auto_open_new_diary = value

src/pilgrim/utils/directory_manager.py

@@ -1,5 +1,4 @@
 import os
-import shutil
 from pathlib import Path
 
 
@@ -38,26 +37,3 @@ class DirectoryManager:
     def get_diary_images_directory(directory_name: str) -> Path:
         """Returns the images directory path for a specific diary."""
         return DirectoryManager.get_diary_data_directory(directory_name) / "images"
-
-    @staticmethod
-    def get_database_path() -> Path:
-        """
-        Get the database file path following XDG Base Directory specification.
-        Creates the directory if it doesn't exist.
-        """
-        pilgrim_dir = DirectoryManager.get_config_directory()
-        db_path = pilgrim_dir / "database.db"
-
-        # If database doesn't exist in new location but exists in current directory,
-        # migrate it
-        if not db_path.exists():
-            current_db = Path("database.db")
-            if current_db.exists():
-                try:
-                    shutil.copy2(current_db, db_path)
-                    # Consider using logging instead of print
-                    print(f"Database migrated from {current_db} to {db_path}")
-                except (OSError, shutil.Error) as e:
-                    raise RuntimeError(f"Failed to migrate database: {e}")
-
-        return db_path

tests/conftest.py

@@ -1,64 +0,0 @@
-import pytest
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
-
-from pilgrim.database import Base
-from pilgrim.models.travel_diary import TravelDiary
-from pilgrim.models.photo import Photo
-
-# Todos os imports necessários para as fixtures devem estar aqui
-# ...
-
-@pytest.fixture(scope="function")
-def db_session():
-    """Esta fixture agora está disponível para TODOS os testes."""
-    engine = create_engine("sqlite:///:memory:")
-    Base.metadata.create_all(engine)
-    Session = sessionmaker(bind=engine)
-    session = Session()
-    yield session
-    session.close()
-    Base.metadata.drop_all(engine)
-
-@pytest.fixture
-def populated_db_session(db_session):
-    """Esta também fica disponível para todos."""
-    travel_diary = TravelDiary(name="My Travel Diary", directory_name="viagem-teste")
-    db_session.add(travel_diary)
-    db_session.commit()
-    return db_session
-
-@pytest.fixture
-def session_with_one_diary(db_session):
-    diary = TravelDiary(name="Diário de Teste", directory_name="diario_de_teste")
-    db_session.add(diary)
-    db_session.commit()
-    db_session.refresh(diary)
-    return db_session, diary
-
-
-@pytest.fixture
-def session_with_photos(session_with_one_diary):
-    session, diary = session_with_one_diary
-
-    # Usamos a mesma raiz de diretório que o mock do teste espera
-    diaries_root = "/fake/diaries_root"
-
-    photo1 = Photo(
-        # CORREÇÃO: O caminho agora inclui a raiz e a subpasta 'images'
-        filepath=f"{diaries_root}/{diary.directory_name}/images/p1.jpg",
-        name="Foto 1",
-        photo_hash="hash1",
-        fk_travel_diary_id=diary.id
-    )
-    photo2 = Photo(
-        filepath=f"{diaries_root}/{diary.directory_name}/images/p2.jpg",
-        name="Foto 2",
-        photo_hash="hash2",
-        fk_travel_diary_id=diary.id
-    )
-
-    session.add_all([photo1, photo2])
-    session.commit()
-
-    return session, [photo1, photo2]

tests/service/test_entry_service.py

@@ -1,269 +0,0 @@
-from re import search
-
-import pytest
-from datetime import datetime
-from unittest.mock import Mock
-from sqlalchemy import create_engine
-from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import sessionmaker
-
-from pilgrim.database import Base
-from pilgrim.models.travel_diary import TravelDiary
-from pilgrim.models.entry import Entry
-from pilgrim.models.photo import Photo
-
-from pilgrim.service.entry_service import EntryService
-
-
-
-@pytest.fixture
-def session_with_an_entry(populated_db_session):
-    session = populated_db_session
-    initial_entry = Entry(
-        title="Título Original",
-        text="Texto original.",
-        date=datetime(2025, 1, 1),
-        travel_diary_id=1
-    )
-    session.add(initial_entry)
-    session.commit()
-    return session, initial_entry.id
-
-@pytest.fixture
-def session_with_multiple_entries(populated_db_session):
-    """Fixture que cria um diário e duas entradas para ele."""
-    session = populated_db_session
-
-    entry1 = Entry(title="Entrada 1", text="Texto 1", date=datetime(2025, 1, 1), travel_diary_id=1)
-    entry2 = Entry(title="Entrada 2", text="Texto 2", date=datetime(2025, 1, 2), travel_diary_id=1)
-
-    session.add_all([entry1, entry2])
-    session.commit()
-
-    return session
-
-def test_create_entry_successfully(populated_db_session):
-    session = populated_db_session
-    service = EntryService(session)
-    diary_id = 1  # Sabemos que o ID é 1 por causa da nossa fixture
-    title = "Primeiro Dia na Praia"
-    text = "O dia foi ensolarado e o mar estava ótimo."
-    date = datetime(2025, 7, 20)
-    photos = [Photo(filepath="/path/to/photo1.jpg",name="Photo 1",photo_hash="hash_12345678",fk_travel_diary_id=diary_id), Photo(filepath="/path/to/photo2.jpg",name="Photo 1",photo_hash="hash_87654321",fk_travel_diary_id=diary_id)]
-    created_entry = service.create(
-        travel_diary_id=diary_id,
-        title=title,
-        text=text,
-        date=date,
-        photos=photos
-    )
-    assert created_entry is not None
-    assert created_entry.id is not None  # Garante que foi salvo no BD e tem um ID
-    assert created_entry.title == title
-    assert created_entry.text == text
-    assert len(created_entry.photos) == 2
-    assert created_entry.photos[0].filepath == "/path/to/photo1.jpg"
-
-    entry_in_db = session.query(Entry).filter_by(id=created_entry.id).one()
-    assert entry_in_db.title == "Primeiro Dia na Praia"
-
-def test_create_entry_fails_when_diary_id_is_invalid(db_session):
-    session = db_session
-    service = EntryService(session)
-    invalid_id = 666
-
-    result = service.create(
-        travel_diary_id=invalid_id,
-        title="Título de Teste",
-        text="Texto de Teste",
-        date=datetime(2025, 7, 20),
-        photos=[]
-    )
-
-    assert result is None
-
-def test_create_entry_successfully_without_photo(populated_db_session):
-    session = populated_db_session
-    service = EntryService(session)
-    diary_id = 1  # Sabemos que o ID é 1 por causa da nossa fixture
-    title = "Primeiro Dia na Praia"
-    text = "O dia foi ensolarado e o mar estava ótimo."
-    date = datetime(2025, 7, 20)
-    photos = []
-    created_entry = service.create(
-        travel_diary_id=diary_id,
-        title=title,
-        text=text,
-        date=date,
-        photos=photos
-    )
-    assert created_entry is not None
-    assert created_entry.id is not None  # Garante que foi salvo no BD e tem um ID
-    assert created_entry.title == title
-    assert created_entry.text == text
-    assert len(created_entry.photos) == 0
-    entry_in_db = session.query(Entry).filter_by(id=created_entry.id).one()
-    assert entry_in_db.title == "Primeiro Dia na Praia"
-
-def test_create_entry_fails_with_null_title(populated_db_session):
-    session = populated_db_session
-    service = EntryService(session)
-    diary_id = 1
-    with pytest.raises(IntegrityError):
-        service.create(
-            travel_diary_id=diary_id,
-            title=None,
-            text="Um texto qualquer.",
-            date=datetime.now(),
-            photos=[]
-        )
-
-def test_create_entry_fails_with_null_date(populated_db_session):
-    session = populated_db_session
-    service = EntryService(session)
-    diary_id = 1
-    with pytest.raises(IntegrityError):
-        service.create(
-            travel_diary_id=diary_id,
-            title="Sabado de sol",
-            text="Um texto qualquer.",
-            date=None,
-            photos=[]
-        )
-
-def test_create_entry_fails_with_null_diary_id(populated_db_session):
-    session = populated_db_session
-    service = EntryService(session)
-    diary_id = 1
-    result = service.create(
-            travel_diary_id=None,
-            title="Sabado de sol",
-            text="Um texto qualquer.",
-            date=datetime.now(),
-            photos=[]
-        )
-    assert result is None
-def test_ready_by_id_successfully(session_with_an_entry):
-    session,_ = session_with_an_entry
-    service = EntryService(session)
-    search_id = 1
-    result = service.read_by_id(search_id)
-    assert result is not None
-def test_ready_by_id_fails_when_id_is_invalid(db_session):
-    session = db_session
-    service = EntryService(session)
-    invalid_id = 666
-    result = service.read_by_id(invalid_id)
-    assert result is None
-
-def test_read_all_returns_all_entries(session_with_multiple_entries):
-    session = session_with_multiple_entries
-    service = EntryService(session)
-    all_entries = service.read_all()
-    assert isinstance(all_entries, list)
-    assert len(all_entries) == 2
-    assert all_entries[0].title == "Entrada 1"
-    assert all_entries[1].title == "Entrada 2"
-
-def test_read_all_returns_empty_list_on_empty_db(db_session):
-    session = db_session
-    service = EntryService(session)
-    all_entries = service.read_all()
-    assert isinstance(all_entries, list)
-    assert len(all_entries) == 0
-
-def test_update_entry_successfully(session_with_an_entry):
-    session, entry_id = session_with_an_entry
-    service = EntryService(session)
-    entry_src = session.query(Entry).filter_by(id=entry_id).one()
-    new_date = datetime(2025, 1, 2)
-    entry_dst = Entry(
-        title="Título Atualizado",
-        text="Texto atualizado.",
-        date=new_date,
-        travel_diary_id=1,  # Mantemos o mesmo travel_diary_id
-        photos=[]
-    )
-    updated_entry = service.update(entry_src, entry_dst)
-    assert updated_entry is not None
-    assert updated_entry.id == entry_id
-    assert updated_entry.title == "Título Atualizado"
-    assert updated_entry.text == "Texto atualizado."
-    entry_in_db = session.query(Entry).filter_by(id=entry_id).one()
-    assert entry_in_db.title == "Título Atualizado"
-
-def test_update_entry_fails_if_entry_does_not_exist(db_session):
-    service = EntryService(db_session)
-    non_existent_entry = Entry(
-        title="dummy",
-        text="dummy",
-        date=datetime.now(),
-        travel_diary_id=1)
-    non_existent_entry.id = 999
-    entry_with_new_data = Entry(title="Novo Título", text="Novo Texto", date=datetime.now(), travel_diary_id=1)
-    result = service.update(non_existent_entry, entry_with_new_data)
-    assert result is None
-
-def test_update_fails_with_null_title(session_with_an_entry):
-    session, entry_id = session_with_an_entry
-    service = EntryService(session)
-    entry_src = session.query(Entry).filter_by(id=entry_id).one()
-    entry_dst = Entry(
-        title=None,
-        text="Texto atualizado.",
-        date=datetime.now(),
-        travel_diary_id=1,
-        photos=[]
-    )
-    with pytest.raises(IntegrityError):
-        service.update(entry_src, entry_dst)
-
-def test_update_fails_with_null_date(session_with_an_entry):
-    session, entry_id = session_with_an_entry
-    service = EntryService(session)
-    entry_src = session.query(Entry).filter_by(id=entry_id).one()
-    entry_dst = Entry(
-        title=entry_src.title,
-        text="Texto atualizado.",
-        date=None,
-        travel_diary_id=1,
-        photos=[]
-    )
-    with pytest.raises(IntegrityError):
-        service.update(entry_src, entry_dst)
-
-def test_update_fails_with_null_diary_id(session_with_an_entry):
-    session, entry_id = session_with_an_entry
-    service = EntryService(session)
-    entry_src = session.query(Entry).filter_by(id=entry_id).one()
-    entry_dst = Entry(
-        title=entry_src.title,
-        text="Texto atualizado.",
-        date=datetime.now(),
-        travel_diary_id=None,
-        photos=[]
-    )
-    with pytest.raises(IntegrityError):
-        service.update(entry_src, entry_dst)
-
-def test_delete_successfully_removes_entry(session_with_an_entry):
-    session, entry_id = session_with_an_entry
-    service = EntryService(session)
-    entry_to_delete = service.read_by_id(entry_id)
-    assert entry_to_delete is not None
-    deleted_entry = service.delete(entry_to_delete)
-    assert deleted_entry is not None
-    assert deleted_entry.id == entry_id
-    entry_in_db = service.read_by_id(entry_id)
-    assert entry_in_db is None
-
-def test_delete_returns_none_if_entry_does_not_exist(db_session):
-    service = EntryService(db_session)
-    non_existent_entry = Entry(
-        title="dummy",
-        text="dummy",
-        date=datetime.now(),
-        travel_diary_id=1)
-    non_existent_entry.id = 999
-    result = service.delete(non_existent_entry)
-    assert result is None

tests/service/test_photo_service.py

@@ -1,249 +0,0 @@
-import pytest
-from pathlib import Path
-
-from pilgrim import TravelDiary
-from pilgrim.service.photo_service import PhotoService
-import hashlib
-from unittest.mock import patch
-from pilgrim.models.photo import Photo
-from pilgrim.utils import DirectoryManager
-
-
-@patch.object(PhotoService, '_copy_photo_to_diary')
-@patch.object(PhotoService, 'hash_file', return_value="fake_hash_123")
-def test_create_photo_successfully(mock_hash, mock_copy, session_with_one_diary):
-    session, diary = session_with_one_diary
-    service = PhotoService(session)
-    fake_source_path = Path("/path/original/imagem.jpg")
-    fake_copied_path = Path(f"~/.pilgrim/diaries/{diary.directory_name}/images/imagem.jpg")
-    mock_copy.return_value = fake_copied_path
-    new_photo = service.create(
-        filepath=fake_source_path,
-        name="Foto da Praia",
-        travel_diary_id=diary.id,
-        caption="Pôr do sol")
-    mock_hash.assert_called_once_with(fake_source_path)
-    mock_copy.assert_called_once_with(fake_source_path, diary)
-    assert new_photo is not None
-    assert new_photo.name == "Foto da Praia"
-    assert new_photo.photo_hash == "fake_hash_123"
-    assert new_photo.filepath == str(fake_copied_path)
-
-def test_hash_file_generates_correct_hash(tmp_path: Path):
-    original_content_bytes = b"um conteudo de teste para o hash"
-    file_on_disk = tmp_path / "test.jpg"
-    file_on_disk.write_bytes(original_content_bytes)
-    hash_from_file = PhotoService.hash_file(file_on_disk)
-    expected_hash_func = hashlib.new('sha3_384')
-    expected_hash_func.update(original_content_bytes)
-    hash_from_memory = expected_hash_func.hexdigest()
-    assert hash_from_file == hash_from_memory
-
-@patch.object(PhotoService, '_copy_photo_to_diary')
-@patch.object(PhotoService, 'hash_file', return_value="hash_ja_existente")
-def test_create_photo_returns_none_if_hash_exists(mock_hash, mock_copy, session_with_one_diary):
-    session, diary = session_with_one_diary
-    existing_photo = Photo(
-        filepath="/path/existente.jpg", name="Foto Antiga",
-        photo_hash="hash_ja_existente", fk_travel_diary_id=diary.id
-    )
-    session.add(existing_photo)
-    session.commit()
-
-    service = PhotoService(session)
-    new_photo = service.create(
-        filepath=Path("/path/novo/arquivo.jpg"),
-        name="Foto Nova",
-        travel_diary_id=diary.id
-    )
-    assert new_photo is None
-    mock_copy.assert_not_called()
-
-def test_read_by_id_successfully(session_with_photos):
-    session, photos = session_with_photos
-    service = PhotoService(session)
-    photo_to_find_id = photos[0].id
-    found_photo = service.read_by_id(photo_to_find_id)
-    assert found_photo is not None
-    assert found_photo.id == photo_to_find_id
-    assert found_photo.name == "Foto 1"
-
-def test_read_by_id_returns_none_for_invalid_id(db_session):
-    service = PhotoService(db_session)
-    result = service.read_by_id(999)
-    assert result is None
-
-def test_read_all_returns_all_photos(session_with_photos):
-    session, _ = session_with_photos
-    service = PhotoService(session)
-    all_photos = service.read_all()
-
-    assert isinstance(all_photos, list)
-    assert len(all_photos) == 2
-    assert all_photos[0].name == "Foto 1"
-    assert all_photos[1].name == "Foto 2"
-
-def test_read_all_returns_empty_list_for_empty_db(db_session):
-    service = PhotoService(db_session)
-    all_photos = service.read_all()
-    assert isinstance(all_photos, list)
-    assert len(all_photos) == 0
-
-def test_check_photo_by_hash_finds_existing_photo(session_with_photos):
-    session, photos = session_with_photos
-    service = PhotoService(session)
-    existing_photo = photos[0]
-    hash_to_find = existing_photo.photo_hash  # "hash1"
-    diary_id = existing_photo.fk_travel_diary_id  # 1
-    found_photo = service.check_photo_by_hash(hash_to_find, diary_id)
-    assert found_photo is not None
-    assert found_photo.id == existing_photo.id
-    assert found_photo.photo_hash == hash_to_find
-
-def test_check_photo_by_hash_returns_none_when_not_found(session_with_photos):
-    session, photos = session_with_photos
-    service = PhotoService(session)
-    existing_hash = photos[0].photo_hash  # "hash1"
-    existing_diary_id = photos[0].fk_travel_diary_id  # 1
-    result1 = service.check_photo_by_hash("hash_inexistente", existing_diary_id)
-    assert result1 is None
-    invalid_diary_id = 999
-    result2 = service.check_photo_by_hash(existing_hash, invalid_diary_id)
-    assert result2 is None
-
-def test_update_photo_metadata_successfully(session_with_photos):
-    session, photos = session_with_photos
-    service = PhotoService(session)
-    photo_to_update = photos[0]
-    photo_with_new_data = Photo(
-        filepath=photo_to_update.filepath,
-        name="Novo Nome da Foto",
-        caption="Nova legenda para a foto.",
-        photo_hash=photo_to_update.photo_hash,  # O hash não muda
-        addition_date=photo_to_update.addition_date,
-        fk_travel_diary_id=photo_to_update.fk_travel_diary_id
-    )
-    updated_photo = service.update(photo_to_update, photo_with_new_data)
-    assert updated_photo is not None
-    assert updated_photo.name == "Novo Nome da Foto"
-    assert updated_photo.caption == "Nova legenda para a foto."
-    assert updated_photo.photo_hash == photo_to_update.photo_hash
-    photo_in_db = session.query(Photo).get(photo_to_update.id)
-    assert photo_in_db.name == "Novo Nome da Foto"
-
-
-@patch.object(PhotoService, 'hash_file')
-@patch('pathlib.Path.unlink')
-@patch('pathlib.Path.exists')
-@patch.object(PhotoService, '_copy_photo_to_diary')
-@patch.object(DirectoryManager, 'get_diaries_root', return_value="/fake/diaries_root")
-def test_update_photo_with_new_file_successfully(
-    mock_get_root, mock_copy, mock_exists, mock_unlink, mock_hash, session_with_photos
-):
-    session, photos = session_with_photos
-    service = PhotoService(session)
-    photo_to_update = photos[0]
-    new_source_path = Path("/path/para/nova_imagem.jpg")
-    new_copied_path = Path(f"/fake/diaries_root/{photo_to_update.travel_diary.directory_name}/images/nova_imagem.jpg")
-
-    mock_copy.return_value = new_copied_path
-    mock_exists.return_value = True
-    mock_hash.return_value = "novo_hash_calculado"
-    photo_with_new_file = Photo(
-        filepath=new_source_path,
-        name=photo_to_update.name,
-        photo_hash="hash_antigo",
-        fk_travel_diary_id=photo_to_update.fk_travel_diary_id
-    )
-    updated_photo = service.update(photo_to_update, photo_with_new_file)
-    mock_copy.assert_called_once_with(new_source_path, photo_to_update.travel_diary)
-    mock_unlink.assert_called_once()
-    mock_hash.assert_called_once_with(new_copied_path)
-    assert updated_photo.filepath == str(new_copied_path)
-    assert updated_photo.photo_hash == "novo_hash_calculado"
-
-def test_update_photo_returns_none_if_photo_does_not_exist(db_session):
-    service = PhotoService(db_session)
-    non_existent_photo_src = Photo(
-        filepath="/fake/path.jpg", name="dummy",
-        photo_hash="dummy", fk_travel_diary_id=1
-    )
-    non_existent_photo_src.id = 999
-    photo_with_new_data = Photo(
-        filepath="/fake/new.jpg", name="new dummy",
-        photo_hash="new_dummy", fk_travel_diary_id=1
-    )
-    result = service.update(non_existent_photo_src, photo_with_new_data)
-    assert result is None
-
-
-@patch.object(PhotoService, 'hash_file')
-@patch('pathlib.Path.unlink')
-@patch('pathlib.Path.exists')
-@patch.object(PhotoService, '_copy_photo_to_diary')
-@patch.object(DirectoryManager, 'get_diaries_root', return_value="/fake/diaries_root")
-def test_update_photo_with_new_file_successfully(
-    mock_get_root, mock_copy, mock_exists, mock_unlink, mock_hash, session_with_photos
-):
-    session, photos = session_with_photos
-    service = PhotoService(session)
-    photo_to_update = photos[0]
-    new_source_path = Path("/path/para/nova_imagem.jpg")
-    new_copied_path = Path(f"/fake/diaries_root/{photo_to_update.travel_diary.directory_name}/images/nova_imagem.jpg")
-    mock_copy.return_value = new_copied_path
-    mock_exists.return_value = True
-    mock_hash.return_value = "novo_hash_calculado"
-    photo_with_new_file = Photo(
-        filepath=new_source_path, name=photo_to_update.name,
-        photo_hash="hash_antigo", fk_travel_diary_id=photo_to_update.fk_travel_diary_id
-    )
-    updated_photo = service.update(photo_to_update, photo_with_new_file)
-    mock_copy.assert_called_once_with(new_source_path, photo_to_update.travel_diary)
-    mock_unlink.assert_called_once()
-    mock_hash.assert_called_once_with(new_copied_path)
-
-    assert updated_photo.filepath == str(new_copied_path)
-    assert updated_photo.photo_hash == "novo_hash_calculado"
-
-@patch.object(DirectoryManager, 'get_diary_images_directory')
-def test_copy_photo_to_diary_handles_name_collision_with_patch(mock_get_images_dir, db_session, tmp_path: Path):
-    images_dir = tmp_path / "images"
-    images_dir.mkdir()
-    mock_get_images_dir.return_value = images_dir
-    source_file = tmp_path / "foto.jpg"
-    source_file.touch()
-    (images_dir / "foto.jpg").touch()
-    service = PhotoService(db_session)
-    fake_diary = TravelDiary(name="test",directory_name="fake_diary")
-    copied_path = service._copy_photo_to_diary(source_file, fake_diary)
-    assert copied_path.name == "foto_1.jpg"
-    assert copied_path.exists()
-
-@patch('pathlib.Path.unlink')
-@patch('pathlib.Path.exists')
-@patch.object(DirectoryManager, 'get_diaries_root', return_value="/fake/diaries_root")
-def test_delete_photo_successfully(mock_get_root, mock_exists, mock_unlink, session_with_photos):
-    session, photos = session_with_photos
-    service = PhotoService(session)
-    photo_to_delete = photos[0]
-    photo_id = photo_to_delete.id
-    mock_exists.return_value = True
-    deleted_photo_data = service.delete(photo_to_delete)
-    mock_unlink.assert_called_once()
-    assert deleted_photo_data is not None
-    assert deleted_photo_data.id == photo_id
-    photo_in_db = service.read_by_id(photo_id)
-    assert photo_in_db is None
-
-@patch('pathlib.Path.unlink')
-def test_delete_returns_none_for_non_existent_photo(mock_unlink, db_session):
-    service = PhotoService(db_session)
-    non_existent_photo = Photo(
-        filepath="/fake/path.jpg", name="dummy",
-        photo_hash="dummy_hash", fk_travel_diary_id=1
-    )
-    non_existent_photo.id = 999
-    result = service.delete(non_existent_photo)
-    assert result is None
-    mock_unlink.assert_not_called()
-

tests/service/test_service_manager.py

@@ -1,33 +0,0 @@
-from pilgrim.service.servicemanager import ServiceManager
-from unittest.mock import patch, MagicMock
-
-def test_initial_state_is_none():
-    manager = ServiceManager()
-    assert manager.get_session() is None
-    assert manager.get_entry_service() is None
-    assert manager.get_photo_service() is None
-    assert manager.get_travel_diary_service() is None
-
-@patch('pilgrim.service.servicemanager.TravelDiaryService')
-@patch('pilgrim.service.servicemanager.PhotoService')
-@patch('pilgrim.service.servicemanager.EntryService')
-def test_get_services_instantiates_with_correct_session(
-    mock_entry_service, mock_photo_service, mock_travel_diary_service
-):
-    manager = ServiceManager()
-    mock_session = MagicMock()
-    manager.set_session(mock_session)
-
-    entry_service_instance = manager.get_entry_service()
-    photo_service_instance = manager.get_photo_service()
-    travel_diary_service_instance = manager.get_travel_diary_service()
-
-    mock_entry_service.assert_called_once()
-    mock_photo_service.assert_called_once()
-    mock_travel_diary_service.assert_called_once()
-    mock_entry_service.assert_called_once_with(mock_session)
-    mock_photo_service.assert_called_once_with(mock_session)
-    mock_travel_diary_service.assert_called_once_with(mock_session)
-    assert entry_service_instance == mock_entry_service.return_value
-    assert photo_service_instance == mock_photo_service.return_value
-    assert travel_diary_service_instance == mock_travel_diary_service.return_value

tests/service/test_travel_diary_service.py

@@ -1,143 +0,0 @@
-from unittest.mock import patch, MagicMock
-from pathlib import Path
-
-import pytest
-
-from pilgrim import TravelDiary
-from pilgrim.service.travel_diary_service import TravelDiaryService
-
-@patch.object(TravelDiaryService, '_ensure_diary_directory')
-@pytest.mark.asyncio # Marca o teste para rodar código assíncrono
-async def test_create_diary_successfully(mock_ensure_dir, db_session):
-    service = TravelDiaryService(db_session)
-    new_diary = await service.async_create("Viagem para a Serra")
-    assert new_diary is not None
-    assert new_diary.id is not None
-    assert new_diary.name == "Viagem para a Serra"
-    assert new_diary.directory_name == "viagem_para_a_serra"
-
-@patch.object(TravelDiaryService, '_ensure_diary_directory')
-@patch.object(TravelDiaryService, '_sanitize_directory_name', return_value="nome_existente")
-@pytest.mark.asyncio
-async def test_create_diary_handles_integrity_error(mock_sanitize, mock_ensure_dir, db_session):
-    existing_diary = TravelDiary(name="Diário Antigo", directory_name="nome_existente")
-    db_session.add(existing_diary)
-    db_session.commit()
-    service = TravelDiaryService(db_session)
-    with pytest.raises(ValueError, match="Could not create diary"):
-        await service.async_create("Qualquer Nome Novo")
-    mock_ensure_dir.assert_not_called()
-
-@patch.object(TravelDiaryService, '_ensure_diary_directory')
-def test_read_by_id_successfully(mock_ensure_dir, session_with_one_diary):
-    session, diary_to_find = session_with_one_diary
-    service = TravelDiaryService(session)
-    found_diary = service.read_by_id(diary_to_find.id)
-    assert found_diary is not None
-    assert found_diary.id == diary_to_find.id
-    assert found_diary.name == "Diário de Teste"
-    mock_ensure_dir.assert_called_once_with(found_diary)
-
-@patch.object(TravelDiaryService, '_ensure_diary_directory')
-def test_read_by_id_returns_none_for_invalid_id(mock_ensure_dir, db_session):
-    service = TravelDiaryService(db_session)
-    result = service.read_by_id(999)
-    assert result is None
-    mock_ensure_dir.assert_not_called()
-
-@patch.object(TravelDiaryService, '_ensure_diary_directory')
-def test_read_all_returns_all_diaries(mock_ensure_dir, db_session):
-    d1 = TravelDiary(name="Diário 1", directory_name="d1")
-    d2 = TravelDiary(name="Diário 2", directory_name="d2")
-    db_session.add_all([d1, d2])
-    db_session.commit()
-    service = TravelDiaryService(db_session)
-    diaries = service.read_all()
-    assert isinstance(diaries, list)
-    assert len(diaries) == 2
-    assert mock_ensure_dir.call_count == 2
-
-@patch.object(TravelDiaryService, '_ensure_diary_directory')
-def test_read_all_returns_empty_list_for_empty_db(mock_ensure_dir, db_session):
-    service = TravelDiaryService(db_session)
-    diaries = service.read_all()
-    assert isinstance(diaries, list)
-    assert len(diaries) == 0
-    mock_ensure_dir.assert_not_called()
-
-@patch.object(TravelDiaryService, '_ensure_diary_directory')
-@patch('pathlib.Path.rename')
-@patch.object(TravelDiaryService, '_get_diary_directory')
-def test_update_diary_successfully(mock_get_dir, mock_path_rename, mock_ensure, session_with_one_diary):
-    session, diary_to_update = session_with_one_diary
-    service = TravelDiaryService(session)
-    old_path = MagicMock(spec=Path)  # Um mock que se parece com um objeto Path
-    old_path.exists.return_value = True  # Dizemos que o diretório antigo "existe"
-    new_path = Path("/fake/path/diario_atualizado")
-    mock_get_dir.side_effect = [old_path, new_path]
-    updated_diary = service.update(diary_to_update.id, "Diário Atualizado")
-    assert updated_diary is not None
-    assert updated_diary.name == "Diário Atualizado"
-    assert updated_diary.directory_name == "diario_atualizado"
-    old_path.rename.assert_called_once_with(new_path)
-
-def test_update_returns_none_for_invalid_id(db_session):
-    service = TravelDiaryService(db_session)
-    result = service.update(travel_diary_id=999, name="Nome Novo")
-    assert result is None
-
-@patch.object(TravelDiaryService, '_cleanup_diary_directory')
-def test_delete_diary_successfully(mock_cleanup, session_with_one_diary):
-    session, diary_to_delete = session_with_one_diary
-    service = TravelDiaryService(session)
-    result = service.delete(diary_to_delete)
-    assert result is not None
-    assert result.id == diary_to_delete.id
-    mock_cleanup.assert_called_once_with(diary_to_delete)
-    diary_in_db = service.read_by_id(diary_to_delete.id)
-    assert diary_in_db is None
-
-@patch.object(TravelDiaryService, '_cleanup_diary_directory')
-def test_delete_returns_none_for_non_existent_diary(mock_cleanup, db_session):
-    service = TravelDiaryService(db_session)
-    non_existent_diary = TravelDiary(name="dummy", directory_name="dummy")
-    non_existent_diary.id = 999
-    result = service.delete(non_existent_diary)
-    assert result is None
-    mock_cleanup.assert_not_called()
-
-@patch.object(TravelDiaryService, '_sanitize_directory_name')
-def test_update_raises_value_error_on_name_collision(mock_sanitize, db_session):
-
-    d1 = TravelDiary(name="Diário A", directory_name="diario_a")
-    d2 = TravelDiary(name="Diário B", directory_name="diario_b")
-    db_session.add_all([d1, d2])
-    db_session.commit()
-    db_session.refresh(d1)
-    mock_sanitize.return_value = "diario_b"
-    service = TravelDiaryService(db_session)
-    with pytest.raises(ValueError, match="Could not update diary"):
-        service.update(d1.id, "Diário B")
-
-def test_sanitize_directory_name_formats_string_correctly(db_session):
-    service = TravelDiaryService(db_session)
-    name1 = "Minha Primeira Viagem"
-    assert service._sanitize_directory_name(name1) == "minha_primeira_viagem"
-    name2 = "Viagem para o #Rio de Janeiro! @2025"
-    assert service._sanitize_directory_name(name2) == "viagem_para_o_rio_de_janeiro_2025"
-    name3 = "  Mochilão na Europa   "
-    assert service._sanitize_directory_name(name3) == "mochilao_na_europa"
-
-def test_sanitize_directory_name_handles_uniqueness(db_session):
-    existing_diary = TravelDiary(name="Viagem para a Praia", directory_name="viagem_para_a_praia")
-    db_session.add(existing_diary)
-    db_session.commit()
-    service = TravelDiaryService(db_session)
-    new_sanitized_name = service._sanitize_directory_name("Viagem para a Praia")
-    assert new_sanitized_name == "viagem_para_a_praia_1"
-    another_diary = TravelDiary(name="Outra Viagem", directory_name="viagem_para_a_praia_1")
-    db_session.add(another_diary)
-    db_session.commit()
-
-    third_sanitized_name = service._sanitize_directory_name("Viagem para a Praia")
-    assert third_sanitized_name == "viagem_para_a_praia_2"

tests/test_application.py

@@ -1,56 +0,0 @@
-from unittest.mock import patch, MagicMock
-from pilgrim.application import Application
-
-@patch('pilgrim.application.UIApp')
-@patch('pilgrim.application.ServiceManager')
-@patch('pilgrim.application.Database')
-@patch('pilgrim.application.ConfigManager')
-def test_application_initialization_wires_dependencies(
-    MockConfigManager, MockDatabase, MockServiceManager, MockUIApp
-):
-    mock_config_instance = MockConfigManager.return_value
-    mock_db_instance = MockDatabase.return_value
-    mock_session_instance = mock_db_instance.session.return_value
-    mock_service_manager_instance = MockServiceManager.return_value
-    app = Application()
-    MockConfigManager.assert_called_once()
-    MockDatabase.assert_called_once_with(mock_config_instance)
-    MockServiceManager.assert_called_once()
-    MockUIApp.assert_called_once_with(mock_service_manager_instance, mock_config_instance)
-    mock_config_instance.read_config.assert_called_once()
-    mock_db_instance.session.assert_called_once()
-    mock_service_manager_instance.set_session.assert_called_once_with(mock_session_instance)
-
-@patch('pilgrim.application.UIApp')
-@patch('pilgrim.application.ServiceManager')
-@patch('pilgrim.application.Database')
-@patch('pilgrim.application.ConfigManager')
-def test_application_run_calls_methods(
-    MockConfigManager, MockDatabase, MockServiceManager, MockUIApp
-):
-    app = Application()
-    mock_db_instance = app.database
-    mock_ui_instance = app.ui
-    app.run()
-    mock_db_instance.create.assert_called_once()
-    mock_ui_instance.run.assert_called_once()
-
-@patch('pilgrim.application.UIApp')
-@patch('pilgrim.application.ServiceManager')
-@patch('pilgrim.application.Database')
-@patch('pilgrim.application.ConfigManager')
-def test_get_service_manager_creates_and_configures_new_instance(
-    MockConfigManager, MockDatabase, MockServiceManager, MockUIApp
-):
-    app = Application()
-    mock_db_instance = app.database
-    fake_session = MagicMock()
-    mock_db_instance.session.return_value = fake_session
-    mock_db_instance.reset_mock()
-    MockServiceManager.reset_mock()
-    returned_manager = app.get_service_manager()
-    mock_db_instance.session.assert_called_once()
-    MockServiceManager.assert_called_once()
-    returned_manager.set_session.assert_called_once_with(fake_session)
-
-    assert returned_manager is MockServiceManager.return_value

tests/test_command.py

@@ -1,9 +0,0 @@
-from unittest.mock import patch
-from pilgrim.command import main
-
-@patch('pilgrim.command.Application')
-def test_main_function_runs_application(MockApplication):
-    mock_app_instance = MockApplication.return_value
-    main()
-    MockApplication.assert_called_once()
-    mock_app_instance.run.assert_called_once()

tests/test_database.py

@@ -1,40 +0,0 @@
-import pytest
-from unittest.mock import Mock  # A ferramenta para criar nosso "dublê"
-from pathlib import Path
-from sqlalchemy import inspect, Column, Integer, String
-from sqlalchemy.orm import Session
-
-from pilgrim.database import Database,Base
-
-class MockUser(Base):
-    __tablename__ = 'mock_users'
-    id = Column(Integer, primary_key=True)
-    name = Column(String)
-
-@pytest.fixture
-def db_instance(tmp_path: Path):
-    fake_db_path = tmp_path / "test_pilgrim.db"
-    mock_config_manager = Mock()
-    mock_config_manager.database_url = str(fake_db_path)
-    db = Database(mock_config_manager)
-    return db, fake_db_path
-
-def test_create_database(db_instance):
-    db, fake_db_path = db_instance
-    db.create()
-    assert fake_db_path.exists()
-
-def test_table_creation(db_instance):
-    db, _ = db_instance
-    db.create()
-    inspector = inspect(db.engine)
-    assert "mock_users" in inspector.get_table_names()
-
-def test_session_returned_corectly(db_instance):
-    db, _ = db_instance
-    session = db.session()
-    assert isinstance(session, Session)
-    session.close()
-
-
-

tests/utils/test_config_manager.py

@@ -1,67 +0,0 @@
-import pytest
-import tomli
-from pathlib import Path
-from unittest.mock import patch
-
-from pilgrim.utils.config_manager import ConfigManager, SingletonMeta
-from pilgrim.utils.directory_manager import DirectoryManager
-
-@pytest.fixture
-def clean_singleton():
-    SingletonMeta._instances = {}
-
-@patch('pilgrim.utils.config_manager.DirectoryManager.get_config_directory')
-def test_create_default_config_if_not_exists_with_decorator(mock_get_config_dir, tmp_path: Path, clean_singleton):
-    mock_get_config_dir.return_value = str(tmp_path)
-    manager = ConfigManager()
-    config_file = tmp_path / "config.toml"
-    assert not config_file.exists()
-    manager.read_config()
-    assert config_file.exists()
-    assert manager.database_type == "sqlite"
-
-@patch('pilgrim.utils.config_manager.DirectoryManager.get_config_directory')
-def test_read_existing_config_with_decorator(mock_get_config_dir, tmp_path: Path, clean_singleton):
-    mock_get_config_dir.return_value = str(tmp_path)
-    custom_config_content = """
-    [database]
-    url = "/custom/path/to/db.sqlite"
-    type = "custom_sqlite"
-    [settings.diary]
-    auto_open_diary_on_startup = "MyCustomDiary"
-    auto_open_on_creation = true
-    """
-    config_file = tmp_path / "config.toml"
-    config_file.write_text(custom_config_content)
-
-    manager = ConfigManager()
-    manager.read_config()
-    assert manager.database_url == "/custom/path/to/db.sqlite"
-    assert manager.database_type == "custom_sqlite"
-
-@patch('pilgrim.utils.config_manager.DirectoryManager.get_config_directory')
-def test_save_config_writes_changes_to_file_with_decorator(mock_get_config_dir, tmp_path: Path, clean_singleton):
-    mock_get_config_dir.return_value = str(tmp_path)
-    manager = ConfigManager()
-    manager.read_config()
-    manager.set_database_url("/novo/caminho.db")
-    manager.set_auto_open_new_diary(True)
-    manager.save_config()
-    config_file = tmp_path / "config.toml"
-    with open(config_file, "rb") as f:
-        data = tomli.load(f)
-        assert data["database"]["url"] == "/novo/caminho.db"
-        assert data["settings"]["diary"]["auto_open_on_creation"] is True
-
-@patch('pilgrim.utils.config_manager.DirectoryManager.get_config_directory')
-def test_read_config_raises_error_on_malformed_toml(mock_get_config_dir, tmp_path: Path, clean_singleton):
-    mock_get_config_dir.return_value = str(tmp_path)
-    invalid_toml_content = """
-       [database]
-       url = /caminho/sem/aspas
-       """
-    config_file = tmp_path / "config.toml"
-    config_file.write_text(invalid_toml_content)
-    manager = ConfigManager()
-    with pytest.raises(ValueError, match="Invalid TOML configuration"):
-        manager.read_config()

tests/utils/test_directory_manager.py

@@ -1,71 +0,0 @@
-import shutil
-from pathlib import Path
-from unittest.mock import patch
-import pytest
-
-from pilgrim.utils.directory_manager import DirectoryManager
-
-@patch('os.chmod')
-@patch('pathlib.Path.home')
-def test_get_config_directory_creates_dir_in_fake_home(mock_home, mock_chmod, tmp_path: Path):
-    mock_home.return_value = tmp_path
-
-    expected_config_dir = tmp_path / ".pilgrim"
-    assert not expected_config_dir.exists()
-    result_path = DirectoryManager.get_config_directory()
-    assert result_path == expected_config_dir
-    assert expected_config_dir.exists()
-    mock_chmod.assert_called_once_with(expected_config_dir, 0o700)
-
-@patch('shutil.copy2')
-@patch('pathlib.Path.home')
-def test_get_database_path_no_migration(mock_home, mock_copy, tmp_path: Path):
-    mock_home.return_value = tmp_path
-    expected_db_path = tmp_path / ".pilgrim" / "database.db"
-    result_path = DirectoryManager.get_database_path()
-    assert result_path == expected_db_path
-    mock_copy.assert_not_called()
-
-@patch('shutil.copy2')
-@patch('pathlib.Path.home')
-def test_get_database_path_with_migration(mock_home, mock_copy, tmp_path: Path, monkeypatch):
-    fake_home_dir = tmp_path / "home"
-    fake_project_dir = tmp_path / "project"
-    fake_home_dir.mkdir()
-    fake_project_dir.mkdir()
-
-    (fake_project_dir / "database.db").touch()
-    mock_home.return_value = fake_home_dir
-    monkeypatch.chdir(fake_project_dir)
-    result_path = DirectoryManager.get_database_path()
-    expected_db_path = fake_home_dir / ".pilgrim" / "database.db"
-    assert result_path == expected_db_path
-
-    mock_copy.assert_called_once_with(
-        Path("database.db"),
-        expected_db_path
-    )
-
-@patch('os.chmod')
-@patch('pathlib.Path.home')
-def test_diary_path_methods_construct_correctly(mock_home, mock_chmod, tmp_path: Path):
-    mock_home.return_value = tmp_path
-    images_path = DirectoryManager.get_diary_images_directory("minha-viagem")
-    expected_path = tmp_path / ".pilgrim" / "diaries" / "minha-viagem" / "data" / "images"
-    assert images_path == expected_path
-    assert (tmp_path / ".pilgrim" / "diaries").exists()
-
-@patch('shutil.copy2')
-@patch('pathlib.Path.home')
-def test_get_database_path_handles_migration_error(mock_home, mock_copy, tmp_path: Path, monkeypatch):
-    fake_home_dir = tmp_path / "home"
-    fake_project_dir = tmp_path / "project"
-    fake_home_dir.mkdir()
-    fake_project_dir.mkdir()
-    (fake_project_dir / "database.db").touch()
-    mock_home.return_value = fake_home_dir
-    mock_copy.side_effect = shutil.Error("O disco está cheio!")
-    monkeypatch.chdir(fake_project_dir)
-    with pytest.raises(RuntimeError, match="Failed to migrate database"):
-        DirectoryManager.get_database_path()
-    mock_copy.assert_called_once()