v2.3.3: 实现移动端API的图片下载功能，重构异常机制，优化工作流 (#143)

Author: hect0x7

.github/workflows/download.yml

@@ -1,4 +1,4 @@
-name: 下载JM本子
+name: 下载JM本子 (commit)
 
 on:
   workflow_dispatch:

.github/workflows/download_dispatch.yml

@@ -1,4 +1,4 @@
-name: 下载JM本子(dispatch)
+name: 下载JM本子 (dispatch)
 
 on:
   workflow_dispatch:
@@ -54,7 +54,7 @@ jobs:
       DIR_RULE: ${{ github.event.inputs.DIR_RULE }}
       ZIP_NAME: ${{ github.event.inputs.ZIP_NAME }}
       UPLOAD_NAME: ${{ github.event.inputs.UPLOAD_NAME }}
-      # sccrets
+      # secrets
       JM_USERNAME: ${{ secrets.JM_USERNAME }}
       JM_PASSWORD: ${{ secrets.JM_PASSWORD }}
       # 固定值

.github/workflows/release.yml

@@ -1,4 +1,5 @@
-name: 发布PYPI
+# publish when new release
+name: Publish If Release
 
 on:
   workflow_dispatch:
@@ -7,7 +8,7 @@ on:
 
 jobs:
   release:
-    name: 构建并发布 jmcomic 到 PyPI
+    name: Publish `jmcomic` to PYPI
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -17,12 +18,12 @@ jobs:
         with:
           python-version: "3.11"
 
-      - name: 构建模块
+      - name: Build
         run: |
           python -m pip install build
           python -m build
 
-      - name: 发布PYPI
+      - name: Publish PYPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_JMCOMIC }}

.github/workflows/release_auto.yml

@@ -1,5 +1,5 @@
-name: Release (auto)
-
+# auto release and publish
+name: Auto Release & Publish
 
 on:
   workflow_dispatch:
@@ -30,7 +30,7 @@ jobs:
           tag_name: ${{ steps.tb.outputs.tag }}
           body: ${{ steps.tb.outputs.body }}
 
-      - name: Build Module
+      - name: Build
         run: |
           python -m pip install build
           python -m build

.github/workflows/test.yml renamed to .github/workflows/test_api.yml

@@ -1,4 +1,4 @@
-name: 跑测试
+name: Run Test (API)
 
 on:
   schedule:
@@ -9,8 +9,8 @@ on:
     paths:
       - 'src/**/*.py'
       - 'tests/**/*.py'
-      - '.github/workflows/test.yml'
-      - 'assets/config/option_test.yml'
+      - '.github/workflows/test_api.yml'
+      - 'assets/config/option_test_api.yml'
 
 jobs:
   test: # This code is based on https://github.com/gaogaotiantian/viztracer/blob/master/.github/workflows/python-package.yml
@@ -20,6 +20,9 @@ jobs:
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 5
+    env:
+      # 配置文件路径
+      JM_OPTION_PATH_TEST: ./assets/config/option_test_api.yml
 
     steps:
       - name: Checkout repository
@@ -31,28 +34,15 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
-        if: matrix.os != 'windows-latest'
         run: |
           python -m pip install --upgrade pip
           if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
 
-      - name: Install dependencies on Windows
-        if: matrix.os == 'windows-latest'
-        run: |
-          python -m pip install --upgrade pip
-          if (Test-Path -Path '.\requirements-dev.txt' -PathType Leaf) {pip install -r requirements-dev.txt}
-
       - name: Install local
         run: |
           pip install -e ./
 
-      - name: 跑测试
-        if: matrix.os != 'windows-latest'
+      - name: Run Test
         run: |
           cd ./tests/
           python -m unittest
-
-      - name: 跑测试（Windows系统）
-        if: matrix.os == 'windows-latest'
-        run: |
-          python -m unittest discover -s ./tests -p "test_*.py"

.github/workflows/test_html.yml

@@ -0,0 +1,48 @@
+name: Run Test (HTML)
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+  push:
+    branches: [ "dev" ]
+    paths:
+      - 'src/**/*.py'
+      - 'tests/**/*.py'
+      - '.github/workflows/test_html.yml'
+      - 'assets/config/option_test_html.yml'
+
+jobs:
+  test: # This code is based on https://github.com/gaogaotiantian/viztracer/blob/master/.github/workflows/python-package.yml
+    strategy:
+      matrix:
+        python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11" ]
+        os: [ ubuntu-latest ]
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 5
+    env:
+      # 配置文件路径
+      JM_OPTION_PATH_TEST: ./assets/config/option_test_html.yml
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
+
+      - name: Install local
+        run: |
+          pip install -e ./
+
+      - name: Run Test
+        run: |
+          cd ./tests/
+          python -m unittest

assets/config/option_test_api.yml

@@ -0,0 +1,22 @@
+# GitHub Actions 测试用
+# 移动端配置
+
+client:
+  impl: api
+  domain: [
+    "www.jmapinode1.cc",
+    "www.jmapinode2.cc",
+    "www.jmapinode3.cc",
+    "www.jmapibranch2.cc"
+  ]
+  postman:
+    meta_data:
+      timeout: 10
+
+# 插件配置
+plugin:
+  after_init:
+    - plugin: usage_log # 实时打印硬件占用率的插件
+      kwargs:
+        interval: 0.5 # 间隔时间
+        enable_warning: false # 不告警

assets/config/option_test.yml renamed to assets/config/option_test_html.yml

@@ -1,10 +1,13 @@
 # GitHub Actions 测试用
-version: '2.0'
+# 网页端配置
 
 client:
   domain:
     - jmcomic1.me
     - jmcomic.me
+  postman:
+    meta_data:
+      timeout: 10
 
 # 插件配置
 plugin:

assets/config/常用配置介绍.yml

@@ -38,11 +38,13 @@ download:
     decode: true # JM的原图是混淆过的，要不要还原？
     suffix: .jpg # 把图片都转为.jpg格式
   threading:
-    # batch_count: 章节的批量下载图片线程数
+    # image: 同时下载的图片数，默认是30张图
     # 数值大，下得快，配置要求高，对禁漫压力大
     # 数值小，下得慢，配置要求低，对禁漫压力小
-    # PS: 禁漫网页一般是一次请求50张图
-    batch_count: 30
+    # PS: 禁漫网页一次最多请求50张图
+    image: 30
+    # photo: 同时下载的章节数，不配置默认是cpu核心数
+    photo: 16
 
 
 

src/jmcomic/__init__.py

@@ -2,7 +2,7 @@
 # 被依赖方 <--- 使用方
 # config <--- entity <--- toolkit <--- client <--- option <--- downloader
 
-__version__ = '2.3.2'
+__version__ = '2.3.3'
 
 from .api import *
 from .jm_plugin import *