mirror of https://github.com/gmbrax/Pilgrim.git
🎨refactor: move modules and refactor import statements
This commit is contained in:
parent
dec8a7b445
commit
99eb0a0651
|
|
@ -1,5 +1,5 @@
|
|||
from pilgrim.database import Database
|
||||
from pilgrim.service.servicemanager import ServiceManager
|
||||
from src.database import Database
|
||||
from src.service.servicemanager import ServiceManager
|
||||
|
||||
|
||||
class Application:
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
from pilgrim.application import Application
|
||||
from src.application import Application
|
||||
|
||||
|
||||
def main():
|
||||
|
|
@ -4,7 +4,6 @@ from sqlalchemy.orm import sessionmaker
|
|||
|
||||
Base = declarative_base()
|
||||
|
||||
|
||||
class Database:
|
||||
def __init__(self):
|
||||
self.engine = create_engine(
|
||||
|
|
@ -3,8 +3,8 @@ from typing import Any
|
|||
from sqlalchemy import Column, Integer, String, ForeignKey
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
from pilgrim.models.photo_in_entry import photo_entry_association
|
||||
from ..database import Base
|
||||
from src.models.photo_in_entry import photo_entry_association
|
||||
from src.database import Base
|
||||
|
||||
|
||||
class Entry(Base):
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
from typing import Any
|
||||
|
||||
from sqlalchemy import Column, Integer, String, ForeignKey
|
||||
from sqlalchemy.orm import relationship
|
||||
from sqlalchemy import Column, Integer, String, ForeignKey
|
||||
|
||||
from pilgrim.models.photo_in_entry import photo_entry_association
|
||||
from ..database import Base
|
||||
from src.models.photo_in_entry import photo_entry_association
|
||||
from src.database import Base
|
||||
|
||||
|
||||
class Photo(Base):
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
from sqlalchemy import Table, Column, Integer, ForeignKey
|
||||
|
||||
from ..database import Base
|
||||
from src.database import Base
|
||||
|
||||
photo_entry_association = Table('photo_entry_association', Base.metadata,
|
||||
Column('id', Integer, primary_key=True, autoincrement=True),
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
from typing import Any
|
||||
|
||||
from src.database import Base
|
||||
|
||||
from sqlalchemy import Column, String, Integer
|
||||
|
||||
from ..database import Base
|
||||
|
||||
class TravelDiary(Base):
|
||||
__tablename__ = "travel_diaries"
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
from pilgrim.application import Application
|
||||
from pilgrim.command import main
|
||||
from pilgrim.database import Database, Base
|
||||
from pilgrim.models.travel_diary import TravelDiary
|
||||
from pilgrim.models.entry import Entry
|
||||
from pilgrim.models.photo import Photo
|
||||
|
||||
__all__ = ["Application", "Database", "TravelDiary", "Entry", "Photo", "main", "Base"]
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
from typing import List
|
||||
|
||||
from ..models.entry import Entry
|
||||
from ..models.travel_diary import TravelDiary
|
||||
from src.models.entry import Entry
|
||||
from src.models.travel_diary import TravelDiary
|
||||
|
||||
|
||||
class EntryService:
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
from pathlib import Path
|
||||
from typing import List
|
||||
|
||||
from pilgrim import Photo, TravelDiary
|
||||
from src.models.photo import Photo
|
||||
from src.models.travel_diary import TravelDiary
|
||||
|
||||
|
||||
class PhotoService:
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
from pilgrim.service.entry_service import EntryService
|
||||
from pilgrim.service.travel_diary_service import TravelDiaryService
|
||||
from src.service.entry_service import EntryService
|
||||
from src.service.travel_diary_service import TravelDiaryService
|
||||
|
||||
|
||||
class ServiceManager:
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
from ..models.travel_diary import TravelDiary
|
||||
from src.models.travel_diary import TravelDiary
|
||||
|
||||
|
||||
class TravelDiaryService:
|
||||
Loading…
Reference in New Issue