From 9024d3066203b2a85bff6692a5ee782eeb414ac8 Mon Sep 17 00:00:00 2001 From: Matheus Toledo Date: Mon, 16 Jun 2025 12:08:01 -0300 Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=99=88=20feat:=20update=20gitignore?= =?UTF-8?q?=20for=20python=20projects?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 08fdd16..fcb93f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,143 @@ +# Database files database.db -__pycache__ + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ +build/ +temp/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +.python-version + +# pipenv +Pipfile.lock + +# poetry +poetry.lock + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.env.* +.venv +venv/ +ENV/ +env/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# VS Code settings +.vscode/ \ No newline at end of file From c2f95b1cf27c9eea6943389f299cfd43131887d6 Mon Sep 17 00:00:00 2001 From: Matheus Toledo Date: Mon, 16 Jun 2025 12:09:02 -0300 Subject: [PATCH 2/9] =?UTF-8?q?=E2=99=BB=EF=B8=8Frefactor:=20remove=20blan?= =?UTF-8?q?k=20lines=20on=20dependencies=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 10dc89b..182fec2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ greenlet==3.2.3 SQLAlchemy==2.0.41 -typing_extensions==4.14.0 - +typing_extensions==4.14.0 \ No newline at end of file From 190cef26277f3c25c08afd93375bd4ceb0466cc8 Mon Sep 17 00:00:00 2001 From: Matheus Toledo Date: Mon, 16 Jun 2025 12:31:05 -0300 Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=93=9D=20docs:=20update=20README=20wi?= =?UTF-8?q?th=20project=20overview,=20features,=20requirements,=20installa?= =?UTF-8?q?tion,=20and=20usage=20instructions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d9baacb..7d8d17a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,50 @@ # Python_Pilgrim -Python Based Travel Diary \ No newline at end of file +## Overview + +**Python_Pilgrim** is a Python-based travel diary application designed to help users document and manage their travel experiences. The project provides tools for recording trips, organizing travel notes, and storing memories in a structured and accessible format. + +## Features + +- Create and manage travel diaries +- Add, edit, and delete travel entries +- Organize trips by date, location, or theme +- Store photos, notes, and other media +- Export and share travel logs + +## Requirements +- Python 3.8 or higher +- Linux operating system (tested on Ubuntu 20.04+) +- Visual Studio Code (VSCode) for development (optional but strongly recommended) +- pip (Python package installer) +- Optional: virtualenv for isolated environments + +## Installation + +1. Clone the repository: + ```bash + git clone https://github.com/gmbrax/Pilgrim.git + ``` +2. Navigate to the project directory: + ```bash + cd Pilgrim + ``` +3. Create a virtual environment and, then, activate it: + ```bash + python -m venv .venv + source .venv/bin/activate + ``` +4. Install the required dependencies: + ```bash + pip install -r requirements.txt + ``` + +## Usage + +To run the main application, execute: + +```bash +python .py +``` + +This will start the Python_Pilgrim application. Follow the on-screen instructions to create and manage your travel diaries. \ No newline at end of file From 83f6d15ba96dac31bc3c1318243f10cda5a5fb39 Mon Sep 17 00:00:00 2001 From: Matheus Toledo Date: Mon, 16 Jun 2025 12:32:43 -0300 Subject: [PATCH 4/9] =?UTF-8?q?=F0=9F=99=88=20feat:=20update=20.gitignore?= =?UTF-8?q?=20to=20include=20IDE=20settings=20for=20VS=20Code=20and=20Inte?= =?UTF-8?q?lliJ?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fcb93f1..e36b675 100644 --- a/.gitignore +++ b/.gitignore @@ -139,5 +139,6 @@ dmypy.json # Cython debug symbols cython_debug/ -# VS Code settings -.vscode/ \ No newline at end of file +# IDE settings +.vscode/ +.idea/ \ No newline at end of file From dec8a7b445838c87c0d3645122a3f3d701036241 Mon Sep 17 00:00:00 2001 From: Matheus Toledo Date: Mon, 16 Jun 2025 12:33:30 -0300 Subject: [PATCH 5/9] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor:=20remove=20i?= =?UTF-8?q?ntelliJ=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/Pilgrim.iml | 11 - .../inspectionProfiles/profiles_settings.xml | 6 - .idea/modules.xml | 8 - .idea/vcs.xml | 6 - .idea/workspace.xml | 201 ------------------ 5 files changed, 232 deletions(-) delete mode 100644 .idea/Pilgrim.iml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/Pilgrim.iml b/.idea/Pilgrim.iml deleted file mode 100644 index 3ce9a18..0000000 --- a/.idea/Pilgrim.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index daedced..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index a012a27..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - { - "lastFilter": { - "state": "OPEN", - "assignee": "gmbrax" - } -} - { - "selectedUrlAndAccountId": { - "url": "https://github.com/gmbrax/Pilgrim.git", - "accountId": "213d8456-c67d-4cfd-99a6-337d47c35b4a" - } -} - { - "associatedIndex": 0 -} - - - - { - "keyToString": { - "ModuleVcsDetector.initialDetectionPerformed": "true", - "Python.Database.executor": "Run", - "Python.command.executor": "Run", - "Python.main.executor": "Run", - "Python.pilgrim.executor": "Run", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.git.unshallow": "true", - "git-widget-placeholder": "master", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "vue.rearranger.settings.migration": "true" - } -} - - - - - - - - - - - - - - - - - - - - 1748985568579 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 99eb0a0651fdaa04b41f043f9b6bd6674fc5b0d3 Mon Sep 17 00:00:00 2001 From: Matheus Toledo Date: Mon, 16 Jun 2025 12:43:39 -0300 Subject: [PATCH 6/9] =?UTF-8?q?=F0=9F=8E=A8refactor:=20move=20modules=20an?= =?UTF-8?q?d=20refactor=20import=20statements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/{pilgrim/models => }/__init__.py | 0 src/{pilgrim => }/application.py | 4 ++-- src/{pilgrim => }/command.py | 2 +- src/{pilgrim => }/database.py | 1 - src/{pilgrim/service => models}/__init__.py | 0 src/{pilgrim => }/models/entry.py | 4 ++-- src/{pilgrim => }/models/photo.py | 6 +++--- src/{pilgrim => }/models/photo_in_entry.py | 2 +- src/{pilgrim => }/models/travel_diary.py | 3 ++- src/pilgrim/__init__.py | 8 -------- src/service/__init__.py | 0 src/{pilgrim => }/service/entry_service.py | 4 ++-- src/{pilgrim => }/service/photo_service.py | 3 ++- src/{pilgrim => }/service/servicemanager.py | 4 ++-- src/{pilgrim => }/service/travel_diary_service.py | 2 +- 15 files changed, 18 insertions(+), 25 deletions(-) rename src/{pilgrim/models => }/__init__.py (100%) rename src/{pilgrim => }/application.py (77%) rename src/{pilgrim => }/command.py (54%) rename src/{pilgrim => }/database.py (99%) rename src/{pilgrim/service => models}/__init__.py (100%) rename src/{pilgrim => }/models/entry.py (88%) rename src/{pilgrim => }/models/photo.py (90%) rename src/{pilgrim => }/models/photo_in_entry.py (92%) rename src/{pilgrim => }/models/travel_diary.py (90%) delete mode 100644 src/pilgrim/__init__.py create mode 100644 src/service/__init__.py rename src/{pilgrim => }/service/entry_service.py (95%) rename src/{pilgrim => }/service/photo_service.py (95%) rename src/{pilgrim => }/service/servicemanager.py (79%) rename src/{pilgrim => }/service/travel_diary_service.py (95%) diff --git a/src/pilgrim/models/__init__.py b/src/__init__.py similarity index 100% rename from src/pilgrim/models/__init__.py rename to src/__init__.py diff --git a/src/pilgrim/application.py b/src/application.py similarity index 77% rename from src/pilgrim/application.py rename to src/application.py index 61d75ba..2dcb79a 100644 --- a/src/pilgrim/application.py +++ b/src/application.py @@ -1,5 +1,5 @@ -from pilgrim.database import Database -from pilgrim.service.servicemanager import ServiceManager +from src.database import Database +from src.service.servicemanager import ServiceManager class Application: diff --git a/src/pilgrim/command.py b/src/command.py similarity index 54% rename from src/pilgrim/command.py rename to src/command.py index 1af56cc..3d23d5a 100644 --- a/src/pilgrim/command.py +++ b/src/command.py @@ -1,4 +1,4 @@ -from pilgrim.application import Application +from src.application import Application def main(): diff --git a/src/pilgrim/database.py b/src/database.py similarity index 99% rename from src/pilgrim/database.py rename to src/database.py index 389b15b..794d698 100644 --- a/src/pilgrim/database.py +++ b/src/database.py @@ -4,7 +4,6 @@ from sqlalchemy.orm import sessionmaker Base = declarative_base() - class Database: def __init__(self): self.engine = create_engine( diff --git a/src/pilgrim/service/__init__.py b/src/models/__init__.py similarity index 100% rename from src/pilgrim/service/__init__.py rename to src/models/__init__.py diff --git a/src/pilgrim/models/entry.py b/src/models/entry.py similarity index 88% rename from src/pilgrim/models/entry.py rename to src/models/entry.py index 4a1132c..8775faf 100644 --- a/src/pilgrim/models/entry.py +++ b/src/models/entry.py @@ -3,8 +3,8 @@ from typing import Any from sqlalchemy import Column, Integer, String, ForeignKey from sqlalchemy.orm import relationship -from pilgrim.models.photo_in_entry import photo_entry_association -from ..database import Base +from src.models.photo_in_entry import photo_entry_association +from src.database import Base class Entry(Base): diff --git a/src/pilgrim/models/photo.py b/src/models/photo.py similarity index 90% rename from src/pilgrim/models/photo.py rename to src/models/photo.py index f6e0406..d4eb6a9 100644 --- a/src/pilgrim/models/photo.py +++ b/src/models/photo.py @@ -1,10 +1,10 @@ from typing import Any -from sqlalchemy import Column, Integer, String, ForeignKey from sqlalchemy.orm import relationship +from sqlalchemy import Column, Integer, String, ForeignKey -from pilgrim.models.photo_in_entry import photo_entry_association -from ..database import Base +from src.models.photo_in_entry import photo_entry_association +from src.database import Base class Photo(Base): diff --git a/src/pilgrim/models/photo_in_entry.py b/src/models/photo_in_entry.py similarity index 92% rename from src/pilgrim/models/photo_in_entry.py rename to src/models/photo_in_entry.py index 76f452e..d07d4fa 100644 --- a/src/pilgrim/models/photo_in_entry.py +++ b/src/models/photo_in_entry.py @@ -1,6 +1,6 @@ from sqlalchemy import Table, Column, Integer, ForeignKey -from ..database import Base +from src.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/models/travel_diary.py similarity index 90% rename from src/pilgrim/models/travel_diary.py rename to src/models/travel_diary.py index 676b49b..15c8579 100644 --- a/src/pilgrim/models/travel_diary.py +++ b/src/models/travel_diary.py @@ -1,8 +1,9 @@ from typing import Any +from src.database import Base + from sqlalchemy import Column, String, Integer -from ..database import Base class TravelDiary(Base): __tablename__ = "travel_diaries" diff --git a/src/pilgrim/__init__.py b/src/pilgrim/__init__.py deleted file mode 100644 index 22aad53..0000000 --- a/src/pilgrim/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from pilgrim.application import Application -from pilgrim.command import main -from pilgrim.database import Database, Base -from pilgrim.models.travel_diary import TravelDiary -from pilgrim.models.entry import Entry -from pilgrim.models.photo import Photo - -__all__ = ["Application", "Database", "TravelDiary", "Entry", "Photo", "main", "Base"] diff --git a/src/service/__init__.py b/src/service/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pilgrim/service/entry_service.py b/src/service/entry_service.py similarity index 95% rename from src/pilgrim/service/entry_service.py rename to src/service/entry_service.py index f316f97..2afedd0 100644 --- a/src/pilgrim/service/entry_service.py +++ b/src/service/entry_service.py @@ -1,7 +1,7 @@ from typing import List -from ..models.entry import Entry -from ..models.travel_diary import TravelDiary +from src.models.entry import Entry +from src.models.travel_diary import TravelDiary class EntryService: diff --git a/src/pilgrim/service/photo_service.py b/src/service/photo_service.py similarity index 95% rename from src/pilgrim/service/photo_service.py rename to src/service/photo_service.py index b1086a9..2232ad1 100644 --- a/src/pilgrim/service/photo_service.py +++ b/src/service/photo_service.py @@ -1,7 +1,8 @@ from pathlib import Path from typing import List -from pilgrim import Photo, TravelDiary +from src.models.photo import Photo +from src.models.travel_diary import TravelDiary class PhotoService: diff --git a/src/pilgrim/service/servicemanager.py b/src/service/servicemanager.py similarity index 79% rename from src/pilgrim/service/servicemanager.py rename to src/service/servicemanager.py index b0b0cde..3e9c3a6 100644 --- a/src/pilgrim/service/servicemanager.py +++ b/src/service/servicemanager.py @@ -1,5 +1,5 @@ -from pilgrim.service.entry_service import EntryService -from pilgrim.service.travel_diary_service import TravelDiaryService +from src.service.entry_service import EntryService +from src.service.travel_diary_service import TravelDiaryService class ServiceManager: diff --git a/src/pilgrim/service/travel_diary_service.py b/src/service/travel_diary_service.py similarity index 95% rename from src/pilgrim/service/travel_diary_service.py rename to src/service/travel_diary_service.py index 0be4cc0..846f27d 100644 --- a/src/pilgrim/service/travel_diary_service.py +++ b/src/service/travel_diary_service.py @@ -1,4 +1,4 @@ -from ..models.travel_diary import TravelDiary +from src.models.travel_diary import TravelDiary class TravelDiaryService: From 8665b6f47b7ddcf4b99cbcf6d8f519ad0cc503b7 Mon Sep 17 00:00:00 2001 From: Matheus Toledo Date: Mon, 16 Jun 2025 15:08:13 -0300 Subject: [PATCH 7/9] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor:=20remove=20u?= =?UTF-8?q?nnecessary=20blank=20lines=20and=20adjust=20package=20path=20in?= =?UTF-8?q?=20pyproject.toml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 805875b..5bc9e75 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,6 @@ requires = ["hatchling"] build-backend = "hatchling.build" - [project] name = "Pilgrim" version = "0.0.1" @@ -20,12 +19,16 @@ classifiers = [ dependencies = [ "sqlalchemy" ] + [template.plugins.default] src-layout = true + [project.urls] Homepage = "https://git.gustavomiranda.xyz/GHMiranda/Pilgrim" Issues = "https://git.gustavomiranda.xyz/GHMiranda/Pilgrim" + [tool.hatch.build.targets.wheel] -packages = ["src/pilgrim"] +packages = ["src"] + [project.scripts] pilgrim = "pilgrim:main" From d206abf01635487c4329b2cad4f229b14cb12e35 Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Santos Souza de Miranda Date: Wed, 25 Jun 2025 22:30:18 -0300 Subject: [PATCH 8/9] =?UTF-8?q?Revert=20"=E2=99=BB=EF=B8=8F=20refactor:=20?= =?UTF-8?q?remove=20unnecessary=20blank=20lines=20and=20adjust=20package?= =?UTF-8?q?=20path=20in=20pyproject.toml"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8665b6f47b7ddcf4b99cbcf6d8f519ad0cc503b7. --- pyproject.toml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5bc9e75..805875b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,6 +2,7 @@ requires = ["hatchling"] build-backend = "hatchling.build" + [project] name = "Pilgrim" version = "0.0.1" @@ -19,16 +20,12 @@ classifiers = [ dependencies = [ "sqlalchemy" ] - [template.plugins.default] src-layout = true - [project.urls] Homepage = "https://git.gustavomiranda.xyz/GHMiranda/Pilgrim" Issues = "https://git.gustavomiranda.xyz/GHMiranda/Pilgrim" - [tool.hatch.build.targets.wheel] -packages = ["src"] - +packages = ["src/pilgrim"] [project.scripts] pilgrim = "pilgrim:main" From 7b13982391dad6bd66780c75cb6fee67f858c24b Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Santos Souza de Miranda Date: Wed, 25 Jun 2025 22:34:19 -0300 Subject: [PATCH 9/9] =?UTF-8?q?Revert=20"=F0=9F=8E=A8refactor:=20move=20mo?= =?UTF-8?q?dules=20and=20refactor=20import=20statements"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 99eb0a0651fdaa04b41f043f9b6bd6674fc5b0d3. --- src/pilgrim/__init__.py | 8 ++++++++ src/{ => pilgrim}/application.py | 4 ++-- src/{ => pilgrim}/command.py | 2 +- src/{ => pilgrim}/database.py | 1 + src/{ => pilgrim/models}/__init__.py | 0 src/{ => pilgrim}/models/entry.py | 4 ++-- src/{ => pilgrim}/models/photo.py | 6 +++--- src/{ => pilgrim}/models/photo_in_entry.py | 2 +- src/{ => pilgrim}/models/travel_diary.py | 3 +-- src/{models => pilgrim/service}/__init__.py | 0 src/{ => pilgrim}/service/entry_service.py | 4 ++-- src/{ => pilgrim}/service/photo_service.py | 3 +-- src/{ => pilgrim}/service/servicemanager.py | 4 ++-- src/{ => pilgrim}/service/travel_diary_service.py | 2 +- src/service/__init__.py | 0 15 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 src/pilgrim/__init__.py rename src/{ => pilgrim}/application.py (77%) rename src/{ => pilgrim}/command.py (54%) rename src/{ => pilgrim}/database.py (99%) rename src/{ => pilgrim/models}/__init__.py (100%) rename src/{ => pilgrim}/models/entry.py (88%) rename src/{ => pilgrim}/models/photo.py (90%) rename src/{ => pilgrim}/models/photo_in_entry.py (92%) rename src/{ => pilgrim}/models/travel_diary.py (90%) rename src/{models => pilgrim/service}/__init__.py (100%) rename src/{ => pilgrim}/service/entry_service.py (95%) rename src/{ => pilgrim}/service/photo_service.py (95%) rename src/{ => pilgrim}/service/servicemanager.py (79%) rename src/{ => pilgrim}/service/travel_diary_service.py (95%) delete mode 100644 src/service/__init__.py diff --git a/src/pilgrim/__init__.py b/src/pilgrim/__init__.py new file mode 100644 index 0000000..22aad53 --- /dev/null +++ b/src/pilgrim/__init__.py @@ -0,0 +1,8 @@ +from pilgrim.application import Application +from pilgrim.command import main +from pilgrim.database import Database, Base +from pilgrim.models.travel_diary import TravelDiary +from pilgrim.models.entry import Entry +from pilgrim.models.photo import Photo + +__all__ = ["Application", "Database", "TravelDiary", "Entry", "Photo", "main", "Base"] diff --git a/src/application.py b/src/pilgrim/application.py similarity index 77% rename from src/application.py rename to src/pilgrim/application.py index 2dcb79a..61d75ba 100644 --- a/src/application.py +++ b/src/pilgrim/application.py @@ -1,5 +1,5 @@ -from src.database import Database -from src.service.servicemanager import ServiceManager +from pilgrim.database import Database +from pilgrim.service.servicemanager import ServiceManager class Application: diff --git a/src/command.py b/src/pilgrim/command.py similarity index 54% rename from src/command.py rename to src/pilgrim/command.py index 3d23d5a..1af56cc 100644 --- a/src/command.py +++ b/src/pilgrim/command.py @@ -1,4 +1,4 @@ -from src.application import Application +from pilgrim.application import Application def main(): diff --git a/src/database.py b/src/pilgrim/database.py similarity index 99% rename from src/database.py rename to src/pilgrim/database.py index 794d698..389b15b 100644 --- a/src/database.py +++ b/src/pilgrim/database.py @@ -4,6 +4,7 @@ from sqlalchemy.orm import sessionmaker Base = declarative_base() + class Database: def __init__(self): self.engine = create_engine( diff --git a/src/__init__.py b/src/pilgrim/models/__init__.py similarity index 100% rename from src/__init__.py rename to src/pilgrim/models/__init__.py diff --git a/src/models/entry.py b/src/pilgrim/models/entry.py similarity index 88% rename from src/models/entry.py rename to src/pilgrim/models/entry.py index 8775faf..4a1132c 100644 --- a/src/models/entry.py +++ b/src/pilgrim/models/entry.py @@ -3,8 +3,8 @@ from typing import Any from sqlalchemy import Column, Integer, String, ForeignKey from sqlalchemy.orm import relationship -from src.models.photo_in_entry import photo_entry_association -from src.database import Base +from pilgrim.models.photo_in_entry import photo_entry_association +from ..database import Base class Entry(Base): diff --git a/src/models/photo.py b/src/pilgrim/models/photo.py similarity index 90% rename from src/models/photo.py rename to src/pilgrim/models/photo.py index d4eb6a9..f6e0406 100644 --- a/src/models/photo.py +++ b/src/pilgrim/models/photo.py @@ -1,10 +1,10 @@ from typing import Any -from sqlalchemy.orm import relationship from sqlalchemy import Column, Integer, String, ForeignKey +from sqlalchemy.orm import relationship -from src.models.photo_in_entry import photo_entry_association -from src.database import Base +from pilgrim.models.photo_in_entry import photo_entry_association +from ..database import Base class Photo(Base): diff --git a/src/models/photo_in_entry.py b/src/pilgrim/models/photo_in_entry.py similarity index 92% rename from src/models/photo_in_entry.py rename to src/pilgrim/models/photo_in_entry.py index d07d4fa..76f452e 100644 --- a/src/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 src.database import Base +from ..database import Base photo_entry_association = Table('photo_entry_association', Base.metadata, Column('id', Integer, primary_key=True, autoincrement=True), diff --git a/src/models/travel_diary.py b/src/pilgrim/models/travel_diary.py similarity index 90% rename from src/models/travel_diary.py rename to src/pilgrim/models/travel_diary.py index 15c8579..676b49b 100644 --- a/src/models/travel_diary.py +++ b/src/pilgrim/models/travel_diary.py @@ -1,9 +1,8 @@ from typing import Any -from src.database import Base - from sqlalchemy import Column, String, Integer +from ..database import Base class TravelDiary(Base): __tablename__ = "travel_diaries" diff --git a/src/models/__init__.py b/src/pilgrim/service/__init__.py similarity index 100% rename from src/models/__init__.py rename to src/pilgrim/service/__init__.py diff --git a/src/service/entry_service.py b/src/pilgrim/service/entry_service.py similarity index 95% rename from src/service/entry_service.py rename to src/pilgrim/service/entry_service.py index 2afedd0..f316f97 100644 --- a/src/service/entry_service.py +++ b/src/pilgrim/service/entry_service.py @@ -1,7 +1,7 @@ from typing import List -from src.models.entry import Entry -from src.models.travel_diary import TravelDiary +from ..models.entry import Entry +from ..models.travel_diary import TravelDiary class EntryService: diff --git a/src/service/photo_service.py b/src/pilgrim/service/photo_service.py similarity index 95% rename from src/service/photo_service.py rename to src/pilgrim/service/photo_service.py index 2232ad1..b1086a9 100644 --- a/src/service/photo_service.py +++ b/src/pilgrim/service/photo_service.py @@ -1,8 +1,7 @@ from pathlib import Path from typing import List -from src.models.photo import Photo -from src.models.travel_diary import TravelDiary +from pilgrim import Photo, TravelDiary class PhotoService: diff --git a/src/service/servicemanager.py b/src/pilgrim/service/servicemanager.py similarity index 79% rename from src/service/servicemanager.py rename to src/pilgrim/service/servicemanager.py index 3e9c3a6..b0b0cde 100644 --- a/src/service/servicemanager.py +++ b/src/pilgrim/service/servicemanager.py @@ -1,5 +1,5 @@ -from src.service.entry_service import EntryService -from src.service.travel_diary_service import TravelDiaryService +from pilgrim.service.entry_service import EntryService +from pilgrim.service.travel_diary_service import TravelDiaryService class ServiceManager: diff --git a/src/service/travel_diary_service.py b/src/pilgrim/service/travel_diary_service.py similarity index 95% rename from src/service/travel_diary_service.py rename to src/pilgrim/service/travel_diary_service.py index 846f27d..0be4cc0 100644 --- a/src/service/travel_diary_service.py +++ b/src/pilgrim/service/travel_diary_service.py @@ -1,4 +1,4 @@ -from src.models.travel_diary import TravelDiary +from ..models.travel_diary import TravelDiary class TravelDiaryService: diff --git a/src/service/__init__.py b/src/service/__init__.py deleted file mode 100644 index e69de29..0000000