Compare commits

...

3 Commits

Author SHA1 Message Date
KeksNino 95a687ddd9 fix updater 2025-10-19 04:07:41 +02:00
KeksNino 813d2b31c4 add setting to ignore updates on windows 2025-10-19 04:05:57 +02:00
Vxrtrauter deb5ce5b88 fixed aria2 killing issues on settings close 2025-10-19 03:53:52 +02:00
5 changed files with 40 additions and 46 deletions
+14 -3
View File
@@ -10,12 +10,10 @@ from PySide6.QtWidgets import (
QLabel, QLabel,
QHBoxLayout, QHBoxLayout,
QSpinBox, QSpinBox,
QCheckBox,
) )
def settings_dialog(self): def settings_dialog(self):
if state.debug: if state.debug:
@@ -30,6 +28,19 @@ def settings_dialog(self):
def close_settings(): def close_settings():
dialog.reject() 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 # # THREAD SETTING #
################## ##################
+1
View File
@@ -61,6 +61,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
super().__init__() super().__init__()
# Check for updates on Windows # Check for updates on Windows
if state.ignore_updates is False:
if platform.system() == "Windows": if platform.system() == "Windows":
result = check_for_updates() result = check_for_updates()
assets, latest_version = result assets, latest_version = result
+2 -1
View File
@@ -7,7 +7,7 @@ def create_config():
config = configparser.ConfigParser() 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}", 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}"} "version": f"{state.version}", "ignore_updates": f"{state.ignore_updates}"}
if platform.system() == "Windows": if platform.system() == "Windows":
config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming")) config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming"))
@@ -43,3 +43,4 @@ def read_config():
state.download_path = config.get("General", "download_path") state.download_path = config.get("General", "download_path")
state.speed_limit = config.getint("General", "speed_limit") state.speed_limit = config.getint("General", "speed_limit")
state.version = config.get("General", "version") state.version = config.get("General", "version")
state.ignore_updates = config.getboolean("General", "ignore_updates")
+5 -25
View File
@@ -1,37 +1,17 @@
from core.utils.data.state import state from core.utils.data.state import state
from core.utils.general.shutdown import kill_aria2server
from .config import create_config from .config import create_config
def restart_aria2c(): def restart_aria2c():
import main # had to do this because of circle import :( import main # had to do this because of circle import :(
import signal import signal
import atexit import atexit
import time kill_aria2server()
state.aria2process.wait()
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() 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) signal.signal(signal.SIGINT, main.keyboardinterrupthandler)
atexit.unregister(main.kill_aria2server) atexit.unregister(kill_aria2server)
atexit.register(main.kill_aria2server) atexit.register(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, version=None):
if thread_count is not None: if thread_count is not None:
+1
View File
@@ -10,6 +10,7 @@ class AppState:
post_author: List[str] post_author: List[str]
downloads: List[str] downloads: List[str]
version: str version: str
ignore_updates: bool = False
debug: bool = False debug: bool = False
tracker: str = "rutracker" tracker: str = "rutracker"
api_url: str = "https://api.michijackson.xyz" api_url: str = "https://api.michijackson.xyz"