mirror of
https://github.com/gmbrax/Pilgrim.git
synced 2026-11-10 18:50:18 +00:00
Compare commits
24
Commits
+1
-1
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
|
||||
|
||||
[project]
|
||||
name = "pilgrim"
|
||||
version = "0.0.4"
|
||||
version = "0.0.5"
|
||||
authors = [
|
||||
{ name="Gustavo Henrique Santos Souza de Miranda", email="gustavohssmiranda@gmail.com" }
|
||||
]
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import declarative_base
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from pathlib import Path
|
||||
import os
|
||||
import shutil
|
||||
|
||||
from pilgrim.utils import ConfigManager
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import re
|
||||
from datetime import datetime
|
||||
from typing import List
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
@@ -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)
|
||||
@@ -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
|
||||
@@ -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)
|
||||
@@ -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
|
||||
|
||||
@@ -9,6 +9,9 @@ from sqlalchemy.exc import IntegrityError
|
||||
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):
|
||||
self.session = session
|
||||
@@ -147,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
|
||||
|
||||
@@ -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.
|
||||
|
||||
"""
|
||||
|
||||
|
||||
|
||||
@@ -1,19 +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"
|
||||
@@ -211,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()
|
||||
@@ -298,3 +298,18 @@ class DiaryListScreen(Screen):
|
||||
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()
|
||||
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
|
||||
from textual.widgets import Static
|
||||
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.reactive import reactive
|
||||
from textual.binding import Binding
|
||||
from textual import on
|
||||
|
||||
from pilgrim.models.travel_diary import TravelDiary
|
||||
from pilgrim.ui.screens.modals.delete_all_entries_from_diary_modal import DeleteAllEntriesModal
|
||||
from pilgrim.ui.screens.modals.delete_all_photos_from_diary_modal import DeleteAllPhotosModal
|
||||
from pilgrim.ui.screens.modals.delete_diary_modal import DeleteDiaryModal
|
||||
@@ -35,7 +34,7 @@ class SettingsScreen(Screen):
|
||||
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.backup_diary_button = Button("Backup Diary")
|
||||
|
||||
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")
|
||||
@@ -47,12 +46,6 @@ class SettingsScreen(Screen):
|
||||
id="DiarySettingsScreen-DeleteDiaryButtonContainer",
|
||||
classes="DiarySettingsScreen-DeleteDiaryButtonContainer Button_Container"
|
||||
)
|
||||
self.backup_diary_button_container = Container(
|
||||
Label("Backup Diary:"),
|
||||
self.backup_diary_button,
|
||||
id="DiarySettingsScreen-BackupDiaryButtonContainer",
|
||||
classes="DiarySettingsScreen-BackupDiaryButtonContainer Button_Container"
|
||||
)
|
||||
self.delete_all_entries_button_container = Container(
|
||||
Label("Delete All Entries:"),
|
||||
self.delete_all_entries_button,
|
||||
@@ -106,7 +99,6 @@ class SettingsScreen(Screen):
|
||||
)
|
||||
|
||||
self.diary_denger_zone_container = Container(
|
||||
self.backup_diary_button_container,
|
||||
self.delete_diary_button_container,
|
||||
self.delete_all_entries_button_container,
|
||||
self.delete_all_photos_button_container,
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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"""
|
||||
|
||||
@@ -3,6 +3,7 @@ from textual.widgets import Button
|
||||
|
||||
from textual import on
|
||||
|
||||
|
||||
from pilgrim.ui.screens.modals.delete_yes_confirmation_modal import DeleteYesConfirmationModal
|
||||
|
||||
|
||||
@@ -10,11 +11,23 @@ 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")
|
||||
@on(Button.Pressed, ".DeleteDiaryModal-DeleteButton")
|
||||
def on_delete_button_pressed(self, event):
|
||||
self.result = True
|
||||
self.dismiss()
|
||||
|
||||
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")
|
||||
|
||||
@@ -10,11 +10,23 @@ 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")
|
||||
@on(Button.Pressed, ".DeleteDiaryModal-DeleteButton")
|
||||
def on_delete_button_pressed(self, event):
|
||||
self.result = True
|
||||
self.dismiss()
|
||||
|
||||
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")
|
||||
@@ -5,6 +5,8 @@ from textual.binding import Binding
|
||||
from textual import on
|
||||
|
||||
|
||||
|
||||
|
||||
class DeleteDiaryModal(Screen):
|
||||
|
||||
BINDINGS = [
|
||||
@@ -44,11 +46,19 @@ class DeleteDiaryModal(Screen):
|
||||
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):
|
||||
@@ -57,3 +67,11 @@ class DeleteDiaryModal(Screen):
|
||||
|
||||
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()
|
||||
|
||||
|
||||
@@ -5,6 +5,8 @@ from textual.binding import Binding
|
||||
from textual import on
|
||||
|
||||
|
||||
|
||||
|
||||
class DeleteYesConfirmationModal(Screen):
|
||||
BINDINGS = [
|
||||
Binding("escape", "cancel", "Cancel"),
|
||||
@@ -45,8 +47,9 @@ class DeleteYesConfirmationModal(Screen):
|
||||
self.action_cancel()
|
||||
|
||||
def action_cancel(self):
|
||||
from pilgrim.ui.screens.diary_settings_screen import SettingsScreen
|
||||
self.dismiss()
|
||||
self.app.push_screen(SettingsScreen(diary=travel_diary[0]))
|
||||
self.app.push_screen(SettingsScreen(self.diary_id))
|
||||
|
||||
def compose(self):
|
||||
yield Header()
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import os.path
|
||||
from os import PathLike
|
||||
from threading import Lock
|
||||
|
||||
import tomli
|
||||
|
||||
@@ -1,14 +1,8 @@
|
||||
from re import search
|
||||
|
||||
import pytest
|
||||
from datetime import datetime
|
||||
from unittest.mock import Mock
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
from pilgrim.database import Base
|
||||
from pilgrim.models.travel_diary import TravelDiary
|
||||
from pilgrim.models.entry import Entry
|
||||
from pilgrim.models.photo import Photo
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import pytest
|
||||
from pathlib import Path
|
||||
|
||||
from pilgrim import TravelDiary
|
||||
|
||||
@@ -4,7 +4,6 @@ from pathlib import Path
|
||||
from unittest.mock import patch
|
||||
|
||||
from pilgrim.utils.config_manager import ConfigManager, SingletonMeta
|
||||
from pilgrim.utils.directory_manager import DirectoryManager
|
||||
|
||||
@pytest.fixture
|
||||
def clean_singleton():
|
||||
|
||||
Reference in New Issue
Block a user