v2.1.4: 工作流优化，支持在Actions页面直接提交要下载的本子 (#80)

Author: hect0x7

.github/workflows/download.yml

@@ -1,6 +1,7 @@
 name: 下载JM本子
 
 on:
+  workflow_dispatch:
   push:
     branches-ignore:
       - 'master' # master专门用于发布pip和repo介绍
@@ -40,6 +41,7 @@ jobs:
           pip install -e ./
 
       - name: 运行下载脚本
+        continue-on-error: true
         run: |
           cd ./usage/
           python workflow_download.py

.github/workflows/download_dispatch.yml

@@ -0,0 +1,91 @@
+name: 下载JM本子(dispatch)
+
+on:
+  workflow_dispatch:
+    inputs:
+      JM_ALBUM_IDS:
+        type: string
+        description: 本子id（多个id用-隔开，如 '123-456-789'）
+        required: true
+        default: ''
+
+      ZIP_NAME:
+        type: string
+        default: 本子.tar.gz
+        description: 压缩文件名称
+        required: false
+
+      UPLOAD_NAME:
+        type: string
+        default: 下载完成的本子
+        description: 上传文件名称
+        required: false
+
+#      JM_USERNAME:
+#        type: string
+#        default: ''
+#        description: '禁漫帐号（不建议使用，用户名和密码会泄露在日志中。最好用secrets）'
+#        required: false
+#
+#      JM_PASSWORD:
+#        type: string
+#        default: ''
+#        description: '禁漫密码（不建议使用，用户名和密码会泄露在日志中。最好用secrets）'
+#        required: false
+
+
+jobs:
+  crawler:
+    runs-on: ubuntu-latest
+    env:
+      # 工作流输入
+      JM_ALBUM_IDS: ${{ github.event.inputs.JM_ALBUM_IDS }}
+      JM_USERNAME: ${{ secrets.JM_USERNAME }}
+      JM_PASSWORD: ${{ secrets.JM_PASSWORD }}
+      ZIP_NAME: ${{ github.event.inputs.ZIP_NAME }}
+      UPLOAD_NAME: ${{ github.event.inputs.UPLOAD_NAME }}
+#      JM_USERNAME: ${{ github.event.inputs.JM_USERNAME }}
+#      JM_PASSWORD: ${{ github.event.inputs.JM_PASSWORD }}
+
+      # 固定值
+      JM_DOWNLOAD_DIR: /home/runner/work/jmcomic/download/
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+
+      - name: 安装依赖项（pip）
+        if: ${{ github.ref != 'refs/heads/dev' }}
+        run: |
+          python -m pip install --upgrade pip
+          pip install jmcomic -i https://pypi.org/project --upgrade
+
+      - name: 安装依赖项（local）
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        run: |
+          python -m pip install --upgrade pip
+          pip install commonX -i https://pypi.org/project --upgrade
+          pip install -e ./
+
+      - name: 运行下载脚本
+        continue-on-error: true
+        run: |
+          cd ./usage/
+          python workflow_download.py
+
+      - name: 压缩文件
+        run: |
+          cd $JM_DOWNLOAD_DIR
+          tar -zcvf ../$ZIP_NAME ./
+          mv ../$ZIP_NAME .
+
+      - name: 上传结果
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.UPLOAD_NAME }}
+          path: ${{ env.JM_DOWNLOAD_DIR }}/${{ env.ZIP_NAME }}
+          if-no-files-found: error
+          retention-days: 90

.github/workflows/release.yml

@@ -1,6 +1,7 @@
 name: 发布PYPI
 
 on:
+  workflow_dispatch:
   release:
     types: [ published ]
 

.github/workflows/test.yml

@@ -1,6 +1,7 @@
 name: 跑测试
 
 on:
+  workflow_dispatch:
   push:
     branches: [ "dev" ]
     paths-ignore:

src/jmcomic/__init__.py

@@ -2,6 +2,6 @@
 # 被依赖方 <--- 使用方
 # config <--- entity <--- toolkit <--- client <--- option
 
-__version__ = '2.1.3'
+__version__ = '2.1.4'
 
 from .api import *

src/jmcomic/api.py

@@ -116,20 +116,17 @@ def download_image(index, image: JmImageDetail, debug_topic='image'):
                  f'图片下载完成: {debug_tag}, [{image.img_url}] → [{img_save_path}]'
                  )
 
-    length = len(photo_detail)
-    # 根据图片数，决定下载策略
-    if length <= option.download_threading_batch_count:
-        # 如果图片数小的话，直接使用多线程下载，一张图一个线程。
+    batch = option.download_threading_batch_count
+    if batch <= 0:
         multi_thread_launcher(
             iter_objs=enumerate(photo_detail),
             apply_each_obj_func=download_image,
         )
     else:
-        # 如果图片数多的话，还是分批下载。
-        multi_task_launcher_batch(
+        thread_pool_executor(
             iter_objs=enumerate(photo_detail),
             apply_each_obj_func=download_image,
-            batch_size=option.download_threading_batch_count
+            max_workers=batch,
         )
 
 

usage/workflow_download.py

@@ -9,10 +9,23 @@
 '''
 
 
+def get_jm_album_ids():
+    from common import str_to_set
+
+    aid_set = set()
+    for text in [
+        jm_albums,
+        (get_env('JM_ALBUM_IDS') or '').replace('-', '\n'),
+    ]:
+        aid_set.update(str_to_set(text))
+
+    return aid_set
+
+
 def main():
-    from jmcomic import str_to_list, download_album
+    from jmcomic import download_album
     # 下载漫画
-    download_album(str_to_list(jm_albums), option=get_option())
+    download_album(get_jm_album_ids(), option=get_option())
 
 
 def get_option():