mirror of
https://github.com/gmbrax/Pilgrim.git
synced 2026-11-10 16:30:17 +00:00
Compare commits
146
Commits
@@ -1,24 +0,0 @@
|
||||
name: Pylint
|
||||
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
python-version: ["3.10"]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up Python ${{ matrix.python-version }}
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
|
||||
pip install pylint
|
||||
- name: Analysing the code with pylint
|
||||
run: |
|
||||
pylint --disable=C0114,C0115,C0116 --exit-zero $(git ls-files '*.py')
|
||||
@@ -0,0 +1,63 @@
|
||||
name: Pylint and SonarCloud
|
||||
on:
|
||||
push:
|
||||
branches: [ main, master, staging ]
|
||||
pull_request:
|
||||
branches: [ main, master, staging ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
python-version: ["3.10"]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0 # Necessário para SonarCloud
|
||||
|
||||
- name: Set up Python ${{ matrix.python-version }}
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
|
||||
pip install pylint ruff coverage pytest
|
||||
|
||||
- name: Analysing the code with pylint (console output)
|
||||
run: |
|
||||
pylint --disable=C0114,C0115,C0116 --exit-zero $(git ls-files '*.py') || true
|
||||
|
||||
- name: Generate Pylint report for SonarCloud
|
||||
run: |
|
||||
pylint --disable=C0114,C0115,C0116 --output-format=json --exit-zero $(git ls-files '*.py') > pylint-report.json || true
|
||||
|
||||
- name: Run Ruff
|
||||
run: |
|
||||
ruff check --output-format=json . > ruff-report.json || true
|
||||
|
||||
- name: Run tests with coverage (if you have tests)
|
||||
run: |
|
||||
if [ -d "tests" ] || [ -f "test_*.py" ] || [ -f "*_test.py" ]; then
|
||||
coverage run -m pytest || true
|
||||
coverage xml || true
|
||||
else
|
||||
echo "No tests found, skipping coverage"
|
||||
fi
|
||||
|
||||
- name: SonarCloud Scan
|
||||
uses: SonarSource/sonarqube-scan-action@v5.0.0
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
||||
with:
|
||||
args: >
|
||||
-Dsonar.projectKey=gmbrax_Pilgrim
|
||||
-Dsonar.organization=gmbrax
|
||||
-Dsonar.python.pylint.reportPaths=pylint-report.json
|
||||
-Dsonar.python.ruff.reportPaths=ruff-report.json
|
||||
-Dsonar.python.coverage.reportPaths=coverage.xml
|
||||
+145
-1
@@ -1,2 +1,146 @@
|
||||
# Database files
|
||||
database.db
|
||||
__pycache__
|
||||
|
||||
.build-vend/
|
||||
dist_nuitka/
|
||||
# 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/
|
||||
|
||||
# IDE settings
|
||||
.vscode/
|
||||
.idea/
|
||||
|
||||
Generated
-11
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="PYTHON_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Python 3.10 (Pilgrim)" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
-6
@@ -1,6 +0,0 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<settings>
|
||||
<option name="USE_PROJECT_PROFILE" value="false" />
|
||||
<version value="1.0" />
|
||||
</settings>
|
||||
</component>
|
||||
Generated
-8
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/Pilgrim.iml" filepath="$PROJECT_DIR$/.idea/Pilgrim.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
Generated
-6
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
Generated
-201
@@ -1,201 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="0a7f92e2-b44a-4dfe-8e01-136d1c0c18be" name="Changes" comment="Added the travel_diary id as foreign key to the photos and add a check on the creation to avoid leaving it empty or bad referenced">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/pilgrim/models/entry.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/models/entry.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/pilgrim/models/photo.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/models/photo.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/pilgrim/models/photo_in_entry.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/models/photo_in_entry.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/pilgrim/service/entry_service.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/service/entry_service.py" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
<option value="Python Script" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||
<map>
|
||||
<entry key="$PROJECT_DIR$" value="proposed_changes" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
<option name="UPDATE_TYPE" value="REBASE" />
|
||||
</component>
|
||||
<component name="GitHubPullRequestSearchHistory">{
|
||||
"lastFilter": {
|
||||
"state": "OPEN",
|
||||
"assignee": "gmbrax"
|
||||
}
|
||||
}</component>
|
||||
<component name="GithubPullRequestsUISettings">{
|
||||
"selectedUrlAndAccountId": {
|
||||
"url": "https://github.com/gmbrax/Pilgrim.git",
|
||||
"accountId": "213d8456-c67d-4cfd-99a6-337d47c35b4a"
|
||||
}
|
||||
}</component>
|
||||
<component name="ProjectColorInfo">{
|
||||
"associatedIndex": 0
|
||||
}</component>
|
||||
<component name="ProjectId" id="2y0y1J9RlHT6m1qL5RuCBf0Ramp" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">{
|
||||
"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"
|
||||
}
|
||||
}</component>
|
||||
<component name="RunManager">
|
||||
<configuration name="pilgrim" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
|
||||
<module name="Pilgrim" />
|
||||
<option name="ENV_FILES" value="" />
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
<envs>
|
||||
<env name="PYTHONUNBUFFERED" value="1" />
|
||||
</envs>
|
||||
<option name="SDK_HOME" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.venv/bin" />
|
||||
<option name="IS_MODULE_SDK" value="false" />
|
||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
|
||||
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/.venv/bin/pilgrim" />
|
||||
<option name="PARAMETERS" value="" />
|
||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||
<option name="EMULATE_TERMINAL" value="false" />
|
||||
<option name="MODULE_MODE" value="false" />
|
||||
<option name="REDIRECT_INPUT" value="false" />
|
||||
<option name="INPUT_FILE" value="" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Python.pilgrim" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
<component name="SharedIndexes">
|
||||
<attachedChunks>
|
||||
<set>
|
||||
<option value="bundled-js-predefined-d6986cc7102b-6a121458b545-JavaScript-PY-251.25410.159" />
|
||||
<option value="bundled-python-sdk-e0ed3721d81e-36ea0e71a18c-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-251.25410.159" />
|
||||
</set>
|
||||
</attachedChunks>
|
||||
</component>
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="Default task">
|
||||
<changelist id="0a7f92e2-b44a-4dfe-8e01-136d1c0c18be" name="Changes" comment="" />
|
||||
<created>1748985568579</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1748985568579</updated>
|
||||
<workItem from="1748985569621" duration="2124000" />
|
||||
<workItem from="1748992451560" duration="312000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="Added a Back Relationship in Entry to list all the photos">
|
||||
<option name="closed" value="true" />
|
||||
<created>1749004109515</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1749004109515</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="Changed the names of the files to conform the python convection and also added photo_in_entry.py to diminish the cyclic import error in pylint">
|
||||
<option name="closed" value="true" />
|
||||
<created>1749006784623</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1749006784623</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00003" summary="Added the Services layer to the code to do the database operation">
|
||||
<option name="closed" value="true" />
|
||||
<created>1749140898576</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1749140898576</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00004" summary="Added the photo_service.py and modified photo.py to have all the crud operations">
|
||||
<option name="closed" value="true" />
|
||||
<created>1749155713848</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1749155713848</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00005" summary="Made some changes to naming in both the classes and the tables of the database to conform the correct naming scheme">
|
||||
<option name="closed" value="true" />
|
||||
<created>1749164385581</created>
|
||||
<option name="number" value="00005" />
|
||||
<option name="presentableId" value="LOCAL-00005" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1749164385581</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00006" summary="Added the travel_diary id as foreign key to the photos and add a check on the creation to avoid leaving it empty or bad referenced">
|
||||
<option name="closed" value="true" />
|
||||
<created>1749168650225</created>
|
||||
<option name="number" value="00006" />
|
||||
<option name="presentableId" value="LOCAL-00006" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1749168650225</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="7" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State />
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="Added a Back Relationship in Entry to list all the photos" />
|
||||
<MESSAGE value="Changed the names of the files to conform the python convection and also added photo_in_entry.py to diminish the cyclic import error in pylint" />
|
||||
<MESSAGE value="Added the Services layer to the code to do the database operation" />
|
||||
<MESSAGE value="Added the photo_service.py and modified photo.py to have all the crud operations" />
|
||||
<MESSAGE value="Made some changes to naming in both the classes and the tables of the database to conform the correct naming scheme" />
|
||||
<MESSAGE value="Added the travel_diary id as foreign key to the photos and add a check on the creation to avoid leaving it empty or bad referenced" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Added the travel_diary id as foreign key to the photos and add a check on the creation to avoid leaving it empty or bad referenced" />
|
||||
</component>
|
||||
<component name="com.intellij.coverage.CoverageDataManagerImpl">
|
||||
<SUITE FILE_PATH="coverage/Pilgrim$Database.coverage" NAME="Database Coverage Results" MODIFIED="1748987101492" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/Database" />
|
||||
<SUITE FILE_PATH="coverage/Pilgrim$pilgrim.coverage" NAME="pilgrim Coverage Results" MODIFIED="1749097142827" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/.venv/bin" />
|
||||
<SUITE FILE_PATH="coverage/Pilgrim$main.coverage" NAME="main Coverage Results" MODIFIED="1748992510527" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src" />
|
||||
<SUITE FILE_PATH="coverage/Pilgrim$command.coverage" NAME="command Coverage Results" MODIFIED="1748992876551" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/Pilgrim" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -0,0 +1,68 @@
|
||||
# Changelog
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
The format is based on Keep a Changelog, and this project adheres to Semantic Versioning.
|
||||
|
||||
## Unreleased
|
||||
|
||||
## Planned
|
||||
* Installation Method 1 (repository compilation)
|
||||
* Organization of trips by date, location, or theme
|
||||
* Enhanced photo management features
|
||||
* Search functionality
|
||||
* Export features
|
||||
* Testing implementation
|
||||
|
||||
## [0.0.4] - 2025-07-19
|
||||
|
||||
### 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
|
||||
|
||||
### Changed
|
||||
* Enhanced feedback and validation when editing or creating diary names
|
||||
* Streamlined and unified save logic for diary modals, reducing duplicated behavior
|
||||
* About screen now displays the actual installed application version dynamically
|
||||
* Sidebar and photo-related UI text updated to remove emoji icons for a cleaner appearance
|
||||
* Sidebar layout and scrolling behavior improved for better usability
|
||||
* Photo hash generation now relies on existing service-provided hashes instead of local computation
|
||||
|
||||
### Improved
|
||||
* Enhanced feedback and validation when editing or creating diary names
|
||||
* Streamlined and unified save logic for diary modals, reducing duplicated behavior
|
||||
* Sidebar layout and scrolling behavior for better usability
|
||||
|
||||
## [0.0.3] - 2025-07-07
|
||||
|
||||
### Changed
|
||||
* Removed the dependency on textual-dev from pyproject.toml
|
||||
|
||||
## [0.0.2] - 2025-07-07
|
||||
|
||||
### Changed
|
||||
* 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)
|
||||
|
||||
### Known Issues
|
||||
* Installation Method 1 not yet implemented
|
||||
* No testing suite implemented yet
|
||||
* Some features may be unstable in an alpha version
|
||||
@@ -1,3 +1,46 @@
|
||||
# Python_Pilgrim
|
||||
# Pilgrim
|
||||
|
||||
Python Based Travel Diary
|
||||
## Overview
|
||||
|
||||
**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 and add them to the diary entry
|
||||
|
||||
## 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
|
||||
|
||||
To install the application you must issue the command:
|
||||
|
||||
```bash
|
||||
pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple Pilgrim
|
||||
```
|
||||
|
||||
## Usage
|
||||
|
||||
To use application you just issue:
|
||||
```bash
|
||||
pilgrim
|
||||
```
|
||||
|
||||
This will start the Pilgrim application. Follow the on-screen instructions to create and manage your travel diaries.
|
||||
|
||||
## Changelog
|
||||
|
||||
To see all the changes in the current version, please refer to the [CHANGELOG](CHANGELOG.md)
|
||||
|
||||
## License
|
||||
|
||||
This project is licensed under the BSD 3-Clause License — see the [LICENSE](LICENSE) file for details.
|
||||
|
||||
+34
-29
@@ -1,31 +1,36 @@
|
||||
[build-system]
|
||||
requires = ["hatchling"]
|
||||
build-backend = "hatchling.build"
|
||||
[build-system]
|
||||
requires = ["hatchling"]
|
||||
build-backend = "hatchling.build"
|
||||
|
||||
|
||||
[project]
|
||||
name = "Pilgrim"
|
||||
version = "0.0.1"
|
||||
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 :: MIT License",
|
||||
"Operating System :: OS Independent",
|
||||
]
|
||||
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"]
|
||||
[project.scripts]
|
||||
pilgrim = "pilgrim:main"
|
||||
[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"
|
||||
|
||||
|
||||
]
|
||||
[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"
|
||||
|
||||
+4
-2
@@ -1,4 +1,6 @@
|
||||
greenlet==3.2.2
|
||||
greenlet==3.2.3
|
||||
SQLAlchemy==2.0.41
|
||||
typing_extensions==4.14.0
|
||||
typing_extensions==4.14.1
|
||||
|
||||
|
||||
textual~=4.0.0
|
||||
@@ -1,13 +1,23 @@
|
||||
from pilgrim.database import Database
|
||||
from pilgrim.service.servicemanager import ServiceManager
|
||||
from pilgrim.ui.ui import UIApp
|
||||
from pilgrim.utils import ConfigManager
|
||||
|
||||
|
||||
class Application:
|
||||
def __init__(self):
|
||||
self.database = Database()
|
||||
self.config_manager = ConfigManager()
|
||||
self.config_manager.read_config() # Chamar antes de criar o Database
|
||||
self.database = Database(self.config_manager)
|
||||
session = self.database.session()
|
||||
session_manager = ServiceManager()
|
||||
session_manager.set_session(session)
|
||||
self.ui = UIApp(session_manager, self.config_manager)
|
||||
|
||||
def run(self):
|
||||
print(f"URL do banco: {self.config_manager.database_url}")
|
||||
self.database.create()
|
||||
self.ui.run()
|
||||
|
||||
def get_service_manager(self):
|
||||
session = self.database.session()
|
||||
|
||||
@@ -4,3 +4,6 @@ from pilgrim.application import Application
|
||||
def main():
|
||||
app = Application()
|
||||
app.run()
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
+21
-4
@@ -1,21 +1,38 @@
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.ext.declarative import declarative_base
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from pathlib import Path
|
||||
import os
|
||||
import shutil
|
||||
|
||||
from pilgrim.utils import ConfigManager
|
||||
|
||||
Base = declarative_base()
|
||||
|
||||
|
||||
|
||||
class Database:
|
||||
def __init__(self):
|
||||
|
||||
def __init__(self, config_manager: ConfigManager):
|
||||
self.db_path = config_manager.database_url
|
||||
|
||||
# Garantir que o diretório existe
|
||||
db_dir = os.path.dirname(self.db_path)
|
||||
if not os.path.exists(db_dir):
|
||||
os.makedirs(db_dir, exist_ok=True)
|
||||
|
||||
self.engine = create_engine(
|
||||
"sqlite:///database.db",
|
||||
f"sqlite:///{self.db_path}",
|
||||
echo=False,
|
||||
connect_args={"check_same_thread": False},
|
||||
)
|
||||
self.session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
|
||||
self._session_maker = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
|
||||
|
||||
def create(self):
|
||||
Base.metadata.create_all(self.engine)
|
||||
|
||||
def session(self):
|
||||
return self._session_maker()
|
||||
|
||||
def get_db(self):
|
||||
return self.session()
|
||||
return self._session_maker()
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
from typing import Any
|
||||
|
||||
from sqlalchemy import Column, Integer, String, ForeignKey
|
||||
from pilgrim.models.photo_in_entry import photo_entry_association
|
||||
from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
from pilgrim.models.photo_in_entry import photo_entry_association
|
||||
from ..database import Base
|
||||
|
||||
|
||||
@@ -12,12 +12,14 @@ class Entry(Base):
|
||||
id = Column(Integer, primary_key=True)
|
||||
title = Column(String)
|
||||
text = Column(String)
|
||||
date = Column(String)
|
||||
date = Column(DateTime)
|
||||
photos = relationship(
|
||||
"Photo",
|
||||
secondary=photo_entry_association,
|
||||
back_populates="entries")
|
||||
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="entries")
|
||||
|
||||
def __init__(self, title: str, text: str, date: str, travel_diary_id: int, **kw: Any):
|
||||
super().__init__(**kw)
|
||||
self.title = title
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
from typing import Any
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
|
||||
from sqlalchemy import Column, Integer, String, ForeignKey
|
||||
from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
|
||||
from sqlalchemy.orm import relationship
|
||||
from sqlalchemy.sql.schema import Index
|
||||
|
||||
from pilgrim.models.photo_in_entry import photo_entry_association
|
||||
from ..database import Base
|
||||
@@ -12,8 +15,9 @@ class Photo(Base):
|
||||
id = Column(Integer, primary_key=True)
|
||||
filepath = Column(String)
|
||||
name = Column(String)
|
||||
addition_date = Column(String)
|
||||
addition_date = Column(DateTime, default=datetime.now)
|
||||
caption = Column(String)
|
||||
photo_hash = Column(String,name='hash')
|
||||
entries = relationship(
|
||||
"Entry",
|
||||
secondary=photo_entry_association,
|
||||
@@ -21,11 +25,21 @@ class Photo(Base):
|
||||
)
|
||||
|
||||
fk_travel_diary_id = Column(Integer, ForeignKey("travel_diaries.id"),nullable=False)
|
||||
__table_args__ = (
|
||||
Index('idx_photo_hash_diary', 'hash', 'fk_travel_diary_id'),
|
||||
)
|
||||
|
||||
def __init__(self, filepath, name, addition_date=None, caption=None, entries=None, **kw: Any):
|
||||
def __init__(self, filepath, name, photo_hash, addition_date=None, caption=None, entries=None, fk_travel_diary_id=None, **kw: Any):
|
||||
super().__init__(**kw)
|
||||
self.filepath = filepath
|
||||
# Convert Path to string if needed
|
||||
if isinstance(filepath, Path):
|
||||
self.filepath = str(filepath)
|
||||
else:
|
||||
self.filepath = filepath
|
||||
self.name = name
|
||||
self.addition_date = addition_date
|
||||
self.addition_date = addition_date if addition_date is not None else datetime.now()
|
||||
self.caption = caption
|
||||
self.entries = entries
|
||||
self.photo_hash = photo_hash
|
||||
self.entries = entries if entries is not None else []
|
||||
if fk_travel_diary_id is not None:
|
||||
self.fk_travel_diary_id = fk_travel_diary_id
|
||||
|
||||
@@ -1,14 +1,26 @@
|
||||
from typing import Any
|
||||
|
||||
from sqlalchemy import Column, String, Integer
|
||||
from sqlalchemy import Column, Integer, String, UniqueConstraint
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
from ..database import Base
|
||||
from .. import database
|
||||
|
||||
class TravelDiary(Base):
|
||||
|
||||
class TravelDiary(database.Base):
|
||||
__tablename__ = "travel_diaries"
|
||||
id = Column(Integer, primary_key=True)
|
||||
name = Column(String)
|
||||
name = Column(String, nullable=False)
|
||||
directory_name = Column(String, nullable=False, unique=True)
|
||||
entries = relationship("Entry", back_populates="travel_diary", cascade="all, delete-orphan")
|
||||
|
||||
def __init__(self, name: str, **kw: Any):
|
||||
__table_args__ = (
|
||||
UniqueConstraint('directory_name', name='uq_travel_diary_directory_name'),
|
||||
)
|
||||
|
||||
def __init__(self, name: str, directory_name: str = None, **kw: Any):
|
||||
super().__init__(**kw)
|
||||
self.name = name
|
||||
self.directory_name = directory_name # Será definido pelo service
|
||||
|
||||
def __repr__(self):
|
||||
return f"<TravelDiary(id={self.id}, name='{self.name}', directory_name='{self.directory_name}')>"
|
||||
|
||||
@@ -1,33 +1,41 @@
|
||||
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
|
||||
|
||||
|
||||
class EntryService:
|
||||
def __init__(self,session):
|
||||
def __init__(self, session):
|
||||
self.session = session
|
||||
|
||||
def create(self, travel_diary_id:int, title: str, text: str, date: str, ):
|
||||
# ✨ Modifique a assinatura para aceitar a lista de fotos
|
||||
def create(self, travel_diary_id: int, title: str, text: str, date: datetime, photos: List[Photo]):
|
||||
travel_diary = self.session.query(TravelDiary).filter(TravelDiary.id == travel_diary_id).first()
|
||||
if not travel_diary:
|
||||
return None
|
||||
new_entry = Entry(title,text,date,travel_diary_id)
|
||||
|
||||
new_entry = Entry(title, text, date, travel_diary_id,photos=photos)
|
||||
|
||||
# ✨ Atribua a relação ANTES de adicionar e fazer o commit
|
||||
new_entry.photos = photos
|
||||
|
||||
self.session.add(new_entry)
|
||||
self.session.commit()
|
||||
self.session.refresh(new_entry)
|
||||
return new_entry
|
||||
|
||||
def read_by_id(self,entry_id:int)->Entry:
|
||||
def read_by_id(self, entry_id: int) -> Entry:
|
||||
entry = self.session.query(Entry).filter(Entry.id == entry_id).first()
|
||||
return entry
|
||||
|
||||
def read_all(self)-> List[Entry]:
|
||||
def read_all(self) -> List[Entry]:
|
||||
entries = self.session.query(Entry).all()
|
||||
return entries
|
||||
|
||||
def update(self,entry_src:Entry,entry_dst:Entry) -> Entry | None:
|
||||
original:Entry = self.read_by_id(entry_src.id)
|
||||
def update(self, entry_src: Entry, entry_dst: Entry) -> Entry | None:
|
||||
original: Entry = self.read_by_id(entry_src.id)
|
||||
if original:
|
||||
original.title = entry_dst.title
|
||||
original.text = entry_dst.text
|
||||
@@ -39,7 +47,7 @@ class EntryService:
|
||||
return original
|
||||
return None
|
||||
|
||||
def delete(self,entry_src:Entry)-> Entry | None:
|
||||
def delete(self, entry_src: Entry) -> Entry | None:
|
||||
excluded = self.read_by_id(entry_src.id)
|
||||
if excluded is not None:
|
||||
self.session.delete(excluded)
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
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)
|
||||
@@ -0,0 +1,48 @@
|
||||
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)
|
||||
@@ -0,0 +1,23 @@
|
||||
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
|
||||
@@ -0,0 +1,67 @@
|
||||
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)
|
||||
@@ -1,47 +1,168 @@
|
||||
import hashlib
|
||||
import os
|
||||
import shutil
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
from typing import List
|
||||
|
||||
from pilgrim import Photo, TravelDiary
|
||||
from pilgrim.models.photo import Photo
|
||||
from pilgrim.models.travel_diary import TravelDiary
|
||||
from pilgrim.utils import DirectoryManager
|
||||
|
||||
|
||||
class PhotoService:
|
||||
def __init__(self, session):
|
||||
self.session = session
|
||||
|
||||
def create(self, filepath:Path, name:str, travel_diary_id, addition_date=None, caption=None, ) -> Photo | None:
|
||||
@staticmethod
|
||||
def hash_file(filepath: Path) -> str:
|
||||
"""Calculate the hash of a file using SHA3-384."""
|
||||
hash_func = hashlib.new('sha3_384')
|
||||
with open(filepath, 'rb') as f:
|
||||
while chunk := f.read(8192):
|
||||
hash_func.update(chunk)
|
||||
return hash_func.hexdigest()
|
||||
|
||||
def _ensure_images_directory(self, travel_diary: TravelDiary) -> Path:
|
||||
"""
|
||||
Ensures the images directory exists for the given diary.
|
||||
Returns the path to the images directory.
|
||||
"""
|
||||
images_dir = DirectoryManager.get_diary_images_directory(travel_diary.directory_name)
|
||||
|
||||
if not images_dir.exists():
|
||||
images_dir.mkdir(parents=True)
|
||||
os.chmod(images_dir, 0o700) # Ensure correct permissions
|
||||
|
||||
return images_dir
|
||||
|
||||
def _copy_photo_to_diary(self, source_path: Path, travel_diary: TravelDiary) -> Path:
|
||||
"""
|
||||
Copies a photo to the diary's images directory.
|
||||
Returns the path to the copied file.
|
||||
"""
|
||||
images_dir = self._ensure_images_directory(travel_diary)
|
||||
|
||||
# Get original filename and extension
|
||||
original_name = Path(source_path).name
|
||||
|
||||
# Create destination path
|
||||
dest_path = images_dir / original_name
|
||||
|
||||
# If file with same name exists, add a number
|
||||
counter = 1
|
||||
while dest_path.exists():
|
||||
name_parts = original_name.rsplit('.', 1)
|
||||
if len(name_parts) > 1:
|
||||
dest_path = images_dir / f"{name_parts[0]}_{counter}.{name_parts[1]}"
|
||||
else:
|
||||
dest_path = images_dir / f"{original_name}_{counter}"
|
||||
counter += 1
|
||||
|
||||
# Copy the file
|
||||
shutil.copy2(source_path, dest_path)
|
||||
os.chmod(dest_path, 0o600) # Read/write for owner only
|
||||
|
||||
return dest_path
|
||||
|
||||
def check_photo_by_hash(self, photohash:str, traveldiaryid:int):
|
||||
photo = (self.session.query(Photo).filter(Photo.photo_hash == photohash,Photo.fk_travel_diary_id == traveldiaryid)
|
||||
.first())
|
||||
return photo
|
||||
|
||||
def create(self, filepath: Path, name: str, travel_diary_id: int, caption=None, addition_date=None) -> Photo | None:
|
||||
travel_diary = self.session.query(TravelDiary).filter(TravelDiary.id == travel_diary_id).first()
|
||||
if not travel_diary:
|
||||
return None
|
||||
new_photo = Photo(filepath, name, addition_date=addition_date, caption=caption)
|
||||
photo_hash = self.hash_file(filepath)
|
||||
if self.check_photo_by_hash(photo_hash, travel_diary_id):
|
||||
return None
|
||||
|
||||
# Copy photo to diary's images directory
|
||||
copied_path = self._copy_photo_to_diary(filepath, travel_diary)
|
||||
|
||||
# Convert addition_date string to datetime if needed
|
||||
if isinstance(addition_date, str):
|
||||
try:
|
||||
addition_date = datetime.strptime(addition_date, "%Y-%m-%d %H:%M:%S")
|
||||
except ValueError:
|
||||
addition_date = None
|
||||
|
||||
|
||||
new_photo = Photo(
|
||||
filepath=str(copied_path), # Store the path to the copied file
|
||||
name=name,
|
||||
caption=caption,
|
||||
fk_travel_diary_id=travel_diary_id,
|
||||
addition_date=addition_date,
|
||||
photo_hash=photo_hash
|
||||
)
|
||||
self.session.add(new_photo)
|
||||
self.session.commit()
|
||||
self.session.refresh(new_photo)
|
||||
|
||||
return new_photo
|
||||
|
||||
def read_by_id(self, photo_id:int) -> Photo:
|
||||
return self.session.query(Photo).get(photo_id)
|
||||
|
||||
def read_all(self) -> List[Photo]:
|
||||
return self.session.query(Photo).all()
|
||||
|
||||
def update(self,photo_src:Photo,photo_dst:Photo) -> Photo | None:
|
||||
original:Photo = self.read_by_id(photo_src.id)
|
||||
def update(self, photo_src: Photo, photo_dst: Photo) -> Photo | None:
|
||||
original: Photo = self.read_by_id(photo_src.id)
|
||||
if original:
|
||||
original.filepath = photo_dst.filepath
|
||||
# If filepath changed, need to copy new file
|
||||
if str(photo_dst.filepath) != str(original.filepath):
|
||||
travel_diary = self.session.query(TravelDiary).filter(
|
||||
TravelDiary.id == original.fk_travel_diary_id).first()
|
||||
if travel_diary:
|
||||
# Copy new photo
|
||||
new_path = self._copy_photo_to_diary(Path(photo_dst.filepath), travel_diary)
|
||||
# Delete old photo if it exists in our images directory
|
||||
old_path = Path(original.filepath)
|
||||
if old_path.exists() and str(DirectoryManager.get_diaries_root()) in str(old_path):
|
||||
old_path.unlink()
|
||||
original.filepath = str(new_path)
|
||||
# Update hash based on the new copied file
|
||||
original.photo_hash = self.hash_file(new_path)
|
||||
|
||||
original.name = photo_dst.name
|
||||
original.addition_date = photo_dst.addition_date
|
||||
original.caption = photo_dst.caption
|
||||
original.entries.extend(photo_dst.entries)
|
||||
|
||||
if photo_dst.entries and len(photo_dst.entries) > 0:
|
||||
if original.entries is None:
|
||||
original.entries = []
|
||||
original.entries = photo_dst.entries # Replace instead of extend
|
||||
|
||||
self.session.commit()
|
||||
self.session.refresh(original)
|
||||
return original
|
||||
return None
|
||||
|
||||
def delete(self, photo_src:Photo) -> Photo | None:
|
||||
def delete(self, photo_src: Photo) -> Photo | None:
|
||||
excluded = self.read_by_id(photo_src.id)
|
||||
if excluded:
|
||||
# Store photo data before deletion
|
||||
deleted_photo = Photo(
|
||||
filepath=excluded.filepath,
|
||||
name=excluded.name,
|
||||
addition_date=excluded.addition_date,
|
||||
caption=excluded.caption,
|
||||
fk_travel_diary_id=excluded.fk_travel_diary_id,
|
||||
id=excluded.id,
|
||||
photo_hash=excluded.photo_hash,
|
||||
entries=excluded.entries,
|
||||
)
|
||||
|
||||
# Delete the physical file if it exists in our images directory
|
||||
file_path = Path(excluded.filepath)
|
||||
if file_path.exists() and str(DirectoryManager.get_diaries_root()) in str(file_path):
|
||||
file_path.unlink()
|
||||
|
||||
self.session.delete(excluded)
|
||||
self.session.commit()
|
||||
self.session.refresh(excluded)
|
||||
return excluded
|
||||
|
||||
return deleted_photo
|
||||
return None
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
from pilgrim.service.entry_service import EntryService
|
||||
from pilgrim.service.photo_service import PhotoService
|
||||
from pilgrim.service.travel_diary_service import TravelDiaryService
|
||||
|
||||
|
||||
@@ -17,3 +18,7 @@ class ServiceManager:
|
||||
if self.session is not None:
|
||||
return TravelDiaryService(self.session)
|
||||
return None
|
||||
def get_photo_service(self):
|
||||
if self.session is not None:
|
||||
return PhotoService(self.session)
|
||||
return None
|
||||
@@ -1,35 +1,147 @@
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
from pathlib import Path
|
||||
|
||||
from pilgrim.utils import DirectoryManager
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
|
||||
from ..models.travel_diary import TravelDiary
|
||||
|
||||
|
||||
class TravelDiaryService:
|
||||
def __init__(self,session):
|
||||
def __init__(self, session):
|
||||
self.session = session
|
||||
def create(self, name:str):
|
||||
new_travel_diary = TravelDiary(name)
|
||||
self.session.add(new_travel_diary)
|
||||
self.session.commit()
|
||||
self.session.refresh(new_travel_diary)
|
||||
|
||||
return new_travel_diary
|
||||
def _sanitize_directory_name(self, name: str) -> str:
|
||||
"""
|
||||
Sanitizes a diary name for use as a directory name.
|
||||
- Removes special characters
|
||||
- Replaces spaces with underscores
|
||||
- Ensures name is unique by adding a suffix if needed
|
||||
"""
|
||||
# Remove special characters and replace spaces
|
||||
safe_name = re.sub(r'[^\w\s-]', '', name)
|
||||
safe_name = safe_name.strip().replace(' ', '_').lower()
|
||||
|
||||
def read_by_id(self, travel_id:int):
|
||||
return self.session.query(TravelDiary).get(travel_id)
|
||||
# Ensure we have a valid name
|
||||
if not safe_name:
|
||||
safe_name = "unnamed_diary"
|
||||
|
||||
# Check if name is already used in database
|
||||
base_name = safe_name
|
||||
counter = 1
|
||||
while self.session.query(TravelDiary).filter_by(directory_name=safe_name).first() is not None:
|
||||
safe_name = f"{base_name}_{counter}"
|
||||
counter += 1
|
||||
|
||||
return safe_name
|
||||
|
||||
def _get_diary_directory(self, diary: TravelDiary) -> Path:
|
||||
"""Returns the directory path for a diary."""
|
||||
return DirectoryManager.get_diary_directory(diary.directory_name)
|
||||
|
||||
def _get_diary_data_directory(self, diary: TravelDiary) -> Path:
|
||||
"""Returns the data directory path for a diary."""
|
||||
return DirectoryManager.get_diary_data_directory(diary.directory_name)
|
||||
|
||||
def _ensure_diary_directory(self, diary: TravelDiary) -> Path:
|
||||
"""
|
||||
Creates and returns the directory structure for a diary:
|
||||
~/.pilgrim/diaries/{directory_name}/data/
|
||||
"""
|
||||
# Create diary directory
|
||||
diary_dir = self._get_diary_directory(diary)
|
||||
diary_dir.mkdir(exist_ok=True)
|
||||
os.chmod(diary_dir, 0o700)
|
||||
|
||||
# Create data subdirectory
|
||||
data_dir = self._get_diary_data_directory(diary)
|
||||
data_dir.mkdir(exist_ok=True)
|
||||
os.chmod(data_dir, 0o700)
|
||||
|
||||
return data_dir
|
||||
|
||||
def _cleanup_diary_directory(self, diary: TravelDiary):
|
||||
"""Removes the diary directory and all its contents."""
|
||||
diary_dir = self._get_diary_directory(diary)
|
||||
if diary_dir.exists():
|
||||
shutil.rmtree(diary_dir)
|
||||
|
||||
async def async_create(self, name: str):
|
||||
# Generate safe directory name
|
||||
directory_name = self._sanitize_directory_name(name)
|
||||
|
||||
# Create diary with directory name
|
||||
new_travel_diary = TravelDiary(name=name, directory_name=directory_name)
|
||||
|
||||
try:
|
||||
self.session.add(new_travel_diary)
|
||||
self.session.commit()
|
||||
self.session.refresh(new_travel_diary)
|
||||
|
||||
# Create directory structure for the new diary
|
||||
self._ensure_diary_directory(new_travel_diary)
|
||||
|
||||
return new_travel_diary
|
||||
except IntegrityError:
|
||||
self.session.rollback()
|
||||
raise ValueError(f"Could not create diary: directory name '{directory_name}' already exists")
|
||||
|
||||
def read_by_id(self, travel_id: int):
|
||||
diary = self.session.query(TravelDiary).get(travel_id)
|
||||
if diary:
|
||||
# Ensure directory exists when reading
|
||||
self._ensure_diary_directory(diary)
|
||||
return diary
|
||||
|
||||
def read_all(self):
|
||||
return self.session.query(TravelDiary).all()
|
||||
diaries = self.session.query(TravelDiary).all()
|
||||
# Ensure directories exist for all diaries
|
||||
for diary in diaries:
|
||||
self._ensure_diary_directory(diary)
|
||||
return diaries
|
||||
|
||||
def update(self, travel_diary_src:TravelDiary,travel_diary_dst:TravelDiary):
|
||||
original = self.read_by_id(travel_diary_src.id)
|
||||
def update(self, travel_diary_id: int, name: str):
|
||||
original = self.read_by_id(travel_diary_id)
|
||||
if original is not None:
|
||||
original.name = travel_diary_dst.name
|
||||
self.session.commit()
|
||||
self.session.refresh(original)
|
||||
return original
|
||||
try:
|
||||
# Generate new directory name
|
||||
new_directory_name = self._sanitize_directory_name(name)
|
||||
old_directory = self._get_diary_directory(original)
|
||||
|
||||
# Update diary
|
||||
original.name = name
|
||||
original.directory_name = new_directory_name
|
||||
self.session.commit()
|
||||
self.session.refresh(original)
|
||||
|
||||
# Rename directory if it exists
|
||||
new_directory = self._get_diary_directory(original)
|
||||
if old_directory.exists() and old_directory != new_directory:
|
||||
old_directory.rename(new_directory)
|
||||
|
||||
return original
|
||||
except IntegrityError:
|
||||
self.session.rollback()
|
||||
raise ValueError(f"Could not update diary: directory name '{new_directory_name}' already exists")
|
||||
|
||||
def delete(self, travel_diary_src:TravelDiary):
|
||||
excluded = self.read_by_id(travel_diary_src.id)
|
||||
if excluded is not None:
|
||||
self.session.delete(travel_diary_src)
|
||||
self.session.commit()
|
||||
return excluded
|
||||
return None
|
||||
|
||||
async def async_update(self, travel_diary_id: int, name: str):
|
||||
return self.update(travel_diary_id, name)
|
||||
|
||||
def delete(self, travel_diary_id: TravelDiary):
|
||||
excluded = self.read_by_id(travel_diary_id.id)
|
||||
if excluded is not None:
|
||||
try:
|
||||
# First delete the directory
|
||||
self._cleanup_diary_directory(excluded)
|
||||
# Then delete from database
|
||||
self.session.delete(travel_diary_id)
|
||||
self.session.commit()
|
||||
return excluded
|
||||
except Exception as e:
|
||||
self.session.rollback()
|
||||
raise ValueError(f"Could not delete diary: {str(e)}")
|
||||
return None
|
||||
|
||||
@@ -0,0 +1,559 @@
|
||||
from textual.app import ComposeResult
|
||||
from textual.binding import Binding
|
||||
from textual.screen import Screen
|
||||
from textual.widgets import Header, Footer, Button, Label, TextArea
|
||||
from textual.containers import Container
|
||||
from importlib.metadata import version
|
||||
class AboutScreen(Screen[bool]):
|
||||
"""Screen to display application information."""
|
||||
|
||||
TITLE = "Pilgrim - About"
|
||||
|
||||
BINDINGS = [
|
||||
Binding("escape", "dismiss", "Close"),
|
||||
]
|
||||
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.header = Header()
|
||||
self.footer = Footer()
|
||||
self.app_title = Label("Pilgrim", id="AboutScreen_AboutTitle",classes="AboutScreen_AboutTitle")
|
||||
self.content = Label("A TUI Based Travel Diary Application", id="AboutScreen_AboutContent",
|
||||
classes="AboutScreen_AboutContent")
|
||||
self.version = Label(f"Version: {version('Pilgrim')}", id="AboutScreen_AboutVersion",
|
||||
classes="AboutScreen_AboutVersion")
|
||||
self.developer = Label("Developed By: Gustavo Henrique Miranda ", id="AboutScreen_AboutAuthor")
|
||||
self.contact = Label("git.gustavomiranda.xyz", id="AboutScreen_AboutContact",
|
||||
classes="AboutScreen_AboutContact")
|
||||
self.license = TextArea(id="AboutScreen_AboutLicense",
|
||||
classes="AboutScreen_AboutLicense")
|
||||
self.license.text = """Copyright (c) 2025 GHMiranda.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||
|
||||
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
This Software uses the following third party libraries:
|
||||
|
||||
- SQLAlchemy: https://www.sqlalchemy.org/
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "{}"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright {yyyy} {name of copyright owner}
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
- Textual: https://github.com/Textualize/textual
|
||||
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2021 Will McGugan
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
- greenlet: https://github.com/python-greenlet/
|
||||
|
||||
The following files are derived from Stackless Python and are subject to the
|
||||
same license as Stackless Python:
|
||||
|
||||
src/greenlet/slp_platformselect.h
|
||||
files in src/greenlet/platform/ directory
|
||||
|
||||
See LICENSE.PSF and http://www.stackless.com/ for details.
|
||||
|
||||
Unless otherwise noted, the files in greenlet have been released under the
|
||||
following MIT license:
|
||||
|
||||
Copyright (c) Armin Rigo, Christian Tismer and contributors
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
||||
- typing_extensions: https://github.com/python/typing_extensions
|
||||
Python software and documentation are licensed under the
|
||||
Python Software Foundation License Version 2.
|
||||
|
||||
Starting with Python 3.8.6, examples, recipes, and other code in
|
||||
the documentation are dual licensed under the PSF License Version 2
|
||||
and the Zero-Clause BSD license.
|
||||
|
||||
Some software incorporated into Python is under different licenses.
|
||||
The licenses are listed with code falling under that license.
|
||||
|
||||
|
||||
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
|
||||
--------------------------------------------
|
||||
|
||||
1. This LICENSE AGREEMENT is between the Python Software Foundation
|
||||
("PSF"), and the Individual or Organization ("Licensee") accessing and
|
||||
otherwise using this software ("Python") in source or binary form and
|
||||
its associated documentation.
|
||||
|
||||
2. Subject to the terms and conditions of this License Agreement, PSF hereby
|
||||
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
|
||||
analyze, test, perform and/or display publicly, prepare derivative works,
|
||||
distribute, and otherwise use Python alone or in any derivative version,
|
||||
provided, however, that PSF's License Agreement and PSF's notice of copyright,
|
||||
i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
||||
2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Python Software Foundation;
|
||||
All Rights Reserved" are retained in Python alone or in any derivative version
|
||||
prepared by Licensee.
|
||||
|
||||
3. In the event Licensee prepares a derivative work that is based on
|
||||
or incorporates Python or any part thereof, and wants to make
|
||||
the derivative work available to others as provided herein, then
|
||||
Licensee hereby agrees to include in any such work a brief summary of
|
||||
the changes made to Python.
|
||||
|
||||
4. PSF is making Python available to Licensee on an "AS IS"
|
||||
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
|
||||
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
|
||||
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
|
||||
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
|
||||
INFRINGE ANY THIRD PARTY RIGHTS.
|
||||
|
||||
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
|
||||
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
|
||||
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
|
||||
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
|
||||
|
||||
6. This License Agreement will automatically terminate upon a material
|
||||
breach of its terms and conditions.
|
||||
|
||||
7. Nothing in this License Agreement shall be deemed to create any
|
||||
relationship of agency, partnership, or joint venture between PSF and
|
||||
Licensee. This License Agreement does not grant permission to use PSF
|
||||
trademarks or trade name in a trademark sense to endorse or promote
|
||||
products or services of Licensee, or any third party.
|
||||
|
||||
8. By copying, installing or otherwise using Python, Licensee
|
||||
agrees to be bound by the terms and conditions of this License
|
||||
Agreement.
|
||||
|
||||
|
||||
BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
|
||||
-------------------------------------------
|
||||
|
||||
BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
|
||||
|
||||
1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
|
||||
office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
|
||||
Individual or Organization ("Licensee") accessing and otherwise using
|
||||
this software in source or binary form and its associated
|
||||
documentation ("the Software").
|
||||
|
||||
2. Subject to the terms and conditions of this BeOpen Python License
|
||||
Agreement, BeOpen hereby grants Licensee a non-exclusive,
|
||||
royalty-free, world-wide license to reproduce, analyze, test, perform
|
||||
and/or display publicly, prepare derivative works, distribute, and
|
||||
otherwise use the Software alone or in any derivative version,
|
||||
provided, however, that the BeOpen Python License is retained in the
|
||||
Software, alone or in any derivative version prepared by Licensee.
|
||||
|
||||
3. BeOpen is making the Software available to Licensee on an "AS IS"
|
||||
basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
|
||||
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
|
||||
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
|
||||
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
|
||||
INFRINGE ANY THIRD PARTY RIGHTS.
|
||||
|
||||
4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
|
||||
SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
|
||||
AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
|
||||
DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
|
||||
|
||||
5. This License Agreement will automatically terminate upon a material
|
||||
breach of its terms and conditions.
|
||||
|
||||
6. This License Agreement shall be governed by and interpreted in all
|
||||
respects by the law of the State of California, excluding conflict of
|
||||
law provisions. Nothing in this License Agreement shall be deemed to
|
||||
create any relationship of agency, partnership, or joint venture
|
||||
between BeOpen and Licensee. This License Agreement does not grant
|
||||
permission to use BeOpen trademarks or trade names in a trademark
|
||||
sense to endorse or promote products or services of Licensee, or any
|
||||
third party. As an exception, the "BeOpen Python" logos available at
|
||||
http://www.pythonlabs.com/logos.html may be used according to the
|
||||
permissions granted on that web page.
|
||||
|
||||
7. By copying, installing or otherwise using the software, Licensee
|
||||
agrees to be bound by the terms and conditions of this License
|
||||
Agreement.
|
||||
|
||||
|
||||
CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
|
||||
---------------------------------------
|
||||
|
||||
1. This LICENSE AGREEMENT is between the Corporation for National
|
||||
Research Initiatives, having an office at 1895 Preston White Drive,
|
||||
Reston, VA 20191 ("CNRI"), and the Individual or Organization
|
||||
("Licensee") accessing and otherwise using Python 1.6.1 software in
|
||||
source or binary form and its associated documentation.
|
||||
|
||||
2. Subject to the terms and conditions of this License Agreement, CNRI
|
||||
hereby grants Licensee a nonexclusive, royalty-free, world-wide
|
||||
license to reproduce, analyze, test, perform and/or display publicly,
|
||||
prepare derivative works, distribute, and otherwise use Python 1.6.1
|
||||
alone or in any derivative version, provided, however, that CNRI's
|
||||
License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
|
||||
1995-2001 Corporation for National Research Initiatives; All Rights
|
||||
Reserved" are retained in Python 1.6.1 alone or in any derivative
|
||||
version prepared by Licensee. Alternately, in lieu of CNRI's License
|
||||
Agreement, Licensee may substitute the following text (omitting the
|
||||
quotes): "Python 1.6.1 is made available subject to the terms and
|
||||
conditions in CNRI's License Agreement. This Agreement together with
|
||||
Python 1.6.1 may be located on the internet using the following
|
||||
unique, persistent identifier (known as a handle): 1895.22/1013. This
|
||||
Agreement may also be obtained from a proxy server on the internet
|
||||
using the following URL: http://hdl.handle.net/1895.22/1013".
|
||||
|
||||
3. In the event Licensee prepares a derivative work that is based on
|
||||
or incorporates Python 1.6.1 or any part thereof, and wants to make
|
||||
the derivative work available to others as provided herein, then
|
||||
Licensee hereby agrees to include in any such work a brief summary of
|
||||
the changes made to Python 1.6.1.
|
||||
|
||||
4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
|
||||
basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
|
||||
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
|
||||
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
|
||||
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
|
||||
INFRINGE ANY THIRD PARTY RIGHTS.
|
||||
|
||||
5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
|
||||
1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
|
||||
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
|
||||
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
|
||||
|
||||
6. This License Agreement will automatically terminate upon a material
|
||||
breach of its terms and conditions.
|
||||
|
||||
7. This License Agreement shall be governed by the federal
|
||||
intellectual property law of the United States, including without
|
||||
limitation the federal copyright law, and, to the extent such
|
||||
U.S. federal law does not apply, by the law of the Commonwealth of
|
||||
Virginia, excluding Virginia's conflict of law provisions.
|
||||
Notwithstanding the foregoing, with regard to derivative works based
|
||||
on Python 1.6.1 that incorporate non-separable material that was
|
||||
previously distributed under the GNU General Public License (GPL), the
|
||||
law of the Commonwealth of Virginia shall govern this License
|
||||
Agreement only as to issues arising under or with respect to
|
||||
Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
|
||||
License Agreement shall be deemed to create any relationship of
|
||||
agency, partnership, or joint venture between CNRI and Licensee. This
|
||||
License Agreement does not grant permission to use CNRI trademarks or
|
||||
trade name in a trademark sense to endorse or promote products or
|
||||
services of Licensee, or any third party.
|
||||
|
||||
8. By clicking on the "ACCEPT" button where indicated, or by copying,
|
||||
installing or otherwise using Python 1.6.1, Licensee agrees to be
|
||||
bound by the terms and conditions of this License Agreement.
|
||||
|
||||
ACCEPT
|
||||
|
||||
|
||||
CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
|
||||
--------------------------------------------------
|
||||
|
||||
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
|
||||
The Netherlands. All rights reserved.
|
||||
|
||||
Permission to use, copy, modify, and distribute this software and its
|
||||
documentation for any purpose and without fee is hereby granted,
|
||||
provided that the above copyright notice appear in all copies and that
|
||||
both that copyright notice and this permission notice appear in
|
||||
supporting documentation, and that the name of Stichting Mathematisch
|
||||
Centrum or CWI not be used in advertising or publicity pertaining to
|
||||
distribution of the software without specific, written prior
|
||||
permission.
|
||||
|
||||
STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
|
||||
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
|
||||
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM 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.
|
||||
|
||||
ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
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.
|
||||
"""
|
||||
|
||||
|
||||
self.license.read_only = True
|
||||
self.about_container = Container(self.app_title, self.content, self.version, self.developer,
|
||||
self.contact, id="AboutScreen_SubContainer",
|
||||
classes="AboutScreen_SubContainer")
|
||||
self.container = Container(self.about_container, self.license, id="AboutScreen_AboutContainer",
|
||||
classes="AboutScreen_AboutContainer")
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
yield self.header
|
||||
yield self.container
|
||||
yield self.footer
|
||||
|
||||
def on_button_pressed(self, event: Button.Pressed) -> None:
|
||||
"""Handles button clicks."""
|
||||
if "about-close-button" in event.button.classes:
|
||||
self.dismiss(False)
|
||||
elif "about-info-button" in event.button.classes:
|
||||
self.notify("More information would be displayed here!", title="Info")
|
||||
|
||||
def action_dismiss(self, **kwargs) -> None:
|
||||
"""Closes the about box using dismiss.
|
||||
:param **kwargs:
|
||||
"""
|
||||
self.dismiss(False)
|
||||
|
||||
def on_key(self, event) -> None:
|
||||
"""Intercepts specific keys."""
|
||||
if event.key == "escape":
|
||||
self.dismiss(False)
|
||||
event.prevent_default()
|
||||
elif event.key == "enter":
|
||||
self.dismiss(False)
|
||||
event.prevent_default()
|
||||
@@ -0,0 +1,288 @@
|
||||
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.binding import Binding
|
||||
from textual.containers import Vertical, Container, Horizontal
|
||||
|
||||
from pilgrim.models.travel_diary import TravelDiary
|
||||
from pilgrim.ui.screens.about_screen import AboutScreen
|
||||
from pilgrim.ui.screens.edit_diary_modal import EditDiaryModal
|
||||
from pilgrim.ui.screens.new_diary_modal import NewDiaryModal
|
||||
from pilgrim.ui.screens.edit_entry_screen import EditEntryScreen
|
||||
|
||||
|
||||
class DiaryListScreen(Screen):
|
||||
TITLE = "Pilgrim - Main"
|
||||
|
||||
BINDINGS = [
|
||||
Binding("n", "new_diary", "New diary"),
|
||||
Binding("^q", "quit", "Quit Pilgrim"),
|
||||
Binding("enter", "open_selected_diary", "Open diary"),
|
||||
Binding("e", "edit_selected_diary", "Edit diary"),
|
||||
Binding("r", "force_refresh", "Force refresh"),
|
||||
]
|
||||
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.selected_diary_index = None
|
||||
self.diary_id_map = {}
|
||||
self.is_refreshing = False
|
||||
|
||||
self.header = Header()
|
||||
self.footer = Footer()
|
||||
self.diary_list = OptionList(classes="DiaryListScreen-DiaryListOptions")
|
||||
self.new_diary_button = Button("New diary", id="new_diary", classes="DiaryListScreen-NewDiaryButton")
|
||||
self.edit_diary_button = Button("Edit diary", id="edit_diary", classes="DiaryListScreen-EditDiaryButton")
|
||||
self.open_diary = Button("Open diary", id="open_diary", classes="DiaryListScreen-OpenDiaryButton")
|
||||
self.buttons_grid = Horizontal(
|
||||
self.new_diary_button, self.edit_diary_button, self.open_diary,
|
||||
classes="DiaryListScreen-ButtonsGrid"
|
||||
)
|
||||
self.tips = Static(
|
||||
"Tip: use ↑↓ to navigate • ENTER to Select • "
|
||||
"TAB to alternate the fields • SHIFT + TAB to alternate back • "
|
||||
"Ctrl+P for command palette • R to force refresh",
|
||||
classes="DiaryListScreen-DiaryListTips"
|
||||
)
|
||||
self.container = Container(
|
||||
self.diary_list, self.buttons_grid, self.tips,
|
||||
classes="DiaryListScreen-DiaryListContainer"
|
||||
)
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
yield self.header
|
||||
yield self.container
|
||||
yield self.footer
|
||||
|
||||
def on_mount(self) -> None:
|
||||
# Uses synchronous version for initial mount
|
||||
self.refresh_diaries()
|
||||
self.update_buttons_state()
|
||||
|
||||
def refresh_diaries(self):
|
||||
"""Synchronous version of refresh"""
|
||||
try:
|
||||
service_manager = self.app.service_manager
|
||||
travel_diary_service = service_manager.get_travel_diary_service()
|
||||
|
||||
# Uses synchronous method
|
||||
diaries = travel_diary_service.read_all()
|
||||
|
||||
# Saves current state
|
||||
current_diary_id = None
|
||||
if (self.selected_diary_index is not None and
|
||||
self.selected_diary_index in self.diary_id_map):
|
||||
current_diary_id = self.diary_id_map[self.selected_diary_index]
|
||||
|
||||
# Clears and rebuilds
|
||||
self.diary_list.clear_options()
|
||||
self.diary_id_map = {}
|
||||
|
||||
if not diaries:
|
||||
self.diary_list.add_option("[dim]No diaries found. Press 'N' to create a new one![/dim]")
|
||||
self.selected_diary_index = None
|
||||
else:
|
||||
new_selected_index = 0
|
||||
|
||||
for index, diary in enumerate(diaries):
|
||||
self.diary_id_map[index] = diary.id
|
||||
self.diary_list.add_option(f"[b]{diary.name}[/b]\n[dim]ID: {diary.id}[/dim]")
|
||||
|
||||
# Maintains selection if possible
|
||||
if current_diary_id and diary.id == current_diary_id:
|
||||
new_selected_index = index
|
||||
|
||||
self.selected_diary_index = new_selected_index
|
||||
|
||||
# Updates highlight
|
||||
self.set_timer(0.05, lambda: self._update_highlight(new_selected_index))
|
||||
|
||||
# Forces visual refresh
|
||||
self.diary_list.refresh()
|
||||
self.update_buttons_state()
|
||||
|
||||
except Exception as e:
|
||||
self.notify(f"Error loading diaries: {str(e)}")
|
||||
|
||||
def _update_highlight(self, index: int):
|
||||
"""Updates the OptionList highlight"""
|
||||
try:
|
||||
if index < len(self.diary_list.options):
|
||||
self.diary_list.highlighted = index
|
||||
self.diary_list.refresh()
|
||||
except Exception as e:
|
||||
self.notify(f"Error updating highlight: {str(e)}")
|
||||
|
||||
async def async_refresh_diaries(self):
|
||||
"""Async version of refresh"""
|
||||
if self.is_refreshing:
|
||||
return
|
||||
|
||||
self.is_refreshing = True
|
||||
|
||||
try:
|
||||
service_manager = self.app.service_manager
|
||||
travel_diary_service = service_manager.get_travel_diary_service()
|
||||
|
||||
# Usa método síncrono agora
|
||||
diaries = travel_diary_service.read_all()
|
||||
|
||||
# Saves current state
|
||||
current_diary_id = None
|
||||
if (self.selected_diary_index is not None and
|
||||
self.selected_diary_index in self.diary_id_map):
|
||||
current_diary_id = self.diary_id_map[self.selected_diary_index]
|
||||
|
||||
# Clears and rebuilds
|
||||
self.diary_list.clear_options()
|
||||
self.diary_id_map = {}
|
||||
|
||||
if not diaries:
|
||||
self.diary_list.add_option("[dim]No diaries found. Press 'N' to create a new one![/dim]")
|
||||
self.selected_diary_index = None
|
||||
else:
|
||||
new_selected_index = 0
|
||||
|
||||
for index, diary in enumerate(diaries):
|
||||
self.diary_id_map[index] = diary.id
|
||||
self.diary_list.add_option(f"[b]{diary.name}[/b]\n[dim]ID: {diary.id}[/dim]")
|
||||
|
||||
if current_diary_id and diary.id == current_diary_id:
|
||||
new_selected_index = index
|
||||
|
||||
self.selected_diary_index = new_selected_index
|
||||
self.set_timer(0.05, lambda: self._update_highlight(new_selected_index))
|
||||
|
||||
self.diary_list.refresh()
|
||||
self.update_buttons_state()
|
||||
|
||||
except Exception as e:
|
||||
self.notify(f"Error loading diaries: {str(e)}")
|
||||
finally:
|
||||
self.is_refreshing = False
|
||||
|
||||
def on_option_list_option_highlighted(self, event: OptionList.OptionHighlighted) -> None:
|
||||
"""Handle when an option is highlighted"""
|
||||
if self.diary_id_map and event.option_index in self.diary_id_map:
|
||||
self.selected_diary_index = event.option_index
|
||||
else:
|
||||
self.selected_diary_index = None
|
||||
|
||||
self.update_buttons_state()
|
||||
|
||||
def on_option_list_option_selected(self, event: OptionList.OptionSelected) -> None:
|
||||
"""Handle when an option is selected"""
|
||||
if self.diary_id_map and event.option_index in self.diary_id_map:
|
||||
self.selected_diary_index = event.option_index
|
||||
self.action_open_diary()
|
||||
else:
|
||||
self.selected_diary_index = None
|
||||
|
||||
self.update_buttons_state()
|
||||
|
||||
def update_buttons_state(self):
|
||||
"""Updates button states"""
|
||||
has_selection = (self.selected_diary_index is not None and
|
||||
self.selected_diary_index in self.diary_id_map)
|
||||
|
||||
self.edit_diary_button.disabled = not has_selection
|
||||
self.open_diary.disabled = not has_selection
|
||||
|
||||
def on_button_pressed(self, event: Button.Pressed) -> None:
|
||||
"""Handle button clicks"""
|
||||
button_id = event.button.id
|
||||
|
||||
if button_id == "new_diary":
|
||||
self.action_new_diary()
|
||||
elif button_id == "edit_diary":
|
||||
self.action_edit_selected_diary()
|
||||
elif button_id == "open_diary":
|
||||
self.action_open_diary()
|
||||
|
||||
def action_new_diary(self):
|
||||
"""Action to create new diary"""
|
||||
self.app.push_screen(NewDiaryModal(),self._on_new_diary_submitted)
|
||||
|
||||
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...")
|
||||
# Atualiza a lista de diários
|
||||
self.refresh_diaries()
|
||||
else:
|
||||
self.notify(f"Creation canceled...")
|
||||
|
||||
def _on_screen_resume(self) -> None:
|
||||
super()._on_screen_resume()
|
||||
self.refresh_diaries()
|
||||
|
||||
def action_edit_selected_diary(self):
|
||||
"""Action to edit selected diary"""
|
||||
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(
|
||||
EditDiaryModal(diary_id=diary_id),
|
||||
self._on_edited_diary_name_submitted
|
||||
)
|
||||
else:
|
||||
self.notify("Select a diary to edit")
|
||||
|
||||
def action_open_diary(self):
|
||||
"""Action to open selected diary"""
|
||||
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(EditEntryScreen(diary_id=diary_id))
|
||||
self.notify(f"Opening diary ID: {diary_id}")
|
||||
else:
|
||||
self.notify("Invalid diary ID")
|
||||
else:
|
||||
self.notify("Select a diary to open")
|
||||
|
||||
def _on_edited_diary_name_submitted(self, result: Optional[Tuple[int, str]]) -> None:
|
||||
"""Callback after diary editing"""
|
||||
if result:
|
||||
diary_id, name = result
|
||||
self.notify(f"Updating diary ID {diary_id} to '{name}'...")
|
||||
# Schedules async update
|
||||
self.call_later(self._async_update_diary, diary_id, name)
|
||||
else:
|
||||
self.notify("Edit canceled")
|
||||
|
||||
async def _async_update_diary(self, diary_id: int, name: str):
|
||||
"""Updates the diary asynchronously"""
|
||||
try:
|
||||
service = self.app.service_manager.get_travel_diary_service()
|
||||
updated_diary = await service.async_update(diary_id, name)
|
||||
|
||||
if updated_diary:
|
||||
self.notify(f"Diary '{name}' updated!")
|
||||
# Forces refresh after update
|
||||
await self.async_refresh_diaries()
|
||||
else:
|
||||
self.notify("Error: Diary not found")
|
||||
|
||||
except Exception as e:
|
||||
self.notify(f"Error updating: {str(e)}")
|
||||
|
||||
def action_force_refresh(self):
|
||||
"""Forces manual refresh"""
|
||||
self.notify("Forcing refresh...")
|
||||
# Tries both versions
|
||||
self.refresh_diaries() # Synchronous
|
||||
self.call_later(self.async_refresh_diaries) # Asynchronous
|
||||
|
||||
def action_open_selected_diary(self):
|
||||
"""Action for ENTER binding"""
|
||||
self.action_open_diary()
|
||||
|
||||
def action_about_cmd(self):
|
||||
self.app.push_screen(AboutScreen())
|
||||
|
||||
def action_quit(self):
|
||||
"""Action to quit the application"""
|
||||
self.app.exit()
|
||||
@@ -0,0 +1,60 @@
|
||||
from textual.app import ComposeResult
|
||||
from textual.binding import Binding
|
||||
from textual.containers import Vertical, Horizontal
|
||||
from textual.screen import ModalScreen
|
||||
from textual.widgets import Label, Input, Button
|
||||
|
||||
|
||||
class EditDiaryModal(ModalScreen[tuple[int,str]]):
|
||||
BINDINGS = [
|
||||
Binding("escape", "cancel", "Cancel"),
|
||||
Binding("enter", "edit_diary", "Save",priority=True),
|
||||
]
|
||||
|
||||
def __init__(self, diary_id: int):
|
||||
super().__init__()
|
||||
self.diary_id = diary_id
|
||||
self.current_diary_name = self.app.service_manager.get_travel_diary_service().read_by_id(self.diary_id).name
|
||||
self.name_input = Input(value=self.current_diary_name, id="edit_diary_name_input", classes="EditDiaryModal-NameInput")
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
with Vertical(id="edit_diary_dialog", classes="EditDiaryModal-Dialog"):
|
||||
yield Label("Edit Diary", classes="EditDiaryModal-Title")
|
||||
yield Label("New Diary Name:")
|
||||
yield self.name_input
|
||||
with Horizontal(classes="EditDiaryModal-ButtonsContainer"):
|
||||
yield Button("Save", variant="primary", id="save_diary_button", classes="EditDiaryModal-SaveButton")
|
||||
yield Button("Cancel", variant="default", id="cancel_button", classes="EditDiaryModal-CancelButton")
|
||||
|
||||
def on_mount(self) -> None:
|
||||
"""Focuses on the input field and moves cursor to the end of text."""
|
||||
self.name_input.focus()
|
||||
self.name_input.cursor_position = len(self.name_input.value)
|
||||
|
||||
def on_button_pressed(self, event: Button.Pressed) -> None:
|
||||
if event.button.id == "save_diary_button":
|
||||
self.action_edit_diary()
|
||||
elif event.button.id == "cancel_button":
|
||||
self.dismiss(None)
|
||||
def on_key(self, event):
|
||||
if event.key == "enter":
|
||||
self.action_edit_diary()
|
||||
event.prevent_default()
|
||||
|
||||
def action_edit_diary(self) -> None:
|
||||
new_diary_name = self.name_input.value.strip()
|
||||
if new_diary_name and new_diary_name != self.current_diary_name:
|
||||
self.dismiss((self.diary_id, new_diary_name))
|
||||
elif new_diary_name == self.current_diary_name:
|
||||
self.notify("No changes made.", severity="warning")
|
||||
self.dismiss(None)
|
||||
else:
|
||||
self.notify("Diary name cannot be empty.", severity="warning")
|
||||
self.name_input.focus()
|
||||
|
||||
def on_input_submitted(self, event: Input.Submitted) -> None:
|
||||
if event.input.id == "edit_diary_name_input":
|
||||
self.action_edit_diary()
|
||||
|
||||
def action_cancel(self) -> None:
|
||||
self.dismiss(None)
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,120 @@
|
||||
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"""
|
||||
def __init__(self, diary_id: int):
|
||||
super().__init__()
|
||||
self.diary_id = diary_id
|
||||
self.result = None
|
||||
self.created_photo = None
|
||||
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
yield Container(
|
||||
Static("📷 Add New Photo", classes="AddPhotoModal-Title"),
|
||||
Static("File path:", classes="AddPhotoModal-Label"),
|
||||
Horizontal(
|
||||
Input(placeholder="Enter file path...", id="filepath-input", classes="AddPhotoModal-Input"),
|
||||
Button("Escolher arquivo...", id="choose-file-button", classes="AddPhotoModal-Button"),
|
||||
classes="AddPhotoModal-FileRow"
|
||||
),
|
||||
Static("Photo name:", classes="AddPhotoModal-Label"),
|
||||
Input(placeholder="Enter photo name...", id="name-input", classes="AddPhotoModal-Input"),
|
||||
Static("Caption (optional):", classes="AddPhotoModal-Label"),
|
||||
Input(placeholder="Enter caption...", id="caption-input", classes="AddPhotoModal-Input"),
|
||||
Horizontal(
|
||||
Button("Add Photo", id="add-button", classes="AddPhotoModal-Button"),
|
||||
Button("Cancel", id="cancel-button", classes="AddPhotoModal-Button"),
|
||||
classes="AddPhotoModal-Buttons"
|
||||
),
|
||||
classes="AddPhotoModal-Dialog"
|
||||
)
|
||||
|
||||
def on_button_pressed(self, event: Button.Pressed) -> None:
|
||||
if event.button.id == "choose-file-button":
|
||||
self.app.push_screen(
|
||||
FilePickerModal(),
|
||||
self.handle_file_picker_result
|
||||
)
|
||||
return
|
||||
if event.button.id == "add-button":
|
||||
filepath = self.query_one("#filepath-input", Input).value
|
||||
name = self.query_one("#name-input", Input).value
|
||||
caption = self.query_one("#caption-input", Input).value
|
||||
if not filepath.strip() or not name.strip():
|
||||
self.notify("File path and name are required", severity="error")
|
||||
return
|
||||
|
||||
# Try to create the photo in the database
|
||||
self.call_later(self._async_create_photo, {
|
||||
"filepath": filepath.strip(),
|
||||
"name": name.strip(),
|
||||
"caption": caption.strip() if caption.strip() else None
|
||||
})
|
||||
elif event.button.id == "cancel-button":
|
||||
self.dismiss()
|
||||
|
||||
async def _async_create_photo(self, photo_data: dict):
|
||||
"""Creates a new photo asynchronously using PhotoService"""
|
||||
|
||||
|
||||
try:
|
||||
service_manager = self.app.service_manager
|
||||
photo_service = service_manager.get_photo_service()
|
||||
|
||||
if photo_service.check_photo_by_hash(photo_service.hash_file(photo_data["filepath"]),self.diary_id):
|
||||
self.notify("Photo already exists in database", severity="error")
|
||||
return
|
||||
|
||||
new_photo = photo_service.create(
|
||||
filepath=Path(photo_data["filepath"]),
|
||||
name=photo_data["name"],
|
||||
travel_diary_id=self.diary_id,
|
||||
caption=photo_data["caption"]
|
||||
)
|
||||
|
||||
if new_photo:
|
||||
self.created_photo = new_photo
|
||||
|
||||
|
||||
self.notify(f"Photo '{new_photo.name}' added successfully!\nHash: {new_photo.photo_hash[:8]}\nReference: \\[\\[photo:{new_photo.name}:{new_photo.photo_hash[:8]}\\]\\]",
|
||||
severity="information", timeout=5)
|
||||
|
||||
# Return the created photo data to the calling screen
|
||||
self.result = {
|
||||
"filepath": photo_data["filepath"],
|
||||
"name": photo_data["name"],
|
||||
"caption": photo_data["caption"],
|
||||
"photo_id": new_photo.id,
|
||||
"hash": new_photo.photo_hash
|
||||
}
|
||||
self.dismiss(self.result)
|
||||
else:
|
||||
self.notify("Error creating photo in database", severity="error")
|
||||
|
||||
except Exception as e:
|
||||
self.notify(f"Error creating photo: {str(e)}", severity="error")
|
||||
|
||||
def handle_file_picker_result(self, result: str | None) -> None:
|
||||
if result:
|
||||
# Set the filepath input value
|
||||
filepath_input = self.query_one("#filepath-input", Input)
|
||||
filepath_input.value = result
|
||||
# Trigger the input change event to update the UI
|
||||
filepath_input.refresh()
|
||||
# Auto-fill the name field with the filename (without extension)
|
||||
filename = Path(result).stem
|
||||
name_input = self.query_one("#name-input", Input)
|
||||
if not name_input.value.strip():
|
||||
name_input.value = filename
|
||||
name_input.refresh()
|
||||
else:
|
||||
# User cancelled the file picker
|
||||
self.notify("File selection cancelled", severity="information")
|
||||
@@ -0,0 +1,32 @@
|
||||
from textual.app import ComposeResult
|
||||
from textual.screen import Screen
|
||||
from textual.widgets import Static, Button
|
||||
from textual.containers import Container, Horizontal
|
||||
from pilgrim.models.photo import Photo
|
||||
|
||||
class ConfirmDeleteModal(Screen):
|
||||
"""Modal for confirming photo deletion"""
|
||||
def __init__(self, photo: Photo):
|
||||
super().__init__()
|
||||
self.photo = photo
|
||||
self.result = None
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
yield Container(
|
||||
Static("🗑️ Confirm Deletion", classes="ConfirmDeleteModal-Title"),
|
||||
Static(f"Are you sure you want to delete the photo '{self.photo.name}'?", classes="ConfirmDeleteModal-Message"),
|
||||
Static("This action cannot be undone.", classes="ConfirmDeleteModal-Warning"),
|
||||
Horizontal(
|
||||
Button("Delete", variant="error", id="delete-button", classes="ConfirmDeleteModal-Button"),
|
||||
Button("Cancel", variant="default", id="cancel-button", classes="ConfirmDeleteModal-Button"),
|
||||
classes="ConfirmDeleteModal-Buttons"
|
||||
),
|
||||
classes="ConfirmDeleteModal-Dialog"
|
||||
)
|
||||
|
||||
def on_button_pressed(self, event: Button.Pressed) -> None:
|
||||
if event.button.id == "delete-button":
|
||||
self.result = True
|
||||
self.dismiss(True)
|
||||
elif event.button.id == "cancel-button":
|
||||
self.dismiss(False)
|
||||
@@ -0,0 +1,77 @@
|
||||
from textual.app import ComposeResult
|
||||
from textual.screen import Screen
|
||||
from textual.widgets import Static, Input, Button
|
||||
from textual.containers import Container, Horizontal
|
||||
from pilgrim.models.photo import Photo
|
||||
|
||||
|
||||
class EditPhotoModal(Screen):
|
||||
"""Modal for editing an existing photo (name and caption only)"""
|
||||
def __init__(self, photo: Photo):
|
||||
super().__init__()
|
||||
self.photo = photo
|
||||
self.result = None
|
||||
|
||||
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
# Generate hash for this photo
|
||||
|
||||
|
||||
yield Container(
|
||||
Static("✏️ Edit Photo", classes="EditPhotoModal-Title"),
|
||||
Static("File path (read-only):", classes="EditPhotoModal-Label"),
|
||||
Input(
|
||||
value=self.photo.filepath,
|
||||
id="filepath-input",
|
||||
classes="EditPhotoModal-Input",
|
||||
disabled=True
|
||||
),
|
||||
Static("Photo name:", classes="EditPhotoModal-Label"),
|
||||
Input(
|
||||
value=self.photo.name,
|
||||
placeholder="Enter photo name...",
|
||||
id="name-input",
|
||||
classes="EditPhotoModal-Input"
|
||||
),
|
||||
Static("Caption (optional):", classes="EditPhotoModal-Label"),
|
||||
Input(
|
||||
value=self.photo.caption or "",
|
||||
placeholder="Enter caption...",
|
||||
id="caption-input",
|
||||
classes="EditPhotoModal-Input"
|
||||
),
|
||||
Static(f"🔗 Photo Hash: {self.photo.photo_hash[:8]}", classes="EditPhotoModal-Hash"),
|
||||
Static("Reference formats:", classes="EditPhotoModal-Label"),
|
||||
Static(f"\\[\\[photo::{self.photo.photo_hash[:8]}\\]\\]", classes="EditPhotoModal-Reference"),
|
||||
Horizontal(
|
||||
Button("Save Changes", id="save-button", classes="EditPhotoModal-Button"),
|
||||
Button("Cancel", id="cancel-button", classes="EditPhotoModal-Button"),
|
||||
classes="EditPhotoModal-Buttons"
|
||||
),
|
||||
classes="EditPhotoModal-Dialog"
|
||||
)
|
||||
|
||||
def on_button_pressed(self, event: Button.Pressed) -> None:
|
||||
if event.button.id == "save-button":
|
||||
name = self.query_one("#name-input", Input).value
|
||||
caption = self.query_one("#caption-input", Input).value
|
||||
|
||||
if not name.strip():
|
||||
self.notify("Photo name is required", severity="error")
|
||||
return
|
||||
|
||||
# Return the updated photo data
|
||||
self.result = {
|
||||
"filepath": self.photo.filepath, # Keep original filepath
|
||||
"name": name.strip(),
|
||||
"caption": caption.strip() if caption.strip() else None
|
||||
}
|
||||
self.dismiss(self.result)
|
||||
|
||||
elif event.button.id == "cancel-button":
|
||||
self.dismiss()
|
||||
|
||||
def on_mount(self) -> None:
|
||||
"""Focus on the name input when modal opens"""
|
||||
self.query_one("#name-input", Input).focus()
|
||||
@@ -0,0 +1,66 @@
|
||||
import os
|
||||
from pathlib import Path
|
||||
from typing import Iterable
|
||||
from textual.app import ComposeResult
|
||||
from textual.screen import Screen
|
||||
from textual.widgets import Static, DirectoryTree, Button
|
||||
from textual.containers import Horizontal, Container
|
||||
|
||||
class ImageDirectoryTree(DirectoryTree):
|
||||
"""DirectoryTree that only shows image files"""
|
||||
|
||||
def filter_paths(self, paths: Iterable[Path]) -> Iterable[Path]:
|
||||
"""Filter to show only directories and image files"""
|
||||
image_extensions = {'.png', '.jpg', '.jpeg', '.gif', '.bmp', '.webp'}
|
||||
return [
|
||||
path for path in paths
|
||||
if path.is_dir() or path.suffix.lower() in image_extensions
|
||||
]
|
||||
|
||||
class FilePickerModal(Screen):
|
||||
"""Modal for picking an image file using DirectoryTree"""
|
||||
|
||||
def __init__(self, start_path=None):
|
||||
super().__init__()
|
||||
self.start_path = Path(start_path or os.getcwd())
|
||||
# Start one level up to make navigation easier
|
||||
self.current_path = self.start_path.parent
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
yield Container(
|
||||
Static(f"Current: {self.current_path}", id="title", classes="FilePickerModal-Title"),
|
||||
ImageDirectoryTree(str(self.current_path), id="directory-tree"),
|
||||
Horizontal(
|
||||
Button("Up", id="up-button", classes="FilePickerModal-Button"),
|
||||
Button("Cancel", id="cancel-button", classes="FilePickerModal-Button"),
|
||||
classes="FilePickerModal-Buttons"
|
||||
),
|
||||
classes="FilePickerModal-Dialog"
|
||||
)
|
||||
|
||||
def on_directory_tree_file_selected(self, event: DirectoryTree.FileSelected) -> None:
|
||||
"""Handle file selection"""
|
||||
file_path = event.path
|
||||
# Check if it's an image file
|
||||
image_extensions = {'.png', '.jpg', '.jpeg', '.gif', '.bmp', '.webp'}
|
||||
if file_path.suffix.lower() in image_extensions:
|
||||
# Return the file path as result
|
||||
self.dismiss(str(file_path))
|
||||
else:
|
||||
self.notify("Please select an image file", severity="warning")
|
||||
|
||||
def on_button_pressed(self, event: Button.Pressed) -> None:
|
||||
"""Handle button presses"""
|
||||
if event.button.id == "up-button":
|
||||
# Navigate to parent directory
|
||||
parent = self.current_path.parent
|
||||
if parent != self.current_path:
|
||||
self.current_path = parent
|
||||
self.query_one("#title", Static).update(f"Current: {self.current_path}")
|
||||
# Reload the directory tree
|
||||
tree = self.query_one("#directory-tree", ImageDirectoryTree)
|
||||
tree.path = str(self.current_path)
|
||||
tree.reload()
|
||||
elif event.button.id == "cancel-button":
|
||||
# Return None to indicate cancellation
|
||||
self.dismiss(None)
|
||||
@@ -0,0 +1,80 @@
|
||||
from textual.app import ComposeResult
|
||||
from textual.binding import Binding
|
||||
from textual.containers import Vertical, Horizontal
|
||||
from textual.screen import ModalScreen
|
||||
from textual.widgets import Label, Input, Button
|
||||
|
||||
from pilgrim.ui.screens.edit_entry_screen import EditEntryScreen
|
||||
|
||||
|
||||
class NewDiaryModal(ModalScreen[str]):
|
||||
BINDINGS = [
|
||||
Binding("escape", "cancel", "Cancel"),
|
||||
Binding("enter", "create_diary", "Create",priority=True),
|
||||
]
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.auto_open = self.app.config_manager.auto_open_new_diary
|
||||
self.name_input = Input(id="NewDiaryModal-NameInput",classes="NewDiaryModal-NameInput") # This ID is fine, it's specific to the input
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
|
||||
with Vertical(id="new_diary_dialog",classes="NewDiaryModal-Dialog"):
|
||||
yield Label("Create a new diary", classes="NewDiaryModal-Title")
|
||||
yield Label("Diary Name:")
|
||||
yield self.name_input
|
||||
with Horizontal(classes="NewDiaryModal-ButtonsContainer"):
|
||||
yield Button("Create", variant="primary", id="create_diary_button",
|
||||
classes="NewDiaryModal-CreateDiaryButton")
|
||||
yield Button("Cancel", variant="default", id="cancel_button",
|
||||
classes="NewDiaryModal-CancelButton")
|
||||
|
||||
def on_mount(self):
|
||||
self.name_input.focus()
|
||||
|
||||
def on_button_pressed(self, event: Button.Pressed) -> None:
|
||||
"""Handles button clicks."""
|
||||
if event.button.id == "create_diary_button":
|
||||
self.action_create_diary()
|
||||
elif event.button.id == "cancel_button":
|
||||
self.dismiss()
|
||||
|
||||
def action_cancel(self) -> None:
|
||||
"""Action to cancel the modal."""
|
||||
self.dismiss("")
|
||||
|
||||
def action_create_diary(self) -> None:
|
||||
diary_name = self.name_input.value.strip()
|
||||
if diary_name:
|
||||
|
||||
self.call_later(self._async_create_diary, diary_name)
|
||||
|
||||
else:
|
||||
self.notify("Diary name cannot be empty.", severity="warning")
|
||||
self.name_input.focus()
|
||||
|
||||
def on_input_submitted(self, event: Input.Submitted) -> None:
|
||||
if event.input.id == "NewDiaryModal-NameInput":
|
||||
self.action_create_diary()
|
||||
|
||||
async def _async_create_diary(self, name: str):
|
||||
|
||||
try:
|
||||
service = self.app.service_manager.get_travel_diary_service()
|
||||
created_diary = await service.async_create(name)
|
||||
if created_diary:
|
||||
self.dismiss(name)
|
||||
|
||||
if self.auto_open:
|
||||
self.app.push_screen(EditEntryScreen(diary_id=created_diary.id))
|
||||
|
||||
self.notify(f"Diary: '{name}' created!")
|
||||
else:
|
||||
self.notify("Error Creating the diary")
|
||||
except Exception as e:
|
||||
self.notify(f"Exception on creating the diary: {str(e)}")
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
from textual.app import ComposeResult
|
||||
from textual.binding import Binding
|
||||
from textual.containers import Vertical, Horizontal
|
||||
from textual.screen import ModalScreen
|
||||
from textual.widgets import Label, Input, Button
|
||||
|
||||
|
||||
class RenameEntryModal(ModalScreen[str]):
|
||||
"""A modal screen to rename a diary entry."""
|
||||
|
||||
BINDINGS = [
|
||||
Binding("escape", "cancel", "Cancel"),
|
||||
]
|
||||
|
||||
def __init__(self, current_name: str):
|
||||
super().__init__()
|
||||
self._current_name = current_name
|
||||
self.name_input = Input(
|
||||
value=self._current_name,
|
||||
placeholder="Type the new name...",
|
||||
id="rename_input",
|
||||
classes="RenameEntryModal-name-input"
|
||||
)
|
||||
|
||||
def compose(self) -> ComposeResult:
|
||||
with Vertical(id="rename_entry_dialog", classes="RenameEntryModal-dialog"):
|
||||
yield Label("Rename Entry", classes="dialog-title RenameEntryModal-title")
|
||||
yield Label("New Entry Title:", classes="RenameEntryModal-label")
|
||||
yield self.name_input
|
||||
with Horizontal(classes="dialog-buttons RenameEntryModal-buttons"):
|
||||
yield Button("Save", variant="primary", id="save", classes="RenameEntryModal-save-button")
|
||||
yield Button("Cancel", variant="default", id="cancel", classes="RenameEntryModal-cancel-button")
|
||||
|
||||
def on_mount(self) -> None:
|
||||
"""Focuses on the input when the screen is mounted."""
|
||||
self.name_input.focus()
|
||||
self.name_input.cursor_position = len(self.name_input.value)
|
||||
|
||||
def on_button_pressed(self, event: Button.Pressed) -> None:
|
||||
"""Handles button clicks."""
|
||||
if event.button.id == "save":
|
||||
new_name = self.name_input.value.strip()
|
||||
if new_name:
|
||||
self.dismiss(new_name) # Returns the new name
|
||||
else:
|
||||
self.dismiss(None) # Considers empty name as cancellation
|
||||
else:
|
||||
self.dismiss(None) # Returns None for cancellation
|
||||
|
||||
def on_input_submitted(self, event: Input.Submitted) -> None:
|
||||
"""Allows saving by pressing Enter."""
|
||||
new_name = event.value.strip()
|
||||
if new_name:
|
||||
self.dismiss(new_name)
|
||||
else:
|
||||
self.dismiss(None)
|
||||
|
||||
def action_cancel(self) -> None:
|
||||
self.dismiss(None)
|
||||
@@ -0,0 +1,626 @@
|
||||
Screen {
|
||||
layout: vertical;
|
||||
background: $surface-darken-1;
|
||||
align: center middle;
|
||||
}
|
||||
|
||||
.EditEntryScreen-sub-header {
|
||||
layout: horizontal;
|
||||
background: $primary-darken-1;
|
||||
height: 1;
|
||||
padding: 0 1;
|
||||
align: center middle;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.EditEntryScreen-diary-info {
|
||||
width: auto;
|
||||
color: $text-muted;
|
||||
margin-right: 2;
|
||||
}
|
||||
|
||||
.EditEntryScreen-entry-info {
|
||||
width: auto;
|
||||
color: $text;
|
||||
margin-right: 1;
|
||||
}
|
||||
|
||||
.EditEntryScreen-spacer {
|
||||
width: 1fr;
|
||||
}
|
||||
|
||||
.EditEntryScreen-status-indicator {
|
||||
width: auto;
|
||||
padding: 0 1;
|
||||
content-align: center middle;
|
||||
}
|
||||
|
||||
.EditEntryScreen-status-indicator.saved {
|
||||
background: #2E8B57; /* SeaGreen */
|
||||
color: $text;
|
||||
}
|
||||
|
||||
.EditEntryScreen-status-indicator.not-saved {
|
||||
background: #B22222; /* FireBrick */
|
||||
color: $text;
|
||||
}
|
||||
|
||||
.EditEntryScreen-status-indicator.new {
|
||||
background: #4682B4; /* SteelBlue */
|
||||
color: $text;
|
||||
}
|
||||
|
||||
.EditEntryScreen-status-indicator.read-only {
|
||||
background: #696969; /* DimGray */
|
||||
color: $text-muted;
|
||||
}
|
||||
|
||||
.EditEntryScreen-main-container {
|
||||
background: bisque;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.EditEntryScreen-text-entry {
|
||||
width: 100%;
|
||||
height: 1fr;
|
||||
border: none;
|
||||
}
|
||||
|
||||
AboutScreen {
|
||||
align: center middle;
|
||||
}
|
||||
|
||||
#AboutScreen_AboutContainer {
|
||||
align: center middle;
|
||||
width: 85%;
|
||||
height: 95%;
|
||||
border: thick $primary;
|
||||
background: $surface;
|
||||
margin: 1;
|
||||
}
|
||||
|
||||
#AboutScreen_AboutContainer TextArea {
|
||||
align: center middle;
|
||||
width: 100%;
|
||||
height: 55%;
|
||||
margin: 2;
|
||||
padding: 1;
|
||||
}
|
||||
|
||||
#AboutScreen_SubContainer {
|
||||
align: center middle;
|
||||
height: 45%;
|
||||
padding: 1 1;
|
||||
margin: 1 1;
|
||||
}
|
||||
|
||||
#AboutScreen_AboutTitle {
|
||||
color: $accent;
|
||||
text-style: bold;
|
||||
text-align: center;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
#AboutScreen_AboutVersion {
|
||||
color: $warning;
|
||||
text-style: italic;
|
||||
text-align: center;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
#AboutScreen_AboutContent {
|
||||
text-align: center;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
#AboutScreen_AboutContact,
|
||||
#AboutScreen_AboutAuthor {
|
||||
color: $text-muted;
|
||||
text-align: center;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
#AboutScreen_AboutLicense {
|
||||
height: 60%;
|
||||
}
|
||||
|
||||
/* Main container - distributing vertical space */
|
||||
.DiaryListScreen-DiaryListContainer {
|
||||
height: 1fr;
|
||||
width: 100%;
|
||||
layout: vertical;
|
||||
align: center top; /* Aligns at the top to follow the wireframe */
|
||||
padding: 2 4; /* More space on the sides */
|
||||
background: $surface; /* Removing aquamarine to keep it cleaner */
|
||||
}
|
||||
|
||||
/* Diary list - main area as in the wireframe */
|
||||
.DiaryListScreen-DiaryListOptions {
|
||||
border: round $primary-lighten-2;
|
||||
background: $surface;
|
||||
width: 75%; /* Generous width as in the wireframe */
|
||||
height: 60%; /* Occupies available space */
|
||||
margin: 2 0; /* Vertical margin to separate from other elements */
|
||||
}
|
||||
|
||||
.DiaryListScreen-DiaryListOptions:focus {
|
||||
border: round $primary;
|
||||
}
|
||||
|
||||
/* Button container - right below the list */
|
||||
.DiaryListScreen-ButtonsGrid {
|
||||
layout: horizontal;
|
||||
align: center middle;
|
||||
width: 75%; /* Same width as the diary list */
|
||||
height: 20%; /* Increasing height to fit button text */
|
||||
}
|
||||
|
||||
/* Individual buttons - ensuring space for text */
|
||||
.DiaryListScreen-NewDiaryButton,
|
||||
.DiaryListScreen-EditDiaryButton,
|
||||
.DiaryListScreen-OpenDiaryButton {
|
||||
margin: 0 1 1 0; /* Space between buttons */
|
||||
height: 1fr;
|
||||
width: 1fr;
|
||||
border: round grey;
|
||||
text-align: center;
|
||||
content-align: center middle;
|
||||
}
|
||||
|
||||
/* Tips - using the correct class */
|
||||
.DiaryListScreen-DiaryListTips {
|
||||
width: 100%; /* Full width when using dock */
|
||||
height: auto;
|
||||
text-style: italic;
|
||||
text-align: center; /* Centers text within the element */
|
||||
color: $text-muted;
|
||||
dock: bottom; /* Sticks to the bottom of the screen */
|
||||
margin: 0 1;
|
||||
}
|
||||
|
||||
/* Generic styles that haven't changed */
|
||||
.option-list--option-highlighted {
|
||||
background: $primary-darken-2;
|
||||
}
|
||||
|
||||
.option-list--option-selected {
|
||||
text-style: bold;
|
||||
background: $primary;
|
||||
}
|
||||
|
||||
Header {
|
||||
background: $primary;
|
||||
color: $text;
|
||||
}
|
||||
|
||||
Footer {
|
||||
background: $primary;
|
||||
color: $text;
|
||||
}
|
||||
|
||||
Screen.-modal {
|
||||
background: rgba(0, 0, 0, 0.7); /* Darkens the background screen underneath */
|
||||
align: center middle; /* Centers the content (your modal) that is in this modal screen */
|
||||
}
|
||||
|
||||
/* Style for the new diary modal dialog */
|
||||
.NewDiaryModal-dialog {
|
||||
layout: vertical;
|
||||
width: 60%;
|
||||
height: auto;
|
||||
background: $surface;
|
||||
border: thick $accent;
|
||||
padding: 2 4;
|
||||
align: center middle;
|
||||
}
|
||||
|
||||
.NewDiaryModal-title {
|
||||
text-align: center;
|
||||
text-style: bold;
|
||||
color: $primary;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
.NewDiaryModal-label {
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
.NewDiaryModal-name-input {
|
||||
width: 1fr;
|
||||
margin-bottom: 2;
|
||||
}
|
||||
|
||||
.NewDiaryModal-buttons {
|
||||
width: 1fr;
|
||||
height: auto;
|
||||
align: center middle;
|
||||
padding-top: 1;
|
||||
}
|
||||
|
||||
.NewDiaryModal-buttons Button {
|
||||
margin: 0 1;
|
||||
width: 1fr;
|
||||
}
|
||||
|
||||
/* Additional classes for NewDiaryModal */
|
||||
.NewDiaryModal-Dialog {
|
||||
layout: vertical;
|
||||
width: 60%;
|
||||
height: auto;
|
||||
background: $surface;
|
||||
border: thick $accent;
|
||||
padding: 2 4;
|
||||
align: center middle;
|
||||
}
|
||||
|
||||
.NewDiaryModal-Title {
|
||||
text-align: center;
|
||||
text-style: bold;
|
||||
color: $primary;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
.NewDiaryModal-NameInput {
|
||||
width: 1fr;
|
||||
margin-bottom: 2;
|
||||
}
|
||||
|
||||
.NewDiaryModal-ButtonsContainer {
|
||||
width: 1fr;
|
||||
height: auto;
|
||||
align: center middle;
|
||||
padding-top: 1;
|
||||
}
|
||||
|
||||
.NewDiaryModal-CreateDiaryButton,
|
||||
.NewDiaryModal-CancelButton {
|
||||
margin: 0 1;
|
||||
width: 1fr;
|
||||
}
|
||||
|
||||
/* Style for the edit diary modal dialog */
|
||||
.EditDiaryModal-dialog {
|
||||
layout: vertical;
|
||||
width: 60%;
|
||||
height: auto;
|
||||
background: $surface;
|
||||
border: thick $warning;
|
||||
padding: 2 4;
|
||||
align: center middle;
|
||||
}
|
||||
|
||||
.EditDiaryModal-title {
|
||||
text-align: center;
|
||||
text-style: bold;
|
||||
color: $warning;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
.EditDiaryModal-label {
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
.EditDiaryModal-name-input {
|
||||
width: 1fr;
|
||||
margin-bottom: 2;
|
||||
}
|
||||
|
||||
.EditDiaryModal-buttons {
|
||||
width: 1fr;
|
||||
height: auto;
|
||||
align: center middle;
|
||||
padding-top: 1;
|
||||
}
|
||||
|
||||
.EditDiaryModal-buttons Button {
|
||||
margin: 0 1;
|
||||
width: 1fr;
|
||||
}
|
||||
|
||||
/* Additional classes for EditDiaryModal */
|
||||
.EditDiaryModal-Dialog {
|
||||
layout: vertical;
|
||||
width: 60%;
|
||||
height: auto;
|
||||
background: $surface;
|
||||
border: thick $warning;
|
||||
padding: 2 4;
|
||||
align: center middle;
|
||||
}
|
||||
|
||||
.EditDiaryModal-Title {
|
||||
text-align: center;
|
||||
text-style: bold;
|
||||
color: $warning;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
.EditDiaryModal-NameInput {
|
||||
width: 1fr;
|
||||
margin-bottom: 2;
|
||||
}
|
||||
|
||||
.EditDiaryModal-ButtonsContainer {
|
||||
width: 1fr;
|
||||
height: auto;
|
||||
align: center middle;
|
||||
padding-top: 1;
|
||||
}
|
||||
|
||||
.EditDiaryModal-SaveButton,
|
||||
.EditDiaryModal-CancelButton {
|
||||
margin: 0 1;
|
||||
width: 1fr;
|
||||
}
|
||||
|
||||
/* Style for the rename entry modal dialog */
|
||||
.RenameEntryModal-dialog {
|
||||
layout: vertical;
|
||||
width: 60%;
|
||||
height: auto;
|
||||
background: $surface;
|
||||
border: thick $accent;
|
||||
padding: 2 4;
|
||||
align: center middle;
|
||||
}
|
||||
|
||||
.RenameEntryModal-title {
|
||||
text-align: center;
|
||||
text-style: bold;
|
||||
color: $accent;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
.RenameEntryModal-name-input {
|
||||
width: 1fr;
|
||||
margin-bottom: 2;
|
||||
}
|
||||
|
||||
.RenameEntryModal-buttons {
|
||||
width: 1fr;
|
||||
height: auto;
|
||||
align: center middle;
|
||||
padding-top: 1;
|
||||
}
|
||||
|
||||
.RenameEntryModal-save-button,
|
||||
.RenameEntryModal-cancel-button {
|
||||
margin: 0 1;
|
||||
width: 1fr;
|
||||
}
|
||||
|
||||
.EditEntryScreen-sidebar{
|
||||
background: $primary-darken-1;
|
||||
width: 45%;
|
||||
}
|
||||
.EditEntryScreen-sidebar-title {
|
||||
text-align: center;
|
||||
text-style: bold;
|
||||
color: $accent;
|
||||
padding: 1;
|
||||
border-bottom: solid $accent;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
.EditEntryScreen-sidebar-content {
|
||||
height: 1fr;
|
||||
layout: vertical;
|
||||
margin-left: 1;
|
||||
margin-right: 1;
|
||||
|
||||
}
|
||||
|
||||
.EditEntryScreen-sidebar-photo-list {
|
||||
height: 2fr; /* Pega o espaço restante disponível */
|
||||
min-height: 5; /* Garante altura mínima para não sumir */
|
||||
border: solid $accent;
|
||||
margin-bottom: 1;
|
||||
overflow-y: auto; /* Adiciona scroll vertical se necessário */
|
||||
}
|
||||
|
||||
.EditEntryScreen-sidebar-photo-info {
|
||||
height: 1fr;
|
||||
max-height: 15; /* Limita altura máxima */
|
||||
min-height: 13;
|
||||
padding: 1;
|
||||
border: solid $warning;
|
||||
margin-bottom: 1;
|
||||
background: $surface-darken-1;
|
||||
overflow-y: auto; /* Adiciona scroll se exceder max-height */
|
||||
}
|
||||
|
||||
.EditEntryScreen-sidebar-help {
|
||||
height: 1fr;
|
||||
max-height: 10; /* Altura máxima menor que info */
|
||||
min-height: 8; /* Altura mínima menor */
|
||||
border: solid $success;
|
||||
padding: 1;
|
||||
background: $surface-darken-1;
|
||||
text-style: italic;
|
||||
overflow-y: auto; /* Adiciona scroll se exceder max-height */
|
||||
}
|
||||
|
||||
/* Photo Modal Styles */
|
||||
.modal-dialog {
|
||||
layout: vertical;
|
||||
width: 60%;
|
||||
height: auto;
|
||||
background: $surface;
|
||||
border: thick $accent;
|
||||
padding: 2 4;
|
||||
align: center middle;
|
||||
}
|
||||
|
||||
.modal-title {
|
||||
text-align: center;
|
||||
text-style: bold;
|
||||
color: $primary;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
.modal-label {
|
||||
margin-bottom: 1;
|
||||
color: $text;
|
||||
}
|
||||
|
||||
.modal-input {
|
||||
width: 1fr;
|
||||
margin-bottom: 2;
|
||||
}
|
||||
|
||||
.modal-buttons {
|
||||
width: 1fr;
|
||||
height: auto;
|
||||
align: center middle;
|
||||
padding-top: 1;
|
||||
}
|
||||
|
||||
.modal-button {
|
||||
margin: 0 1;
|
||||
width: 1fr;
|
||||
}
|
||||
|
||||
/* AddPhotoModal styles */
|
||||
.AddPhotoModal-Dialog {
|
||||
layout: vertical;
|
||||
width: 60%;
|
||||
height: auto;
|
||||
background: $surface;
|
||||
border: thick $accent;
|
||||
padding: 2 4;
|
||||
align: center middle;
|
||||
}
|
||||
.AddPhotoModal-Title {
|
||||
text-align: center;
|
||||
text-style: bold;
|
||||
color: $primary;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
.AddPhotoModal-Label {
|
||||
margin-bottom: 1;
|
||||
color: $text;
|
||||
}
|
||||
.AddPhotoModal-Input {
|
||||
width: 1fr;
|
||||
margin-bottom: 2;
|
||||
}
|
||||
.AddPhotoModal-Buttons {
|
||||
width: 1fr;
|
||||
height: auto;
|
||||
align: center middle;
|
||||
padding-top: 1;
|
||||
}
|
||||
.AddPhotoModal-Button {
|
||||
margin: 0 1;
|
||||
width: 1fr;
|
||||
}
|
||||
|
||||
/* EditPhotoModal styles */
|
||||
.EditPhotoModal-Dialog {
|
||||
layout: vertical;
|
||||
width: 60%;
|
||||
height: auto;
|
||||
background: $surface;
|
||||
border: thick $accent;
|
||||
padding: 2 4;
|
||||
align: center middle;
|
||||
}
|
||||
.EditPhotoModal-Title {
|
||||
text-align: center;
|
||||
text-style: bold;
|
||||
color: $primary;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
.EditPhotoModal-Label {
|
||||
margin-bottom: 1;
|
||||
color: $text;
|
||||
}
|
||||
.EditPhotoModal-Input {
|
||||
width: 1fr;
|
||||
margin-bottom: 2;
|
||||
}
|
||||
.EditPhotoModal-Buttons {
|
||||
width: 1fr;
|
||||
height: auto;
|
||||
align: center middle;
|
||||
padding-top: 1;
|
||||
}
|
||||
.EditPhotoModal-Button {
|
||||
margin: 0 1;
|
||||
width: 1fr;
|
||||
}
|
||||
|
||||
/* FilePickerModal styles */
|
||||
.FilePickerModal-Dialog {
|
||||
layout: vertical;
|
||||
width: 80%;
|
||||
height: 80%;
|
||||
background: $surface;
|
||||
border: thick $accent;
|
||||
padding: 2 4;
|
||||
align: center middle;
|
||||
}
|
||||
|
||||
.FilePickerModal-Title {
|
||||
text-align: center;
|
||||
text-style: bold;
|
||||
color: $primary;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
|
||||
.FilePickerModal-Buttons {
|
||||
width: 1fr;
|
||||
height: auto;
|
||||
align: center middle;
|
||||
padding-top: 1;
|
||||
}
|
||||
|
||||
.FilePickerModal-Button {
|
||||
margin: 0 1;
|
||||
width: 1fr;
|
||||
}
|
||||
|
||||
/* DirectoryTree specific styles */
|
||||
#directory-tree {
|
||||
height: 1fr;
|
||||
border: solid $accent;
|
||||
margin: 1;
|
||||
}
|
||||
|
||||
/* ConfirmDeleteModal styles */
|
||||
.ConfirmDeleteModal-Dialog {
|
||||
layout: vertical;
|
||||
width: 60%;
|
||||
height: auto;
|
||||
background: $surface;
|
||||
border: thick $error;
|
||||
padding: 2 4;
|
||||
align: center middle;
|
||||
}
|
||||
.ConfirmDeleteModal-Title {
|
||||
text-align: center;
|
||||
text-style: bold;
|
||||
color: $error;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
.ConfirmDeleteModal-Message {
|
||||
text-align: center;
|
||||
color: $text;
|
||||
margin-bottom: 1;
|
||||
}
|
||||
.ConfirmDeleteModal-Warning {
|
||||
text-align: center;
|
||||
color: $warning;
|
||||
text-style: italic;
|
||||
margin-bottom: 2;
|
||||
}
|
||||
.ConfirmDeleteModal-Buttons {
|
||||
width: 1fr;
|
||||
height: auto;
|
||||
align: center middle;
|
||||
padding-top: 1;
|
||||
}
|
||||
.ConfirmDeleteModal-Button {
|
||||
margin: 0 1;
|
||||
width: 1fr;
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
from pathlib import Path
|
||||
from typing import Iterable
|
||||
|
||||
from textual.app import App, SystemCommand
|
||||
from textual.screen import Screen
|
||||
|
||||
|
||||
from pilgrim.service.servicemanager import ServiceManager
|
||||
from pilgrim.ui.screens.about_screen import AboutScreen
|
||||
from pilgrim.ui.screens.diary_list_screen import DiaryListScreen
|
||||
from pilgrim.ui.screens.edit_entry_screen import EditEntryScreen
|
||||
from pilgrim.utils import ConfigManager
|
||||
|
||||
CSS_FILE_PATH = Path(__file__).parent / "styles" / "pilgrim.css"
|
||||
|
||||
|
||||
class UIApp(App):
|
||||
CSS_PATH = CSS_FILE_PATH
|
||||
|
||||
def __init__(self,service_manager: ServiceManager, config_manager: ConfigManager, **kwargs):
|
||||
super().__init__(**kwargs)
|
||||
self.service_manager = service_manager
|
||||
self.config_manager = config_manager
|
||||
|
||||
|
||||
def on_mount(self) -> None:
|
||||
"""Called when the app starts. Loads the main screen."""
|
||||
self.push_screen(DiaryListScreen())
|
||||
|
||||
def get_system_commands(self, screen: Screen) -> Iterable[SystemCommand]:
|
||||
"""Return commands based on current screen."""
|
||||
|
||||
# Commands for DiaryListScreen
|
||||
if isinstance(screen, DiaryListScreen):
|
||||
yield SystemCommand(
|
||||
"About Pilgrim",
|
||||
"Open About Pilgrim",
|
||||
screen.action_about_cmd
|
||||
)
|
||||
|
||||
elif isinstance(screen, AboutScreen):
|
||||
yield SystemCommand(
|
||||
"Back to List",
|
||||
"Return to the diary list",
|
||||
screen.dismiss
|
||||
)
|
||||
|
||||
elif isinstance(screen, EditEntryScreen):
|
||||
yield SystemCommand(
|
||||
"Back to Diary List",
|
||||
"Return to the diary list",
|
||||
screen.action_back_to_list
|
||||
)
|
||||
|
||||
# Always include quit command
|
||||
yield SystemCommand(
|
||||
"Quit Application",
|
||||
"Exit Pilgrim",
|
||||
self.action_quit
|
||||
)
|
||||
@@ -0,0 +1,4 @@
|
||||
from .directory_manager import DirectoryManager
|
||||
from .config_manager import ConfigManager
|
||||
|
||||
__all__ = ['DirectoryManager', 'ConfigManager']
|
||||
@@ -0,0 +1,107 @@
|
||||
import os.path
|
||||
from os import PathLike
|
||||
from threading import Lock
|
||||
|
||||
import tomli
|
||||
import tomli_w
|
||||
|
||||
from pilgrim.utils import DirectoryManager
|
||||
|
||||
|
||||
class SingletonMeta(type):
|
||||
_instances = {}
|
||||
_lock: Lock = Lock()
|
||||
|
||||
def __call__(cls, *args, **kwargs):
|
||||
with cls._lock:
|
||||
if cls not in cls._instances:
|
||||
instance = super().__call__(*args, **kwargs)
|
||||
cls._instances[cls] = instance
|
||||
return cls._instances[cls]
|
||||
|
||||
|
||||
class ConfigManager(metaclass=SingletonMeta):
|
||||
def __init__(self):
|
||||
self.database_url = None
|
||||
self.database_type = None
|
||||
self.auto_open_diary = None
|
||||
self.auto_open_new_diary = None
|
||||
self.config_dir = DirectoryManager.get_config_directory()
|
||||
self.__data = None
|
||||
|
||||
def read_config(self):
|
||||
if os.path.exists(f"{DirectoryManager.get_config_directory()}/config.toml"):
|
||||
try:
|
||||
with open(f"{DirectoryManager.get_config_directory()}/config.toml", "rb") as f:
|
||||
data = tomli.load(f)
|
||||
|
||||
except tomli.TOMLDecodeError as e:
|
||||
raise ValueError(f"Invalid TOML configuration: {e}")
|
||||
except Exception as e:
|
||||
raise RuntimeError(f"Error reading configuration: {e}")
|
||||
|
||||
self.__data = data
|
||||
self.database_url = self.__data["database"]["url"]
|
||||
self.database_type = self.__data["database"]["type"]
|
||||
|
||||
if self.__data["settings"]["diary"]["auto_open_diary_on_startup"] == "":
|
||||
self.auto_open_diary = None
|
||||
self.auto_open_new_diary = self.__data["settings"]["diary"]["auto_open_on_creation"]
|
||||
else:
|
||||
print("Error: config.toml not found.")
|
||||
self.create_config()
|
||||
self.read_config()
|
||||
|
||||
def create_config(self, config: dict = None):
|
||||
# Garantir que o diretório de configuração existe
|
||||
config_dir = DirectoryManager.get_config_directory()
|
||||
if not os.path.exists(config_dir):
|
||||
os.makedirs(config_dir, exist_ok=True)
|
||||
|
||||
default = {
|
||||
"database": {
|
||||
"url": f"{config_dir}/database.db",
|
||||
"type": "sqlite"
|
||||
},
|
||||
"settings": {
|
||||
"diary": {
|
||||
"auto_open_diary_on_startup": "",
|
||||
"auto_open_on_creation": False
|
||||
}
|
||||
}
|
||||
}
|
||||
if config is None:
|
||||
config = default
|
||||
|
||||
try:
|
||||
with open(f"{config_dir}/config.toml", "wb") as f:
|
||||
tomli_w.dump(config, f)
|
||||
except Exception as e:
|
||||
raise RuntimeError(f"Error creating configuration: {e}")
|
||||
|
||||
def save_config(self):
|
||||
if self.__data is None:
|
||||
self.read_config()
|
||||
if self.__data is None:
|
||||
raise RuntimeError("Error reading configuration.")
|
||||
|
||||
self.__data["database"]["url"] = self.database_url
|
||||
self.__data["database"]["type"] = self.database_type
|
||||
self.__data["settings"]["diary"]["auto_open_diary_on_startup"] = self.auto_open_diary or ""
|
||||
self.__data["settings"]["diary"]["auto_open_on_creation"] = self.auto_open_new_diary
|
||||
try:
|
||||
self.create_config(self.__data)
|
||||
except Exception as e:
|
||||
raise RuntimeError(f"Error saving configuration: {e}")
|
||||
|
||||
def set_config_dir(self, value):
|
||||
self.config_dir = value
|
||||
|
||||
def set_database_url(self, value: str):
|
||||
self.database_url = value
|
||||
|
||||
def set_auto_open_diary(self, value: str):
|
||||
self.auto_open_diary = value
|
||||
|
||||
def set_auto_open_new_diary(self, value: bool):
|
||||
self.auto_open_new_diary = value
|
||||
@@ -0,0 +1,63 @@
|
||||
import os
|
||||
import shutil
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
class DirectoryManager:
|
||||
@staticmethod
|
||||
def get_config_directory() -> Path:
|
||||
"""
|
||||
Get the ~/.pilgrim directory path.
|
||||
Creates it if it doesn't exist.
|
||||
"""
|
||||
home = Path.home()
|
||||
config_dir = home / ".pilgrim"
|
||||
config_dir.mkdir(exist_ok=True)
|
||||
os.chmod(config_dir, 0o700)
|
||||
return config_dir
|
||||
|
||||
@staticmethod
|
||||
def get_diaries_root() -> Path:
|
||||
"""Returns the path to the diaries directory."""
|
||||
diaries_dir = DirectoryManager.get_config_directory() / "diaries"
|
||||
diaries_dir.mkdir(exist_ok=True)
|
||||
os.chmod(diaries_dir, 0o700)
|
||||
return diaries_dir
|
||||
|
||||
@staticmethod
|
||||
def get_diary_directory(directory_name: str) -> Path:
|
||||
"""Returns the directory path for a specific diary."""
|
||||
return DirectoryManager.get_diaries_root() / directory_name
|
||||
|
||||
@staticmethod
|
||||
def get_diary_data_directory(directory_name: str) -> Path:
|
||||
"""Returns the data directory path for a specific diary."""
|
||||
return DirectoryManager.get_diary_directory(directory_name) / "data"
|
||||
|
||||
@staticmethod
|
||||
def get_diary_images_directory(directory_name: str) -> Path:
|
||||
"""Returns the images directory path for a specific diary."""
|
||||
return DirectoryManager.get_diary_data_directory(directory_name) / "images"
|
||||
|
||||
@staticmethod
|
||||
def get_database_path() -> Path:
|
||||
"""
|
||||
Get the database file path following XDG Base Directory specification.
|
||||
Creates the directory if it doesn't exist.
|
||||
"""
|
||||
pilgrim_dir = DirectoryManager.get_config_directory()
|
||||
db_path = pilgrim_dir / "database.db"
|
||||
|
||||
# If database doesn't exist in new location but exists in current directory,
|
||||
# migrate it
|
||||
if not db_path.exists():
|
||||
current_db = Path("database.db")
|
||||
if current_db.exists():
|
||||
try:
|
||||
shutil.copy2(current_db, db_path)
|
||||
# Consider using logging instead of print
|
||||
print(f"Database migrated from {current_db} to {db_path}")
|
||||
except (OSError, shutil.Error) as e:
|
||||
raise RuntimeError(f"Failed to migrate database: {e}")
|
||||
|
||||
return db_path
|
||||
@@ -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()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user