mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-04 01:49:42 +02:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| efe83613d0 | |||
| 3597cba207 | |||
| 749051aa4f | |||
| bd26f073e4 |
@@ -67,7 +67,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
pip install -r requirements.txt
|
pip install -r requirements.txt
|
||||||
pip install pyinstaller
|
pip install pyinstaller backports.tarfile
|
||||||
|
|
||||||
- name: Generate version
|
- name: Generate version
|
||||||
id: version
|
id: version
|
||||||
@@ -105,6 +105,11 @@ jobs:
|
|||||||
--add-data "build_info.json;." \
|
--add-data "build_info.json;." \
|
||||||
--add-data "deps/aria2c.exe;." \
|
--add-data "deps/aria2c.exe;." \
|
||||||
--add-data "core/interface/assets;core/interface/assets" \
|
--add-data "core/interface/assets;core/interface/assets" \
|
||||||
|
--hidden-import=backports.tarfile \
|
||||||
|
--hidden-import=backports \
|
||||||
|
--hidden-import=jaraco.context \
|
||||||
|
--hidden-import=jaraco.text \
|
||||||
|
--hidden-import=jaraco.functools \
|
||||||
--name ${{ env.APP_NAME }} \
|
--name ${{ env.APP_NAME }} \
|
||||||
main.py
|
main.py
|
||||||
|
|
||||||
@@ -115,6 +120,11 @@ jobs:
|
|||||||
pyinstaller --onefile --windowed \
|
pyinstaller --onefile --windowed \
|
||||||
--add-data "build_info.json:." \
|
--add-data "build_info.json:." \
|
||||||
--add-data "core/interface/assets:core/interface/assets" \
|
--add-data "core/interface/assets:core/interface/assets" \
|
||||||
|
--hidden-import=backports.tarfile \
|
||||||
|
--hidden-import=backports \
|
||||||
|
--hidden-import=jaraco.context \
|
||||||
|
--hidden-import=jaraco.text \
|
||||||
|
--hidden-import=jaraco.functools \
|
||||||
--name ${{ env.APP_NAME }} \
|
--name ${{ env.APP_NAME }} \
|
||||||
main.py
|
main.py
|
||||||
|
|
||||||
@@ -158,14 +168,33 @@ jobs:
|
|||||||
chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos
|
chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos
|
||||||
ls -la release/
|
ls -la release/
|
||||||
|
|
||||||
|
- name: Generate release notes
|
||||||
|
run: |
|
||||||
|
SHORT_SHA="${{ needs.build.outputs.short_sha }}"
|
||||||
|
cat > release_notes.md << EOF
|
||||||
|
## Development Build
|
||||||
|
|
||||||
|
**Commit:** [\`${SHORT_SHA}\`](https://github.com/${{ github.repository }}/commit/${{ github.sha }})
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
$(git log -1 --pretty=format:"- %s" ${{ github.sha }})
|
||||||
|
|
||||||
|
### Downloads
|
||||||
|
- Linux: \`SoftwareManager-dev-${SHORT_SHA}-linux\`
|
||||||
|
- Windows: \`SoftwareManager-dev-${SHORT_SHA}-windows.exe\`
|
||||||
|
- macOS: \`SoftwareManager-dev-${SHORT_SHA}-macos\`
|
||||||
|
EOF
|
||||||
|
cat release_notes.md
|
||||||
|
|
||||||
- name: Create Release (Public)
|
- name: Create Release (Public)
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
tag_name: ${{ needs.build.outputs.version }}
|
tag_name: ${{ needs.build.outputs.version }}
|
||||||
name: ${{ needs.build.outputs.version }}
|
name: ${{ needs.build.outputs.version }}
|
||||||
|
body_path: release_notes.md
|
||||||
files: |
|
files: |
|
||||||
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-linux
|
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-linux
|
||||||
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.exe
|
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.exe
|
||||||
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos
|
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@@ -2,6 +2,7 @@ import aria2p
|
|||||||
import subprocess
|
import subprocess
|
||||||
from core.utils.data.state import state
|
from core.utils.data.state import state
|
||||||
from core.utils.general.logs import update_download_completed_by_hash
|
from core.utils.general.logs import update_download_completed_by_hash
|
||||||
|
from core.utils.general.logs import consoleLog
|
||||||
from plyer import notification
|
from plyer import notification
|
||||||
import time
|
import time
|
||||||
import sys
|
import sys
|
||||||
|
|||||||
+11
-16
@@ -34,22 +34,17 @@ def read_config():
|
|||||||
|
|
||||||
if not os.path.exists(config_file):
|
if not os.path.exists(config_file):
|
||||||
create_config()
|
create_config()
|
||||||
|
return
|
||||||
|
|
||||||
config.read(config_file)
|
config.read(config_file)
|
||||||
|
|
||||||
if state.debug is not None:
|
state.debug = config.getboolean("General", "debug", fallback=state.debug)
|
||||||
state.debug = config.getboolean("General", "debug")
|
state.api_url = config.get("General", "api_url", fallback=state.api_url)
|
||||||
if state.api_url is not None:
|
state.aria2_threads = config.getint("General", "aria2_threads", fallback=state.aria2_threads)
|
||||||
state.api_url = config.get("General", "api_url")
|
state.download_path = config.get("General", "download_path", fallback=state.download_path)
|
||||||
if state.aria2_threads is not None:
|
state.speed_limit = config.getint("General", "speed_limit", fallback=state.speed_limit)
|
||||||
state.aria2_threads = config.getint("General", "aria2_threads")
|
state.ignore_updates = config.getboolean("General", "ignore_updates", fallback=state.ignore_updates)
|
||||||
if state.download_path is not None:
|
state.image_path = config.get("General", "image_path", fallback=state.image_path)
|
||||||
state.download_path = config.get("General", "download_path")
|
state.autoresume = config.getboolean("General", "autoresume", fallback=state.autoresume)
|
||||||
if state.speed_limit is not None:
|
|
||||||
state.speed_limit = config.getint("General", "speed_limit")
|
create_config()
|
||||||
if state.ignore_updates is not None:
|
|
||||||
state.ignore_updates = config.getboolean("General", "ignore_updates")
|
|
||||||
if state.image_path is not None:
|
|
||||||
state.image_path = config.get("General", "image_path")
|
|
||||||
if state.autoresume is not None:
|
|
||||||
state.autoresume = config.getboolean("General", "autoresume")
|
|
||||||
@@ -52,8 +52,11 @@ if __name__ == "__main__":
|
|||||||
state.aria2process = run_aria2server()
|
state.aria2process = run_aria2server()
|
||||||
signal.signal(signal.SIGINT, keyboardinterrupthandler)
|
signal.signal(signal.SIGINT, keyboardinterrupthandler)
|
||||||
run_thread(threading.Thread(target=send_notification, args=(shutdown_event,), daemon=True))
|
run_thread(threading.Thread(target=send_notification, args=(shutdown_event,), daemon=True))
|
||||||
|
consoleLog("Started send_notification thread")
|
||||||
run_thread(threading.Thread(target=update_log, args=(shutdown_event,), daemon=True))
|
run_thread(threading.Thread(target=update_log, args=(shutdown_event,), daemon=True))
|
||||||
|
consoleLog("Started update_log thread")
|
||||||
run_thread(threading.Thread(target=check_completed, args=(downloads, state.autoresume)))
|
run_thread(threading.Thread(target=check_completed, args=(downloads, state.autoresume)))
|
||||||
|
consoleLog("Started check_completed thread")
|
||||||
consoleLog("Launching GUI")
|
consoleLog("Launching GUI")
|
||||||
run_gui()
|
run_gui()
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
requests==2.32.2
|
requests==2.32.2
|
||||||
PySide6==6.9.2
|
PySide6==6.10.1
|
||||||
beautifulsoup4==4.13.5
|
beautifulsoup4==4.13.5
|
||||||
darkdetect==0.8.0
|
darkdetect==0.8.0
|
||||||
aria2p==0.12.1
|
aria2p==0.12.1
|
||||||
@@ -7,4 +7,4 @@ pyinstaller==6.15.0
|
|||||||
pyqtdarktheme==0.1.7
|
pyqtdarktheme==0.1.7
|
||||||
aiohttp==3.13.0
|
aiohttp==3.13.0
|
||||||
plyer==2.1.0
|
plyer==2.1.0
|
||||||
psutil==7.1.0
|
psutil==7.1.0
|
||||||
|
|||||||
Reference in New Issue
Block a user