Skip to content

Commit 141c5b3

Browse files
committed
Update according to discussion #3
1 parent 837a1b8 commit 141c5b3

3 files changed

Lines changed: 6 additions & 8 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ FROM gcr.io/distroless/python3-debian12
2323
COPY --from=build-venv /venv /venv
2424
COPY --from=build-venv /usr/bin/7zz /usr/bin
2525
COPY --from=build-venv /usr/bin/ffmpeg /usr/bin
26-
COPY --from=build-venv /extract/api_dump.sqlite /data
26+
COPY --from=build-venv /extract/api_dump.sqlite /data/api_dump.sqlite
2727
COPY --from=build-venv /userdata /userdata
28-
ENV API_DUMP_PATH=/data/api_dump.sqlite content=/root/comiclib watch=False
28+
ENV importEHdb_API_DUMP_PATH=/data/api_dump.sqlite content=/root/comiclib watch=False
2929
EXPOSE 8000
3030
WORKDIR /userdata
3131
VOLUME /userdata

comiclib/scanner/30-importEHdb.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
from datetime import date
55
from pydantic import Field
66
from pydantic_settings import BaseSettings
7-
import os
87

98
class Settings(BaseSettings):
109
importEHdb_thumb: bool = True
1110
importEHdb_matchtitle: Union[bool, str] = Field(default=True, union_mode='left_to_right')
1211
importEHdb_matchtorrent: bool = True
12+
importEHdb_API_DUMP_PATH: str = "api_dump.sqlite"
1313
settings = Settings()
1414

1515
import logging
@@ -39,13 +39,10 @@ class Scanner:
3939
Currently only support matching by the source URL (from previous scanners).'''
4040

4141
def __init__(self) -> None:
42-
# Load database from $API_DUMP_PATH when the environment variable is set
43-
# or fallback to api_dump.sqlite in the current directory
44-
api_dump_path = os.getenv('API_DUMP_PATH', default="api_dump.sqlite")
45-
if Path(api_dump_path).exists():
42+
if Path(settings.importEHdb_API_DUMP_PATH).exists():
4643
logger.info('Loading ehentai metadata database, please wait...')
4744
# do it in readonly mode, to maintain a readonly container image
48-
self.con = sqlite3.connect("file:"+api_dump_path+"?mode=ro", uri=True, check_same_thread=False)
45+
self.con = sqlite3.connect("file:"+settings.importEHdb_API_DUMP_PATH+"?mode=ro", uri=True, check_same_thread=False)
4946
if settings.importEHdb_matchtitle:
5047
self.db_title = {blur_title(row[0]): row[1] for row in self.con.execute("SELECT title, gid FROM gallery") if not row[0] is None}
5148
self.db_title_jpn = {blur_title(row[0]): row[1] for row in self.con.execute("SELECT title_jpn, gid FROM gallery") if not row[0] is None}

docs/zh/docs/getting-started.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ pip install -U "comiclib[full] @ git+https://github.com/comiclib/comiclib.git"
3939
``` bash
4040
docker run -p 8000:8000 \
4141
--mount type=bind,source=你的漫画库路径,target=/root/comiclib \
42+
--mount type=bind,source=你的数据路径,target=/userdata \
4243
urenko/comiclib
4344
```
4445
现在 ComicLib 运行在了 http://localhost:8000

0 commit comments

Comments
 (0)