support comics downloaded via EhViewer

Author: URenko

comiclib/main.py

@@ -257,7 +257,7 @@ def extract_archive(id: str, force: bool, db: Session = Depends(get_db)):
         return JSONResponse({"operation": "", "error": "This ID doesn't exist on the server.", "success": 0}, status.HTTP_400_BAD_REQUEST)
     path = Path(settings.content) / a.path
     if path.is_dir():
-        pages = [f"./api/archives/{id}/page?path="+quote(p.name, safe='') for p in sorted(path.iterdir()) if p.suffix != '.txt']
+        pages = [f"./api/archives/{id}/page?path="+quote(p.name, safe='') for p in sorted(path.iterdir()) if p.suffix != '.txt' and not p.name.startswith('.')]
     elif path.suffix == '.zip':
         with ZipFile(path) as z:
             pages = [f"./api/archives/{id}/page?path="+quote(z_info.filename, safe='') for z_info in filter(

comiclib/scanner/22-ehviewer.py

@@ -0,0 +1,18 @@
+from pathlib import Path
+import re
+
+import logging
+logger = logging.getLogger(__name__)
+
+class Scanner:
+    '''For archives downloaded via Ehviewer'''
+    
+    def scan(self, path: Path, id: str, metadata: dict, prev_scanners: list[str]) -> bool:
+        if path.is_dir() and not (m := re.match(r'(\d+)-(.+)', path.name)) is None:
+            logger.info(f' <- {path}')
+            metadata["source"] = 'https://exhentai.org/g/' + m[1] + '/'
+            metadata["title"] = m[2]
+            metadata["pagecount"] = len([p for p in path.iterdir() if not p.name.startswith('.')])
+            return metadata["pagecount"] > 0
+        else:
+            return False

comiclib/utils.py

@@ -40,7 +40,8 @@ def extract_thumbnail(path: Union[str, Path], id: str, page: int, cache=False) -
         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', path.iterdir()))[page-1], saveto, thumbnail=True)
+        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:

docs/en/docs/scanner.md

@@ -27,6 +27,10 @@ Parse comic files downloaded via [ccloli/E-Hentai-Downloader](https://github.com
 
 Parse comic folders downloaded via [Hentai@Home](https://ehwiki.org/wiki/Hentai@Home#H.40H_Downloader).
 
+### 22-ehviewer.py
+
+Parse comic folders downloaded via [EhViewer](https://github.com/seven332/EhViewer).
+
 ### 30-importEHdb.py
 
 Import the corresponding metadata from [ehentai metadata database](https://sukebei.nyaa.si/user/gipaf23445).

docs/zh/docs/scanner.md

@@ -26,6 +26,10 @@ ComicLib 的主体仅负责遍历漫画库，漫画文件的判断、解析等
 
 解析通过 [Hentai@Home](https://ehwiki.org/wiki/Hentai@Home#H.40H_Downloader) 下载的漫画文件夹。
 
+### 22-ehviewer.py
+
+解析通过 [EhViewer](https://github.com/seven332/EhViewer) 下载的漫画文件夹。
+
 ### 30-importEHdb.py
 
 从 [ehentai 元数据库](https://sukebei.nyaa.si/user/gipaf23445)导入相应的元数据。