Vorbereitung Release 0.2.0

kontor-api/src/db/models/media.py

@@ -25,9 +25,9 @@ class MediaFile(Base, BaseMixin, BaseVideoMixin):
     def update_title(self) -> None:
         logging.info(f"update title for {self.url}")
         try:
-            r = requests.get(self.url)
+            r = requests.get(str(self.url))
             soup = BeautifulSoup(r.content, "html.parser")
-            title = soup.title.string
+            title = soup.title.get_text() # type: ignore
             self.title = title
             self.review = False
         except:
@@ -37,7 +37,7 @@ class MediaFile(Base, BaseMixin, BaseVideoMixin):
 
     def download_file(self, download_dir: str, dl_tool: str):
         logging.info(f"download file for {self.url} to {download_dir}")
-        result = subprocess.run([dl_tool, self.url], cwd=download_dir, capture_output=True, text=True)
+        result = subprocess.run([dl_tool, self.url], cwd=download_dir, capture_output=True, text=True) # type: ignore
         if result.returncode == 0:
             output = result.stdout
             output = re.sub(' +', ' ', output)
@@ -72,6 +72,12 @@ class MediaActor(Base, BaseMixin):
     __tablename__ = 'media_actor'
     name = Column(String)
     media_actor_files = relationship("MediaActorFile")
+    
+    def __repr__(self) -> str:
+        return f'MediaActor({self.id} {self.name} {self.url})'
+    
+    def __str__(self) -> str:
+        return f'{self.url}({self.id})'
 
 
 class MediaActorFile(Base, BaseMixin):
@@ -81,6 +87,11 @@ class MediaActorFile(Base, BaseMixin):
     media_file_id = Column(String, ForeignKey("media_file.id"), nullable=True)
     media_file = relationship("MediaFile", back_populates="media_actor_files")
 
+    def __repr__(self):
+        return f'MediaActorFile({self.id} {self.media_actor_id} {self.media_file_id})'
+
+    def __str__(self) -> str:
+        return f'{self.id} {self.media_actor_id} {self.media_file_id}'
 
 class MediaArticle(Base, BaseMixin):
     __tablename__ = 'media_article'

kontor-api/src/db/repository/comics/publisher.py

@@ -0,0 +1,24 @@
+from typing import List
+
+from src.db.models.comic import Publisher
+from src.schema.comics.comic import ComicResponse
+from src.schema.comics.publisher import PublisherResponse
+from src.schema.comics.publisher_details import PublisherDetailsResponse
+
+
+def get_publisher_details(publisher: Publisher) -> PublisherDetailsResponse:
+    imprints: List[PublisherResponse] = []
+    for imprint in publisher.imprints:
+        imprints.append(PublisherResponse(id=imprint.id, name=str(imprint.name)))
+    comics: List[ComicResponse] = []
+    for comic in publisher.comics:
+        comics.append(
+            ComicResponse(id=comic.id, title=comic.title, completed=comic.completed)
+        )
+    parent_publisher: PublisherResponse | None = None
+    if publisher.parent_publisher:
+        parent_publisher = PublisherResponse(id=publisher.parent_publisher.id, name=str(publisher.parent_publisher.name))
+    response: PublisherDetailsResponse = PublisherDetailsResponse(
+        id=publisher.id, name=str(publisher.name), parent_publisher=parent_publisher, imprints=imprints, comics=comics
+    )
+    return response

kontor-api/src/db/session.py

@@ -1,5 +1,6 @@
 from typing import Generator
 
+from fastapi import Depends
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
@@ -10,6 +11,9 @@ engine = create_engine(SQLALCHEMY_DATABASE_URL)
 
 SessionLocal = sessionmaker(bind=engine)
 
+
 def get_db() -> Generator:
     with SessionLocal() as db:
         yield db
+
+SessionDep: type[Session] = Annotated[Session, Depends(get_db)]