Merge pull request #81 from gmbrax/refactor/clean-the-ruff-errors

Fix all the Ruff errors
This commit is contained in:
Gustavo Henrique Miranda 2025-07-24 20:26:17 -03:00 committed by GitHub
commit 447dffd7df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 9 additions and 31 deletions

View File

@ -1,9 +1,7 @@
from sqlalchemy import create_engine from sqlalchemy import create_engine
from sqlalchemy.orm import declarative_base from sqlalchemy.orm import declarative_base
from sqlalchemy.orm import sessionmaker from sqlalchemy.orm import sessionmaker
from pathlib import Path
import os import os
import shutil
from pilgrim.utils import ConfigManager from pilgrim.utils import ConfigManager

View File

@ -1,6 +1,4 @@
import sqlite3
import zipfile import zipfile
from pathlib import Path
from pilgrim.utils.directory_manager import DirectoryManager from pilgrim.utils.directory_manager import DirectoryManager

View File

@ -1,7 +1,6 @@
from pilgrim.service.mocks.entry_service_mock import EntryServiceMock from pilgrim.service.mocks.entry_service_mock import EntryServiceMock
from pilgrim.service.mocks.photo_service_mock import PhotoServiceMock from pilgrim.service.mocks.photo_service_mock import PhotoServiceMock
from pilgrim.service.mocks.travel_diary_service_mock import TravelDiaryServiceMock from pilgrim.service.mocks.travel_diary_service_mock import TravelDiaryServiceMock
from pilgrim.service.photo_service import PhotoService
from pilgrim.service.servicemanager import ServiceManager from pilgrim.service.servicemanager import ServiceManager

View File

@ -3,7 +3,6 @@ import re
import shutil import shutil
from pathlib import Path from pathlib import Path
from pilgrim.models.entry import Entry
from pilgrim.utils import DirectoryManager from pilgrim.utils import DirectoryManager
from sqlalchemy.exc import IntegrityError from sqlalchemy.exc import IntegrityError

View File

@ -1,13 +1,11 @@
from typing import Optional, Tuple from typing import Optional, Tuple
import asyncio
from textual.app import ComposeResult from textual.app import ComposeResult
from textual.screen import Screen 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.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.about_screen import AboutScreen
from pilgrim.ui.screens.diary_settings_screen import SettingsScreen from pilgrim.ui.screens.diary_settings_screen import SettingsScreen
from pilgrim.ui.screens.edit_diary_modal import EditDiaryModal from pilgrim.ui.screens.edit_diary_modal import EditDiaryModal
@ -213,11 +211,11 @@ class DiaryListScreen(Screen):
def _on_new_diary_submitted(self, result): def _on_new_diary_submitted(self, result):
"""Callback after diary creation""" """Callback after diary creation"""
if result: # Se result não é string vazia, o diário foi criado 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 # Atualiza a lista de diários
self.refresh_diaries() self.refresh_diaries()
else: else:
self.notify(f"Creation canceled...") self.notify("Creation canceled...")
def _on_screen_resume(self) -> None: def _on_screen_resume(self) -> None:
super()._on_screen_resume() super()._on_screen_resume()

View File

@ -1,13 +1,12 @@
from textual.widgets import Static from textual.widgets import Static
from textual.containers import Container from textual.containers import Container
from textual.widgets import Header, Footer, Label, Button,Checkbox,Input from textual.widgets import Header, Footer, Label, Button,Checkbox
from textual.screen import Screen from textual.screen import Screen
from textual.reactive import reactive from textual.reactive import reactive
from textual.binding import Binding from textual.binding import Binding
from textual import on from textual import on
from pilgrim.models.travel_diary import TravelDiary
from pilgrim.ui.screens.modals.delete_all_entries_from_diary_modal import DeleteAllEntriesModal from pilgrim.ui.screens.modals.delete_all_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_all_photos_from_diary_modal import DeleteAllPhotosModal
from pilgrim.ui.screens.modals.delete_diary_modal import DeleteDiaryModal from pilgrim.ui.screens.modals.delete_diary_modal import DeleteDiaryModal

View File

