diff --git a/.github/workflows/Manually_build_executable_programs.yml b/.github/workflows/Manually_build_executable_programs.yml index 236e3da..a3d44ff 100644 --- a/.github/workflows/Manually_build_executable_programs.yml +++ b/.github/workflows/Manually_build_executable_programs.yml @@ -1,4 +1,4 @@ -name: 手动构建可执行文件 +name: 构建可执行文件 on: workflow_dispatch: @@ -29,16 +29,18 @@ jobs: - name: 构建 Win 可执行文件 if: runner.os == 'Windows' run: | + echo "DATE=$(Get-Date -Format 'yyyyMMdd')" >> $env:GITHUB_ENV pyinstaller --icon=./static/XHS-Downloader.ico --add-data "static:static" --add-data "locale:locale" --collect-all emoji main.py shell: pwsh - name: 构建 Mac 可执行文件 if: runner.os == 'macOS' run: | + echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV pyinstaller --icon=./static/XHS-Downloader.icns --add-data "static:static" --add-data "locale:locale" --collect-all emoji main.py - name: 上传文件 uses: actions/upload-artifact@v4 with: - name: XHS-Downloader_${{ runner.os }}_${{ runner.arch }} + name: XHS-Downloader_${{ runner.os }}_${{ runner.arch }}_${{ env.DATE }} path: dist/main/ diff --git a/.github/workflows/Manually_docker_image.yml b/.github/workflows/Manually_docker_image.yml index 3324be5..1f89fd5 100644 --- a/.github/workflows/Manually_docker_image.yml +++ b/.github/workflows/Manually_docker_image.yml @@ -1,4 +1,4 @@ -name: 手动构建并发布 Docker 镜像 +name: 构建并发布 Docker 镜像 on: workflow_dispatch: diff --git a/.github/workflows/Release_build_executable_program.yml b/.github/workflows/Release_build_executable_program.yml index e73788f..e0e10f0 100644 --- a/.github/workflows/Release_build_executable_program.yml +++ b/.github/workflows/Release_build_executable_program.yml @@ -1,8 +1,8 @@ -name: 发布构建可执行文件 +name: 自动构建并发布可执行文件 on: release: - types: [ created ] + types: [ published ] permissions: contents: write diff --git a/README.md b/README.md index acb2c8d..24e59b7 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,8 @@

如果仅需下载无水印作品文件，建议选择 程序运行 或 Docker 运行；如果有其他需求，建议选择 源码运行！

2.2 版本开始，项目功能无异常的情况下，无需额外处理 Cookie！

🖱 程序运行

-

⭐ Mac OS、Windows 10 及以上用户可前往 Releases 下载程序压缩包，解压后打开程序文件夹，双击运行 main 即可使用。

-

⭐ 本项目包含手动构建可执行文件的 GitHub Actions，使用者可以随时使用 GitHub Actions 将最新源码构建为可执行文件！

+

⭐ Mac OS、Windows 10 及以上用户可前往 Releases 或者 Actions 下载程序压缩包，解压后打开程序文件夹，双击运行 main 即可使用。

+

⭐ 本项目包含自动构建可执行文件的 GitHub Actions，使用者可以随时使用 GitHub Actions 将最新源码构建为可执行文件！

注意：Mac OS 平台可执行文件 main 可能需要从终端命令行启动；受设备限制，Mac OS 平台可执行文件尚未经过测试，无法保证可用性！

若通过此方式使用程序，文件默认下载路径为：.\_internal\Download；配置文件路径为：.\_internal\settings.json

⌨️ Docker 运行

@@ -433,7 +433,7 @@ async def example(): ### 3. 手动触发打包流程 1. 在您 Fork 的仓库中，点击顶部的 **Actions** 选项卡 -2. 找到名为 **手动构建可执行文件** 的工作流 +2. 找到名为 **构建可执行文件** 的工作流 3. 点击右侧的 **Run workflow** 按钮： - 选择 **master** 或者 **develop** 分支 - 点击 **Run workflow** diff --git a/README_EN.md b/README_EN.md index a1c845d..c411d17 100644 --- a/README_EN.md +++ b/README_EN.md @@ -71,8 +71,8 @@

If you only need to download watermark-free works files, it is recommended to choose Program Run; if you have other needs, it is recommended to choose Source Code Run!

Starting from version 2.2, if there are no abnormalities in project functionality, there is no need to handle cookies separately!

🖱 Program Run

-

⭐ Mac OS, Windows 10 and above users can go to Releases to download the program package, unzip it, open the program folder, and double-click to run main to use.

-

⭐ This project includes GitHub Actions for manually building executable files. Users can use GitHub Actions to build the latest source code into executable files at any time!

+

⭐ Mac OS, Windows 10 and above users can go to Releases or Actions to download the program package, unzip it, open the program folder, and double-click to run main to use.

+

⭐ This project includes GitHub Actions for automatic building executable files. Users can use GitHub Actions to build the latest source code into executable files at any time!

Note: The executable file main for Mac OS may need to be launched from the terminal command line; Due to device limitations, the Mac OS executable file has not been tested and its availability cannot be guaranteed!

If you use the program in this way, the default download path for files is: .\_internal\Download; the configuration file path is: .\_internal\settings.json

⌨️ Docker Run

@@ -456,7 +456,7 @@ the program based on the latest source code! ### 3. Manually Trigger the Build Process 1. In your forked repository, click the **Actions** tab at the top -2. Find the workflow named **Manual Build of Executable File** +2. Find the workflow named **构建可执行文件** 3. Click the **Run workflow** button on the right: - Select the **master** or **develop** branch - Click **Run workflow**