Dev (#23)

* Update dev_package_and_upload.yml (#17)

* 更新 NetEase_Cloud_Music_Download

* sync (#19)

* Update dev_package_and_upload.yml

* Update README.md

* update nuitka_build.py

* Update pyinstaller_package_and_release.yml

* Update nuitka_package_release.yml

* Update nuitka_build.py

* 更新 NetEase_Cloud_Music_Download (#18)

* Update dev_package_and_upload.yml (#17)

* 更新 NetEase_Cloud_Music_Download

* 更新依赖项，添加psutil和astropy库

* 添加favicon.ico图标文件，并在配置中启用UPX压缩

* Nuitka Build 启用多核并行编译

* test cache

* 删去错误版本信息

* fix dev_package_and_upload.yml

Author: God-2077

.github/workflows/dev_package_and_upload.yml

@@ -9,8 +9,11 @@ on:
       - 'package/nuitka_config.yml'
 
 jobs:
-  package-and-upload:
+  package-and-release:
     runs-on: windows-latest
+    env:
+      PYTHON_VERSION: 3.10
+      NUITKA_CACHE_DIR: ${{ github.workspace }}/nuitka-cache
 
     # 添加必要的权限
     permissions:
@@ -23,17 +26,42 @@ jobs:
 
     - name: Checkout code
       uses: actions/checkout@v4
+          
+    
 
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
-
+        python-version: ${{ env.PYTHON_VERSION }}
+        
+    - name: Cache UPX
+      id: cache-upx
+      uses: actions/cache@v4
+      with:
+        path: upx
+        key: ${{ runner.os }}-${{ runner.arch }}-upx-v5.0.1
+        restore-keys: |
+          ${{ runner.os }}-${{ runner.arch }}-upx-
+          
     - name: UPX Setup
+      if: ${{ steps.cache-upx.outputs.cache-hit != 'true' }
       run: |
         mkdir upx
         curl -o upx/upx.exe https://assets.ksable.top/github/upx/upx/v5.0.1/windows-amd64/upx.exe
 
+    - name: get pip cache dir
+      id: pip-cache-dir
+      run: echo "pip-cache-dir=$(pip cache dir)" >> $env:GITHUB_OUTPUT
+      
+    - name: pip cache
+      uses: actions/cache@v4
+      with:
+        path: ${{ steps.pip-cache-dir.outputs.dir }}  # pip缓存路径
+        key: ${{ runner.os }}-${{ runner.arch }}-pip-${{ hashFiles('package/nuitka_build.py') }}
+        restore-keys: |
+             ${{ runner.os }}-${{ runner.arch }}-pip-  # 后备恢复键（当精确键不存在时，使用最近的缓存）
+             
+
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -53,6 +81,15 @@ jobs:
     #     # 设置控制台编码为UTF-8
     #     chcp.com 65001
 
+    - name: Cache Nuitka cache directory
+      uses: actions/cache@v4
+      with:
+        path: ${{ env.NUITKA_CACHE_DIR }}
+        key: nuitka-${{ runner.os }}-${{ runner.arch }}-python-${{ env.PYTHON_VERSION }}-nuitka-${{ hashFiles('package/nuitka_build.py') }}
+        restore-keys: |
+          nuitka-${{ runner.os }}-${{ runner.arch }}-python-${{ env.PYTHON_VERSION }}-
+          nuitka-${{ runner.os }}-${{ runner.arch }}-
+          
     - name: Run packaging script
       run: |
         # 设置Python使用UTF-8编码

novel_crawler/novel_crawler_v.25.07.08.py

@@ -417,7 +417,7 @@ def download_chapter(chapter_info, progress, task_id, chapter_count):
 
 # 主函数开始
 def main():
-    print_header("小说爬虫工具\n版本 v.25.07.07")
+    print_header("小说爬虫工具")
 
     if debug:
         logger.debug("Debug模式已开启")

package/nuitka_build.py

@@ -26,13 +26,14 @@ def main():
 
     print(f"当前操作系统: {Machine} {arrch}")
     print(f"平台详情: {platform.platform()}")
+    print("CPU核心数:", os.cpu_count())
     print(f"Python版本: {sys.version}")
 
     # 解析命令行参数
     parser = argparse.ArgumentParser(description='Nuitka打包脚本')
     parser.add_argument('config', help='配置文件路径')
     args = parser.parse_args()
-
+    cpu_count=os.cpu_count()
     # 读取配置文件
     with open(args.config, 'r', encoding='utf-8') as f:
         config = yaml.safe_load(f)
@@ -92,6 +93,7 @@ def main():
                 '--onefile', # 单文件
                 '--standalone',
                 '--mingw64',
+                f'--jobs={os.cpu_count()}', # 多线程
                 # '--mode',
                 '--assume-yes-for-downloads', #自动下载外部代码
                 # '--show-memory'