@ -5,11 +5,9 @@ from typing import Optional, List
from pilgrim.models.entry import Entry from pilgrim.models.entry import Entry
from pilgrim.models.photo import Photo 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.add_photo_modal import AddPhotoModal
from pilgrim.ui.screens.modals.confirm_delete_modal import ConfirmDeleteModal 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.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 pilgrim.ui.screens.rename_entry_modal import RenameEntryModal
from textual.app import ComposeResult from textual.app import ComposeResult
from textual.binding import Binding from textual.binding import Binding
@ -189,7 +187,7 @@ class EditEntryScreen(Screen):
"""Ensures the diary info widget is always updated with current diary name""" """Ensures the diary info widget is always updated with current diary name"""
try: try:
self.diary_info.update(f"Diary: {self.diary_name}") self.diary_info.update(f"Diary: {self.diary_name}")
except Exception as e: except Exception:
self.diary_info.update(f"Diary: {self.diary_id}") self.diary_info.update(f"Diary: {self.diary_id}")
def refresh_entries(self): def refresh_entries(self):
@ -427,7 +425,7 @@ class EditEntryScreen(Screen):
photo_details += f"🔗 {photo_hash}\n" photo_details += f"🔗 {photo_hash}\n"
photo_details += f"📅 {selected_photo.addition_date}\n" photo_details += f"📅 {selected_photo.addition_date}\n"
photo_details += f"💬 {selected_photo.caption or 'No caption'}\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}\\]\\]" photo_details += f"\\[\\[photo::{photo_hash}\\]\\]"
self.photo_info.update(photo_details) self.photo_info.update(photo_details)
@ -745,8 +743,8 @@ class EditEntryScreen(Screen):
if selected_photo.caption: if selected_photo.caption:
photo_details += f"Caption: {selected_photo.caption}\n" photo_details += f"Caption: {selected_photo.caption}\n"
else: else:
photo_details += f"Caption: No Caption\n" photo_details += "Caption: No Caption\n"
photo_details += f"[b]Reference formats:[/b]\n" photo_details += "[b]Reference formats:[/b]\n"
photo_details += f"\\[\\[photo::{photo_hash}]]" photo_details += f"\\[\\[photo::{photo_hash}]]"
self.photo_info.update(photo_details) self.photo_info.update(photo_details)

View File

@ -1,11 +1,9 @@
import os
from pathlib import Path from pathlib import Path
from textual.app import ComposeResult from textual.app import ComposeResult
from textual.screen import Screen from textual.screen import Screen
from textual.widgets import Static, Input, Button from textual.widgets import Static, Input, Button
from textual.containers import Horizontal, Container from textual.containers import Horizontal, Container
from .file_picker_modal import FilePickerModal from .file_picker_modal import FilePickerModal
import hashlib
class AddPhotoModal(Screen): class AddPhotoModal(Screen):
"""Modal for adding a new photo""" """Modal for adding a new photo"""

View File

@ -1,5 +1,4 @@
import os.path import os.path
from os import PathLike
from threading import Lock from threading import Lock
import tomli import tomli

View File

@ -1,14 +1,8 @@
from re import search
import pytest import pytest
from datetime import datetime from datetime import datetime
from unittest.mock import Mock
from sqlalchemy import create_engine
from sqlalchemy.exc import IntegrityError from sqlalchemy.exc import IntegrityError
from sqlalchemy.orm import sessionmaker
from pilgrim.database import Base
from pilgrim.models.travel_diary import TravelDiary
from pilgrim.models.entry import Entry from pilgrim.models.entry import Entry
from pilgrim.models.photo import Photo from pilgrim.models.photo import Photo

View File

@ -1,4 +1,3 @@
import pytest
from pathlib import Path from pathlib import Path
from pilgrim import TravelDiary from pilgrim import TravelDiary

View File

@ -4,7 +4,6 @@ from pathlib import Path
from unittest.mock import patch from unittest.mock import patch
from pilgrim.utils.config_manager import ConfigManager, SingletonMeta from pilgrim.utils.config_manager import ConfigManager, SingletonMeta
from pilgrim.utils.directory_manager import DirectoryManager
@pytest.fixture @pytest.fixture
def clean_singleton(): def clean_singleton():