mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-03 17:39:42 +02:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 05a5b04507 | |||
| 87c974f124 | |||
| 95a687ddd9 | |||
| 813d2b31c4 | |||
| deb5ce5b88 | |||
| a11c1d7129 | |||
| dcc78ade44 |
@@ -66,8 +66,12 @@ jobs:
|
||||
pip install -r requirements.txt
|
||||
pip install pyinstaller
|
||||
|
||||
- name: Inject commit hash into code
|
||||
run: |
|
||||
echo "version = '${GITHUB_SHA}'" > build_info.json
|
||||
|
||||
- name: Build executable with PyInstaller
|
||||
run: pyinstaller --onefile --windowed --name ${{ env.APP_NAME }} main.py
|
||||
run: pyinstaller --onefile --windowed --add-data "build_info.json:." --name ${{ env.APP_NAME }} main.py
|
||||
|
||||
- name: Make executable (Unix)
|
||||
if: runner.os != 'Windows'
|
||||
|
||||
@@ -10,12 +10,10 @@ from PySide6.QtWidgets import (
|
||||
QLabel,
|
||||
QHBoxLayout,
|
||||
QSpinBox,
|
||||
QCheckBox,
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
def settings_dialog(self):
|
||||
|
||||
if state.debug:
|
||||
@@ -29,7 +27,20 @@ def settings_dialog(self):
|
||||
|
||||
def close_settings():
|
||||
dialog.reject()
|
||||
|
||||
|
||||
checkbox_container = QWidget()
|
||||
checkbox_layout = QHBoxLayout()
|
||||
|
||||
# ignore updates checkbox
|
||||
checkbox = QCheckBox()
|
||||
checkbox_container.setLayout(checkbox_layout)
|
||||
checkbox_layout.addWidget(QLabel("Ignore Updates: "))
|
||||
checkbox_layout.addStretch()
|
||||
checkbox.setChecked(state.ignore_updates)
|
||||
checkbox.toggled.connect(lambda checked: setattr(state, 'ignore_updates', checked))
|
||||
checkbox_layout.addWidget(checkbox)
|
||||
dialog.layout().addWidget(checkbox_container)
|
||||
|
||||
##################
|
||||
# THREAD SETTING #
|
||||
##################
|
||||
@@ -119,4 +130,4 @@ def settings_dialog(self):
|
||||
|
||||
dialog.layout().addLayout(layout)
|
||||
|
||||
dialog.exec()
|
||||
dialog.exec()
|
||||
|
||||
+32
-17
@@ -16,9 +16,10 @@ from PySide6.QtWidgets import (
|
||||
QHeaderView,
|
||||
QMessageBox,
|
||||
QTableWidget,
|
||||
QTableWidgetItem,
|
||||
QTableWidgetItem
|
||||
)
|
||||
from PySide6.QtGui import QIcon, QAction, QCloseEvent
|
||||
|
||||
from PySide6.QtGui import QIcon, QAction, QCloseEvent, QPalette
|
||||
import darkdetect
|
||||
import threading
|
||||
import platform
|
||||
@@ -27,6 +28,7 @@ import os
|
||||
import subprocess
|
||||
import time
|
||||
import sys
|
||||
import json
|
||||
from core.utils.config.settings import save_settings
|
||||
from core.utils.general.wrappers import run_thread
|
||||
from core.utils.data.state import state
|
||||
@@ -38,7 +40,7 @@ from core.interface.utils.searchhelper import return_pressed
|
||||
from core.interface.dialogs.settings import settings_dialog
|
||||
from core.network.aria2_integration import dlprogress
|
||||
|
||||
def download_update(latest_version):
|
||||
def download_update():
|
||||
filename = "SoftwareManager-dev-windows.exe"
|
||||
url = "https://github.com/KeksPirates/SoftwareManager/releases/latest/download/SoftwareManager-dev-windows.exe"
|
||||
|
||||
@@ -52,29 +54,35 @@ def download_update(latest_version):
|
||||
raise FileNotFoundError(f"Executable not found")
|
||||
subprocess.Popen([filename], shell=True)
|
||||
time.sleep(0.5)
|
||||
save_settings(version=latest_version)
|
||||
sys.exit(0)
|
||||
|
||||
class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
|
||||
build_info_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "build_info.json")
|
||||
if os.path.exists(build_info_path):
|
||||
with open(build_info_path, "r") as f:
|
||||
build_info = json.load(f)
|
||||
state.version = build_info.get("version", "dev")
|
||||
|
||||
# Check for updates on Windows
|
||||
if platform.system() == "Windows":
|
||||
result = check_for_updates()
|
||||
assets, latest_version = result
|
||||
if state.ignore_updates is False:
|
||||
if platform.system() == "Windows":
|
||||
result = check_for_updates()
|
||||
assets, latest_version = result
|
||||
|
||||
if assets:
|
||||
msg = QMessageBox()
|
||||
msg.setIcon(QMessageBox.Information)
|
||||
msg.setWindowTitle("Update Available")
|
||||
msg.setText(f"A new version is available.")
|
||||
msg.setInformativeText("Please visit the GitHub releases page to download the latest version.")
|
||||
msg.setStandardButtons(QMessageBox.Ok | QMessageBox.Ignore)
|
||||
if assets:
|
||||
msg = QMessageBox()
|
||||
msg.setIcon(QMessageBox.Information)
|
||||
msg.setWindowTitle("Update Available")
|
||||
msg.setText(f"A new version is available.")
|
||||
msg.setInformativeText("Please visit the GitHub releases page to download the latest version.")
|
||||
msg.setStandardButtons(QMessageBox.Ok | QMessageBox.Ignore)
|
||||
|
||||
response = msg.exec_()
|
||||
if response == QMessageBox.Ok:
|
||||
download_update(latest_version)
|
||||
response = msg.exec_()
|
||||
if response == QMessageBox.Ok:
|
||||
download_update(latest_version)
|
||||
|
||||
self.setWindowTitle("Software Manager")
|
||||
self.setGeometry(100, 100, 800, 600)
|
||||
@@ -109,6 +117,9 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
self.qtablewidget.verticalHeader().setVisible(False)
|
||||
self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
|
||||
self.qtablewidget.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
|
||||
self.qtablewidget.setAttribute(Qt.WA_TranslucentBackground)
|
||||
self.qtablewidget.viewport().setAttribute(Qt.WA_TranslucentBackground)
|
||||
|
||||
header = self.qtablewidget.horizontalHeader()
|
||||
header.setSectionResizeMode(1, QHeaderView.Fixed)
|
||||
header.resizeSection(1, 500)
|
||||
@@ -158,6 +169,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
self.downloadList.horizontalHeader().setStretchLastSection(False)
|
||||
self.downloadList.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
|
||||
self.downloadList.setSelectionBehavior(QTableView.SelectRows)
|
||||
self.downloadList.setAttribute(Qt.WA_TranslucentBackground)
|
||||
self.downloadList.viewport().setAttribute(Qt.WA_TranslucentBackground)
|
||||
|
||||
# download button triggers
|
||||
self.dlbutton.clicked.connect(lambda: run_thread(threading.Thread(target=download_selected, args=(self.qtablewidget.currentItem(), state.posts, state.post_titles))))
|
||||
@@ -175,6 +188,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
self.tab1 = create_tab("Search", self.searchbar, self.qtablewidget, self.tabs, self.dlbutton, self.horizontal_layout)
|
||||
self.tab2 = create_tab("Library", self.emptyLibrary, self.libraryList, self.tabs, None, None)
|
||||
self.tab3 = create_tab("Downloads", self.emptyDownload, self.downloadList, self.tabs, None, None)
|
||||
|
||||
|
||||
|
||||
containerLayout.addWidget(self.tabs)
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ from core.utils.data.state import state
|
||||
def create_config():
|
||||
config = configparser.ConfigParser()
|
||||
|
||||
config["General"] = {"debug": True, "api_url": f"{state.api_url}", "aria2_threads": f"{state.aria2_threads}", "download_path": f"{state.download_path}", f"speed_limit": f"{state.speed_limit}",
|
||||
"version": f"{state.version}"}
|
||||
config["General"] = {"debug": True, "api_url": f"{state.api_url}", "aria2_threads": f"{state.aria2_threads}", "download_path": f"{state.download_path}", f"speed_limit": f"{state.speed_limit}",
|
||||
"ignore_updates": f"{state.ignore_updates}"}
|
||||
|
||||
if platform.system() == "Windows":
|
||||
config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming"))
|
||||
@@ -42,4 +42,4 @@ def read_config():
|
||||
state.aria2_threads = config.getint("General", "aria2_threads")
|
||||
state.download_path = config.get("General", "download_path")
|
||||
state.speed_limit = config.getint("General", "speed_limit")
|
||||
state.version = config.get("General", "version")
|
||||
state.ignore_updates = config.getboolean("General", "ignore_updates")
|
||||
|
||||
@@ -1,39 +1,19 @@
|
||||
from core.utils.data.state import state
|
||||
from core.utils.general.shutdown import kill_aria2server
|
||||
from .config import create_config
|
||||
|
||||
def restart_aria2c():
|
||||
import main # had to do this because of circle import :(
|
||||
import signal
|
||||
import atexit
|
||||
import time
|
||||
kill_aria2server()
|
||||
state.aria2process.wait()
|
||||
state.aria2process = main.run_aria2server()
|
||||
signal.signal(signal.SIGINT, main.keyboardinterrupthandler)
|
||||
atexit.unregister(kill_aria2server)
|
||||
atexit.register(kill_aria2server)
|
||||
|
||||
try:
|
||||
main.kill_aria2server()
|
||||
except Exception as e:
|
||||
print(f"Warning: aria2server kill failed: {e}")
|
||||
|
||||
try:
|
||||
if state.aria2process:
|
||||
state.aria2process.wait(timeout=3)
|
||||
except Exception as e:
|
||||
print(f"Warning: aria2process wait failed: {e}")
|
||||
|
||||
time.sleep(0.5)
|
||||
|
||||
try:
|
||||
state.aria2process = main.run_aria2server()
|
||||
except Exception as e:
|
||||
print(f"Error: failed to restart aria2server: {e}")
|
||||
return
|
||||
|
||||
try:
|
||||
signal.signal(signal.SIGINT, main.keyboardinterrupthandler)
|
||||
atexit.unregister(main.kill_aria2server)
|
||||
atexit.register(main.kill_aria2server)
|
||||
except Exception as e:
|
||||
print(f"Warning: signal/atexit setup failed: {e}")
|
||||
|
||||
def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_path=None, speed_limit=None, version=None):
|
||||
def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_path=None, speed_limit=None):
|
||||
if thread_count is not None:
|
||||
state.aria2_threads = thread_count
|
||||
if apiurl is not None:
|
||||
@@ -42,8 +22,6 @@ def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_p
|
||||
state.download_path = download_path
|
||||
if speed_limit is not None:
|
||||
state.speed_limit = speed_limit
|
||||
if version is not None:
|
||||
state.version = version
|
||||
|
||||
create_config()
|
||||
restart_aria2c()
|
||||
|
||||
@@ -10,6 +10,7 @@ class AppState:
|
||||
post_author: List[str]
|
||||
downloads: List[str]
|
||||
version: str
|
||||
ignore_updates: bool = False
|
||||
debug: bool = False
|
||||
tracker: str = "rutracker"
|
||||
api_url: str = "https://api.michijackson.xyz"
|
||||
|
||||
@@ -16,7 +16,12 @@ def check_for_updates():
|
||||
latest_version = latest_release["name"]
|
||||
assets = latest_release["assets"]
|
||||
|
||||
if latest_version != state.version:
|
||||
|
||||
if state.version == "dev":
|
||||
if state.debug:
|
||||
print("Dev release detected, skipping version check")
|
||||
return None, None
|
||||
elif latest_version != state.version:
|
||||
if state.debug:
|
||||
print(f"New release available: {latest_version}")
|
||||
if assets:
|
||||
|
||||
Reference in New Issue
Block a user