diff --git a/CHANGELOG.md b/CHANGELOG.md index ff3e8f0..11a17f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,63 +6,84 @@ The format is based on Keep a Changelog, and this project adheres to Semantic Ve ## Unreleased ## Planned -* Installation Method 1 (repository compilation) +* Restore from backup functionality * Organization of trips by date, location, or theme * Enhanced photo management features * Search functionality * Export features -* Testing implementation +* UI Testing with Textual Pilot + +## [0.0.5] - 2025-07-24 + +### Added +* **Backup Feature:** Introduced a full backup feature to export the database and all photos to a single ZIP file. +* **Diary Settings Screen:** Added a dedicated settings screen per diary, accessible with the 's' key from the diary list. +* **Advanced Deletion Options:** The new settings screen allows for deleting the entire diary, all of its entries, or all of its photos. +* **Confirmation Modals:** Added confirmation modals that require the user to type the diary's name to proceed with critical delete operations, preventing accidental data loss. +* **Comprehensive Test Suite:** Implemented a robust unit and integration test suite for the entire backend (services, models, utils, application), achieving high code coverage and ensuring stability. + +### Changed +* **Architectural Refactor:** Service methods were refactored to be transactional, allowing for more complex operations to be executed safely and atomically. +* **Configuration:** The "auto-open diary on startup" setting is now managed and persisted via the `config.toml` file. +* **Project Structure:** Standardized project metadata and build configuration in `pyproject.toml` and converted all imports to use a consistent absolute path structure. + +### Fixed +* **Directory Name Sanitization:** Fixed a bug where directory names were not correctly sanitized, now properly handling accented and special characters by using transliteration. +* **Data Integrity:** Enforced `NOT NULL` constraints on `title` and `date` fields for entries in the database, preventing the creation of entries with invalid data. + +### Removed +* **Obsolete Mocks:** Removed old and unused mock service files from the production codebase. ## [0.0.4] - 2025-07-19 ### Added -* Support for creating new diaries asynchronously, with an option to automatically open the newly created diary -* Unified "Enter" key support for saving or creating diaries across relevant modals -* Automatic diary list refresh when returning to the diary screen -* Application configuration management with a new centralized config system -* Database location and initialization now configurable via the new config manager -* 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 +* Support for creating new diaries asynchronously, with an option to automatically open the newly created diary. +* Unified "Enter" key support for saving or creating diaries across relevant modals. +* Automatic diary list refresh when returning to the diary screen. +* Application configuration management with a new centralized config system. +* Database location and initialization now configurable via the new config manager. +* 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 +* 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 +* 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 -* Create and edit diary entries -* Photo ingestion system -* Photo addition and reference via sidebar -* Text User Interface (TUI) built with Textual framework -* Pre-compiled binary installation method (Method 2) -* Support for Linux operating systems -* Basic project documentation (README) +* Initial alpha release of Pilgrim travel diary application. +* Create and edit travel diaries. +* Create and edit diary entries. +* Photo ingestion system. +* Photo addition and reference via sidebar. +* Text User Interface (TUI) built with Textual framework. +* Pre-compiled binary installation method (Method 2). +* Support for Linux operating systems. +* Basic project documentation (README). ### Known Issues -* Installation Method 1 not yet implemented -* No testing suite implemented yet -* Some features may be unstable in an alpha version +* Installation Method 1 not yet implemented. +* No testing suite implemented yet. +* Some features may be unstable in an alpha version. diff --git a/pyproject.toml b/pyproject.toml index 0a1b086..d0c4757 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,36 +1,32 @@ - [build-system] - requires = ["hatchling"] - build-backend = "hatchling.build" +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" +[project] +name = "pilgrim" +version = "0.0.5" +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] - 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" +[project.urls] +Homepage = "https://github.com/gmbrax/Pilgrim/" +Issues = "https://github.com/gmbrax/Pilgrim/issues" - - ] - [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" +[project.scripts] +pilgrim = "pilgrim.command:main" \ No newline at end of file diff --git a/src/pilgrim/database.py b/src/pilgrim/database.py index 8d472af..003e5d9 100644 --- a/src/pilgrim/database.py +++ b/src/pilgrim/database.py @@ -1,9 +1,7 @@ from sqlalchemy import create_engine -from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import declarative_base from sqlalchemy.orm import sessionmaker -from pathlib import Path import os -import shutil from pilgrim.utils import ConfigManager diff --git a/src/pilgrim/models/entry.py b/src/pilgrim/models/entry.py index dac87b0..7ae7abd 100644 --- a/src/pilgrim/models/entry.py +++ b/src/pilgrim/models/entry.py @@ -1,18 +1,20 @@ -from typing import Any +from typing import Any, List +from pilgrim.models.photo import Photo from pilgrim.models.photo_in_entry import photo_entry_association from sqlalchemy import Column, Integer, String, ForeignKey, DateTime from sqlalchemy.orm import relationship -from ..database import Base +from pilgrim.database import Base + class Entry(Base): __tablename__ = "entries" id = Column(Integer, primary_key=True) - title = Column(String) + title = Column(String,nullable=False) text = Column(String) - date = Column(DateTime) + date = Column(DateTime,nullable=False) photos = relationship( "Photo", secondary=photo_entry_association, @@ -20,9 +22,12 @@ class Entry(Base): fk_travel_diary_id = Column(Integer, ForeignKey("travel_diaries.id"), nullable=False) travel_diary = relationship("TravelDiary", back_populates="entries") - def __init__(self, title: str, text: str, date: str, travel_diary_id: int, **kw: Any): + def __init__(self, title: str, text: str, date: Any, travel_diary_id: int, photos: List[Photo] = None, **kw: Any): super().__init__(**kw) self.title = title self.text = text self.date = date self.fk_travel_diary_id = travel_diary_id + if photos is not None: + self.photos = photos + diff --git a/src/pilgrim/models/photo.py b/src/pilgrim/models/photo.py index 3a1ac9b..88fc5a2 100644 --- a/src/pilgrim/models/photo.py +++ b/src/pilgrim/models/photo.py @@ -7,7 +7,8 @@ from sqlalchemy.orm import relationship from sqlalchemy.sql.schema import Index from pilgrim.models.photo_in_entry import photo_entry_association -from ..database import Base +from pilgrim.database import Base + class Photo(Base): @@ -24,7 +25,8 @@ 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'), ) diff --git a/src/pilgrim/models/photo_in_entry.py b/src/pilgrim/models/photo_in_entry.py index 76f452e..8e9d677 100644 --- a/src/pilgrim/models/photo_in_entry.py +++ b/src/pilgrim/models/photo_in_entry.py @@ -1,6 +1,6 @@ from sqlalchemy import Table, Column, Integer, ForeignKey -from ..database import Base +from pilgrim.database import Base photo_entry_association = Table('photo_entry_association', Base.metadata, Column('id', Integer, primary_key=True, autoincrement=True), diff --git a/src/pilgrim/models/travel_diary.py b/src/pilgrim/models/travel_diary.py index 1164bc4..90a89b5 100644 --- a/src/pilgrim/models/travel_diary.py +++ b/src/pilgrim/models/travel_diary.py @@ -3,15 +3,17 @@ from typing import Any from sqlalchemy import Column, Integer, String, UniqueConstraint from sqlalchemy.orm import relationship -from .. import database +from pilgrim.database import Base -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'), diff --git a/src/pilgrim/service/backup_service.py b/src/pilgrim/service/backup_service.py new file mode 100644 index 0000000..95879af --- /dev/null +++ b/src/pilgrim/service/backup_service.py @@ -0,0 +1,34 @@ +import zipfile + + +from pilgrim.utils.directory_manager import DirectoryManager + + +class BackupService: + def __init__(self, session): + self.session = session + + def create_backup(self): + db_path = DirectoryManager.get_database_path() + if not db_path.exists(): + raise FileNotFoundError("No Database Found") + + with self.session.connection() as conn: + raw_conn = conn.connection + dump = "\n".join(line for line in raw_conn.iterdump()) + + filename = DirectoryManager.get_config_directory() / "backup.zip" + diaries_root_path = DirectoryManager.get_diaries_root() + + try: + with zipfile.ZipFile(filename, "w",zipfile.ZIP_DEFLATED) as zipf: + zipf.writestr("database.sql", dump) + if diaries_root_path.exists(): + for file_path in diaries_root_path.rglob('*'): + if file_path.is_file(): + arcname = file_path.relative_to(diaries_root_path.parent) + zipf.write(file_path, arcname=arcname) + return True, filename + except Exception as e: + return False, str(e) + diff --git a/src/pilgrim/service/entry_service.py b/src/pilgrim/service/entry_service.py index 040f5a8..1d6f476 100644 --- a/src/pilgrim/service/entry_service.py +++ b/src/pilgrim/service/entry_service.py @@ -1,9 +1,10 @@ +import re from datetime import datetime from typing import List -from ..models.entry import Entry -from ..models.travel_diary import TravelDiary -from ..models.photo import Photo # ✨ Importe o modelo Photo +from pilgrim.models.entry import Entry +from pilgrim.models.travel_diary import TravelDiary +from pilgrim.models.photo import Photo # ✨ Importe o modelo Photo class EntryService: @@ -54,3 +55,24 @@ 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 diff --git a/src/pilgrim/service/mocks/__init__.py b/src/pilgrim/service/mocks/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/pilgrim/service/mocks/entry_service_mock.py b/src/pilgrim/service/mocks/entry_service_mock.py deleted file mode 100644 index b78f59e..0000000 --- a/src/pilgrim/service/mocks/entry_service_mock.py +++ /dev/null @@ -1,123 +0,0 @@ -from typing import List, Tuple -import asyncio -from pilgrim.service.entry_service import EntryService -from pilgrim.models.entry import Entry - - -class EntryServiceMock(EntryService): - def __init__(self): - super().__init__(None) - - self.mock_data = { - 1: Entry(title="The Adventure Begins", text="I'm hopping in the Plane to finally visit canadian lands", - date="26/07/2025", travel_diary_id=1, id=1, - photos=[]), - 2: Entry(title="The Landing", text="Finally on Canadian Soil", date="27/07/2025", - travel_diary_id=1, id=2,photos=[]), - 3: Entry(title="The Mount Royal", text="The Mount Royal is fucking awesome", date="28/07/2025", - travel_diary_id=1, id=3, photos=[]), - 4: Entry(title="Old Montreal", text="Exploring the historic district", date="29/07/2025", - travel_diary_id=1, id=4, photos=[]), - 5: Entry(title="Notre-Dame Basilica", text="Beautiful architecture", date="30/07/2025", - travel_diary_id=1, id=5, photos=[]), - 6: Entry(title="Parc Jean-Drapeau", text="Great views of the city", date="31/07/2025", - travel_diary_id=1, id=6, photos=[]), - 7: Entry(title="La Ronde", text="Amusement park fun", date="01/08/2025", - travel_diary_id=1, id=7, photos=[]), - 8: Entry(title="Biodome", text="Nature and science", date="02/08/2025", - travel_diary_id=1, id=8, photos=[]), - 9: Entry(title="Botanical Gardens", text="Peaceful walk", date="03/08/2025", - travel_diary_id=1, id=9, photos=[]), - 10: Entry(title="Olympic Stadium", text="Historic venue", date="04/08/2025", - travel_diary_id=1, id=10, photos=[]), - } - self._next_id = 11 - - # Synchronous methods (kept for compatibility) - def create(self, travel_diary_id: int, title: str, text: str, date: str) -> Entry: - """Synchronous version""" - new_entry = Entry(title, text, date, travel_diary_id, id=self._next_id) - self.mock_data[self._next_id] = new_entry - self._next_id += 1 - return new_entry - - def read_by_id(self, entry_id: int) -> Entry | None: - """Synchronous version""" - return self.mock_data.get(entry_id) - - def read_all(self) -> List[Entry]: - """Synchronous version""" - return list(self.mock_data.values()) - - def read_by_travel_diary_id(self, travel_diary_id: int) -> List[Entry]: - """Synchronous version - reads entries by diary""" - return [entry for entry in self.mock_data.values() if entry.fk_travel_diary_id == travel_diary_id] - - def read_paginated(self, travel_diary_id: int, page: int = 1, page_size: int = 5) -> Tuple[List[Entry], int, int]: - """Synchronous version - reads paginated entries by diary""" - entries = self.read_by_travel_diary_id(travel_diary_id) - entries.sort(key=lambda x: x.id, reverse=True) # Most recent first - - total_entries = len(entries) - total_pages = (total_entries + page_size - 1) // page_size - - start_index = (page - 1) * page_size - end_index = start_index + page_size - - page_entries = entries[start_index:end_index] - - return page_entries, total_pages, total_entries - - def update(self, entry_src: Entry, entry_dst: Entry) -> Entry | None: - """Synchronous version""" - item_to_update = self.mock_data.get(entry_src.id) - if item_to_update: - item_to_update.title = entry_dst.title if entry_dst.title is not None else item_to_update.title - item_to_update.text = entry_dst.text if entry_dst.text is not None else item_to_update.text - item_to_update.date = entry_dst.date if entry_dst.date is not None else item_to_update.date - item_to_update.fk_travel_diary_id = entry_dst.fk_travel_diary_id if (entry_dst.fk_travel_diary_id - is not None) else entry_dst.id - item_to_update.photos.extend(entry_dst.photos) - - return item_to_update - return None - - def delete(self, entry_src: Entry) -> Entry | None: - """Synchronous version""" - return self.mock_data.pop(entry_src.id, None) - - # Async methods (main) - async def async_create(self, travel_diary_id: int, title: str, text: str, date: str) -> Entry: - """Async version""" - await asyncio.sleep(0.01) # Simulates I/O - return self.create(travel_diary_id, title, text, date) - - async def async_read_by_id(self, entry_id: int) -> Entry | None: - """Async version""" - await asyncio.sleep(0.01) # Simulates I/O - return self.read_by_id(entry_id) - - async def async_read_all(self) -> List[Entry]: - """Async version""" - await asyncio.sleep(0.01) # Simulates I/O - return self.read_all() - - async def async_read_by_travel_diary_id(self, travel_diary_id: int) -> List[Entry]: - """Async version - reads entries by diary""" - await asyncio.sleep(0.01) # Simulates I/O - return self.read_by_travel_diary_id(travel_diary_id) - - async def async_read_paginated(self, travel_diary_id: int, page: int = 1, page_size: int = 5) -> Tuple[List[Entry], int, int]: - """Async version - reads paginated entries by diary""" - await asyncio.sleep(0.01) # Simulates I/O - return self.read_paginated(travel_diary_id, page, page_size) - - async def async_update(self, entry_src: Entry, entry_dst: Entry) -> Entry | None: - """Async version""" - await asyncio.sleep(0.01) # Simulates I/O - return self.update(entry_src, entry_dst) - - async def async_delete(self, entry_src: Entry) -> Entry | None: - """Async version""" - await asyncio.sleep(0.01) # Simulates I/O - return self.delete(entry_src) \ No newline at end of file diff --git a/src/pilgrim/service/mocks/photo_service_mock.py b/src/pilgrim/service/mocks/photo_service_mock.py deleted file mode 100644 index 0f9078a..0000000 --- a/src/pilgrim/service/mocks/photo_service_mock.py +++ /dev/null @@ -1,48 +0,0 @@ -from pathlib import Path -from typing import List - -from pilgrim.models.photo import Photo -from pilgrim.service.photo_service import PhotoService - - -class PhotoServiceMock(PhotoService): - def __init__(self): - super().__init__(None) - self.mock_data = {} - self._next_id = 1 - - def create(self, filepath: Path, name: str, travel_diary_id, addition_date=None, caption=None) -> Photo | None: - new_photo = Photo( - filepath=filepath, - name=name, - addition_date=addition_date, - caption=caption, - fk_travel_diary_id=travel_diary_id - ) - new_photo.id = self._next_id - self.mock_data[self._next_id] = new_photo - self._next_id += 1 - return new_photo - - - def read_by_id(self, photo_id: int) -> Photo: - return self.mock_data.get(photo_id) - - def read_all(self) -> List[Photo]: - return list(self.mock_data.values()) - - def update(self, photo_src: Photo, photo_dst: Photo) -> Photo | None: - item_to_update: Photo = self.mock_data.get(photo_src.id) - if item_to_update: - item_to_update.filepath = photo_dst.filepath if photo_dst.filepath else item_to_update.filepath - item_to_update.name = photo_dst.name if photo_dst.name else item_to_update.name - item_to_update.caption = photo_dst.caption if photo_dst.caption else item_to_update.caption - item_to_update.addition_date = photo_dst.addition_date if photo_dst.addition_date else item_to_update.addition_date - item_to_update.fk_travel_diary_id = photo_dst.fk_travel_diary_id if photo_dst.fk_travel_diary_id else item_to_update.fk_travel_diary_id - if photo_dst.entries: - item_to_update.entries = photo_dst.entries - return item_to_update - return None - - def delete(self, photo_src: Photo) -> Photo | None: - return self.mock_data.pop(photo_src.id, None) diff --git a/src/pilgrim/service/mocks/service_manager_mock.py b/src/pilgrim/service/mocks/service_manager_mock.py deleted file mode 100644 index 2715171..0000000 --- a/src/pilgrim/service/mocks/service_manager_mock.py +++ /dev/null @@ -1,23 +0,0 @@ -from pilgrim.service.mocks.entry_service_mock import EntryServiceMock -from pilgrim.service.mocks.photo_service_mock import PhotoServiceMock -from pilgrim.service.mocks.travel_diary_service_mock import TravelDiaryServiceMock -from pilgrim.service.photo_service import PhotoService -from pilgrim.service.servicemanager import ServiceManager - - -class ServiceManagerMock(ServiceManager): - def __init__(self): - super().__init__() - # Cria instâncias únicas para manter estado consistente - self._travel_diary_service = TravelDiaryServiceMock() - self._entry_service = EntryServiceMock() - self._photo_service = PhotoServiceMock() - - def get_entry_service(self): - return self._entry_service - - def get_travel_diary_service(self): - return self._travel_diary_service - - def get_photo_service(self): - return self._photo_service \ No newline at end of file diff --git a/src/pilgrim/service/mocks/travel_diary_service_mock.py b/src/pilgrim/service/mocks/travel_diary_service_mock.py deleted file mode 100644 index c5b4c6e..0000000 --- a/src/pilgrim/service/mocks/travel_diary_service_mock.py +++ /dev/null @@ -1,67 +0,0 @@ -from pilgrim.service.travel_diary_service import TravelDiaryService -from pilgrim.models.travel_diary import TravelDiary -import asyncio - - -class TravelDiaryServiceMock(TravelDiaryService): - def __init__(self): - super().__init__(None) - self.mock_data = { - 1: TravelDiary(id=1, name="Montreal"), - 2: TravelDiary(id=2, name="Rio de Janeiro"), - } - self._next_id = 3 - - # Synchronous methods (original) - def create(self, name: str): - """Synchronous version""" - new_travel_diary = TravelDiary(id=self._next_id, name=name) - self.mock_data[self._next_id] = new_travel_diary - self._next_id += 1 - return new_travel_diary - - def read_by_id(self, travel_id: int): - """Synchronous version""" - return self.mock_data.get(travel_id) - - def read_all(self): - """Synchronous version""" - return list(self.mock_data.values()) - - def update(self, travel_diary_id: int, name: str): - """Synchronous version""" - item_to_update = self.mock_data.get(travel_diary_id) - if item_to_update: - item_to_update.name = name - return item_to_update - return None - - def delete(self, travel_diary_id: int): - """Synchronous version""" - return self.mock_data.pop(travel_diary_id, None) - - # Async methods (new) - async def async_create(self, name: str): - """Async version""" - await asyncio.sleep(0.01) # Simulates I/O - return self.create(name) - - async def async_read_by_id(self, travel_id: int): - """Async version""" - await asyncio.sleep(0.01) # Simulates I/O - return self.read_by_id(travel_id) - - async def async_read_all(self): - """Async version""" - await asyncio.sleep(0.01) # Simulates I/O - return self.read_all() - - async def async_update(self, travel_diary_id: int, name: str): - """Async version""" - await asyncio.sleep(0.01) # Simulates I/O - return self.update(travel_diary_id, name) - - async def async_delete(self, travel_diary_id: int): - """Async version""" - await asyncio.sleep(0.01) # Simulates I/O - return self.delete(travel_diary_id) \ No newline at end of file diff --git a/src/pilgrim/service/photo_service.py b/src/pilgrim/service/photo_service.py index f23ae3f..5ee3a18 100644 --- a/src/pilgrim/service/photo_service.py +++ b/src/pilgrim/service/photo_service.py @@ -141,7 +141,7 @@ class PhotoService: return original return None - def delete(self, photo_src: Photo) -> Photo | None: + def delete(self, photo_src: Photo, commit=True) -> Photo | None: excluded = self.read_by_id(photo_src.id) if excluded: # Store photo data before deletion @@ -162,7 +162,8 @@ class PhotoService: file_path.unlink() self.session.delete(excluded) - self.session.commit() + if commit: + self.session.commit() return deleted_photo return None diff --git a/src/pilgrim/service/travel_diary_service.py b/src/pilgrim/service/travel_diary_service.py index 34136e7..bbae6a0 100644 --- a/src/pilgrim/service/travel_diary_service.py +++ b/src/pilgrim/service/travel_diary_service.py @@ -6,8 +6,11 @@ from pathlib import Path from pilgrim.utils import DirectoryManager from sqlalchemy.exc import IntegrityError -from ..models.travel_diary import TravelDiary +from pilgrim.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): @@ -20,8 +23,10 @@ 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-]', '', name) + safe_name = re.sub(r'[^\w\s-]', '', transliterated_name) safe_name = safe_name.strip().replace(' ', '_').lower() # Ensure we have a valid name @@ -145,3 +150,32 @@ 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 diff --git a/src/pilgrim/ui/screens/about_screen.py b/src/pilgrim/ui/screens/about_screen.py index eb6cd80..1c75003 100644 --- a/src/pilgrim/ui/screens/about_screen.py +++ b/src/pilgrim/ui/screens/about_screen.py @@ -521,6 +521,288 @@ This Software uses the following third party libraries: LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + - Unidecode: https://github.com/avian2/unidecode + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + """ diff --git a/src/pilgrim/ui/screens/diary_list_screen.py b/src/pilgrim/ui/screens/diary_list_screen.py index 649a508..5e760f8 100644 --- a/src/pilgrim/ui/screens/diary_list_screen.py +++ b/src/pilgrim/ui/screens/diary_list_screen.py @@ -1,18 +1,19 @@ from typing import Optional, Tuple -import asyncio from textual.app import ComposeResult from textual.screen import Screen -from textual.widgets import Header, Footer, Label, Static, OptionList, Button +from textual.widgets import Header, Footer, Static, OptionList, Button from textual.binding import Binding -from textual.containers import Vertical, Container, Horizontal +from textual.containers import 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 +from pilgrim.service.backup_service import BackupService + class DiaryListScreen(Screen): TITLE = "Pilgrim - Main" @@ -23,6 +24,7 @@ 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): @@ -209,11 +211,11 @@ class DiaryListScreen(Screen): def _on_new_diary_submitted(self, result): """Callback after diary creation""" if result: # Se result não é string vazia, o diário foi criado - self.notify(f"Returning to diary list...") + self.notify("Returning to diary list...") # Atualiza a lista de diários self.refresh_diaries() else: - self.notify(f"Creation canceled...") + self.notify("Creation canceled...") def _on_screen_resume(self) -> None: super()._on_screen_resume() @@ -285,4 +287,29 @@ class DiaryListScreen(Screen): def action_quit(self): """Action to quit the application""" - self.app.exit() \ No newline at end of file + 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") + + + def action_backup(self): + session = self.app.service_manager.get_session() + if session: + backup_service = BackupService(session) + result_operation, result_data = backup_service.create_backup() + if result_operation: + self.notify(f"Backup result: {result_data}") + else: + self.notify(f"Error performing backup: {result_data}") + else: + self.notify("Error: Session not found",severity="error") + self.app.exit() + diff --git a/src/pilgrim/ui/screens/diary_settings_screen.py b/src/pilgrim/ui/screens/diary_settings_screen.py new file mode 100644 index 0000000..d549212 --- /dev/null +++ b/src/pilgrim/ui/screens/diary_settings_screen.py @@ -0,0 +1,272 @@ + +from textual.widgets import Static +from textual.containers import Container +from textual.widgets import Header, Footer, Label, Button,Checkbox +from textual.screen import Screen +from textual.reactive import reactive +from textual.binding import Binding +from textual import on + +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.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") \ No newline at end of file diff --git a/src/pilgrim/ui/screens/edit_entry_screen.py b/src/pilgrim/ui/screens/edit_entry_screen.py index 0e5a027..1ed8327 100644 --- a/src/pilgrim/ui/screens/edit_entry_screen.py +++ b/src/pilgrim/ui/screens/edit_entry_screen.py @@ -5,11 +5,9 @@ from typing import Optional, List from pilgrim.models.entry import Entry from pilgrim.models.photo import Photo -from pilgrim.models.travel_diary import TravelDiary from pilgrim.ui.screens.modals.add_photo_modal import AddPhotoModal from pilgrim.ui.screens.modals.confirm_delete_modal import ConfirmDeleteModal from pilgrim.ui.screens.modals.edit_photo_modal import EditPhotoModal -from pilgrim.ui.screens.modals.file_picker_modal import FilePickerModal from pilgrim.ui.screens.rename_entry_modal import RenameEntryModal from textual.app import ComposeResult from textual.binding import Binding @@ -189,7 +187,7 @@ class EditEntryScreen(Screen): """Ensures the diary info widget is always updated with current diary name""" try: self.diary_info.update(f"Diary: {self.diary_name}") - except Exception as e: + except Exception: self.diary_info.update(f"Diary: {self.diary_id}") def refresh_entries(self): @@ -427,7 +425,7 @@ 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"[b]Reference formats:[/b]\n" + photo_details += "[b]Reference formats:[/b]\n" photo_details += f"\\[\\[photo::{photo_hash}\\]\\]" self.photo_info.update(photo_details) @@ -745,8 +743,8 @@ class EditEntryScreen(Screen): if selected_photo.caption: photo_details += f"Caption: {selected_photo.caption}\n" else: - photo_details += f"Caption: No Caption\n" - photo_details += f"[b]Reference formats:[/b]\n" + photo_details += "Caption: No Caption\n" + photo_details += "[b]Reference formats:[/b]\n" photo_details += f"\\[\\[photo::{photo_hash}]]" self.photo_info.update(photo_details) diff --git a/src/pilgrim/ui/screens/modals/add_photo_modal.py b/src/pilgrim/ui/screens/modals/add_photo_modal.py index 5a7c8cb..36a38fa 100644 --- a/src/pilgrim/ui/screens/modals/add_photo_modal.py +++ b/src/pilgrim/ui/screens/modals/add_photo_modal.py @@ -1,11 +1,9 @@ -import os from pathlib import Path from textual.app import ComposeResult from textual.screen import Screen from textual.widgets import Static, Input, Button from textual.containers import Horizontal, Container from .file_picker_modal import FilePickerModal -import hashlib class AddPhotoModal(Screen): """Modal for adding a new photo""" diff --git a/src/pilgrim/ui/screens/modals/delete_all_entries_from_diary_modal.py b/src/pilgrim/ui/screens/modals/delete_all_entries_from_diary_modal.py new file mode 100644 index 0000000..b03db96 --- /dev/null +++ b/src/pilgrim/ui/screens/modals/delete_all_entries_from_diary_modal.py @@ -0,0 +1,33 @@ + +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") diff --git a/src/pilgrim/ui/screens/modals/delete_all_photos_from_diary_modal.py b/src/pilgrim/ui/screens/modals/delete_all_photos_from_diary_modal.py new file mode 100644 index 0000000..6b8619d --- /dev/null +++ b/src/pilgrim/ui/screens/modals/delete_all_photos_from_diary_modal.py @@ -0,0 +1,32 @@ + +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") \ No newline at end of file diff --git a/src/pilgrim/ui/screens/modals/delete_diary_modal.py b/src/pilgrim/ui/screens/modals/delete_diary_modal.py new file mode 100644 index 0000000..8930dfd --- /dev/null +++ b/src/pilgrim/ui/screens/modals/delete_diary_modal.py @@ -0,0 +1,77 @@ +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() + diff --git a/src/pilgrim/ui/screens/modals/delete_yes_confirmation_modal.py b/src/pilgrim/ui/screens/modals/delete_yes_confirmation_modal.py new file mode 100644 index 0000000..2e779d0 --- /dev/null +++ b/src/pilgrim/ui/screens/modals/delete_yes_confirmation_modal.py @@ -0,0 +1,57 @@ +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 \ No newline at end of file diff --git a/src/pilgrim/ui/styles/pilgrim.css b/src/pilgrim/ui/styles/pilgrim.css index 5b9bf3b..8486ac0 100644 --- a/src/pilgrim/ui/styles/pilgrim.css +++ b/src/pilgrim/ui/styles/pilgrim.css @@ -1,7 +1,8 @@ Screen { layout: vertical; - background: $surface-darken-1; + background: $primary-background-darken-3; align: center middle; + hatch: right $secondary-background-darken-3; } .EditEntryScreen-sub-header { @@ -623,4 +624,265 @@ Screen.-modal { .ConfirmDeleteModal-Button { 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; } \ No newline at end of file diff --git a/src/pilgrim/ui/ui.py b/src/pilgrim/ui/ui.py index 5557993..ee613a9 100644 --- a/src/pilgrim/ui/ui.py +++ b/src/pilgrim/ui/ui.py @@ -37,6 +37,11 @@ class UIApp(App): "Open About Pilgrim", screen.action_about_cmd ) + yield SystemCommand( + "Backup Database", + "Backup the Database", + screen.action_backup + ) elif isinstance(screen, AboutScreen): yield SystemCommand( diff --git a/src/pilgrim/utils/config_manager.py b/src/pilgrim/utils/config_manager.py index 7a0f856..7da0ff2 100644 --- a/src/pilgrim/utils/config_manager.py +++ b/src/pilgrim/utils/config_manager.py @@ -1,5 +1,4 @@ import os.path -from os import PathLike from threading import Lock import tomli @@ -46,6 +45,8 @@ class ConfigManager(metaclass=SingletonMeta): 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.") @@ -103,5 +104,8 @@ class ConfigManager(metaclass=SingletonMeta): 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 diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 0000000..b89d02d --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,139 @@ +from pathlib import Path +from unittest.mock import patch + +import pytest +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from datetime import datetime + +from pilgrim.models.entry import Entry +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.utils import DirectoryManager + + +# 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] + +@pytest.fixture +def backup_test_env_files_only(tmp_path): + fake_config_dir = tmp_path / "config" + fake_diaries_root = tmp_path / "diaries" + fake_db_path = fake_config_dir / "database.db" + fake_config_dir.mkdir() + fake_diaries_root.mkdir() + with patch.object(DirectoryManager, 'get_database_path', return_value=fake_db_path), \ + patch.object(DirectoryManager, 'get_config_directory', return_value=fake_config_dir), \ + patch.object(DirectoryManager, 'get_diaries_root', return_value=fake_diaries_root): + engine = create_engine(f"sqlite:///{fake_db_path}") + Base.metadata.create_all(engine) + Session = sessionmaker(bind=engine) + session = Session() + + diary = TravelDiary(name="Viagem de Teste", directory_name="viagem_de_teste") + session.add(diary) + session.commit() + photo_file_path_str = str(fake_diaries_root / "viagem_de_teste" / "images" / "foto1.jpg") + photo = Photo(filepath=photo_file_path_str, name="Foto 1", photo_hash="hash123", fk_travel_diary_id=diary.id) + session.add(photo) + session.commit() + photo_file_path = Path(photo_file_path_str) + photo_file_path.parent.mkdir(parents=True) + photo_file_path.touch() + yield { + "session": session, + "db_path": fake_db_path, + "config_dir": fake_config_dir, + "diaries_root": fake_diaries_root, + } + session.close() + +@pytest.fixture +def entry_with_photo_references(session_with_one_diary): + session, diary = session_with_one_diary + photo1 = Photo(filepath="p1.jpg", name="P1", photo_hash="aaaaaaaa", fk_travel_diary_id=diary.id) + photo2 = Photo(filepath="p2.jpg", name="P2", photo_hash="bbbbbbbb", fk_travel_diary_id=diary.id) + session.add_all([photo1, photo2]) + session.flush() + entry = Entry( + title="Entrada com Fotos", + text="Texto com a foto A [[photo::aaaaaaaa]] e também a foto B [[photo::bbbbbbbb]].", + date=datetime.now(), + travel_diary_id=diary.id, + photos=[photo1, photo2] + ) + session.add(entry) + session.commit() + session.refresh(entry) + + return session, entry + + +@pytest.fixture +def session_with_multiple_entries(session_with_one_diary): + session, diary = session_with_one_diary + session.query(Entry).delete() + entry1 = Entry(title="Entrada 1", text="Texto 1", date=datetime.now(), travel_diary_id=diary.id) + entry2 = Entry(title="Entrada 2", text="Texto 2", date=datetime.now(), travel_diary_id=diary.id) + + session.add_all([entry1, entry2]) + session.commit() + + return session, diary + diff --git a/tests/service/test_backup_service.py b/tests/service/test_backup_service.py new file mode 100644 index 0000000..3038194 --- /dev/null +++ b/tests/service/test_backup_service.py @@ -0,0 +1,39 @@ +import zipfile +from pathlib import Path +from unittest.mock import patch, MagicMock +from pilgrim.service.backup_service import BackupService +from pilgrim.utils.directory_manager import DirectoryManager +import pytest + +@patch.object(DirectoryManager, 'get_diaries_root') +@patch.object(DirectoryManager, 'get_config_directory') +@patch.object(DirectoryManager, 'get_database_path') +def test_create_backup_success(mock_get_db_path, mock_get_config_dir, mock_get_diaries_root, backup_test_env_files_only): + env = backup_test_env_files_only + session = env["session"] + mock_get_db_path.return_value = env["db_path"] + mock_get_config_dir.return_value = env["config_dir"] + mock_get_diaries_root.return_value = env["diaries_root"] + + service = BackupService(session) + backup_zip_path = env["config_dir"] / "backup.zip" + success, returned_path = service.create_backup() + assert success is True + assert returned_path == backup_zip_path + assert backup_zip_path.exists() + + with zipfile.ZipFile(backup_zip_path, 'r') as zf: + file_list = zf.namelist() + assert "database.sql" in file_list + assert "diaries/viagem_de_teste/images/foto1.jpg" in file_list + sql_dump = zf.read("database.sql").decode('utf-8') + assert "Viagem de Teste" in sql_dump + +@patch.object(DirectoryManager, 'get_database_path') +def test_create_backup_fails_if_db_not_found(mock_get_db_path, tmp_path: Path): + non_existent_db_path = tmp_path / "non_existent.db" + mock_get_db_path.return_value = non_existent_db_path + mock_session = MagicMock() + service = BackupService(mock_session) + with pytest.raises(FileNotFoundError, match="No Database Found"): + service.create_backup() \ No newline at end of file diff --git a/tests/service/test_entry_service.py b/tests/service/test_entry_service.py new file mode 100644 index 0000000..5cab040 --- /dev/null +++ b/tests/service/test_entry_service.py @@ -0,0 +1,306 @@ + +import pytest +from datetime import datetime +from sqlalchemy.exc import IntegrityError + +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 + +def test_delete_references_for_specific_photo(entry_with_photo_references): + session, entry = entry_with_photo_references + service = EntryService(session) + updated_entry = service.delete_references_for_specific_photo(entry, "aaaaaaaa") + assert "[[photo::aaaaaaaa]]" not in updated_entry.text + assert "[[photo::bbbbbbbb]]" in updated_entry.text + +def test_delete_specific_photo_reference_does_nothing_if_no_match(entry_with_photo_references): + session, entry = entry_with_photo_references + service = EntryService(session) + + original_text = entry.text + updated_entry = service.delete_references_for_specific_photo(entry, "cccccccc") + assert updated_entry.text == original_text + +def test_delete_all_photo_references_removes_all_refs(entry_with_photo_references): + session, entry = entry_with_photo_references + service = EntryService(session) + updated_entry = service.delete_all_photo_references(entry) + assert "[[photo::aaaaaaaa]]" not in updated_entry.text + assert "[[photo::bbbbbbbb]]" not in updated_entry.text + +def test_delete_all_photo_references_uses_truncated_hash(session_with_one_diary): + session, diary = session_with_one_diary + service = EntryService(session) + long_hash_photo = Photo( + filepath="long.jpg", name="Long", + photo_hash="1234567890abcdef", # Hash com 16 caracteres + fk_travel_diary_id=diary.id + ) + entry = Entry( + title="Teste de Hash Curto", + text="Referência com hash truncado [[photo::12345678]].", # Texto usa só os 8 primeiros + date=datetime.now(), + travel_diary_id=diary.id + ) + entry.photos.append(long_hash_photo) + session.add_all([long_hash_photo, entry]) + session.commit() + updated_entry = service.delete_all_photo_references(entry) + expected_text = "Referência com hash truncado ." + assert "[[photo::12345678]]" not in updated_entry.text diff --git a/tests/service/test_photo_service.py b/tests/service/test_photo_service.py new file mode 100644 index 0000000..786554e --- /dev/null +++ b/tests/service/test_photo_service.py @@ -0,0 +1,248 @@ +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() + diff --git a/tests/service/test_service_manager.py b/tests/service/test_service_manager.py new file mode 100644 index 0000000..ed66e64 --- /dev/null +++ b/tests/service/test_service_manager.py @@ -0,0 +1,33 @@ +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 \ No newline at end of file diff --git a/tests/service/test_travel_diary_service.py b/tests/service/test_travel_diary_service.py new file mode 100644 index 0000000..9a1e890 --- /dev/null +++ b/tests/service/test_travel_diary_service.py @@ -0,0 +1,176 @@ +from pathlib import Path +from unittest.mock import patch, MagicMock + + +import pytest + +from pilgrim.models.photo import Photo +from pilgrim.models.travel_diary import TravelDiary +from pilgrim.models.entry import Entry +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" + +def test_delete_all_entries_successfully(session_with_multiple_entries): + session, diary = session_with_multiple_entries + service = TravelDiaryService(session) + diary_id = 1 + assert session.query(Entry).filter_by(fk_travel_diary_id=diary_id).count() == 2 + result = service.delete_all_entries(diary) + assert result is True + assert session.query(Entry).filter_by(fk_travel_diary_id=diary_id).count() == 0 + +@patch.object(TravelDiaryService, '_ensure_diary_directory') +@patch('pathlib.Path.unlink') +@patch('pathlib.Path.exists', return_value=True) +@patch('pilgrim.utils.DirectoryManager.get_diaries_root', return_value=Path("/fake/diaries_root")) +def test_delete_all_photos_orchestration( + mock_ensure_dir, mock_unlink, mock_exists, mock_get_root, entry_with_photo_references +): + session, entry = entry_with_photo_references + diary_id = entry.fk_travel_diary_id + service = TravelDiaryService(session) + assert session.query(Photo).filter_by(fk_travel_diary_id=diary_id).count() == 2 + assert "[[photo::" in entry.text + diary = session.get(TravelDiary, diary_id) + result = service.delete_all_photos(diary) + assert result is True + photos_after_delete = session.query(Photo).filter_by(fk_travel_diary_id=diary_id).all() + assert len(photos_after_delete) == 0 + session.refresh(entry) + assert "[[photo::" not in entry.text + assert mock_unlink.call_count == 2 diff --git a/tests/test_application.py b/tests/test_application.py new file mode 100644 index 0000000..c4f1ae0 --- /dev/null +++ b/tests/test_application.py @@ -0,0 +1,56 @@ +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 \ No newline at end of file diff --git a/tests/test_command.py b/tests/test_command.py new file mode 100644 index 0000000..c95a85a --- /dev/null +++ b/tests/test_command.py @@ -0,0 +1,9 @@ +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() diff --git a/tests/test_database.py b/tests/test_database.py new file mode 100644 index 0000000..a9529df --- /dev/null +++ b/tests/test_database.py @@ -0,0 +1,40 @@ +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() + + + diff --git a/tests/utils/test_config_manager.py b/tests/utils/test_config_manager.py new file mode 100644 index 0000000..3d5d4ed --- /dev/null +++ b/tests/utils/test_config_manager.py @@ -0,0 +1,66 @@ +import pytest +import tomli +from pathlib import Path +from unittest.mock import patch + +from pilgrim.utils.config_manager import ConfigManager, SingletonMeta + +@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() \ No newline at end of file diff --git a/tests/utils/test_directory_manager.py b/tests/utils/test_directory_manager.py new file mode 100644 index 0000000..eb3846b --- /dev/null +++ b/tests/utils/test_directory_manager.py @@ -0,0 +1,71 @@ +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()