KeksPirates/SoftwareManager
1
1
Fork 0
mirror of https://github.com/KeksPirates/SoftwareManager.git synced 2026-08-04 09:59:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

update settings dialog & config, remove aria2

Browse Source
This commit is contained in:
Vxrtrauter
2026-01-31 03:05:31 +01:00
parent fa3a43887a
commit 8f9f77d63f
10 changed files with 102 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/utils/config/config.py
+3 -2
View File
@@ -6,7 +6,7 @@ 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}",
config["General"] = {"debug": True, "api_url": f"{state.api_url}", "aria2_threads": f"{state.aria2_threads}", "download_path": f"{state.download_path}", f"download_speed_limit": f"{state.down_speed_limit}", f"upload_speed_limit": f"{state.up_speed_limit}",
"ignore_updates": f"{state.ignore_updates}", "image_path": f"{state.image_path}", "autoresume": f"{state.autoresume}"}
if platform.system() == "Windows":
@@ -42,7 +42,8 @@ def read_config():
state.api_url = config.get("General", "api_url", fallback=state.api_url)
state.aria2_threads = config.getint("General", "aria2_threads", fallback=state.aria2_threads)
state.download_path = config.get("General", "download_path", fallback=state.download_path)
state.speed_limit = config.getint("General", "speed_limit", fallback=state.speed_limit)
state.down_speed_limit = config.getint("General", "download_speed_limit", fallback=state.down_speed_limit)
state.up_speed_limit = config.getint("General", "upload_speed_limit", fallback=state.up_speed_limit)
state.ignore_updates = config.getboolean("General", "ignore_updates", fallback=state.ignore_updates)
state.image_path = config.get("General", "image_path", fallback=state.image_path)
state.autoresume = config.getboolean("General", "autoresume", fallback=state.autoresume)
core/utils/config/settings.py
+5 -15
View File
@@ -1,27 +1,18 @@
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
kill_aria2server()
state.aria2process.wait()
state.aria2process = main.run_aria2server()
signal.signal(signal.SIGINT, main.keyboardinterrupthandler)
atexit.unregister(kill_aria2server)
atexit.register(kill_aria2server)
def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_path=None, speed_limit=None, image_path=None, autoresume=None):
def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_path=None, down_speed_limit=None, up_speed_limit=None, image_path=None, autoresume=None):
if thread_count is not None:
state.aria2_threads = thread_count
if apiurl is not None:
state.api_url = apiurl
if download_path is not None:
state.download_path = download_path
if speed_limit is not None:
state.speed_limit = speed_limit
if down_speed_limit is not None:
state.down_speed_limit = down_speed_limit
if up_speed_limit is not None:
state.up_speed_limit = up_speed_limit
if image_path is not None:
state.image_path = image_path
if autoresume is not None:
@@ -29,5 +20,4 @@ def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_p
create_config()
restart_aria2c()
close()
core/utils/data/state.py
+4 -1
View File
@@ -19,7 +19,10 @@ class AppState(QObject):
self.tracker: str = "rutracker"
self.api_url: str = "https://api.michijackson.xyz"
self.download_path: str = str(Path.home() / "Downloads")
self.speed_limit: int = 0
self.up_speed_limit: int = 0
self.down_speed_limit: int = 0
self.max_connections: int = 200
self.max_downloads: int = 10
self.aria2process: Optional[Any] = None
self.aria2: Any = None
self.aria2p: Any = None