mirror of
https://github.com/KenanZhu/AutoLibrary.git
synced 2026-08-02 14:19:35 +08:00
Compare commits
43 Commits
f9175371dc
..
v1.4.0
| Author | SHA1 | Date | |
|---|---|---|---|
| e4d838a9d0 | |||
| 70f78c2a6f | |||
| e40e7767c7 | |||
| 1b6c170d6c | |||
| 30a7a8e996 | |||
| d59ecc3090 | |||
| 7685f6a616 | |||
| ed8dec70a6 | |||
| dfa9ae1a0c | |||
| 06740776a9 | |||
| c8f9ae752f | |||
| 89c1e33257 | |||
| 862f86827a | |||
| ed98623cda | |||
| ab51c72a11 | |||
| 2fe4584129 | |||
| 92c5fa0dfb | |||
| 05ad9ba0b3 | |||
| 0069d5274b | |||
| 6a9c662287 | |||
| d7fff16991 | |||
| db345f9efc | |||
| 133433f2d8 | |||
| 6f32923865 | |||
| a716e5b945 | |||
| 588718f9c5 | |||
| 0ba76babc6 | |||
| dc7e5d8cd8 | |||
| 818acd4efc | |||
| 308a1dfcf3 | |||
| c250fa4a6e | |||
| 8f8e3e4ba7 | |||
| 88a74a7a47 | |||
| 5552af1345 | |||
| 6d05d4c7cb | |||
| 01f4ccaa0e | |||
| 0bad34d7a8 | |||
| 61d1b44402 | |||
| 72301c63fd | |||
| 609850ab60 | |||
| 8e14d45b71 | |||
| f6ef9af39d | |||
| 72dce83c55 |
@@ -4,6 +4,9 @@ name: Build Test
|
|||||||
# It is triggered when a pull request is opened, synchronized, or reopened against the main branch.
|
# It is triggered when a pull request is opened, synchronized, or reopened against the main branch.
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
@@ -209,13 +212,283 @@ jobs:
|
|||||||
|
|
||||||
- name: Upload build summary
|
- name: Upload build summary
|
||||||
run: |
|
run: |
|
||||||
Write-Host "## Build Test Summary" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8
|
"## Build Test Summary" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8
|
||||||
Write-Host "" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "========================================" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"========================================" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "✓ Pull request build test completed successfully!" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"✓ Pull request build test completed successfully!" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "- Version: ${{ steps.get_version.outputs.VERSION }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"- Version: ${{ steps.get_version.outputs.VERSION }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "- Tag: ${{ steps.get_version.outputs.TAG_NAME }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"- Tag: ${{ steps.get_version.outputs.TAG_NAME }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "- Pull Request #${{ github.event.pull_request.number || 'N/A' }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"- Pull Request #${{ github.event.pull_request.number || 'N/A' }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "- Branch: ${{ github.event.pull_request.head.ref || github.ref }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"- Branch: ${{ github.event.pull_request.head.ref || github.ref }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "- Event: ${{ github.event_name }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"- Event: ${{ github.event_name }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
|
|
||||||
|
#
|
||||||
|
# Build macOS
|
||||||
|
#
|
||||||
|
|
||||||
|
build-macos:
|
||||||
|
runs-on: macos-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
ref: ${{ github.ref }}
|
||||||
|
|
||||||
|
- name: Get version info
|
||||||
|
id: get_version
|
||||||
|
run: |
|
||||||
|
version="pr-test"
|
||||||
|
tag_name="pr-test"
|
||||||
|
echo "✓ Mode: Pull Request Test Build"
|
||||||
|
echo "✓ Tag: $tag_name"
|
||||||
|
echo "✓ Version: $version"
|
||||||
|
echo "VERSION=$version" >> $GITHUB_OUTPUT
|
||||||
|
echo "TAG_NAME=$tag_name" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Set up Python
|
||||||
|
uses: actions/setup-python@v6
|
||||||
|
with:
|
||||||
|
python-version: '3.13'
|
||||||
|
cache: 'pip'
|
||||||
|
cache-dependency-path: requirements.txt
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
pip install -r requirements.txt
|
||||||
|
|
||||||
|
- name: Solve ddddocr compatibility and copy model files
|
||||||
|
run: |
|
||||||
|
ddddocr_path=$(python -c "import ddddocr, os; print(os.path.dirname(ddddocr.__file__))")
|
||||||
|
echo "ddddocr package location: $ddddocr_path"
|
||||||
|
|
||||||
|
init_file="$ddddocr_path/__init__.py"
|
||||||
|
if [ -f "$init_file" ]; then
|
||||||
|
echo "Fixing ddddocr compatibility in: $init_file"
|
||||||
|
# macOS 使用 BSD sed,要求 -i 后跟备份后缀名(空字符串 = 不备份)
|
||||||
|
sed -i '' 's/Image\.ANTIALIAS/Image.Resampling.LANCZOS/g' "$init_file"
|
||||||
|
echo "✓ Fixed: Image.ANTIALIAS -> Image.Resampling.LANCZOS"
|
||||||
|
else
|
||||||
|
echo "✗ ddddocr __init__.py not found"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p models
|
||||||
|
echo "✓ Created models directory"
|
||||||
|
|
||||||
|
# 多路径 fallback 搜索 ONNX 模型,提升 ddddocr 版本兼容性
|
||||||
|
onnx_source=""
|
||||||
|
onnx_dest="models/common.onnx"
|
||||||
|
candidate_paths=(
|
||||||
|
"$ddddocr_path/common.onnx"
|
||||||
|
"$ddddocr_path/models/common.onnx"
|
||||||
|
"$ddddocr_path/ddddocr/common.onnx"
|
||||||
|
)
|
||||||
|
for candidate in "${candidate_paths[@]}"; do
|
||||||
|
if [ -f "$candidate" ]; then
|
||||||
|
onnx_source="$candidate"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
# 若以上候选均未命中,回退到全包搜索
|
||||||
|
if [ -z "$onnx_source" ]; then
|
||||||
|
echo "⚠ 未在已知路径找到 ONNX 模型,回退到全包搜索..."
|
||||||
|
onnx_source=$(find "$ddddocr_path" -name "*.onnx" -type f 2>/dev/null | head -1)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$onnx_source" ] && [ -f "$onnx_source" ]; then
|
||||||
|
cp "$onnx_source" "$onnx_dest"
|
||||||
|
echo "✓ ONNX model copied: $onnx_source -> $onnx_dest"
|
||||||
|
else
|
||||||
|
echo "✗ ONNX model not found in ddddocr package"
|
||||||
|
echo " Searched directory: $ddddocr_path"
|
||||||
|
ls -la "$ddddocr_path/" || true
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f "$onnx_dest" ]; then
|
||||||
|
file_size=$(du -h "$onnx_dest" | cut -f1)
|
||||||
|
echo "✓ Model file verified: $onnx_dest (Size: $file_size)"
|
||||||
|
else
|
||||||
|
echo "✗ Failed to copy model file"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Compile Qt Resource files
|
||||||
|
run: |
|
||||||
|
cd batchs
|
||||||
|
bash compile_rc.sh
|
||||||
|
|
||||||
|
- name: Compile Qt UI files
|
||||||
|
run: |
|
||||||
|
cd batchs
|
||||||
|
bash compile_ui.sh
|
||||||
|
|
||||||
|
- name: Generate 'Main.spec'
|
||||||
|
env:
|
||||||
|
APP_VERSION: ${{ steps.get_version.outputs.VERSION }}
|
||||||
|
run: |
|
||||||
|
version="$APP_VERSION"
|
||||||
|
exe_name="AutoLibrary-$version"
|
||||||
|
echo "Generating Main.spec for version: $version"
|
||||||
|
echo "App name: $exe_name"
|
||||||
|
|
||||||
|
printf '%s\n' \
|
||||||
|
'# -*- mode: python ; coding: utf-8 -*-' \
|
||||||
|
'' \
|
||||||
|
'a = Analysis(' \
|
||||||
|
" ['src/Main.py']," \
|
||||||
|
' pathex=[],' \
|
||||||
|
' binaries=[],' \
|
||||||
|
' datas=[' \
|
||||||
|
" ('models/common.onnx', 'ddddocr')," \
|
||||||
|
" ('src/gui/resources/icons/AutoLibrary_Logo_64.ico', 'gui/resources/icons')," \
|
||||||
|
' ],' \
|
||||||
|
' hiddenimports=[],' \
|
||||||
|
' hookspath=[],' \
|
||||||
|
' hooksconfig={},' \
|
||||||
|
' runtime_hooks=[],' \
|
||||||
|
' excludes=[],' \
|
||||||
|
' noarchive=False,' \
|
||||||
|
' optimize=0,' \
|
||||||
|
')' \
|
||||||
|
'pyz = PYZ(a.pure)' \
|
||||||
|
'' \
|
||||||
|
'exe = EXE(' \
|
||||||
|
' pyz,' \
|
||||||
|
' a.scripts,' \
|
||||||
|
' [],' \
|
||||||
|
' exclude_binaries=True,' \
|
||||||
|
" name='AutoLibrary'," \
|
||||||
|
' debug=False,' \
|
||||||
|
' bootloader_ignore_signals=False,' \
|
||||||
|
' strip=False,' \
|
||||||
|
' upx=True,' \
|
||||||
|
' upx_exclude=[],' \
|
||||||
|
' runtime_tmpdir=None,' \
|
||||||
|
' console=False,' \
|
||||||
|
' disable_windowed_traceback=False,' \
|
||||||
|
' argv_emulation=False,' \
|
||||||
|
' target_arch=None,' \
|
||||||
|
' codesign_identity=None,' \
|
||||||
|
' entitlements_file=None,' \
|
||||||
|
" icon=['src/gui/resources/icons/AutoLibrary_Logo_64.ico']," \
|
||||||
|
')' \
|
||||||
|
'' \
|
||||||
|
'coll = COLLECT(' \
|
||||||
|
' exe,' \
|
||||||
|
' a.binaries,' \
|
||||||
|
' a.zipfiles,' \
|
||||||
|
' a.datas,' \
|
||||||
|
' strip=False,' \
|
||||||
|
' upx=True,' \
|
||||||
|
' upx_exclude=[],' \
|
||||||
|
" name='${exe_name}'," \
|
||||||
|
')' \
|
||||||
|
'' \
|
||||||
|
'app = BUNDLE(' \
|
||||||
|
' coll,' \
|
||||||
|
" name='AutoLibrary.app'," \
|
||||||
|
" icon='src/gui/resources/icons/AutoLibrary_Logo.icns'," \
|
||||||
|
" bundle_identifier='com.kenanzhu.autolibrary'," \
|
||||||
|
' info_plist={' \
|
||||||
|
" 'NSHighResolutionCapable': 'True'," \
|
||||||
|
" 'CFBundleName': 'AutoLibrary'," \
|
||||||
|
" 'CFBundleDisplayName': 'AutoLibrary'," \
|
||||||
|
" 'CFBundleShortVersionString': '${version}'," \
|
||||||
|
" 'CFBundleVersion': '${version}'," \
|
||||||
|
" 'CFBundleExecutable': 'AutoLibrary'," \
|
||||||
|
" 'NSPrincipalClass': 'NSApplication'," \
|
||||||
|
" 'LSMinimumSystemVersion': '11.0'," \
|
||||||
|
" 'NSRequiresAquaSystemAppearance': 'False'," \
|
||||||
|
" 'NSHumanReadableCopyright': 'Copyright 2025 - 2026 KenanZhu. All rights reserved.'," \
|
||||||
|
' },' \
|
||||||
|
')' \
|
||||||
|
> Main.spec
|
||||||
|
|
||||||
|
echo "✓ Main.spec generated successfully"
|
||||||
|
echo ""
|
||||||
|
echo "========================================"
|
||||||
|
echo "Generated Main.spec"
|
||||||
|
echo "========================================"
|
||||||
|
cat Main.spec
|
||||||
|
echo "========================================"
|
||||||
|
|
||||||
|
- name: Build with PyInstaller
|
||||||
|
run: |
|
||||||
|
python -m PyInstaller Main.spec
|
||||||
|
|
||||||
|
- name: Create DMG
|
||||||
|
run: |
|
||||||
|
tag_name="${{ steps.get_version.outputs.TAG_NAME }}"
|
||||||
|
dmg_name="AutoLibrary.$tag_name-macos-arm64.dmg"
|
||||||
|
app_path="dist/AutoLibrary.app"
|
||||||
|
|
||||||
|
if [ ! -d "$app_path" ]; then
|
||||||
|
echo "✗ App bundle not found: $app_path"
|
||||||
|
echo "Files in dist directory:"
|
||||||
|
ls -la dist/
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Creating DMG from: $app_path"
|
||||||
|
xattr -cr "$app_path" 2>/dev/null || true
|
||||||
|
|
||||||
|
tmp_dmg_dir=$(mktemp -d)
|
||||||
|
cp -R "$app_path" "$tmp_dmg_dir/"
|
||||||
|
ln -s /Applications "$tmp_dmg_dir/Applications"
|
||||||
|
|
||||||
|
hdiutil create \
|
||||||
|
-volname "AutoLibrary $tag_name" \
|
||||||
|
-srcfolder "$tmp_dmg_dir" \
|
||||||
|
-ov \
|
||||||
|
-format UDZO \
|
||||||
|
"$dmg_name"
|
||||||
|
|
||||||
|
rm -rf "$tmp_dmg_dir"
|
||||||
|
|
||||||
|
if [ -f "$dmg_name" ]; then
|
||||||
|
dmg_size=$(du -h "$dmg_name" | cut -f1)
|
||||||
|
echo "✓ DMG created: $dmg_name (Size: $dmg_size)"
|
||||||
|
else
|
||||||
|
echo "✗ Failed to create DMG"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "✓ Artifacts ready:"
|
||||||
|
echo " - $dmg_name"
|
||||||
|
echo " - $app_path"
|
||||||
|
|
||||||
|
- name: Archive artifacts
|
||||||
|
uses: actions/upload-artifact@v6
|
||||||
|
with:
|
||||||
|
name: AutoLibrary.${{ steps.get_version.outputs.TAG_NAME }}-macos-arm64
|
||||||
|
path: |
|
||||||
|
AutoLibrary.${{ steps.get_version.outputs.TAG_NAME }}-macos-arm64.dmg
|
||||||
|
dist/AutoLibrary.app/**
|
||||||
|
retention-days: 7
|
||||||
|
|
||||||
|
- name: Upload build summary
|
||||||
|
run: |
|
||||||
|
tag_name="${{ steps.get_version.outputs.TAG_NAME }}"
|
||||||
|
version="${{ steps.get_version.outputs.VERSION }}"
|
||||||
|
dmg_name="AutoLibrary.$tag_name-macos-arm64.dmg"
|
||||||
|
|
||||||
|
{
|
||||||
|
echo "## Build Test Summary (macOS)"
|
||||||
|
echo ""
|
||||||
|
echo "========================================"
|
||||||
|
echo "✓ Pull request build test completed successfully!"
|
||||||
|
echo "- Version: $version"
|
||||||
|
echo "- Tag: $tag_name"
|
||||||
|
echo "- Pull Request #${{ github.event.pull_request.number || 'N/A' }}"
|
||||||
|
echo "- Branch: ${{ github.event.pull_request.head.ref || github.ref }}"
|
||||||
|
echo "- Event: ${{ github.event_name }}"
|
||||||
|
echo "- DMG: $dmg_name"
|
||||||
|
echo ""
|
||||||
|
echo "### How to test on macOS"
|
||||||
|
echo '1. Download the DMG artifact'
|
||||||
|
echo '2. Open the DMG and drag AutoLibrary.app to /Applications'
|
||||||
|
echo '3. Right-click → Open the app (to bypass Gatekeeper)'
|
||||||
|
} >> $GITHUB_STEP_SUMMARY
|
||||||
|
|||||||
+311
-10
@@ -1,7 +1,10 @@
|
|||||||
name: Build
|
name: Build
|
||||||
|
|
||||||
# This workflow compiles the application for Windows platform using PyInstaller, and
|
# This workflow compiles the application for Windows and macOS platforms using
|
||||||
# archives the built artifacts as 'AutoLibrary.<tag_name>-windows-x86_64.zip'.
|
# PyInstaller, and archives the built artifacts.
|
||||||
|
#
|
||||||
|
# - Windows: AutoLibrary.<tag_name>-windows-x86_64.zip
|
||||||
|
# - macOS: AutoLibrary.<tag_name>-macos-arm64.dmg
|
||||||
#
|
#
|
||||||
# It is triggered when called by the release workflow.
|
# It is triggered when called by the release workflow.
|
||||||
|
|
||||||
@@ -251,12 +254,310 @@ jobs:
|
|||||||
- name: Upload build summary
|
- name: Upload build summary
|
||||||
if: ${{ inputs.is_test == 'true' }}
|
if: ${{ inputs.is_test == 'true' }}
|
||||||
run: |
|
run: |
|
||||||
Write-Host "## Build Summary" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8
|
"## Build Summary" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8
|
||||||
Write-Host "" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "========================================" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"========================================" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "✓ Build test completed successfully!" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"✓ Build test completed successfully!" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "- Version: ${{ steps.get_version.outputs.VERSION }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"- Version: ${{ steps.get_version.outputs.VERSION }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "- Tag: ${{ steps.get_version.outputs.TAG_NAME }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"- Tag: ${{ steps.get_version.outputs.TAG_NAME }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "- Event: ${{ github.event_name }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"- Event: ${{ github.event_name }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
Write-Host "- Ref: ${{ github.ref }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
"- Ref: ${{ github.ref }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
|
|
||||||
|
#
|
||||||
|
# Build macOS
|
||||||
|
#
|
||||||
|
|
||||||
|
build-macos:
|
||||||
|
runs-on: macos-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
ref: ${{ github.ref }}
|
||||||
|
|
||||||
|
- name: Download build version of ALVersionInfo.py
|
||||||
|
uses: actions/download-artifact@v6
|
||||||
|
with:
|
||||||
|
name: updated-version-info-for-build
|
||||||
|
path: src/gui/
|
||||||
|
|
||||||
|
- name: Get version info
|
||||||
|
id: get_version
|
||||||
|
run: |
|
||||||
|
is_test="${{ inputs.is_test }}"
|
||||||
|
if [ "$is_test" = "true" ]; then
|
||||||
|
version="test"
|
||||||
|
tag_name="test"
|
||||||
|
echo "✓ Mode: Test Build"
|
||||||
|
else
|
||||||
|
version="${{ inputs.version }}"
|
||||||
|
tag_name="${{ inputs.tag_name }}"
|
||||||
|
|
||||||
|
if [ -z "$version" ]; then
|
||||||
|
version="test"
|
||||||
|
tag_name="test"
|
||||||
|
echo "✓ Mode: Independent Build (No inputs provided)"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "✓ Tag: $tag_name"
|
||||||
|
echo "✓ Version: $version"
|
||||||
|
|
||||||
|
echo "VERSION=$version" >> $GITHUB_OUTPUT
|
||||||
|
echo "TAG_NAME=$tag_name" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Verify 'ALVersionInfo.py' was updated
|
||||||
|
run: |
|
||||||
|
version_info_file="src/gui/ALVersionInfo.py"
|
||||||
|
echo "Verifying $version_info_file content:"
|
||||||
|
echo "========================================"
|
||||||
|
cat "$version_info_file"
|
||||||
|
echo "========================================"
|
||||||
|
|
||||||
|
- name: Set up Python
|
||||||
|
uses: actions/setup-python@v6
|
||||||
|
with:
|
||||||
|
python-version: '3.13'
|
||||||
|
cache: 'pip'
|
||||||
|
cache-dependency-path: requirements.txt
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
pip install -r requirements.txt
|
||||||
|
|
||||||
|
- name: Solve ddddocr compatibility and copy model files
|
||||||
|
run: |
|
||||||
|
ddddocr_path=$(python -c "import ddddocr, os; print(os.path.dirname(ddddocr.__file__))")
|
||||||
|
echo "ddddocr package location: $ddddocr_path"
|
||||||
|
|
||||||
|
init_file="$ddddocr_path/__init__.py"
|
||||||
|
if [ -f "$init_file" ]; then
|
||||||
|
echo "Fixing ddddocr compatibility in: $init_file"
|
||||||
|
# macOS 使用 BSD sed,要求 -i 后跟备份后缀名(空字符串 = 不备份)
|
||||||
|
sed -i '' 's/Image\.ANTIALIAS/Image.Resampling.LANCZOS/g' "$init_file"
|
||||||
|
echo "✓ Fixed: Image.ANTIALIAS -> Image.Resampling.LANCZOS"
|
||||||
|
else
|
||||||
|
echo "✗ ddddocr __init__.py not found"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p models
|
||||||
|
echo "✓ Created models directory"
|
||||||
|
|
||||||
|
# 多路径 fallback 搜索 ONNX 模型,提升 ddddocr 版本兼容性
|
||||||
|
onnx_source=""
|
||||||
|
onnx_dest="models/common.onnx"
|
||||||
|
candidate_paths=(
|
||||||
|
"$ddddocr_path/common.onnx"
|
||||||
|
"$ddddocr_path/models/common.onnx"
|
||||||
|
"$ddddocr_path/ddddocr/common.onnx"
|
||||||
|
)
|
||||||
|
for candidate in "${candidate_paths[@]}"; do
|
||||||
|
if [ -f "$candidate" ]; then
|
||||||
|
onnx_source="$candidate"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
# 若以上候选均未命中,回退到全包搜索
|
||||||
|
if [ -z "$onnx_source" ]; then
|
||||||
|
echo "⚠ 未在已知路径找到 ONNX 模型,回退到全包搜索..."
|
||||||
|
onnx_source=$(find "$ddddocr_path" -name "*.onnx" -type f 2>/dev/null | head -1)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$onnx_source" ] && [ -f "$onnx_source" ]; then
|
||||||
|
cp "$onnx_source" "$onnx_dest"
|
||||||
|
echo "✓ ONNX model copied: $onnx_source -> $onnx_dest"
|
||||||
|
else
|
||||||
|
echo "✗ ONNX model not found in ddddocr package"
|
||||||
|
echo " Searched directory: $ddddocr_path"
|
||||||
|
ls -la "$ddddocr_path/" || true
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f "$onnx_dest" ]; then
|
||||||
|
file_size=$(du -h "$onnx_dest" | cut -f1)
|
||||||
|
echo "✓ Model file verified: $onnx_dest (Size: $file_size)"
|
||||||
|
else
|
||||||
|
echo "✗ Failed to copy model file"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Compile Qt Resource files
|
||||||
|
run: |
|
||||||
|
cd batchs
|
||||||
|
bash compile_rc.sh
|
||||||
|
|
||||||
|
- name: Compile Qt UI files
|
||||||
|
run: |
|
||||||
|
cd batchs
|
||||||
|
bash compile_ui.sh
|
||||||
|
|
||||||
|
- name: Generate 'Main.spec'
|
||||||
|
env:
|
||||||
|
APP_VERSION: ${{ steps.get_version.outputs.VERSION }}
|
||||||
|
run: |
|
||||||
|
version="$APP_VERSION"
|
||||||
|
exe_name="AutoLibrary-$version"
|
||||||
|
echo "Generating Main.spec for version: $version"
|
||||||
|
echo "App name: $exe_name"
|
||||||
|
|
||||||
|
printf '%s\n' \
|
||||||
|
'# -*- mode: python ; coding: utf-8 -*-' \
|
||||||
|
'' \
|
||||||
|
'a = Analysis(' \
|
||||||
|
" ['src/Main.py']," \
|
||||||
|
' pathex=[],' \
|
||||||
|
' binaries=[],' \
|
||||||
|
' datas=[' \
|
||||||
|
" ('models/common.onnx', 'ddddocr')," \
|
||||||
|
" ('src/gui/resources/icons/AutoLibrary_Logo_64.ico', 'gui/resources/icons')," \
|
||||||
|
' ],' \
|
||||||
|
' hiddenimports=[],' \
|
||||||
|
' hookspath=[],' \
|
||||||
|
' hooksconfig={},' \
|
||||||
|
' runtime_hooks=[],' \
|
||||||
|
' excludes=[],' \
|
||||||
|
' noarchive=False,' \
|
||||||
|
' optimize=0,' \
|
||||||
|
')' \
|
||||||
|
'pyz = PYZ(a.pure)' \
|
||||||
|
'' \
|
||||||
|
'exe = EXE(' \
|
||||||
|
' pyz,' \
|
||||||
|
' a.scripts,' \
|
||||||
|
' [],' \
|
||||||
|
' exclude_binaries=True,' \
|
||||||
|
" name='AutoLibrary'," \
|
||||||
|
' debug=False,' \
|
||||||
|
' bootloader_ignore_signals=False,' \
|
||||||
|
' strip=False,' \
|
||||||
|
' upx=True,' \
|
||||||
|
' upx_exclude=[],' \
|
||||||
|
' runtime_tmpdir=None,' \
|
||||||
|
' console=False,' \
|
||||||
|
' disable_windowed_traceback=False,' \
|
||||||
|
' argv_emulation=False,' \
|
||||||
|
' target_arch=None,' \
|
||||||
|
' codesign_identity=None,' \
|
||||||
|
' entitlements_file=None,' \
|
||||||
|
" icon=['src/gui/resources/icons/AutoLibrary_Logo_64.ico']," \
|
||||||
|
')' \
|
||||||
|
'' \
|
||||||
|
'coll = COLLECT(' \
|
||||||
|
' exe,' \
|
||||||
|
' a.binaries,' \
|
||||||
|
' a.zipfiles,' \
|
||||||
|
' a.datas,' \
|
||||||
|
' strip=False,' \
|
||||||
|
' upx=True,' \
|
||||||
|
' upx_exclude=[],' \
|
||||||
|
" name='${exe_name}'," \
|
||||||
|
')' \
|
||||||
|
'' \
|
||||||
|
'app = BUNDLE(' \
|
||||||
|
' coll,' \
|
||||||
|
" name='AutoLibrary.app'," \
|
||||||
|
" icon='src/gui/resources/icons/AutoLibrary_Logo.icns'," \
|
||||||
|
" bundle_identifier='com.kenanzhu.autolibrary'," \
|
||||||
|
' info_plist={' \
|
||||||
|
" 'NSHighResolutionCapable': 'True'," \
|
||||||
|
" 'CFBundleName': 'AutoLibrary'," \
|
||||||
|
" 'CFBundleDisplayName': 'AutoLibrary'," \
|
||||||
|
" 'CFBundleShortVersionString': '${version}'," \
|
||||||
|
" 'CFBundleVersion': '${version}'," \
|
||||||
|
" 'CFBundleExecutable': 'AutoLibrary'," \
|
||||||
|
" 'NSPrincipalClass': 'NSApplication'," \
|
||||||
|
" 'LSMinimumSystemVersion': '11.0'," \
|
||||||
|
" 'NSRequiresAquaSystemAppearance': 'False'," \
|
||||||
|
" 'NSHumanReadableCopyright': 'Copyright 2025 - 2026 KenanZhu. All rights reserved.'," \
|
||||||
|
' },' \
|
||||||
|
')' \
|
||||||
|
> Main.spec
|
||||||
|
|
||||||
|
echo "✓ Main.spec generated successfully"
|
||||||
|
echo ""
|
||||||
|
echo "========================================"
|
||||||
|
echo "Generated Main.spec"
|
||||||
|
echo "========================================"
|
||||||
|
cat Main.spec
|
||||||
|
echo "========================================"
|
||||||
|
|
||||||
|
- name: Build with PyInstaller
|
||||||
|
run: |
|
||||||
|
python -m PyInstaller Main.spec
|
||||||
|
|
||||||
|
- name: Create DMG
|
||||||
|
run: |
|
||||||
|
tag_name="${{ steps.get_version.outputs.TAG_NAME }}"
|
||||||
|
dmg_name="AutoLibrary.$tag_name-macos-arm64.dmg"
|
||||||
|
app_path="dist/AutoLibrary.app"
|
||||||
|
|
||||||
|
if [ ! -d "$app_path" ]; then
|
||||||
|
echo "✗ App bundle not found: $app_path"
|
||||||
|
echo "Files in dist directory:"
|
||||||
|
ls -la dist/
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Creating DMG from: $app_path"
|
||||||
|
xattr -cr "$app_path" 2>/dev/null || true
|
||||||
|
|
||||||
|
tmp_dmg_dir=$(mktemp -d)
|
||||||
|
cp -R "$app_path" "$tmp_dmg_dir/"
|
||||||
|
ln -s /Applications "$tmp_dmg_dir/Applications"
|
||||||
|
|
||||||
|
hdiutil create \
|
||||||
|
-volname "AutoLibrary $tag_name" \
|
||||||
|
-srcfolder "$tmp_dmg_dir" \
|
||||||
|
-ov \
|
||||||
|
-format UDZO \
|
||||||
|
"$dmg_name"
|
||||||
|
|
||||||
|
rm -rf "$tmp_dmg_dir"
|
||||||
|
|
||||||
|
if [ -f "$dmg_name" ]; then
|
||||||
|
dmg_size=$(du -h "$dmg_name" | cut -f1)
|
||||||
|
echo "✓ DMG created: $dmg_name (Size: $dmg_size)"
|
||||||
|
else
|
||||||
|
echo "✗ Failed to create DMG"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "✓ Artifacts ready:"
|
||||||
|
echo " - $dmg_name"
|
||||||
|
echo " - $app_path"
|
||||||
|
|
||||||
|
- name: Archive artifacts
|
||||||
|
uses: actions/upload-artifact@v6
|
||||||
|
with:
|
||||||
|
name: AutoLibrary.${{ steps.get_version.outputs.TAG_NAME }}-macos-arm64
|
||||||
|
path: |
|
||||||
|
AutoLibrary.${{ steps.get_version.outputs.TAG_NAME }}-macos-arm64.dmg
|
||||||
|
dist/AutoLibrary.app/**
|
||||||
|
retention-days: ${{ inputs.is_test == 'true' && 7 || 90 }}
|
||||||
|
|
||||||
|
- name: Upload build summary
|
||||||
|
if: ${{ inputs.is_test == 'true' }}
|
||||||
|
run: |
|
||||||
|
tag_name="${{ steps.get_version.outputs.TAG_NAME }}"
|
||||||
|
version="${{ steps.get_version.outputs.VERSION }}"
|
||||||
|
dmg_name="AutoLibrary.$tag_name-macos-arm64.dmg"
|
||||||
|
|
||||||
|
{
|
||||||
|
echo "## Build Summary (macOS)"
|
||||||
|
echo ""
|
||||||
|
echo "========================================"
|
||||||
|
echo "✓ Build test completed successfully!"
|
||||||
|
echo "- Version: $version"
|
||||||
|
echo "- Tag: $tag_name"
|
||||||
|
echo "- Event: ${{ github.event_name }}"
|
||||||
|
echo "- Ref: ${{ github.ref }}"
|
||||||
|
echo "- DMG: $dmg_name"
|
||||||
|
echo ""
|
||||||
|
echo "### How to test on macOS"
|
||||||
|
echo '1. Download the DMG artifact'
|
||||||
|
echo '2. Open the DMG and drag AutoLibrary.app to /Applications'
|
||||||
|
echo '3. Right-click → Open the app (to bypass Gatekeeper)'
|
||||||
|
} >> $GITHUB_STEP_SUMMARY
|
||||||
|
|||||||
@@ -21,8 +21,10 @@ name: Release
|
|||||||
# Commits version changes to release branch and creates the release tag.
|
# Commits version changes to release branch and creates the release tag.
|
||||||
|
|
||||||
# 4. Build:
|
# 4. Build:
|
||||||
# Compiles the application for Windows platform using PyInstaller, and
|
# Compiles the application for Windows and macOS platforms using PyInstaller, and
|
||||||
# archives the built artifacts as 'AutoLibrary.<tag_name>-windows-x86_64.zip'.
|
# archives the built artifacts.
|
||||||
|
# - Windows: AutoLibrary.<tag_name>-windows-x86_64.zip
|
||||||
|
# - macOS: AutoLibrary.<tag_name>-macos-arm64.dmg
|
||||||
|
|
||||||
# 5. Release:
|
# 5. Release:
|
||||||
# Creates GitHub release with generated artifacts and release notes
|
# Creates GitHub release with generated artifacts and release notes
|
||||||
@@ -181,12 +183,18 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Download artifacts
|
- name: Download Windows artifacts
|
||||||
uses: actions/download-artifact@v6
|
uses: actions/download-artifact@v6
|
||||||
with:
|
with:
|
||||||
name: AutoLibrary.${{ needs.extract-version.outputs.tag_name }}-windows-x86_64
|
name: AutoLibrary.${{ needs.extract-version.outputs.tag_name }}-windows-x86_64
|
||||||
path: artifacts/
|
path: artifacts/
|
||||||
|
|
||||||
|
- name: Download macOS artifacts
|
||||||
|
uses: actions/download-artifact@v6
|
||||||
|
with:
|
||||||
|
name: AutoLibrary.${{ needs.extract-version.outputs.tag_name }}-macos-arm64
|
||||||
|
path: artifacts/
|
||||||
|
|
||||||
- name: Create release
|
- name: Create release
|
||||||
id: create_release
|
id: create_release
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
@@ -195,6 +203,7 @@ jobs:
|
|||||||
name: AutoLibrary ${{ needs.extract-version.outputs.tag_name }}
|
name: AutoLibrary ${{ needs.extract-version.outputs.tag_name }}
|
||||||
files: |
|
files: |
|
||||||
artifacts/AutoLibrary.${{ needs.extract-version.outputs.tag_name }}-windows-x86_64.zip
|
artifacts/AutoLibrary.${{ needs.extract-version.outputs.tag_name }}-windows-x86_64.zip
|
||||||
|
artifacts/AutoLibrary.${{ needs.extract-version.outputs.tag_name }}-macos-arm64.dmg
|
||||||
draft: false
|
draft: false
|
||||||
prerelease: ${{ needs.extract-version.outputs.is_rc == 'true' }}
|
prerelease: ${{ needs.extract-version.outputs.is_rc == 'true' }}
|
||||||
generate_release_notes: true
|
generate_release_notes: true
|
||||||
|
|||||||
@@ -17,13 +17,22 @@
|
|||||||
|
|
||||||
### 功能
|
### 功能
|
||||||
|
|
||||||
|
#### 核心特性
|
||||||
|
|
||||||
1. 自动预约 - 支持自动预约
|
1. 自动预约 - 支持自动预约
|
||||||
2. 自动续约 - 支持自动续约
|
2. 自动续约 - 支持自动续约
|
||||||
3. 自动签到 - 支持自动签到
|
3. 自动签到 - 支持自动签到
|
||||||
4. 远程签到 - 支持远程签到,无需在图书馆网络环境下即可签到
|
4. 远程签到 - 支持远程签到,无需在图书馆网络环境下即可签到
|
||||||
5. 批量操作 - 支持同时预约多个用户,可以指定当前需要跳过的用户,并将用户分成多个组
|
|
||||||
6. 定时任务 - 使用内置定时任务管理,添加定时任务,指定时间后按当前预约信息自动运行,支持设置重复任务
|
#### 辅助特性
|
||||||
7. 驱动管理 - 内置浏览器驱动自动管理,支持自动检测浏览器版本并下载对应驱动,无需手动下载
|
|
||||||
|
1. 批量操作 - 支持同时预约多个用户,可以指定当前需要跳过的用户,并将用户分成多个组
|
||||||
|
2. 定时任务 - 使用内置定时任务管理,添加定时任务,指定时间后按当前预约信息自动运行,支持设置重复任务
|
||||||
|
3. 驱动管理 - 内置浏览器驱动自动管理,支持自动检测浏览器版本并下载对应驱动,无需手动下载
|
||||||
|
4. 自定义主题 - 支持深浅色主题切换,多款应用样式切换,可导入 .altheme 自定义主题一键换肤
|
||||||
|
|
||||||
|
> [!TIP]
|
||||||
|
> 前往 [主题市场](https://www.autolibrary.kenanzhu.com/marketplace) 获取和分享更多自定义主题。
|
||||||
|
|
||||||
*具体操作方法和注意事项请访问我们的 [帮助手册](https://manuals.autolibrary.kenanzhu.com)*
|
*具体操作方法和注意事项请访问我们的 [帮助手册](https://manuals.autolibrary.kenanzhu.com)*
|
||||||
|
|
||||||
@@ -39,7 +48,7 @@
|
|||||||
|
|
||||||
#### 平台支持 & 编译步骤
|
#### 平台支持 & 编译步骤
|
||||||
|
|
||||||
本工具目前仅支持 Windows 平台,由于使用 PySide6 库开发,理论上是可以自行编译并在 Linux 和 macOS 上运行,这里提供简单的编译步骤:
|
本工具目前支持 Windows 和 macOS(Apple Silicon)平台,由于使用 PySide6 库开发,理论上是可以自行编译并在 Linux 和旧架构 macOS 上运行,这里提供简单的编译步骤:
|
||||||
|
|
||||||
1. 确保系统安装了 Python 3.13 版本 (推荐,过低或高版本会导致兼容问题)。
|
1. 确保系统安装了 Python 3.13 版本 (推荐,过低或高版本会导致兼容问题)。
|
||||||
2. 安装所有依赖库,命令为 `pip install -r requirements.txt` (建议在虚拟环境下操作)。
|
2. 安装所有依赖库,命令为 `pip install -r requirements.txt` (建议在虚拟环境下操作)。
|
||||||
@@ -71,7 +80,7 @@ def classification(self, img: bytes):
|
|||||||
只要确保处于校园网网络环境内,工具都是可以正常运行的。操作处理速度基本上取决于校园网的网络环境,一般情况下在 3-4 秒(不考虑硬件差异)左右即可完成一个用户的操作,完全满足正常使用需求。
|
只要确保处于校园网网络环境内,工具都是可以正常运行的。操作处理速度基本上取决于校园网的网络环境,一般情况下在 3-4 秒(不考虑硬件差异)左右即可完成一个用户的操作,完全满足正常使用需求。
|
||||||
|
|
||||||
> [!NOTE]
|
> [!NOTE]
|
||||||
> 工具仅作为正常的预约,签到和续约的图书馆辅助工具,请勿干扰图书馆的正常运行(如故意预约多个座位,或同时预约大量的用户等,对此影响图书馆正常运行本工具概不负责,请在善用工具方便自己的情况下尽量不用影响其他同学的使用)。
|
> 工具仅作为正常的预约,签到和续约的图书馆辅助工具,请勿干扰图书馆的正常运行(如故意预约多个座位,或同时预约大量的用户等)由此影响图书馆正常运行的情况本工具概不负责,请在善用工具方便自己的情况下尽量不用影响其他同学的使用。
|
||||||
|
|
||||||
#### 关于批量操作
|
#### 关于批量操作
|
||||||
|
|
||||||
@@ -97,13 +106,13 @@ def classification(self, img: bytes):
|
|||||||
|
|
||||||
#### 会有手机端的版本吗?
|
#### 会有手机端的版本吗?
|
||||||
|
|
||||||
暂时没有考虑,而且也没有足够的时间和能力开发多平台的版本并测试维护,所以暂时只提供 Windows 版本。
|
暂时没有考虑,而且也没有足够的时间和能力开发多平台的版本并测试维护,所以暂时只提供 Windows 和 macOS(Apple Silicon)版本。
|
||||||
|
|
||||||
#### 后续会有哪些功能?
|
#### 后续会有哪些功能?
|
||||||
|
|
||||||
当前版本的功能对于正常使用已经足够,不过后续会着重完善预约时的使用体验,暂时有以下构想:
|
当前版本的功能对于正常使用已经足够,不过后续会着重完善预约时的使用体验,暂时有以下构想:
|
||||||
|
|
||||||
- 引入交互预约面板功能,预约时直接在座位分布图中选择可用座位,并按用户分配,无需事先配置预约信息。
|
- ~~引入交互预约面板功能,预约时直接在座位分布图中选择可用座位,并按用户分配,无需事先配置预约信息。~~ (不计划)
|
||||||
- ~~优化定时任务管理功能,用户可以在定时任务管理界面设置重复运行的定时任务,如每日预约、每周预约等。~~ (已完成)
|
- ~~优化定时任务管理功能,用户可以在定时任务管理界面设置重复运行的定时任务,如每日预约、每周预约等。~~ (已完成)
|
||||||
- 软件的自动更新以及公告栏功能,用户可以自动更新最新版本并获取最新公告事项。
|
- 软件的自动更新以及公告栏功能,用户可以自动更新最新版本并获取最新公告事项。
|
||||||
|
|
||||||
@@ -111,8 +120,8 @@ def classification(self, img: bytes):
|
|||||||
|
|
||||||
#### 其他功能建议?
|
#### 其他功能建议?
|
||||||
|
|
||||||
如果你有其他功能建议,或者遇到了什么功能性,操作上的问题,欢迎提交 Issue 到本项目。
|
如果你有其他功能建议,或者遇到了什么功能性,操作上的问题,欢迎提交 [Issue](https://github.com/KenanZhu/AutoLibrary/issues) 到本项目。
|
||||||
如果你有足够的开发能力,欢迎为本项目提交 PR,也可以 Fork 本项目,根据自己的需求进行修改和完善。
|
如果你有足够的开发能力,欢迎为本项目提交 [PR](https://github.com/KenanZhu/AutoLibrary/pulls) ,也可以 Fork 本项目,根据自己的需求进行修改和完善。
|
||||||
|
|
||||||
### 联系我
|
### 联系我
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -11,7 +11,7 @@ import logging
|
|||||||
import queue
|
import queue
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
import managers.log.LogManager as LogManager
|
from managers.log.LogManager import getLogger
|
||||||
|
|
||||||
|
|
||||||
class MsgBase:
|
class MsgBase:
|
||||||
@@ -54,7 +54,7 @@ class MsgBase:
|
|||||||
self._input_queue = input_queue
|
self._input_queue = input_queue
|
||||||
self._output_queue = output_queue
|
self._output_queue = output_queue
|
||||||
try:
|
try:
|
||||||
self._logger = LogManager.getLogger(self._class_name)
|
self._logger = getLogger(self._class_name)
|
||||||
except RuntimeError:
|
except RuntimeError:
|
||||||
self._logger = None
|
self._logger = None
|
||||||
|
|
||||||
|
|||||||
@@ -73,6 +73,8 @@ def _initializeWebDriverManager(
|
|||||||
def _initializeAppearance(
|
def _initializeAppearance(
|
||||||
):
|
):
|
||||||
|
|
||||||
|
logger = logInstance().getLogger("AppInitializer")
|
||||||
|
|
||||||
app = QApplication.instance()
|
app = QApplication.instance()
|
||||||
if not app:
|
if not app:
|
||||||
return
|
return
|
||||||
@@ -82,7 +84,6 @@ def _initializeAppearance(
|
|||||||
saved_custom_theme = cfg.get(CfgKey.GLOBAL.APPEARANCE.CUSTOM_THEME, "")
|
saved_custom_theme = cfg.get(CfgKey.GLOBAL.APPEARANCE.CUSTOM_THEME, "")
|
||||||
app.setStyle(saved_style)
|
app.setStyle(saved_style)
|
||||||
setActiveStyle(saved_style)
|
setActiveStyle(saved_style)
|
||||||
logger = logInstance().getLogger("AppInitializer")
|
|
||||||
if saved_custom_theme:
|
if saved_custom_theme:
|
||||||
try:
|
try:
|
||||||
themeInstance().applyTheme(saved_custom_theme)
|
themeInstance().applyTheme(saved_custom_theme)
|
||||||
|
|||||||
@@ -55,9 +55,9 @@ class ALAboutDialog(QDialog, Ui_ALAboutDialog):
|
|||||||
AboutBrowser.setOpenExternalLinks(True)
|
AboutBrowser.setOpenExternalLinks(True)
|
||||||
AboutBrowser.setLineWrapMode(QTextBrowser.LineWrapMode.NoWrap)
|
AboutBrowser.setLineWrapMode(QTextBrowser.LineWrapMode.NoWrap)
|
||||||
AboutBrowser.setTextInteractionFlags(Qt.TextBrowserInteraction)
|
AboutBrowser.setTextInteractionFlags(Qt.TextBrowserInteraction)
|
||||||
BrowserFont = AboutBrowser.font()
|
browser_font = AboutBrowser.font()
|
||||||
BrowserFont.setFamilies(["Courier New", "Consolas", "Menlo", "DejaVu Sans Mono", "monospace"])
|
browser_font.setFamilies(["Courier New", "Consolas", "Menlo", "DejaVu Sans Mono", "monospace"])
|
||||||
AboutBrowser.setFont(BrowserFont)
|
AboutBrowser.setFont(browser_font)
|
||||||
self.TabWidget.addTab(AboutBrowser, "关于")
|
self.TabWidget.addTab(AboutBrowser, "关于")
|
||||||
LicenseBrowser = QTextBrowser()
|
LicenseBrowser = QTextBrowser()
|
||||||
LicenseBrowser.setHtml(self.generateLicenseText())
|
LicenseBrowser.setHtml(self.generateLicenseText())
|
||||||
@@ -135,7 +135,6 @@ THE SOFTWARE.</p>"""
|
|||||||
system = platform.system()
|
system = platform.system()
|
||||||
version = platform.version()
|
version = platform.version()
|
||||||
architecture = platform.architecture()[0]
|
architecture = platform.architecture()[0]
|
||||||
|
|
||||||
if system == "Windows":
|
if system == "Windows":
|
||||||
try:
|
try:
|
||||||
version = platform.win32_ver()[1]
|
version = platform.win32_ver()[1]
|
||||||
@@ -152,7 +151,6 @@ THE SOFTWARE.</p>"""
|
|||||||
version = f"{distro.name()} {distro.version()}"
|
version = f"{distro.name()} {distro.version()}"
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'system': system,
|
'system': system,
|
||||||
'version': version,
|
'version': version,
|
||||||
|
|||||||
+109
-109
@@ -75,54 +75,54 @@ class ALScriptHighlighter(QSyntaxHighlighter):
|
|||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self._rules = []
|
self._rules = []
|
||||||
|
|
||||||
KeywordFmt = QTextCharFormat()
|
keyword_fmt = QTextCharFormat()
|
||||||
KeywordFmt.setForeground(QColor("#569CD6"))
|
keyword_fmt.setForeground(QColor("#569CD6"))
|
||||||
KeywordFmt.setFontWeight(QFont.Weight.Bold)
|
keyword_fmt.setFontWeight(QFont.Weight.Bold)
|
||||||
for kw in [
|
for kw in [
|
||||||
"if", "elseif", "else", "end", "then",
|
"if", "elseif", "else", "end", "then",
|
||||||
"and", "or", "not",
|
"and", "or", "not",
|
||||||
"local", "function", "return", "nil",
|
"local", "function", "return", "nil",
|
||||||
]:
|
]:
|
||||||
self._rules.append((r"\b" + kw + r"\b", KeywordFmt))
|
self._rules.append((r"\b" + kw + r"\b", keyword_fmt))
|
||||||
BoolFmt = QTextCharFormat()
|
bool_fmt = QTextCharFormat()
|
||||||
BoolFmt.setForeground(QColor("#4FC1FF"))
|
bool_fmt.setForeground(QColor("#4FC1FF"))
|
||||||
BoolFmt.setFontWeight(QFont.Weight.Bold)
|
bool_fmt.setFontWeight(QFont.Weight.Bold)
|
||||||
self._rules.append((r"\btrue\b", BoolFmt))
|
self._rules.append((r"\btrue\b", bool_fmt))
|
||||||
self._rules.append((r"\bfalse\b", BoolFmt))
|
self._rules.append((r"\bfalse\b", bool_fmt))
|
||||||
CmpFmt = QTextCharFormat()
|
cmp_fmt = QTextCharFormat()
|
||||||
CmpFmt.setForeground(QColor("#C586C0"))
|
cmp_fmt.setForeground(QColor("#C586C0"))
|
||||||
CmpFmt.setFontWeight(QFont.Weight.Normal)
|
cmp_fmt.setFontWeight(QFont.Weight.Normal)
|
||||||
for op in [r"==", r"~=", r">=", r"<=", r">", r"<"]:
|
for op in [r"==", r"~=", r">=", r"<=", r">", r"<"]:
|
||||||
self._rules.append((op, CmpFmt))
|
self._rules.append((op, cmp_fmt))
|
||||||
ArithFmt = QTextCharFormat()
|
arith_fmt = QTextCharFormat()
|
||||||
ArithFmt.setForeground(QColor("#C586C0"))
|
arith_fmt.setForeground(QColor("#C586C0"))
|
||||||
ArithFmt.setFontWeight(QFont.Weight.Normal)
|
arith_fmt.setFontWeight(QFont.Weight.Normal)
|
||||||
for op in [r"\+", r"-", r"\*", r"/", r"\.\."]:
|
for op in [r"\+", r"-", r"\*", r"/", r"\.\."]:
|
||||||
self._rules.append((op, ArithFmt))
|
self._rules.append((op, arith_fmt))
|
||||||
FuncFmt = QTextCharFormat()
|
func_fmt = QTextCharFormat()
|
||||||
FuncFmt.setForeground(QColor("#DCDCAA"))
|
func_fmt.setForeground(QColor("#DCDCAA"))
|
||||||
FuncFmt.setFontWeight(QFont.Weight.Normal)
|
func_fmt.setFontWeight(QFont.Weight.Normal)
|
||||||
for fn in [ "time", "date", "datenow", "timenow", "dateadd", "timeadd"]:
|
for fn in [ "time", "date", "datenow", "timenow", "dateadd", "timeadd"]:
|
||||||
self._rules.append((r"\b" + fn + r"\b", FuncFmt))
|
self._rules.append((r"\b" + fn + r"\b", func_fmt))
|
||||||
VarFmt = QTextCharFormat()
|
var_fmt = QTextCharFormat()
|
||||||
VarFmt.setForeground(QColor("#9CDCFE"))
|
var_fmt.setForeground(QColor("#9CDCFE"))
|
||||||
VarFmt.setFontWeight(QFont.Weight.Normal)
|
var_fmt.setFontWeight(QFont.Weight.Normal)
|
||||||
var_names = [name for _, (name, _) in createAllVariablesTable().items()]
|
var_names = [name for _, (name, _) in createAllVariablesTable().items()]
|
||||||
for var in var_names:
|
for var in var_names:
|
||||||
self._rules.append((r"\b" + var + r"\b", VarFmt))
|
self._rules.append((r"\b" + var + r"\b", var_fmt))
|
||||||
StrFmt = QTextCharFormat()
|
st_fmt = QTextCharFormat()
|
||||||
StrFmt.setForeground(QColor("#CE9178"))
|
st_fmt.setForeground(QColor("#CE9178"))
|
||||||
StrFmt.setFontWeight(QFont.Weight.Normal)
|
st_fmt.setFontWeight(QFont.Weight.Normal)
|
||||||
self._rules.append((r'"[^"]*"', StrFmt))
|
self._rules.append((r'"[^"]*"', st_fmt))
|
||||||
self._rules.append((r"'[^']*'", StrFmt))
|
self._rules.append((r"'[^']*'", st_fmt))
|
||||||
NumFmt = QTextCharFormat()
|
num_fmt = QTextCharFormat()
|
||||||
NumFmt.setForeground(QColor("#B5CEA8"))
|
num_fmt.setForeground(QColor("#B5CEA8"))
|
||||||
NumFmt.setFontWeight(QFont.Weight.Normal)
|
num_fmt.setFontWeight(QFont.Weight.Normal)
|
||||||
self._rules.append((r"\b\d+(?:\.\d+)?\b", NumFmt))
|
self._rules.append((r"\b\d+(?:\.\d+)?\b", num_fmt))
|
||||||
CommentFmt = QTextCharFormat()
|
comment_fmt = QTextCharFormat()
|
||||||
CommentFmt.setForeground(QColor("#6A9955"))
|
comment_fmt.setForeground(QColor("#6A9955"))
|
||||||
CommentFmt.setFontItalic(True)
|
comment_fmt.setFontItalic(True)
|
||||||
self._rules.append((r"--[^\n]*", CommentFmt))
|
self._rules.append((r"--[^\n]*", comment_fmt))
|
||||||
|
|
||||||
def highlightBlock(
|
def highlightBlock(
|
||||||
self,
|
self,
|
||||||
@@ -189,13 +189,13 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
):
|
):
|
||||||
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self._fontSize = 21
|
self._font_size = 21
|
||||||
self._mockWidgets = {}
|
self._mock_widgets = {}
|
||||||
|
|
||||||
self.setupUi()
|
self.setupUi()
|
||||||
self.connectSignals()
|
self.connectSignals()
|
||||||
self.TextEdit.setPlainText(script)
|
self.TextEdit.setPlainText(script)
|
||||||
self._Highlighter = ALScriptHighlighter(
|
self._high_lighter = ALScriptHighlighter(
|
||||||
self.TextEdit.document()
|
self.TextEdit.document()
|
||||||
)
|
)
|
||||||
if mockData:
|
if mockData:
|
||||||
@@ -224,7 +224,7 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
self.ZoomResetBtn.setIconSize(QSize(14, 14))
|
self.ZoomResetBtn.setIconSize(QSize(14, 14))
|
||||||
self.ZoomResetBtn.setFixedSize(25, 25)
|
self.ZoomResetBtn.setFixedSize(25, 25)
|
||||||
self.ZoomResetBtn.setToolTip("重置缩放")
|
self.ZoomResetBtn.setToolTip("重置缩放")
|
||||||
self.ZoomLabel = QLabel(f"{self._fontSize}px")
|
self.ZoomLabel = QLabel(f"{self._font_size}px")
|
||||||
self.ZoomLabel.setFixedHeight(25)
|
self.ZoomLabel.setFixedHeight(25)
|
||||||
self.OrchBtn = QPushButton("编排")
|
self.OrchBtn = QPushButton("编排")
|
||||||
self.OrchBtn.setFixedSize(80, 25)
|
self.OrchBtn.setFixedSize(80, 25)
|
||||||
@@ -259,7 +259,7 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
self.TextEdit.setStyleSheet(
|
self.TextEdit.setStyleSheet(
|
||||||
"QPlainTextEdit {"
|
"QPlainTextEdit {"
|
||||||
" font-family: 'Courier New', 'Consolas', monospace;"
|
" font-family: 'Courier New', 'Consolas', monospace;"
|
||||||
f" font-size: {self._fontSize}px;"
|
f" font-size: {self._font_size}px;"
|
||||||
"}"
|
"}"
|
||||||
)
|
)
|
||||||
Layout.addWidget(self.TextEdit)
|
Layout.addWidget(self.TextEdit)
|
||||||
@@ -287,30 +287,30 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
BasicLayout.setSpacing(4)
|
BasicLayout.setSpacing(4)
|
||||||
BasicLayout.setContentsMargins(4, 4, 4, 4)
|
BasicLayout.setContentsMargins(4, 4, 4, 4)
|
||||||
BasicLayout.setAlignment(Qt.AlignLeft | Qt.AlignTop)
|
BasicLayout.setAlignment(Qt.AlignLeft | Qt.AlignTop)
|
||||||
controlButtons = [
|
control_buttons = [
|
||||||
("如果 (if...)", "if then\n \nend"),
|
("如果 (if...)", "if then\n \nend"),
|
||||||
("再如果 (elseif...)", "elseif then\n "),
|
("再如果 (elseif...)", "elseif then\n "),
|
||||||
("否则 (else)", "else"),
|
("否则 (else)", "else"),
|
||||||
("结束 (end)", "end"),
|
("结束 (end)", "end"),
|
||||||
("跳过 (pass)", "-- pass"),
|
("跳过 (pass)", "-- pass"),
|
||||||
]
|
]
|
||||||
self.addButtonsToGrid(BasicLayout, controlButtons, 0, 0, 3)
|
self.addButtonsToGrid(BasicLayout, control_buttons, 0, 0, 3)
|
||||||
assignButtons = [
|
assign_buttons = [
|
||||||
("赋值 (=)", " = "),
|
("赋值 (=)", " = "),
|
||||||
]
|
]
|
||||||
self.addButtonsToGrid(BasicLayout, assignButtons, 1, 2, 3)
|
self.addButtonsToGrid(BasicLayout, assign_buttons, 1, 2, 3)
|
||||||
TabWidget.addTab(BasicWidget, "基本语法")
|
TabWidget.addTab(BasicWidget, "基本语法")
|
||||||
OperatorWidget = QWidget()
|
OperatorWidget = QWidget()
|
||||||
OperatorLayout = QGridLayout(OperatorWidget)
|
OperatorLayout = QGridLayout(OperatorWidget)
|
||||||
OperatorLayout.setSpacing(4)
|
OperatorLayout.setSpacing(4)
|
||||||
OperatorLayout.setContentsMargins(4, 4, 4, 4)
|
OperatorLayout.setContentsMargins(4, 4, 4, 4)
|
||||||
OperatorLayout.setAlignment(Qt.AlignLeft | Qt.AlignTop)
|
OperatorLayout.setAlignment(Qt.AlignLeft | Qt.AlignTop)
|
||||||
arithmeticButtons = [
|
arithmetic_buttons = [
|
||||||
("加 (+)", " + "),
|
("加 (+)", " + "),
|
||||||
("减 (-)", " - "),
|
("减 (-)", " - "),
|
||||||
]
|
]
|
||||||
self.addButtonsToGrid(OperatorLayout, arithmeticButtons, 0, 0, 3)
|
self.addButtonsToGrid(OperatorLayout, arithmetic_buttons, 0, 0, 3)
|
||||||
compareButtons = [
|
compare_buttons = [
|
||||||
("等于 (==)", " == "),
|
("等于 (==)", " == "),
|
||||||
("不等于 (~=)", " ~= "),
|
("不等于 (~=)", " ~= "),
|
||||||
("大于 (>)", " > "),
|
("大于 (>)", " > "),
|
||||||
@@ -318,7 +318,7 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
("大于等于 (>=)", " >= "),
|
("大于等于 (>=)", " >= "),
|
||||||
("小于等于 (<=)", " <= "),
|
("小于等于 (<=)", " <= "),
|
||||||
]
|
]
|
||||||
self.addButtonsToGrid(OperatorLayout, compareButtons, 1, 0, 3)
|
self.addButtonsToGrid(OperatorLayout, compare_buttons, 1, 0, 3)
|
||||||
logic_buttons = [
|
logic_buttons = [
|
||||||
("且 (and)", " and "),
|
("且 (and)", " and "),
|
||||||
("或 (or)", " or "),
|
("或 (or)", " or "),
|
||||||
@@ -335,40 +335,40 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
("假 (false)", "false"),
|
("假 (false)", "false"),
|
||||||
]
|
]
|
||||||
self.addButtonsToGrid(LiteralLayout, bool_buttons, 0, 0, 3)
|
self.addButtonsToGrid(LiteralLayout, bool_buttons, 0, 0, 3)
|
||||||
dateTimeButtons = [
|
date_time_buttons = [
|
||||||
("日期", 'date(2026, 1, 1)'),
|
("日期", 'date(2026, 1, 1)'),
|
||||||
("时间", 'time(0, 0)'),
|
("时间", 'time(0, 0)'),
|
||||||
]
|
]
|
||||||
self.addButtonsToGrid(LiteralLayout, dateTimeButtons, 1, 0, 3)
|
self.addButtonsToGrid(LiteralLayout, date_time_buttons, 1, 0, 3)
|
||||||
hintButtons = [
|
hint_buttons = [
|
||||||
("字符串", '"请输入文本"'),
|
("字符串", '"请输入文本"'),
|
||||||
("数字", "123"),
|
("数字", "123"),
|
||||||
("注释", "-- 请输入注释"),
|
("注释", "-- 请输入注释"),
|
||||||
]
|
]
|
||||||
self.addButtonsToGrid(LiteralLayout, hintButtons, 2, 0, 3)
|
self.addButtonsToGrid(LiteralLayout, hint_buttons, 2, 0, 3)
|
||||||
TabWidget.addTab(LiteralWidget, "字面量")
|
TabWidget.addTab(LiteralWidget, "字面量")
|
||||||
VarWidget = QWidget()
|
VarWidget = QWidget()
|
||||||
VarLayout = QGridLayout(VarWidget)
|
VarLayout = QGridLayout(VarWidget)
|
||||||
VarLayout.setSpacing(4)
|
VarLayout.setSpacing(4)
|
||||||
VarLayout.setContentsMargins(4, 4, 4, 4)
|
VarLayout.setContentsMargins(4, 4, 4, 4)
|
||||||
VarLayout.setAlignment(Qt.AlignLeft | Qt.AlignTop)
|
VarLayout.setAlignment(Qt.AlignLeft | Qt.AlignTop)
|
||||||
varButtons = [
|
var_buttons = [
|
||||||
(display_name, name) for display_name, (name, _) in createAllVariablesTable().items()
|
(display_name, name) for display_name, (name, _) in createAllVariablesTable().items()
|
||||||
]
|
]
|
||||||
self.addButtonsToGrid(VarLayout, varButtons, 0, 0, 3)
|
self.addButtonsToGrid(VarLayout, var_buttons, 0, 0, 3)
|
||||||
TabWidget.addTab(VarWidget, "变量")
|
TabWidget.addTab(VarWidget, "变量")
|
||||||
FuncWidget = QWidget()
|
FuncWidget = QWidget()
|
||||||
FuncLayout = QGridLayout(FuncWidget)
|
FuncLayout = QGridLayout(FuncWidget)
|
||||||
FuncLayout.setSpacing(4)
|
FuncLayout.setSpacing(4)
|
||||||
FuncLayout.setContentsMargins(4, 4, 4, 4)
|
FuncLayout.setContentsMargins(4, 4, 4, 4)
|
||||||
FuncLayout.setAlignment(Qt.AlignLeft | Qt.AlignTop)
|
FuncLayout.setAlignment(Qt.AlignLeft | Qt.AlignTop)
|
||||||
funcButtons = [
|
func_buttons = [
|
||||||
("datenow()", "datenow()", "返回当前日期的 Unix 时间戳"),
|
("datenow()", "datenow()", "返回当前日期的 Unix 时间戳"),
|
||||||
("timenow()", "timenow()", "返回当前时间在一天中的分钟数"),
|
("timenow()", "timenow()", "返回当前时间在一天中的分钟数"),
|
||||||
("dateadd(day, n)", "dateadd(, )", "日期偏移: dateadd(日期时间戳, 天数)"),
|
("dateadd(day, n)", "dateadd(, )", "日期偏移: dateadd(日期时间戳, 天数)"),
|
||||||
("timeadd(time, n)", "timeadd(, )", "时间偏移: timeadd(分钟数, 分钟数)"),
|
("timeadd(time, n)", "timeadd(, )", "时间偏移: timeadd(分钟数, 分钟数)"),
|
||||||
]
|
]
|
||||||
for i, (text, template, tooltip) in enumerate(funcButtons):
|
for i, (text, template, tooltip) in enumerate(func_buttons):
|
||||||
Btn = QPushButton(text)
|
Btn = QPushButton(text)
|
||||||
Btn.setProperty("template", template)
|
Btn.setProperty("template", template)
|
||||||
Btn.clicked.connect(self.insertTemplate)
|
Btn.clicked.connect(self.insertTemplate)
|
||||||
@@ -419,17 +419,17 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
Form = QFormLayout(Group)
|
Form = QFormLayout(Group)
|
||||||
Form.setSpacing(4)
|
Form.setSpacing(4)
|
||||||
Form.setContentsMargins(5, 10, 5, 5)
|
Form.setContentsMargins(5, 10, 5, 5)
|
||||||
self._mockWidgets = {}
|
self._mock_widgets = {}
|
||||||
mockData = createMockTargetData()
|
mock_data = createMockTargetData()
|
||||||
for name, var_type, key_path, display_name in createTargetVarDefs():
|
for name, var_type, key_path, display_name in createTargetVarDefs():
|
||||||
d = mockData
|
d = mock_data
|
||||||
for key in key_path:
|
for key in key_path:
|
||||||
d = d[key]
|
d = d[key]
|
||||||
default = d
|
default = d
|
||||||
Widget = self.makeMockInput(var_type, default)
|
Widget = self.makeMockInput(var_type, default)
|
||||||
Label = QLabel(f"{display_name}: {name}({var_type})")
|
Label = QLabel(f"{display_name}: {name}({var_type})")
|
||||||
Form.addRow(Label, Widget)
|
Form.addRow(Label, Widget)
|
||||||
self._mockWidgets[name] = (Widget, var_type, key_path)
|
self._mock_widgets[name] = (Widget, var_type, key_path)
|
||||||
return Group
|
return Group
|
||||||
|
|
||||||
def makeMockInput(
|
def makeMockInput(
|
||||||
@@ -439,49 +439,49 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
) -> QWidget:
|
) -> QWidget:
|
||||||
|
|
||||||
if var_type == "String":
|
if var_type == "String":
|
||||||
W = QLineEdit()
|
widget = QLineEdit()
|
||||||
W.setText(str(default))
|
widget.setText(str(default))
|
||||||
return W
|
return widget
|
||||||
if var_type == "Boolean":
|
if var_type == "Boolean":
|
||||||
W = QComboBox()
|
widget = QComboBox()
|
||||||
W.addItems(["是", "否"])
|
widget.addItems(["是", "否"])
|
||||||
W.setCurrentIndex(0 if default else 1)
|
widget.setCurrentIndex(0 if default else 1)
|
||||||
return W
|
return widget
|
||||||
if var_type == "Date":
|
if var_type == "Date":
|
||||||
W = QDateEdit()
|
widget = QDateEdit()
|
||||||
W.setCalendarPopup(True)
|
widget.setCalendarPopup(True)
|
||||||
W.setDisplayFormat("yyyy-MM-dd")
|
widget.setDisplayFormat("yyyy-MM-dd")
|
||||||
W.setDate(QDate.fromString(str(default), "yyyy-MM-dd"))
|
widget.setDate(QDate.fromString(str(default), "yyyy-MM-dd"))
|
||||||
return W
|
return widget
|
||||||
if var_type == "Time":
|
if var_type == "Time":
|
||||||
W = QTimeEdit()
|
widget = QTimeEdit()
|
||||||
W.setDisplayFormat("HH:mm")
|
widget.setDisplayFormat("HH:mm")
|
||||||
W.setTime(QTime.fromString(str(default), "HH:mm"))
|
widget.setTime(QTime.fromString(str(default), "HH:mm"))
|
||||||
return W
|
return widget
|
||||||
if var_type == "Int":
|
if var_type == "Int":
|
||||||
W = QSpinBox()
|
widget = QSpinBox()
|
||||||
W.setMinimum(-999999)
|
widget.setMinimum(-999999)
|
||||||
W.setMaximum(999999)
|
widget.setMaximum(999999)
|
||||||
W.setValue(int(default) if default else 0)
|
widget.setValue(int(default) if default else 0)
|
||||||
return W
|
return widget
|
||||||
if var_type == "Float":
|
if var_type == "Float":
|
||||||
W = QDoubleSpinBox()
|
widget = QDoubleSpinBox()
|
||||||
W.setMinimum(-999999.0)
|
widget.setMinimum(-999999.0)
|
||||||
W.setMaximum(999999.0)
|
widget.setMaximum(999999.0)
|
||||||
W.setDecimals(2)
|
widget.setDecimals(2)
|
||||||
W.setValue(float(default) if default else 0.0)
|
widget.setValue(float(default) if default else 0.0)
|
||||||
return W
|
return widget
|
||||||
W = QLineEdit()
|
widget = QLineEdit()
|
||||||
W.setText(str(default))
|
widget.setText(str(default))
|
||||||
return W
|
return widget
|
||||||
|
|
||||||
def getMockData(
|
def getMockData(
|
||||||
self
|
self
|
||||||
) -> dict:
|
) -> dict:
|
||||||
|
|
||||||
data = {}
|
data = {}
|
||||||
for name, var_type, key_path, display_name in createTargetVarDefs():
|
for name, var_type, key_path, _ in createTargetVarDefs():
|
||||||
widget, _, _ = self._mockWidgets[name]
|
widget, _, _ = self._mock_widgets[name]
|
||||||
value = self.getMockValue(widget, var_type)
|
value = self.getMockValue(widget, var_type)
|
||||||
d = data
|
d = data
|
||||||
for key in key_path[:-1]:
|
for key in key_path[:-1]:
|
||||||
@@ -496,14 +496,14 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
|
|
||||||
if not data:
|
if not data:
|
||||||
return
|
return
|
||||||
for name, var_type, key_path, display_name in createTargetVarDefs():
|
for name, var_type, key_path, _ in createTargetVarDefs():
|
||||||
d = data
|
d = data
|
||||||
try:
|
try:
|
||||||
for key in key_path:
|
for key in key_path:
|
||||||
d = d[key]
|
d = d[key]
|
||||||
except (KeyError, TypeError):
|
except (KeyError, TypeError):
|
||||||
continue
|
continue
|
||||||
widget, _, _ = self._mockWidgets[name]
|
widget, _, _ = self._mock_widgets[name]
|
||||||
self.setMockValue(widget, var_type, d)
|
self.setMockValue(widget, var_type, d)
|
||||||
|
|
||||||
def getMockValue(
|
def getMockValue(
|
||||||
@@ -578,10 +578,10 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
self.TextEdit.setStyleSheet(
|
self.TextEdit.setStyleSheet(
|
||||||
"QPlainTextEdit {"
|
"QPlainTextEdit {"
|
||||||
" font-family: 'Courier New', 'Consolas', monospace;"
|
" font-family: 'Courier New', 'Consolas', monospace;"
|
||||||
f" font-size: {self._fontSize}px;"
|
f" font-size: {self._font_size}px;"
|
||||||
"}"
|
"}"
|
||||||
)
|
)
|
||||||
self.ZoomLabel.setText(f"{self._fontSize}px")
|
self.ZoomLabel.setText(f"{self._font_size}px")
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def insertTemplate(
|
def insertTemplate(
|
||||||
@@ -602,7 +602,7 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
self._fontSize = min(self._fontSize + 2, 40)
|
self._font_size = min(self._font_size + 2, 40)
|
||||||
self.updateFontSize()
|
self.updateFontSize()
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
@@ -610,7 +610,7 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
self._fontSize = max(self._fontSize - 2, 8)
|
self._font_size = max(self._font_size - 2, 8)
|
||||||
self.updateFontSize()
|
self.updateFontSize()
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
@@ -618,7 +618,7 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
self._fontSize = 21
|
self._font_size = 21
|
||||||
self.updateFontSize()
|
self.updateFontSize()
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
@@ -639,13 +639,13 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
):
|
):
|
||||||
|
|
||||||
from gui.ALAutoScriptOrchDialog import ALAutoScriptOrchDialog
|
from gui.ALAutoScriptOrchDialog import ALAutoScriptOrchDialog
|
||||||
Dlg = ALAutoScriptOrchDialog(self)
|
Dialpg = ALAutoScriptOrchDialog(self)
|
||||||
if Dlg.exec() == QDialog.DialogCode.Accepted:
|
if Dialpg.exec() == QDialog.DialogCode.Accepted:
|
||||||
script = Dlg.getScript()
|
script = Dialpg.getScript()
|
||||||
if script:
|
if script:
|
||||||
cursor = self.TextEdit.textCursor()
|
cursor = self.TextEdit.textCursor()
|
||||||
cursor.insertText(script)
|
cursor.insertText(script)
|
||||||
Dlg.deleteLater()
|
Dialpg.deleteLater()
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onDebugRun(
|
def onDebugRun(
|
||||||
@@ -679,6 +679,6 @@ class ALAutoScriptEditDialog(QDialog):
|
|||||||
if not changes:
|
if not changes:
|
||||||
QMessageBox.information(self, "调试运行", "目标变量未发生变化。")
|
QMessageBox.information(self, "调试运行", "目标变量未发生变化。")
|
||||||
return
|
return
|
||||||
Dlg = _DebugResultDialog(changes, self)
|
Dialpg = _DebugResultDialog(changes, self)
|
||||||
Dlg.exec()
|
Dialpg.exec()
|
||||||
Dlg.deleteLater()
|
Dialpg.deleteLater()
|
||||||
|
|||||||
@@ -32,16 +32,16 @@ class ConditionalBlock(QGroupBox):
|
|||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
blockIndex: int,
|
block_index: int,
|
||||||
varMgr = None,
|
var_mgr = None,
|
||||||
parent = None
|
parent = None
|
||||||
):
|
):
|
||||||
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self.blockIndex = blockIndex
|
self._block_index = block_index
|
||||||
self._varMgr = varMgr
|
self._var_mgr = var_mgr
|
||||||
self._actionWidgets = []
|
self._action_widgets = []
|
||||||
self._conditionRows = []
|
self._condition_rows = []
|
||||||
|
|
||||||
self.setupUi()
|
self.setupUi()
|
||||||
self.connectSignals()
|
self.connectSignals()
|
||||||
@@ -53,8 +53,12 @@ class ConditionalBlock(QGroupBox):
|
|||||||
|
|
||||||
self.setUpdatesEnabled(False)
|
self.setUpdatesEnabled(False)
|
||||||
self.setStyleSheet(
|
self.setStyleSheet(
|
||||||
"QGroupBox { font-weight: bold; border: 1px solid #ccc; "
|
"QGroupBox { "\
|
||||||
"margin-top: 5px; padding-top: 5px; }"
|
"font-weight: bold;"\
|
||||||
|
"border: 1px solid #ccc;"\
|
||||||
|
"margin-top: 5px;"\
|
||||||
|
"padding-top: 5px; "\
|
||||||
|
"}"
|
||||||
)
|
)
|
||||||
self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
|
self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
|
||||||
MainLayout = QVBoxLayout(self)
|
MainLayout = QVBoxLayout(self)
|
||||||
@@ -67,7 +71,7 @@ class ConditionalBlock(QGroupBox):
|
|||||||
self.TypeCombo.addItem("ELSE IF", "ELSE IF")
|
self.TypeCombo.addItem("ELSE IF", "ELSE IF")
|
||||||
self.TypeCombo.addItem("ELSE", "ELSE")
|
self.TypeCombo.addItem("ELSE", "ELSE")
|
||||||
self.TypeCombo.setFixedHeight(25)
|
self.TypeCombo.setFixedHeight(25)
|
||||||
if self.blockIndex == 0:
|
if self._block_index == 0:
|
||||||
self.TypeCombo.setEnabled(False)
|
self.TypeCombo.setEnabled(False)
|
||||||
HeaderLayout.addWidget(QLabel("类型:", self))
|
HeaderLayout.addWidget(QLabel("类型:", self))
|
||||||
HeaderLayout.addWidget(self.TypeCombo)
|
HeaderLayout.addWidget(self.TypeCombo)
|
||||||
@@ -115,10 +119,10 @@ class ConditionalBlock(QGroupBox):
|
|||||||
):
|
):
|
||||||
|
|
||||||
Row = ConditionRowFrame(
|
Row = ConditionRowFrame(
|
||||||
self._varMgr, self.blockIndex,
|
self._var_mgr, self._block_index,
|
||||||
isFirst=True, parent=self
|
is_first=True, parent=self
|
||||||
)
|
)
|
||||||
self._conditionRows.append(Row)
|
self._condition_rows.append(Row)
|
||||||
self.CondRowsLayout.addWidget(Row)
|
self.CondRowsLayout.addWidget(Row)
|
||||||
|
|
||||||
def addConditionRow(
|
def addConditionRow(
|
||||||
@@ -126,11 +130,11 @@ class ConditionalBlock(QGroupBox):
|
|||||||
):
|
):
|
||||||
|
|
||||||
Row = ConditionRowFrame(
|
Row = ConditionRowFrame(
|
||||||
self._varMgr, self.blockIndex,
|
self._var_mgr, self._block_index,
|
||||||
isFirst=False, parent=self
|
is_first=False, parent=self
|
||||||
)
|
)
|
||||||
Row.DeleteBtn.clicked.connect(lambda: self.removeConditionRow(Row))
|
Row.DeleteBtn.clicked.connect(lambda: self.removeConditionRow(Row))
|
||||||
self._conditionRows.append(Row)
|
self._condition_rows.append(Row)
|
||||||
self.CondRowsLayout.addWidget(Row)
|
self.CondRowsLayout.addWidget(Row)
|
||||||
|
|
||||||
def removeConditionRow(
|
def removeConditionRow(
|
||||||
@@ -138,8 +142,8 @@ class ConditionalBlock(QGroupBox):
|
|||||||
row: ConditionRowFrame
|
row: ConditionRowFrame
|
||||||
):
|
):
|
||||||
|
|
||||||
if row in self._conditionRows and len(self._conditionRows) > 1:
|
if row in self._condition_rows and len(self._condition_rows) > 1:
|
||||||
self._conditionRows.remove(row)
|
self._condition_rows.remove(row)
|
||||||
self.CondRowsLayout.removeWidget(row)
|
self.CondRowsLayout.removeWidget(row)
|
||||||
row.hide()
|
row.hide()
|
||||||
row.deleteLater()
|
row.deleteLater()
|
||||||
@@ -148,9 +152,9 @@ class ConditionalBlock(QGroupBox):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
Step = ActionStepFrame(self._varMgr, self.blockIndex, parent=self)
|
Step = ActionStepFrame(self._var_mgr, self._block_index, parent=self)
|
||||||
Step.DeleteBtn.clicked.connect(lambda: self.removeActionStep(Step))
|
Step.DeleteBtn.clicked.connect(lambda: self.removeActionStep(Step))
|
||||||
self._actionWidgets.append(Step)
|
self._action_widgets.append(Step)
|
||||||
self.ActionsLayout.addWidget(Step)
|
self.ActionsLayout.addWidget(Step)
|
||||||
|
|
||||||
def removeActionStep(
|
def removeActionStep(
|
||||||
@@ -158,8 +162,8 @@ class ConditionalBlock(QGroupBox):
|
|||||||
step: ActionStepFrame
|
step: ActionStepFrame
|
||||||
):
|
):
|
||||||
|
|
||||||
if step in self._actionWidgets:
|
if step in self._action_widgets:
|
||||||
self._actionWidgets.remove(step)
|
self._action_widgets.remove(step)
|
||||||
self.ActionsLayout.removeWidget(step)
|
self.ActionsLayout.removeWidget(step)
|
||||||
step.hide()
|
step.hide()
|
||||||
step.deleteLater()
|
step.deleteLater()
|
||||||
@@ -174,19 +178,19 @@ class ConditionalBlock(QGroupBox):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
return list(self._conditionRows)
|
return list(self._condition_rows)
|
||||||
|
|
||||||
def getActionSteps(
|
def getActionSteps(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
return list(self._actionWidgets)
|
return list(self._action_widgets)
|
||||||
|
|
||||||
def countActionSteps(
|
def countActionSteps(
|
||||||
self
|
self
|
||||||
) -> int:
|
) -> int:
|
||||||
|
|
||||||
return len(self._actionWidgets)
|
return len(self._action_widgets)
|
||||||
|
|
||||||
def toScript(
|
def toScript(
|
||||||
self
|
self
|
||||||
@@ -195,48 +199,48 @@ class ConditionalBlock(QGroupBox):
|
|||||||
Generate Lua script lines for this conditional block.
|
Generate Lua script lines for this conditional block.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
blockType = self.getBlockType()
|
block_type = self.getBlockType()
|
||||||
lines = []
|
lines = []
|
||||||
if blockType in ("IF", "ELSE IF"):
|
if block_type in ("IF", "ELSE IF"):
|
||||||
condTexts = [
|
cond_texts = [
|
||||||
r.toScript() for r in self._conditionRows if r.toScript()
|
r.toScript() for r in self._condition_rows if r.toScript()
|
||||||
]
|
]
|
||||||
if not condTexts:
|
if not cond_texts:
|
||||||
condTexts = ["true"]
|
cond_texts = ["true"]
|
||||||
if len(condTexts) == 1:
|
if len(cond_texts) == 1:
|
||||||
combined = condTexts[0]
|
combined = cond_texts[0]
|
||||||
else:
|
else:
|
||||||
parts = []
|
parts = []
|
||||||
for i, ct in enumerate(condTexts):
|
for i, ct in enumerate(cond_texts):
|
||||||
if i > 0:
|
if i > 0:
|
||||||
logic = self._conditionRows[i].getLogic() or "and"
|
logic = self._condition_rows[i].getLogic() or "and"
|
||||||
parts.append(f" {logic} ")
|
parts.append(f" {logic} ")
|
||||||
parts.append(f"({ct})")
|
parts.append(f"({ct})")
|
||||||
combined = "".join(parts)
|
combined = "".join(parts)
|
||||||
if blockType == "IF":
|
if block_type == "IF":
|
||||||
lines.append(f"if {combined} then")
|
lines.append(f"if {combined} then")
|
||||||
else:
|
else:
|
||||||
lines.append(f"elseif {combined} then")
|
lines.append(f"elseif {combined} then")
|
||||||
else:
|
else:
|
||||||
lines.append("else")
|
lines.append("else")
|
||||||
for step in self._actionWidgets:
|
for step in self._action_widgets:
|
||||||
scriptLine = step.toScript()
|
script_line = step.toScript()
|
||||||
if scriptLine:
|
if script_line:
|
||||||
lines.append(scriptLine)
|
lines.append(script_line)
|
||||||
return lines
|
return lines
|
||||||
|
|
||||||
def refreshVarCombos(
|
def refreshVarCombos(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
for row in self._conditionRows:
|
for row in self._condition_rows:
|
||||||
row.refreshVarCombos()
|
row.refreshVarCombos()
|
||||||
for step in self._actionWidgets:
|
for step in self._action_widgets:
|
||||||
step.refreshVarCombos()
|
step.refreshVarCombos()
|
||||||
|
|
||||||
def setPrevBlockType(
|
def setPrevBlockType(
|
||||||
self,
|
self,
|
||||||
prevType: str | None
|
prev_type: str | None
|
||||||
):
|
):
|
||||||
|
|
||||||
model = self.TypeCombo.model()
|
model = self.TypeCombo.model()
|
||||||
@@ -247,19 +251,19 @@ class ConditionalBlock(QGroupBox):
|
|||||||
if idx < 0:
|
if idx < 0:
|
||||||
continue
|
continue
|
||||||
item = model.item(idx)
|
item = model.item(idx)
|
||||||
shouldEnable = prevType != "ELSE"
|
should_enable = prev_type != "ELSE"
|
||||||
item.setEnabled(shouldEnable)
|
item.setEnabled(should_enable)
|
||||||
if prevType == "ELSE" and self.TypeCombo.currentData() in ("ELSE IF", "ELSE"):
|
if prev_type == "ELSE" and self.TypeCombo.currentData() in ("ELSE IF", "ELSE"):
|
||||||
self.TypeCombo.setCurrentIndex(0)
|
self.TypeCombo.setCurrentIndex(0)
|
||||||
|
|
||||||
@Slot(int)
|
@Slot(int)
|
||||||
def onTypeChanged(
|
def onTypeChanged(
|
||||||
self,
|
self,
|
||||||
_idx
|
idx: int
|
||||||
):
|
):
|
||||||
|
|
||||||
isCond = self.TypeCombo.currentData() in ("IF", "ELSE IF")
|
is_cond = self.TypeCombo.currentData() in ("IF", "ELSE IF")
|
||||||
self.ConditionWidget.setVisible(isCond)
|
self.ConditionWidget.setVisible(is_cond)
|
||||||
self.ActionLabel.setText(
|
self.ActionLabel.setText(
|
||||||
"执行步骤:" if isCond else "ELSE 执行步骤:"
|
"执行步骤:" if is_cond else "ELSE 执行步骤:"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ class ALAutoScriptOrchDialog(QDialog):
|
|||||||
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self._blocks = []
|
self._blocks = []
|
||||||
self._varMgr = VariableManager(self)
|
self._var_mgr = VariableManager(self)
|
||||||
|
|
||||||
self.setupUi()
|
self.setupUi()
|
||||||
self.connectSignals()
|
self.connectSignals()
|
||||||
@@ -91,7 +91,7 @@ class ALAutoScriptOrchDialog(QDialog):
|
|||||||
):
|
):
|
||||||
|
|
||||||
Block = ConditionalBlock(
|
Block = ConditionalBlock(
|
||||||
len(self._blocks), self._varMgr, parent=self
|
len(self._blocks), self._var_mgr, parent=self
|
||||||
)
|
)
|
||||||
Block.DeleteBlockBtn.clicked.connect(lambda: self.removeBlock(Block))
|
Block.DeleteBlockBtn.clicked.connect(lambda: self.removeBlock(Block))
|
||||||
Block.TypeCombo.currentIndexChanged.connect(self.updateBlockTypeRestrictions)
|
Block.TypeCombo.currentIndexChanged.connect(self.updateBlockTypeRestrictions)
|
||||||
|
|||||||
@@ -46,11 +46,11 @@ def getTypeOrder(
|
|||||||
return [t for t, _ in VARTYPE_INFOS]
|
return [t for t, _ in VARTYPE_INFOS]
|
||||||
|
|
||||||
def getArithType(
|
def getArithType(
|
||||||
varType: str
|
var_type: str
|
||||||
) -> bool:
|
) -> bool:
|
||||||
|
|
||||||
for t, a in VARTYPE_INFOS:
|
for t, a in VARTYPE_INFOS:
|
||||||
if t == varType:
|
if t == var_type:
|
||||||
return a
|
return a
|
||||||
|
|
||||||
def getPresetVars(
|
def getPresetVars(
|
||||||
@@ -104,6 +104,7 @@ class _DateInputContainer(QWidget):
|
|||||||
):
|
):
|
||||||
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
|
|
||||||
self.setupUi()
|
self.setupUi()
|
||||||
|
|
||||||
def setupUi(
|
def setupUi(
|
||||||
@@ -113,36 +114,36 @@ class _DateInputContainer(QWidget):
|
|||||||
Layout = QHBoxLayout(self)
|
Layout = QHBoxLayout(self)
|
||||||
Layout.setContentsMargins(0, 0, 0, 0)
|
Layout.setContentsMargins(0, 0, 0, 0)
|
||||||
Layout.setSpacing(4)
|
Layout.setSpacing(4)
|
||||||
self._ModeCombo = QComboBox(self)
|
self.ModeCombo = QComboBox(self)
|
||||||
self._ModeCombo.addItem("相对日期", "relative")
|
self.ModeCombo.addItem("相对日期", "relative")
|
||||||
self._ModeCombo.addItem("绝对日期", "absolute")
|
self.ModeCombo.addItem("绝对日期", "absolute")
|
||||||
self._ModeCombo.setFixedHeight(25)
|
self.ModeCombo.setFixedHeight(25)
|
||||||
self._Stack = QStackedWidget(self)
|
self.Stack = QStackedWidget(self)
|
||||||
self._RelCombo = QComboBox(self)
|
self.RelCombo = QComboBox(self)
|
||||||
for display, data in DATE_OPTIONS:
|
for display, data in DATE_OPTIONS:
|
||||||
self._RelCombo.addItem(display, data)
|
self.RelCombo.addItem(display, data)
|
||||||
self._RelCombo.setFixedHeight(25)
|
self.RelCombo.setFixedHeight(25)
|
||||||
self._Stack.addWidget(self._RelCombo)
|
self.Stack.addWidget(self.RelCombo)
|
||||||
self._DateEdit = QDateEdit(self)
|
self.DateEdit = QDateEdit(self)
|
||||||
self._DateEdit.setDisplayFormat("yyyy-MM-dd")
|
self.DateEdit.setDisplayFormat("yyyy-MM-dd")
|
||||||
self._DateEdit.setCalendarPopup(True)
|
self.DateEdit.setCalendarPopup(True)
|
||||||
self._DateEdit.setFixedHeight(25)
|
self.DateEdit.setFixedHeight(25)
|
||||||
self._Stack.addWidget(self._DateEdit)
|
self.Stack.addWidget(self.DateEdit)
|
||||||
self._ModeCombo.currentIndexChanged.connect(
|
self.ModeCombo.currentIndexChanged.connect(
|
||||||
lambda i: self._Stack.setCurrentIndex(i)
|
lambda i: self.Stack.setCurrentIndex(i)
|
||||||
)
|
)
|
||||||
Layout.addWidget(self._ModeCombo)
|
Layout.addWidget(self.ModeCombo)
|
||||||
Layout.addWidget(self._Stack)
|
Layout.addWidget(self.Stack)
|
||||||
Layout.addStretch()
|
Layout.addStretch()
|
||||||
|
|
||||||
def getValue(
|
def getValue(
|
||||||
self
|
self
|
||||||
) -> str:
|
) -> str:
|
||||||
|
|
||||||
mode = self._ModeCombo.currentData()
|
mode = self.ModeCombo.currentData()
|
||||||
if mode == "relative":
|
if mode == "relative":
|
||||||
return self._RelCombo.currentText()
|
return self.RelCombo.currentText()
|
||||||
return self._DateEdit.date().toString("yyyy-MM-dd")
|
return self.DateEdit.date().toString("yyyy-MM-dd")
|
||||||
|
|
||||||
|
|
||||||
class _TimeInputContainer(QWidget):
|
class _TimeInputContainer(QWidget):
|
||||||
@@ -153,19 +154,25 @@ class _TimeInputContainer(QWidget):
|
|||||||
):
|
):
|
||||||
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self._TimeEdit = QTimeEdit(self)
|
|
||||||
self._TimeEdit.setDisplayFormat("HH:mm")
|
|
||||||
self._TimeEdit.setFixedHeight(25)
|
|
||||||
|
|
||||||
|
self.setupUi()
|
||||||
|
|
||||||
|
def setupUi(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.TimeEdit = QTimeEdit(self)
|
||||||
|
self.TimeEdit.setDisplayFormat("HH:mm")
|
||||||
|
self.TimeEdit.setFixedHeight(25)
|
||||||
Layout = QHBoxLayout(self)
|
Layout = QHBoxLayout(self)
|
||||||
Layout.setContentsMargins(0, 0, 0, 0)
|
Layout.setContentsMargins(0, 0, 0, 0)
|
||||||
Layout.addWidget(self._TimeEdit)
|
Layout.addWidget(self.TimeEdit)
|
||||||
|
|
||||||
def getValue(
|
def getValue(
|
||||||
self
|
self
|
||||||
) -> str:
|
) -> str:
|
||||||
|
|
||||||
return self._TimeEdit.time().toString("HH:mm")
|
return self.TimeEdit.time().toString("HH:mm")
|
||||||
|
|
||||||
|
|
||||||
class _DateOffsetContainer(QWidget):
|
class _DateOffsetContainer(QWidget):
|
||||||
@@ -176,19 +183,25 @@ class _DateOffsetContainer(QWidget):
|
|||||||
):
|
):
|
||||||
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self._SpinBox = QSpinBox(self)
|
|
||||||
self._SpinBox.setRange(0, 99999)
|
|
||||||
self._SpinBox.setFixedHeight(25)
|
|
||||||
self._UnitCombo = QComboBox(self)
|
|
||||||
for display, data in DATE_OFFSET_OPTIONS:
|
|
||||||
self._UnitCombo.addItem(display, data)
|
|
||||||
self._UnitCombo.setFixedHeight(25)
|
|
||||||
|
|
||||||
|
self.setupUi()
|
||||||
|
|
||||||
|
def setupUi(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.SpinBox = QSpinBox(self)
|
||||||
|
self.SpinBox.setRange(0, 99999)
|
||||||
|
self.SpinBox.setFixedHeight(25)
|
||||||
|
self.UnitCombo = QComboBox(self)
|
||||||
|
for display, data in DATE_OFFSET_OPTIONS:
|
||||||
|
self.UnitCombo.addItem(display, data)
|
||||||
|
self.UnitCombo.setFixedHeight(25)
|
||||||
Layout = QHBoxLayout(self)
|
Layout = QHBoxLayout(self)
|
||||||
Layout.setContentsMargins(0, 0, 0, 0)
|
Layout.setContentsMargins(0, 0, 0, 0)
|
||||||
Layout.setSpacing(4)
|
Layout.setSpacing(4)
|
||||||
Layout.addWidget(self._SpinBox)
|
Layout.addWidget(self.SpinBox)
|
||||||
Layout.addWidget(self._UnitCombo)
|
Layout.addWidget(self.UnitCombo)
|
||||||
Layout.addStretch()
|
Layout.addStretch()
|
||||||
|
|
||||||
def getValue(
|
def getValue(
|
||||||
@@ -201,8 +214,8 @@ class _DateOffsetContainer(QWidget):
|
|||||||
self
|
self
|
||||||
) -> int:
|
) -> int:
|
||||||
|
|
||||||
val = self._SpinBox.value()
|
val = self.SpinBox.value()
|
||||||
unit = self._UnitCombo.currentData()
|
unit = self.UnitCombo.currentData()
|
||||||
if unit == "weeks":
|
if unit == "weeks":
|
||||||
return val*7
|
return val*7
|
||||||
if unit == "months":
|
if unit == "months":
|
||||||
@@ -220,14 +233,20 @@ class _TimeOffsetContainer(QWidget):
|
|||||||
):
|
):
|
||||||
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self._SpinBox = QSpinBox(self)
|
|
||||||
self._SpinBox.setRange(0, 99999)
|
|
||||||
self._SpinBox.setSuffix(" 小时")
|
|
||||||
self._SpinBox.setFixedHeight(25)
|
|
||||||
|
|
||||||
|
self.setupUi()
|
||||||
|
|
||||||
|
def setupUi(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.SpinBox = QSpinBox(self)
|
||||||
|
self.SpinBox.setRange(0, 99999)
|
||||||
|
self.SpinBox.setSuffix(" 小时")
|
||||||
|
self.SpinBox.setFixedHeight(25)
|
||||||
Layout = QHBoxLayout(self)
|
Layout = QHBoxLayout(self)
|
||||||
Layout.setContentsMargins(0, 0, 0, 0)
|
Layout.setContentsMargins(0, 0, 0, 0)
|
||||||
Layout.addWidget(self._SpinBox)
|
Layout.addWidget(self.SpinBox)
|
||||||
|
|
||||||
def getValue(
|
def getValue(
|
||||||
self
|
self
|
||||||
@@ -239,7 +258,7 @@ class _TimeOffsetContainer(QWidget):
|
|||||||
self
|
self
|
||||||
) -> int:
|
) -> int:
|
||||||
|
|
||||||
return self._SpinBox.value()
|
return self.SpinBox.value()
|
||||||
|
|
||||||
|
|
||||||
class VariableManager(QObject):
|
class VariableManager(QObject):
|
||||||
@@ -251,7 +270,7 @@ class VariableManager(QObject):
|
|||||||
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self._vars = []
|
self._vars = []
|
||||||
self._nameMap = {}
|
self._name_map = {}
|
||||||
|
|
||||||
self.initPresetVars()
|
self.initPresetVars()
|
||||||
|
|
||||||
@@ -262,21 +281,21 @@ class VariableManager(QObject):
|
|||||||
for p in getPresetVars():
|
for p in getPresetVars():
|
||||||
entry = {"name": p["name"], "type": p["type"], "display": p["display"]}
|
entry = {"name": p["name"], "type": p["type"], "display": p["display"]}
|
||||||
self._vars.append(entry)
|
self._vars.append(entry)
|
||||||
self._nameMap[p["name"]] = entry
|
self._name_map[p["name"]] = entry
|
||||||
|
|
||||||
def getInfoByName(
|
def getInfoByName(
|
||||||
self,
|
self,
|
||||||
name: str
|
name: str
|
||||||
):
|
):
|
||||||
|
|
||||||
return self._nameMap.get(name.upper().strip())
|
return self._name_map.get(name.upper().strip())
|
||||||
|
|
||||||
def populateCombo(
|
def populateCombo(
|
||||||
self,
|
self,
|
||||||
combo: QComboBox
|
combo: QComboBox
|
||||||
):
|
):
|
||||||
|
|
||||||
currentData = combo.currentData()
|
current_data = combo.currentData()
|
||||||
combo.blockSignals(True)
|
combo.blockSignals(True)
|
||||||
combo.clear()
|
combo.clear()
|
||||||
for entry in self._vars:
|
for entry in self._vars:
|
||||||
@@ -284,10 +303,10 @@ class VariableManager(QObject):
|
|||||||
entry["display"],
|
entry["display"],
|
||||||
(entry["name"], entry["type"])
|
(entry["name"], entry["type"])
|
||||||
)
|
)
|
||||||
if currentData:
|
if current_data:
|
||||||
for i in range(combo.count()):
|
for i in range(combo.count()):
|
||||||
d = combo.itemData(i)
|
d = combo.itemData(i)
|
||||||
if d and d[0] == currentData[0]:
|
if d and d[0] == current_data[0]:
|
||||||
combo.setCurrentIndex(i)
|
combo.setCurrentIndex(i)
|
||||||
break
|
break
|
||||||
combo.blockSignals(False)
|
combo.blockSignals(False)
|
||||||
@@ -299,40 +318,40 @@ def makeValueWidget(
|
|||||||
) -> QWidget:
|
) -> QWidget:
|
||||||
|
|
||||||
if var_type == "Int":
|
if var_type == "Int":
|
||||||
w = QSpinBox(parent)
|
Widget = QSpinBox(parent)
|
||||||
w.setRange(-999999, 999999)
|
Widget.setRange(-999999, 999999)
|
||||||
w.setFixedHeight(25)
|
Widget.setFixedHeight(25)
|
||||||
w.setMinimumWidth(100)
|
Widget.setMinimumWidth(100)
|
||||||
return w
|
return Widget
|
||||||
if var_type == "Float":
|
if var_type == "Float":
|
||||||
w = QDoubleSpinBox(parent)
|
Widget = QDoubleSpinBox(parent)
|
||||||
w.setRange(-999999.0, 999999.0)
|
Widget.setRange(-999999.0, 999999.0)
|
||||||
w.setDecimals(2)
|
Widget.setDecimals(2)
|
||||||
w.setFixedHeight(25)
|
Widget.setFixedHeight(25)
|
||||||
w.setMinimumWidth(100)
|
Widget.setMinimumWidth(100)
|
||||||
return w
|
return Widget
|
||||||
if var_type == "String":
|
if var_type == "String":
|
||||||
w = QLineEdit(parent)
|
Widget = QLineEdit(parent)
|
||||||
w.setPlaceholderText("输入值")
|
Widget.setPlaceholderText("输入值")
|
||||||
w.setFixedHeight(25)
|
Widget.setFixedHeight(25)
|
||||||
w.setMinimumWidth(120)
|
Widget.setMinimumWidth(120)
|
||||||
return w
|
return Widget
|
||||||
if var_type == "Boolean":
|
if var_type == "Boolean":
|
||||||
w = QComboBox(parent)
|
Widget = QComboBox(parent)
|
||||||
w.addItem("是 (true)", "true")
|
Widget.addItem("是 (true)", "true")
|
||||||
w.addItem("否 (false)", "false")
|
Widget.addItem("否 (false)", "false")
|
||||||
w.setFixedHeight(25)
|
Widget.setFixedHeight(25)
|
||||||
w.setMinimumWidth(100)
|
Widget.setMinimumWidth(100)
|
||||||
return w
|
return Widget
|
||||||
if var_type == "Date":
|
if var_type == "Date":
|
||||||
return _DateInputContainer(parent)
|
return _DateInputContainer(parent)
|
||||||
if var_type == "Time":
|
if var_type == "Time":
|
||||||
return _TimeInputContainer(parent)
|
return _TimeInputContainer(parent)
|
||||||
w = QLineEdit(parent)
|
Widget = QLineEdit(parent)
|
||||||
w.setPlaceholderText("输入值")
|
Widget.setPlaceholderText("输入值")
|
||||||
w.setFixedHeight(25)
|
Widget.setFixedHeight(25)
|
||||||
w.setMinimumWidth(120)
|
Widget.setMinimumWidth(120)
|
||||||
return w
|
return Widget
|
||||||
|
|
||||||
def makeOffsetWidget(
|
def makeOffsetWidget(
|
||||||
var_type: str,
|
var_type: str,
|
||||||
@@ -340,35 +359,35 @@ def makeOffsetWidget(
|
|||||||
) -> QWidget:
|
) -> QWidget:
|
||||||
|
|
||||||
if var_type == "Int":
|
if var_type == "Int":
|
||||||
w = QSpinBox(parent)
|
Widget = QSpinBox(parent)
|
||||||
w.setRange(-999999, 999999)
|
Widget.setRange(-999999, 999999)
|
||||||
w.setFixedHeight(25)
|
Widget.setFixedHeight(25)
|
||||||
w.setMinimumWidth(100)
|
Widget.setMinimumWidth(100)
|
||||||
return w
|
return Widget
|
||||||
if var_type == "Float":
|
if var_type == "Float":
|
||||||
w = QDoubleSpinBox(parent)
|
Widget = QDoubleSpinBox(parent)
|
||||||
w.setRange(-999999.0, 999999.0)
|
Widget.setRange(-999999.0, 999999.0)
|
||||||
w.setDecimals(2)
|
Widget.setDecimals(2)
|
||||||
w.setFixedHeight(25)
|
Widget.setFixedHeight(25)
|
||||||
w.setMinimumWidth(100)
|
Widget.setMinimumWidth(100)
|
||||||
return w
|
return Widget
|
||||||
if var_type == "Date":
|
if var_type == "Date":
|
||||||
return _DateOffsetContainer(parent)
|
return _DateOffsetContainer(parent)
|
||||||
if var_type == "Time":
|
if var_type == "Time":
|
||||||
return _TimeOffsetContainer(parent)
|
return _TimeOffsetContainer(parent)
|
||||||
w = QLabel("(不支持该操作)", parent)
|
Widget = QLabel("(不支持该操作)", parent)
|
||||||
w.setFixedHeight(25)
|
Widget.setFixedHeight(25)
|
||||||
return w
|
return Widget
|
||||||
|
|
||||||
def makeVarRefCombo(
|
def makeVarRefCombo(
|
||||||
parent: QWidget = None
|
parent: QWidget = None
|
||||||
) -> QComboBox:
|
) -> QComboBox:
|
||||||
|
|
||||||
Cb = QComboBox(parent)
|
ComboBox = QComboBox(parent)
|
||||||
Cb.setFixedHeight(25)
|
ComboBox.setFixedHeight(25)
|
||||||
Cb.setMinimumWidth(120)
|
ComboBox.setMinimumWidth(120)
|
||||||
Cb.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
|
ComboBox.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
|
||||||
return Cb
|
return ComboBox
|
||||||
|
|
||||||
def makeComboWidget(
|
def makeComboWidget(
|
||||||
items,
|
items,
|
||||||
@@ -376,12 +395,12 @@ def makeComboWidget(
|
|||||||
parent: QWidget = None
|
parent: QWidget = None
|
||||||
) -> QComboBox:
|
) -> QComboBox:
|
||||||
|
|
||||||
Cb = QComboBox(parent)
|
ComboBox = QComboBox(parent)
|
||||||
for display, data in items:
|
for display, data in items:
|
||||||
Cb.addItem(display, data)
|
ComboBox.addItem(display, data)
|
||||||
Cb.setFixedHeight(25)
|
ComboBox.setFixedHeight(25)
|
||||||
Cb.setMinimumWidth(min_width)
|
ComboBox.setMinimumWidth(min_width)
|
||||||
return Cb
|
return ComboBox
|
||||||
|
|
||||||
def makeLabel(
|
def makeLabel(
|
||||||
text: str,
|
text: str,
|
||||||
@@ -389,30 +408,30 @@ def makeLabel(
|
|||||||
width: int = None
|
width: int = None
|
||||||
) -> QLabel:
|
) -> QLabel:
|
||||||
|
|
||||||
Lbl = QLabel(text, parent)
|
Label = QLabel(text, parent)
|
||||||
Lbl.setFixedHeight(25)
|
Label.setFixedHeight(25)
|
||||||
if width:
|
if width:
|
||||||
Lbl.setFixedWidth(width)
|
Label.setFixedWidth(width)
|
||||||
return Lbl
|
return Label
|
||||||
|
|
||||||
def getValueFromWidget(
|
def getValueFromWidget(
|
||||||
w: QWidget
|
widget: QWidget
|
||||||
) -> str:
|
) -> str:
|
||||||
|
|
||||||
if hasattr(w, "getValue"):
|
if hasattr(widget, "getValue"):
|
||||||
return w.getValue()
|
return widget.getValue()
|
||||||
if isinstance(w, QTimeEdit):
|
if isinstance(widget, QTimeEdit):
|
||||||
return w.time().toString("HH:mm")
|
return widget.time().toString("HH:mm")
|
||||||
if isinstance(w, QDateEdit):
|
if isinstance(widget, QDateEdit):
|
||||||
return w.date().toString("yyyy-MM-dd")
|
return widget.date().toString("yyyy-MM-dd")
|
||||||
if isinstance(w, QComboBox):
|
if isinstance(widget, QComboBox):
|
||||||
return w.currentData() or w.currentText()
|
return widget.currentData() or widget.currentText()
|
||||||
if isinstance(w, QSpinBox):
|
if isinstance(widget, QSpinBox):
|
||||||
return str(w.value())
|
return str(widget.value())
|
||||||
if isinstance(w, QDoubleSpinBox):
|
if isinstance(widget, QDoubleSpinBox):
|
||||||
return str(w.value())
|
return str(widget.value())
|
||||||
if isinstance(w, QLineEdit):
|
if isinstance(widget, QLineEdit):
|
||||||
return w.text()
|
return widget.text()
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
def encodeValueStr(
|
def encodeValueStr(
|
||||||
|
|||||||
@@ -42,18 +42,18 @@ class ConditionRowFrame(QFrame):
|
|||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
varMgr,
|
var_mgr,
|
||||||
parentBlockIndex: int = 0,
|
parent_block_index: int = 0,
|
||||||
isFirst: bool = False,
|
is_first: bool = False,
|
||||||
parent = None
|
parent = None
|
||||||
):
|
):
|
||||||
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self._varMgr = varMgr
|
self._var_mgr = var_mgr
|
||||||
self._blockIndex = parentBlockIndex
|
self._block_index = parent_block_index
|
||||||
self._isFirst = isFirst
|
self._is_first = is_first
|
||||||
self._isBoolMode = False
|
self._is_bool_mode = False
|
||||||
self._rawRhsExpr = ""
|
self._raw_rhs_expr = ""
|
||||||
|
|
||||||
self.setupUi()
|
self.setupUi()
|
||||||
self.connectSignals()
|
self.connectSignals()
|
||||||
@@ -69,7 +69,7 @@ class ConditionRowFrame(QFrame):
|
|||||||
Layout = QHBoxLayout(self)
|
Layout = QHBoxLayout(self)
|
||||||
Layout.setContentsMargins(2, 2, 2, 2)
|
Layout.setContentsMargins(2, 2, 2, 2)
|
||||||
Layout.setSpacing(4)
|
Layout.setSpacing(4)
|
||||||
if self._isFirst:
|
if self._is_first:
|
||||||
self.LogicCombo = None
|
self.LogicCombo = None
|
||||||
else:
|
else:
|
||||||
self.LogicCombo = makeComboWidget(LOGIC_OPTIONS, min_width=110, parent=self)
|
self.LogicCombo = makeComboWidget(LOGIC_OPTIONS, min_width=110, parent=self)
|
||||||
@@ -82,11 +82,11 @@ class ConditionRowFrame(QFrame):
|
|||||||
Layout.addWidget(self.LeftVarCombo)
|
Layout.addWidget(self.LeftVarCombo)
|
||||||
self.OpCombo = makeComboWidget(COMPARE_OPTIONS, min_width=80, parent=self)
|
self.OpCombo = makeComboWidget(COMPARE_OPTIONS, min_width=80, parent=self)
|
||||||
Layout.addWidget(self.OpCombo)
|
Layout.addWidget(self.OpCombo)
|
||||||
self._CompTypeCombo = makeComboWidget([
|
self.CompTypeCombo = makeComboWidget([
|
||||||
("特定值", "literal"),
|
("特定值", "literal"),
|
||||||
("变量", "variable"),
|
("变量", "variable"),
|
||||||
], min_width=70, parent=self)
|
], min_width=70, parent=self)
|
||||||
Layout.addWidget(self._CompTypeCombo)
|
Layout.addWidget(self.CompTypeCombo)
|
||||||
self.RhsStack = QStackedWidget(self)
|
self.RhsStack = QStackedWidget(self)
|
||||||
self.RhsStack.setFixedHeight(25)
|
self.RhsStack.setFixedHeight(25)
|
||||||
self.initLiteralStack()
|
self.initLiteralStack()
|
||||||
@@ -94,7 +94,7 @@ class ConditionRowFrame(QFrame):
|
|||||||
self.RhsStack.addWidget(self.RhsVarCombo)
|
self.RhsStack.addWidget(self.RhsVarCombo)
|
||||||
self.RhsStack.setCurrentIndex(0)
|
self.RhsStack.setCurrentIndex(0)
|
||||||
Layout.addWidget(self.RhsStack)
|
Layout.addWidget(self.RhsStack)
|
||||||
if not self._isFirst:
|
if not self._is_first:
|
||||||
self.DeleteBtn = QPushButton("×", self)
|
self.DeleteBtn = QPushButton("×", self)
|
||||||
self.DeleteBtn.setFixedSize(25, 25)
|
self.DeleteBtn.setFixedSize(25, 25)
|
||||||
self.DeleteBtn.setStyleSheet("color: red; font-weight: bold;")
|
self.DeleteBtn.setStyleSheet("color: red; font-weight: bold;")
|
||||||
@@ -108,21 +108,21 @@ class ConditionRowFrame(QFrame):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
wasBool = self._isBoolMode
|
was_bool = self._is_bool_mode
|
||||||
boolName = None
|
bool_name = None
|
||||||
if wasBool:
|
if was_bool:
|
||||||
data = self.LeftVarCombo.currentData()
|
data = self.LeftVarCombo.currentData()
|
||||||
if data:
|
if data:
|
||||||
boolName = data[0]
|
bool_name = data[0]
|
||||||
self._varMgr.populateCombo(self.LeftVarCombo)
|
self._var_mgr.populateCombo(self.LeftVarCombo)
|
||||||
# Append boolean literal sentinels at the end
|
# Append boolean literal sentinels at the end
|
||||||
self.LeftVarCombo.insertSeparator(self.LeftVarCombo.count())
|
self.LeftVarCombo.insertSeparator(self.LeftVarCombo.count())
|
||||||
self.LeftVarCombo.addItem("true", ("true", "Boolean"))
|
self.LeftVarCombo.addItem("true", ("true", "Boolean"))
|
||||||
self.LeftVarCombo.addItem("false", ("false", "Boolean"))
|
self.LeftVarCombo.addItem("false", ("false", "Boolean"))
|
||||||
if wasBool and boolName:
|
if was_bool and bool_name:
|
||||||
for ci in range(self.LeftVarCombo.count()):
|
for ci in range(self.LeftVarCombo.count()):
|
||||||
d = self.LeftVarCombo.itemData(ci)
|
d = self.LeftVarCombo.itemData(ci)
|
||||||
if d and d[0] == boolName:
|
if d and d[0] == bool_name:
|
||||||
self.LeftVarCombo.setCurrentIndex(ci)
|
self.LeftVarCombo.setCurrentIndex(ci)
|
||||||
break
|
break
|
||||||
|
|
||||||
@@ -130,7 +130,7 @@ class ConditionRowFrame(QFrame):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
self._varMgr.populateCombo(self.RhsVarCombo)
|
self._var_mgr.populateCombo(self.RhsVarCombo)
|
||||||
|
|
||||||
def initLiteralStack(
|
def initLiteralStack(
|
||||||
self
|
self
|
||||||
@@ -138,12 +138,12 @@ class ConditionRowFrame(QFrame):
|
|||||||
|
|
||||||
self.LiteralStack = QStackedWidget(self)
|
self.LiteralStack = QStackedWidget(self)
|
||||||
self.LiteralStack.setFixedHeight(25)
|
self.LiteralStack.setFixedHeight(25)
|
||||||
self._literalWidgets = {}
|
self.literal_widgets = {}
|
||||||
for vt in getTypeOrder():
|
for vt in getTypeOrder():
|
||||||
W = makeValueWidget(vt, self.LiteralStack)
|
W = makeValueWidget(vt, self.LiteralStack)
|
||||||
self._literalWidgets[vt] = W
|
self.literal_widgets[vt] = W
|
||||||
self.LiteralStack.addWidget(W)
|
self.LiteralStack.addWidget(W)
|
||||||
self.LiteralStack.setCurrentWidget(self._literalWidgets.get("String"))
|
self.LiteralStack.setCurrentWidget(self.literal_widgets.get("String"))
|
||||||
self.RhsStack.addWidget(self.LiteralStack)
|
self.RhsStack.addWidget(self.LiteralStack)
|
||||||
|
|
||||||
def connectSignals(
|
def connectSignals(
|
||||||
@@ -151,7 +151,7 @@ class ConditionRowFrame(QFrame):
|
|||||||
):
|
):
|
||||||
|
|
||||||
self.LeftVarCombo.currentIndexChanged.connect(self.onLeftVarChanged)
|
self.LeftVarCombo.currentIndexChanged.connect(self.onLeftVarChanged)
|
||||||
self._CompTypeCombo.currentIndexChanged.connect(self.onCompTypeChanged)
|
self.CompTypeCombo.currentIndexChanged.connect(self.onCompTypeChanged)
|
||||||
|
|
||||||
def getLogic(
|
def getLogic(
|
||||||
self
|
self
|
||||||
@@ -164,16 +164,16 @@ class ConditionRowFrame(QFrame):
|
|||||||
vartype: str
|
vartype: str
|
||||||
):
|
):
|
||||||
|
|
||||||
if vartype not in self._literalWidgets:
|
if vartype not in self.literal_widgets:
|
||||||
vartype = "String"
|
vartype = "String"
|
||||||
self.LiteralStack.setCurrentWidget(self._literalWidgets[vartype])
|
self.LiteralStack.setCurrentWidget(self.literal_widgets[vartype])
|
||||||
|
|
||||||
def toScript(
|
def toScript(
|
||||||
self
|
self
|
||||||
) -> str:
|
) -> str:
|
||||||
|
|
||||||
data = self.LeftVarCombo.currentData()
|
data = self.LeftVarCombo.currentData()
|
||||||
if self._isBoolMode and data:
|
if self._is_bool_mode and data:
|
||||||
return data[0]
|
return data[0]
|
||||||
if not data:
|
if not data:
|
||||||
return ""
|
return ""
|
||||||
@@ -183,28 +183,28 @@ class ConditionRowFrame(QFrame):
|
|||||||
name = "datenow()"
|
name = "datenow()"
|
||||||
elif name == "CURRENT_TIME":
|
elif name == "CURRENT_TIME":
|
||||||
name = "timenow()"
|
name = "timenow()"
|
||||||
opSym = self.OpCombo.currentData()
|
op_sym = self.OpCombo.currentData()
|
||||||
if self._rawRhsExpr:
|
if self._raw_rhs_expr:
|
||||||
return f"{name} {opSym} {self._rawRhsExpr}"
|
return f"{name} {op_sym} {self._raw_rhs_expr}"
|
||||||
isVarRef = (self._CompTypeCombo.currentData() == "variable")
|
is_var_ref = (self.CompTypeCombo.currentData() == "variable")
|
||||||
if isVarRef:
|
if is_var_ref:
|
||||||
rd = self.RhsVarCombo.currentData()
|
rd = self.RhsVarCombo.currentData()
|
||||||
if rd:
|
if rd:
|
||||||
rhsName = rd[0]
|
rhs_name = rd[0]
|
||||||
if rhsName == "CURRENT_DATE":
|
if rhs_name == "CURRENT_DATE":
|
||||||
rhsName = "datenow()"
|
rhs_name = "datenow()"
|
||||||
elif rhsName == "CURRENT_TIME":
|
elif rhs_name == "CURRENT_TIME":
|
||||||
rhsName = "timenow()"
|
rhs_name = "timenow()"
|
||||||
return f"{name} {opSym} {rhsName}"
|
return f"{name} {op_sym} {rhs_name}"
|
||||||
rhsText = self.RhsVarCombo.currentText().strip()
|
rhs_text = self.RhsVarCombo.currentText().strip()
|
||||||
if rhsText:
|
if rhs_text:
|
||||||
return f"{name} {opSym} {rhsText}"
|
return f"{name} {op_sym} {rhs_text}"
|
||||||
return ""
|
return ""
|
||||||
w = self._literalWidgets.get(vartype)
|
w = self.literal_widgets.get(vartype)
|
||||||
if w:
|
if w:
|
||||||
rawVal = getValueFromWidget(w)
|
raw_val = getValueFromWidget(w)
|
||||||
encoded = encodeValueStr(rawVal, vartype)
|
encoded = encodeValueStr(raw_val, vartype)
|
||||||
return f"{name} {opSym} {encoded}"
|
return f"{name} {op_sym} {encoded}"
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
def refreshVarCombos(
|
def refreshVarCombos(
|
||||||
@@ -220,19 +220,19 @@ class ConditionRowFrame(QFrame):
|
|||||||
idx
|
idx
|
||||||
):
|
):
|
||||||
|
|
||||||
self._rawRhsExpr = ""
|
self._raw_rhs_expr = ""
|
||||||
if idx < 0:
|
if idx < 0:
|
||||||
return
|
return
|
||||||
data = self.LeftVarCombo.itemData(idx)
|
data = self.LeftVarCombo.itemData(idx)
|
||||||
if not data:
|
if not data:
|
||||||
return
|
return
|
||||||
name, vartype = data
|
name, vartype = data
|
||||||
isBool = name in ("true", "false")
|
is_bool = name in ("true", "false")
|
||||||
self._isBoolMode = isBool
|
self._is_bool_mode = is_bool
|
||||||
self.OpCombo.setVisible(not isBool)
|
self.OpCombo.setVisible(not is_bool)
|
||||||
self._CompTypeCombo.setVisible(not isBool)
|
self.CompTypeCombo.setVisible(not is_bool)
|
||||||
self.RhsStack.setVisible(not isBool)
|
self.RhsStack.setVisible(not is_bool)
|
||||||
if not isBool:
|
if not is_bool:
|
||||||
self.updateRHSLiteralWidget(vartype)
|
self.updateRHSLiteralWidget(vartype)
|
||||||
|
|
||||||
@Slot(int)
|
@Slot(int)
|
||||||
@@ -241,8 +241,8 @@ class ConditionRowFrame(QFrame):
|
|||||||
idx
|
idx
|
||||||
):
|
):
|
||||||
|
|
||||||
self._rawRhsExpr = ""
|
self._raw_rhs_expr = ""
|
||||||
isVar = (self._CompTypeCombo.currentData() == "variable")
|
isVar = (self.CompTypeCombo.currentData() == "variable")
|
||||||
self.RhsStack.setCurrentIndex(1 if isVar else 0)
|
self.RhsStack.setCurrentIndex(1 if isVar else 0)
|
||||||
if isVar:
|
if isVar:
|
||||||
self.populateRHSVarCombo()
|
self.populateRHSVarCombo()
|
||||||
@@ -252,15 +252,15 @@ class ActionStepFrame(QFrame):
|
|||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
varMgr,
|
var_mgr,
|
||||||
parentBlockIndex: int = 0,
|
parent_block_index: int = 0,
|
||||||
parent = None
|
parent = None
|
||||||
):
|
):
|
||||||
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self._varMgr = varMgr
|
self._var_mgr = var_mgr
|
||||||
self._blockIndex = parentBlockIndex
|
self._block_index = parent_block_index
|
||||||
self._currentTargetType = "String"
|
self._current_target_type = "String"
|
||||||
|
|
||||||
self.setupUi()
|
self.setupUi()
|
||||||
self.connectSignals()
|
self.connectSignals()
|
||||||
@@ -312,7 +312,7 @@ class ActionStepFrame(QFrame):
|
|||||||
for p in getPresetVars():
|
for p in getPresetVars():
|
||||||
if p["name"] in ("CURRENT_TIME", "CURRENT_DATE"):
|
if p["name"] in ("CURRENT_TIME", "CURRENT_DATE"):
|
||||||
continue
|
continue
|
||||||
info = self._varMgr.getInfoByName(p["name"])
|
info = self._var_mgr.getInfoByName(p["name"])
|
||||||
if info:
|
if info:
|
||||||
self.TargetCombo.addItem(
|
self.TargetCombo.addItem(
|
||||||
info["display"],
|
info["display"],
|
||||||
@@ -324,18 +324,18 @@ class ActionStepFrame(QFrame):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
self._literalWidgets = {}
|
self.literal_widgets = {}
|
||||||
self._offsetWidgets = {}
|
self.offset_widgets = {}
|
||||||
for vt in getTypeOrder():
|
for vt in getTypeOrder():
|
||||||
self._literalWidgets[vt] = makeValueWidget(vt, self.ValueStack)
|
self.literal_widgets[vt] = makeValueWidget(vt, self.ValueStack)
|
||||||
self.ValueStack.addWidget(self._literalWidgets[vt])
|
self.ValueStack.addWidget(self.literal_widgets[vt])
|
||||||
if getArithType(vt):
|
if getArithType(vt):
|
||||||
self._offsetWidgets[vt] = makeOffsetWidget(vt, self.ValueStack)
|
self.offset_widgets[vt] = makeOffsetWidget(vt, self.ValueStack)
|
||||||
self.ValueStack.addWidget(self._offsetWidgets[vt])
|
self.ValueStack.addWidget(self.offset_widgets[vt])
|
||||||
else:
|
else:
|
||||||
Lbl = QLabel("(不支持该操作)", self.ValueStack)
|
Lbl = QLabel("(不支持该操作)", self.ValueStack)
|
||||||
Lbl.setFixedHeight(25)
|
Lbl.setFixedHeight(25)
|
||||||
self._offsetWidgets[vt] = Lbl
|
self.offset_widgets[vt] = Lbl
|
||||||
self.ValueStack.addWidget(Lbl)
|
self.ValueStack.addWidget(Lbl)
|
||||||
|
|
||||||
def connectSignals(
|
def connectSignals(
|
||||||
@@ -358,14 +358,14 @@ class ActionStepFrame(QFrame):
|
|||||||
):
|
):
|
||||||
|
|
||||||
op = self.OpTypeCombo.currentData()
|
op = self.OpTypeCombo.currentData()
|
||||||
isArith = (op in ("add", "sub"))
|
is_arith = (op in ("add", "sub"))
|
||||||
actualType = self._currentTargetType
|
actual_type = self._current_target_type
|
||||||
if isArith and actualType in self._offsetWidgets:
|
if is_arith and actual_type in self.offset_widgets:
|
||||||
self.ValueStack.setCurrentWidget(self._offsetWidgets[actualType])
|
self.ValueStack.setCurrentWidget(self.offset_widgets[actual_type])
|
||||||
elif actualType in self._literalWidgets:
|
elif actual_type in self.literal_widgets:
|
||||||
self.ValueStack.setCurrentWidget(self._literalWidgets[actualType])
|
self.ValueStack.setCurrentWidget(self.literal_widgets[actual_type])
|
||||||
else:
|
else:
|
||||||
self.ValueStack.setCurrentWidget(self._literalWidgets.get("String"))
|
self.ValueStack.setCurrentWidget(self.literal_widgets.get("String"))
|
||||||
|
|
||||||
def toScript(
|
def toScript(
|
||||||
self
|
self
|
||||||
@@ -380,10 +380,10 @@ class ActionStepFrame(QFrame):
|
|||||||
return " -- pass"
|
return " -- pass"
|
||||||
if not target:
|
if not target:
|
||||||
return ""
|
return ""
|
||||||
rawVal = self.getValueRaw()
|
raw_val = self.getValueRaw()
|
||||||
vartype = self._currentTargetType
|
vartype = self._current_target_type
|
||||||
if op == "set":
|
if op == "set":
|
||||||
encoded = encodeValueStr(rawVal, vartype)
|
encoded = encodeValueStr(raw_val, vartype)
|
||||||
return f" {target} = {encoded}"
|
return f" {target} = {encoded}"
|
||||||
elif op == "add":
|
elif op == "add":
|
||||||
if vartype == "Date" and hasattr(self.ValueStack.currentWidget(), "getOffsetDays"):
|
if vartype == "Date" and hasattr(self.ValueStack.currentWidget(), "getOffsetDays"):
|
||||||
@@ -392,7 +392,7 @@ class ActionStepFrame(QFrame):
|
|||||||
if vartype == "Time" and hasattr(self.ValueStack.currentWidget(), "getOffsetHours"):
|
if vartype == "Time" and hasattr(self.ValueStack.currentWidget(), "getOffsetHours"):
|
||||||
hours = self.ValueStack.currentWidget().getOffsetHours()
|
hours = self.ValueStack.currentWidget().getOffsetHours()
|
||||||
return f" {target} = timeadd({target}, {hours})"
|
return f" {target} = timeadd({target}, {hours})"
|
||||||
return f" {target} = {target} + {rawVal}"
|
return f" {target} = {target} + {raw_val}"
|
||||||
elif op == "sub":
|
elif op == "sub":
|
||||||
if vartype == "Date" and hasattr(self.ValueStack.currentWidget(), "getOffsetDays"):
|
if vartype == "Date" and hasattr(self.ValueStack.currentWidget(), "getOffsetDays"):
|
||||||
days = self.ValueStack.currentWidget().getOffsetDays()
|
days = self.ValueStack.currentWidget().getOffsetDays()
|
||||||
@@ -400,7 +400,7 @@ class ActionStepFrame(QFrame):
|
|||||||
if vartype == "Time" and hasattr(self.ValueStack.currentWidget(), "getOffsetHours"):
|
if vartype == "Time" and hasattr(self.ValueStack.currentWidget(), "getOffsetHours"):
|
||||||
hours = self.ValueStack.currentWidget().getOffsetHours()
|
hours = self.ValueStack.currentWidget().getOffsetHours()
|
||||||
return f" {target} = timeadd({target}, -{hours})"
|
return f" {target} = timeadd({target}, -{hours})"
|
||||||
return f" {target} = {target} - {rawVal}"
|
return f" {target} = {target} - {raw_val}"
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
def getValueRaw(
|
def getValueRaw(
|
||||||
@@ -419,15 +419,15 @@ class ActionStepFrame(QFrame):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
currentData = self.TargetCombo.currentData()
|
current_data = self.TargetCombo.currentData()
|
||||||
self.populateTargetCombo()
|
self.populateTargetCombo()
|
||||||
if currentData:
|
if current_data:
|
||||||
for i in range(self.TargetCombo.count()):
|
for i in range(self.TargetCombo.count()):
|
||||||
d = self.TargetCombo.itemData(i)
|
d = self.TargetCombo.itemData(i)
|
||||||
if d and d[0] == currentData[0]:
|
if d and d[0] == current_data[0]:
|
||||||
self.TargetCombo.setCurrentIndex(i)
|
self.TargetCombo.setCurrentIndex(i)
|
||||||
break
|
break
|
||||||
self._varMgr.populateCombo(self.ExistingVarCombo)
|
self._var_mgr.populateCombo(self.ExistingVarCombo)
|
||||||
|
|
||||||
@Slot(int)
|
@Slot(int)
|
||||||
def onTargetChanged(
|
def onTargetChanged(
|
||||||
@@ -441,7 +441,7 @@ class ActionStepFrame(QFrame):
|
|||||||
if not data:
|
if not data:
|
||||||
return
|
return
|
||||||
_, vartype = data
|
_, vartype = data
|
||||||
self._currentTargetType = vartype
|
self._current_target_type = vartype
|
||||||
self.updateValueWidget()
|
self.updateValueWidget()
|
||||||
self.onValueSrcChanged(self.ValueSrcCombo.currentIndex())
|
self.onValueSrcChanged(self.ValueSrcCombo.currentIndex())
|
||||||
|
|
||||||
@@ -459,10 +459,10 @@ class ActionStepFrame(QFrame):
|
|||||||
idx
|
idx
|
||||||
):
|
):
|
||||||
|
|
||||||
isVar = (self.ValueSrcCombo.currentData() == "variable")
|
is_var = (self.ValueSrcCombo.currentData() == "variable")
|
||||||
self.ValueStack.setVisible(not isVar)
|
self.ValueStack.setVisible(not is_var)
|
||||||
self.ExistingVarCombo.setVisible(isVar)
|
self.ExistingVarCombo.setVisible(is_var)
|
||||||
if isVar:
|
if is_var:
|
||||||
self._varMgr.populateCombo(self.ExistingVarCombo)
|
self._var_mgr.populateCombo(self.ExistingVarCombo)
|
||||||
else:
|
else:
|
||||||
self.updateValueWidget()
|
self.updateValueWidget()
|
||||||
|
|||||||
@@ -0,0 +1,352 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
Copyright (c) 2026 KenanZhu.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
This software is provided "as is", without any warranty of any kind.
|
||||||
|
You may use, modify, and distribute this file under the terms of the MIT License.
|
||||||
|
See the LICENSE file for details.
|
||||||
|
"""
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from PySide6.QtCore import (
|
||||||
|
Qt,
|
||||||
|
Signal,
|
||||||
|
Slot,
|
||||||
|
QTimer
|
||||||
|
)
|
||||||
|
from PySide6.QtGui import (
|
||||||
|
QFont
|
||||||
|
)
|
||||||
|
from PySide6.QtWidgets import (
|
||||||
|
QDialog,
|
||||||
|
QHBoxLayout,
|
||||||
|
QLabel,
|
||||||
|
QListWidgetItem,
|
||||||
|
QMessageBox,
|
||||||
|
QVBoxLayout,
|
||||||
|
QWidget
|
||||||
|
)
|
||||||
|
|
||||||
|
from gui.ALBulletinWorker import ALBulletinFetchWorker
|
||||||
|
from gui.ALStatusLabel import ALStatusLabel
|
||||||
|
from gui.resources.ui.Ui_ALBulletinDialog import Ui_ALBulletinDialog
|
||||||
|
from managers.bulletin.BulletinManager import instance as bulletinInstance
|
||||||
|
|
||||||
|
|
||||||
|
class ALBulletinItemWidget(QWidget):
|
||||||
|
"""
|
||||||
|
Single bulletin item widget for the bulletin list.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
parent=None,
|
||||||
|
bulletin: dict[str, Any] = None
|
||||||
|
):
|
||||||
|
|
||||||
|
super().__init__(parent)
|
||||||
|
self.__bulletin = bulletin.copy() if bulletin else {}
|
||||||
|
self.modifyUi()
|
||||||
|
|
||||||
|
def modifyUi(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.ItemWidgetLayout = QVBoxLayout()
|
||||||
|
self.ItemWidgetLayout.setSpacing(10)
|
||||||
|
self.ItemWidgetLayout.setContentsMargins(10, 5, 10, 5)
|
||||||
|
self.BulletinTitleLayout = QHBoxLayout()
|
||||||
|
self.BulletinTitleLabel = QLabel(self.__bulletin.get("title", "无标题"))
|
||||||
|
title_font = QFont()
|
||||||
|
title_font.setBold(True)
|
||||||
|
self.BulletinTitleLabel.setFont(title_font)
|
||||||
|
self.BulletinTitleLayout.addWidget(self.BulletinTitleLabel)
|
||||||
|
if self.__bulletin.get("isNew", False):
|
||||||
|
self.NewIndicatorLabel = QLabel("新 !")
|
||||||
|
self.NewIndicatorLabel.setStyleSheet(
|
||||||
|
"color: #DC0000;"\
|
||||||
|
"font-size: 10px;"\
|
||||||
|
"font-weight: bold;"\
|
||||||
|
"font-style: italic;"
|
||||||
|
)
|
||||||
|
self.NewIndicatorLabel.setFixedSize(25, 25)
|
||||||
|
self.BulletinTitleLayout.addWidget(self.NewIndicatorLabel)
|
||||||
|
else:
|
||||||
|
self.NewIndicatorLabel = None
|
||||||
|
if self.__bulletin.get("isEdited", False):
|
||||||
|
self.BulletinIsEditedLabel = QLabel("(已编辑)")
|
||||||
|
self.BulletinIsEditedLabel.setStyleSheet(
|
||||||
|
"color: #FF9800;"\
|
||||||
|
"font-size: 10px;"
|
||||||
|
)
|
||||||
|
self.BulletinTitleLayout.addWidget(self.BulletinIsEditedLabel)
|
||||||
|
self.BulletinTitleLayout.addStretch()
|
||||||
|
self.ItemWidgetLayout.addLayout(self.BulletinTitleLayout)
|
||||||
|
self.BulletinInfoLayout = QHBoxLayout()
|
||||||
|
self.BulletinDateLabel = QLabel()
|
||||||
|
try:
|
||||||
|
raw_dt = self.__bulletin.get("dateTime", "")
|
||||||
|
date_time = datetime.fromisoformat(raw_dt) if raw_dt else datetime.now()
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
date_time = datetime.now()
|
||||||
|
self.BulletinDateLabel.setText(date_time.strftime("%Y-%m-%d %H:%M:%S"))
|
||||||
|
self.BulletinDateLabel.setStyleSheet("color: #969696; font-size: 11px;")
|
||||||
|
self.BulletinInfoLayout.addWidget(self.BulletinDateLabel)
|
||||||
|
self.BulletinAuthorLabel = QLabel(self.__bulletin.get("author", "未知"))
|
||||||
|
self.BulletinAuthorLabel.setStyleSheet("color: #969696; font-size: 11px;")
|
||||||
|
self.BulletinInfoLayout.addWidget(self.BulletinAuthorLabel)
|
||||||
|
self.BulletinInfoLayout.addStretch()
|
||||||
|
self.ItemWidgetLayout.addLayout(self.BulletinInfoLayout)
|
||||||
|
self.setLayout(self.ItemWidgetLayout)
|
||||||
|
self.__bulletin = None
|
||||||
|
|
||||||
|
def markAsRead(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
if self.NewIndicatorLabel:
|
||||||
|
self.NewIndicatorLabel.hide()
|
||||||
|
|
||||||
|
|
||||||
|
class ALBulletinDialog(QDialog, Ui_ALBulletinDialog):
|
||||||
|
"""
|
||||||
|
Bulletin viewer dialog.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
parent=None
|
||||||
|
):
|
||||||
|
super().__init__(parent)
|
||||||
|
self.__sync_timer: QTimer | None = None
|
||||||
|
self.__fetch_worker: ALBulletinFetchWorker | None = None
|
||||||
|
self.__bulletin_mgr = bulletinInstance()
|
||||||
|
|
||||||
|
self.setupUi(self)
|
||||||
|
self.modifyUi()
|
||||||
|
self.connectSignals()
|
||||||
|
self.setupTimer()
|
||||||
|
if self.shouldAutoSync():
|
||||||
|
self.syncBulletin()
|
||||||
|
|
||||||
|
def modifyUi(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.ALSyncStatusLabel = ALStatusLabel(self)
|
||||||
|
self.ALSyncStatusLabel.setFixedSize(30, 30)
|
||||||
|
self.SyncLayout.replaceWidget(
|
||||||
|
self.SyncStatusPlaceholder, self.ALSyncStatusLabel
|
||||||
|
)
|
||||||
|
title_font = QFont()
|
||||||
|
title_font.setBold(True)
|
||||||
|
title_font.setPointSize(15)
|
||||||
|
self.BulletinTitleLabel.setFont(title_font)
|
||||||
|
self.BulletinDateLabel.setStyleSheet("color: #969696;")
|
||||||
|
self.BulletinAuthorLabel.setStyleSheet("color: #969696;")
|
||||||
|
self.BulletinIsEditedLabel.setStyleSheet("color: #FF9800;")
|
||||||
|
self.BulletinIsEditedLabel.hide()
|
||||||
|
last_time = self.__bulletin_mgr.lastSyncTime()
|
||||||
|
if last_time:
|
||||||
|
self.setLastSyncTime(last_time)
|
||||||
|
self.updateBulletinList(self.__bulletin_mgr.bulletins())
|
||||||
|
|
||||||
|
def shouldAutoSync(
|
||||||
|
self
|
||||||
|
) -> bool:
|
||||||
|
|
||||||
|
last = self.__bulletin_mgr.lastSyncTime()
|
||||||
|
if last is None:
|
||||||
|
return True
|
||||||
|
try:
|
||||||
|
last_dt = datetime.fromisoformat(last)
|
||||||
|
interval_min = max(self.__bulletin_mgr.syncInterval()//2, 1)
|
||||||
|
threshold = timedelta(minutes=interval_min)
|
||||||
|
return (datetime.now().astimezone() - last_dt) > threshold
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
return True
|
||||||
|
|
||||||
|
def setLastSyncTime(
|
||||||
|
self,
|
||||||
|
iso_str: str
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Set last sync time to update the UI status.
|
||||||
|
"""
|
||||||
|
|
||||||
|
try:
|
||||||
|
dt = datetime.fromisoformat(iso_str)
|
||||||
|
self.LastSyncDateTimeEdit.setDateTime(dt)
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def connectSignals(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.BulletinListWidget.itemClicked.connect(self.onBulletinListWidgetItemClicked)
|
||||||
|
self.SyncButton.clicked.connect(self.syncBulletin)
|
||||||
|
|
||||||
|
def setupTimer(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__sync_timer = QTimer(self)
|
||||||
|
self.__sync_timer.timeout.connect(self.syncBulletin)
|
||||||
|
self.__sync_timer.start(self.__bulletin_mgr.syncInterval()*60*1000)
|
||||||
|
|
||||||
|
def updateBulletinList(
|
||||||
|
self,
|
||||||
|
bulletins: list[dict]
|
||||||
|
):
|
||||||
|
|
||||||
|
self.BulletinListWidget.clear()
|
||||||
|
sorted_list = sorted(
|
||||||
|
bulletins, key=lambda x: x.get("dateTime", ""), reverse=True
|
||||||
|
)
|
||||||
|
for bulletin in sorted_list:
|
||||||
|
item = QListWidgetItem()
|
||||||
|
item.setData(Qt.UserRole, bulletin)
|
||||||
|
widget = ALBulletinItemWidget(self, bulletin)
|
||||||
|
item.setSizeHint(widget.sizeHint())
|
||||||
|
self.BulletinListWidget.addItem(item)
|
||||||
|
self.BulletinListWidget.setItemWidget(item, widget)
|
||||||
|
|
||||||
|
def showBulletin(
|
||||||
|
self,
|
||||||
|
bulletin: dict
|
||||||
|
):
|
||||||
|
|
||||||
|
self.BulletinTitleLabel.setText(bulletin.get("title", "无标题"))
|
||||||
|
try:
|
||||||
|
raw_dt = bulletin.get("dateTime", "")
|
||||||
|
date_time = datetime.fromisoformat(raw_dt) if raw_dt else datetime.now()
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
date_time = datetime.now()
|
||||||
|
self.BulletinDateLabel.setText(date_time.strftime("%Y-%m-%d %H:%M:%S"))
|
||||||
|
self.BulletinAuthorLabel.setText(bulletin.get("author", "未知"))
|
||||||
|
if bulletin.get("isEdited", False):
|
||||||
|
self.BulletinIsEditedLabel.show()
|
||||||
|
else:
|
||||||
|
self.BulletinIsEditedLabel.hide()
|
||||||
|
self.BulletinContentTextBrowser.setHtml(
|
||||||
|
"<div style='font-size: 14px;'>{content}</div>".format(
|
||||||
|
content=bulletin.get("content", "无内容")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def clearBulletin(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.BulletinTitleLabel.setText("")
|
||||||
|
self.BulletinDateLabel.setText("")
|
||||||
|
self.BulletinAuthorLabel.setText("")
|
||||||
|
self.BulletinContentTextBrowser.setText("")
|
||||||
|
self.BulletinIsEditedLabel.hide()
|
||||||
|
|
||||||
|
def syncBulletin(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
if self.__fetch_worker is not None:
|
||||||
|
return
|
||||||
|
self.SyncButton.setEnabled(False)
|
||||||
|
self.SyncButton.setText("同步中...")
|
||||||
|
self.ALSyncStatusLabel.status = ALStatusLabel.Status.RUNNING
|
||||||
|
self.SyncStatusDetailLabel.setText("")
|
||||||
|
self.SyncStatusDetailLabel.setStyleSheet("")
|
||||||
|
params = self.__bulletin_mgr.getSyncDateTimeAndRange()
|
||||||
|
self.__fetch_worker = ALBulletinFetchWorker(
|
||||||
|
self, self.__bulletin_mgr.apiUrl(), params
|
||||||
|
)
|
||||||
|
self.__fetch_worker.fetchWorkerIsFinished.connect(self.onBulletinsFetched)
|
||||||
|
self.__fetch_worker.fetchWorkerFinishedWithError.connect(self.onBulletinsFetchError)
|
||||||
|
self.__fetch_worker.start()
|
||||||
|
|
||||||
|
@Slot(dict)
|
||||||
|
def onBulletinsFetched(
|
||||||
|
self,
|
||||||
|
data: dict
|
||||||
|
):
|
||||||
|
|
||||||
|
worker = self.sender()
|
||||||
|
if worker is not self.__fetch_worker:
|
||||||
|
return
|
||||||
|
worker.fetchWorkerIsFinished.disconnect(self.onBulletinsFetched)
|
||||||
|
worker.fetchWorkerFinishedWithError.disconnect(self.onBulletinsFetchError)
|
||||||
|
worker.wait(2000)
|
||||||
|
worker.deleteLater()
|
||||||
|
self.__fetch_worker = None
|
||||||
|
bulletins = data.get("bulletins", [])
|
||||||
|
delete_ids = data.get("delete_ids", [])
|
||||||
|
merged = self.__bulletin_mgr.updateAndMergeBulletins(bulletins, delete_ids)
|
||||||
|
self.__bulletin_mgr.setLastSyncTime(datetime.now().astimezone().isoformat())
|
||||||
|
self.SyncButton.setEnabled(True)
|
||||||
|
self.SyncButton.setText("同步")
|
||||||
|
self.ALSyncStatusLabel.status = ALStatusLabel.Status.SUCCESS
|
||||||
|
self.SyncStatusDetailLabel.setText("同步成功")
|
||||||
|
self.SyncStatusDetailLabel.setStyleSheet("color: green;")
|
||||||
|
QTimer.singleShot(3000, self, self.clearSyncStatus)
|
||||||
|
|
||||||
|
self.setLastSyncTime(self.__bulletin_mgr.lastSyncTime())
|
||||||
|
self.updateBulletinList(merged)
|
||||||
|
self.clearBulletin()
|
||||||
|
interval_ms = self.__bulletin_mgr.syncInterval()*60*1000
|
||||||
|
if self.__sync_timer:
|
||||||
|
self.__sync_timer.start(interval_ms)
|
||||||
|
|
||||||
|
@Slot(str)
|
||||||
|
def onBulletinsFetchError(
|
||||||
|
self,
|
||||||
|
error_message: str
|
||||||
|
):
|
||||||
|
|
||||||
|
worker = self.sender()
|
||||||
|
if worker is not self.__fetch_worker:
|
||||||
|
return
|
||||||
|
worker.fetchWorkerIsFinished.disconnect(self.onBulletinsFetched)
|
||||||
|
worker.fetchWorkerFinishedWithError.disconnect(self.onBulletinsFetchError)
|
||||||
|
worker.wait(2000)
|
||||||
|
worker.deleteLater()
|
||||||
|
self.__fetch_worker = None
|
||||||
|
self.SyncButton.setEnabled(True)
|
||||||
|
self.SyncButton.setText("重试")
|
||||||
|
self.ALSyncStatusLabel.status = ALStatusLabel.Status.FAILURE
|
||||||
|
self.SyncStatusDetailLabel.setText("同步失败,请检查网络连接")
|
||||||
|
self.SyncStatusDetailLabel.setStyleSheet("color: red;")
|
||||||
|
QMessageBox.warning(
|
||||||
|
self,
|
||||||
|
"警告 - AutoLibrary",
|
||||||
|
f"同步失败:{error_message}"
|
||||||
|
)
|
||||||
|
interval_ms = self.__bulletin_mgr.syncInterval()*60*1000
|
||||||
|
if self.__sync_timer:
|
||||||
|
self.__sync_timer.start(interval_ms)
|
||||||
|
|
||||||
|
def clearSyncStatus(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.ALSyncStatusLabel.status = ALStatusLabel.Status.WAITING
|
||||||
|
self.SyncStatusDetailLabel.setText("")
|
||||||
|
self.SyncStatusDetailLabel.setStyleSheet("")
|
||||||
|
|
||||||
|
@Slot(QListWidgetItem)
|
||||||
|
def onBulletinListWidgetItemClicked(
|
||||||
|
self,
|
||||||
|
item: QListWidgetItem
|
||||||
|
):
|
||||||
|
|
||||||
|
if item is None or item.data(Qt.UserRole) is None:
|
||||||
|
return
|
||||||
|
bulletin = item.data(Qt.UserRole)
|
||||||
|
if bulletin.get("isNew", False):
|
||||||
|
self.__bulletin_mgr.markBulletinAsRead(bulletin["id"])
|
||||||
|
widget = self.BulletinListWidget.itemWidget(item)
|
||||||
|
if widget:
|
||||||
|
widget.markAsRead()
|
||||||
|
item.setData(Qt.UserRole, bulletin)
|
||||||
|
self.showBulletin(bulletin)
|
||||||
@@ -0,0 +1,188 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
Copyright (c) 2026 KenanZhu.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
This software is provided "as is", without any warranty of any kind.
|
||||||
|
You may use, modify, and distribute this file under the terms of the MIT License.
|
||||||
|
See the LICENSE file for details.
|
||||||
|
"""
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from PySide6.QtCore import (
|
||||||
|
QObject,
|
||||||
|
QTimer,
|
||||||
|
Signal,
|
||||||
|
Slot
|
||||||
|
)
|
||||||
|
|
||||||
|
from gui.ALBulletinWorker import ALBulletinFetchWorker
|
||||||
|
from managers.bulletin.BulletinManager import instance as bulletinInstance
|
||||||
|
|
||||||
|
|
||||||
|
class ALBulletinPoller(QObject):
|
||||||
|
"""
|
||||||
|
Background bulletin poller.
|
||||||
|
|
||||||
|
Owns the periodic poll timer and the ALBulletinFetchWorker
|
||||||
|
lifecycle. Emits signals when new bulletins are detected so
|
||||||
|
the owner can show tray notifications without knowing the
|
||||||
|
fetch / merge details.
|
||||||
|
"""
|
||||||
|
|
||||||
|
newBulletinsDetected = Signal(int)
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
parent=None
|
||||||
|
):
|
||||||
|
|
||||||
|
super().__init__(parent)
|
||||||
|
self.__timer = QTimer(self)
|
||||||
|
self.__timer.timeout.connect(self.__poll)
|
||||||
|
self.__worker = None
|
||||||
|
self.__dialog_open = False
|
||||||
|
self.__stopped = False
|
||||||
|
self.__mgr = bulletinInstance()
|
||||||
|
|
||||||
|
def start(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__stopped = False
|
||||||
|
interval_ms = self.__mgr.syncInterval()*60*1000
|
||||||
|
self.__timer.start(interval_ms)
|
||||||
|
|
||||||
|
def stop(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__stopped = True
|
||||||
|
self.__timer.stop()
|
||||||
|
self.__cleanupWorker()
|
||||||
|
|
||||||
|
def restart(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.stop()
|
||||||
|
self.start()
|
||||||
|
|
||||||
|
def fetchNow(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
if self.__worker is not None:
|
||||||
|
return
|
||||||
|
if self.__dialog_open:
|
||||||
|
return
|
||||||
|
self.__doFetch()
|
||||||
|
|
||||||
|
def isPolling(
|
||||||
|
self
|
||||||
|
) -> bool:
|
||||||
|
|
||||||
|
return self.__timer.isActive()
|
||||||
|
|
||||||
|
def setDialogOpen(
|
||||||
|
self,
|
||||||
|
open: bool
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__dialog_open = open
|
||||||
|
|
||||||
|
def __disconnectWorker(
|
||||||
|
self,
|
||||||
|
worker: ALBulletinFetchWorker
|
||||||
|
):
|
||||||
|
|
||||||
|
try:
|
||||||
|
worker.fetchWorkerIsFinished.disconnect(self.__onFetched)
|
||||||
|
except (TypeError, RuntimeError):
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
worker.fetchWorkerFinishedWithError.disconnect(self.__onError)
|
||||||
|
except (TypeError, RuntimeError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def __cleanupWorker(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
if self.__worker is None:
|
||||||
|
return
|
||||||
|
self.__disconnectWorker(self.__worker)
|
||||||
|
self.__worker.wait(500)
|
||||||
|
self.__worker.deleteLater()
|
||||||
|
self.__worker = None
|
||||||
|
|
||||||
|
def __doFetch(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
params = self.__mgr.getSyncDateTimeAndRange()
|
||||||
|
self.__worker = ALBulletinFetchWorker(
|
||||||
|
self, self.__mgr.apiUrl(), params
|
||||||
|
)
|
||||||
|
self.__worker.fetchWorkerIsFinished.connect(self.__onFetched)
|
||||||
|
self.__worker.fetchWorkerFinishedWithError.connect(self.__onError)
|
||||||
|
self.__worker.start()
|
||||||
|
|
||||||
|
@Slot()
|
||||||
|
def __poll(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
if self.__worker is not None:
|
||||||
|
return
|
||||||
|
if self.__dialog_open:
|
||||||
|
return
|
||||||
|
self.__doFetch()
|
||||||
|
|
||||||
|
@Slot(dict)
|
||||||
|
def __onFetched(
|
||||||
|
self,
|
||||||
|
data: dict
|
||||||
|
):
|
||||||
|
|
||||||
|
worker = self.sender()
|
||||||
|
if worker is not self.__worker:
|
||||||
|
return
|
||||||
|
self.__disconnectWorker(worker)
|
||||||
|
worker.wait(500)
|
||||||
|
worker.deleteLater()
|
||||||
|
self.__worker = None
|
||||||
|
old_ids = {str(b.get("id", "")) for b in self.__mgr.bulletins()}
|
||||||
|
bulletins = data.get("bulletins", [])
|
||||||
|
delete_ids = data.get("delete_ids", [])
|
||||||
|
self.__mgr.updateAndMergeBulletins(bulletins, delete_ids)
|
||||||
|
self.__mgr.setLastSyncTime(datetime.now().astimezone().isoformat())
|
||||||
|
delete_id_set = {str(d) for d in delete_ids}
|
||||||
|
new_ids = {
|
||||||
|
str(b.get("id", ""))
|
||||||
|
for b in bulletins
|
||||||
|
if str(b.get("id", "")) and str(b.get("id", "")) not in old_ids
|
||||||
|
}
|
||||||
|
new_ids -= delete_id_set
|
||||||
|
if new_ids and not self.__dialog_open:
|
||||||
|
self.newBulletinsDetected.emit(len(new_ids))
|
||||||
|
if not self.__stopped:
|
||||||
|
interval_ms = self.__mgr.syncInterval()*60*1000
|
||||||
|
self.__timer.start(interval_ms)
|
||||||
|
|
||||||
|
@Slot(str)
|
||||||
|
def __onError(
|
||||||
|
self,
|
||||||
|
error_message: str
|
||||||
|
):
|
||||||
|
|
||||||
|
worker = self.sender()
|
||||||
|
if worker is not self.__worker:
|
||||||
|
return
|
||||||
|
self.__disconnectWorker(worker)
|
||||||
|
worker.wait(500)
|
||||||
|
worker.deleteLater()
|
||||||
|
self.__worker = None
|
||||||
|
if not self.__stopped:
|
||||||
|
interval_ms = self.__mgr.syncInterval()*60*1000
|
||||||
|
self.__timer.start(interval_ms)
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
Copyright (c) 2026 KenanZhu.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
This software is provided "as is", without any warranty of any kind.
|
||||||
|
You may use, modify, and distribute this file under the terms of the MIT License.
|
||||||
|
See the LICENSE file for details.
|
||||||
|
"""
|
||||||
|
import requests
|
||||||
|
|
||||||
|
from PySide6.QtCore import (
|
||||||
|
QThread,
|
||||||
|
Signal
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class ALBulletinFetchWorker(QThread):
|
||||||
|
"""
|
||||||
|
Worker thread for fetching bulletins from the server.
|
||||||
|
"""
|
||||||
|
|
||||||
|
fetchWorkerIsFinished = Signal(dict)
|
||||||
|
fetchWorkerFinishedWithError = Signal(str)
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
parent=None,
|
||||||
|
request_url: str = "",
|
||||||
|
params: dict = None
|
||||||
|
):
|
||||||
|
|
||||||
|
super().__init__(parent)
|
||||||
|
self.__request_url = request_url.rstrip("/") if request_url else ""
|
||||||
|
self.__params = params or {}
|
||||||
|
|
||||||
|
def run(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = requests.get(
|
||||||
|
self.__request_url, params=self.__params, timeout=5
|
||||||
|
)
|
||||||
|
response.raise_for_status()
|
||||||
|
r = response.json()
|
||||||
|
if r.get("code") == 200:
|
||||||
|
data = r.get("data", {})
|
||||||
|
self.fetchWorkerIsFinished.emit(data)
|
||||||
|
else:
|
||||||
|
raise Exception(
|
||||||
|
f"服务器返回错误: [{r.get('code', '未知代码')}] {r.get('msg', '未知错误')}"
|
||||||
|
)
|
||||||
|
except requests.RequestException as e:
|
||||||
|
self.fetchWorkerFinishedWithError.emit(f"获取公告数据时发生网络错误: \n{e}")
|
||||||
|
except Exception as e:
|
||||||
|
self.fetchWorkerFinishedWithError.emit(f"获取公告数据时发生未知错误: \n{e}")
|
||||||
@@ -0,0 +1,192 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
Copyright (c) 2026 KenanZhu.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
This software is provided "as is", without any warranty of any kind.
|
||||||
|
You may use, modify, and distribute this file under the terms of the MIT License.
|
||||||
|
See the LICENSE file for details.
|
||||||
|
"""
|
||||||
|
from PySide6.QtCore import Qt
|
||||||
|
from PySide6.QtGui import QDesktopServices
|
||||||
|
from PySide6.QtCore import QUrl
|
||||||
|
from PySide6.QtWidgets import (
|
||||||
|
QDialog,
|
||||||
|
QDialogButtonBox,
|
||||||
|
QLabel,
|
||||||
|
QVBoxLayout
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class ALCheckUpdateDialog(QDialog):
|
||||||
|
"""
|
||||||
|
Dialog for showing update check result.
|
||||||
|
|
||||||
|
Supports two layouts:
|
||||||
|
- has_update=True : version comparison with green text + action buttons
|
||||||
|
- has_update=False: "already up-to-date" message + close button
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
parent=None,
|
||||||
|
has_update: bool = False,
|
||||||
|
current_version: str = "",
|
||||||
|
latest_version: str = "",
|
||||||
|
tag_name: str = "",
|
||||||
|
html_url: str = ""
|
||||||
|
):
|
||||||
|
|
||||||
|
super().__init__(parent)
|
||||||
|
self.__has_update = has_update
|
||||||
|
self.__html_url = html_url
|
||||||
|
self.__current_version = current_version
|
||||||
|
self.__latest_version = latest_version
|
||||||
|
self.__tag_name = tag_name
|
||||||
|
|
||||||
|
self.modifyUi()
|
||||||
|
self.connectSignals()
|
||||||
|
|
||||||
|
def modifyUi(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.setWindowTitle("检查更新 - AutoLibrary")
|
||||||
|
self.setMinimumWidth(360)
|
||||||
|
Layout = QVBoxLayout(self)
|
||||||
|
Layout.setSpacing(12)
|
||||||
|
Layout.setContentsMargins(20, 20, 20, 20)
|
||||||
|
if self.__has_update:
|
||||||
|
self.buildUpdateAvailableUi(Layout)
|
||||||
|
else:
|
||||||
|
self.buildUpToDateUi(Layout)
|
||||||
|
|
||||||
|
def buildUpdateAvailableUi(
|
||||||
|
self,
|
||||||
|
layout: QVBoxLayout
|
||||||
|
):
|
||||||
|
|
||||||
|
TitleLabel = QLabel()
|
||||||
|
TitleLabel.setStyleSheet(
|
||||||
|
"font-size: 14px;"
|
||||||
|
"font-weight: bold;"
|
||||||
|
)
|
||||||
|
TitleLabel.setTextFormat(Qt.TextFormat.RichText)
|
||||||
|
TitleLabel.setText(
|
||||||
|
f"检测到新版本: "
|
||||||
|
f"<span>{self.__current_version}</span> "
|
||||||
|
f"<span>></span> "
|
||||||
|
f"<span style='color: green; font-weight: bold;'>{self.__latest_version}</span>"
|
||||||
|
)
|
||||||
|
layout.addWidget(TitleLabel)
|
||||||
|
InfoLabel = QLabel()
|
||||||
|
InfoLabel.setTextFormat(Qt.TextFormat.RichText)
|
||||||
|
InfoLabel.setWordWrap(True)
|
||||||
|
InfoLabel.setText(
|
||||||
|
f"最新版本: <b>{self.__tag_name}</b><br>"
|
||||||
|
)
|
||||||
|
InfoLabel.setOpenExternalLinks(True)
|
||||||
|
layout.addWidget(InfoLabel)
|
||||||
|
layout.addSpacing(8)
|
||||||
|
self.__button_box = QDialogButtonBox()
|
||||||
|
self.__btn_github = self.__button_box.addButton(
|
||||||
|
"前往 GitHub",
|
||||||
|
QDialogButtonBox.ButtonRole.AcceptRole
|
||||||
|
)
|
||||||
|
self.__btn_github.setMinimumWidth(100)
|
||||||
|
self.__btn_github.setMaximumWidth(100)
|
||||||
|
self.__btn_github.setMinimumHeight(25)
|
||||||
|
self.__btn_github.setMaximumHeight(25)
|
||||||
|
self.__btn_download = self.__button_box.addButton(
|
||||||
|
"官网下载",
|
||||||
|
QDialogButtonBox.ButtonRole.ActionRole
|
||||||
|
)
|
||||||
|
self.__btn_download.setMinimumWidth(80)
|
||||||
|
self.__btn_download.setMaximumWidth(80)
|
||||||
|
self.__btn_download.setMinimumHeight(25)
|
||||||
|
self.__btn_download.setMaximumHeight(25)
|
||||||
|
self.__btn_cancel = self.__button_box.addButton(
|
||||||
|
"取消",
|
||||||
|
QDialogButtonBox.ButtonRole.RejectRole
|
||||||
|
)
|
||||||
|
self.__btn_cancel.setMinimumWidth(80)
|
||||||
|
self.__btn_cancel.setMaximumWidth(80)
|
||||||
|
self.__btn_cancel.setMinimumHeight(25)
|
||||||
|
self.__btn_cancel.setMaximumHeight(25)
|
||||||
|
layout.addWidget(self.__button_box)
|
||||||
|
|
||||||
|
def buildUpToDateUi(
|
||||||
|
self,
|
||||||
|
layout: QVBoxLayout
|
||||||
|
):
|
||||||
|
|
||||||
|
TitleLabel = QLabel()
|
||||||
|
TitleLabel.setStyleSheet(
|
||||||
|
"font-size: 14px;"
|
||||||
|
"font-weight: bold;"
|
||||||
|
)
|
||||||
|
TitleLabel.setText(f"已是最新版本 !")
|
||||||
|
layout.addWidget(TitleLabel)
|
||||||
|
InfoLabel = QLabel()
|
||||||
|
InfoLabel.setText(
|
||||||
|
f"当前版本: <b>{self.__current_version}</b><br>"
|
||||||
|
)
|
||||||
|
layout.addWidget(InfoLabel)
|
||||||
|
layout.addStretch()
|
||||||
|
self.__button_box = QDialogButtonBox()
|
||||||
|
self.__btn_close = self.__button_box.addButton(
|
||||||
|
"确定",
|
||||||
|
QDialogButtonBox.ButtonRole.AcceptRole
|
||||||
|
)
|
||||||
|
self.__btn_close.setMinimumWidth(80)
|
||||||
|
self.__btn_close.setMaximumWidth(80)
|
||||||
|
self.__btn_close.setMinimumHeight(25)
|
||||||
|
self.__btn_close.setMaximumHeight(25)
|
||||||
|
layout.addWidget(self.__button_box)
|
||||||
|
|
||||||
|
def connectSignals(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
if self.__has_update:
|
||||||
|
self.__btn_github.clicked.connect(self.onGoToGitHub)
|
||||||
|
self.__btn_download.clicked.connect(self.onGoToDownload)
|
||||||
|
self.__btn_cancel.clicked.connect(self.reject)
|
||||||
|
else:
|
||||||
|
self.__btn_close.clicked.connect(self.accept)
|
||||||
|
|
||||||
|
def onGoToGitHub(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
QDesktopServices.openUrl(QUrl(self.__html_url))
|
||||||
|
self.accept()
|
||||||
|
|
||||||
|
def onGoToDownload(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
QDesktopServices.openUrl(
|
||||||
|
QUrl("https://www.autolibrary.kenanzhu.com/downloads")
|
||||||
|
)
|
||||||
|
self.accept()
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def showResult(
|
||||||
|
parent,
|
||||||
|
has_update: bool,
|
||||||
|
current_version: str,
|
||||||
|
latest_version: str = "",
|
||||||
|
tag_name: str = "",
|
||||||
|
html_url: str = ""
|
||||||
|
):
|
||||||
|
|
||||||
|
dialog = ALCheckUpdateDialog(
|
||||||
|
parent,
|
||||||
|
has_update=has_update,
|
||||||
|
current_version=current_version,
|
||||||
|
latest_version=latest_version,
|
||||||
|
tag_name=tag_name,
|
||||||
|
html_url=html_url
|
||||||
|
)
|
||||||
|
dialog.exec()
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
Copyright (c) 2026 KenanZhu.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
This software is provided "as is", without any warranty of any kind.
|
||||||
|
You may use, modify, and distribute this file under the terms of the MIT License.
|
||||||
|
See the LICENSE file for details.
|
||||||
|
"""
|
||||||
|
import requests
|
||||||
|
|
||||||
|
from PySide6.QtCore import (
|
||||||
|
QThread,
|
||||||
|
Signal
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class ALCheckUpdateWorker(QThread):
|
||||||
|
"""
|
||||||
|
Worker thread for checking latest release from GitHub API.
|
||||||
|
"""
|
||||||
|
|
||||||
|
checkUpdateWorkerIsFinished = Signal(dict)
|
||||||
|
checkUpdateWorkerFinishedWithError = Signal(str)
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
parent=None
|
||||||
|
):
|
||||||
|
|
||||||
|
super().__init__(parent)
|
||||||
|
self.__api_url = "https://api.github.com/repos/KenanZhu/AutoLibrary/releases/latest"
|
||||||
|
|
||||||
|
def run(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = requests.get(self.__api_url, timeout=10)
|
||||||
|
response.raise_for_status()
|
||||||
|
data = response.json()
|
||||||
|
self.checkUpdateWorkerIsFinished.emit({
|
||||||
|
"tag_name": data.get("tag_name", ""),
|
||||||
|
"name": data.get("name", ""),
|
||||||
|
"html_url": data.get("html_url", ""),
|
||||||
|
"body": data.get("body", ""),
|
||||||
|
})
|
||||||
|
except requests.RequestException as e:
|
||||||
|
self.checkUpdateWorkerFinishedWithError.emit(f"网络请求失败: \n{e}")
|
||||||
|
except Exception as e:
|
||||||
|
self.checkUpdateWorkerFinishedWithError.emit(f"检查更新时发生未知错误: \n{e}")
|
||||||
+76
-99
@@ -42,6 +42,7 @@ from gui.ALUserTreeWidget import (
|
|||||||
ALUserTreeWidget
|
ALUserTreeWidget
|
||||||
)
|
)
|
||||||
from gui.ALWebDriverDownloadDialog import ALWebDriverDownloadDialog
|
from gui.ALWebDriverDownloadDialog import ALWebDriverDownloadDialog
|
||||||
|
from gui.ALWidgetMixin import CenterOnParentMixin
|
||||||
from gui.resources.ui.Ui_ALConfigWidget import Ui_ALConfigWidget
|
from gui.resources.ui.Ui_ALConfigWidget import Ui_ALConfigWidget
|
||||||
from interfaces.ConfigProvider import (
|
from interfaces.ConfigProvider import (
|
||||||
CfgKey,
|
CfgKey,
|
||||||
@@ -52,7 +53,7 @@ from utils.JSONReader import JSONReader
|
|||||||
from utils.JSONWriter import JSONWriter
|
from utils.JSONWriter import JSONWriter
|
||||||
|
|
||||||
|
|
||||||
class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
class ALConfigWidget(CenterOnParentMixin, QWidget, Ui_ALConfigWidget):
|
||||||
|
|
||||||
configWidgetIsClosed = Signal()
|
configWidgetIsClosed = Signal()
|
||||||
|
|
||||||
@@ -110,29 +111,6 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
|||||||
self.ConfirmButton.clicked.connect(self.onConfirmButtonClicked)
|
self.ConfirmButton.clicked.connect(self.onConfirmButtonClicked)
|
||||||
self.CancelButton.clicked.connect(self.onCancelButtonClicked)
|
self.CancelButton.clicked.connect(self.onCancelButtonClicked)
|
||||||
|
|
||||||
def showEvent(
|
|
||||||
self,
|
|
||||||
event
|
|
||||||
):
|
|
||||||
|
|
||||||
result = super().showEvent(event)
|
|
||||||
|
|
||||||
screen_rect = self.screen().geometry()
|
|
||||||
target_pos = self.parent().geometry().center()
|
|
||||||
target_pos.setX(target_pos.x() - self.width()//2)
|
|
||||||
target_pos.setY(target_pos.y() - self.height()//2)
|
|
||||||
if target_pos.x() < 0:
|
|
||||||
target_pos.setX(0)
|
|
||||||
if target_pos.x() + self.width() > screen_rect.width():
|
|
||||||
target_pos.setX(screen_rect.width() - self.width())
|
|
||||||
if target_pos.y() < 0:
|
|
||||||
target_pos.setY(0)
|
|
||||||
if target_pos.y() + self.height() > screen_rect.height():
|
|
||||||
target_pos.setY(screen_rect.height() - self.height())
|
|
||||||
self.move(target_pos)
|
|
||||||
|
|
||||||
return result
|
|
||||||
|
|
||||||
def closeEvent(
|
def closeEvent(
|
||||||
self,
|
self,
|
||||||
event: QCloseEvent
|
event: QCloseEvent
|
||||||
@@ -386,18 +364,18 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
|||||||
|
|
||||||
user_config = self.defaultUserConfig()
|
user_config = self.defaultUserConfig()
|
||||||
for i in range(self.UserTreeWidget.topLevelItemCount()):
|
for i in range(self.UserTreeWidget.topLevelItemCount()):
|
||||||
GroupItem = self.UserTreeWidget.topLevelItem(i)
|
group_item = self.UserTreeWidget.topLevelItem(i)
|
||||||
group_config = {
|
group_config = {
|
||||||
"name": GroupItem.text(0),
|
"name": group_item.text(0),
|
||||||
"enabled": GroupItem.checkState(1) == Qt.CheckState.Checked,
|
"enabled": group_item.checkState(1) == Qt.CheckState.Checked,
|
||||||
"users": []
|
"users": []
|
||||||
}
|
}
|
||||||
for j in range(GroupItem.childCount()):
|
for j in range(group_item.childCount()):
|
||||||
UserItem = GroupItem.child(j)
|
user_item = group_item.child(j)
|
||||||
user = UserItem.data(0, Qt.UserRole)
|
user = user_item.data(0, Qt.UserRole)
|
||||||
if not user:
|
if not user:
|
||||||
continue
|
continue
|
||||||
user["enabled"] = UserItem.checkState(1) == Qt.CheckState.Checked
|
user["enabled"] = user_item.checkState(1) == Qt.CheckState.Checked
|
||||||
group_config["users"].append(user)
|
group_config["users"].append(user)
|
||||||
user_config["groups"].append(group_config)
|
user_config["groups"].append(group_config)
|
||||||
return user_config
|
return user_config
|
||||||
@@ -453,18 +431,18 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
|||||||
try:
|
try:
|
||||||
if "groups" in users:
|
if "groups" in users:
|
||||||
for group_config in users["groups"]:
|
for group_config in users["groups"]:
|
||||||
GroupItem = QTreeWidgetItem(self.UserTreeWidget, ALUserTreeItemType.GROUP.value)
|
group_item = QTreeWidgetItem(self.UserTreeWidget, ALUserTreeItemType.GROUP.value)
|
||||||
GroupItem.setText(0, group_config["name"])
|
group_item.setText(0, group_config["name"])
|
||||||
GroupItem.setFlags(GroupItem.flags() | Qt.ItemIsEditable)
|
group_item.setFlags(group_item.flags() | Qt.ItemIsEditable)
|
||||||
GroupItem.setCheckState(1, Qt.Checked if group_config.get("enabled", True) else Qt.Unchecked)
|
group_item.setCheckState(1, Qt.Checked if group_config.get("enabled", True) else Qt.Unchecked)
|
||||||
for user_config in group_config["users"]:
|
for user_config in group_config["users"]:
|
||||||
UserItem = QTreeWidgetItem(GroupItem, ALUserTreeItemType.USER.value)
|
user_item = QTreeWidgetItem(group_item, ALUserTreeItemType.USER.value)
|
||||||
UserItem.setText(0, user_config["username"])
|
user_item.setText(0, user_config["username"])
|
||||||
UserItem.setText(1, "" if user_config.get("enabled", True) else "跳过")
|
user_item.setText(1, "" if user_config.get("enabled", True) else "跳过")
|
||||||
UserItem.setData(0, Qt.UserRole, user_config)
|
user_item.setData(0, Qt.UserRole, user_config)
|
||||||
UserItem.setCheckState(1, Qt.Checked if user_config.get("enabled", True) else Qt.Unchecked)
|
user_item.setCheckState(1, Qt.Checked if user_config.get("enabled", True) else Qt.Unchecked)
|
||||||
UserItem.setDisabled(not group_config.get("enabled", True))
|
user_item.setDisabled(not group_config.get("enabled", True))
|
||||||
GroupItem.setExpanded(True)
|
group_item.setExpanded(True)
|
||||||
except KeyError as e:
|
except KeyError as e:
|
||||||
QMessageBox.warning(
|
QMessageBox.warning(
|
||||||
self,
|
self,
|
||||||
@@ -638,43 +616,43 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
|||||||
) -> QTreeWidgetItem:
|
) -> QTreeWidgetItem:
|
||||||
|
|
||||||
self.UserTreeWidget.itemChanged.disconnect(self.onUserTreeWidgetItemChanged)
|
self.UserTreeWidget.itemChanged.disconnect(self.onUserTreeWidgetItemChanged)
|
||||||
GroupItem = QTreeWidgetItem(self.UserTreeWidget, ALUserTreeItemType.GROUP.value)
|
group_item = QTreeWidgetItem(self.UserTreeWidget, ALUserTreeItemType.GROUP.value)
|
||||||
if not group_name:
|
if not group_name:
|
||||||
group_name = f"新分组-{self.UserTreeWidget.topLevelItemCount()}"
|
group_name = f"新分组-{self.UserTreeWidget.topLevelItemCount()}"
|
||||||
GroupItem.setText(0, group_name)
|
group_item.setText(0, group_name)
|
||||||
GroupItem.setFlags(GroupItem.flags() | Qt.ItemIsEditable)
|
group_item.setFlags(group_item.flags() | Qt.ItemIsEditable)
|
||||||
GroupItem.setCheckState(1, Qt.Checked)
|
group_item.setCheckState(1, Qt.Checked)
|
||||||
self.UserTreeWidget.setCurrentItem(GroupItem)
|
self.UserTreeWidget.setCurrentItem(group_item)
|
||||||
self.UserTreeWidget.itemChanged.connect(self.onUserTreeWidgetItemChanged)
|
self.UserTreeWidget.itemChanged.connect(self.onUserTreeWidgetItemChanged)
|
||||||
return GroupItem
|
return group_item
|
||||||
|
|
||||||
def delGroup(
|
def delGroup(
|
||||||
self,
|
self,
|
||||||
GroupItem: QTreeWidgetItem = None
|
group_item: QTreeWidgetItem = None
|
||||||
):
|
):
|
||||||
|
|
||||||
if GroupItem is None:
|
if group_item is None:
|
||||||
return
|
return
|
||||||
if GroupItem.type() != ALUserTreeItemType.GROUP.value:
|
if group_item.type() != ALUserTreeItemType.GROUP.value:
|
||||||
return
|
return
|
||||||
index = self.UserTreeWidget.indexOfTopLevelItem(GroupItem)
|
index = self.UserTreeWidget.indexOfTopLevelItem(group_item)
|
||||||
self.UserTreeWidget.takeTopLevelItem(index)
|
self.UserTreeWidget.takeTopLevelItem(index)
|
||||||
|
|
||||||
def addUser(
|
def addUser(
|
||||||
self,
|
self,
|
||||||
GroupItem: QTreeWidgetItem = None
|
group_item: QTreeWidgetItem = None
|
||||||
) -> QTreeWidgetItem:
|
) -> QTreeWidgetItem:
|
||||||
|
|
||||||
if GroupItem is None:
|
if group_item is None:
|
||||||
CurrentItem = self.UserTreeWidget.currentItem()
|
current_item = self.UserTreeWidget.currentItem()
|
||||||
if CurrentItem is None:
|
if current_item is None:
|
||||||
GroupItem = self.addGroup()
|
group_item = self.addGroup()
|
||||||
if GroupItem.type() == ALUserTreeItemType.USER.value:
|
if group_item.type() == ALUserTreeItemType.USER.value:
|
||||||
GroupItem = GroupItem.parent()
|
group_item = group_item.parent()
|
||||||
if GroupItem.checkState(1) == Qt.CheckState.Unchecked:
|
if group_item.checkState(1) == Qt.CheckState.Unchecked:
|
||||||
return None
|
return None
|
||||||
new_user = {
|
new_user = {
|
||||||
"username": f"新用户-{GroupItem.childCount()}",
|
"username": f"新用户-{group_item.childCount()}",
|
||||||
"password": "000000",
|
"password": "000000",
|
||||||
"enabled": True,
|
"enabled": True,
|
||||||
"reserve_info": {
|
"reserve_info": {
|
||||||
@@ -703,30 +681,30 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
self.UserTreeWidget.itemChanged.disconnect(self.onUserTreeWidgetItemChanged)
|
self.UserTreeWidget.itemChanged.disconnect(self.onUserTreeWidgetItemChanged)
|
||||||
UserItem = QTreeWidgetItem(GroupItem, ALUserTreeItemType.USER.value)
|
user_item = QTreeWidgetItem(group_item, ALUserTreeItemType.USER.value)
|
||||||
UserItem.setText(0, new_user["username"])
|
user_item.setText(0, new_user["username"])
|
||||||
UserItem.setText(1, "")
|
user_item.setText(1, "")
|
||||||
UserItem.setData(0, Qt.UserRole, new_user)
|
user_item.setData(0, Qt.UserRole, new_user)
|
||||||
UserItem.setCheckState(1, Qt.CheckState.Checked)
|
user_item.setCheckState(1, Qt.CheckState.Checked)
|
||||||
GroupItem.setExpanded(True)
|
group_item.setExpanded(True)
|
||||||
self.UserTreeWidget.setCurrentItem(UserItem)
|
self.UserTreeWidget.setCurrentItem(user_item)
|
||||||
self.setUserToWidget(new_user)
|
self.setUserToWidget(new_user)
|
||||||
self.UserTreeWidget.itemChanged.connect(self.onUserTreeWidgetItemChanged)
|
self.UserTreeWidget.itemChanged.connect(self.onUserTreeWidgetItemChanged)
|
||||||
return UserItem
|
return user_item
|
||||||
|
|
||||||
def delUser(
|
def delUser(
|
||||||
self,
|
self,
|
||||||
UserItem: QTreeWidgetItem = None
|
user_item: QTreeWidgetItem = None
|
||||||
):
|
):
|
||||||
|
|
||||||
if UserItem is None:
|
if user_item is None:
|
||||||
return
|
return
|
||||||
if UserItem.type() != ALUserTreeItemType.USER.value:
|
if user_item.type() != ALUserTreeItemType.USER.value:
|
||||||
return
|
return
|
||||||
ParentItem = UserItem.parent()
|
parent_item = user_item.parent()
|
||||||
index = ParentItem.indexOfChild(UserItem)
|
index = parent_item.indexOfChild(user_item)
|
||||||
ParentItem.takeChild(index)
|
parent_item.takeChild(index)
|
||||||
if ParentItem.childCount() == 0:
|
if parent_item.childCount() == 0:
|
||||||
self.UserTreeWidget.setCurrentItem(None)
|
self.UserTreeWidget.setCurrentItem(None)
|
||||||
|
|
||||||
def renameItem(
|
def renameItem(
|
||||||
@@ -844,10 +822,10 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
|||||||
if item.type() == ALUserTreeItemType.GROUP.value:
|
if item.type() == ALUserTreeItemType.GROUP.value:
|
||||||
is_checked = item.checkState(1) == Qt.CheckState.Checked
|
is_checked = item.checkState(1) == Qt.CheckState.Checked
|
||||||
for i in range(item.childCount()):
|
for i in range(item.childCount()):
|
||||||
Child = item.child(i)
|
child = item.child(i)
|
||||||
if self.UserTreeWidget.currentItem() == Child:
|
if self.UserTreeWidget.currentItem() == child:
|
||||||
self.UserTreeWidget.setCurrentItem(item)
|
self.UserTreeWidget.setCurrentItem(item)
|
||||||
Child.setDisabled(not is_checked)
|
child.setDisabled(not is_checked)
|
||||||
else:
|
else:
|
||||||
is_checked = item.checkState(1) == Qt.CheckState.Checked
|
is_checked = item.checkState(1) == Qt.CheckState.Checked
|
||||||
item.setText(1, "" if is_checked else "跳过")
|
item.setText(1, "" if is_checked else "跳过")
|
||||||
@@ -864,32 +842,32 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
|||||||
def showGroupMenu(
|
def showGroupMenu(
|
||||||
self,
|
self,
|
||||||
menu: QMenu,
|
menu: QMenu,
|
||||||
GroupItem: QTreeWidgetItem = None
|
group_item: QTreeWidgetItem = None
|
||||||
):
|
):
|
||||||
|
|
||||||
AddUserAction = QAction("添加用户", menu)
|
AddUserAction = QAction("添加用户", menu)
|
||||||
RenameGroupAction = QAction("重命名分组", menu)
|
RenameGroupAction = QAction("重命名分组", menu)
|
||||||
DelGroupAction = QAction("删除分组", menu)
|
DelGroupAction = QAction("删除分组", menu)
|
||||||
AddUserAction.triggered.connect(lambda: self.addUser(GroupItem))
|
AddUserAction.triggered.connect(lambda: self.addUser(group_item))
|
||||||
RenameGroupAction.triggered.connect(lambda: self.renameItem(GroupItem))
|
RenameGroupAction.triggered.connect(lambda: self.renameItem(group_item))
|
||||||
DelGroupAction.triggered.connect(lambda: self.delGroup(GroupItem))
|
DelGroupAction.triggered.connect(lambda: self.delGroup(group_item))
|
||||||
menu.addAction(AddUserAction)
|
menu.addAction(AddUserAction)
|
||||||
menu.addSeparator()
|
menu.addSeparator()
|
||||||
menu.addAction(RenameGroupAction)
|
menu.addAction(RenameGroupAction)
|
||||||
menu.addAction(DelGroupAction)
|
menu.addAction(DelGroupAction)
|
||||||
if GroupItem.checkState(1) == Qt.CheckState.Unchecked:
|
if group_item.checkState(1) == Qt.CheckState.Unchecked:
|
||||||
AddUserAction.setEnabled(False)
|
AddUserAction.setEnabled(False)
|
||||||
|
|
||||||
def showUserMenu(
|
def showUserMenu(
|
||||||
self,
|
self,
|
||||||
menu: QMenu,
|
menu: QMenu,
|
||||||
UserItem: QTreeWidgetItem = None
|
user_item: QTreeWidgetItem = None
|
||||||
):
|
):
|
||||||
|
|
||||||
RenameUserAction = QAction("重命名用户", menu)
|
RenameUserAction = QAction("重命名用户", menu)
|
||||||
DelUserAction = QAction("删除用户", menu)
|
DelUserAction = QAction("删除用户", menu)
|
||||||
RenameUserAction.triggered.connect(lambda: self.renameItem(UserItem))
|
RenameUserAction.triggered.connect(lambda: self.renameItem(user_item))
|
||||||
DelUserAction.triggered.connect(lambda: self.delUser(UserItem))
|
DelUserAction.triggered.connect(lambda: self.delUser(user_item))
|
||||||
menu.addAction(RenameUserAction)
|
menu.addAction(RenameUserAction)
|
||||||
menu.addAction(DelUserAction)
|
menu.addAction(DelUserAction)
|
||||||
|
|
||||||
@@ -899,14 +877,14 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
|||||||
pos
|
pos
|
||||||
):
|
):
|
||||||
|
|
||||||
CurrentItem = self.UserTreeWidget.itemAt(pos)
|
current_item = self.UserTreeWidget.itemAt(pos)
|
||||||
Menu = QMenu(self.UserTreeWidget)
|
Menu = QMenu(self.UserTreeWidget)
|
||||||
if CurrentItem is None:
|
if current_item is None:
|
||||||
self.showTreeMenu(Menu)
|
self.showTreeMenu(Menu)
|
||||||
elif CurrentItem.type() == ALUserTreeItemType.GROUP.value:
|
elif current_item.type() == ALUserTreeItemType.GROUP.value:
|
||||||
self.showGroupMenu(Menu, CurrentItem)
|
self.showGroupMenu(Menu, current_item)
|
||||||
else:
|
else:
|
||||||
self.showUserMenu(Menu, CurrentItem)
|
self.showUserMenu(Menu, current_item)
|
||||||
Menu.exec_(self.UserTreeWidget.mapToGlobal(pos))
|
Menu.exec_(self.UserTreeWidget.mapToGlobal(pos))
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
@@ -914,16 +892,16 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
CurrentItem = self.UserTreeWidget.currentItem()
|
current_item = self.UserTreeWidget.currentItem()
|
||||||
self.addUser(CurrentItem)
|
self.addUser(current_item)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onDelUserButtonClicked(
|
def onDelUserButtonClicked(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
CurrentItem = self.UserTreeWidget.currentItem()
|
current_item = self.UserTreeWidget.currentItem()
|
||||||
self.delUser(CurrentItem)
|
self.delUser(current_item)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onBrowseBrowserDriverButtonClicked(
|
def onBrowseBrowserDriverButtonClicked(
|
||||||
@@ -1056,7 +1034,6 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
|||||||
):
|
):
|
||||||
|
|
||||||
msg = ""
|
msg = ""
|
||||||
|
|
||||||
run_config_path = self.ExportRunConfigEdit.text()
|
run_config_path = self.ExportRunConfigEdit.text()
|
||||||
user_config_path = self.ExportUserConfigEdit.text()
|
user_config_path = self.ExportUserConfigEdit.text()
|
||||||
if run_config_path:
|
if run_config_path:
|
||||||
@@ -1133,8 +1110,8 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
CurrentItem = self.UserTreeWidget.currentItem()
|
current_item = self.UserTreeWidget.currentItem()
|
||||||
if CurrentItem and CurrentItem.type() == ALUserTreeItemType.USER.value:
|
if current_item and current_item.type() == ALUserTreeItemType.USER.value:
|
||||||
self.UserTreeWidget.setCurrentItem(None)
|
self.UserTreeWidget.setCurrentItem(None)
|
||||||
if self.saveConfigs(
|
if self.saveConfigs(
|
||||||
self.__config_paths["run"],
|
self.__config_paths["run"],
|
||||||
|
|||||||
+274
-158
@@ -9,11 +9,12 @@ See the LICENSE file for details.
|
|||||||
"""
|
"""
|
||||||
import queue
|
import queue
|
||||||
|
|
||||||
|
import packaging.version as ver
|
||||||
|
|
||||||
from PySide6.QtCore import (
|
from PySide6.QtCore import (
|
||||||
QTimer,
|
QTimer,
|
||||||
QUrl,
|
QUrl,
|
||||||
Qt,
|
Qt,
|
||||||
Signal,
|
|
||||||
Slot
|
Slot
|
||||||
)
|
)
|
||||||
from PySide6.QtGui import (
|
from PySide6.QtGui import (
|
||||||
@@ -32,46 +33,54 @@ from PySide6.QtWidgets import (
|
|||||||
|
|
||||||
from base.MsgBase import MsgBase
|
from base.MsgBase import MsgBase
|
||||||
from gui.ALAboutDialog import ALAboutDialog
|
from gui.ALAboutDialog import ALAboutDialog
|
||||||
|
from gui.ALBulletinDialog import ALBulletinDialog
|
||||||
|
from gui.ALCheckUpdateWorker import ALCheckUpdateWorker
|
||||||
|
from gui.ALCheckUpdateDialog import ALCheckUpdateDialog
|
||||||
from gui.ALConfigWidget import ALConfigWidget
|
from gui.ALConfigWidget import ALConfigWidget
|
||||||
from gui.ALSettingsWidget import ALSettingsWidget
|
from gui.ALSettingsWidget import ALSettingsWidget
|
||||||
from gui.ALMainWorkers import (
|
|
||||||
AutoLibWorker,
|
|
||||||
TimerTaskWorker
|
|
||||||
)
|
|
||||||
from gui.ALTimerTaskManageWidget import ALTimerTaskManageWidget
|
from gui.ALTimerTaskManageWidget import ALTimerTaskManageWidget
|
||||||
|
from gui.ALMainWorker import AutoLibWorker
|
||||||
|
from gui.ALBulletinPoller import ALBulletinPoller
|
||||||
|
from gui.ALTimerTaskPoller import ALTimerTaskPoller
|
||||||
|
from gui.ALVersionInfo import AL_VERSION
|
||||||
from gui.resources import ALResource
|
from gui.resources import ALResource
|
||||||
from gui.resources.ui.Ui_ALMainWindow import Ui_ALMainWindow
|
from gui.resources.ui.Ui_ALMainWindow import Ui_ALMainWindow
|
||||||
|
from managers.bulletin.BulletinManager import instance as bulletinInstance
|
||||||
from managers.config.ConfigUtils import ConfigUtils
|
from managers.config.ConfigUtils import ConfigUtils
|
||||||
|
|
||||||
|
|
||||||
class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
||||||
|
|
||||||
# signal : timer task
|
|
||||||
timerTaskIsRunning = Signal(dict)
|
|
||||||
timerTaskIsExecuted = Signal(dict)
|
|
||||||
timerTaskIsError = Signal(dict)
|
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
MsgBase.__init__(self, queue.Queue(), queue.Queue())
|
MsgBase.__init__(self, queue.Queue(), queue.Queue())
|
||||||
QMainWindow.__init__(self)
|
QMainWindow.__init__(self)
|
||||||
self.__timer_task_queue = queue.Queue()
|
|
||||||
self.__config_paths = ConfigUtils.getAutomationConfigPaths()
|
self.__config_paths = ConfigUtils.getAutomationConfigPaths()
|
||||||
self.__alTimerTaskManageWidget = None
|
self.__ALTimerTaskManageWidget = None
|
||||||
self.__alConfigWidget = None
|
self.__ALConfigWidget = None
|
||||||
self.__alSettingsWidget = None
|
self.__ALSettingsWidget = None
|
||||||
|
self.__ALBulletinDialog = None
|
||||||
self.__auto_lib_thread = None
|
self.__auto_lib_thread = None
|
||||||
self.__current_timer_task_thread = None
|
self.__bulletin_poller = ALBulletinPoller(self)
|
||||||
self.__is_running_timer_task = False
|
self.__timer_task_poller = ALTimerTaskPoller(
|
||||||
|
self,
|
||||||
|
self._input_queue,
|
||||||
|
self._output_queue,
|
||||||
|
self.__config_paths
|
||||||
|
)
|
||||||
|
self.__notification_type = ""
|
||||||
|
|
||||||
self.setupUi(self)
|
self.setupUi(self)
|
||||||
self.modifyUi()
|
self.modifyUi()
|
||||||
self.setupTray()
|
self.setupTray()
|
||||||
self.connectSignals()
|
self.connectSignals()
|
||||||
self.startMsgPolling()
|
self.startMsgPolling()
|
||||||
self.startTimerTaskPolling()
|
self.__timer_task_poller.start()
|
||||||
|
self.__bulletin_poller.start()
|
||||||
|
if bulletinInstance().autoFetch():
|
||||||
|
QTimer.singleShot(1000, self.__bulletin_poller.fetchNow)
|
||||||
self._showLog("主窗口初始化完成")
|
self._showLog("主窗口初始化完成")
|
||||||
|
|
||||||
def modifyUi(
|
def modifyUi(
|
||||||
@@ -82,42 +91,31 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
|||||||
self.setWindowIcon(self.Icon)
|
self.setWindowIcon(self.Icon)
|
||||||
self.MessageIOTextEdit.setFont(QFont("Courier New", 10))
|
self.MessageIOTextEdit.setFont(QFont("Courier New", 10))
|
||||||
self.ManualAction.triggered.connect(self.onManualActionTriggered)
|
self.ManualAction.triggered.connect(self.onManualActionTriggered)
|
||||||
|
self.CheckUpdateAction.triggered.connect(self.onCheckUpdateActionTriggered)
|
||||||
self.AboutAction.triggered.connect(self.onAboutActionTriggered)
|
self.AboutAction.triggered.connect(self.onAboutActionTriggered)
|
||||||
self.SettingsAction.triggered.connect(self.onSettingsActionTriggered)
|
self.SettingsAction.triggered.connect(self.onSettingsActionTriggered)
|
||||||
|
self.BulletinAction.triggered.connect(self.onBulletinActionTriggered)
|
||||||
# initialize timer task widget, but not show it
|
# initialize timer task widget, but not show it
|
||||||
try:
|
try:
|
||||||
self.__alTimerTaskManageWidget = ALTimerTaskManageWidget(self)
|
self.__ALTimerTaskManageWidget = ALTimerTaskManageWidget(self)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
QMessageBox.critical(
|
QMessageBox.critical(
|
||||||
self,
|
self,
|
||||||
"错误 - AutoLibrary",
|
"错误 - AutoLibrary",
|
||||||
f"初始化定时任务功能失败: \n{e}"
|
f"初始化定时任务功能失败: \n{e}"
|
||||||
)
|
)
|
||||||
self.__alTimerTaskManageWidget = None
|
self.__ALTimerTaskManageWidget = None
|
||||||
self.TimerTaskManageWidgetButton.setEnabled(False)
|
self.TimerTaskManageWidgetButton.setEnabled(False)
|
||||||
self.TimerTaskManageWidgetButton.setToolTip("定时任务功能初始化失败, 请检查配置文件。")
|
self.TimerTaskManageWidgetButton.setToolTip("定时任务功能初始化失败, 请检查配置文件。")
|
||||||
return
|
return
|
||||||
self.timerTaskIsRunning.connect(self.__alTimerTaskManageWidget.onTimerTaskIsRunning)
|
self.__timer_task_poller.taskRunning.connect(self.onTimerTaskRunning)
|
||||||
self.timerTaskIsExecuted.connect(self.__alTimerTaskManageWidget.onTimerTaskIsExecuted)
|
self.__timer_task_poller.taskFinished.connect(self.onTimerTaskFinished)
|
||||||
self.timerTaskIsError.connect(self.__alTimerTaskManageWidget.onTimerTaskIsError)
|
self.__timer_task_poller.taskRunning.connect(self.__ALTimerTaskManageWidget.onTimerTaskIsRunning)
|
||||||
self.__alTimerTaskManageWidget.timerTaskIsReady.connect(self.onTimerTaskIsReady)
|
self.__timer_task_poller.taskExecuted.connect(self.__ALTimerTaskManageWidget.onTimerTaskIsExecuted)
|
||||||
self.__alTimerTaskManageWidget.timerTaskManageWidgetIsClosed.connect(self.onTimerTaskManageWidgetClosed)
|
self.__timer_task_poller.taskError.connect(self.__ALTimerTaskManageWidget.onTimerTaskIsError)
|
||||||
self.__alTimerTaskManageWidget.setWindowFlags(Qt.WindowType.Window|Qt.WindowType.WindowCloseButtonHint)
|
self.__ALTimerTaskManageWidget.timerTaskIsReady.connect(self.__timer_task_poller.enqueue)
|
||||||
|
self.__ALTimerTaskManageWidget.timerTaskManageWidgetIsClosed.connect(self.onTimerTaskManageWidgetClosed)
|
||||||
def onAboutActionTriggered(
|
self.__ALTimerTaskManageWidget.setWindowFlags(Qt.WindowType.Window|Qt.WindowType.WindowCloseButtonHint)
|
||||||
self
|
|
||||||
):
|
|
||||||
|
|
||||||
AboutDialog = ALAboutDialog(self)
|
|
||||||
AboutDialog.exec()
|
|
||||||
|
|
||||||
def onManualActionTriggered(
|
|
||||||
self
|
|
||||||
):
|
|
||||||
|
|
||||||
Url = QUrl("https://www.autolibrary.kenanzhu.com/manuals")
|
|
||||||
QDesktopServices.openUrl(Url)
|
|
||||||
|
|
||||||
def setupTray(
|
def setupTray(
|
||||||
self
|
self
|
||||||
@@ -135,8 +133,8 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
|||||||
self.TrayMenu.addSeparator()
|
self.TrayMenu.addSeparator()
|
||||||
self.TrayMenu.addAction("退出", self.close)
|
self.TrayMenu.addAction("退出", self.close)
|
||||||
self.TrayIcon.setContextMenu(self.TrayMenu)
|
self.TrayIcon.setContextMenu(self.TrayMenu)
|
||||||
|
|
||||||
self.TrayIcon.activated.connect(self.onTrayIconActivated)
|
self.TrayIcon.activated.connect(self.onTrayIconActivated)
|
||||||
|
self.TrayIcon.messageClicked.connect(self.onTrayMessageClicked)
|
||||||
self.TrayIcon.show()
|
self.TrayIcon.show()
|
||||||
|
|
||||||
def hideToTray(
|
def hideToTray(
|
||||||
@@ -144,6 +142,9 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
|||||||
):
|
):
|
||||||
|
|
||||||
self.hide()
|
self.hide()
|
||||||
|
self.__notification_type = ""
|
||||||
|
if not hasattr(self, "TrayIcon"):
|
||||||
|
return
|
||||||
self.TrayIcon.showMessage(
|
self.TrayIcon.showMessage(
|
||||||
"AutoLibrary",
|
"AutoLibrary",
|
||||||
"\n已最小化到托盘",
|
"\n已最小化到托盘",
|
||||||
@@ -151,14 +152,6 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
|||||||
2000
|
2000
|
||||||
)
|
)
|
||||||
|
|
||||||
def onTrayIconActivated(
|
|
||||||
self,
|
|
||||||
reason: QSystemTrayIcon.ActivationReason
|
|
||||||
):
|
|
||||||
|
|
||||||
if reason == QSystemTrayIcon.DoubleClick:
|
|
||||||
self.showNormal()
|
|
||||||
|
|
||||||
def connectSignals(
|
def connectSignals(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
@@ -169,6 +162,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
|||||||
self.StopButton.clicked.connect(self.onStopButtonClicked)
|
self.StopButton.clicked.connect(self.onStopButtonClicked)
|
||||||
self.SendButton.clicked.connect(self.onSendButtonClicked)
|
self.SendButton.clicked.connect(self.onSendButtonClicked)
|
||||||
self.MessageEdit.returnPressed.connect(self.onSendButtonClicked)
|
self.MessageEdit.returnPressed.connect(self.onSendButtonClicked)
|
||||||
|
self.__bulletin_poller.newBulletinsDetected.connect(self.onBulletinPollerNewBulletins)
|
||||||
|
|
||||||
def closeEvent(
|
def closeEvent(
|
||||||
self,
|
self,
|
||||||
@@ -181,20 +175,22 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
|||||||
return
|
return
|
||||||
if self.__msg_queue_timer and self.__msg_queue_timer.isActive():
|
if self.__msg_queue_timer and self.__msg_queue_timer.isActive():
|
||||||
self.__msg_queue_timer.stop()
|
self.__msg_queue_timer.stop()
|
||||||
if self.__timer_task_timer and self.__timer_task_timer.isActive():
|
if self.__timer_task_poller:
|
||||||
self.__timer_task_timer.stop()
|
self.__timer_task_poller.stop()
|
||||||
if self.__is_running_timer_task:
|
if self.__ALTimerTaskManageWidget:
|
||||||
self.__current_timer_task_thread.wait(2000)
|
self.__ALTimerTaskManageWidget.close()
|
||||||
self.__current_timer_task_thread.deleteLater()
|
self.__ALTimerTaskManageWidget.deleteLater()
|
||||||
if self.__alTimerTaskManageWidget:
|
if self.__ALConfigWidget:
|
||||||
self.__alTimerTaskManageWidget.close()
|
self.__ALConfigWidget.close()
|
||||||
self.__alTimerTaskManageWidget.deleteLater()
|
|
||||||
if self.__alConfigWidget:
|
|
||||||
self.__alConfigWidget.close()
|
|
||||||
# the config widget is already deleted in the 'self.onConfigWidgetClosed'
|
# the config widget is already deleted in the 'self.onConfigWidgetClosed'
|
||||||
if self.__alSettingsWidget:
|
if self.__ALSettingsWidget:
|
||||||
self.__alSettingsWidget.close()
|
self.__ALSettingsWidget.close()
|
||||||
# the settings widget is already deleted in the 'self.onSettingsWidgetClosed'
|
# the settings widget is already deleted in the 'self.onSettingsWidgetClosed'
|
||||||
|
if self.__ALBulletinDialog:
|
||||||
|
self.__ALBulletinDialog.close()
|
||||||
|
# the bulletin dialog is already deleted in the 'self.onBulletinDialogClosed'
|
||||||
|
if self.__bulletin_poller:
|
||||||
|
self.__bulletin_poller.stop()
|
||||||
self._showLog("主窗口关闭")
|
self._showLog("主窗口关闭")
|
||||||
QMainWindow.closeEvent(self, event)
|
QMainWindow.closeEvent(self, event)
|
||||||
|
|
||||||
@@ -219,47 +215,6 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
|||||||
self.__msg_queue_timer.timeout.connect(self.pollMsgQueue)
|
self.__msg_queue_timer.timeout.connect(self.pollMsgQueue)
|
||||||
self.__msg_queue_timer.start(100)
|
self.__msg_queue_timer.start(100)
|
||||||
|
|
||||||
def startTimerTaskPolling(
|
|
||||||
self
|
|
||||||
):
|
|
||||||
|
|
||||||
self.__timer_task_timer = QTimer()
|
|
||||||
self.__timer_task_timer.timeout.connect(self.pollTimerTaskQueue)
|
|
||||||
self.__timer_task_timer.start(500)
|
|
||||||
|
|
||||||
def pollTimerTaskQueue(
|
|
||||||
self
|
|
||||||
):
|
|
||||||
|
|
||||||
if self.__is_running_timer_task:
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
while not self.__is_running_timer_task:
|
|
||||||
timer_task = self.__timer_task_queue.get_nowait()
|
|
||||||
self.timerTaskIsRunning.emit(timer_task)
|
|
||||||
self.__timer_task_timer.stop()
|
|
||||||
self.__is_running_timer_task = True
|
|
||||||
self.setControlButtons(None, True, False)
|
|
||||||
if not timer_task["silent"]:
|
|
||||||
self.TrayIcon.showMessage(
|
|
||||||
"定时任务 - AutoLibrary",
|
|
||||||
f"\n已开始执行定时任务: \n{timer_task['name']}",
|
|
||||||
QSystemTrayIcon.MessageIcon.Information,
|
|
||||||
1000
|
|
||||||
)
|
|
||||||
self.showNormal()
|
|
||||||
self.__current_timer_task_thread = TimerTaskWorker(
|
|
||||||
timer_task,
|
|
||||||
self._input_queue,
|
|
||||||
self._output_queue,
|
|
||||||
self.__config_paths
|
|
||||||
)
|
|
||||||
self.__current_timer_task_thread.timerTaskWorkerIsFinished.connect(self.onTimerTaskFinished)
|
|
||||||
self.__current_timer_task_thread.start()
|
|
||||||
except queue.Empty:
|
|
||||||
self.__is_running_timer_task = False
|
|
||||||
pass
|
|
||||||
|
|
||||||
def setControlButtons(
|
def setControlButtons(
|
||||||
self,
|
self,
|
||||||
config_button_enabled: bool,
|
config_button_enabled: bool,
|
||||||
@@ -287,6 +242,145 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
|||||||
except queue.Empty:
|
except queue.Empty:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@Slot(int)
|
||||||
|
def onBulletinPollerNewBulletins(
|
||||||
|
self,
|
||||||
|
count: int
|
||||||
|
):
|
||||||
|
|
||||||
|
if not hasattr(self, "TrayIcon"):
|
||||||
|
return
|
||||||
|
self.__notification_type = "bulletin"
|
||||||
|
self.TrayIcon.showMessage(
|
||||||
|
"公告栏 - AutoLibrary",
|
||||||
|
f"有 {count} 条新公告,点击查看详情。",
|
||||||
|
QSystemTrayIcon.MessageIcon.Information,
|
||||||
|
3000
|
||||||
|
)
|
||||||
|
|
||||||
|
@Slot(dict)
|
||||||
|
def onTimerTaskRunning(
|
||||||
|
self,
|
||||||
|
timer_task: dict
|
||||||
|
):
|
||||||
|
|
||||||
|
self.setControlButtons(None, True, False)
|
||||||
|
self.__notification_type = ""
|
||||||
|
if not hasattr(self, "TrayIcon"):
|
||||||
|
return
|
||||||
|
if not timer_task.get("silent", False):
|
||||||
|
self.TrayIcon.showMessage(
|
||||||
|
"定时任务 - AutoLibrary",
|
||||||
|
f"\n已开始执行定时任务: \n{timer_task['name']}",
|
||||||
|
QSystemTrayIcon.MessageIcon.Information,
|
||||||
|
1000
|
||||||
|
)
|
||||||
|
self.showNormal()
|
||||||
|
|
||||||
|
@Slot(bool, dict)
|
||||||
|
def onTimerTaskFinished(
|
||||||
|
self,
|
||||||
|
is_error: bool,
|
||||||
|
timer_task: dict
|
||||||
|
):
|
||||||
|
|
||||||
|
self.setControlButtons(None, False, True)
|
||||||
|
self.__notification_type = ""
|
||||||
|
if not hasattr(self, "TrayIcon"):
|
||||||
|
return
|
||||||
|
self.TrayIcon.showMessage(
|
||||||
|
"定时任务 - AutoLibrary",
|
||||||
|
f"\n定时任务 '{timer_task['name']}' 执行{'失败' if is_error else '完成'}",
|
||||||
|
QSystemTrayIcon.MessageIcon.Warning if is_error else QSystemTrayIcon.MessageIcon.Information,
|
||||||
|
1000
|
||||||
|
)
|
||||||
|
self._showTrace(
|
||||||
|
f"定时任务 {timer_task['name']} 执行{'失败' if is_error else '完成'}, uuid: {timer_task['uuid']}"
|
||||||
|
)
|
||||||
|
|
||||||
|
@Slot(dict)
|
||||||
|
def onCheckUpdateIsFinished(
|
||||||
|
self,
|
||||||
|
data: dict
|
||||||
|
):
|
||||||
|
|
||||||
|
worker = self.sender()
|
||||||
|
if worker is not self.__check_update_worker:
|
||||||
|
return
|
||||||
|
worker.checkUpdateWorkerIsFinished.disconnect(self.onCheckUpdateIsFinished)
|
||||||
|
worker.checkUpdateWorkerFinishedWithError.disconnect(self.onCheckUpdateFinishedWithError)
|
||||||
|
worker.wait(3000)
|
||||||
|
worker.deleteLater()
|
||||||
|
self.__check_update_worker = None
|
||||||
|
tag_name = data.get("tag_name", "")
|
||||||
|
html_url = data.get("html_url", "")
|
||||||
|
latest_version = tag_name.lstrip("v")
|
||||||
|
try:
|
||||||
|
local_ver = ver.Version(AL_VERSION)
|
||||||
|
remote_ver = ver.Version(latest_version)
|
||||||
|
except ver.InvalidVersion:
|
||||||
|
self._showTrace("版本号解析失败, 无法比较版本", self.TraceLevel.WARNING)
|
||||||
|
return
|
||||||
|
if remote_ver > local_ver:
|
||||||
|
ALCheckUpdateDialog.showResult(
|
||||||
|
self,
|
||||||
|
has_update=True,
|
||||||
|
current_version=AL_VERSION,
|
||||||
|
latest_version=latest_version,
|
||||||
|
tag_name=tag_name,
|
||||||
|
html_url=html_url
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
ALCheckUpdateDialog.showResult(
|
||||||
|
self,
|
||||||
|
has_update=False,
|
||||||
|
current_version=AL_VERSION
|
||||||
|
)
|
||||||
|
self._showLog("检查更新完成")
|
||||||
|
|
||||||
|
@Slot(str)
|
||||||
|
def onCheckUpdateFinishedWithError(
|
||||||
|
self,
|
||||||
|
error_message: str
|
||||||
|
):
|
||||||
|
|
||||||
|
worker = self.sender()
|
||||||
|
if worker is not self.__check_update_worker:
|
||||||
|
return
|
||||||
|
worker.checkUpdateWorkerIsFinished.disconnect(self.onCheckUpdateIsFinished)
|
||||||
|
worker.checkUpdateWorkerFinishedWithError.disconnect(self.onCheckUpdateFinishedWithError)
|
||||||
|
worker.wait(3000)
|
||||||
|
worker.deleteLater()
|
||||||
|
self.__check_update_worker = None
|
||||||
|
QMessageBox.warning(
|
||||||
|
self,
|
||||||
|
"检查更新 - AutoLibrary",
|
||||||
|
f"检查更新失败: \n{error_message}",
|
||||||
|
)
|
||||||
|
self._showLog("检查更新失败")
|
||||||
|
|
||||||
|
@Slot()
|
||||||
|
def onBulletinDialogClosed(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
if self.__ALBulletinDialog:
|
||||||
|
self.__ALBulletinDialog.finished.disconnect(self.onBulletinDialogClosed)
|
||||||
|
self.__ALBulletinDialog.deleteLater()
|
||||||
|
self.__ALBulletinDialog = None
|
||||||
|
self.__bulletin_poller.setDialogOpen(False)
|
||||||
|
|
||||||
|
@Slot()
|
||||||
|
def onSettingsWidgetClosed(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
if self.__ALSettingsWidget:
|
||||||
|
self.__ALSettingsWidget.settingsWidgetIsClosed.disconnect(self.onSettingsWidgetClosed)
|
||||||
|
self.__ALSettingsWidget.deleteLater()
|
||||||
|
self.__ALSettingsWidget = None
|
||||||
|
self.SettingsAction.setEnabled(True)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onTimerTaskManageWidgetClosed(
|
def onTimerTaskManageWidgetClosed(
|
||||||
self
|
self
|
||||||
@@ -299,84 +393,106 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
if self.__alConfigWidget:
|
if self.__ALConfigWidget:
|
||||||
self.__alConfigWidget.configWidgetIsClosed.disconnect(self.onConfigWidgetClosed)
|
self.__ALConfigWidget.configWidgetIsClosed.disconnect(self.onConfigWidgetClosed)
|
||||||
self.__alConfigWidget.deleteLater()
|
self.__ALConfigWidget.deleteLater()
|
||||||
self.__alConfigWidget = None
|
self.__ALConfigWidget = None
|
||||||
self.__config_paths = ConfigUtils.getAutomationConfigPaths()
|
self.__config_paths = ConfigUtils.getAutomationConfigPaths()
|
||||||
|
self.__timer_task_poller.updateConfigPaths(self.__config_paths)
|
||||||
self.setControlButtons(True, None, None)
|
self.setControlButtons(True, None, None)
|
||||||
self._showLog("配置窗口已关闭,配置文件路径已更新")
|
self._showLog("配置窗口已关闭,配置文件路径已更新")
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onSettingsWidgetClosed(
|
def onBulletinActionTriggered(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
if self.__alSettingsWidget:
|
if self.__ALBulletinDialog is None:
|
||||||
self.__alSettingsWidget.settingsWidgetIsClosed.disconnect(self.onSettingsWidgetClosed)
|
self.__ALBulletinDialog = ALBulletinDialog(self)
|
||||||
self.__alSettingsWidget.deleteLater()
|
self.__ALBulletinDialog.finished.connect(self.onBulletinDialogClosed)
|
||||||
self.__alSettingsWidget = None
|
self.__bulletin_poller.setDialogOpen(True)
|
||||||
self.SettingsAction.setEnabled(True)
|
self.__ALBulletinDialog.show()
|
||||||
|
self.__ALBulletinDialog.raise_()
|
||||||
|
self.__ALBulletinDialog.activateWindow()
|
||||||
|
self._showLog("打开公告栏窗口")
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onSettingsActionTriggered(
|
def onSettingsActionTriggered(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
if self.__alSettingsWidget is None:
|
if self.__ALSettingsWidget is None:
|
||||||
self.__alSettingsWidget = ALSettingsWidget(self)
|
self.__ALSettingsWidget = ALSettingsWidget(self)
|
||||||
self.__alSettingsWidget.settingsWidgetIsClosed.connect(self.onSettingsWidgetClosed)
|
self.__ALSettingsWidget.settingsWidgetIsClosed.connect(self.onSettingsWidgetClosed)
|
||||||
self.__alSettingsWidget.show()
|
self.__ALSettingsWidget.openBulletinRequested.connect(self.onBulletinActionTriggered)
|
||||||
self.__alSettingsWidget.raise_()
|
self.__ALSettingsWidget.show()
|
||||||
self.__alSettingsWidget.activateWindow()
|
self.__ALSettingsWidget.raise_()
|
||||||
|
self.__ALSettingsWidget.activateWindow()
|
||||||
self.SettingsAction.setEnabled(False)
|
self.SettingsAction.setEnabled(False)
|
||||||
self._showLog("打开全局设置窗口")
|
self._showLog("打开全局设置窗口")
|
||||||
|
|
||||||
@Slot(dict)
|
@Slot()
|
||||||
def onTimerTaskIsReady(
|
def onAboutActionTriggered(
|
||||||
self,
|
self
|
||||||
timer_task: dict
|
|
||||||
):
|
):
|
||||||
|
|
||||||
self.__timer_task_queue.put(timer_task)
|
AboutDialog = ALAboutDialog(self)
|
||||||
|
AboutDialog.exec()
|
||||||
|
|
||||||
@Slot(dict)
|
@Slot()
|
||||||
def onTimerTaskFinished(
|
def onManualActionTriggered(
|
||||||
self,
|
self
|
||||||
is_error: bool,
|
|
||||||
timer_task: dict
|
|
||||||
):
|
):
|
||||||
|
|
||||||
self.__current_timer_task_thread.wait(1000)
|
url = QUrl("https://manuals.autolibrary.kenanzhu.com")
|
||||||
self.__current_timer_task_thread.timerTaskWorkerIsFinished.disconnect(self.onTimerTaskFinished)
|
QDesktopServices.openUrl(url)
|
||||||
self.__current_timer_task_thread.deleteLater()
|
|
||||||
self.__current_timer_task_thread = None
|
@Slot()
|
||||||
self.setControlButtons(None, False, True)
|
def onCheckUpdateActionTriggered(
|
||||||
self.__is_running_timer_task = False
|
self
|
||||||
self.__timer_task_timer.start(500)
|
):
|
||||||
timer_task["executed"] = True
|
|
||||||
self.TrayIcon.showMessage(
|
if hasattr(self, '__check_update_worker') and self.__check_update_worker is not None:
|
||||||
"定时任务 - AutoLibrary",
|
return
|
||||||
f"\n定时任务 '{timer_task['name']}' 执行{'失败' if is_error else '完成'}",
|
self.__check_update_worker = ALCheckUpdateWorker(self)
|
||||||
QSystemTrayIcon.MessageIcon.Warning if is_error else QSystemTrayIcon.MessageIcon.Information,
|
self.__check_update_worker.checkUpdateWorkerIsFinished.connect(self.onCheckUpdateIsFinished)
|
||||||
1000
|
self.__check_update_worker.checkUpdateWorkerFinishedWithError.connect(self.onCheckUpdateFinishedWithError)
|
||||||
)
|
self.__check_update_worker.start()
|
||||||
self._showTrace(
|
self._showLog("正在检查更新...")
|
||||||
f"定时任务 {timer_task['name']} 执行{'失败' if is_error else '完成'}, uuid: {timer_task['uuid']}"
|
|
||||||
)
|
@Slot()
|
||||||
if not is_error:
|
def onTrayMessageClicked(
|
||||||
self.timerTaskIsExecuted.emit(timer_task)
|
self
|
||||||
else:
|
):
|
||||||
self.timerTaskIsError.emit(timer_task)
|
|
||||||
|
if self.__notification_type == "bulletin":
|
||||||
|
self.__notification_type = ""
|
||||||
|
self.onBulletinActionTriggered()
|
||||||
|
|
||||||
|
@Slot(QSystemTrayIcon.ActivationReason)
|
||||||
|
def onTrayIconActivated(
|
||||||
|
self,
|
||||||
|
reason: QSystemTrayIcon.ActivationReason
|
||||||
|
):
|
||||||
|
|
||||||
|
if reason == QSystemTrayIcon.DoubleClick:
|
||||||
|
self.showNormal()
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onTimerTaskManageWidgetButtonClicked(
|
def onTimerTaskManageWidgetButtonClicked(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
self.__alTimerTaskManageWidget.show()
|
if self.__ALTimerTaskManageWidget is None:
|
||||||
self.__alTimerTaskManageWidget.raise_()
|
QMessageBox.warning(
|
||||||
self.__alTimerTaskManageWidget.activateWindow()
|
self,
|
||||||
|
"警告 - AutoLibrary",
|
||||||
|
"定时任务功能初始化失败, 请检查配置文件。"
|
||||||
|
)
|
||||||
|
return
|
||||||
|
self.__ALTimerTaskManageWidget.show()
|
||||||
|
self.__ALTimerTaskManageWidget.raise_()
|
||||||
|
self.__ALTimerTaskManageWidget.activateWindow()
|
||||||
self.TimerTaskManageWidgetButton.setEnabled(False)
|
self.TimerTaskManageWidgetButton.setEnabled(False)
|
||||||
self._showLog("打开定时任务管理窗口")
|
self._showLog("打开定时任务管理窗口")
|
||||||
|
|
||||||
@@ -385,12 +501,12 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
if self.__alConfigWidget is None:
|
if self.__ALConfigWidget is None:
|
||||||
self.__alConfigWidget = ALConfigWidget(self)
|
self.__ALConfigWidget = ALConfigWidget(self)
|
||||||
self.__alConfigWidget.configWidgetIsClosed.connect(self.onConfigWidgetClosed)
|
self.__ALConfigWidget.configWidgetIsClosed.connect(self.onConfigWidgetClosed)
|
||||||
self.__alConfigWidget.show()
|
self.__ALConfigWidget.show()
|
||||||
self.__alConfigWidget.raise_()
|
self.__ALConfigWidget.raise_()
|
||||||
self.__alConfigWidget.activateWindow()
|
self.__ALConfigWidget.activateWindow()
|
||||||
self.ConfigButton.setEnabled(False)
|
self.ConfigButton.setEnabled(False)
|
||||||
self._showLog("打开配置窗口")
|
self._showLog("打开配置窗口")
|
||||||
|
|
||||||
|
|||||||
@@ -24,9 +24,9 @@ from PySide6.QtWidgets import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
from gui.ALSeatMapView import ALSeatMapView
|
from gui.ALSeatMapView import ALSeatMapView
|
||||||
|
from gui.ALWidgetMixin import CenterOnParentMixin
|
||||||
|
|
||||||
|
class ALSeatMapSelectDialog(CenterOnParentMixin, QDialog):
|
||||||
class ALSeatMapSelectDialog(QDialog):
|
|
||||||
|
|
||||||
seatMapSelectDialogIsClosed = Signal(list)
|
seatMapSelectDialogIsClosed = Signal(list)
|
||||||
|
|
||||||
@@ -55,7 +55,6 @@ class ALSeatMapSelectDialog(QDialog):
|
|||||||
self.setMinimumSize(800, 600)
|
self.setMinimumSize(800, 600)
|
||||||
self.resize(800, 600)
|
self.resize(800, 600)
|
||||||
self.setWindowTitle(f"选择楼层座位 - AutoLibrary")
|
self.setWindowTitle(f"选择楼层座位 - AutoLibrary")
|
||||||
|
|
||||||
self.SeatMapWidgetMainLayout = QVBoxLayout(self)
|
self.SeatMapWidgetMainLayout = QVBoxLayout(self)
|
||||||
self.SeatMapWidgetMainLayout.setContentsMargins(5, 5, 5, 5)
|
self.SeatMapWidgetMainLayout.setContentsMargins(5, 5, 5, 5)
|
||||||
self.SeatMapWidgetMainLayout.setSpacing(5)
|
self.SeatMapWidgetMainLayout.setSpacing(5)
|
||||||
@@ -63,10 +62,8 @@ class ALSeatMapSelectDialog(QDialog):
|
|||||||
self.TitleLabel.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
self.TitleLabel.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||||
self.TitleLabel.setStyleSheet("font-size: 16px; font-weight: bold; margin: 10px;")
|
self.TitleLabel.setStyleSheet("font-size: 16px; font-weight: bold; margin: 10px;")
|
||||||
self.SeatMapWidgetMainLayout.addWidget(self.TitleLabel)
|
self.SeatMapWidgetMainLayout.addWidget(self.TitleLabel)
|
||||||
|
|
||||||
self.SeatMapGraphicsView = ALSeatMapView(None, self.__seats_data)
|
self.SeatMapGraphicsView = ALSeatMapView(None, self.__seats_data)
|
||||||
self.SeatMapWidgetMainLayout.addWidget(self.SeatMapGraphicsView)
|
self.SeatMapWidgetMainLayout.addWidget(self.SeatMapGraphicsView)
|
||||||
|
|
||||||
self.TipsLabel = QLabel(
|
self.TipsLabel = QLabel(
|
||||||
" 点击座位进行选择/取消选择, 最多选择1个座位 \n"
|
" 点击座位进行选择/取消选择, 最多选择1个座位 \n"
|
||||||
" [操作方法: Ctrl+鼠标滚轮缩放 | 滚轮/拖拽/方向键 移动]"
|
" [操作方法: Ctrl+鼠标滚轮缩放 | 滚轮/拖拽/方向键 移动]"
|
||||||
@@ -74,7 +71,6 @@ class ALSeatMapSelectDialog(QDialog):
|
|||||||
self.TipsLabel.setAlignment(Qt.AlignmentFlag.AlignLeft)
|
self.TipsLabel.setAlignment(Qt.AlignmentFlag.AlignLeft)
|
||||||
self.TipsLabel.setStyleSheet("color: #666; margin: 5px;")
|
self.TipsLabel.setStyleSheet("color: #666; margin: 5px;")
|
||||||
self.SeatMapWidgetMainLayout.addWidget(self.TipsLabel)
|
self.SeatMapWidgetMainLayout.addWidget(self.TipsLabel)
|
||||||
|
|
||||||
self.ConfirmButton = QPushButton("确认")
|
self.ConfirmButton = QPushButton("确认")
|
||||||
self.ConfirmButton.setFixedSize(80, 25)
|
self.ConfirmButton.setFixedSize(80, 25)
|
||||||
self.ConfirmButton.setAutoDefault(True)
|
self.ConfirmButton.setAutoDefault(True)
|
||||||
@@ -96,29 +92,6 @@ class ALSeatMapSelectDialog(QDialog):
|
|||||||
self.ConfirmButton.clicked.connect(self.onConfirmButtonClicked)
|
self.ConfirmButton.clicked.connect(self.onConfirmButtonClicked)
|
||||||
self.CancelButton.clicked.connect(self.onCancelButtonClicked)
|
self.CancelButton.clicked.connect(self.onCancelButtonClicked)
|
||||||
|
|
||||||
def showEvent(
|
|
||||||
self,
|
|
||||||
event
|
|
||||||
):
|
|
||||||
|
|
||||||
result = super().showEvent(event)
|
|
||||||
|
|
||||||
screen_rect = self.screen().geometry()
|
|
||||||
target_pos = self.parent().geometry().center()
|
|
||||||
target_pos.setX(target_pos.x() - self.width()//2)
|
|
||||||
target_pos.setY(target_pos.y() - self.height()//2)
|
|
||||||
if target_pos.x() < 0:
|
|
||||||
target_pos.setX(0)
|
|
||||||
if target_pos.x() + self.width() > screen_rect.width():
|
|
||||||
target_pos.setX(screen_rect.width() - self.width())
|
|
||||||
if target_pos.y() < 0:
|
|
||||||
target_pos.setY(0)
|
|
||||||
if target_pos.y() + self.height() > screen_rect.height():
|
|
||||||
target_pos.setY(screen_rect.height() - self.height())
|
|
||||||
self.move(target_pos)
|
|
||||||
|
|
||||||
return result
|
|
||||||
|
|
||||||
def closeEvent(
|
def closeEvent(
|
||||||
self,
|
self,
|
||||||
event: QCloseEvent
|
event: QCloseEvent
|
||||||
|
|||||||
@@ -85,11 +85,9 @@ class ALSeatMapView(QGraphicsView):
|
|||||||
self.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
|
self.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
|
||||||
self.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
|
self.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
|
||||||
self.viewport().installEventFilter(self)
|
self.viewport().installEventFilter(self)
|
||||||
|
|
||||||
self.SeatsContainerWidget = QWidget()
|
self.SeatsContainerWidget = QWidget()
|
||||||
self.SeatsContainerLayout = QGridLayout(self.SeatsContainerWidget)
|
self.SeatsContainerLayout = QGridLayout(self.SeatsContainerWidget)
|
||||||
self.setupSeatMap()
|
self.setupSeatMap()
|
||||||
|
|
||||||
self.ContainerProxy = self.SeatMapGraphicsScene.addWidget(self.SeatsContainerWidget)
|
self.ContainerProxy = self.SeatMapGraphicsScene.addWidget(self.SeatsContainerWidget)
|
||||||
self.ContainerProxy.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable, False)
|
self.ContainerProxy.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable, False)
|
||||||
|
|
||||||
|
|||||||
+249
-145
@@ -9,18 +9,20 @@ See the LICENSE file for details.
|
|||||||
"""
|
"""
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
import time
|
||||||
|
|
||||||
|
import requests
|
||||||
import qtawesome as qta
|
import qtawesome as qta
|
||||||
|
|
||||||
from PySide6.QtCore import (
|
from PySide6.QtCore import (
|
||||||
QProcess,
|
QProcess,
|
||||||
Qt,
|
Qt,
|
||||||
|
QTimer,
|
||||||
Signal,
|
Signal,
|
||||||
Slot
|
Slot
|
||||||
)
|
)
|
||||||
from PySide6.QtGui import (
|
from PySide6.QtGui import (
|
||||||
QCloseEvent,
|
QCloseEvent
|
||||||
QShowEvent
|
|
||||||
)
|
)
|
||||||
from PySide6.QtWidgets import (
|
from PySide6.QtWidgets import (
|
||||||
QApplication,
|
QApplication,
|
||||||
@@ -31,6 +33,7 @@ from PySide6.QtWidgets import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
import managers.config.ConfigManager as ConfigManager
|
import managers.config.ConfigManager as ConfigManager
|
||||||
|
from managers.bulletin.BulletinManager import instance as bulletinInstance
|
||||||
from managers.log.LogManager import instance as logInstance
|
from managers.log.LogManager import instance as logInstance
|
||||||
from managers.theme.ThemeManager import(
|
from managers.theme.ThemeManager import(
|
||||||
getActiveStyle,
|
getActiveStyle,
|
||||||
@@ -38,6 +41,8 @@ from managers.theme.ThemeManager import(
|
|||||||
instance as themeInstance
|
instance as themeInstance
|
||||||
)
|
)
|
||||||
|
|
||||||
|
from gui.ALBulletinWorker import ALBulletinFetchWorker
|
||||||
|
from gui.ALWidgetMixin import CenterOnParentMixin
|
||||||
from gui.resources.ui.Ui_ALSettingsWidget import Ui_ALSettingsWidget
|
from gui.resources.ui.Ui_ALSettingsWidget import Ui_ALSettingsWidget
|
||||||
from interfaces.ConfigProvider import (
|
from interfaces.ConfigProvider import (
|
||||||
CfgKey,
|
CfgKey,
|
||||||
@@ -83,9 +88,10 @@ def _restartApp(
|
|||||||
QProcess.startDetached(sys.executable, sys.argv)
|
QProcess.startDetached(sys.executable, sys.argv)
|
||||||
|
|
||||||
|
|
||||||
class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
class ALSettingsWidget(CenterOnParentMixin, QWidget, Ui_ALSettingsWidget):
|
||||||
|
|
||||||
settingsWidgetIsClosed = Signal()
|
settingsWidgetIsClosed = Signal()
|
||||||
|
openBulletinRequested = Signal()
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
@@ -96,33 +102,48 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
self.__original_theme: str = ""
|
self.__original_theme: str = ""
|
||||||
self.__original_custom_theme: str = ""
|
self.__original_custom_theme: str = ""
|
||||||
self.__original_style: str = ""
|
self.__original_style: str = ""
|
||||||
|
self.__original_bulletin_url: str = ""
|
||||||
|
self.__original_bulletin_auto_fetch: bool = False
|
||||||
|
self.__original_bulletin_sync_interval: int = 10
|
||||||
|
|
||||||
self.setupUi(self)
|
self.setupUi(self)
|
||||||
self.modifyUi()
|
self.modifyUi()
|
||||||
self.connectSignals()
|
self.connectSignals()
|
||||||
self.loadSettings()
|
self.loadSettings()
|
||||||
|
|
||||||
|
def closeEvent(
|
||||||
|
self,
|
||||||
|
event: QCloseEvent
|
||||||
|
):
|
||||||
|
|
||||||
|
if hasattr(self, '__bulletin_test_worker') and self.__bulletin_test_worker is not None:
|
||||||
|
self.__bulletin_test_worker.wait(3000)
|
||||||
|
self.settingsWidgetIsClosed.emit()
|
||||||
|
super().closeEvent(event)
|
||||||
|
|
||||||
def modifyUi(
|
def modifyUi(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
self.setWindowFlags(Qt.WindowType.Window)
|
self.setWindowFlags(Qt.WindowType.Window)
|
||||||
self.NavigationList.setCurrentRow(0)
|
|
||||||
self.populateStyles()
|
|
||||||
self.setNavigationIcons()
|
self.setNavigationIcons()
|
||||||
color = QApplication.instance().palette().color(
|
color = QApplication.instance().palette().color(
|
||||||
QApplication.instance().palette().ColorRole.WindowText
|
QApplication.instance().palette().ColorRole.WindowText
|
||||||
).name()
|
).name()
|
||||||
self.BrowseQssButton.setIcon(qta.icon("fa6s.plus", color=color))
|
self.ImportCustomThemeButton.setIcon(qta.icon("fa6s.plus", color=color))
|
||||||
self.BrowseQssButton.setText("")
|
self.ImportCustomThemeButton.setText("")
|
||||||
self.RemoveThemeButton.setIcon(qta.icon("fa6s.minus", color=color))
|
self.RemoveCustomThemeButton.setIcon(qta.icon("fa6s.minus", color=color))
|
||||||
self.RemoveThemeButton.setText("")
|
self.RemoveCustomThemeButton.setText("")
|
||||||
self.ThemeInfoLabel.setTextFormat(Qt.TextFormat.RichText)
|
self.CustomThemeInfoLabel.setTextFormat(Qt.TextFormat.RichText)
|
||||||
self.ThemeInfoLabel.setStyleSheet(
|
self.CustomThemeInfoLabel.setStyleSheet(
|
||||||
"border: 1px solid palette(mid);"\
|
"border: 1px solid palette(mid);"\
|
||||||
"border-radius: 2px;"\
|
"border-radius: 2px;"\
|
||||||
"padding: 5px;"
|
"padding: 5px;"
|
||||||
)
|
)
|
||||||
|
self.NavigationList.setCurrentRow(0)
|
||||||
|
self.NavigationList.currentRowChanged.connect(self.PageStack.setCurrentIndex)
|
||||||
|
self.populateStyles()
|
||||||
|
self.populateCustomThemes()
|
||||||
|
|
||||||
def setNavigationIcons(
|
def setNavigationIcons(
|
||||||
self
|
self
|
||||||
@@ -130,9 +151,12 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
|
|
||||||
app : QApplication | None = QApplication.instance()
|
app : QApplication | None = QApplication.instance()
|
||||||
color = app.palette().color(app.palette().ColorRole.WindowText).name()
|
color = app.palette().color(app.palette().ColorRole.WindowText).name()
|
||||||
item = self.NavigationList.item(0)
|
item0 = self.NavigationList.item(0)
|
||||||
if item:
|
if item0:
|
||||||
item.setIcon(qta.icon("fa6s.palette", color=color))
|
item0.setIcon(qta.icon("fa6s.palette", color=color))
|
||||||
|
item1 = self.NavigationList.item(1)
|
||||||
|
if item1:
|
||||||
|
item1.setIcon(qta.icon("fa6s.bullhorn", color=color))
|
||||||
|
|
||||||
def populateStyles(
|
def populateStyles(
|
||||||
self
|
self
|
||||||
@@ -141,51 +165,43 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
self.StyleComboBox.clear()
|
self.StyleComboBox.clear()
|
||||||
self.StyleComboBox.addItems(QStyleFactory.keys())
|
self.StyleComboBox.addItems(QStyleFactory.keys())
|
||||||
|
|
||||||
|
def populateCustomThemes(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.CustomThemeComboBox.blockSignals(True)
|
||||||
|
self.CustomThemeComboBox.clear()
|
||||||
|
self.CustomThemeComboBox.addItem("默认", "")
|
||||||
|
self.__theme_cache = {}
|
||||||
|
themes = themeInstance().listThemes()
|
||||||
|
for t in themes:
|
||||||
|
name = t.get("name", "")
|
||||||
|
file = t.get("file", name)
|
||||||
|
author = t.get("author", "")
|
||||||
|
if name:
|
||||||
|
self.__theme_cache[file] = t
|
||||||
|
self.CustomThemeComboBox.addItem(name, file)
|
||||||
|
self.CustomThemeComboBox.blockSignals(False)
|
||||||
|
|
||||||
def connectSignals(
|
def connectSignals(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
self.BrowseQssButton.clicked.connect(self.onImportThemeButtonClicked)
|
self.ImportCustomThemeButton.clicked.connect(self.onImportCustomThemeButtonClicked)
|
||||||
self.RemoveThemeButton.clicked.connect(self.onRemoveThemeButtonClicked)
|
self.RemoveCustomThemeButton.clicked.connect(self.onRemoveCustomThemeButtonClicked)
|
||||||
self.ThemeComboBox.currentIndexChanged.connect(self.onThemeComboBoxChanged)
|
self.CustomThemeComboBox.currentIndexChanged.connect(self.onCustomThemeComboBoxChanged)
|
||||||
self.ResetThemeButton.clicked.connect(self.onResetThemeButtonClicked)
|
self.ResetCustomThemeButton.clicked.connect(self.onResetCustomThemeButtonClicked)
|
||||||
|
self.BulletinTestButton.clicked.connect(self.onBulletinTestButtonClicked)
|
||||||
|
self.BulletinOpenButton.clicked.connect(self.openBulletinRequested.emit)
|
||||||
self.CancelButton.clicked.connect(self.onCancelButtonClicked)
|
self.CancelButton.clicked.connect(self.onCancelButtonClicked)
|
||||||
self.ApplyButton.clicked.connect(self.onApplyButtonClicked)
|
self.ApplyButton.clicked.connect(self.onApplyButtonClicked)
|
||||||
self.ConfirmButton.clicked.connect(self.onConfirmButtonClicked)
|
self.ConfirmButton.clicked.connect(self.onConfirmButtonClicked)
|
||||||
|
|
||||||
def showEvent(
|
|
||||||
self,
|
|
||||||
event: QShowEvent
|
|
||||||
):
|
|
||||||
|
|
||||||
result = super().showEvent(event)
|
|
||||||
screen_rect = self.screen().geometry()
|
|
||||||
target_pos = self.parent().geometry().center()
|
|
||||||
target_pos.setX(target_pos.x() - self.width()//2)
|
|
||||||
target_pos.setY(target_pos.y() - self.height()//2)
|
|
||||||
if target_pos.x() < 0:
|
|
||||||
target_pos.setX(0)
|
|
||||||
if target_pos.x() + self.width() > screen_rect.width():
|
|
||||||
target_pos.setX(screen_rect.width() - self.width())
|
|
||||||
if target_pos.y() < 0:
|
|
||||||
target_pos.setY(0)
|
|
||||||
if target_pos.y() + self.height() > screen_rect.height():
|
|
||||||
target_pos.setY(screen_rect.height() - self.height())
|
|
||||||
self.move(target_pos)
|
|
||||||
return result
|
|
||||||
|
|
||||||
def closeEvent(
|
|
||||||
self,
|
|
||||||
event: QCloseEvent
|
|
||||||
):
|
|
||||||
|
|
||||||
self.settingsWidgetIsClosed.emit()
|
|
||||||
super().closeEvent(event)
|
|
||||||
|
|
||||||
def loadSettings(
|
def loadSettings(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
|
# appearance settings
|
||||||
theme = self.__cfg_mgr.get(CfgKey.GLOBAL.APPEARANCE.THEME, "system")
|
theme = self.__cfg_mgr.get(CfgKey.GLOBAL.APPEARANCE.THEME, "system")
|
||||||
style = self.__cfg_mgr.get(CfgKey.GLOBAL.APPEARANCE.STYLE, "Fusion")
|
style = self.__cfg_mgr.get(CfgKey.GLOBAL.APPEARANCE.STYLE, "Fusion")
|
||||||
custom_theme = self.__cfg_mgr.get(CfgKey.GLOBAL.APPEARANCE.CUSTOM_THEME, "")
|
custom_theme = self.__cfg_mgr.get(CfgKey.GLOBAL.APPEARANCE.CUSTOM_THEME, "")
|
||||||
@@ -202,33 +218,28 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
if index < 0:
|
if index < 0:
|
||||||
index = 0
|
index = 0
|
||||||
self.StyleComboBox.setCurrentIndex(index)
|
self.StyleComboBox.setCurrentIndex(index)
|
||||||
self.populateThemeList()
|
|
||||||
if custom_theme:
|
if custom_theme:
|
||||||
idx = self.ThemeComboBox.findData(custom_theme)
|
idx = self.CustomThemeComboBox.findData(custom_theme)
|
||||||
if idx >= 0:
|
if idx >= 0:
|
||||||
self.ThemeComboBox.setCurrentIndex(idx)
|
self.CustomThemeComboBox.setCurrentIndex(idx)
|
||||||
self.updateThemeStatus()
|
self.updateCustomThemeInfo()
|
||||||
self.updateThemeInfo()
|
self.updateCustomThemeStatus()
|
||||||
|
# bulletin settings
|
||||||
|
bulletin_mgr = bulletinInstance()
|
||||||
|
self.__original_bulletin_url = bulletin_mgr.serverUrl()
|
||||||
|
self.__original_bulletin_auto_fetch = bulletin_mgr.autoFetch()
|
||||||
|
self.__original_bulletin_sync_interval = bulletin_mgr.syncInterval()
|
||||||
|
self.BulletinServerUrlEdit.setText(self.__original_bulletin_url)
|
||||||
|
self.BulletinAutoFetchCheck.setChecked(self.__original_bulletin_auto_fetch)
|
||||||
|
self.BulletinSyncIntervalSpin.setValue(self.__original_bulletin_sync_interval)
|
||||||
|
|
||||||
def updateThemeStatus(
|
def updateCustomThemeInfo(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
file = self.ThemeComboBox.currentData()
|
file = self.CustomThemeComboBox.currentData()
|
||||||
t = self.__theme_cache.get(file) if file else None
|
|
||||||
name = t.get("name", "") if t else ""
|
|
||||||
if name:
|
|
||||||
self.QssStatusLabel.setText(f"当前使用 {name} 主题。")
|
|
||||||
else:
|
|
||||||
self.QssStatusLabel.setText("当前使用 默认 主题。")
|
|
||||||
|
|
||||||
def updateThemeInfo(
|
|
||||||
self
|
|
||||||
):
|
|
||||||
|
|
||||||
file = self.ThemeComboBox.currentData()
|
|
||||||
if not file:
|
if not file:
|
||||||
self.ThemeInfoLabel.setText("")
|
self.CustomThemeInfoLabel.setText("")
|
||||||
return
|
return
|
||||||
t = self.__theme_cache.get(file)
|
t = self.__theme_cache.get(file)
|
||||||
if t:
|
if t:
|
||||||
@@ -236,13 +247,25 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
author = t.get("author", "未知作者")
|
author = t.get("author", "未知作者")
|
||||||
need_theme = t.get("need_theme", "both")
|
need_theme = t.get("need_theme", "both")
|
||||||
brief = t.get("brief", "没有相关简介")
|
brief = t.get("brief", "没有相关简介")
|
||||||
self.ThemeInfoLabel.setText(
|
self.CustomThemeInfoLabel.setText(
|
||||||
f"<b>{name}</b> - 适用于 <i>{_themeToReadable(need_theme)}</i> 主题<br>"
|
f"<b>{name}</b> - 适用于 <i>{_themeToReadable(need_theme)}</i> 主题<br>"
|
||||||
f"作者:{author}<br><br>"
|
f"作者:{author}<br><br>"
|
||||||
f"{brief}"
|
f"{brief}"
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
self.ThemeInfoLabel.setText("")
|
self.CustomThemeInfoLabel.setText("")
|
||||||
|
|
||||||
|
def updateCustomThemeStatus(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
file = self.CustomThemeComboBox.currentData()
|
||||||
|
t = self.__theme_cache.get(file) if file else None
|
||||||
|
name = t.get("name", "") if t else ""
|
||||||
|
if name:
|
||||||
|
self.CustomThemeStatusLabel.setText(f"当前使用 {name} 主题。")
|
||||||
|
else:
|
||||||
|
self.CustomThemeStatusLabel.setText("当前使用 默认 主题。")
|
||||||
|
|
||||||
def syncRadioFromNeedTheme(
|
def syncRadioFromNeedTheme(
|
||||||
self,
|
self,
|
||||||
@@ -257,10 +280,17 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
elif need_theme == "dark":
|
elif need_theme == "dark":
|
||||||
self.DarkThemeRadio.setChecked(True)
|
self.DarkThemeRadio.setChecked(True)
|
||||||
|
|
||||||
def collectSettings(
|
def clearBulletinTestStatus(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
|
self.BulletinTestStatusLabel.setText("")
|
||||||
|
self.BulletinTestStatusLabel.setStyleSheet("")
|
||||||
|
|
||||||
|
def collectAppearanceSettings(
|
||||||
|
self
|
||||||
|
) -> tuple[str, str, str]:
|
||||||
|
|
||||||
if self.LightThemeRadio.isChecked():
|
if self.LightThemeRadio.isChecked():
|
||||||
theme = "light"
|
theme = "light"
|
||||||
elif self.DarkThemeRadio.isChecked():
|
elif self.DarkThemeRadio.isChecked():
|
||||||
@@ -268,33 +298,61 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
else:
|
else:
|
||||||
theme = "system"
|
theme = "system"
|
||||||
style = self.StyleComboBox.currentText()
|
style = self.StyleComboBox.currentText()
|
||||||
custom_theme = self.ThemeComboBox.currentData() or ""
|
custom_theme = self.CustomThemeComboBox.currentData() or ""
|
||||||
if not custom_theme:
|
if not custom_theme:
|
||||||
custom_theme = ""
|
custom_theme = ""
|
||||||
return theme, style, custom_theme
|
return theme, style, custom_theme
|
||||||
|
|
||||||
def saveAndApply(
|
def collectBulletinSettings(
|
||||||
|
self
|
||||||
|
) -> tuple[str, bool, int]:
|
||||||
|
|
||||||
|
url = self.BulletinServerUrlEdit.text().strip()
|
||||||
|
auto_fetch = self.BulletinAutoFetchCheck.isChecked()
|
||||||
|
sync_interval = self.BulletinSyncIntervalSpin.value()
|
||||||
|
if sync_interval < 1:
|
||||||
|
sync_interval = 5
|
||||||
|
return url, auto_fetch, sync_interval
|
||||||
|
|
||||||
|
def saveAppearanceSettings(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
theme, style, custom_theme = self.collectSettings()
|
theme, style, custom_theme = self.collectAppearanceSettings()
|
||||||
self.__cfg_mgr.set(CfgKey.GLOBAL.APPEARANCE.STYLE, style)
|
self.__cfg_mgr.set(CfgKey.GLOBAL.APPEARANCE.STYLE, style)
|
||||||
self.__cfg_mgr.set(CfgKey.GLOBAL.APPEARANCE.CUSTOM_THEME, custom_theme)
|
self.__cfg_mgr.set(CfgKey.GLOBAL.APPEARANCE.CUSTOM_THEME, custom_theme)
|
||||||
setActiveStyle(style)
|
setActiveStyle(style)
|
||||||
if not _applyCustomTheme(custom_theme, theme):
|
if not _applyCustomTheme(custom_theme, theme):
|
||||||
self.__cfg_mgr.set(CfgKey.GLOBAL.APPEARANCE.CUSTOM_THEME, "")
|
self.__cfg_mgr.set(CfgKey.GLOBAL.APPEARANCE.CUSTOM_THEME, "")
|
||||||
self.syncRadioFromNeedTheme(custom_theme)
|
self.syncRadioFromNeedTheme(custom_theme)
|
||||||
# Re-read theme after syncRadioFromNeedTheme — the radio may have
|
theme, _, _ = self.collectAppearanceSettings()
|
||||||
# changed to match the custom theme's need_theme
|
|
||||||
theme, _, _ = self.collectSettings()
|
|
||||||
self.__cfg_mgr.set(CfgKey.GLOBAL.APPEARANCE.THEME, theme)
|
self.__cfg_mgr.set(CfgKey.GLOBAL.APPEARANCE.THEME, theme)
|
||||||
self.setNavigationIcons()
|
self.setNavigationIcons()
|
||||||
self.updateThemeStatus()
|
self.updateCustomThemeStatus()
|
||||||
self.updateThemeInfo()
|
self.updateCustomThemeInfo()
|
||||||
self.__original_theme = theme
|
self.__original_theme = theme
|
||||||
self.__original_custom_theme = custom_theme if custom_theme else ""
|
self.__original_custom_theme = custom_theme if custom_theme else ""
|
||||||
self.__original_style = getActiveStyle()
|
self.__original_style = getActiveStyle()
|
||||||
|
|
||||||
|
def saveBulletinSettings(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
url, auto_fetch, sync_interval = self.collectBulletinSettings()
|
||||||
|
self.__cfg_mgr.set(CfgKey.GLOBAL.BULLETIN.SERVER_URL, url)
|
||||||
|
self.__cfg_mgr.set(CfgKey.GLOBAL.BULLETIN.AUTO_FETCH, auto_fetch)
|
||||||
|
self.__cfg_mgr.set(CfgKey.GLOBAL.BULLETIN.SYNC_INTERVAL, sync_interval)
|
||||||
|
self.__original_bulletin_url = url
|
||||||
|
self.__original_bulletin_auto_fetch = auto_fetch
|
||||||
|
self.__original_bulletin_sync_interval = sync_interval
|
||||||
|
|
||||||
|
def saveSettings(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.saveBulletinSettings()
|
||||||
|
self.saveAppearanceSettings()
|
||||||
|
|
||||||
def maybeRestart(
|
def maybeRestart(
|
||||||
self
|
self
|
||||||
) -> bool:
|
) -> bool:
|
||||||
@@ -311,30 +369,39 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def populateThemeList(
|
@Slot()
|
||||||
|
def onImportCustomThemeButtonClicked(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
self.ThemeComboBox.blockSignals(True)
|
file_path, _ = QFileDialog.getOpenFileName(
|
||||||
self.ThemeComboBox.clear()
|
self,
|
||||||
self.ThemeComboBox.addItem("默认", "")
|
"导入主题 - AutoLibrary",
|
||||||
self.__theme_cache = {}
|
"",
|
||||||
themes = themeInstance().listThemes()
|
"主题文件 (*.altheme *.qss);;所有文件 (*)"
|
||||||
for t in themes:
|
)
|
||||||
name = t.get("name", "")
|
if not file_path:
|
||||||
file = t.get("file", name)
|
return
|
||||||
author = t.get("author", "")
|
try:
|
||||||
if name:
|
file_id = themeInstance().importTheme(file_path)
|
||||||
self.__theme_cache[file] = t
|
self.populateCustomThemes()
|
||||||
self.ThemeComboBox.addItem(name, file)
|
idx = self.CustomThemeComboBox.findData(file_id)
|
||||||
self.ThemeComboBox.blockSignals(False)
|
if idx >= 0:
|
||||||
|
self.CustomThemeComboBox.setCurrentIndex(idx)
|
||||||
|
self.updateCustomThemeInfo()
|
||||||
|
except Exception as e:
|
||||||
|
QMessageBox.warning(
|
||||||
|
self,
|
||||||
|
"导入失败 - AutoLibrary",
|
||||||
|
f"无法导入主题文件:{e}"
|
||||||
|
)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onRemoveThemeButtonClicked(
|
def onRemoveCustomThemeButtonClicked(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
file = self.ThemeComboBox.currentData()
|
file = self.CustomThemeComboBox.currentData()
|
||||||
if not file:
|
if not file:
|
||||||
QMessageBox.information(
|
QMessageBox.information(
|
||||||
self,
|
self,
|
||||||
@@ -355,10 +422,10 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
return
|
return
|
||||||
try:
|
try:
|
||||||
themeInstance().removeTheme(file)
|
themeInstance().removeTheme(file)
|
||||||
self.populateThemeList()
|
self.populateCustomThemes()
|
||||||
self.ThemeComboBox.setCurrentIndex(0)
|
self.CustomThemeComboBox.setCurrentIndex(0)
|
||||||
self.updateThemeStatus()
|
self.updateCustomThemeStatus()
|
||||||
self.updateThemeInfo()
|
self.updateCustomThemeInfo()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
QMessageBox.warning(
|
QMessageBox.warning(
|
||||||
self,
|
self,
|
||||||
@@ -367,65 +434,106 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onImportThemeButtonClicked(
|
def onCustomThemeComboBoxChanged(
|
||||||
self
|
|
||||||
):
|
|
||||||
|
|
||||||
file_path, _ = QFileDialog.getOpenFileName(
|
|
||||||
self,
|
|
||||||
"导入主题 - AutoLibrary",
|
|
||||||
"",
|
|
||||||
"主题文件 (*.altheme *.qss);;所有文件 (*)"
|
|
||||||
)
|
|
||||||
if not file_path:
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
file_id = themeInstance().importTheme(file_path)
|
|
||||||
self.populateThemeList()
|
|
||||||
idx = self.ThemeComboBox.findData(file_id)
|
|
||||||
if idx >= 0:
|
|
||||||
self.ThemeComboBox.setCurrentIndex(idx)
|
|
||||||
self.updateThemeStatus()
|
|
||||||
self.updateThemeInfo()
|
|
||||||
except Exception as e:
|
|
||||||
QMessageBox.warning(
|
|
||||||
self,
|
|
||||||
"导入失败 - AutoLibrary",
|
|
||||||
f"无法导入主题文件:{e}"
|
|
||||||
)
|
|
||||||
|
|
||||||
@Slot()
|
|
||||||
def onThemeComboBoxChanged(
|
|
||||||
self,
|
self,
|
||||||
index: int
|
index: int
|
||||||
):
|
):
|
||||||
|
|
||||||
self.updateThemeInfo()
|
self.updateCustomThemeInfo()
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onResetThemeButtonClicked(
|
def onResetCustomThemeButtonClicked(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
self.ThemeComboBox.blockSignals(True)
|
self.CustomThemeComboBox.blockSignals(True)
|
||||||
if self.__original_custom_theme:
|
if self.__original_custom_theme:
|
||||||
idx = self.ThemeComboBox.findData(self.__original_custom_theme)
|
idx = self.CustomThemeComboBox.findData(self.__original_custom_theme)
|
||||||
if idx >= 0:
|
if idx >= 0:
|
||||||
self.ThemeComboBox.setCurrentIndex(idx)
|
self.CustomThemeComboBox.setCurrentIndex(idx)
|
||||||
else:
|
else:
|
||||||
self.ThemeComboBox.setCurrentIndex(0)
|
self.CustomThemeComboBox.setCurrentIndex(0)
|
||||||
else:
|
else:
|
||||||
self.ThemeComboBox.setCurrentIndex(0)
|
self.CustomThemeComboBox.setCurrentIndex(0)
|
||||||
self.ThemeComboBox.blockSignals(False)
|
self.CustomThemeComboBox.blockSignals(False)
|
||||||
if self.__original_theme == "light":
|
if self.__original_theme == "light":
|
||||||
self.LightThemeRadio.setChecked(True)
|
self.LightThemeRadio.setChecked(True)
|
||||||
elif self.__original_theme == "dark":
|
elif self.__original_theme == "dark":
|
||||||
self.DarkThemeRadio.setChecked(True)
|
self.DarkThemeRadio.setChecked(True)
|
||||||
else:
|
else:
|
||||||
self.SystemThemeRadio.setChecked(True)
|
self.SystemThemeRadio.setChecked(True)
|
||||||
_applyCustomTheme(self.__original_custom_theme, self.__original_theme)
|
self.updateCustomThemeInfo()
|
||||||
self.updateThemeStatus()
|
self.updateCustomThemeStatus()
|
||||||
self.updateThemeInfo()
|
|
||||||
|
@Slot()
|
||||||
|
def onBulletinTestButtonClicked(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
url = self.BulletinServerUrlEdit.text().strip()
|
||||||
|
if not url:
|
||||||
|
self.BulletinTestStatusLabel.setText("请先输入服务器地址。")
|
||||||
|
self.BulletinTestStatusLabel.setStyleSheet("color: red;")
|
||||||
|
return
|
||||||
|
if hasattr(self, '__bulletin_test_worker') and self.__bulletin_test_worker is not None:
|
||||||
|
return
|
||||||
|
self.BulletinTestButton.setEnabled(False)
|
||||||
|
self.BulletinTestStatusLabel.setText("正在测试连接...")
|
||||||
|
self.BulletinTestStatusLabel.setStyleSheet("")
|
||||||
|
self.__bulletin_test_t0 = time.monotonic()
|
||||||
|
api_url = url.rstrip("/") + "/bulletins"
|
||||||
|
self.__bulletin_test_worker = ALBulletinFetchWorker(
|
||||||
|
self, api_url, {"date": "", "time": "", "range_hour": "1"}
|
||||||
|
)
|
||||||
|
self.__bulletin_test_worker.fetchWorkerIsFinished.connect(
|
||||||
|
self.onBulletinTestIsFinished
|
||||||
|
)
|
||||||
|
self.__bulletin_test_worker.fetchWorkerFinishedWithError.connect(
|
||||||
|
self.onBulletinTestFinishedWithError
|
||||||
|
)
|
||||||
|
self.__bulletin_test_worker.start()
|
||||||
|
|
||||||
|
@Slot(dict)
|
||||||
|
def onBulletinTestIsFinished(
|
||||||
|
self,
|
||||||
|
data: dict
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__bulletin_test_worker.fetchWorkerIsFinished.disconnect(
|
||||||
|
self.onBulletinTestIsFinished
|
||||||
|
)
|
||||||
|
self.__bulletin_test_worker.fetchWorkerFinishedWithError.disconnect(
|
||||||
|
self.onBulletinTestFinishedWithError
|
||||||
|
)
|
||||||
|
self.__bulletin_test_worker.wait(3000)
|
||||||
|
self.__bulletin_test_worker.deleteLater()
|
||||||
|
self.__bulletin_test_worker = None
|
||||||
|
elapsed_ms = (time.monotonic() - self.__bulletin_test_t0) * 1000
|
||||||
|
self.BulletinTestStatusLabel.setText(
|
||||||
|
f"连接成功!响应延迟 {elapsed_ms:.0f} ms"
|
||||||
|
)
|
||||||
|
self.BulletinTestStatusLabel.setStyleSheet("color: green;")
|
||||||
|
self.BulletinTestButton.setEnabled(True)
|
||||||
|
QTimer.singleShot(3000, self, self.clearBulletinTestStatus)
|
||||||
|
|
||||||
|
@Slot(str)
|
||||||
|
def onBulletinTestFinishedWithError(
|
||||||
|
self,
|
||||||
|
error_message: str
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__bulletin_test_worker.fetchWorkerIsFinished.disconnect(
|
||||||
|
self.onBulletinTestIsFinished
|
||||||
|
)
|
||||||
|
self.__bulletin_test_worker.fetchWorkerFinishedWithError.disconnect(
|
||||||
|
self.onBulletinTestFinishedWithError
|
||||||
|
)
|
||||||
|
self.__bulletin_test_worker.wait(3000)
|
||||||
|
self.__bulletin_test_worker.deleteLater()
|
||||||
|
self.__bulletin_test_worker = None
|
||||||
|
self.BulletinTestStatusLabel.setText(f"连接失败:{error_message}")
|
||||||
|
self.BulletinTestStatusLabel.setStyleSheet("color: red;")
|
||||||
|
self.BulletinTestButton.setEnabled(True)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onCancelButtonClicked(
|
def onCancelButtonClicked(
|
||||||
@@ -439,9 +547,9 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
_, style, _ = self.collectSettings()
|
_, style, _ = self.collectAppearanceSettings()
|
||||||
style_changed = self.__original_style != style
|
style_changed = self.__original_style != style
|
||||||
self.saveAndApply()
|
self.saveSettings()
|
||||||
if style_changed:
|
if style_changed:
|
||||||
self.maybeRestart()
|
self.maybeRestart()
|
||||||
|
|
||||||
@@ -450,9 +558,5 @@ class ALSettingsWidget(QWidget, Ui_ALSettingsWidget):
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
_, style, _ = self.collectSettings()
|
self.onApplyButtonClicked()
|
||||||
style_changed = self.__original_style != style
|
|
||||||
self.saveAndApply()
|
|
||||||
if style_changed:
|
|
||||||
self.maybeRestart()
|
|
||||||
self.close()
|
self.close()
|
||||||
|
|||||||
+63
-67
@@ -118,35 +118,34 @@ class ALStatusLabel(QLabel):
|
|||||||
event
|
event
|
||||||
):
|
):
|
||||||
|
|
||||||
Painter = QPainter(self)
|
painter = QPainter(self)
|
||||||
Painter.setRenderHint(QPainter.RenderHint.Antialiasing)
|
painter.setRenderHint(QPainter.RenderHint.Antialiasing)
|
||||||
center_x = self.width()/2
|
center_x = self.width()/2
|
||||||
center_y = self.height()/2
|
center_y = self.height()/2
|
||||||
radius = min(center_x, center_y) - 3
|
radius = min(center_x, center_y) - 3
|
||||||
match self.__status:
|
match self.__status:
|
||||||
case self.Status.WAITING:
|
case self.Status.WAITING:
|
||||||
Pen = Painter.pen()
|
pen = painter.pen()
|
||||||
Pen.setWidth(2)
|
pen.setWidth(2)
|
||||||
Pen.setBrush(Qt.BrushStyle.NoBrush)
|
pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
||||||
Pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
pen.setColor(QColor("#969696")) # grey
|
||||||
Pen.setColor(QColor("#969696")) # grey
|
painter.setPen(pen)
|
||||||
Painter.setPen(Pen)
|
painter.drawEllipse(
|
||||||
Painter.drawEllipse(
|
|
||||||
int(center_x - radius),
|
int(center_x - radius),
|
||||||
int(center_y - radius),
|
int(center_y - radius),
|
||||||
int(radius*2),
|
int(radius*2),
|
||||||
int(radius*2)
|
int(radius*2)
|
||||||
)
|
)
|
||||||
case self.Status.RUNNING:
|
case self.Status.RUNNING:
|
||||||
Gradient = QConicalGradient(center_x, center_y, self.__icon_angle)
|
gradient = QConicalGradient(center_x, center_y, self.__icon_angle)
|
||||||
Gradient.setColorAt(0.0, QColor("#2294FF" if self.isDarkMode() else "#0094FF"))
|
gradient.setColorAt(0.0, QColor("#2294FF" if self.isDarkMode() else "#0094FF"))
|
||||||
Gradient.setColorAt(1.0, QColor("#2294FF00"))
|
gradient.setColorAt(1.0, QColor("#2294FF00"))
|
||||||
Pen = Painter.pen()
|
pen = painter.pen()
|
||||||
Pen.setWidth(3)
|
pen.setWidth(3)
|
||||||
Pen.setBrush(Gradient)
|
pen.setBrush(gradient)
|
||||||
Pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
||||||
Painter.setPen(Pen)
|
painter.setPen(pen)
|
||||||
Painter.drawEllipse(
|
painter.drawEllipse(
|
||||||
int(center_x - radius),
|
int(center_x - radius),
|
||||||
int(center_y - radius),
|
int(center_y - radius),
|
||||||
int(radius*2),
|
int(radius*2),
|
||||||
@@ -154,102 +153,99 @@ class ALStatusLabel(QLabel):
|
|||||||
)
|
)
|
||||||
case self.Status.SUCCESS:
|
case self.Status.SUCCESS:
|
||||||
# draw the success green circle
|
# draw the success green circle
|
||||||
Pen = Painter.pen()
|
pen = painter.pen()
|
||||||
Pen.setWidth(2)
|
pen.setWidth(2)
|
||||||
Pen.setBrush(Qt.BrushStyle.NoBrush)
|
pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
||||||
Pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
pen.setColor(QColor("#4CAF50" if self.isDarkMode() else "#00AF50")) # green
|
||||||
Pen.setColor(QColor("#4CAF50" if self.isDarkMode() else "#00AF50")) # green
|
painter.setPen(pen)
|
||||||
Painter.setPen(Pen)
|
painter.drawEllipse(
|
||||||
Painter.drawEllipse(
|
|
||||||
int(center_x - radius),
|
int(center_x - radius),
|
||||||
int(center_y - radius),
|
int(center_y - radius),
|
||||||
int(radius*2),
|
int(radius*2),
|
||||||
int(radius*2)
|
int(radius*2)
|
||||||
)
|
)
|
||||||
# draw the success check mark '✓'
|
# draw the success check mark '✓'
|
||||||
Painter.setPen(Qt.PenStyle.SolidLine)
|
painter.setPen(Qt.PenStyle.SolidLine)
|
||||||
Pen = Painter.pen()
|
pen = painter.pen()
|
||||||
Pen.setWidth(3)
|
pen.setWidth(3)
|
||||||
Pen.setBrush(Qt.BrushStyle.NoBrush)
|
pen.setBrush(Qt.BrushStyle.NoBrush)
|
||||||
Pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
||||||
# white when dark mode, black when light mode
|
# white when dark mode, black when light mode
|
||||||
Pen.setColor(self.getMarkColor())
|
pen.setColor(self.getMarkColor())
|
||||||
Painter.setPen(Pen)
|
painter.setPen(pen)
|
||||||
mark_size = radius/2
|
mark_size = radius/2
|
||||||
mark_path = [
|
mark_path = [
|
||||||
(center_x - mark_size, center_y),
|
(center_x - mark_size, center_y),
|
||||||
(center_x - mark_size/3, center_y + mark_size/2),
|
(center_x - mark_size/3, center_y + mark_size/2),
|
||||||
(center_x + mark_size, center_y - mark_size/2)
|
(center_x + mark_size, center_y - mark_size/2)
|
||||||
]
|
]
|
||||||
Painter.drawLine(
|
painter.drawLine(
|
||||||
int(mark_path[0][0]),int(mark_path[0][1]),
|
int(mark_path[0][0]),int(mark_path[0][1]),
|
||||||
int(mark_path[1][0]),int(mark_path[1][1])
|
int(mark_path[1][0]),int(mark_path[1][1])
|
||||||
)
|
)
|
||||||
Painter.drawLine(
|
painter.drawLine(
|
||||||
int(mark_path[1][0]),int(mark_path[1][1]),
|
int(mark_path[1][0]),int(mark_path[1][1]),
|
||||||
int(mark_path[2][0]),int(mark_path[2][1])
|
int(mark_path[2][0]),int(mark_path[2][1])
|
||||||
)
|
)
|
||||||
case self.Status.WARNING:
|
case self.Status.WARNING:
|
||||||
# draw the warning orange circle
|
# draw the warning orange circle
|
||||||
Pen = Painter.pen()
|
pen = painter.pen()
|
||||||
Pen.setWidth(2)
|
pen.setWidth(2)
|
||||||
Pen.setBrush(Qt.BrushStyle.NoBrush)
|
pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
||||||
Pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
pen.setColor(QColor("#FF9800")) # orange
|
||||||
Pen.setColor(QColor("#FF9800")) # orange
|
painter.setPen(pen)
|
||||||
Painter.setPen(Pen)
|
painter.drawEllipse(
|
||||||
Painter.drawEllipse(
|
|
||||||
int(center_x - radius),
|
int(center_x - radius),
|
||||||
int(center_y - radius),
|
int(center_y - radius),
|
||||||
int(radius*2),
|
int(radius*2),
|
||||||
int(radius*2)
|
int(radius*2)
|
||||||
)
|
)
|
||||||
# draw the warning exclamation mark '!'
|
# draw the warning exclamation mark '!'
|
||||||
Painter.setPen(Qt.PenStyle.SolidLine)
|
painter.setPen(Qt.PenStyle.SolidLine)
|
||||||
Pen = Painter.pen()
|
pen = painter.pen()
|
||||||
Pen.setWidth(3)
|
pen.setWidth(3)
|
||||||
Pen.setBrush(Qt.BrushStyle.NoBrush)
|
pen.setBrush(Qt.BrushStyle.NoBrush)
|
||||||
Pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
||||||
# white when dark mode, black when light mode
|
# white when dark mode, black when light mode
|
||||||
Pen.setColor(self.getMarkColor())
|
pen.setColor(self.getMarkColor())
|
||||||
Painter.setPen(Pen)
|
painter.setPen(pen)
|
||||||
Painter.drawLine(
|
painter.drawLine(
|
||||||
int(center_x), int(center_y - radius/2),
|
int(center_x), int(center_y - radius/2),
|
||||||
int(center_x), int(center_y + radius/6)
|
int(center_x), int(center_y + radius/6)
|
||||||
)
|
)
|
||||||
Painter.drawPoint(
|
painter.drawPoint(
|
||||||
int(center_x), int(center_y + radius/2)
|
int(center_x), int(center_y + radius/2)
|
||||||
)
|
)
|
||||||
case self.Status.FAILURE:
|
case self.Status.FAILURE:
|
||||||
# draw the failure red circle
|
# draw the failure red circle
|
||||||
Pen = Painter.pen()
|
pen = painter.pen()
|
||||||
Pen.setWidth(2)
|
pen.setWidth(2)
|
||||||
Pen.setBrush(Qt.BrushStyle.NoBrush)
|
pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
||||||
Pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
pen.setColor(QColor("#DC0000")) # red
|
||||||
Pen.setColor(QColor("#DC0000")) # red
|
painter.setPen(pen)
|
||||||
Painter.setPen(Pen)
|
painter.drawEllipse(
|
||||||
Painter.drawEllipse(
|
|
||||||
int(center_x - radius),
|
int(center_x - radius),
|
||||||
int(center_y - radius),
|
int(center_y - radius),
|
||||||
int(radius*2),
|
int(radius*2),
|
||||||
int(radius*2)
|
int(radius*2)
|
||||||
)
|
)
|
||||||
# draw the failure cross mark '✗'
|
# draw the failure cross mark '✗'
|
||||||
Painter.setPen(Qt.PenStyle.SolidLine)
|
painter.setPen(Qt.PenStyle.SolidLine)
|
||||||
Pen = Painter.pen()
|
pen = painter.pen()
|
||||||
Pen.setWidth(3)
|
pen.setWidth(3)
|
||||||
Pen.setBrush(Qt.BrushStyle.NoBrush)
|
pen.setBrush(Qt.BrushStyle.NoBrush)
|
||||||
Pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
pen.setCapStyle(Qt.PenCapStyle.RoundCap)
|
||||||
# white when dark mode, black when light mode
|
# white when dark mode, black when light mode
|
||||||
Pen.setColor(self.getMarkColor())
|
pen.setColor(self.getMarkColor())
|
||||||
Painter.setPen(Pen)
|
painter.setPen(pen)
|
||||||
mark_size = radius/3
|
mark_size = radius/3
|
||||||
Painter.drawLine(
|
painter.drawLine(
|
||||||
int(center_x - mark_size), int(center_y - mark_size),
|
int(center_x - mark_size), int(center_y - mark_size),
|
||||||
int(center_x + mark_size), int(center_y + mark_size)
|
int(center_x + mark_size), int(center_y + mark_size)
|
||||||
)
|
)
|
||||||
Painter.drawLine(
|
painter.drawLine(
|
||||||
int(center_x + mark_size), int(center_y - mark_size),
|
int(center_x + mark_size), int(center_y - mark_size),
|
||||||
int(center_x - mark_size), int(center_y + mark_size)
|
int(center_x - mark_size), int(center_y + mark_size)
|
||||||
)
|
)
|
||||||
Painter.end()
|
painter.end()
|
||||||
super().paintEvent(event)
|
super().paintEvent(event)
|
||||||
|
|||||||
@@ -322,5 +322,5 @@ class ALTimerTaskAddDialog(QDialog, Ui_ALTimerTaskAddDialog):
|
|||||||
):
|
):
|
||||||
|
|
||||||
QDesktopServices.openUrl(
|
QDesktopServices.openUrl(
|
||||||
QUrl("https://www.autolibrary.kenanzhu.com/manuals/autoscript")
|
QUrl("https://manuals.autolibrary.kenanzhu.com/zh/autoscript")
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -108,24 +108,24 @@ class ALTimerTaskHistoryDialog(QDialog):
|
|||||||
execute_time = record.get("execute_time", "")
|
execute_time = record.get("execute_time", "")
|
||||||
result = record.get("result", ALTimerTaskStatus.UNKNOWN)
|
result = record.get("result", ALTimerTaskStatus.UNKNOWN)
|
||||||
duration = record.get("duration", 0)
|
duration = record.get("duration", 0)
|
||||||
ExecuteTimeItem = QTableWidgetItem(execute_time)
|
execute_time_item = QTableWidgetItem(execute_time)
|
||||||
ExecuteTimeItem.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
execute_time_item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||||
self.HistoryTableWidget.setItem(row, 0, ExecuteTimeItem)
|
self.HistoryTableWidget.setItem(row, 0, execute_time_item)
|
||||||
ResultItem = QTableWidgetItem(result.value)
|
result_item = QTableWidgetItem(result.value)
|
||||||
ResultItem.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
result_item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||||
match result:
|
match result:
|
||||||
case ALTimerTaskStatus.EXECUTED:
|
case ALTimerTaskStatus.EXECUTED:
|
||||||
ResultItem.setForeground(Qt.GlobalColor.green)
|
result_item.setForeground(Qt.GlobalColor.green)
|
||||||
case ALTimerTaskStatus.ERROR:
|
case ALTimerTaskStatus.ERROR:
|
||||||
ResultItem.setForeground(Qt.GlobalColor.red)
|
result_item.setForeground(Qt.GlobalColor.red)
|
||||||
case ALTimerTaskStatus.OUTDATED:
|
case ALTimerTaskStatus.OUTDATED:
|
||||||
ResultItem.setForeground(Qt.GlobalColor.red)
|
result_item.setForeground(Qt.GlobalColor.red)
|
||||||
case _:
|
case _:
|
||||||
ResultItem.setForeground(Qt.GlobalColor.black)
|
result_item.setForeground(Qt.GlobalColor.black)
|
||||||
self.HistoryTableWidget.setItem(row, 1, ResultItem)
|
self.HistoryTableWidget.setItem(row, 1, result_item)
|
||||||
DurationItem = QTableWidgetItem(f"{duration:.2f}")
|
duration_item = QTableWidgetItem(f"{duration:.2f}")
|
||||||
DurationItem.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
duration_item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||||
self.HistoryTableWidget.setItem(row, 2, DurationItem)
|
self.HistoryTableWidget.setItem(row, 2, duration_item)
|
||||||
self.HistoryTableWidget.setRowHeight(row, 25)
|
self.HistoryTableWidget.setRowHeight(row, 25)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
@@ -135,4 +135,4 @@ class ALTimerTaskHistoryDialog(QDialog):
|
|||||||
|
|
||||||
self.__history.clear()
|
self.__history.clear()
|
||||||
self.HistoryTableWidget.setRowCount(0)
|
self.HistoryTableWidget.setRowCount(0)
|
||||||
self.__task_data["repeat_history"] = self.__history
|
self.__task_data["repeat_history"] = self.__history # = []
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ from gui.ALTimerTaskAddDialog import (
|
|||||||
ALTimerTaskStatus
|
ALTimerTaskStatus
|
||||||
)
|
)
|
||||||
from gui.ALTimerTaskHistoryDialog import ALTimerTaskHistoryDialog
|
from gui.ALTimerTaskHistoryDialog import ALTimerTaskHistoryDialog
|
||||||
|
from gui.ALWidgetMixin import CenterOnParentMixin
|
||||||
from gui.resources.ui.Ui_ALTimerTaskManageWidget import Ui_ALTimerTaskManageWidget
|
from gui.resources.ui.Ui_ALTimerTaskManageWidget import Ui_ALTimerTaskManageWidget
|
||||||
from interfaces.ConfigProvider import (
|
from interfaces.ConfigProvider import (
|
||||||
CfgKey,
|
CfgKey,
|
||||||
@@ -80,12 +81,12 @@ class ALTimerTaskItemWidget(QWidget):
|
|||||||
self.TaskInfoLayout = QVBoxLayout()
|
self.TaskInfoLayout = QVBoxLayout()
|
||||||
self.TaskInfoLayout.setSpacing(5)
|
self.TaskInfoLayout.setSpacing(5)
|
||||||
TaskNameLabel = QLabel(self.__timer_task["name"])
|
TaskNameLabel = QLabel(self.__timer_task["name"])
|
||||||
TaskNameLabelFont = TaskNameLabel.font()
|
task_name_label_font = TaskNameLabel.font()
|
||||||
TaskNameLabelFont.setBold(True)
|
task_name_label_font.setBold(True)
|
||||||
TaskNameLabel.setFont(TaskNameLabelFont)
|
TaskNameLabel.setFont(task_name_label_font)
|
||||||
TaskNameLabel.setFixedHeight(25)
|
TaskNameLabel.setFixedHeight(25)
|
||||||
self.TaskInfoLayout.addWidget(TaskNameLabel)
|
self.TaskInfoLayout.addWidget(TaskNameLabel)
|
||||||
ExecuteTimeStr = self.__timer_task["execute_time"].strftime("%Y-%m-%d %H:%M:%S")
|
execute_time_str = self.__timer_task["execute_time"].strftime("%Y-%m-%d %H:%M:%S")
|
||||||
if self.__timer_task.get("repeat", False):
|
if self.__timer_task.get("repeat", False):
|
||||||
repeat_days = self.__timer_task.get("repeat_days", [])
|
repeat_days = self.__timer_task.get("repeat_days", [])
|
||||||
repeat_hour = self.__timer_task.get("repeat_hour", 0)
|
repeat_hour = self.__timer_task.get("repeat_hour", 0)
|
||||||
@@ -93,14 +94,14 @@ class ALTimerTaskItemWidget(QWidget):
|
|||||||
repeat_second = self.__timer_task.get("repeat_second", 0)
|
repeat_second = self.__timer_task.get("repeat_second", 0)
|
||||||
if len(repeat_days) == 7:
|
if len(repeat_days) == 7:
|
||||||
time_str = f"{repeat_hour:02d}:{repeat_minute:02d}:{repeat_second:02d}"
|
time_str = f"{repeat_hour:02d}:{repeat_minute:02d}:{repeat_second:02d}"
|
||||||
ExecuteTimeLabel = QLabel(f"下次执行时间: {ExecuteTimeStr} (每日 {time_str})")
|
ExecuteTimeLabel = QLabel(f"下次执行时间: {execute_time_str} (每日 {time_str})")
|
||||||
else:
|
else:
|
||||||
day_names = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"]
|
day_names = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"]
|
||||||
selected_days = [day_names[d] for d in repeat_days]
|
selected_days = [day_names[d] for d in repeat_days]
|
||||||
time_str = f"{repeat_hour:02d}:{repeat_minute:02d}:{repeat_second:02d}"
|
time_str = f"{repeat_hour:02d}:{repeat_minute:02d}:{repeat_second:02d}"
|
||||||
ExecuteTimeLabel = QLabel(f"下次执行时间: {ExecuteTimeStr} (每{','.join(selected_days)} {time_str})")
|
ExecuteTimeLabel = QLabel(f"下次执行时间: {execute_time_str} (每{','.join(selected_days)} {time_str})")
|
||||||
else:
|
else:
|
||||||
ExecuteTimeLabel = QLabel(f"执行时间: {ExecuteTimeStr}")
|
ExecuteTimeLabel = QLabel(f"执行时间: {execute_time_str}")
|
||||||
ExecuteTimeLabel.setStyleSheet("color: #969696;")
|
ExecuteTimeLabel.setStyleSheet("color: #969696;")
|
||||||
ExecuteTimeLabel.setFixedHeight(20)
|
ExecuteTimeLabel.setFixedHeight(20)
|
||||||
self.TaskInfoLayout.addWidget(ExecuteTimeLabel)
|
self.TaskInfoLayout.addWidget(ExecuteTimeLabel)
|
||||||
@@ -189,7 +190,7 @@ class ALTimerTaskItemWidget(QWidget):
|
|||||||
Menu.exec(self.mapToGlobal(pos))
|
Menu.exec(self.mapToGlobal(pos))
|
||||||
|
|
||||||
|
|
||||||
class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
class ALTimerTaskManageWidget(CenterOnParentMixin, QWidget, Ui_ALTimerTaskManageWidget):
|
||||||
|
|
||||||
class SortPolicy(Enum):
|
class SortPolicy(Enum):
|
||||||
|
|
||||||
@@ -299,29 +300,6 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
)
|
)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def showEvent(
|
|
||||||
self,
|
|
||||||
event
|
|
||||||
):
|
|
||||||
|
|
||||||
result = super().showEvent(event)
|
|
||||||
|
|
||||||
screen_rect = self.screen().geometry()
|
|
||||||
target_pos = self.parent().geometry().center()
|
|
||||||
target_pos.setX(target_pos.x() - self.width()//2)
|
|
||||||
target_pos.setY(target_pos.y() - self.height()//2)
|
|
||||||
if target_pos.x() < 0:
|
|
||||||
target_pos.setX(0)
|
|
||||||
if target_pos.x() + self.width() > screen_rect.width():
|
|
||||||
target_pos.setX(screen_rect.width() - self.width())
|
|
||||||
if target_pos.y() < 0:
|
|
||||||
target_pos.setY(0)
|
|
||||||
if target_pos.y() + self.height() > screen_rect.height():
|
|
||||||
target_pos.setY(screen_rect.height() - self.height())
|
|
||||||
self.move(target_pos)
|
|
||||||
|
|
||||||
return result
|
|
||||||
|
|
||||||
def closeEvent(
|
def closeEvent(
|
||||||
self,
|
self,
|
||||||
event: QCloseEvent
|
event: QCloseEvent
|
||||||
@@ -537,6 +515,11 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
task: dict
|
task: dict
|
||||||
):
|
):
|
||||||
|
|
||||||
|
# Here we use reference to task data, not copy.
|
||||||
|
# So any change of task data in history dialog will be
|
||||||
|
# reflected in the timer task list
|
||||||
|
# Thus we can emit timerTasksChanged signal to
|
||||||
|
# update config file
|
||||||
Dialog = ALTimerTaskHistoryDialog(self, task)
|
Dialog = ALTimerTaskHistoryDialog(self, task)
|
||||||
if Dialog.exec() == QDialog.DialogCode.Accepted:
|
if Dialog.exec() == QDialog.DialogCode.Accepted:
|
||||||
self.timerTasksChanged.emit()
|
self.timerTasksChanged.emit()
|
||||||
|
|||||||
@@ -0,0 +1,142 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
Copyright (c) 2026 KenanZhu.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
This software is provided "as is", without any warranty of any kind.
|
||||||
|
You may use, modify, and distribute this file under the terms of the MIT License.
|
||||||
|
See the LICENSE file for details.
|
||||||
|
"""
|
||||||
|
import queue
|
||||||
|
|
||||||
|
from PySide6.QtCore import (
|
||||||
|
QObject,
|
||||||
|
QTimer,
|
||||||
|
Signal,
|
||||||
|
Slot
|
||||||
|
)
|
||||||
|
|
||||||
|
from gui.ALMainWorker import TimerTaskWorker
|
||||||
|
|
||||||
|
|
||||||
|
class ALTimerTaskPoller(QObject):
|
||||||
|
|
||||||
|
taskRunning = Signal(dict)
|
||||||
|
taskFinished = Signal(bool, dict)
|
||||||
|
taskExecuted = Signal(dict)
|
||||||
|
taskError = Signal(dict)
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
parent=None,
|
||||||
|
input_queue: queue.Queue = None,
|
||||||
|
output_queue: queue.Queue = None,
|
||||||
|
config_paths: list = None
|
||||||
|
):
|
||||||
|
|
||||||
|
super().__init__(parent)
|
||||||
|
self.__input_queue = input_queue or queue.Queue()
|
||||||
|
self.__output_queue = output_queue or queue.Queue()
|
||||||
|
self.__config_paths = config_paths or []
|
||||||
|
self.__task_queue = queue.Queue()
|
||||||
|
self.__timer = QTimer(self)
|
||||||
|
self.__timer.timeout.connect(self.__poll)
|
||||||
|
self.__worker = None
|
||||||
|
self.__stopped = False
|
||||||
|
|
||||||
|
def start(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__stopped = False
|
||||||
|
self.__timer.start(500)
|
||||||
|
|
||||||
|
def stop(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__stopped = True
|
||||||
|
self.__timer.stop()
|
||||||
|
self.__cleanupWorker()
|
||||||
|
|
||||||
|
def enqueue(
|
||||||
|
self,
|
||||||
|
task: dict
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__task_queue.put(task)
|
||||||
|
|
||||||
|
def isRunning(
|
||||||
|
self
|
||||||
|
) -> bool:
|
||||||
|
|
||||||
|
return self.__worker is not None
|
||||||
|
|
||||||
|
def updateConfigPaths(
|
||||||
|
self,
|
||||||
|
config_paths: list
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__config_paths = config_paths
|
||||||
|
|
||||||
|
@Slot()
|
||||||
|
def __poll(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
if self.__worker is not None:
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
task = self.__task_queue.get_nowait()
|
||||||
|
except queue.Empty:
|
||||||
|
return
|
||||||
|
self.__timer.stop()
|
||||||
|
self.taskRunning.emit(task)
|
||||||
|
try:
|
||||||
|
self.__worker = TimerTaskWorker(
|
||||||
|
task,
|
||||||
|
self.__input_queue,
|
||||||
|
self.__output_queue,
|
||||||
|
self.__config_paths
|
||||||
|
)
|
||||||
|
self.__worker.timerTaskWorkerIsFinished.connect(self.__onFinished)
|
||||||
|
self.__worker.start()
|
||||||
|
except Exception:
|
||||||
|
self.__worker = None
|
||||||
|
if not self.__stopped:
|
||||||
|
self.__timer.start(500)
|
||||||
|
|
||||||
|
@Slot(bool, dict)
|
||||||
|
def __onFinished(
|
||||||
|
self,
|
||||||
|
is_error: bool,
|
||||||
|
task: dict
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__worker.timerTaskWorkerIsFinished.disconnect(self.__onFinished)
|
||||||
|
self.__worker.wait(1000)
|
||||||
|
self.__worker.deleteLater()
|
||||||
|
self.__worker = None
|
||||||
|
try:
|
||||||
|
self.taskFinished.emit(is_error, task)
|
||||||
|
if not is_error:
|
||||||
|
self.taskExecuted.emit(task)
|
||||||
|
else:
|
||||||
|
self.taskError.emit(task)
|
||||||
|
finally:
|
||||||
|
if not self.__stopped:
|
||||||
|
self.__timer.start(500)
|
||||||
|
|
||||||
|
def __cleanupWorker(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
if self.__worker is None:
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
self.__worker.timerTaskWorkerIsFinished.disconnect(self.__onFinished)
|
||||||
|
except (TypeError, RuntimeError):
|
||||||
|
pass
|
||||||
|
self.__worker.wait(500)
|
||||||
|
self.__worker.deleteLater()
|
||||||
|
self.__worker = None
|
||||||
+10
-10
@@ -109,27 +109,27 @@ class ALUserTreeWidget(QTreeWidget):
|
|||||||
|
|
||||||
super().dragMoveEvent(event)
|
super().dragMoveEvent(event)
|
||||||
|
|
||||||
SourceItem = self.currentItem()
|
source_item = self.currentItem()
|
||||||
TargetItem = self.itemAt(event.position().toPoint())
|
target_item = self.itemAt(event.position().toPoint())
|
||||||
if SourceItem is None:
|
if source_item is None:
|
||||||
event.ignore()
|
event.ignore()
|
||||||
return
|
return
|
||||||
if SourceItem.type() == ALUserTreeItemType.GROUP.value:
|
if source_item.type() == ALUserTreeItemType.GROUP.value:
|
||||||
if TargetItem is not None:
|
if target_item is not None:
|
||||||
event.ignore()
|
event.ignore()
|
||||||
return
|
return
|
||||||
elif SourceItem.type() == ALUserTreeItemType.USER.value:
|
elif source_item.type() == ALUserTreeItemType.USER.value:
|
||||||
if TargetItem is None:
|
if target_item is None:
|
||||||
event.ignore()
|
event.ignore()
|
||||||
return
|
return
|
||||||
if TargetItem.type() != ALUserTreeItemType.GROUP.value:
|
if target_item.type() != ALUserTreeItemType.GROUP.value:
|
||||||
event.ignore()
|
event.ignore()
|
||||||
return
|
return
|
||||||
if TargetItem.checkState(1) == Qt.CheckState.Unchecked:
|
if target_item.checkState(1) == Qt.CheckState.Unchecked:
|
||||||
event.ignore()
|
event.ignore()
|
||||||
return
|
return
|
||||||
if not self.isDragPositionValid(
|
if not self.isDragPositionValid(
|
||||||
self.visualItemRect(TargetItem),
|
self.visualItemRect(target_item),
|
||||||
event.position().toPoint()
|
event.position().toPoint()
|
||||||
):
|
):
|
||||||
event.ignore()
|
event.ignore()
|
||||||
|
|||||||
@@ -5,11 +5,11 @@
|
|||||||
workflow process. Do not edit manually.
|
workflow process. Do not edit manually.
|
||||||
|
|
||||||
This file is auto-generated during the workflow process.
|
This file is auto-generated during the workflow process.
|
||||||
Last updated: 2026-05-09 06:05:13 UTC
|
Last updated: 2026-07-14 02:19:31 UTC
|
||||||
"""
|
"""
|
||||||
|
|
||||||
AL_VERSION = "1.3.0"
|
AL_VERSION = "1.4.0"
|
||||||
AL_TAG = "v1.3.0"
|
AL_TAG = "v1.4.0"
|
||||||
AL_COMMIT_SHA = "local"
|
AL_COMMIT_SHA = "local"
|
||||||
AL_COMMIT_DATE = "null" # time zone : UTC
|
AL_COMMIT_DATE = "null" # time zone : UTC
|
||||||
AL_BUILD_DATE = "null" # time zone : UTC
|
AL_BUILD_DATE = "null" # time zone : UTC
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ You may use, modify, and distribute this file under the terms of the MIT License
|
|||||||
See the LICENSE file for details.
|
See the LICENSE file for details.
|
||||||
"""
|
"""
|
||||||
import threading
|
import threading
|
||||||
|
from pathlib import Path
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from PySide6.QtCore import (
|
from PySide6.QtCore import (
|
||||||
@@ -33,11 +34,12 @@ from PySide6.QtGui import QCloseEvent
|
|||||||
from managers.driver.WebDriverManager import (
|
from managers.driver.WebDriverManager import (
|
||||||
instance as webdriverInstance,
|
instance as webdriverInstance,
|
||||||
WebDriverManager,
|
WebDriverManager,
|
||||||
WebDriverInfo,
|
WebDriverCtx,
|
||||||
WebDriverType,
|
WebDriverType,
|
||||||
WebDriverStatus
|
WebDriverStatus
|
||||||
)
|
)
|
||||||
from gui.ALStatusLabel import ALStatusLabel
|
from gui.ALStatusLabel import ALStatusLabel
|
||||||
|
from gui.ALWidgetMixin import CenterOnParentMixin
|
||||||
|
|
||||||
|
|
||||||
class DownloadWorker(QThread):
|
class DownloadWorker(QThread):
|
||||||
@@ -53,12 +55,12 @@ class DownloadWorker(QThread):
|
|||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
driver_manager: WebDriverManager,
|
driver_manager: WebDriverManager,
|
||||||
driver_info: WebDriverInfo
|
driver_ctx: WebDriverCtx
|
||||||
):
|
):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.__driver_manager = driver_manager
|
self.__driver_manager = driver_manager
|
||||||
self.__driver_info = driver_info
|
self.__driver_ctx = driver_ctx
|
||||||
self.__driver_path = None
|
self.__driver_path: Optional[Path] = None
|
||||||
self.__cancelled = False
|
self.__cancelled = False
|
||||||
self.__cancel_event = threading.Event()
|
self.__cancel_event = threading.Event()
|
||||||
|
|
||||||
@@ -80,7 +82,7 @@ class DownloadWorker(QThread):
|
|||||||
self.downloadCancelled.emit()
|
self.downloadCancelled.emit()
|
||||||
return
|
return
|
||||||
self.__driver_path = self.__driver_manager.installDriver(
|
self.__driver_path = self.__driver_manager.installDriver(
|
||||||
self.__driver_info,
|
self.__driver_ctx,
|
||||||
progress_callback=self.onProgress,
|
progress_callback=self.onProgress,
|
||||||
cancel_event=self.__cancel_event
|
cancel_event=self.__cancel_event
|
||||||
)
|
)
|
||||||
@@ -123,7 +125,7 @@ class DownloadWorker(QThread):
|
|||||||
self.wait()
|
self.wait()
|
||||||
|
|
||||||
|
|
||||||
class ALWebDriverDownloadDialog(QDialog):
|
class ALWebDriverDownloadDialog(CenterOnParentMixin, QDialog):
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
@@ -139,12 +141,11 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
|
|
||||||
self.__driver_dir = driver_dir
|
self.__driver_dir = driver_dir
|
||||||
self.__driver_manager: Optional[WebDriverManager] = None
|
self.__driver_manager: Optional[WebDriverManager] = None
|
||||||
self.__confirmed = False
|
self.__confirmed = False
|
||||||
self.__selected_driver_info: Optional[WebDriverInfo] = None
|
self.__selected_driver_ctx: Optional[WebDriverCtx] = None
|
||||||
self.__driver_infos: list[WebDriverInfo] = []
|
self.__driver_ctxs: list[WebDriverCtx] = []
|
||||||
self.__download_thread: Optional[DownloadWorker] = None
|
self.__download_thread: Optional[DownloadWorker] = None
|
||||||
|
|
||||||
self.setupUi()
|
self.setupUi()
|
||||||
@@ -152,27 +153,26 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
self.initializeDriverManager()
|
self.initializeDriverManager()
|
||||||
self.refreshDriverList()
|
self.refreshDriverList()
|
||||||
|
|
||||||
def showEvent(
|
def closeEvent(
|
||||||
self,
|
self,
|
||||||
event
|
event: QCloseEvent
|
||||||
):
|
):
|
||||||
|
|
||||||
result = super().showEvent(event)
|
if self.__download_thread and self.__download_thread.isRunning():
|
||||||
if self.parent():
|
reply = QMessageBox.question(
|
||||||
screen_rect = self.screen().geometry()
|
self,
|
||||||
target_pos = self.parent().geometry().center()
|
"确认关闭 - AutoLibrary",
|
||||||
target_pos.setX(target_pos.x() - self.width()//2)
|
"驱动正在下载中, 确定要取消并关闭对话框吗 ?",
|
||||||
target_pos.setY(target_pos.y() - self.height()//2)
|
QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No
|
||||||
if target_pos.x() < 0:
|
)
|
||||||
target_pos.setX(0)
|
if reply == QMessageBox.StandardButton.No:
|
||||||
if target_pos.x() + self.width() > screen_rect.width():
|
event.ignore()
|
||||||
target_pos.setX(screen_rect.width() - self.width())
|
return
|
||||||
if target_pos.y() < 0:
|
self.__download_thread.stop()
|
||||||
target_pos.setY(0)
|
if not self.__confirmed:
|
||||||
if target_pos.y() + self.height() > screen_rect.height():
|
self.__selected_driver_ctx = None
|
||||||
target_pos.setY(screen_rect.height() - self.height())
|
event.accept()
|
||||||
self.move(target_pos)
|
super().closeEvent(event)
|
||||||
return result
|
|
||||||
|
|
||||||
def setupUi(
|
def setupUi(
|
||||||
self
|
self
|
||||||
@@ -267,89 +267,42 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
if not self.__driver_manager:
|
if not self.__driver_manager:
|
||||||
return
|
return
|
||||||
self.__driver_manager.refresh()
|
self.__driver_manager.refresh()
|
||||||
self.__driver_infos = self.__driver_manager.getDriverInfos()
|
self.__driver_ctxs = self.__driver_manager.getDriverCtxs()
|
||||||
self.DriverComboBox.clear()
|
self.DriverComboBox.clear()
|
||||||
installed = 0
|
installed = 0
|
||||||
installed_idx = 0
|
installed_idx = 0
|
||||||
for i, driver_info in enumerate(self.__driver_infos):
|
for i, driver_ctx in enumerate(self.__driver_ctxs):
|
||||||
display_text = f"{driver_info.driver_type.value} - {driver_info.browser_version}"
|
display_text = f"{driver_ctx.driver_type.value} - {driver_ctx.browser_version}"
|
||||||
if driver_info.driver_status == WebDriverStatus.INSTALLED:
|
if driver_ctx.driver_status == WebDriverStatus.INSTALLED:
|
||||||
installed += 1
|
installed += 1
|
||||||
installed_idx = i # get the installed driver index
|
installed_idx = i # get the installed driver index
|
||||||
display_text += " : 已安装"
|
display_text += " - 已安装"
|
||||||
self.DriverComboBox.addItem(display_text)
|
self.DriverComboBox.addItem(display_text)
|
||||||
count = len(self.__driver_infos)
|
count = len(self.__driver_ctxs)
|
||||||
self.BrowserCountLabel.setText(f"检测到 {count} 个可用浏览器,{installed} 个已安装驱动:")
|
self.BrowserCountLabel.setText(f"检测到 {count} 个可用浏览器,{installed} 个已安装驱动:")
|
||||||
if self.__driver_infos:
|
if self.__driver_ctxs:
|
||||||
self.DriverComboBox.setCurrentIndex(installed_idx)
|
self.DriverComboBox.setCurrentIndex(installed_idx)
|
||||||
|
|
||||||
def onDriverComboBoxChanged(
|
|
||||||
self,
|
|
||||||
index: int
|
|
||||||
):
|
|
||||||
|
|
||||||
if not self.__driver_infos or index < 0 or index >= len(self.__driver_infos):
|
|
||||||
return
|
|
||||||
driver_info = self.__driver_infos[index]
|
|
||||||
self.updateDriverInfoDisplay(driver_info)
|
|
||||||
self.updateProgressBarStates(driver_info)
|
|
||||||
self.updateButtonStates(driver_info)
|
|
||||||
|
|
||||||
def closeEvent(
|
|
||||||
self,
|
|
||||||
event: QCloseEvent
|
|
||||||
):
|
|
||||||
|
|
||||||
if self.__download_thread and self.__download_thread.isRunning():
|
|
||||||
reply = QMessageBox.question(
|
|
||||||
self,
|
|
||||||
"确认关闭 - AutoLibrary",
|
|
||||||
"驱动正在下载中, 确定要取消并关闭对话框吗 ?",
|
|
||||||
QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No
|
|
||||||
)
|
|
||||||
if reply == QMessageBox.StandardButton.No:
|
|
||||||
event.ignore()
|
|
||||||
return
|
|
||||||
self.__download_thread.stop()
|
|
||||||
if not self.__confirmed:
|
|
||||||
self.__selected_driver_info = None
|
|
||||||
event.accept()
|
|
||||||
super().closeEvent(event)
|
|
||||||
|
|
||||||
def onThreadFinished(
|
|
||||||
self
|
|
||||||
):
|
|
||||||
|
|
||||||
if self.__download_thread:
|
|
||||||
self.__download_thread.deleteLater()
|
|
||||||
self.__download_thread = None
|
|
||||||
|
|
||||||
def getSelectedDriverInfo(
|
|
||||||
self
|
|
||||||
) -> Optional[WebDriverInfo]:
|
|
||||||
|
|
||||||
return self.__selected_driver_info
|
|
||||||
|
|
||||||
def updateDriverInfoDisplay(
|
def updateDriverInfoDisplay(
|
||||||
self,
|
self,
|
||||||
driver_info: WebDriverInfo
|
driver_ctx: WebDriverCtx
|
||||||
):
|
):
|
||||||
|
|
||||||
if driver_info.driver_type == WebDriverType.CHROME:
|
if driver_ctx.driver_type == WebDriverType.CHROME:
|
||||||
driver_type = "Google Chrome"
|
driver_type = "Google Chrome"
|
||||||
elif driver_info.driver_type == WebDriverType.FIREFOX:
|
elif driver_ctx.driver_type == WebDriverType.FIREFOX:
|
||||||
driver_type = "Mozilla Firefox"
|
driver_type = "Mozilla Firefox"
|
||||||
elif driver_info.driver_type == WebDriverType.EDGE:
|
elif driver_ctx.driver_type == WebDriverType.EDGE:
|
||||||
driver_type = "Microsoft Edge"
|
driver_type = "Microsoft Edge"
|
||||||
else:
|
else:
|
||||||
driver_type = "未知"
|
driver_type = "未知"
|
||||||
self.BrowserTypeLabel.setText(f"类型:{driver_type}")
|
self.BrowserTypeLabel.setText(f"类型:{driver_type}")
|
||||||
self.VersionLabel.setText(f"版本:{driver_info.driver_version}")
|
self.VersionLabel.setText(f"版本:{driver_ctx.driver_version}")
|
||||||
if driver_info.driver_path:
|
if driver_ctx.driver_path:
|
||||||
self.PathLabel.setText(str(driver_info.driver_path))
|
self.PathLabel.setText(str(driver_ctx.driver_path))
|
||||||
else:
|
else:
|
||||||
self.PathLabel.setText("未安装")
|
self.PathLabel.setText("未安装")
|
||||||
match driver_info.driver_status:
|
match driver_ctx.driver_status:
|
||||||
case WebDriverStatus.NOT_INSTALLED:
|
case WebDriverStatus.NOT_INSTALLED:
|
||||||
self.StatusLabel.status = ALStatusLabel.Status.WAITING
|
self.StatusLabel.status = ALStatusLabel.Status.WAITING
|
||||||
case WebDriverStatus.INSTALLED:
|
case WebDriverStatus.INSTALLED:
|
||||||
@@ -361,51 +314,70 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
|
|
||||||
def updateProgressBarStates(
|
def updateProgressBarStates(
|
||||||
self,
|
self,
|
||||||
driver_info: WebDriverInfo
|
driver_ctx: WebDriverCtx
|
||||||
):
|
):
|
||||||
|
|
||||||
if driver_info.driver_status == WebDriverStatus.NOT_INSTALLED:
|
if driver_ctx.driver_status == WebDriverStatus.NOT_INSTALLED:
|
||||||
self.ProgressBar.setValue(0)
|
self.ProgressBar.setValue(0)
|
||||||
self.ProgressText.setText("未安装")
|
self.ProgressText.setText("未安装")
|
||||||
elif driver_info.driver_status == WebDriverStatus.INSTALLED:
|
elif driver_ctx.driver_status == WebDriverStatus.INSTALLED:
|
||||||
self.ProgressBar.setValue(100)
|
self.ProgressBar.setValue(100)
|
||||||
self.ProgressText.setText("已安装")
|
self.ProgressText.setText("已安装")
|
||||||
elif driver_info.driver_status == WebDriverStatus.DOWNLOADING:
|
elif driver_ctx.driver_status == WebDriverStatus.DOWNLOADING:
|
||||||
pass # update by worker thread
|
pass # update by worker thread
|
||||||
elif driver_info.driver_status == WebDriverStatus.ERROR:
|
elif driver_ctx.driver_status == WebDriverStatus.ERROR:
|
||||||
self.ProgressBar.setValue(0)
|
self.ProgressBar.setValue(0)
|
||||||
self.ProgressText.setText("下载失败")
|
self.ProgressText.setText("下载失败")
|
||||||
|
|
||||||
def updateButtonStates(
|
def updateButtonStates(
|
||||||
self,
|
self,
|
||||||
driver_info: WebDriverInfo
|
driver_ctx: WebDriverCtx
|
||||||
):
|
):
|
||||||
|
|
||||||
if driver_info.driver_status == WebDriverStatus.NOT_INSTALLED:
|
if driver_ctx.driver_status == WebDriverStatus.NOT_INSTALLED:
|
||||||
self.RefreshButton.setEnabled(True)
|
self.RefreshButton.setEnabled(True)
|
||||||
self.DeleteButton.setEnabled(False)
|
self.DeleteButton.setEnabled(False)
|
||||||
self.DownloadButton.setEnabled(True)
|
self.DownloadButton.setEnabled(True)
|
||||||
self.CancelButton.setEnabled(True)
|
self.CancelButton.setEnabled(True)
|
||||||
self.ConfirmButton.setEnabled(False)
|
self.ConfirmButton.setEnabled(False)
|
||||||
elif driver_info.driver_status == WebDriverStatus.INSTALLED:
|
elif driver_ctx.driver_status == WebDriverStatus.INSTALLED:
|
||||||
self.RefreshButton.setEnabled(True)
|
self.RefreshButton.setEnabled(True)
|
||||||
self.DownloadButton.setEnabled(False)
|
self.DownloadButton.setEnabled(False)
|
||||||
self.DeleteButton.setEnabled(True)
|
self.DeleteButton.setEnabled(True)
|
||||||
self.CancelButton.setEnabled(True)
|
self.CancelButton.setEnabled(True)
|
||||||
self.ConfirmButton.setEnabled(True)
|
self.ConfirmButton.setEnabled(True)
|
||||||
elif driver_info.driver_status == WebDriverStatus.DOWNLOADING:
|
elif driver_ctx.driver_status == WebDriverStatus.DOWNLOADING:
|
||||||
self.RefreshButton.setEnabled(False)
|
self.RefreshButton.setEnabled(False)
|
||||||
self.DownloadButton.setEnabled(False)
|
self.DownloadButton.setEnabled(False)
|
||||||
self.DeleteButton.setEnabled(False)
|
self.DeleteButton.setEnabled(False)
|
||||||
self.CancelButton.setEnabled(True)
|
self.CancelButton.setEnabled(True)
|
||||||
self.ConfirmButton.setEnabled(False)
|
self.ConfirmButton.setEnabled(False)
|
||||||
elif driver_info.driver_status == WebDriverStatus.ERROR:
|
elif driver_ctx.driver_status == WebDriverStatus.ERROR:
|
||||||
self.RefreshButton.setEnabled(True)
|
self.RefreshButton.setEnabled(True)
|
||||||
self.DownloadButton.setEnabled(True)
|
self.DownloadButton.setEnabled(True)
|
||||||
self.DeleteButton.setEnabled(False)
|
self.DeleteButton.setEnabled(False)
|
||||||
self.CancelButton.setEnabled(True)
|
self.CancelButton.setEnabled(True)
|
||||||
self.ConfirmButton.setEnabled(False)
|
self.ConfirmButton.setEnabled(False)
|
||||||
|
|
||||||
|
def getSelectedDriverInfo(
|
||||||
|
self
|
||||||
|
) -> Optional[WebDriverCtx]:
|
||||||
|
|
||||||
|
return self.__selected_driver_ctx
|
||||||
|
|
||||||
|
@Slot(int)
|
||||||
|
def onDriverComboBoxChanged(
|
||||||
|
self,
|
||||||
|
index: int
|
||||||
|
):
|
||||||
|
|
||||||
|
if not self.__driver_ctxs or index < 0 or index >= len(self.__driver_ctxs):
|
||||||
|
return
|
||||||
|
driver_ctx = self.__driver_ctxs[index]
|
||||||
|
self.updateDriverInfoDisplay(driver_ctx)
|
||||||
|
self.updateProgressBarStates(driver_ctx)
|
||||||
|
self.updateButtonStates(driver_ctx)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onRefreshButtonClicked(
|
def onRefreshButtonClicked(
|
||||||
self
|
self
|
||||||
@@ -419,9 +391,9 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
):
|
):
|
||||||
|
|
||||||
index = self.DriverComboBox.currentIndex()
|
index = self.DriverComboBox.currentIndex()
|
||||||
if index < 0 or index >= len(self.__driver_infos):
|
if index < 0 or index >= len(self.__driver_ctxs):
|
||||||
return
|
return
|
||||||
driver_info = self.__driver_infos[index]
|
driver_info = self.__driver_ctxs[index]
|
||||||
if driver_info.driver_status.name != "INSTALLED":
|
if driver_info.driver_status.name != "INSTALLED":
|
||||||
QMessageBox.information(self, "提示 - AutoLibrary", "该驱动未安装, 无需删除")
|
QMessageBox.information(self, "提示 - AutoLibrary", "该驱动未安装, 无需删除")
|
||||||
return
|
return
|
||||||
@@ -447,9 +419,9 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
|
|
||||||
self.DriverComboBox.setEnabled(False)
|
self.DriverComboBox.setEnabled(False)
|
||||||
index = self.DriverComboBox.currentIndex()
|
index = self.DriverComboBox.currentIndex()
|
||||||
if index < 0 or index >= len(self.__driver_infos):
|
if index < 0 or index >= len(self.__driver_ctxs):
|
||||||
return
|
return
|
||||||
driver_info = self.__driver_infos[index]
|
driver_info = self.__driver_ctxs[index]
|
||||||
if driver_info.driver_status == WebDriverStatus.INSTALLED:
|
if driver_info.driver_status == WebDriverStatus.INSTALLED:
|
||||||
return
|
return
|
||||||
driver_info.driver_status = WebDriverStatus.DOWNLOADING # we set this only to update
|
driver_info.driver_status = WebDriverStatus.DOWNLOADING # we set this only to update
|
||||||
@@ -465,7 +437,7 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
self.__download_thread.downloadFinished.connect(self.onDownloadFinished)
|
self.__download_thread.downloadFinished.connect(self.onDownloadFinished)
|
||||||
self.__download_thread.downloadError.connect(self.onDownloadError)
|
self.__download_thread.downloadError.connect(self.onDownloadError)
|
||||||
self.__download_thread.downloadCancelled.connect(self.onDownloadCancelled)
|
self.__download_thread.downloadCancelled.connect(self.onDownloadCancelled)
|
||||||
self.__download_thread.finished.connect(self.onThreadFinished)
|
self.__download_thread.finished.connect(self.onDownloadThreadFinished)
|
||||||
self.__download_thread.start()
|
self.__download_thread.start()
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
@@ -493,9 +465,11 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
|
|
||||||
self.DriverComboBox.setEnabled(True)
|
self.DriverComboBox.setEnabled(True)
|
||||||
index = self.DriverComboBox.currentIndex()
|
index = self.DriverComboBox.currentIndex()
|
||||||
if 0 <= index < len(self.__driver_infos):
|
if 0 <= index < len(self.__driver_ctxs):
|
||||||
driver_info = self.__driver_infos[index]
|
driver_info = self.__driver_ctxs[index]
|
||||||
driver_info.driver_status = WebDriverStatus.INSTALLED
|
driver_info.driver_status = WebDriverStatus.INSTALLED
|
||||||
|
current_text = self.DriverComboBox.itemText(index)
|
||||||
|
self.DriverComboBox.setItemText(index, current_text + " - 已安装")
|
||||||
self.updateDriverInfoDisplay(driver_info)
|
self.updateDriverInfoDisplay(driver_info)
|
||||||
self.updateProgressBarStates(driver_info)
|
self.updateProgressBarStates(driver_info)
|
||||||
self.updateButtonStates(driver_info)
|
self.updateButtonStates(driver_info)
|
||||||
@@ -508,8 +482,8 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
|
|
||||||
self.DriverComboBox.setEnabled(True)
|
self.DriverComboBox.setEnabled(True)
|
||||||
index = self.DriverComboBox.currentIndex()
|
index = self.DriverComboBox.currentIndex()
|
||||||
if 0 <= index < len(self.__driver_infos):
|
if 0 <= index < len(self.__driver_ctxs):
|
||||||
driver_info = self.__driver_infos[index]
|
driver_info = self.__driver_ctxs[index]
|
||||||
driver_info.driver_status = WebDriverStatus.ERROR
|
driver_info.driver_status = WebDriverStatus.ERROR
|
||||||
self.updateDriverInfoDisplay(driver_info)
|
self.updateDriverInfoDisplay(driver_info)
|
||||||
self.updateProgressBarStates(driver_info)
|
self.updateProgressBarStates(driver_info)
|
||||||
@@ -523,8 +497,8 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
|
|
||||||
self.DriverComboBox.setEnabled(True)
|
self.DriverComboBox.setEnabled(True)
|
||||||
index = self.DriverComboBox.currentIndex()
|
index = self.DriverComboBox.currentIndex()
|
||||||
if 0 <= index < len(self.__driver_infos):
|
if 0 <= index < len(self.__driver_ctxs):
|
||||||
driver_info = self.__driver_infos[index]
|
driver_info = self.__driver_ctxs[index]
|
||||||
self.__driver_manager.cancelDriverDownload(driver_info)
|
self.__driver_manager.cancelDriverDownload(driver_info)
|
||||||
driver_info.driver_status = WebDriverStatus.NOT_INSTALLED
|
driver_info.driver_status = WebDriverStatus.NOT_INSTALLED
|
||||||
self.updateDriverInfoDisplay(driver_info)
|
self.updateDriverInfoDisplay(driver_info)
|
||||||
@@ -532,18 +506,27 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
self.updateButtonStates(driver_info)
|
self.updateButtonStates(driver_info)
|
||||||
self.ProgressText.setText("下载已取消")
|
self.ProgressText.setText("下载已取消")
|
||||||
|
|
||||||
|
@Slot()
|
||||||
|
def onDownloadThreadFinished(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
if self.__download_thread:
|
||||||
|
self.__download_thread.deleteLater()
|
||||||
|
self.__download_thread = None
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def onConfirmButtonClicked(
|
def onConfirmButtonClicked(
|
||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
index = self.DriverComboBox.currentIndex()
|
index = self.DriverComboBox.currentIndex()
|
||||||
if index < 0 or index >= len(self.__driver_infos):
|
if index < 0 or index >= len(self.__driver_ctxs):
|
||||||
return
|
return
|
||||||
driver_info = self.__driver_infos[index]
|
driver_ctx = self.__driver_ctxs[index]
|
||||||
if driver_info.driver_status != WebDriverStatus.INSTALLED:
|
if driver_ctx.driver_status != WebDriverStatus.INSTALLED:
|
||||||
return
|
return
|
||||||
self.__selected_driver_info = driver_info
|
self.__selected_driver_ctx = driver_ctx
|
||||||
self.__confirmed = True
|
self.__confirmed = True
|
||||||
self.accept()
|
self.accept()
|
||||||
|
|
||||||
@@ -563,5 +546,5 @@ class ALWebDriverDownloadDialog(QDialog):
|
|||||||
self.__download_thread.cancel()
|
self.__download_thread.cancel()
|
||||||
else:
|
else:
|
||||||
self.__confirmed = False
|
self.__confirmed = False
|
||||||
self.__selected_driver_info = None
|
self.__selected_driver_ctx = None
|
||||||
self.reject()
|
self.reject()
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
Copyright (c) 2026 KenanZhu.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
This software is provided "as is", without any warranty of any kind.
|
||||||
|
You may use, modify, and distribute this file under the terms of the MIT License.
|
||||||
|
See the LICENSE file for details.
|
||||||
|
"""
|
||||||
|
from PySide6.QtGui import QShowEvent
|
||||||
|
|
||||||
|
|
||||||
|
class CenterOnParentMixin:
|
||||||
|
"""
|
||||||
|
Mixin that centres the widget relative to its parent on first show,
|
||||||
|
clamping the position to the screen bounds.
|
||||||
|
|
||||||
|
Usage::
|
||||||
|
|
||||||
|
class MyWidget(CenterOnParentMixin, QWidget, Ui_MyWidget):
|
||||||
|
pass
|
||||||
|
|
||||||
|
class MyDialog(CenterOnParentMixin, QDialog):
|
||||||
|
pass
|
||||||
|
|
||||||
|
The mixin must appear **before** QWidget / QDialog in the base list
|
||||||
|
so that ``super().showEvent(event)`` resolves up the MRO correctly.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def showEvent(
|
||||||
|
self,
|
||||||
|
event: QShowEvent
|
||||||
|
):
|
||||||
|
|
||||||
|
super().showEvent(event)
|
||||||
|
if self.parent():
|
||||||
|
screen_rect = self.screen().geometry()
|
||||||
|
target_pos = self.parent().geometry().center()
|
||||||
|
target_pos.setX(target_pos.x() - self.width() // 2)
|
||||||
|
target_pos.setY(target_pos.y() - self.height() // 2)
|
||||||
|
if target_pos.x() < 0:
|
||||||
|
target_pos.setX(0)
|
||||||
|
if target_pos.x() + self.width() > screen_rect.width():
|
||||||
|
target_pos.setX(screen_rect.width() - self.width())
|
||||||
|
if target_pos.y() < 0:
|
||||||
|
target_pos.setY(0)
|
||||||
|
if target_pos.y() + self.height() > screen_rect.height():
|
||||||
|
target_pos.setY(screen_rect.height() - self.height())
|
||||||
|
self.move(target_pos)
|
||||||
Binary file not shown.
@@ -0,0 +1,385 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<ui version="4.0">
|
||||||
|
<class>ALBulletinDialog</class>
|
||||||
|
<widget class="QDialog" name="ALBulletinDialog">
|
||||||
|
<property name="windowModality">
|
||||||
|
<enum>Qt::WindowModality::NonModal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>0</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>640</width>
|
||||||
|
<height>450</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>400</width>
|
||||||
|
<height>450</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>800</width>
|
||||||
|
<height>450</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="windowTitle">
|
||||||
|
<string>公告栏 - AutoLibrary</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="ALBulletinDialogLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="SyncLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>10</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="SyncButton">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>80</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>80</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="focusPolicy">
|
||||||
|
<enum>Qt::FocusPolicy::NoFocus</enum>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>同步</string>
|
||||||
|
</property>
|
||||||
|
<property name="autoDefault">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="SyncStatusPlaceholder">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>30</width>
|
||||||
|
<height>30</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>30</width>
|
||||||
|
<height>30</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="SyncStatusDetailLabel">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>80</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>200</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QFrame" name="SyncSpaceFrame">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>800</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="frameShape">
|
||||||
|
<enum>QFrame::Shape::NoFrame</enum>
|
||||||
|
</property>
|
||||||
|
<property name="frameShadow">
|
||||||
|
<enum>QFrame::Shadow::Plain</enum>
|
||||||
|
</property>
|
||||||
|
<property name="lineWidth">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="LastSyncTimeLabel">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>50</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>50</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>上次同步:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QDateTimeEdit" name="LastSyncDateTimeEdit">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>130</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>130</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="frame">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="readOnly">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="buttonSymbols">
|
||||||
|
<enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
|
||||||
|
</property>
|
||||||
|
<property name="keyboardTracking">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="displayFormat">
|
||||||
|
<string>yyyy/MM/dd HH:mm:ss</string>
|
||||||
|
</property>
|
||||||
|
<property name="timeSpec">
|
||||||
|
<enum>Qt::TimeSpec::LocalTime</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QSplitter" name="BulletinSplitter">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Orientation::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<widget class="QFrame" name="LeftFrame">
|
||||||
|
<property name="frameShape">
|
||||||
|
<enum>QFrame::Shape::NoFrame</enum>
|
||||||
|
</property>
|
||||||
|
<property name="frameShadow">
|
||||||
|
<enum>QFrame::Shadow::Plain</enum>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="LeftFrameLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QListWidget" name="BulletinListWidget">
|
||||||
|
<property name="frameShape">
|
||||||
|
<enum>QFrame::Shape::NoFrame</enum>
|
||||||
|
</property>
|
||||||
|
<property name="editTriggers">
|
||||||
|
<set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
|
||||||
|
</property>
|
||||||
|
<property name="selectionMode">
|
||||||
|
<enum>QAbstractItemView::SelectionMode::SingleSelection</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<widget class="QFrame" name="RightFrame">
|
||||||
|
<property name="frameShape">
|
||||||
|
<enum>QFrame::Shape::NoFrame</enum>
|
||||||
|
</property>
|
||||||
|
<property name="frameShadow">
|
||||||
|
<enum>QFrame::Shadow::Plain</enum>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="RightFrameLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="BulletinTitleLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="BulletinInfoLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="BulletinDateLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="BulletinAuthorLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="BulletinIsEditedLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string>(已编辑)</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="BulletinInfoSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Orientation::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QTextBrowser" name="BulletinContentTextBrowser">
|
||||||
|
<property name="readOnly">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="openExternalLinks">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QDialogButtonBox" name="BulletinDialogButtonBox">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>16777215</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Orientation::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="standardButtons">
|
||||||
|
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<resources/>
|
||||||
|
<connections>
|
||||||
|
<connection>
|
||||||
|
<sender>BulletinDialogButtonBox</sender>
|
||||||
|
<signal>accepted()</signal>
|
||||||
|
<receiver>ALBulletinDialog</receiver>
|
||||||
|
<slot>accept()</slot>
|
||||||
|
<hints>
|
||||||
|
<hint type="sourcelabel">
|
||||||
|
<x>248</x>
|
||||||
|
<y>254</y>
|
||||||
|
</hint>
|
||||||
|
<hint type="destinationlabel">
|
||||||
|
<x>157</x>
|
||||||
|
<y>274</y>
|
||||||
|
</hint>
|
||||||
|
</hints>
|
||||||
|
</connection>
|
||||||
|
<connection>
|
||||||
|
<sender>BulletinDialogButtonBox</sender>
|
||||||
|
<signal>rejected()</signal>
|
||||||
|
<receiver>ALBulletinDialog</receiver>
|
||||||
|
<slot>reject()</slot>
|
||||||
|
<hints>
|
||||||
|
<hint type="sourcelabel">
|
||||||
|
<x>316</x>
|
||||||
|
<y>260</y>
|
||||||
|
</hint>
|
||||||
|
<hint type="destinationlabel">
|
||||||
|
<x>286</x>
|
||||||
|
<y>274</y>
|
||||||
|
</hint>
|
||||||
|
</hints>
|
||||||
|
</connection>
|
||||||
|
</connections>
|
||||||
|
</ui>
|
||||||
@@ -286,6 +286,7 @@ font: 700 9pt;</string>
|
|||||||
<string>工具</string>
|
<string>工具</string>
|
||||||
</property>
|
</property>
|
||||||
<addaction name="SettingsAction"/>
|
<addaction name="SettingsAction"/>
|
||||||
|
<addaction name="BulletinAction"/>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QMenu" name="HelpMenu">
|
<widget class="QMenu" name="HelpMenu">
|
||||||
<property name="mouseTracking">
|
<property name="mouseTracking">
|
||||||
@@ -295,6 +296,7 @@ font: 700 9pt;</string>
|
|||||||
<string>帮助</string>
|
<string>帮助</string>
|
||||||
</property>
|
</property>
|
||||||
<addaction name="ManualAction"/>
|
<addaction name="ManualAction"/>
|
||||||
|
<addaction name="CheckUpdateAction"/>
|
||||||
<addaction name="AboutAction"/>
|
<addaction name="AboutAction"/>
|
||||||
</widget>
|
</widget>
|
||||||
<addaction name="ToolsMenu"/>
|
<addaction name="ToolsMenu"/>
|
||||||
@@ -310,6 +312,11 @@ font: 700 9pt;</string>
|
|||||||
<string>在线手册</string>
|
<string>在线手册</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="CheckUpdateAction">
|
||||||
|
<property name="text">
|
||||||
|
<string>检查更新</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
<action name="AboutAction">
|
<action name="AboutAction">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>关于</string>
|
<string>关于</string>
|
||||||
@@ -320,6 +327,11 @@ font: 700 9pt;</string>
|
|||||||
<string>全局设置</string>
|
<string>全局设置</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="BulletinAction">
|
||||||
|
<property name="text">
|
||||||
|
<string>公告栏</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
|
|||||||
@@ -101,9 +101,21 @@
|
|||||||
<iconset theme="preferences-desktop-color"/>
|
<iconset theme="preferences-desktop-color"/>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>公告</string>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset theme="preferences-desktop-color"/>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
|
<widget class="QStackedWidget" name="PageStack">
|
||||||
|
<property name="currentIndex">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
<widget class="QScrollArea" name="AppearanceScrollArea">
|
<widget class="QScrollArea" name="AppearanceScrollArea">
|
||||||
<property name="frameShape">
|
<property name="frameShape">
|
||||||
<enum>QFrame::Shape::NoFrame</enum>
|
<enum>QFrame::Shape::NoFrame</enum>
|
||||||
@@ -116,8 +128,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>450</width>
|
<width>397</width>
|
||||||
<height>380</height>
|
<height>434</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="AppearancePageLayout">
|
<layout class="QVBoxLayout" name="AppearancePageLayout">
|
||||||
@@ -252,7 +264,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="CustomQssGroupBox">
|
<widget class="QGroupBox" name="CustomThemeGroupBox">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>自定义外观</string>
|
<string>自定义外观</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -273,7 +285,7 @@
|
|||||||
<number>3</number>
|
<number>3</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="CustomQssHintLabel">
|
<widget class="QLabel" name="CustomThemeHintLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>选择一个主题,或导入新的主题文件:</string>
|
<string>选择一个主题,或导入新的主题文件:</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -283,12 +295,12 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="QssPathLayout">
|
<layout class="QHBoxLayout" name="CustomThemePathLayout">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>5</number>
|
<number>5</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QComboBox" name="ThemeComboBox">
|
<widget class="QComboBox" name="CustomThemeComboBox">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>160</width>
|
<width>160</width>
|
||||||
@@ -298,7 +310,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="QssPathEdit">
|
<widget class="QLineEdit" name="CustomThemePathEdit">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>0</width>
|
<width>0</width>
|
||||||
@@ -314,7 +326,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="BrowseQssButton">
|
<widget class="QPushButton" name="ImportCustomThemeButton">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>25</width>
|
<width>25</width>
|
||||||
@@ -333,7 +345,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="RemoveThemeButton">
|
<widget class="QPushButton" name="RemoveCustomThemeButton">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>25</width>
|
<width>25</width>
|
||||||
@@ -354,7 +366,7 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="ThemeInfoLabel">
|
<widget class="QLabel" name="CustomThemeInfoLabel">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>0</width>
|
<width>0</width>
|
||||||
@@ -368,7 +380,7 @@
|
|||||||
<enum>Qt::TextFormat::RichText</enum>
|
<enum>Qt::TextFormat::RichText</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignTop</set>
|
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@@ -376,28 +388,12 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="QssActionLayout">
|
<layout class="QHBoxLayout" name="CustomThemeActionLayout">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>5</number>
|
<number>5</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="ApplyQssButton">
|
<widget class="QPushButton" name="ResetCustomThemeButton">
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>80</width>
|
|
||||||
<height>25</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="visible">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>应用样式</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="ResetThemeButton">
|
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>80</width>
|
<width>80</width>
|
||||||
@@ -410,7 +406,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="QssActionSpacer">
|
<spacer name="CustomThemeActionSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Orientation::Horizontal</enum>
|
<enum>Qt::Orientation::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
@@ -425,7 +421,7 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="QssStatusLabel">
|
<widget class="QLabel" name="CustomThemeStatusLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>当前使用程序 默认 外观。</string>
|
<string>当前使用程序 默认 外观。</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -453,6 +449,243 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
|
<widget class="QScrollArea" name="BulletinScrollArea">
|
||||||
|
<property name="frameShape">
|
||||||
|
<enum>QFrame::Shape::NoFrame</enum>
|
||||||
|
</property>
|
||||||
|
<property name="widgetResizable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<widget class="QWidget" name="BulletinPageContent">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>0</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>409</width>
|
||||||
|
<height>383</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="BulletinPageLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="BulletinGroupBox">
|
||||||
|
<property name="title">
|
||||||
|
<string>公告设置</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="BulletinGroupBoxLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>3</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="BulletinServerUrlLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="BulletinServerUrlLabel">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>服务器地址:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLineEdit" name="BulletinServerUrlEdit">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>200</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="placeholderText">
|
||||||
|
<string>https://api.autolibrary.kenanzhu.com</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="BulletinAutoFetchCheck">
|
||||||
|
<property name="text">
|
||||||
|
<string>软件启动时自动获取公告</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="BulletinSyncIntervalLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>5</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="BulletinSyncIntervalLabel">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>自动同步间隔:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QSpinBox" name="BulletinSyncIntervalSpin">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>80</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="suffix">
|
||||||
|
<string> 分钟</string>
|
||||||
|
</property>
|
||||||
|
<property name="minimum">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>1440</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="BulletinSyncIntervalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Orientation::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="BulletinTestButton">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>测试连接</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="BulletinTestStatusLabel">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>16777215</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="wordWrap">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="BulletinOpenButton">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>25</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>查看公告栏</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="BulletinPageSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Orientation::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>20</width>
|
||||||
|
<height>40</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</widget>
|
||||||
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -72,6 +72,12 @@ class CfgKey:
|
|||||||
STYLE = ConfigPath(ConfigType.GLOBAL, "appearance.style")
|
STYLE = ConfigPath(ConfigType.GLOBAL, "appearance.style")
|
||||||
CUSTOM_THEME = ConfigPath(ConfigType.GLOBAL, "appearance.custom_theme")
|
CUSTOM_THEME = ConfigPath(ConfigType.GLOBAL, "appearance.custom_theme")
|
||||||
|
|
||||||
|
class BULLETIN:
|
||||||
|
ROOT = ConfigPath(ConfigType.GLOBAL, "bulletin")
|
||||||
|
AUTO_FETCH = ConfigPath(ConfigType.GLOBAL, "bulletin.auto_fetch")
|
||||||
|
SERVER_URL = ConfigPath(ConfigType.GLOBAL, "bulletin.server_url")
|
||||||
|
SYNC_INTERVAL = ConfigPath(ConfigType.GLOBAL, "bulletin.sync_interval")
|
||||||
|
|
||||||
class TIMERTASK:
|
class TIMERTASK:
|
||||||
ROOT = ConfigPath(ConfigType.TIMERTASK, "")
|
ROOT = ConfigPath(ConfigType.TIMERTASK, "")
|
||||||
TIMER_TASKS = ConfigPath(ConfigType.TIMERTASK, "timer_tasks")
|
TIMER_TASKS = ConfigPath(ConfigType.TIMERTASK, "timer_tasks")
|
||||||
|
|||||||
@@ -0,0 +1,340 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
Copyright (c) 2026 KenanZhu.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
This software is provided "as is", without any warranty of any kind.
|
||||||
|
You may use, modify, and distribute this file under the terms of the MIT License.
|
||||||
|
See the LICENSE file for details.
|
||||||
|
"""
|
||||||
|
import threading
|
||||||
|
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from interfaces.ConfigProvider import (
|
||||||
|
CfgKey,
|
||||||
|
ConfigProvider
|
||||||
|
)
|
||||||
|
from managers.config.ConfigManager import instance as configInstance
|
||||||
|
|
||||||
|
|
||||||
|
class BulletinManager:
|
||||||
|
"""
|
||||||
|
Bulletin Manager Singleton Class
|
||||||
|
|
||||||
|
Manages bulletin data persistence via ConfigManager and provides
|
||||||
|
merge, read-status and sync-parameter logic. The HTTP fetch and
|
||||||
|
UI concerns are handled by the GUI layer.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self
|
||||||
|
):
|
||||||
|
|
||||||
|
self.__lock = threading.Lock()
|
||||||
|
self.__cfg: ConfigProvider = configInstance()
|
||||||
|
|
||||||
|
def bulletins(
|
||||||
|
self
|
||||||
|
) -> list[dict]:
|
||||||
|
"""
|
||||||
|
Get cached bulletins.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
list[dict]: Cached bulletin list.
|
||||||
|
"""
|
||||||
|
|
||||||
|
return self.__cfg.get(CfgKey.BULLETIN.BULLETIN, [])
|
||||||
|
|
||||||
|
def setBulletins(
|
||||||
|
self,
|
||||||
|
bulletins: list[dict]
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Replace the bulletin cache.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
bulletins (list[dict]): Bulletin list to store.
|
||||||
|
"""
|
||||||
|
|
||||||
|
self.__cfg.set(CfgKey.BULLETIN.BULLETIN, bulletins)
|
||||||
|
|
||||||
|
def lastSyncTime(
|
||||||
|
self
|
||||||
|
) -> Optional[str]:
|
||||||
|
"""
|
||||||
|
Get last sync time string.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Optional[str]: ISO-format last sync time, or None.
|
||||||
|
"""
|
||||||
|
|
||||||
|
return self.__cfg.get(CfgKey.BULLETIN.LAST_SYNC_TIME, None)
|
||||||
|
|
||||||
|
def setLastSyncTime(
|
||||||
|
self,
|
||||||
|
value: Optional[str]
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Set last sync time.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
value (Optional[str]): ISO-format datetime string.
|
||||||
|
"""
|
||||||
|
|
||||||
|
self.__cfg.set(CfgKey.BULLETIN.LAST_SYNC_TIME, value)
|
||||||
|
|
||||||
|
def autoFetch(
|
||||||
|
self
|
||||||
|
) -> bool:
|
||||||
|
"""
|
||||||
|
Get auto-fetch-on-startup setting.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool: Whether to fetch bulletins on application startup.
|
||||||
|
"""
|
||||||
|
|
||||||
|
return self.__cfg.get(CfgKey.GLOBAL.BULLETIN.AUTO_FETCH, False)
|
||||||
|
|
||||||
|
def serverUrl(
|
||||||
|
self
|
||||||
|
) -> str:
|
||||||
|
"""
|
||||||
|
Get bulletin server URL.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str: Server base URL.
|
||||||
|
"""
|
||||||
|
|
||||||
|
return self.__cfg.get(
|
||||||
|
CfgKey.GLOBAL.BULLETIN.SERVER_URL,
|
||||||
|
"https://api.autolibrary.kenanzhu.com"
|
||||||
|
)
|
||||||
|
|
||||||
|
def syncInterval(
|
||||||
|
self
|
||||||
|
) -> int:
|
||||||
|
"""
|
||||||
|
Get auto-sync interval in minutes.
|
||||||
|
|
||||||
|
Values below 1 are clamped upward. Non-integer or missing
|
||||||
|
values fall back to the default of 10 minutes.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
int: Sync interval (minutes), minimum 1.
|
||||||
|
"""
|
||||||
|
|
||||||
|
interval = self.__cfg.get(CfgKey.GLOBAL.BULLETIN.SYNC_INTERVAL, 10)
|
||||||
|
try:
|
||||||
|
interval = int(interval)
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
return 10
|
||||||
|
if interval < 1:
|
||||||
|
return 5
|
||||||
|
return interval
|
||||||
|
|
||||||
|
def apiUrl(
|
||||||
|
self
|
||||||
|
) -> str:
|
||||||
|
"""
|
||||||
|
Build the full bulletin API endpoint URL.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str: Full API URL (base + /bulletins).
|
||||||
|
"""
|
||||||
|
|
||||||
|
base = self.serverUrl().rstrip("/")
|
||||||
|
return f"{base}/bulletins"
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _ensureAware(
|
||||||
|
dt_value: datetime
|
||||||
|
) -> datetime:
|
||||||
|
|
||||||
|
if dt_value.tzinfo is None:
|
||||||
|
return dt_value.replace(tzinfo=timezone.utc)
|
||||||
|
return dt_value
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _parseBulletinDateTime(
|
||||||
|
b: dict
|
||||||
|
) -> datetime:
|
||||||
|
|
||||||
|
raw = b.get("dateTime", "")
|
||||||
|
if not raw:
|
||||||
|
raise ValueError("empty dateTime")
|
||||||
|
dt_value = datetime.fromisoformat(raw)
|
||||||
|
return BulletinManager._ensureAware(dt_value)
|
||||||
|
|
||||||
|
def isFirstSync(
|
||||||
|
self
|
||||||
|
) -> bool:
|
||||||
|
"""
|
||||||
|
Check whether this is the first sync.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool: True if no cached bulletins or no last sync time.
|
||||||
|
"""
|
||||||
|
|
||||||
|
with self.__lock:
|
||||||
|
last = self.lastSyncTime()
|
||||||
|
bulletins = self.bulletins()
|
||||||
|
return last is None or not bulletins
|
||||||
|
|
||||||
|
def shouldFullSync(
|
||||||
|
self
|
||||||
|
) -> bool:
|
||||||
|
"""
|
||||||
|
Check whether a full sync is needed.
|
||||||
|
|
||||||
|
A full sync is triggered when the last sync time is more than
|
||||||
|
one hour ago.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool: True if a full sync should be performed.
|
||||||
|
"""
|
||||||
|
|
||||||
|
with self.__lock:
|
||||||
|
last = self.lastSyncTime()
|
||||||
|
if last is None:
|
||||||
|
return True
|
||||||
|
try:
|
||||||
|
last_dt = datetime.fromisoformat(last)
|
||||||
|
last_dt = self._ensureAware(last_dt)
|
||||||
|
now = datetime.now(timezone.utc).astimezone()
|
||||||
|
return (now - last_dt) > timedelta(hours=1)
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
return True
|
||||||
|
|
||||||
|
def getSyncDateTimeAndRange(
|
||||||
|
self
|
||||||
|
) -> dict:
|
||||||
|
"""
|
||||||
|
Calculate the date / time / range_hour query parameters.
|
||||||
|
|
||||||
|
Falls back to a first-sync (7-day window) on any parsing error.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
dict: Keys "date", "time", "range_hour" for the API request.
|
||||||
|
"""
|
||||||
|
|
||||||
|
now = datetime.now(timezone.utc).astimezone()
|
||||||
|
try:
|
||||||
|
if self.isFirstSync():
|
||||||
|
start_date = now - timedelta(days=7)
|
||||||
|
range_hour = str(24*8)
|
||||||
|
elif self.shouldFullSync():
|
||||||
|
with self.__lock:
|
||||||
|
bulletins = self.bulletins()
|
||||||
|
earliest = min(bulletins, key=self._parseBulletinDateTime)
|
||||||
|
start_date = self._parseBulletinDateTime(earliest)
|
||||||
|
diff = now - start_date
|
||||||
|
range_hour = str(int(diff.total_seconds()/3600) + 1)
|
||||||
|
else:
|
||||||
|
with self.__lock:
|
||||||
|
bulletins = self.bulletins()
|
||||||
|
latest = max(bulletins, key=self._parseBulletinDateTime)
|
||||||
|
start_date = self._parseBulletinDateTime(latest)
|
||||||
|
diff = now - start_date
|
||||||
|
range_hour = str(int(diff.total_seconds()/3600) + 1)
|
||||||
|
except (ValueError, TypeError, KeyError):
|
||||||
|
start_date = now - timedelta(days=7)
|
||||||
|
range_hour = str(24*8)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"date": start_date.strftime("%Y-%m-%d"),
|
||||||
|
"time": start_date.strftime("%H:%M:%S"),
|
||||||
|
"range_hour": range_hour,
|
||||||
|
}
|
||||||
|
|
||||||
|
def updateAndMergeBulletins(
|
||||||
|
self,
|
||||||
|
new_bulletins: list[dict],
|
||||||
|
delete_ids: list[str]
|
||||||
|
) -> list[dict]:
|
||||||
|
"""
|
||||||
|
Merge incoming bulletins into the cache.
|
||||||
|
|
||||||
|
- New bulletins are added with isNew=True.
|
||||||
|
- Existing bulletins keep their current isNew state.
|
||||||
|
- Entries listed in delete_ids are removed.
|
||||||
|
- Bulletins missing an "id" field are skipped.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
new_bulletins (list[dict]): Incoming bulletin list.
|
||||||
|
delete_ids (list[str]): IDs to remove.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
list[dict]: Merged bulletin list sorted by id.
|
||||||
|
"""
|
||||||
|
|
||||||
|
with self.__lock:
|
||||||
|
delete_set = set(str(d) for d in delete_ids)
|
||||||
|
bulletins_dict = {}
|
||||||
|
for b in self.bulletins():
|
||||||
|
bid = b.get("id")
|
||||||
|
if bid is not None:
|
||||||
|
bulletins_dict[str(bid)] = b
|
||||||
|
for bulletin in new_bulletins:
|
||||||
|
bid = bulletin.get("id")
|
||||||
|
if bid is None:
|
||||||
|
continue
|
||||||
|
bid = str(bid)
|
||||||
|
if bid in delete_set:
|
||||||
|
bulletins_dict.pop(bid, None)
|
||||||
|
continue
|
||||||
|
bulletin["isNew"] = (
|
||||||
|
True
|
||||||
|
if bid not in bulletins_dict
|
||||||
|
else bulletins_dict[bid].get("isNew", True)
|
||||||
|
)
|
||||||
|
bulletins_dict[bid] = bulletin
|
||||||
|
for bid in delete_set:
|
||||||
|
bulletins_dict.pop(bid, None)
|
||||||
|
result = list(bulletins_dict.values())
|
||||||
|
result.sort(key=lambda x: str(x.get("id", "")))
|
||||||
|
self.setBulletins(result)
|
||||||
|
return result
|
||||||
|
|
||||||
|
def markBulletinAsRead(
|
||||||
|
self,
|
||||||
|
bulletin_id: str
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Mark a bulletin as read by its id.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
bulletin_id (str): The bulletin id.
|
||||||
|
"""
|
||||||
|
|
||||||
|
with self.__lock:
|
||||||
|
bulletins = self.bulletins()
|
||||||
|
for b in bulletins:
|
||||||
|
if str(b.get("id", "")) == str(bulletin_id):
|
||||||
|
b["isNew"] = False
|
||||||
|
self.setBulletins(bulletins)
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
|
# BulletinManager singleton instance.
|
||||||
|
_bulletin_manager_instance = None
|
||||||
|
|
||||||
|
# Singleton instance lock.
|
||||||
|
_instance_lock = threading.Lock()
|
||||||
|
|
||||||
|
|
||||||
|
def instance(
|
||||||
|
) -> BulletinManager:
|
||||||
|
"""
|
||||||
|
Get the BulletinManager singleton instance.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
BulletinManager: The singleton BulletinManager instance.
|
||||||
|
"""
|
||||||
|
|
||||||
|
global _bulletin_manager_instance
|
||||||
|
with _instance_lock:
|
||||||
|
if _bulletin_manager_instance is None:
|
||||||
|
_bulletin_manager_instance = BulletinManager()
|
||||||
|
return _bulletin_manager_instance
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
Copyright (c) 2026 KenanZhu.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
This software is provided "as is", without any warranty of any kind.
|
||||||
|
You may use, modify, and distribute this file under the terms of the MIT License.
|
||||||
|
See the LICENSE file for details.
|
||||||
|
"""
|
||||||
@@ -7,6 +7,7 @@ This software is provided "as is", without any warranty of any kind.
|
|||||||
You may use, modify, and distribute this file under the terms of the MIT License.
|
You may use, modify, and distribute this file under the terms of the MIT License.
|
||||||
See the LICENSE file for details.
|
See the LICENSE file for details.
|
||||||
"""
|
"""
|
||||||
|
import copy
|
||||||
import os
|
import os
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
@@ -18,7 +19,7 @@ from interfaces.ConfigProvider import ConfigType, ConfigPath
|
|||||||
|
|
||||||
|
|
||||||
# This config manager class only responsible for global and other
|
# This config manager class only responsible for global and other
|
||||||
# unconfigurable config files.
|
# config files. NOT include run and user config files.
|
||||||
|
|
||||||
|
|
||||||
class ConfigTemplate:
|
class ConfigTemplate:
|
||||||
@@ -59,6 +60,11 @@ class ConfigTemplate:
|
|||||||
"theme": "system",
|
"theme": "system",
|
||||||
"style": "Fusion",
|
"style": "Fusion",
|
||||||
"custom_theme": ""
|
"custom_theme": ""
|
||||||
|
},
|
||||||
|
"bulletin": {
|
||||||
|
"auto_fetch": False,
|
||||||
|
"server_url": "https://api.autolibrary.kenanzhu.com",
|
||||||
|
"sync_interval": 10
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case ConfigType.BULLETIN:
|
case ConfigType.BULLETIN:
|
||||||
@@ -82,8 +88,8 @@ class ConfigManager:
|
|||||||
):
|
):
|
||||||
|
|
||||||
self.__config_dir = os.path.abspath(config_dir)
|
self.__config_dir = os.path.abspath(config_dir)
|
||||||
self.__config_lock = threading.Lock()
|
|
||||||
self.__config_data = {}
|
self.__config_data = {}
|
||||||
|
self.__lock = threading.Lock()
|
||||||
|
|
||||||
self.initialize()
|
self.initialize()
|
||||||
|
|
||||||
@@ -105,7 +111,7 @@ class ConfigManager:
|
|||||||
config_data = JSONReader(config_path).data()
|
config_data = JSONReader(config_path).data()
|
||||||
self.__config_data[config_type.value] = config_data
|
self.__config_data[config_type.value] = config_data
|
||||||
return
|
return
|
||||||
except:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
self.__config_data[config_type.value] = ConfigTemplate(config_type).template()
|
self.__config_data[config_type.value] = ConfigTemplate(config_type).template()
|
||||||
JSONWriter(config_path, self.__config_data[config_type.value])
|
JSONWriter(config_path, self.__config_data[config_type.value])
|
||||||
@@ -116,16 +122,16 @@ class ConfigManager:
|
|||||||
default: Optional[Any] = None
|
default: Optional[Any] = None
|
||||||
) -> Any:
|
) -> Any:
|
||||||
|
|
||||||
with self.__config_lock:
|
with self.__lock:
|
||||||
config_data = self.__config_data[key.config_type.value]
|
config_data = self.__config_data[key.config_type.value]
|
||||||
if key.key == "":
|
if key.key == "":
|
||||||
return config_data
|
return copy.deepcopy(config_data)
|
||||||
keys = key.key.split('.')
|
keys = key.key.split('.')
|
||||||
for k in keys[:-1]:
|
for k in keys[:-1]:
|
||||||
config_data = config_data.get(k, None)
|
config_data = config_data.get(k, None)
|
||||||
if config_data is None:
|
if config_data is None:
|
||||||
return default
|
return default
|
||||||
return config_data.get(keys[-1], default)
|
return copy.deepcopy(config_data.get(keys[-1], default))
|
||||||
|
|
||||||
def set(
|
def set(
|
||||||
self,
|
self,
|
||||||
@@ -133,7 +139,7 @@ class ConfigManager:
|
|||||||
value: Any = None
|
value: Any = None
|
||||||
):
|
):
|
||||||
|
|
||||||
with self.__config_lock:
|
with self.__lock:
|
||||||
root_data = self.__config_data[key.config_type.value]
|
root_data = self.__config_data[key.config_type.value]
|
||||||
if key.key == "":
|
if key.key == "":
|
||||||
self.__config_data[key.config_type.value] = value
|
self.__config_data[key.config_type.value] = value
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ class WebDriverFileName:
|
|||||||
raise ValueError(f"不受支持的 web driver 类型 : {self.driver_type}")
|
raise ValueError(f"不受支持的 web driver 类型 : {self.driver_type}")
|
||||||
|
|
||||||
|
|
||||||
class WebDriverURL:
|
class WebDriverDownloadURL:
|
||||||
"""
|
"""
|
||||||
Web driver download URL
|
Web driver download URL
|
||||||
"""
|
"""
|
||||||
@@ -242,7 +242,7 @@ class WebDriverDownloader:
|
|||||||
self.driver_type = driver_type
|
self.driver_type = driver_type
|
||||||
self.arch = driver_arch
|
self.arch = driver_arch
|
||||||
self.version = driver_version
|
self.version = driver_version
|
||||||
self.download_url = str(WebDriverURL(self.version, self.driver_type, self.arch))
|
self.download_url = str(WebDriverDownloadURL(self.version, self.driver_type, self.arch))
|
||||||
self.download_dir = Path(download_dir)/self.driver_type.value/self.version/self.arch.value
|
self.download_dir = Path(download_dir)/self.driver_type.value/self.version/self.arch.value
|
||||||
self.download_dir.mkdir(mode=0o0755, parents=True, exist_ok=True)
|
self.download_dir.mkdir(mode=0o0755, parents=True, exist_ok=True)
|
||||||
self.download_path = self.download_dir/str(WebDriverFileName(self.version, self.driver_type, self.arch))
|
self.download_path = self.download_dir/str(WebDriverFileName(self.version, self.driver_type, self.arch))
|
||||||
@@ -360,6 +360,10 @@ class WebDriverDownloader:
|
|||||||
break
|
break
|
||||||
if not driver_file:
|
if not driver_file:
|
||||||
raise FileNotFoundError(f"未找到 web driver 文件 : {expected_name}")
|
raise FileNotFoundError(f"未找到 web driver 文件 : {expected_name}")
|
||||||
|
# Ensure executable permissions on Unix systems (zipfile
|
||||||
|
# extraction does not preserve the execute bit).
|
||||||
|
if os.name != 'nt':
|
||||||
|
os.chmod(driver_file, 0o755)
|
||||||
progress_callback(100, 100, 0.0, "解压完成")
|
progress_callback(100, 100, 0.0, "解压完成")
|
||||||
self.download_path.unlink()
|
self.download_path.unlink()
|
||||||
self._cleanup(driver_file)
|
self._cleanup(driver_file)
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ You may use, modify, and distribute this file under the terms of the MIT License
|
|||||||
See the LICENSE file for details.
|
See the LICENSE file for details.
|
||||||
"""
|
"""
|
||||||
import os
|
import os
|
||||||
|
import shutil
|
||||||
import threading
|
import threading
|
||||||
import packaging.version as ver
|
import packaging.version as ver
|
||||||
|
|
||||||
@@ -19,7 +20,7 @@ from managers.driver.WebBrowserDetector import (
|
|||||||
WebBrowserType, WebBrowserArch, WebBrowserInfo, WebBrowserDetector
|
WebBrowserType, WebBrowserArch, WebBrowserInfo, WebBrowserDetector
|
||||||
)
|
)
|
||||||
from managers.driver.WebDriverDownloader import (
|
from managers.driver.WebDriverDownloader import (
|
||||||
WebDriverArch, WebDriverType,
|
WebDriverArch, WebDriverType, WebDriverExecName,
|
||||||
ChromeDriverDownloader, FirefoxDriverDownloader, EdgeDriverDownloader
|
ChromeDriverDownloader, FirefoxDriverDownloader, EdgeDriverDownloader
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -35,9 +36,9 @@ class WebDriverStatus(Enum):
|
|||||||
ERROR = 3
|
ERROR = 3
|
||||||
|
|
||||||
|
|
||||||
class WebDriverInfo:
|
class WebDriverCtx:
|
||||||
"""
|
"""
|
||||||
Web driver information.
|
Web browser and driver context.
|
||||||
|
|
||||||
Attributes:
|
Attributes:
|
||||||
driver_type (WebDriverType): Web driver type
|
driver_type (WebDriverType): Web driver type
|
||||||
@@ -52,8 +53,8 @@ class WebDriverInfo:
|
|||||||
self
|
self
|
||||||
):
|
):
|
||||||
|
|
||||||
self.driver_type = None
|
self.driver_type : Optional[WebDriverType] = None
|
||||||
self.driver_arch = None
|
self.driver_arch : Optional[WebDriverArch] = None
|
||||||
self.driver_version = ""
|
self.driver_version = ""
|
||||||
self.browser_version = ""
|
self.browser_version = ""
|
||||||
self.driver_path: Optional[Path] = None
|
self.driver_path: Optional[Path] = None
|
||||||
@@ -75,7 +76,7 @@ class WebDriverManager:
|
|||||||
|
|
||||||
self.__driver_dir = os.path.abspath(driver_dir)
|
self.__driver_dir = os.path.abspath(driver_dir)
|
||||||
self.__browser_detector = WebBrowserDetector()
|
self.__browser_detector = WebBrowserDetector()
|
||||||
self.__driver_infos: list[WebDriverInfo] = []
|
self.__driver_ctxs: list[WebDriverCtx] = []
|
||||||
self.__initialized = False
|
self.__initialized = False
|
||||||
self.__lock = threading.Lock()
|
self.__lock = threading.Lock()
|
||||||
|
|
||||||
@@ -98,8 +99,8 @@ class WebDriverManager:
|
|||||||
|
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
browser_infos = self.__browser_detector.detect()
|
browser_infos = self.__browser_detector.detect()
|
||||||
self.__driver_infos = [
|
self.__driver_ctxs = [
|
||||||
self._getDriverInfo(info)
|
self._getDriverCtx(info)
|
||||||
for info in browser_infos
|
for info in browser_infos
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -108,9 +109,13 @@ class WebDriverManager:
|
|||||||
):
|
):
|
||||||
|
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
for driver_info in self.__driver_infos:
|
for driver_info in self.__driver_ctxs:
|
||||||
driver_path = self._getDriverPath(driver_info)
|
driver_path = self._getDriverPath(driver_info)
|
||||||
if driver_path and driver_path.exists() and driver_path.is_file():
|
if driver_path and driver_path.exists() and driver_path.is_file():
|
||||||
|
# Repair missing execute permission on Unix
|
||||||
|
# (zip-extracted drivers from older versions).
|
||||||
|
if os.name != 'nt' and not os.access(str(driver_path), os.X_OK):
|
||||||
|
os.chmod(str(driver_path), 0o755)
|
||||||
driver_info.driver_path = driver_path
|
driver_info.driver_path = driver_path
|
||||||
driver_info.driver_status = WebDriverStatus.INSTALLED
|
driver_info.driver_status = WebDriverStatus.INSTALLED
|
||||||
|
|
||||||
@@ -194,7 +199,7 @@ class WebDriverManager:
|
|||||||
else:
|
else:
|
||||||
raise ValueError(f"不支持的 Web 浏览器类型 : {browser_type}")
|
raise ValueError(f"不支持的 Web 浏览器类型 : {browser_type}")
|
||||||
|
|
||||||
def _mapFirefoxDriverVersion(
|
def _mapFirefoxBrowserVersionToDriver(
|
||||||
self,
|
self,
|
||||||
version: str
|
version: str
|
||||||
) -> str:
|
) -> str:
|
||||||
@@ -234,46 +239,30 @@ class WebDriverManager:
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise ValueError(f"无效的 Firefox 版本格式 : {version}") from e
|
raise ValueError(f"无效的 Firefox 版本格式 : {version}") from e
|
||||||
|
|
||||||
def _getDriverInfo(
|
def _getDriverCtx(
|
||||||
self,
|
self,
|
||||||
browser_info: WebBrowserInfo
|
browser_info: WebBrowserInfo
|
||||||
) -> WebDriverInfo:
|
) -> WebDriverCtx:
|
||||||
|
|
||||||
driver_info = WebDriverInfo()
|
driver_ctx = WebDriverCtx()
|
||||||
driver_info.driver_type = self._mapWebBrowserTypeToDriver(browser_info.browser_type)
|
driver_ctx.driver_type = self._mapWebBrowserTypeToDriver(browser_info.browser_type)
|
||||||
driver_info.driver_arch = self._mapWebBrowserArchToDriver(browser_info.browser_type, browser_info.browser_arch)
|
driver_ctx.driver_arch = self._mapWebBrowserArchToDriver(browser_info.browser_type, browser_info.browser_arch)
|
||||||
if browser_info.browser_type == WebBrowserType.FIREFOX:
|
if browser_info.browser_type == WebBrowserType.FIREFOX:
|
||||||
driver_info.driver_version = self._mapFirefoxDriverVersion(browser_info.browser_version)
|
driver_ctx.driver_version = self._mapFirefoxBrowserVersionToDriver(browser_info.browser_version)
|
||||||
else:
|
else:
|
||||||
driver_info.driver_version = browser_info.browser_version
|
driver_ctx.driver_version = browser_info.browser_version
|
||||||
driver_info.browser_version = browser_info.browser_version
|
driver_ctx.browser_version = browser_info.browser_version
|
||||||
return driver_info
|
return driver_ctx
|
||||||
|
|
||||||
def _getDriverPath(
|
def _getDriverPath(
|
||||||
self,
|
self,
|
||||||
driver_info: WebDriverInfo
|
driver_ctx: WebDriverCtx
|
||||||
) -> Optional[Path]:
|
) -> Optional[Path]:
|
||||||
|
|
||||||
driver_type = driver_info.driver_type
|
driver_type = driver_ctx.driver_type
|
||||||
driver_arch = driver_info.driver_arch
|
driver_arch = driver_ctx.driver_arch
|
||||||
driver_version = driver_info.driver_version
|
driver_version = driver_ctx.driver_version
|
||||||
if driver_type == WebDriverType.CHROME:
|
exe_name = str(WebDriverExecName(driver_type, driver_arch))
|
||||||
driver_name = "chromedriver"
|
|
||||||
elif driver_type == WebDriverType.FIREFOX:
|
|
||||||
driver_name = "geckodriver"
|
|
||||||
elif driver_type == WebDriverType.EDGE:
|
|
||||||
driver_name = "msedgedriver"
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
is_win = driver_arch in [
|
|
||||||
WebDriverArch.Chrome.WINX86_32,
|
|
||||||
WebDriverArch.Chrome.WINX86_64,
|
|
||||||
WebDriverArch.Firefox.WINX86_32,
|
|
||||||
WebDriverArch.Firefox.WINX86_64,
|
|
||||||
WebDriverArch.Edge.WINX86_32,
|
|
||||||
WebDriverArch.Edge.WINX86_64,
|
|
||||||
]
|
|
||||||
exe_name = f"{driver_name}.exe" if is_win else driver_name
|
|
||||||
driver_dir = Path(self.__driver_dir)/driver_type.value/driver_version/driver_arch.value
|
driver_dir = Path(self.__driver_dir)/driver_type.value/driver_version/driver_arch.value
|
||||||
driver_path = driver_dir/exe_name
|
driver_path = driver_dir/exe_name
|
||||||
return driver_path
|
return driver_path
|
||||||
@@ -285,28 +274,28 @@ class WebDriverManager:
|
|||||||
self._detectBrowsers()
|
self._detectBrowsers()
|
||||||
self._checkDriverStatus()
|
self._checkDriverStatus()
|
||||||
|
|
||||||
def getDriverInfos(
|
def getDriverCtxs(
|
||||||
self
|
self
|
||||||
) -> list[WebDriverInfo]:
|
) -> list[WebDriverCtx]:
|
||||||
|
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
return self.__driver_infos.copy()
|
return self.__driver_ctxs.copy()
|
||||||
|
|
||||||
def getDriverInfo(
|
def getDriverCtx(
|
||||||
self,
|
self,
|
||||||
driver_type: WebDriverType
|
driver_type: WebDriverType
|
||||||
) -> list[WebDriverInfo]:
|
) -> list[WebDriverCtx]:
|
||||||
|
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
return [
|
return [
|
||||||
info
|
info
|
||||||
for info in self.__driver_infos
|
for info in self.__driver_ctxs
|
||||||
if info.driver_type == driver_type
|
if info.driver_type == driver_type
|
||||||
]
|
]
|
||||||
|
|
||||||
def getDriverPath(
|
def getDriverPath(
|
||||||
self,
|
self,
|
||||||
driver_info: WebDriverInfo
|
driver_info: WebDriverCtx
|
||||||
) -> Optional[Path]:
|
) -> Optional[Path]:
|
||||||
|
|
||||||
if driver_info and driver_info.driver_status == WebDriverStatus.INSTALLED:
|
if driver_info and driver_info.driver_status == WebDriverStatus.INSTALLED:
|
||||||
@@ -315,28 +304,28 @@ class WebDriverManager:
|
|||||||
|
|
||||||
def installDriver(
|
def installDriver(
|
||||||
self,
|
self,
|
||||||
driver_info: WebDriverInfo,
|
driver_ctx: WebDriverCtx,
|
||||||
progress_callback: Optional[Callable[[float, int, float, str], None]] = None,
|
progress_callback: Optional[Callable[[float, int, float, str], None]] = None,
|
||||||
cancel_event: Optional[threading.Event] = None
|
cancel_event: Optional[threading.Event] = None
|
||||||
) -> Optional[Path]:
|
) -> Optional[Path]:
|
||||||
|
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
if not driver_info:
|
if not driver_ctx:
|
||||||
if progress_callback:
|
if progress_callback:
|
||||||
progress_callback(0, 0, 0, "未找到浏览器信息")
|
progress_callback(0, 0, 0, "未找到浏览器信息")
|
||||||
else:
|
else:
|
||||||
raise ValueError("未找到浏览器信息")
|
raise ValueError("未找到浏览器信息")
|
||||||
if driver_info and driver_info.driver_status == WebDriverStatus.DOWNLOADING:
|
if driver_ctx and driver_ctx.driver_status == WebDriverStatus.DOWNLOADING:
|
||||||
if progress_callback:
|
if progress_callback:
|
||||||
progress_callback(0, 0, 0, f"{driver_info.driver_type} 驱动正在下载中")
|
progress_callback(0, 0, 0, f"{driver_ctx.driver_type} 驱动正在下载中")
|
||||||
else:
|
else:
|
||||||
raise ValueError(f"{driver_info.driver_type} 驱动正在下载中")
|
raise ValueError(f"{driver_ctx.driver_type} 驱动正在下载中")
|
||||||
try:
|
try:
|
||||||
if not driver_info:
|
if not driver_ctx:
|
||||||
raise ValueError("未找到浏览器信息")
|
raise ValueError("未找到浏览器信息")
|
||||||
driver_arch = driver_info.driver_arch
|
driver_arch = driver_ctx.driver_arch
|
||||||
driver_type = driver_info.driver_type
|
driver_type = driver_ctx.driver_type
|
||||||
driver_version = driver_info.driver_version
|
driver_version = driver_ctx.driver_version
|
||||||
downloader = None
|
downloader = None
|
||||||
if driver_type == WebDriverType.CHROME:
|
if driver_type == WebDriverType.CHROME:
|
||||||
downloader = ChromeDriverDownloader(
|
downloader = ChromeDriverDownloader(
|
||||||
@@ -362,68 +351,66 @@ class WebDriverManager:
|
|||||||
else:
|
else:
|
||||||
raise ValueError(f"不支持的 Web Driver 类型")
|
raise ValueError(f"不支持的 Web Driver 类型")
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
driver_info.driver_status = WebDriverStatus.DOWNLOADING
|
driver_ctx.driver_status = WebDriverStatus.DOWNLOADING
|
||||||
driver_path = downloader.download(progress_callback=progress_callback, cancel_event=cancel_event)
|
driver_path = downloader.download(progress_callback=progress_callback, cancel_event=cancel_event)
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
if driver_path:
|
if driver_path:
|
||||||
driver_info.driver_path = driver_path
|
driver_ctx.driver_path = driver_path
|
||||||
driver_info.driver_version = driver_version
|
driver_ctx.driver_version = driver_version
|
||||||
driver_info.driver_status = WebDriverStatus.INSTALLED
|
driver_ctx.driver_status = WebDriverStatus.INSTALLED
|
||||||
else:
|
else:
|
||||||
driver_info.driver_status = WebDriverStatus.ERROR
|
driver_ctx.driver_status = WebDriverStatus.ERROR
|
||||||
return driver_path
|
return driver_path
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
driver_info.driver_status = WebDriverStatus.ERROR
|
driver_ctx.driver_status = WebDriverStatus.ERROR
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
def cancelDriverDownload(
|
def cancelDriverDownload(
|
||||||
self,
|
self,
|
||||||
driver_info: WebDriverInfo
|
driver_ctx: WebDriverCtx
|
||||||
) -> bool:
|
) -> bool:
|
||||||
|
|
||||||
import shutil
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
driver_path = self._getDriverPath(driver_info)
|
driver_path = self._getDriverPath(driver_ctx)
|
||||||
if driver_path:
|
if driver_path:
|
||||||
download_dir = driver_path.parent
|
download_dir = driver_path.parent
|
||||||
if download_dir.exists():
|
if download_dir.exists():
|
||||||
shutil.rmtree(download_dir, ignore_errors=True)
|
shutil.rmtree(download_dir, ignore_errors=True)
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
driver_info.driver_path = None
|
driver_ctx.driver_path = None
|
||||||
driver_info.driver_status = WebDriverStatus.NOT_INSTALLED
|
driver_ctx.driver_status = WebDriverStatus.NOT_INSTALLED
|
||||||
return True
|
return True
|
||||||
except Exception:
|
except Exception:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def uninstallDriver(
|
def uninstallDriver(
|
||||||
self,
|
self,
|
||||||
driver_info: WebDriverInfo,
|
driver_ctx: WebDriverCtx,
|
||||||
progress_callback: Optional[Callable[[int, int, float, str], None]] = None
|
progress_callback: Optional[Callable[[int, int, float, str], None]] = None
|
||||||
) -> bool:
|
) -> bool:
|
||||||
|
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
if not driver_info:
|
if not driver_ctx:
|
||||||
if progress_callback:
|
if progress_callback:
|
||||||
progress_callback(0, 0, 0, "未找到浏览器信息")
|
progress_callback(0, 0, 0, "未找到浏览器信息")
|
||||||
else:
|
else:
|
||||||
raise ValueError("未找到浏览器信息")
|
raise ValueError("未找到浏览器信息")
|
||||||
if driver_info.driver_status != WebDriverStatus.INSTALLED:
|
if driver_ctx.driver_status != WebDriverStatus.INSTALLED:
|
||||||
if progress_callback:
|
if progress_callback:
|
||||||
progress_callback(0, 0, 0, f"{driver_info.driver_type} 驱动未安装")
|
progress_callback(0, 0, 0, f"{driver_ctx.driver_type} 驱动未安装")
|
||||||
else:
|
else:
|
||||||
raise ValueError(f"{driver_info.driver_type} 驱动未安装")
|
raise ValueError(f"{driver_ctx.driver_type} 驱动未安装")
|
||||||
try:
|
try:
|
||||||
driver_path = driver_info.driver_path
|
driver_path = driver_ctx.driver_path
|
||||||
driver_path.unlink()
|
driver_path.unlink()
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
driver_info.driver_path = None
|
driver_ctx.driver_path = None
|
||||||
driver_info.driver_status = WebDriverStatus.NOT_INSTALLED
|
driver_ctx.driver_status = WebDriverStatus.NOT_INSTALLED
|
||||||
return True
|
return True
|
||||||
except Exception:
|
except Exception:
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
driver_info.driver_status = WebDriverStatus.ERROR
|
driver_ctx.driver_status = WebDriverStatus.ERROR
|
||||||
raise
|
raise
|
||||||
|
|
||||||
def driverDir(
|
def driverDir(
|
||||||
|
|||||||
@@ -99,17 +99,14 @@ class LogManager:
|
|||||||
self.__logger = logging.getLogger("AutoLibrary")
|
self.__logger = logging.getLogger("AutoLibrary")
|
||||||
self.__logger.setLevel(logging.DEBUG)
|
self.__logger.setLevel(logging.DEBUG)
|
||||||
self.__logger.handlers.clear()
|
self.__logger.handlers.clear()
|
||||||
|
|
||||||
formatter = CallerInfoFormatter(
|
formatter = CallerInfoFormatter(
|
||||||
'[%(asctime)s] - [%(name)s] - [%(levelname)s] - [%(filename)s:%(lineno)s] - %(message)s',
|
'[%(asctime)s] - [%(name)s] - [%(levelname)s] - [%(filename)s:%(lineno)s] - %(message)s',
|
||||||
datefmt='%Y-%m-%d %H:%M:%S'
|
datefmt='%Y-%m-%d %H:%M:%S'
|
||||||
)
|
)
|
||||||
|
|
||||||
console_handler = logging.StreamHandler()
|
console_handler = logging.StreamHandler()
|
||||||
console_handler.setLevel(logging.INFO)
|
console_handler.setLevel(logging.INFO)
|
||||||
console_handler.setFormatter(formatter)
|
console_handler.setFormatter(formatter)
|
||||||
self.__logger.addHandler(console_handler)
|
self.__logger.addHandler(console_handler)
|
||||||
|
|
||||||
all_log_file = os.path.join(self.__log_dir, "all.log")
|
all_log_file = os.path.join(self.__log_dir, "all.log")
|
||||||
file_handler_all = TimedRotatingFileHandler(
|
file_handler_all = TimedRotatingFileHandler(
|
||||||
all_log_file,
|
all_log_file,
|
||||||
@@ -122,7 +119,6 @@ class LogManager:
|
|||||||
file_handler_all.setLevel(logging.DEBUG)
|
file_handler_all.setLevel(logging.DEBUG)
|
||||||
file_handler_all.setFormatter(formatter)
|
file_handler_all.setFormatter(formatter)
|
||||||
self.__logger.addHandler(file_handler_all)
|
self.__logger.addHandler(file_handler_all)
|
||||||
|
|
||||||
error_log_file = os.path.join(self.__log_dir, "error.log")
|
error_log_file = os.path.join(self.__log_dir, "error.log")
|
||||||
file_handler_error = TimedRotatingFileHandler(
|
file_handler_error = TimedRotatingFileHandler(
|
||||||
error_log_file,
|
error_log_file,
|
||||||
@@ -135,7 +131,6 @@ class LogManager:
|
|||||||
file_handler_error.setLevel(logging.ERROR)
|
file_handler_error.setLevel(logging.ERROR)
|
||||||
file_handler_error.setFormatter(formatter)
|
file_handler_error.setFormatter(formatter)
|
||||||
self.__logger.addHandler(file_handler_error)
|
self.__logger.addHandler(file_handler_error)
|
||||||
|
|
||||||
self.__initialized = True
|
self.__initialized = True
|
||||||
|
|
||||||
def getLogger(
|
def getLogger(
|
||||||
|
|||||||
@@ -21,12 +21,15 @@ from interfaces.ConfigProvider import CfgKey
|
|||||||
from managers.config.ConfigManager import instance as configInstance
|
from managers.config.ConfigManager import instance as configInstance
|
||||||
from managers.log.LogManager import instance as logInstance
|
from managers.log.LogManager import instance as logInstance
|
||||||
from utils.ThemeUtils import (
|
from utils.ThemeUtils import (
|
||||||
|
readThemeInfo,
|
||||||
readThemeQss,
|
readThemeQss,
|
||||||
validateTheme,
|
validateTheme,
|
||||||
wrapQssToAtheme
|
wrapQssToAtheme
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# we use Fusion as the default active style name
|
||||||
|
# because it's cross-platform.
|
||||||
_active_style_name = "Fusion"
|
_active_style_name = "Fusion"
|
||||||
|
|
||||||
|
|
||||||
@@ -60,8 +63,10 @@ class ThemeManager:
|
|||||||
):
|
):
|
||||||
|
|
||||||
self.__themes_dir = os.path.abspath(themes_dir)
|
self.__themes_dir = os.path.abspath(themes_dir)
|
||||||
self.__lock = threading.Lock()
|
|
||||||
self.__current_theme_name = ""
|
self.__current_theme_name = ""
|
||||||
|
self.__lock = threading.Lock()
|
||||||
|
|
||||||
|
# directory must exist
|
||||||
os.makedirs(self.__themes_dir, exist_ok=True)
|
os.makedirs(self.__themes_dir, exist_ok=True)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@@ -79,17 +84,21 @@ class ThemeManager:
|
|||||||
else:
|
else:
|
||||||
return Qt.ColorScheme.Unknown
|
return Qt.ColorScheme.Unknown
|
||||||
|
|
||||||
def themesDir(
|
def _deleteThemeFile(
|
||||||
self
|
self,
|
||||||
) -> str:
|
name: str
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Get the themes directory path.
|
Delete a theme file in the themes storage directory.
|
||||||
|
|
||||||
Returns:
|
The caller must hold self.__lock before invoking this method.
|
||||||
str: The absolute path to the themes storage directory.
|
|
||||||
|
**This method ONLY deletes the file**.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
return self.__themes_dir
|
filepath = os.path.join(self.__themes_dir, name + ".altheme")
|
||||||
|
if os.path.isfile(filepath):
|
||||||
|
os.remove(filepath)
|
||||||
|
|
||||||
def _resolveDestPath(
|
def _resolveDestPath(
|
||||||
self,
|
self,
|
||||||
@@ -121,7 +130,7 @@ class ThemeManager:
|
|||||||
existing_info = validateTheme(default_path)
|
existing_info = validateTheme(default_path)
|
||||||
existing_author = existing_info.get("author", "")
|
existing_author = existing_info.get("author", "")
|
||||||
except Exception:
|
except Exception:
|
||||||
self._removeThemeFile(theme_name) # caller holds the lock
|
self._deleteThemeFile(theme_name) # caller holds the lock
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
f"主题 '{theme_name}' 已存在但无法通过验证, 已清理该主题文件"
|
f"主题 '{theme_name}' 已存在但无法通过验证, 已清理该主题文件"
|
||||||
)
|
)
|
||||||
@@ -164,16 +173,16 @@ class ThemeManager:
|
|||||||
|
|
||||||
if not os.path.isfile(source_path):
|
if not os.path.isfile(source_path):
|
||||||
raise FileNotFoundError(source_path)
|
raise FileNotFoundError(source_path)
|
||||||
ext = os.path.splitext(source_path)[1].lower()
|
base_name, ext = os.path.splitext(os.path.basename(source_path))
|
||||||
|
ext = ext.lower()
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
if ext == ".qss":
|
if ext == ".qss":
|
||||||
name = os.path.splitext(os.path.basename(source_path))[0]
|
dest_path = self._resolveDestPath(base_name, "未知作者")
|
||||||
dest_path = self._resolveDestPath(name, "未知作者")
|
|
||||||
wrapQssToAtheme(source_path, dest_path, "both")
|
wrapQssToAtheme(source_path, dest_path, "both")
|
||||||
return os.path.splitext(os.path.basename(dest_path))[0]
|
return os.path.splitext(os.path.basename(dest_path))[0]
|
||||||
elif ext == ".altheme":
|
elif ext == ".altheme":
|
||||||
info = validateTheme(source_path)
|
info = validateTheme(source_path)
|
||||||
name = info.get("name", os.path.splitext(os.path.basename(source_path))[0])
|
name = info.get("name", base_name)
|
||||||
safe_name = os.path.basename(name)
|
safe_name = os.path.basename(name)
|
||||||
new_author = info.get("author", "")
|
new_author = info.get("author", "")
|
||||||
dest_path = self._resolveDestPath(safe_name, new_author)
|
dest_path = self._resolveDestPath(safe_name, new_author)
|
||||||
@@ -203,7 +212,7 @@ class ThemeManager:
|
|||||||
if filename.endswith(".altheme"):
|
if filename.endswith(".altheme"):
|
||||||
filepath = os.path.join(self.__themes_dir, filename)
|
filepath = os.path.join(self.__themes_dir, filename)
|
||||||
try:
|
try:
|
||||||
info = validateTheme(filepath, check_qss=False) # skip QSS read for list scan
|
info = validateTheme(filepath)
|
||||||
name = info.get("name", "")
|
name = info.get("name", "")
|
||||||
author = info.get("author", "")
|
author = info.get("author", "")
|
||||||
key = (name, author)
|
key = (name, author)
|
||||||
@@ -225,26 +234,6 @@ class ThemeManager:
|
|||||||
)
|
)
|
||||||
return themes
|
return themes
|
||||||
|
|
||||||
def _removeThemeFile(
|
|
||||||
self,
|
|
||||||
name: str
|
|
||||||
):
|
|
||||||
"""
|
|
||||||
Remove a theme file without locking.
|
|
||||||
|
|
||||||
The caller must hold self.__lock before invoking this method.
|
|
||||||
"""
|
|
||||||
|
|
||||||
filepath = os.path.join(self.__themes_dir, name + ".altheme")
|
|
||||||
if os.path.isfile(filepath):
|
|
||||||
os.remove(filepath)
|
|
||||||
if self.__current_theme_name == name:
|
|
||||||
self.__current_theme_name = ""
|
|
||||||
saved_theme = configInstance().get(
|
|
||||||
CfgKey.GLOBAL.APPEARANCE.THEME, "system"
|
|
||||||
)
|
|
||||||
self.clearTheme(saved_theme)
|
|
||||||
|
|
||||||
def removeTheme(
|
def removeTheme(
|
||||||
self,
|
self,
|
||||||
name: str
|
name: str
|
||||||
@@ -253,14 +242,21 @@ class ThemeManager:
|
|||||||
Remove a theme by name.
|
Remove a theme by name.
|
||||||
|
|
||||||
If the removed theme is currently active, clears the QSS
|
If the removed theme is currently active, clears the QSS
|
||||||
stylesheet from the application.
|
stylesheet from the application and reverts to the saved
|
||||||
|
colour scheme.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
name (str): The theme name to remove.
|
name (str): The theme name to remove.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
self._removeThemeFile(name)
|
self._deleteThemeFile(name)
|
||||||
|
if self.__current_theme_name == name:
|
||||||
|
self.__current_theme_name = ""
|
||||||
|
saved_theme = configInstance().get(
|
||||||
|
CfgKey.GLOBAL.APPEARANCE.THEME, "system"
|
||||||
|
)
|
||||||
|
self.clearTheme(saved_theme)
|
||||||
|
|
||||||
def applyTheme(
|
def applyTheme(
|
||||||
self,
|
self,
|
||||||
@@ -284,7 +280,7 @@ class ThemeManager:
|
|||||||
if not os.path.isfile(filepath):
|
if not os.path.isfile(filepath):
|
||||||
raise FileNotFoundError(filepath)
|
raise FileNotFoundError(filepath)
|
||||||
with self.__lock:
|
with self.__lock:
|
||||||
info = validateTheme(filepath)
|
info = readThemeInfo(filepath)
|
||||||
qss = readThemeQss(filepath)
|
qss = readThemeQss(filepath)
|
||||||
app = QApplication.instance()
|
app = QApplication.instance()
|
||||||
if app:
|
if app:
|
||||||
@@ -317,6 +313,18 @@ class ThemeManager:
|
|||||||
)
|
)
|
||||||
app.setStyle(QStyleFactory.create(_active_style_name))
|
app.setStyle(QStyleFactory.create(_active_style_name))
|
||||||
|
|
||||||
|
def themesDir(
|
||||||
|
self
|
||||||
|
) -> str:
|
||||||
|
"""
|
||||||
|
Get the themes directory path.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str: The absolute path to the themes storage directory.
|
||||||
|
"""
|
||||||
|
|
||||||
|
return self.__themes_dir
|
||||||
|
|
||||||
|
|
||||||
# ThemeManager singleton instance.
|
# ThemeManager singleton instance.
|
||||||
_theme_manager_instance = None
|
_theme_manager_instance = None
|
||||||
|
|||||||
+15
-13
@@ -10,6 +10,7 @@ See the LICENSE file for details.
|
|||||||
import os
|
import os
|
||||||
import queue
|
import queue
|
||||||
from selenium import webdriver
|
from selenium import webdriver
|
||||||
|
from selenium.webdriver.remote.webdriver import WebDriver
|
||||||
from selenium.common.exceptions import (
|
from selenium.common.exceptions import (
|
||||||
TimeoutException,
|
TimeoutException,
|
||||||
WebDriverException,
|
WebDriverException,
|
||||||
@@ -37,11 +38,11 @@ class AutoLib(MsgBase):
|
|||||||
output_queue: queue.Queue,
|
output_queue: queue.Queue,
|
||||||
run_config: dict,
|
run_config: dict,
|
||||||
) -> None:
|
) -> None:
|
||||||
super().__init__(input_queue, output_queue)
|
|
||||||
|
|
||||||
|
super().__init__(input_queue, output_queue)
|
||||||
self.__run_config: dict = run_config
|
self.__run_config: dict = run_config
|
||||||
self.__user_config: dict | None = None
|
self.__user_config: dict | None = None
|
||||||
self.__driver = None
|
self.__driver: WebDriver | None = None
|
||||||
self.__driver_type: str = ""
|
self.__driver_type: str = ""
|
||||||
self.__driver_path: str = ""
|
self.__driver_path: str = ""
|
||||||
self.__login_page: LoginPage = None
|
self.__login_page: LoginPage = None
|
||||||
@@ -58,7 +59,7 @@ class AutoLib(MsgBase):
|
|||||||
else:
|
else:
|
||||||
if not self.__initDriverUrl():
|
if not self.__initDriverUrl():
|
||||||
self.close()
|
self.close()
|
||||||
raise Exception("浏览器驱动URL初始化失败 !")
|
raise Exception("浏览器驱动 URL 初始化失败 !")
|
||||||
self.__initPagesServices()
|
self.__initPagesServices()
|
||||||
self.__initPagesFlows()
|
self.__initPagesFlows()
|
||||||
|
|
||||||
@@ -67,9 +68,10 @@ class AutoLib(MsgBase):
|
|||||||
) -> bool:
|
) -> bool:
|
||||||
|
|
||||||
self._showTrace("正在初始化浏览器驱动......", no_log=True)
|
self._showTrace("正在初始化浏览器驱动......", no_log=True)
|
||||||
web_driver_config: dict = self.__run_config.get("web_driver", None)
|
driver_config: dict = self.__run_config.get("web_driver", None)
|
||||||
self.__driver_type = web_driver_config.get("driver_type", "none")
|
self.__driver_type = driver_config.get("driver_type", "none")
|
||||||
match self.__driver_type.lower():
|
self.__driver_type = self.__driver_type.lower()
|
||||||
|
match self.__driver_type:
|
||||||
case "edge":
|
case "edge":
|
||||||
driver_options = webdriver.EdgeOptions()
|
driver_options = webdriver.EdgeOptions()
|
||||||
case "chrome":
|
case "chrome":
|
||||||
@@ -82,10 +84,10 @@ class AutoLib(MsgBase):
|
|||||||
self.TraceLevel.WARNING,
|
self.TraceLevel.WARNING,
|
||||||
)
|
)
|
||||||
return False
|
return False
|
||||||
if not web_driver_config:
|
if not driver_config:
|
||||||
self._showTrace("未配置浏览器驱动参数 !", self.TraceLevel.ERROR)
|
self._showTrace("未配置浏览器驱动参数 !", self.TraceLevel.ERROR)
|
||||||
return False
|
return False
|
||||||
if web_driver_config.get("headless", False):
|
if driver_config.get("headless", False):
|
||||||
driver_options.add_argument("--headless")
|
driver_options.add_argument("--headless")
|
||||||
driver_options.add_argument("--disable-gpu")
|
driver_options.add_argument("--disable-gpu")
|
||||||
driver_options.add_argument("--no-sandbox")
|
driver_options.add_argument("--no-sandbox")
|
||||||
@@ -110,11 +112,11 @@ class AutoLib(MsgBase):
|
|||||||
"AppleWebKit/537.36 (KHTML, like Gecko) "\
|
"AppleWebKit/537.36 (KHTML, like Gecko) "\
|
||||||
"Chrome/120.0.0.0 "\
|
"Chrome/120.0.0.0 "\
|
||||||
"Safari/537.36"
|
"Safari/537.36"
|
||||||
if self.__driver_type.lower() == "edge":
|
if self.__driver_type == "edge":
|
||||||
user_agent += " Edg/120.0.0.0"
|
user_agent += " Edg/120.0.0.0"
|
||||||
|
|
||||||
# set options for firefox
|
# set options for firefox
|
||||||
elif self.__driver_type.lower() == "firefox":
|
elif self.__driver_type == "firefox":
|
||||||
driver_options.set_preference("dom.webdriver.enabled", False)
|
driver_options.set_preference("dom.webdriver.enabled", False)
|
||||||
driver_options.set_preference("useAutomationExtension", False)
|
driver_options.set_preference("useAutomationExtension", False)
|
||||||
user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:120.0) "\
|
user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:120.0) "\
|
||||||
@@ -122,14 +124,14 @@ class AutoLib(MsgBase):
|
|||||||
driver_options.add_argument(f"user-agent={user_agent}")
|
driver_options.add_argument(f"user-agent={user_agent}")
|
||||||
|
|
||||||
# init browser driver
|
# init browser driver
|
||||||
self.__driver_path = web_driver_config.get("driver_path", "")
|
self.__driver_path = driver_config.get("driver_path", "")
|
||||||
if not self.__driver_path:
|
if not self.__driver_path:
|
||||||
self._showTrace("未配置浏览器驱动路径 !", self.TraceLevel.WARNING)
|
self._showTrace("未配置浏览器驱动路径 !", self.TraceLevel.WARNING)
|
||||||
return False
|
return False
|
||||||
try:
|
try:
|
||||||
self.__driver_path = os.path.abspath(self.__driver_path)
|
self.__driver_path = os.path.abspath(self.__driver_path)
|
||||||
service = None
|
service = None
|
||||||
match self.__driver_type.lower():
|
match self.__driver_type:
|
||||||
case "edge":
|
case "edge":
|
||||||
service = EdgeService(executable_path=self.__driver_path)
|
service = EdgeService(executable_path=self.__driver_path)
|
||||||
self.__driver = webdriver.Edge(service=service, options=driver_options)
|
self.__driver = webdriver.Edge(service=service, options=driver_options)
|
||||||
@@ -161,7 +163,7 @@ class AutoLib(MsgBase):
|
|||||||
self._showTrace("未配置图书馆参数 !", self.TraceLevel.ERROR)
|
self._showTrace("未配置图书馆参数 !", self.TraceLevel.ERROR)
|
||||||
return False
|
return False
|
||||||
url: str = lib_config.get("host_url") + lib_config.get("login_url")
|
url: str = lib_config.get("host_url") + lib_config.get("login_url")
|
||||||
self.__login_page = LoginPage(self.__driver, tracer=self._showTrace)
|
self.__login_page = LoginPage(self._input_queue, self._output_queue, self.__driver)
|
||||||
self.__driver.set_page_load_timeout(5)
|
self.__driver.set_page_load_timeout(5)
|
||||||
try:
|
try:
|
||||||
self.__driver.get(url)
|
self.__driver.get(url)
|
||||||
|
|||||||
+13
-19
@@ -7,7 +7,8 @@ This software is provided "as is", without any warranty of any kind.
|
|||||||
You may use, modify, and distribute this file under the terms of the MIT License.
|
You may use, modify, and distribute this file under the terms of the MIT License.
|
||||||
See the LICENSE file for details.
|
See the LICENSE file for details.
|
||||||
"""
|
"""
|
||||||
from typing import Callable, Optional
|
import queue
|
||||||
|
from typing import Callable
|
||||||
|
|
||||||
from selenium.common.exceptions import (
|
from selenium.common.exceptions import (
|
||||||
ElementNotInteractableException,
|
ElementNotInteractableException,
|
||||||
@@ -19,8 +20,10 @@ from selenium.webdriver.remote.webdriver import WebDriver
|
|||||||
from selenium.webdriver.support.ui import WebDriverWait
|
from selenium.webdriver.support.ui import WebDriverWait
|
||||||
from selenium.webdriver.support import expected_conditions as EC
|
from selenium.webdriver.support import expected_conditions as EC
|
||||||
|
|
||||||
|
from base.MsgBase import MsgBase
|
||||||
|
|
||||||
class LoginPage:
|
|
||||||
|
class LoginPage(MsgBase):
|
||||||
|
|
||||||
USERNAME_INPUT = (By.NAME, "username")
|
USERNAME_INPUT = (By.NAME, "username")
|
||||||
PASSWORD_INPUT = (By.NAME, "password")
|
PASSWORD_INPUT = (By.NAME, "password")
|
||||||
@@ -36,22 +39,13 @@ class LoginPage:
|
|||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
|
input_queue: queue.Queue,
|
||||||
|
output_queue: queue.Queue,
|
||||||
driver: WebDriver,
|
driver: WebDriver,
|
||||||
tracer: Optional[Callable[..., None]] = None,
|
|
||||||
) -> None:
|
) -> None:
|
||||||
|
|
||||||
|
super().__init__(input_queue, output_queue)
|
||||||
self._driver: WebDriver = driver
|
self._driver: WebDriver = driver
|
||||||
self._tracer: Optional[Callable[..., None]] = tracer
|
|
||||||
|
|
||||||
def _trace(
|
|
||||||
self,
|
|
||||||
msg: str,
|
|
||||||
level: int = 20,
|
|
||||||
no_log: bool = False,
|
|
||||||
) -> None:
|
|
||||||
|
|
||||||
if self._tracer:
|
|
||||||
self._tracer(msg, level, no_log)
|
|
||||||
|
|
||||||
def navigate(
|
def navigate(
|
||||||
self,
|
self,
|
||||||
@@ -185,7 +179,7 @@ class LoginPage:
|
|||||||
) -> bool:
|
) -> bool:
|
||||||
|
|
||||||
for attempt in range(max_attempts):
|
for attempt in range(max_attempts):
|
||||||
self._trace(
|
self._showTrace(
|
||||||
f"用户 {username} 第 {attempt + 1} 次尝试登录......",
|
f"用户 {username} 第 {attempt + 1} 次尝试登录......",
|
||||||
no_log=True,
|
no_log=True,
|
||||||
)
|
)
|
||||||
@@ -196,16 +190,16 @@ class LoginPage:
|
|||||||
continue
|
continue
|
||||||
if not self.fillCaptcha(captcha_text):
|
if not self.fillCaptcha(captcha_text):
|
||||||
continue
|
continue
|
||||||
self._trace("尝试登录...", no_log=True)
|
self._showTrace("尝试登录...", no_log=True)
|
||||||
if not self.clickLogin():
|
if not self.clickLogin():
|
||||||
continue
|
continue
|
||||||
if self.waitLoginSuccess():
|
if self.waitLoginSuccess():
|
||||||
self._trace(f"用户 {username} 第 {attempt + 1} 次登录成功 !")
|
self._showTrace(f"用户 {username} 第 {attempt + 1} 次登录成功 !")
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
self._trace(
|
self._showTrace(
|
||||||
"登录页面加载失败 ! : "
|
"登录页面加载失败 ! : "
|
||||||
"用户账号或者密码错误/验证码错误, 具体以页面提示为准",
|
"用户账号或者密码错误/验证码错误, 具体以页面提示为准",
|
||||||
level=40,
|
level=self.TraceLevel.ERROR,
|
||||||
)
|
)
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ class CheckinFlow(MsgBase):
|
|||||||
self._driver: WebDriver = driver
|
self._driver: WebDriver = driver
|
||||||
self._shell: MainShell = shell
|
self._shell: MainShell = shell
|
||||||
|
|
||||||
def execute(
|
def _ensureCheckinButton(
|
||||||
self,
|
self,
|
||||||
username: str,
|
username: str,
|
||||||
) -> bool:
|
) -> bool:
|
||||||
@@ -49,7 +49,13 @@ class CheckinFlow(MsgBase):
|
|||||||
self._showTrace(f"签到按钮启用失败 !", self.TraceLevel.ERROR)
|
self._showTrace(f"签到按钮启用失败 !", self.TraceLevel.ERROR)
|
||||||
return False
|
return False
|
||||||
self._showTrace("签到按钮已启用")
|
self._showTrace("签到按钮已启用")
|
||||||
self._shell.clickCheckinButton()
|
return True
|
||||||
|
|
||||||
|
def _processCheckinDialog(
|
||||||
|
self,
|
||||||
|
username: str,
|
||||||
|
) -> bool:
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with CheckinResultDialog(self._driver) as dialog:
|
with CheckinResultDialog(self._driver) as dialog:
|
||||||
result_msg = dialog.getResultMessage()
|
result_msg = dialog.getResultMessage()
|
||||||
@@ -87,3 +93,13 @@ class CheckinFlow(MsgBase):
|
|||||||
except (TimeoutException, NoSuchElementException, ElementNotInteractableException):
|
except (TimeoutException, NoSuchElementException, ElementNotInteractableException):
|
||||||
self._showTrace("签到时发生未知错误 !", self.TraceLevel.ERROR)
|
self._showTrace("签到时发生未知错误 !", self.TraceLevel.ERROR)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
def execute(
|
||||||
|
self,
|
||||||
|
username: str,
|
||||||
|
) -> bool:
|
||||||
|
|
||||||
|
if not self._ensureCheckinButton(username):
|
||||||
|
return False
|
||||||
|
self._shell.clickCheckinButton()
|
||||||
|
return self._processCheckinDialog(username)
|
||||||
|
|||||||
@@ -61,19 +61,23 @@ class RenewFlow(MsgBase):
|
|||||||
)
|
)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def execute(
|
def _computeRenewTarget(
|
||||||
self,
|
self,
|
||||||
username: str,
|
|
||||||
record: dict,
|
record: dict,
|
||||||
renew_info: dict,
|
renew_info: dict,
|
||||||
) -> bool:
|
):
|
||||||
|
|
||||||
max_diff = renew_info.get("max_diff", 30)
|
|
||||||
prefer_earlier = renew_info.get("prefer_early", True)
|
|
||||||
end_time = record["time"]["end"]
|
end_time = record["time"]["end"]
|
||||||
target_renew_mins = timeStrToMins(end_time) + renew_info.get("expect_duration", 2) * 60
|
target_renew_mins = timeStrToMins(end_time) + renew_info.get("expect_duration", 2) * 60
|
||||||
if not self._validateRenewTime(end_time, target_renew_mins):
|
if not self._validateRenewTime(end_time, target_renew_mins):
|
||||||
return False
|
return None
|
||||||
|
return target_renew_mins
|
||||||
|
|
||||||
|
def _ensureExtendButton(
|
||||||
|
self,
|
||||||
|
username: str,
|
||||||
|
) -> bool:
|
||||||
|
|
||||||
if not self._shell.waitExtendButton():
|
if not self._shell.waitExtendButton():
|
||||||
self._showTrace(f"用户 {username} 续约界面加载失败 !", self.TraceLevel.ERROR)
|
self._showTrace(f"用户 {username} 续约界面加载失败 !", self.TraceLevel.ERROR)
|
||||||
return False
|
return False
|
||||||
@@ -83,7 +87,17 @@ class RenewFlow(MsgBase):
|
|||||||
f"请连接图书馆网络后重试"
|
f"请连接图书馆网络后重试"
|
||||||
)
|
)
|
||||||
return False
|
return False
|
||||||
self._shell.clickExtendButton()
|
return True
|
||||||
|
|
||||||
|
def _processRenewDialog(
|
||||||
|
self,
|
||||||
|
username: str,
|
||||||
|
record: dict,
|
||||||
|
target_renew_mins: int,
|
||||||
|
max_diff: int,
|
||||||
|
prefer_earlier: bool,
|
||||||
|
) -> bool:
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with RenewDialog(self._driver) as dialog:
|
with RenewDialog(self._driver) as dialog:
|
||||||
if not dialog.waitUntilReady():
|
if not dialog.waitUntilReady():
|
||||||
@@ -132,3 +146,22 @@ class RenewFlow(MsgBase):
|
|||||||
self._showTrace(f"用户 {username} 续约失败 ! : {e}", self.TraceLevel.ERROR)
|
self._showTrace(f"用户 {username} 续约失败 ! : {e}", self.TraceLevel.ERROR)
|
||||||
self._shell.refresh()
|
self._shell.refresh()
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
def execute(
|
||||||
|
self,
|
||||||
|
username: str,
|
||||||
|
record: dict,
|
||||||
|
renew_info: dict,
|
||||||
|
) -> bool:
|
||||||
|
|
||||||
|
max_diff = renew_info.get("max_diff", 30)
|
||||||
|
prefer_earlier = renew_info.get("prefer_early", True)
|
||||||
|
target_renew_mins = self._computeRenewTarget(record, renew_info)
|
||||||
|
if target_renew_mins is None:
|
||||||
|
return False
|
||||||
|
if not self._ensureExtendButton(username):
|
||||||
|
return False
|
||||||
|
self._shell.clickExtendButton()
|
||||||
|
return self._processRenewDialog(
|
||||||
|
username, record, target_renew_mins, max_diff, prefer_earlier,
|
||||||
|
)
|
||||||
|
|||||||
+101
-32
@@ -22,6 +22,7 @@ from pages.strategies.TimeSelectMaker import TimeSelectMaker
|
|||||||
from pages.ReserveView import ReserveView
|
from pages.ReserveView import ReserveView
|
||||||
from pages.components.ReserveResultDialog import ReserveResultDialog
|
from pages.components.ReserveResultDialog import ReserveResultDialog
|
||||||
from pages.components.TimeSelectDialog import TimeSelectDialog
|
from pages.components.TimeSelectDialog import TimeSelectDialog
|
||||||
|
from pages.components.SeatMapDialog import SeatMapDialog
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
@@ -58,59 +59,70 @@ class ReserveFlow(MsgBase):
|
|||||||
self._driver: WebDriver = driver
|
self._driver: WebDriver = driver
|
||||||
self._shell: MainShell = shell
|
self._shell: MainShell = shell
|
||||||
|
|
||||||
def execute(
|
def _loadReserveView(
|
||||||
self,
|
self,
|
||||||
|
) -> ReserveView | None:
|
||||||
|
|
||||||
|
try:
|
||||||
|
return self._shell.gotoReserveView()
|
||||||
|
except (TimeoutException, ElementNotInteractableException) as e:
|
||||||
|
self._showTrace(f"加载预约选座页面失败 ! : {e}", self.TraceLevel.ERROR)
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _selectDate(
|
||||||
|
self,
|
||||||
|
view: ReserveView,
|
||||||
ctx: ReserveContext,
|
ctx: ReserveContext,
|
||||||
) -> bool:
|
) -> bool:
|
||||||
|
|
||||||
submit_reserve = False
|
|
||||||
reserve_success = False
|
|
||||||
have_hover_on_page = False
|
|
||||||
|
|
||||||
try:
|
|
||||||
view = self._shell.gotoReserveView()
|
|
||||||
except (TimeoutException, ElementNotInteractableException) as e:
|
|
||||||
self._showTrace(f"加载预约选座页面失败 ! : {e}", self.TraceLevel.ERROR)
|
|
||||||
return False
|
|
||||||
if not view.selectDate(ctx.date):
|
if not view.selectDate(ctx.date):
|
||||||
self._showTrace(f"选择日期失败 ! : {ctx.date} 不可用", self.TraceLevel.ERROR)
|
self._showTrace(f"选择日期失败 ! : {ctx.date} 不可用", self.TraceLevel.ERROR)
|
||||||
return False
|
return False
|
||||||
self._showTrace(f"日期 {ctx.date} 选择成功 !")
|
self._showTrace(f"日期 {ctx.date} 选择成功 !")
|
||||||
|
return True
|
||||||
|
|
||||||
|
def _selectPlace(
|
||||||
|
self,
|
||||||
|
view: ReserveView,
|
||||||
|
) -> bool:
|
||||||
|
|
||||||
if not view.selectPlace("1"):
|
if not view.selectPlace("1"):
|
||||||
self._showTrace("选择预约场所失败 ! : 图书馆 不可用", self.TraceLevel.ERROR)
|
self._showTrace("选择预约场所失败 ! : 图书馆 不可用", self.TraceLevel.ERROR)
|
||||||
return False
|
return False
|
||||||
self._showTrace("预约场所 图书馆 选择成功 !")
|
self._showTrace("预约场所 图书馆 选择成功 !")
|
||||||
|
return True
|
||||||
|
|
||||||
|
def _selectFloor(
|
||||||
|
self,
|
||||||
|
view: ReserveView,
|
||||||
|
ctx: ReserveContext,
|
||||||
|
) -> bool:
|
||||||
|
|
||||||
if not view.selectFloor(ctx.floor):
|
if not view.selectFloor(ctx.floor):
|
||||||
display_floor = ReserveView.FLOOR_MAP.get(ctx.floor, ctx.floor)
|
display_floor = ReserveView.FLOOR_MAP.get(ctx.floor, ctx.floor)
|
||||||
self._showTrace(f"选择楼层失败 ! : {display_floor} 不可用", self.TraceLevel.ERROR)
|
self._showTrace(f"选择楼层失败 ! : {display_floor} 不可用", self.TraceLevel.ERROR)
|
||||||
return False
|
return False
|
||||||
self._showTrace(f"楼层 {ReserveView.FLOOR_MAP.get(ctx.floor)} 选择成功 !")
|
self._showTrace(f"楼层 {ReserveView.FLOOR_MAP.get(ctx.floor)} 选择成功 !")
|
||||||
|
return True
|
||||||
|
|
||||||
|
def _selectRoom(
|
||||||
|
self,
|
||||||
|
view: ReserveView,
|
||||||
|
ctx: ReserveContext,
|
||||||
|
):
|
||||||
|
|
||||||
seat_map = view.selectRoom(ctx.room)
|
seat_map = view.selectRoom(ctx.room)
|
||||||
if seat_map is None:
|
if seat_map is None:
|
||||||
display_room = ReserveView.ROOM_MAP.get(ctx.room, ctx.room)
|
display_room = ReserveView.ROOM_MAP.get(ctx.room, ctx.room)
|
||||||
self._showTrace(f"选择房间失败 ! : {display_room} 不可用", self.TraceLevel.ERROR)
|
self._showTrace(f"选择房间失败 ! : {display_room} 不可用", self.TraceLevel.ERROR)
|
||||||
return False
|
return None
|
||||||
self._showTrace(f"房间 {ReserveView.ROOM_MAP.get(ctx.room)} 选择成功 !")
|
self._showTrace(f"房间 {ReserveView.ROOM_MAP.get(ctx.room)} 选择成功 !")
|
||||||
have_hover_on_page = True
|
return seat_map
|
||||||
seat_status = seat_map.selectSeat(ctx.seat_id)
|
|
||||||
if seat_status is None:
|
def _processReserveResult(
|
||||||
self._showTrace(
|
self,
|
||||||
f"座位 {ctx.seat_id} 在该楼层区域中不存在, 请检查座位号是否正确",
|
) -> bool:
|
||||||
self.TraceLevel.WARNING,
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
self._showTrace(f"座位 {ctx.seat_id} 选择成功 ! : 当前状态 - '{seat_status}'")
|
|
||||||
try:
|
|
||||||
time_dialog = TimeSelectDialog(self._driver, tracer=self._showTrace)
|
|
||||||
except TimeoutException:
|
|
||||||
self._showTrace("时间选择面板未出现 !", self.TraceLevel.ERROR)
|
|
||||||
else:
|
|
||||||
if not time_dialog.selectSeatTime(ctx):
|
|
||||||
self._showTrace("选择时间失败 !", self.TraceLevel.ERROR)
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
view.submitReserve()
|
|
||||||
submit_reserve = True
|
|
||||||
with ReserveResultDialog(self._driver) as result:
|
with ReserveResultDialog(self._driver) as result:
|
||||||
if result.isFailure():
|
if result.isFailure():
|
||||||
self._showTrace("预约失败", self.TraceLevel.ERROR)
|
self._showTrace("预约失败", self.TraceLevel.ERROR)
|
||||||
@@ -131,11 +143,68 @@ class ReserveFlow(MsgBase):
|
|||||||
" 预约成功 !\n"
|
" 预约成功 !\n"
|
||||||
" 未找获取到详细信息"
|
" 未找获取到详细信息"
|
||||||
)
|
)
|
||||||
reserve_success = True
|
return True
|
||||||
else:
|
else:
|
||||||
self._showTrace("预约结果加载失败 !", self.TraceLevel.ERROR)
|
self._showTrace("预约结果加载失败 !", self.TraceLevel.ERROR)
|
||||||
|
return False
|
||||||
|
|
||||||
|
def _selectSeatAndSubmit(
|
||||||
|
self,
|
||||||
|
view: ReserveView,
|
||||||
|
seat_map: SeatMapDialog,
|
||||||
|
ctx: ReserveContext,
|
||||||
|
) -> tuple[bool, bool]:
|
||||||
|
|
||||||
|
submit_reserve = False
|
||||||
|
reserve_success = False
|
||||||
|
|
||||||
|
seat_status = seat_map.selectSeat(ctx.seat_id)
|
||||||
|
if seat_status is None:
|
||||||
|
self._showTrace(
|
||||||
|
f"座位 {ctx.seat_id} 在该楼层区域中不存在, 请检查座位号是否正确",
|
||||||
|
self.TraceLevel.WARNING,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
self._showTrace(f"座位 {ctx.seat_id} 选择成功 ! : 当前状态 - '{seat_status}'")
|
||||||
|
try:
|
||||||
|
time_dialog = TimeSelectDialog(self._driver, tracer=self._showTrace)
|
||||||
|
except TimeoutException:
|
||||||
|
self._showTrace("时间选择面板未出现 !", self.TraceLevel.ERROR)
|
||||||
|
else:
|
||||||
|
if not time_dialog.selectSeatTime(ctx):
|
||||||
|
self._showTrace("选择时间失败 !", self.TraceLevel.ERROR)
|
||||||
|
else:
|
||||||
|
try:
|
||||||
|
view.submitReserve()
|
||||||
|
submit_reserve = True
|
||||||
|
reserve_success = self._processReserveResult()
|
||||||
except (TimeoutException, ElementNotInteractableException):
|
except (TimeoutException, ElementNotInteractableException):
|
||||||
self._showTrace("预约提交失败 !", self.TraceLevel.ERROR)
|
self._showTrace("预约提交失败 !", self.TraceLevel.ERROR)
|
||||||
|
return submit_reserve, reserve_success
|
||||||
|
|
||||||
|
def execute(
|
||||||
|
self,
|
||||||
|
ctx: ReserveContext,
|
||||||
|
) -> bool:
|
||||||
|
|
||||||
|
# reserve flow pipeline:
|
||||||
|
# date > place > floor > room > seat (begin/end time) > submit > result
|
||||||
|
view = self._loadReserveView()
|
||||||
|
if view is None:
|
||||||
|
return False
|
||||||
|
if not self._selectDate(view, ctx):
|
||||||
|
return False
|
||||||
|
if not self._selectPlace(view):
|
||||||
|
return False
|
||||||
|
if not self._selectFloor(view, ctx):
|
||||||
|
return False
|
||||||
|
seat_map = self._selectRoom(view, ctx)
|
||||||
|
if seat_map is None:
|
||||||
|
return False
|
||||||
|
have_hover_on_page = True
|
||||||
|
submit_reserve, reserve_success = self._selectSeatAndSubmit(
|
||||||
|
view, seat_map, ctx,
|
||||||
|
)
|
||||||
if not submit_reserve and have_hover_on_page:
|
if not submit_reserve and have_hover_on_page:
|
||||||
view.refresh()
|
view.refresh()
|
||||||
if reserve_success:
|
if reserve_success:
|
||||||
|
|||||||
+60
-69
@@ -68,17 +68,20 @@ def readThemeInfo(
|
|||||||
altheme_path: str
|
altheme_path: str
|
||||||
) -> dict:
|
) -> dict:
|
||||||
"""
|
"""
|
||||||
Read only the info.json metadata from a .altheme file.
|
Read and validate the info.json metadata from a .altheme file.
|
||||||
|
|
||||||
|
Verifies that all required fields (name, author, need_theme, brief)
|
||||||
|
are present with valid values.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
altheme_path (str): Path to the .altheme file.
|
altheme_path (str): Path to the .altheme file.
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
dict: The theme metadata dictionary.
|
dict: The validated theme metadata dictionary.
|
||||||
|
|
||||||
Raises:
|
Raises:
|
||||||
FileNotFoundError: If altheme_path does not exist.
|
FileNotFoundError: If altheme_path does not exist.
|
||||||
ValueError: If the .altheme does not contain info.json.
|
ValueError: If info.json is missing or any field is invalid.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if not os.path.isfile(altheme_path):
|
if not os.path.isfile(altheme_path):
|
||||||
@@ -87,76 +90,14 @@ def readThemeInfo(
|
|||||||
if "info.json" not in zf.namelist():
|
if "info.json" not in zf.namelist():
|
||||||
raise ValueError("无效的 .altheme: 缺少 info.json")
|
raise ValueError("无效的 .altheme: 缺少 info.json")
|
||||||
with zf.open("info.json") as fh:
|
with zf.open("info.json") as fh:
|
||||||
info = json.loads(fh.read().decode("utf-8"))
|
|
||||||
if "name" not in info:
|
|
||||||
raise ValueError("无效的 .altheme: info.json 缺少 'name' 字段")
|
|
||||||
return info
|
|
||||||
|
|
||||||
def readThemeQss(
|
|
||||||
altheme_path: str
|
|
||||||
) -> str:
|
|
||||||
"""
|
|
||||||
Read the theme.qss content directly from a .altheme archive.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
altheme_path (str): Path to the .altheme file.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
str: The QSS stylesheet content.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
FileNotFoundError: If altheme_path does not exist.
|
|
||||||
ValueError: If theme.qss is missing from the archive.
|
|
||||||
"""
|
|
||||||
|
|
||||||
if not os.path.isfile(altheme_path):
|
|
||||||
raise FileNotFoundError(altheme_path)
|
|
||||||
with zipfile.ZipFile(altheme_path, "r") as zf:
|
|
||||||
if "theme.qss" not in zf.namelist():
|
|
||||||
raise ValueError("无效的 .altheme: 缺少 theme.qss")
|
|
||||||
return zf.read("theme.qss").decode("utf-8")
|
|
||||||
|
|
||||||
def validateTheme(
|
|
||||||
altheme_path: str,
|
|
||||||
check_qss: bool = True
|
|
||||||
) -> dict:
|
|
||||||
"""
|
|
||||||
Validate a .altheme file and return its metadata.
|
|
||||||
|
|
||||||
Checks that info.json and theme.qss both exist, info.json
|
|
||||||
contains all required fields with valid values, and theme.qss
|
|
||||||
is a non-empty entry in the archive.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
altheme_path (str): Path to the .altheme file.
|
|
||||||
check_qss (bool): If False, skip theme.qss existence and
|
|
||||||
content checks (for list-only operations).
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
dict: The validated theme metadata dictionary.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
FileNotFoundError: If altheme_path does not exist.
|
|
||||||
ValueError: If validation fails for any reason.
|
|
||||||
"""
|
|
||||||
|
|
||||||
if not os.path.isfile(altheme_path):
|
|
||||||
raise FileNotFoundError(altheme_path)
|
|
||||||
with zipfile.ZipFile(altheme_path, "r") as zf:
|
|
||||||
names = zf.namelist()
|
|
||||||
if "info.json" not in names:
|
|
||||||
raise ValueError("无效的 .altheme: 缺少 info.json")
|
|
||||||
if "theme.qss" not in names:
|
|
||||||
raise ValueError("无效的 .altheme: 缺少 theme.qss")
|
|
||||||
info_bytes = zf.read("info.json")
|
|
||||||
qss_bytes = zf.read("theme.qss") if check_qss else None # skip QSS read when only listing
|
|
||||||
try:
|
try:
|
||||||
info = json.loads(info_bytes.decode("utf-8"))
|
info = json.loads(fh.read().decode("utf-8"))
|
||||||
except (json.JSONDecodeError, UnicodeDecodeError) as e:
|
except (json.JSONDecodeError, UnicodeDecodeError) as e:
|
||||||
raise ValueError(f"无效的 .altheme: info.json 解析失败 — {e}")
|
raise ValueError(f"无效的 .altheme: info.json 解析失败 — {e}")
|
||||||
if "name" not in info or not isinstance(info.get("name"), str) or not info["name"].strip():
|
if "name" not in info or not isinstance(info.get("name"), str) or not info["name"].strip():
|
||||||
raise ValueError("无效的 .altheme: info.json 缺少有效的 'name' 字段")
|
raise ValueError("无效的 .altheme: info.json 缺少有效的 'name' 字段")
|
||||||
# reject blank author so info.json does not drift from the "未知作者" filename fallback
|
# reject blank author so that info.json does not drift from the
|
||||||
|
# "未知作者" filename fallback used by wrapQssToAtheme
|
||||||
if ("author" not in info or not isinstance(info.get("author"), str)
|
if ("author" not in info or not isinstance(info.get("author"), str)
|
||||||
or not info["author"].strip()):
|
or not info["author"].strip()):
|
||||||
raise ValueError("无效的 .altheme: info.json 缺少有效的 'author' 字段")
|
raise ValueError("无效的 .altheme: info.json 缺少有效的 'author' 字段")
|
||||||
@@ -168,8 +109,58 @@ def validateTheme(
|
|||||||
)
|
)
|
||||||
if "brief" not in info or not isinstance(info.get("brief"), str):
|
if "brief" not in info or not isinstance(info.get("brief"), str):
|
||||||
raise ValueError("无效的 .altheme: info.json 缺少有效的 'brief' 字段")
|
raise ValueError("无效的 .altheme: info.json 缺少有效的 'brief' 字段")
|
||||||
if check_qss and not qss_bytes.strip():
|
return info
|
||||||
|
|
||||||
|
def readThemeQss(
|
||||||
|
altheme_path: str
|
||||||
|
) -> str:
|
||||||
|
"""
|
||||||
|
Read the theme.qss content from a .altheme archive.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
altheme_path (str): Path to the .altheme file.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str: The non-empty QSS stylesheet content.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
FileNotFoundError: If altheme_path does not exist.
|
||||||
|
ValueError: If theme.qss is missing or empty.
|
||||||
|
"""
|
||||||
|
|
||||||
|
if not os.path.isfile(altheme_path):
|
||||||
|
raise FileNotFoundError(altheme_path)
|
||||||
|
with zipfile.ZipFile(altheme_path, "r") as zf:
|
||||||
|
if "theme.qss" not in zf.namelist():
|
||||||
|
raise ValueError("无效的 .altheme: 缺少 theme.qss")
|
||||||
|
qss = zf.read("theme.qss").decode("utf-8")
|
||||||
|
if not qss.strip():
|
||||||
raise ValueError("无效的 .altheme: theme.qss 为空")
|
raise ValueError("无效的 .altheme: theme.qss 为空")
|
||||||
|
return qss
|
||||||
|
|
||||||
|
def validateTheme(
|
||||||
|
altheme_path: str
|
||||||
|
) -> dict:
|
||||||
|
"""
|
||||||
|
Fully validate a .altheme file and return its metadata.
|
||||||
|
|
||||||
|
Delegates info validation to readThemeInfo and QSS validation
|
||||||
|
to readThemeQss, then additionally checks that theme.qss is
|
||||||
|
non-empty.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
altheme_path (str): Path to the .altheme file.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
dict: The validated theme metadata dictionary.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
FileNotFoundError: If altheme_path does not exist.
|
||||||
|
ValueError: If validation fails for any reason.
|
||||||
|
"""
|
||||||
|
|
||||||
|
info = readThemeInfo(altheme_path)
|
||||||
|
readThemeQss(altheme_path) # validates existence and non-empty
|
||||||
return info
|
return info
|
||||||
|
|
||||||
def wrapQssToAtheme(
|
def wrapQssToAtheme(
|
||||||
|
|||||||
Reference in New Issue
Block a user