Merge pull request #11 from LinJHS/dev

Author: LinJHS

.github/workflows/publish.yml

@@ -40,9 +40,25 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-  publish-pypi:
+  create-release:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish-pypi:
+    needs: create-release
+    runs-on: ubuntu-latest
     permissions:
       id-token: write
       contents: write
@@ -65,13 +81,40 @@ jobs:
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
 
-      - name: Create GitHub Release
+      - name: Upload PyPI Assets to Release
         uses: softprops/action-gh-release@v2
         with:
           files: dist/*
-          generate_release_notes: true
-          draft: false
-          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  build-windows-exe:
+    needs: create-release
+    runs-on: windows-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+          pip install pyinstaller
+
+      - name: Build EXE with PyInstaller
+        run: |
+          pyinstaller --noconfirm --onefile --console --name "WinFolderManager" --add-data "manager/templates;manager/templates" --add-data "manager/static;manager/static" --icon "manager/static/favicon.ico" run.py
+
+      - name: Upload EXE to Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: dist/WinFolderManager.exe
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

MANIFEST.in

@@ -1 +1,2 @@
 recursive-include manager/templates *
+recursive-include manager/static *

README.md

@@ -1,7 +1,9 @@
-# Win Folder Manager
-
 <div align="center">
 
+<img src="imgs/Logo-Text.jpg" width="100%" alt="Win Folder Manager">
+
+<br>
+
 [![PyPI version](https://img.shields.io/pypi/v/win-folder-manager.svg?style=flat-square&logo=pypi&logoColor=white)](https://pypi.org/project/win-folder-manager/)
 [![PyPI Downloads](https://img.shields.io/pypi/dm/win-folder-manager.svg?style=flat-square&logo=pypi&logoColor=white)](https://pypi.org/project/win-folder-manager/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linjhs/win-folder-manager.svg?style=flat-square&logo=docker&logoColor=white)](https://hub.docker.com/r/linjhs/win-folder-manager)

README_EN.md

@@ -1,7 +1,9 @@
-# Win Folder Manager
-
 <div align="center">
 
+<img src="imgs/Logo-Text.jpg" width="100%" alt="Win Folder Manager">
+
+<br>
+
 [![PyPI version](https://img.shields.io/pypi/v/win-folder-manager.svg?style=flat-square&logo=pypi&logoColor=white)](https://pypi.org/project/win-folder-manager/)
 [![PyPI Downloads](https://img.shields.io/pypi/dm/win-folder-manager.svg?style=flat-square&logo=pypi&logoColor=white)](https://pypi.org/project/win-folder-manager/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linjhs/win-folder-manager.svg?style=flat-square&logo=docker&logoColor=white)](https://hub.docker.com/r/linjhs/win-folder-manager)

imgs/Logo-Text.jpg

@@ -5,6 +5,8 @@
 from flask import Flask, render_template, jsonify, request
 from .logic import FolderManager
 
+import sys
+
 # Use APPDATA for persistent config storage
 def get_config_dir():
     if os.name == 'nt':
@@ -24,10 +26,18 @@ def get_config_dir():
 
 CONFIG_FILE = os.path.join(APPDATA_DIR, 'config.json')
 
-# Templates are now inside the package
-TEMPLATE_FOLDER = os.path.join(os.path.dirname(__file__), 'templates')
+# Define paths for templates and static files
+if getattr(sys, 'frozen', False):
+    # Running in PyInstaller bundle
+    BASE_DIR = os.path.join(sys._MEIPASS, 'manager')
+else:
+    # Running in normal Python environment
+    BASE_DIR = os.path.dirname(__file__)
+
+TEMPLATE_FOLDER = os.path.join(BASE_DIR, 'templates')
+STATIC_FOLDER = os.path.join(BASE_DIR, 'static')
 
-app = Flask(__name__, template_folder=TEMPLATE_FOLDER)
+app = Flask(__name__, template_folder=TEMPLATE_FOLDER, static_folder=STATIC_FOLDER)
 
 # 初始化逻辑类
 folder_logic = FolderManager(CONFIG_FILE)
@@ -74,6 +84,12 @@ def select_folder_dialog():
         # Create a hidden root window
         root = tk.Tk()
         root.withdraw() # Hide the main window
+
+        # Set custom icon if exists
+        icon_path = os.path.join(STATIC_FOLDER, 'favicon.ico')
+        if os.path.exists(icon_path):
+            root.iconbitmap(icon_path)
+
         root.attributes('-topmost', True) # Make it appear on top
 
         # Open directory picker

manager/app.py

@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Win Folder Manager</title>
+    <link rel="icon" href="{{ url_for('static', filename='favicon.ico') }}" type="image/x-icon">
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" rel="stylesheet">
     <style>

manager/static/favicon.ico

@@ -0,0 +1,4 @@
+from manager.app import main
+
+if __name__ == '__main__':
+    main()