mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-04 09:59:41 +02:00
update settings dialog & config, remove aria2
This commit is contained in:
@@ -1,109 +0,0 @@
|
||||
import aria2p
|
||||
import subprocess
|
||||
from core.utils.data.state import state
|
||||
from core.utils.general.logs import update_download_completed_by_hash
|
||||
from core.utils.general.logs import consoleLog
|
||||
from plyer import notification
|
||||
import socket
|
||||
import time
|
||||
import sys
|
||||
|
||||
def run_aria2p():
|
||||
|
||||
state.aria2 = aria2p.API(
|
||||
aria2p.Client(
|
||||
host="http://localhost",
|
||||
port=6800,
|
||||
secret=""
|
||||
)
|
||||
)
|
||||
|
||||
return state.aria2
|
||||
|
||||
|
||||
def aria2server():
|
||||
download_path = state.download_path
|
||||
speed_limit = state.speed_limit
|
||||
|
||||
cmd = [
|
||||
"aria2c",
|
||||
"--enable-rpc",
|
||||
"--disable-ipv6", # added this since it caused problems with vpns
|
||||
"--rpc-listen-all",
|
||||
"--rpc-listen-port=6800",
|
||||
f"--dir={download_path}",
|
||||
f"--max-download-limit={speed_limit * 1024}",
|
||||
"-x", str(state.aria2_threads),
|
||||
"-s", str(state.aria2_threads),
|
||||
]
|
||||
|
||||
aria2server = subprocess.Popen(
|
||||
cmd,
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.DEVNULL,
|
||||
creationflags=subprocess.CREATE_NO_WINDOW if sys.platform == 'win32' else 0
|
||||
)
|
||||
|
||||
max_checks = 50
|
||||
for check in range(max_checks):
|
||||
try:
|
||||
sock = socket.socket()
|
||||
sock.settimeout(0.1)
|
||||
sock.connect(("localhost", 6800))
|
||||
sock.close()
|
||||
break
|
||||
except(ConnectionRefusedError, socket.timeout):
|
||||
time.sleep(0.1)
|
||||
else:
|
||||
raise RuntimeError("Aria2 Server failed to start")
|
||||
|
||||
consoleLog("Aria2 Server started")
|
||||
return aria2server
|
||||
|
||||
def dlprogress():
|
||||
try:
|
||||
state.downloads = [download for download in state.aria2.get_downloads() if not download.is_metadata]
|
||||
downloads = state.downloads
|
||||
if downloads:
|
||||
for download in downloads:
|
||||
progress = download.progress_string(0)
|
||||
progress_int = int(progress.strip('%'))
|
||||
return progress_int
|
||||
return 0
|
||||
except:
|
||||
return 0
|
||||
|
||||
def send_notification(shutdown_event):
|
||||
notified = set()
|
||||
while not shutdown_event.is_set():
|
||||
try:
|
||||
for d in state.aria2.get_downloads():
|
||||
if d.is_metadata:
|
||||
continue
|
||||
if d.progress == 100 and d.gid not in notified:
|
||||
notification.notify(
|
||||
title="Download finished",
|
||||
message=f"{d.name} has finished downloading.",
|
||||
timeout=4
|
||||
)
|
||||
notified.add(d.gid)
|
||||
state.downloads = [d for d in state.aria2.get_downloads() if d.is_active and not d.is_metadata]
|
||||
except Exception:
|
||||
pass
|
||||
time.sleep(5)
|
||||
|
||||
def update_log(shutdown_event):
|
||||
updated = set()
|
||||
while not shutdown_event.is_set():
|
||||
try:
|
||||
for d in state.aria2.get_downloads():
|
||||
if d.is_metadata:
|
||||
continue
|
||||
if d.progress == 100 and d.gid not in updated:
|
||||
consoleLog(f"Marking {d.name} as completed")
|
||||
update_download_completed_by_hash(d.info_hash, True)
|
||||
updated.add(d.gid)
|
||||
state.downloads = [d for d in state.aria2.get_downloads() if d.is_active and not d.is_metadata]
|
||||
except Exception:
|
||||
pass
|
||||
time.sleep(5)
|
||||
@@ -1,18 +0,0 @@
|
||||
from .aria2_integration import run_aria2p
|
||||
from core.utils.data.state import state
|
||||
from core.utils.general.logs import consoleLog
|
||||
|
||||
def start_client():
|
||||
global aria2
|
||||
aria2 = run_aria2p()
|
||||
consoleLog("Started Aria2p")
|
||||
|
||||
def add_magnet(uri):
|
||||
if uri is not None and uri.startswith("magnet:?"):
|
||||
aria2.add_magnet(uri)
|
||||
consoleLog("Magnet URI added to Aria2")
|
||||
else:
|
||||
consoleLog(f"Invalid Magnet Link: {uri}")
|
||||
|
||||
|
||||
|
||||
@@ -16,15 +16,15 @@ def init_session():
|
||||
state.dl_session = lt.session()
|
||||
|
||||
settings = {
|
||||
"upload_rate_limit": 0,
|
||||
"download_rate_limit": 0,
|
||||
"upload_rate_limit": state.up_speed_limit,
|
||||
"download_rate_limit": state.down_speed_limit,
|
||||
"enable_dht": True,
|
||||
"enable_lsd": True,
|
||||
"enable_upnp": True,
|
||||
"enable_natpmp": True,
|
||||
"dht_bootstrap_nodes": "router.bittorrent.com:6881,dht.transmissionbt.com:6881",
|
||||
"connections_limit": 200,
|
||||
"active_downloads": 10
|
||||
"connections_limit": state.max_connections,
|
||||
"active_downloads": state.max_downloads
|
||||
}
|
||||
|
||||
|
||||
@@ -87,6 +87,14 @@ def dl_status_loop():
|
||||
|
||||
loop_running = False
|
||||
|
||||
def update_settings():
|
||||
|
||||
settings = {
|
||||
"upload_rate_limit": state.up_speed_limit,
|
||||
"download_rate_limit": state.down_speed_limit,
|
||||
"connections_limit": state.max_connections,
|
||||
"active_downloads": state.max_downloads
|
||||
}
|
||||
|
||||
|
||||
state.dl_session.apply_settings(settings)
|
||||
consoleLog("Updated Settings")
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
import aria2p
|
||||
import subprocess
|
||||
from core.utils.data.state import state
|
||||
from core.utils.general.logs import update_download_completed_by_hash
|
||||
from core.utils.general.logs import consoleLog
|
||||
from plyer import notification
|
||||
import socket
|
||||
import time
|
||||
import sys
|
||||
|
||||
|
||||
def send_notification(shutdown_event):
|
||||
notified = set()
|
||||
while not shutdown_event.is_set():
|
||||
try:
|
||||
for d in state.aria2.get_downloads():
|
||||
if d.is_metadata:
|
||||
continue
|
||||
if d.progress == 100 and d.gid not in notified:
|
||||
notification.notify(
|
||||
title="Download finished",
|
||||
message=f"{d.name} has finished downloading.",
|
||||
timeout=4
|
||||
)
|
||||
notified.add(d.gid)
|
||||
state.downloads = [d for d in state.aria2.get_downloads() if d.is_active and not d.is_metadata]
|
||||
except Exception:
|
||||
pass
|
||||
time.sleep(5)
|
||||
|
||||
def update_log(shutdown_event):
|
||||
updated = set()
|
||||
while not shutdown_event.is_set():
|
||||
try:
|
||||
for d in state.aria2.get_downloads():
|
||||
if d.is_metadata:
|
||||
continue
|
||||
if d.progress == 100 and d.gid not in updated:
|
||||
consoleLog(f"Marking {d.name} as completed")
|
||||
update_download_completed_by_hash(d.info_hash, True)
|
||||
updated.add(d.gid)
|
||||
state.downloads = [d for d in state.aria2.get_downloads() if d.is_active and not d.is_metadata]
|
||||
except Exception:
|
||||
pass
|
||||
time.sleep(5)
|
||||
Reference in New Issue
Block a user