mirror of
https://github.com/gmbrax/Pilgrim.git
synced 2026-11-10 14:10:16 +00:00
Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
736c0f160f | ||
|
|
de27485c98 | ||
|
|
e9162ab25c | ||
|
|
88a0b9cf80 | ||
|
|
4dda85d8a3 | ||
|
|
5a28afc540 | ||
|
|
4d87ae1b90 | ||
|
|
e1add84537 | ||
|
|
2ba1cbd0a6 | ||
|
|
eed16f34c1 | ||
|
|
06ee08b201 |
+29
-33
@@ -1,36 +1,32 @@
|
|||||||
[build-system]
|
[build-system]
|
||||||
requires = ["hatchling"]
|
requires = ["hatchling"]
|
||||||
build-backend = "hatchling.build"
|
build-backend = "hatchling.build"
|
||||||
|
|
||||||
|
[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",
|
||||||
|
"unidecode"
|
||||||
|
]
|
||||||
|
|
||||||
[project]
|
[project.urls]
|
||||||
name = "Pilgrim"
|
Homepage = "https://github.com/gmbrax/Pilgrim/"
|
||||||
version = "0.0.4"
|
Issues = "https://github.com/gmbrax/Pilgrim/issues"
|
||||||
authors = [
|
|
||||||
{ name="Gustavo Henrique Santos Souza de Miranda", email="gustavohssmiranda@gmail.com" }
|
|
||||||
]
|
|
||||||
description = "Pilgrim's Travel Log"
|
|
||||||
readme = "README.md"
|
|
||||||
requires-python = ">=3.10"
|
|
||||||
classifiers = [
|
|
||||||
"Programming Language :: Python :: 3",
|
|
||||||
"License :: OSI Approved :: BSD License",
|
|
||||||
"Operating System :: OS Independent",
|
|
||||||
]
|
|
||||||
dependencies = [
|
|
||||||
"sqlalchemy",
|
|
||||||
"textual",
|
|
||||||
"tomli",
|
|
||||||
"tomli_w"
|
|
||||||
|
|
||||||
|
[project.scripts]
|
||||||
]
|
pilgrim = "pilgrim.command:main"
|
||||||
[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"
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
from sqlalchemy import create_engine
|
from sqlalchemy import create_engine
|
||||||
from sqlalchemy.ext.declarative import declarative_base
|
from sqlalchemy.orm import declarative_base
|
||||||
from sqlalchemy.orm import sessionmaker
|
from sqlalchemy.orm import sessionmaker
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
import os
|
import os
|
||||||
|
|||||||
@@ -4,15 +4,16 @@ from pilgrim.models.photo_in_entry import photo_entry_association
|
|||||||
from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
|
from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
|
|
||||||
from ..database import Base
|
from pilgrim.database import Base
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Entry(Base):
|
class Entry(Base):
|
||||||
__tablename__ = "entries"
|
__tablename__ = "entries"
|
||||||
id = Column(Integer, primary_key=True)
|
id = Column(Integer, primary_key=True)
|
||||||
title = Column(String)
|
title = Column(String,nullable=False)
|
||||||
text = Column(String)
|
text = Column(String)
|
||||||
date = Column(DateTime)
|
date = Column(DateTime,nullable=False)
|
||||||
photos = relationship(
|
photos = relationship(
|
||||||
"Photo",
|
"Photo",
|
||||||
secondary=photo_entry_association,
|
secondary=photo_entry_association,
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ from sqlalchemy.orm import relationship
|
|||||||
from sqlalchemy.sql.schema import Index
|
from sqlalchemy.sql.schema import Index
|
||||||
|
|
||||||
from pilgrim.models.photo_in_entry import photo_entry_association
|
from pilgrim.models.photo_in_entry import photo_entry_association
|
||||||
from ..database import Base
|
from pilgrim.database import Base
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Photo(Base):
|
class Photo(Base):
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from sqlalchemy import Table, Column, Integer, ForeignKey
|
from sqlalchemy import Table, Column, Integer, ForeignKey
|
||||||
|
|
||||||
from ..database import Base
|
from pilgrim.database import Base
|
||||||
|
|
||||||
photo_entry_association = Table('photo_entry_association', Base.metadata,
|
photo_entry_association = Table('photo_entry_association', Base.metadata,
|
||||||
Column('id', Integer, primary_key=True, autoincrement=True),
|
Column('id', Integer, primary_key=True, autoincrement=True),
|
||||||
|
|||||||
@@ -3,10 +3,11 @@ from typing import Any
|
|||||||
from sqlalchemy import Column, Integer, String, UniqueConstraint
|
from sqlalchemy import Column, Integer, String, UniqueConstraint
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
|
|
||||||
from .. import database
|
from pilgrim.database import Base
|
||||||
|
|
||||||
|
|
||||||
class TravelDiary(database.Base):
|
|
||||||
|
class TravelDiary(Base):
|
||||||
__tablename__ = "travel_diaries"
|
__tablename__ = "travel_diaries"
|
||||||
id = Column(Integer, primary_key=True)
|
id = Column(Integer, primary_key=True)
|
||||||
name = Column(String, nullable=False)
|
name = Column(String, nullable=False)
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
from ..models.entry import Entry
|
from pilgrim.models.entry import Entry
|
||||||
from ..models.travel_diary import TravelDiary
|
from pilgrim.models.travel_diary import TravelDiary
|
||||||
from ..models.photo import Photo # ✨ Importe o modelo Photo
|
from pilgrim.models.photo import Photo # ✨ Importe o modelo Photo
|
||||||
|
|
||||||
|
|
||||||
class EntryService:
|
class EntryService:
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ from pathlib import Path
|
|||||||
from pilgrim.utils import DirectoryManager
|
from pilgrim.utils import DirectoryManager
|
||||||
from sqlalchemy.exc import IntegrityError
|
from sqlalchemy.exc import IntegrityError
|
||||||
|
|
||||||
from ..models.travel_diary import TravelDiary
|
from pilgrim.models.travel_diary import TravelDiary
|
||||||
|
from unidecode import unidecode
|
||||||
|
|
||||||
class TravelDiaryService:
|
class TravelDiaryService:
|
||||||
def __init__(self, session):
|
def __init__(self, session):
|
||||||
@@ -20,8 +20,10 @@ class TravelDiaryService:
|
|||||||
- Replaces spaces with underscores
|
- Replaces spaces with underscores
|
||||||
- Ensures name is unique by adding a suffix if needed
|
- Ensures name is unique by adding a suffix if needed
|
||||||
"""
|
"""
|
||||||
|
transliterated_name = unidecode(name)
|
||||||
|
|
||||||
# Remove special characters and replace spaces
|
# Remove special characters and replace spaces
|
||||||
safe_name = re.sub(r'[^\w\s-]', '', name)
|
safe_name = re.sub(r'[^\w\s-]', '', transliterated_name)
|
||||||
safe_name = safe_name.strip().replace(' ', '_').lower()
|
safe_name = safe_name.strip().replace(' ', '_').lower()
|
||||||
|
|
||||||
# Ensure we have a valid name
|
# Ensure we have a valid name
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import pytest
|
||||||
|
from sqlalchemy import create_engine
|
||||||
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
|
||||||
|
from pilgrim.database import Base
|
||||||
|
from pilgrim.models.travel_diary import TravelDiary
|
||||||
|
|
||||||
|
# Todos os imports necessários para as fixtures devem estar aqui
|
||||||
|
# ...
|
||||||
|
|
||||||
|
@pytest.fixture(scope="function")
|
||||||
|
def db_session():
|
||||||
|
"""Esta fixture agora está disponível para TODOS os testes."""
|
||||||
|
engine = create_engine("sqlite:///:memory:")
|
||||||
|
Base.metadata.create_all(engine)
|
||||||
|
Session = sessionmaker(bind=engine)
|
||||||
|
session = Session()
|
||||||
|
yield session
|
||||||
|
session.close()
|
||||||
|
Base.metadata.drop_all(engine)
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def populated_db_session(db_session):
|
||||||
|
"""Esta também fica disponível para todos."""
|
||||||
|
travel_diary = TravelDiary(name="My Travel Diary", directory_name="viagem-teste")
|
||||||
|
db_session.add(travel_diary)
|
||||||
|
db_session.commit()
|
||||||
|
return db_session
|
||||||
Reference in New Issue
Block a user