chore: bump version from 1.1.5 to 1.1.6

* feat: docker build adds cache

* fix: dockerfile optimization

* doc: dockerhub pictures are not displayed properly

---------

Co-authored-by: DDSRem <1448139087@qq.com>

.github/workflows/docker-image-debug.yml

@@ -12,18 +12,37 @@ jobs:
             -
                 name: Checkout
                 uses: actions/checkout@v3
+            - 
+                name: Docker meta
+                id: meta
+                uses: docker/metadata-action@v5
+                with:
+                    images: ${{ secrets.DOCKERHUB_USERNAME }}/bili-sync
+                    tags: |
+                        type=raw,value=debug
+            - 
+                name: Set Up QEMU
+                uses: docker/setup-qemu-action@v3
+            - 
+                name: Set Up Buildx
+                uses: docker/setup-buildx-action@v3
             -
                 name: Login to DockerHub
                 uses: docker/login-action@v3
                 with:
                     username: ${{ secrets.DOCKERHUB_USERNAME }}
                     password: ${{ secrets.DOCKERHUB_TOKEN }}
-            -
+            - 
                 name: Build and push images
                 uses: docker/build-push-action@v5
                 with:
                     context: .
-                    file: ./Dockerfile
+                    file: Dockerfile
+                    platforms: |
+                        linux/amd64
+                        linux/arm64/v8
                     push: true
-                    tags: |
-                        ${{ secrets.DOCKERHUB_USERNAME }}/bili-sync:debug
+                    tags: ${{ steps.meta.outputs.tags }}
+                    labels: ${{ steps.meta.outputs.labels }}
+                    cache-from: type=gha, scope=${{ github.workflow }}
+                    cache-to: type=gha, scope=${{ github.workflow }}          

.github/workflows/docker-image.yml

@@ -12,22 +12,41 @@ jobs:
             -
                 name: Checkout
                 uses: actions/checkout@v3
+            - 
+                name: Docker meta
+                id: meta
+                uses: docker/metadata-action@v5
+                with:
+                    images: ${{ secrets.DOCKERHUB_USERNAME }}/bili-sync
+                    tags: |
+                        type=raw,value=${{ github.ref_name }}
+                        type=raw,value=latest
+            - 
+                name: Set Up QEMU
+                uses: docker/setup-qemu-action@v3
+            - 
+                name: Set Up Buildx
+                uses: docker/setup-buildx-action@v3
             -
                 name: Login to DockerHub
                 uses: docker/login-action@v3
                 with:
                     username: ${{ secrets.DOCKERHUB_USERNAME }}
                     password: ${{ secrets.DOCKERHUB_TOKEN }}
-            -
+            - 
                 name: Build and push images
                 uses: docker/build-push-action@v5
                 with:
                     context: .
-                    file: ./Dockerfile
+                    file: Dockerfile
+                    platforms: |
+                        linux/amd64
+                        linux/arm64/v8
                     push: true
-                    tags: |
-                        ${{ secrets.DOCKERHUB_USERNAME }}/bili-sync:${{ github.ref_name }}
-                        ${{ secrets.DOCKERHUB_USERNAME }}/bili-sync:latest
+                    tags: ${{ steps.meta.outputs.tags }}
+                    labels: ${{ steps.meta.outputs.labels }}
+                    cache-from: type=gha, scope=${{ github.workflow }}
+                    cache-to: type=gha, scope=${{ github.workflow }}
             -
                 name: Update DockerHub description
                 uses: peter-evans/dockerhub-description@v3

Dockerfile

@@ -1,22 +1,41 @@
-FROM python:3.11.6-alpine3.18 AS base
+FROM python:3.11.7-alpine3.19 as base
 
 WORKDIR /app
 
-ENV BILI_IN_DOCKER=true
+ENV LANG=zh_CN.UTF-8 \
+    TZ=Asia/Shanghai \
+    BILI_IN_DOCKER=true
+
+RUN apk add --no-cache ffmpeg tini \
+    && apk add --no-cache --virtual .build-deps \
+        gcc \
+        musl-dev \
+        libffi-dev \
+        openssl-dev \
+    && pip install poetry==1.7.1 pip3-autoremove==1.2.0
 
 COPY poetry.lock pyproject.toml ./
 
