add option cover

Author: URenko

comiclib/config.py

@@ -9,7 +9,8 @@ class Settings(BaseSettings):
     debug: bool = False
     loglevel: str = 'INFO'
     content: str = '.'
-    thumb: str = './thumb'
+    cover: str = './thumb'
+    thumb: Union[str, None] = None
     metadata: str = 'sqlite:///./comiclib_metadata.db'
     password: Union[str, None] = None
     skip_exits: bool = True
@@ -31,3 +32,5 @@ class Settings(BaseSettings):
 
 settings.UA_convert_jxl = re.compile(settings.UA_convert_jxl)
 settings.UA_convert_all = re.compile(settings.UA_convert_all)
+if settings.thumb is None:
+    settings.thumb = settings.cover

comiclib/main.py

@@ -231,7 +231,7 @@ def get_archive_thumbnail(id: str, background_tasks: BackgroundTasks, response:
         if a.thumb.startswith('http'):
             return RedirectResponse(a.thumb)
         else:
-            thumb_path = Path(settings.thumb) / a.thumb
+            thumb_path = Path(settings.cover) / a.thumb
     else:
         thumb_path = Path(settings.thumb) / extract_thumbnail(Path(settings.content) / a.path, id, page, cache=True)
     return FileResponse(thumb_path)
@@ -242,7 +242,7 @@ def update_thumbnail(id: str, page: int = 1, db: Session = Depends(get_db)):
     a = db.get(Archive, id)
     if a is None:
         return JSONResponse({"operation": "", "error": "This ID doesn't exist on the server.", "success": 0}, status.HTTP_400_BAD_REQUEST)
-    thumb_path = extract_thumbnail(Path(settings.content) / a.path, a.id, page)
+    thumb_path = extract_thumbnail(Path(settings.content) / a.path, a.id, page, cover=True)
     a.thumb = str(thumb_path)
     db.commit()
     return {

comiclib/utils.py

@@ -33,19 +33,23 @@ def convert_image(f_or_path, saveto: str, thumbnail=False):
             subprocess.run(cmd, check=True, stderr=None if settings.debug else subprocess.DEVNULL)
 
 
-def extract_thumbnail(path: Union[str, Path], id: str, page: int, cache=False) -> Path:
+def extract_thumbnail(path: Union[str, Path], id: str, page: int, cache=False, cover=False) -> Path:
     path = Path(path)
-    saveto = Path(settings.thumb) / (id+'.webp') if page == 1 else Path(settings.thumb) / id / f'{page}.webp'
+    saveto = Path(settings.thumb) / id / f'{page}.webp'
     if cache and saveto.exists():
         return saveto.relative_to(settings.thumb)
     saveto.parent.mkdir(parents=True, exist_ok=True)
     if path.is_dir():
         convert_image(sorted(filter(lambda p:p.suffix != '.txt' and not p.name.startswith('.'), path.iterdir()))[page-1], saveto, thumbnail=True)
-        return saveto.relative_to(settings.thumb)
     elif path.suffix == '.zip':
         with ZipFile(path) as z:
             with z.open(list(filter(lambda z_info: not z_info.is_dir(), z.infolist()))[page-1].filename) as f:
                 convert_image(f, saveto, thumbnail=True)
-        return saveto.relative_to(settings.thumb)
     else:
-        raise NotImplementedError
+        raise NotImplementedError
+    if cover:
+        cover_path = Path(settings.cover) / f'{id}.webp'
+        cover_path.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy2(saveto, cover_path)
+        return cover_path.name
+    return saveto.relative_to(settings.thumb)