The TouchFish v4 -- Merge pull request #58 from 035966-L3/main

v4

Author: pztsdy

.github/workflows/compile_py.yml

@@ -1,6 +1,4 @@
-# 贡献者注意： 
-# 下面的 hook-win10toast.py 迁移不要删
-name: Build and Push Python Binaries
+name: Build and Release Python Binaries
 
 on:
   push:
@@ -10,25 +8,20 @@ on:
 jobs:
   build-linux:
     runs-on: ubuntu-latest
+    container:
+      image: python:3.6-buster # 适配 NOI Linux 2.0 的 Python 3.6
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'  # Linux保持原版本
-          cache: 'pip'
+      - name: Install PyInstaller for Linux
+        run: pip install pyinstaller
 
       - name: Compile Python scripts for Linux
         run: |
-          pip install -r requirements_linux.txt
           mkdir -p bin/linux
-          pyinstaller --onefile --distpath bin/linux chat.py
-          pyinstaller --onefile --distpath bin/linux admin.py
-          pyinstaller --onefile --noconsole --distpath bin/linux client.py
-          pyinstaller --onefile --distpath bin/linux clientcli.py  # 新增clientcli.py编译
-          rm chat.spec client.spec clientcli.spec  # 删除新增的spec文件
+          pyinstaller --onefile --distpath bin/linux LTS.py
+          rm LTS.spec
           rm -rf build/
 
       - name: Upload Linux binaries
@@ -46,21 +39,18 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.6'  # 适配Windows 7的Python 3.6
-          cache: 'pip'
+          python-version: '3.6'  # 适配 Windows 7 的 Python 3.6
+
+      - name: Install PyInstaller for Windows
+        run: pip install pyinstaller
 
       - name: Compile Python scripts for Windows
         run: |
-          pip install -r requirements.txt
-          # 动态获取Python安装路径（适配3.6版本）
+          # 动态获取 Python 安装路径（适配 3.6 版本）
           $site_packages = python -c "import site; print(site.getsitepackages()[0])"
-          Copy-Item -Path hook-win10toast.py "$site_packages\lib\site-packages\PyInstaller\hooks\"
           mkdir -Force bin/windows
-          pyinstaller --onefile --distpath bin/windows admin.py
-          pyinstaller --onefile --distpath bin/windows chat.py
-          pyinstaller --onefile --noconsole --distpath bin/windows client.py
-          pyinstaller --onefile --distpath bin/windows clientcli.py  # 新增clientcli.py编译
-          Remove-Item -Path "chat.spec", "client.spec", "clientcli.spec" -Force  # 删除新增的spec文件
+          pyinstaller --onefile --distpath bin/windows LTS.py
+          Remove-Item -Path "LTS.spec" -Force
           Remove-Item -Path ".\build" -Recurse -Force
           
       - name: Upload Windows binaries
@@ -69,38 +59,40 @@ jobs:
           name: windows-binaries
           path: bin/windows/
 
-  push-binaries:
-    needs: [build-windows, build-linux]
+  prerelease-upload:
+    needs: [build-linux, build-windows]
     runs-on: ubuntu-latest
     if: success()
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Download Windows binaries
         uses: actions/download-artifact@v4
         with:
           name: windows-binaries
           path: bin/windows/
-
       - name: Download Linux binaries
         uses: actions/download-artifact@v4
         with:
           name: linux-binaries
           path: bin/linux/
-
-      - name: Configure Git
-        run: |
-          git config user.name "github-actions"
-          git config user.email "github-actions@users.noreply.github.com"
-
-      - name: Add and commit binaries
-        run: |
-          git add bin/windows/
-          git add bin/linux/
-          git commit -m "[skip ci] [Bot] Add compiled binaries" || echo "No changes to commit"
-
-      - name: Push changes
-        run: git push
+      - name: Create Development Build Pre-release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: dev-build
+          name: Development Build
+          body: |
+            这是一个基于 `main` 分支最新代码的自动版本。
+            Commit SHA: ${{ github.sha }}
+            
+            提示：
+             - 此版本为开发测试版，可能包含不稳定的功能或未知的错误。
+             - 不建议用于生产环境或正式用途。
+          prerelease: true
+          allowUpdates: true
+          artifacts: |
+            bin/windows/*
+            bin/linux/*
+            LTS.py
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,5 +1,4 @@
 __pycache__
-log.txt
 config.json
-hint.txt
-admin_err.log
+log.txt
+TouchFishFiles

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# TouchFish 贡献者须知 V2
+# TouchFish 贡献者须知 v2
 
 感谢你为项目贡献代码！在提交 PR 前，请仔细阅读以下指引：
 
@@ -10,6 +10,7 @@
   - 变量名应具有描述性，推荐使用下划线分隔，如 `exit_flag`
 - **代码结构**：单文件超过 800 行时应考虑拆分为独立的模块
 - **修改范围**：每次修改请控制在 200 行以内，大幅改动请拆分多个 PR
+- **界面要求**：请保持命令行界面，不接受可视化改动
 
 ## 二、测试与质量
 - **测试覆盖**：每次提交必须保证测试覆盖（文档类修改除外）
@@ -27,7 +28,4 @@
   - 请勿频繁催促审核
 - **合并流程**：当 PR 被标记为 **Action: Merge** 时，表示即将合并
 
-## 四、关于服务端的说明
-- **界面要求**：服务端（`chat.py` 和 `admin.py`）请保持命令行界面，不接受可视化改动（部分发行版的 admin 除外）
-
-感谢你的理解与配合，我们期待看到你的精彩贡献！
+感谢你的理解与配合，我们期待看到你的精彩贡献！