-RUN apk add ffmpeg \
-    && apk add --no-cache --virtual .build-deps \
-    gcc \
-    musl-dev \
-    libffi-dev \
-    openssl-dev \
-    && pip install poetry \
-    && poetry config virtualenvs.create false \
-    && poetry install --no-dev --no-interaction --no-ansi \
-    && apk del .build-deps
+RUN poetry config virtualenvs.create false \
+    && poetry install --only main --no-root \
+    && pip3-autoremove -y poetry pip3-autoremove \
+    && apk del .build-deps \
+    && rm -rf \
+        /root/.cache \
+        /tmp/*
 
 COPY . .
 
-ENTRYPOINT [ "python", "entry.py" ]
+FROM scratch
+
+WORKDIR /app
+
+ENV LANG=zh_CN.UTF-8 \
+    TZ=Asia/Shanghai \
+    BILI_IN_DOCKER=true
+
+COPY --from=base / /
+
+ENTRYPOINT [ "tini", "python", "entry.py" ]
+
+VOLUME [ "/app/config", "/app/data", "/app/thumb", "/Videos/Bilibilis" ]

README.md

@@ -13,9 +13,9 @@
 
 ## 工作截图
 
-![下载视频](asset/run.png)
+![下载视频](https://raw.githubusercontent.com/amtoaer/bili-sync/main/asset/run.png)
 
-![EMBY 识别](asset/emby.png)
+![EMBY 识别](https://raw.githubusercontent.com/amtoaer/bili-sync/main/asset/emby.png)
 
 ## 配置文件
 

entry.py

@@ -1,4 +1,6 @@
 import asyncio
+import os
+import signal
 import sys
 
 import uvloop
@@ -45,8 +47,16 @@ async def entry() -> None:
 
 
 if __name__ == "__main__":
+    # 确保 docker 退出时正确触发资源释放
+    signal.signal(signal.SIGTERM, lambda *_: os.kill(os.getpid(), signal.SIGINT))
     with asyncio.Runner() as runner:
         try:
             runner.run(entry())
+        except Exception:
+            logger.exception("Unexpected error occurred, exiting...")
+        except KeyboardInterrupt:
+            logger.error("Exit Signal Received, exiting...")
         finally:
+            logger.info("Cleaning up resources...")
             runner.run(cleanup())
+            logger.info("Done, exited.")

migrations/models/3_20240104221037_update.py

@@ -0,0 +1,14 @@
+from tortoise import BaseDBAsyncClient
+
+
+async def upgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        CREATE TABLE IF NOT EXISTS "program" (
+    "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+    "version" VARCHAR(20) NOT NULL
+);"""
+
+
+async def downgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        DROP TABLE IF EXISTS "program";"""

models.py

@@ -14,6 +14,7 @@ from constants import (
 )
 from settings import settings
 from utils import aopen
+from version import VERSION
 
 
 class FavoriteList(Model):
@@ -40,15 +41,11 @@ class Upper(Model):
 
     @property
     def thumb_path(self) -> Path:
-        return (
-            DEFAULT_THUMB_PATH / str(self.mid)[0] / f"{self.mid}" / "folder.jpg"
-        )
+        return DEFAULT_THUMB_PATH / str(self.mid)[0] / f"{self.mid}" / "folder.jpg"
 
     @property
     def meta_path(self) -> Path:
-        return (
-            DEFAULT_THUMB_PATH / str(self.mid)[0] / f"{self.mid}" / "person.nfo"
-        )
+        return DEFAULT_THUMB_PATH / str(self.mid)[0] / f"{self.mid}" / "person.nfo"
 
     async def save_metadata(self):
         async with aopen(self.meta_path, "w") as f:
@@ -73,16 +70,12 @@ class FavoriteItem(Model):
     id = fields.IntField(pk=True)
     name = fields.CharField(max_length=255)
     type = fields.IntEnumField(enum_type=MediaType)
-    status = fields.IntEnumField(
-        enum_type=MediaStatus, default=MediaStatus.NORMAL
-    )
+    status = fields.IntEnumField(enum_type=MediaStatus, default=MediaStatus.NORMAL)
     bvid = fields.CharField(max_length=255)
     desc = fields.TextField()
     cover = fields.TextField()
     tags = fields.JSONField(null=True)
-    favorite_list = fields.ForeignKeyField(
-        "models.FavoriteList", related_name="items"
-    )
+    favorite_list = fields.ForeignKeyField("models.FavoriteList", related_name="items")
     upper = fields.ForeignKeyField("models.Upper", related_name="uploads")
     ctime = fields.DatetimeField()
     pubtime = fields.DatetimeField()
@@ -100,38 +93,23 @@ class FavoriteItem(Model):
 
     @property
     def tmp_video_path(self) -> Path:
-        return (
-            Path(settings.path_mapper[self.favorite_list_id])
-            / f"tmp_{self.bvid}_video"
-        )
+        return Path(settings.path_mapper[self.favorite_list_id]) / f"tmp_{self.bvid}_video"
 
     @property
     def tmp_audio_path(self) -> Path:
-        return (
-            Path(settings.path_mapper[self.favorite_list_id])
-            / f"tmp_{self.bvid}_audio"
-        )
+        return Path(settings.path_mapper[self.favorite_list_id]) / f"tmp_{self.bvid}_audio"
 
     @property
     def video_path(self) -> Path:
-        return (
-            Path(settings.path_mapper[self.favorite_list_id])
-            / f"{self.bvid}.mp4"
-        )
+        return Path(settings.path_mapper[self.favorite_list_id]) / f"{self.bvid}.mp4"
 
     @property
     def nfo_path(self) -> Path:
-        return (
-            Path(settings.path_mapper[self.favorite_list_id])
-            / f"{self.bvid}.nfo"
-        )
+        return Path(settings.path_mapper[self.favorite_list_id]) / f"{self.bvid}.nfo"
 
     @property
     def poster_path(self) -> Path:
-        return (
-            Path(settings.path_mapper[self.favorite_list_id])
-            / f"{self.bvid}-poster.jpg"
-        )
+        return Path(settings.path_mapper[self.favorite_list_id]) / f"{self.bvid}-poster.jpg"
 
     @property
     def upper_path(self) -> list[Path]:
@@ -142,10 +120,12 @@ class FavoriteItem(Model):
 
     @property
     def subtitle_path(self) -> Path:
-        return (
-            Path(settings.path_mapper[self.favorite_list_id])
-            / f"{self.bvid}.zh-CN.default.ass"
-        )
+        return Path(settings.path_mapper[self.favorite_list_id]) / f"{self.bvid}.zh-CN.default.ass"
+
+
+class Program(Model):
+    id = fields.IntField(pk=True)
+    version = fields.CharField(max_length=20)
 
 
 async def init_model() -> None:
@@ -157,3 +137,13 @@ async def init_model() -> None:
     )
     process = await create_subprocess_exec(*migrate_commands)
     await process.communicate()
+    program, created = await Program.get_or_create(
+        defaults={
+            "version": VERSION,
+        }
+    )
+    if created or program.version != VERSION:
+        # 把新版本的迁移逻辑写在这里
+        pass
+    program.version = VERSION
+    await program.save()

processor.py

@@ -1,5 +1,6 @@
 import asyncio
 import datetime
+import itertools
 from asyncio import Semaphore, create_subprocess_exec
 from asyncio.subprocess import DEVNULL
 
@@ -45,9 +46,7 @@ async def manage_model(medias: list[dict], fav_list: FavoriteList) -> None:
         )
         for media in medias
     ]
-    await Upper.bulk_create(
-        uppers, on_conflict=["mid"], update_fields=["name", "thumb"]
-    )
+    await Upper.bulk_create(uppers, on_conflict=["mid"], update_fields=["name", "thumb"])
     items = [
         FavoriteItem(
             name=media["title"],
@@ -114,10 +113,8 @@ async def process_favorite(favorite_id: int) -> None:
     while True:
         page += 1
         if page > 1:
-            favorite_video_list = (
-                await favorite_list.get_video_favorite_list_content(
-                    favorite_id, page=page, credential=credential
-                )
+            favorite_video_list = await favorite_list.get_video_favorite_list_content(
+                favorite_id, page=page, credential=credential
             )
         # 先看看对应 bvid 的记录是否存在
         existed_items = await FavoriteItem.filter(
@@ -125,14 +122,10 @@ async def process_favorite(favorite_id: int) -> None:
             bvid__in=[media["bvid"] for media in favorite_video_list["medias"]],
         )
         # 记录一下获得的列表中的 bvid 和 fav_time
-        media_info = {
-            (media["bvid"], media["fav_time"])
-            for media in favorite_video_list["medias"]
-        }
+        media_info = {(media["bvid"], media["fav_time"]) for media in favorite_video_list["medias"]}
         # 如果有 bvid 和 fav_time 都相同的记录，说明已经到达了上次处理到的位置
         continue_flag = not media_info & {
-            (item.bvid, int(item.fav_time.timestamp()))
-            for item in existed_items
+            (item.bvid, int(item.fav_time.timestamp())) for item in existed_items
         }
         await manage_model(favorite_video_list["medias"], fav_list)
         if not (continue_flag and favorite_video_list["has_more"]):
@@ -186,9 +179,7 @@ async def process_favorite_item(
                 await amakedirs(fav_item.upper.thumb_path.parent, exist_ok=True)
                 await asyncio.gather(
                     fav_item.upper.save_metadata(),
-                    download_content(
-                        fav_item.upper.thumb, fav_item.upper.thumb_path
-                    ),
+                    download_content(fav_item.upper.thumb, fav_item.upper.thumb_path),
                     return_exceptions=True,
                 )
             else:
@@ -297,45 +288,39 @@ async def process_favorite_item(
                 detector = video.VideoDownloadURLDataDetecter(
                     await v.get_download_url(page_index=0)
                 )
-                streams = detector.detect_best_streams()
+                streams = detector.detect_best_streams(codecs=settings.codec)
                 if detector.check_flv_stream():
-                    await download_content(
-                        streams[0].url, fav_item.tmp_video_path
-                    )
+                    await download_content(streams[0].url, fav_item.tmp_video_path)
                     process = await create_subprocess_exec(
                         FFMPEG_COMMAND,
                         "-i",
-                        str(fav_item.tmp_video_path),
-                        str(fav_item.video_path),
+                        fav_item.tmp_video_path,
+                        fav_item.video_path,
                         stdout=DEVNULL,
                         stderr=DEVNULL,
                     )
                     await process.communicate()
                     fav_item.tmp_video_path.unlink()
                 else:
-                    await asyncio.gather(
-                        download_content(
-                            streams[0].url, fav_item.tmp_video_path
-                        ),
-                        download_content(
-                            streams[1].url, fav_item.tmp_audio_path
-                        ),
-                    )
+                    paths, tasks = [fav_item.tmp_video_path], [
+                        download_content(streams[0].url, fav_item.tmp_video_path)
+                    ]
+                    if streams[1]:
+                        paths.append(fav_item.tmp_audio_path)
+                        tasks.append(download_content(streams[1].url, fav_item.tmp_audio_path))
+                    await asyncio.gather(*tasks)
                     process = await create_subprocess_exec(
                         FFMPEG_COMMAND,
-                        "-i",
-                        str(fav_item.tmp_video_path),
-                        "-i",
-                        str(fav_item.tmp_audio_path),
+                        *list(itertools.chain(*zip(["-i"] * len(paths), paths))),
                         "-c",
                         "copy",
-                        str(fav_item.video_path),
+                        fav_item.video_path,
                         stdout=DEVNULL,
                         stderr=DEVNULL,
                     )
                     await process.communicate()
-                    fav_item.tmp_video_path.unlink()
-                    fav_item.tmp_audio_path.unlink()
+                    for path in paths:
+                        path.unlink()
                 fav_item.downloaded = True
         except ResponseCodeException as e:
             match e.code:
@@ -358,9 +343,7 @@ async def process_favorite_item(
                     fav_item.status.text,
                 )
         except Exception:
-            logger.exception(
-                "Failed to process video {} {}", fav_item.bvid, fav_item.name
-            )
+            logger.exception("Failed to process video {} {}", fav_item.bvid, fav_item.name)
     await fav_item.save()
     logger.info(
         "{} {} is processed successfully.",

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bili-sync"
-version = "1.0.1"
+version = "1.1.6"
 description = ""
 authors = ["amtoaer <amtoaer@gmail.com>"]
 license = "GPL-3.0"
@@ -8,24 +8,26 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.11"
-bilibili-api-python = { git = "https://github.com/amtoaer/bilibili-api.git", rev = "dev" }
-dataclasses-json = "0.6.2"
-tortoise-orm = "0.20.0"
-loguru = "0.7.2"
-uvloop = "0.19.0"
-aiofiles = "23.2.1"
 aerich = "0.7.2"
+aiofiles = "23.2.1"
+bilibili-api-python = {git = "https://github.com/Nemo2011/bilibili-api.git", rev = "16.2.0b2"}
+dataclasses-json = "0.6.2"
+loguru = "0.7.2"
+pydantic = "2.5.3"
+tortoise-orm = "0.20.0"
+uvloop = "0.19.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "23.11.0"
-ruff = "0.1.6"
+bump-my-version = "0.15.4"
 ipython = "8.17.2"
+ruff = "0.1.6"
 
 [tool.black]
-line-length = 80
+line-length = 100
 
 [tool.ruff]
-line-length = 80
+line-length = 100
 select = [
   "F", # https://beta.ruff.rs/docs/rules/#pyflakes-f
   "E",
@@ -60,6 +62,25 @@ tortoise_orm = "constants.TORTOISE_ORM"
 location = "./migrations"
 src_folder = "./."
 
+[tool.bumpversion]
+commit = true
+message = "chore: bump version from {current_version} to {new_version}"
+tag = true
+tag_name = "{new_version}"
+tag_message = ""
+current_version = "1.1.6"
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
+
+[[tool.bumpversion.files]]
+filename = "version.py"
+
+[[tool.bumpversion.files]]
+filename = "pyproject.toml"
+
+
+
+
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

settings.py

@@ -1,16 +1,14 @@
-from dataclasses import dataclass, field, fields
 from pathlib import Path
-from typing import Self
 
-from dataclasses_json import DataClassJsonMixin, Undefined
+from bilibili_api.video import VideoCodecs
+from pydantic import BaseModel, Field, field_validator
+from pydantic_core import PydanticCustomError
+from typing_extensions import Annotated
 
 from constants import DEFAULT_CONFIG_PATH
 
 
-@dataclass
-class SubtitleConfig(DataClassJsonMixin):
-    dataclass_json_config = {"undefined": Undefined.EXCLUDE}
-
+class SubtitleConfig(BaseModel):
     font_name: str = "微软雅黑，黑体"  # 字体
     font_size: float = 40  # 字号
     alpha: float = 0.8  # 透明度
@@ -18,59 +16,58 @@ class SubtitleConfig(DataClassJsonMixin):
     static_time: float = 10  # 静态弹幕持续时间
 
 
-@dataclass
-class Config(DataClassJsonMixin):
-    dataclass_json_config = {"undefined": Undefined.EXCLUDE}
-
-    sessdata: str = ""
-    bili_jct: str = ""
-    buvid3: str = ""
-    dedeuserid: str = ""
-    ac_time_value: str = ""
+class Config(BaseModel):
+    sessdata: Annotated[str, Field(min_length=1)] = ""
+    bili_jct: Annotated[str, Field(min_length=1)] = ""
+    buvid3: Annotated[str, Field(min_length=1)] = ""
+    dedeuserid: Annotated[str, Field(min_length=1)] = ""
+    ac_time_value: Annotated[str, Field(min_length=1)] = ""
     interval: int = 20
-    path_mapper: dict[int, str] = field(default_factory=dict)
-    subtitle: SubtitleConfig = field(default_factory=SubtitleConfig)
+    path_mapper: dict[int, str] = Field(default_factory=dict)
+    subtitle: SubtitleConfig = Field(default_factory=SubtitleConfig)
+    codec: list[VideoCodecs] = Field(
+        default_factory=lambda: [
+            VideoCodecs.AV1,
+            VideoCodecs.AVC,
+            VideoCodecs.HEV,
+        ],
+        min_length=1,
+    )
 
-    def validate(self) -> Self:
-        """所有值必须被设置"""
-        if not all(getattr(self, f.name) for f in fields(self)):
-            raise ValueError("Some config values are not set.")
-        return self
+    @field_validator("codec", mode="after")
+    def codec_validator(cls, codecs: list[VideoCodecs]) -> list[VideoCodecs]:
+        if len(codecs) != len(set(codecs)):
+            raise PydanticCustomError("unique_list", "List must be unique")
+        return codecs
 
     @staticmethod
-    def load(path: Path | None = None) -> Self:
+    def load(path: Path | None = None) -> "Config":
         if not path:
             path = DEFAULT_CONFIG_PATH
         try:
             with path.open("r") as f:
-                return Config.schema().loads(f.read())
+                return Config.model_validate_json(f.read())
         except Exception as e:
             raise RuntimeError(f"Failed to load config file: {path}") from e
 
-    def save(self, path: Path | None = None) -> Self:
+    def save(self, path: Path | None = None) -> "Config":
         if not path:
             path = DEFAULT_CONFIG_PATH
         try:
             path.parent.mkdir(parents=True, exist_ok=True)
             with path.open("w") as f:
-                f.write(
-                    Config.schema().dumps(self, indent=4, ensure_ascii=False)
-                )
+                f.write(Config.model_dump_json(self, indent=4))
             return self
         except Exception as e:
             raise RuntimeError(f"Failed to save config file: {path}") from e
 
 
 def init_settings() -> Config:
-    return (
-        (
-            Config.load(DEFAULT_CONFIG_PATH)
-            if DEFAULT_CONFIG_PATH.exists()
-            else Config()
-        )
-        .save(DEFAULT_CONFIG_PATH)
-        .validate()
-    )
+    if not DEFAULT_CONFIG_PATH.exists():
+        # 配置文件不存在的情况下，写入空的默认值
+        Config().save(DEFAULT_CONFIG_PATH)
+    # 读取配置文件，校验出错会抛出异常，校验通过则重新保存一下配置文件（写入新配置项的默认值）
+    return Config.load(DEFAULT_CONFIG_PATH).save()
 
 
 settings = init_settings()

version.py

@@ -0,0 +1 @@
+VERSION = "1.1.6"