Compare commits

...

2 Commits

6 changed files with 69 additions and 45 deletions
+41 -2
View File
@@ -13,6 +13,7 @@ from PySide6.QtWidgets import (
QSpinBox,
QCheckBox,
QFileDialog,
QComboBox
)
import platform
@@ -56,7 +57,6 @@ def settings_dialog(self):
autoresume_layout.addStretch()
autoresume_checkbox.setChecked(state.autoresume)
autoresume_checkbox.toggled.connect(lambda checked: setattr(state, 'autoresume', checked))
autoresume_layout.addWidget(autoresume_checkbox)
dialog.layout().addWidget(autoresume_container)
@@ -206,6 +206,35 @@ def settings_dialog(self):
max_downloads.setFixedHeight(30)
dialog.layout().addWidget(max_downloads_container)
#####################
# INTERFACE BINDING #
#####################
interface_container = QWidget()
interface_layout = QHBoxLayout()
interface_label = QLabel("Network Interface:")
interface_layout.addWidget(interface_label)
interface_select = QComboBox()
interface_select.addItems(["None"] + state.interfaces)
target = state.bound_interface if state.bound_interface else "None"
index = interface_select.findText(target)
if index >= 0:
interface_select.setCurrentIndex(index)
else:
interface_select.setCurrentIndex(0)
interface_select.setFixedWidth(180)
interface_select.setFixedHeight(30)
interface_select.setFixedWidth(180)
interface_select.setFixedHeight(30)
interface_layout.addWidget(interface_select)
interface_container.setLayout(interface_layout)
dialog.layout().addWidget(interface_container)
###############
# SAVE/CANCEL #
###############
@@ -214,7 +243,17 @@ def settings_dialog(self):
save_btn = QPushButton("Save")
cancel_btn = QPushButton("Cancel")
save_btn.clicked.connect(lambda: save_settings(close_settings, api_url.text(), download_path.text(), down_speed_limit.value(), up_speed_limit.value(), image_path.text(), None, max_connections.value(), max_downloads.value()))
save_btn.clicked.connect(lambda: save_settings(
close_settings,
api_url.text(),
download_path.text(),
down_speed_limit.value(),
up_speed_limit.value(),
image_path.text(),
autoresume_checkbox.isChecked(),
max_connections.value(),
max_downloads.value(),
interface_select.currentText()))
cancel_btn.clicked.connect(dialog.reject)
layout.addWidget(cancel_btn)
+3 -1
View File
@@ -29,7 +29,7 @@ import libtorrent as lt
import time
import sys
import json
from core.utils.general.logs import consoleLog, remove_download_log
from core.utils.general.logs import consoleLog, remove_download_log, flush_log_buffer
from core.utils.general.wrappers import run_thread
from core.utils.data.state import state
from core.utils.network.download import download_selected
@@ -150,6 +150,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
self.consoleLog = QTextEdit()
self.progressbar = QProgressBar()
flush_log_buffer()
# Table Widget for Item List
self.qtablewidget = QTableWidget()
+3 -1
View File
@@ -4,7 +4,7 @@ from core.utils.general.logs import consoleLog
from .config import create_config
def save_settings(close=lambda: None, apiurl=None, download_path=None, down_speed_limit=None, up_speed_limit=None, image_path=None, autoresume=None, max_connections=None, max_downloads=None):
def save_settings(close=lambda: None, apiurl=None, download_path=None, down_speed_limit=None, up_speed_limit=None, image_path=None, autoresume=None, max_connections=None, max_downloads=None, bound_interface=None):
if apiurl is not None:
state.api_url = apiurl
if download_path is not None:
@@ -21,6 +21,8 @@ def save_settings(close=lambda: None, apiurl=None, download_path=None, down_spee
state.max_connections = max_connections
if max_downloads is not None:
state.max_downloads = max_downloads
if bound_interface is not None:
state.bound_interface = None if bound_interface == "None" else bound_interface
update_settings()
+18 -3
View File
@@ -6,6 +6,8 @@ import json
import os
import re
_log_buffer = []
def add_download_log(title, url, magnet_uri, completed) -> DownloadList:
downloads_file = os.path.join(state.settings_path, "downloads.json")
@@ -189,15 +191,28 @@ def set_main_window(window):
global _main_window
_main_window = window
def flush_log_buffer(): # credits to claude
global _log_buffer
if _log_buffer:
try:
from core.interface.gui import MainWindow
for log_entry in _log_buffer:
MainWindow.add_log(log_entry)
_log_buffer = []
except Exception:
pass
def consoleLog(text, printAnyways = False):
now = datetime.now()
current_time = now.strftime("%H:%M:%S")
formatted_text = f"[{current_time}] {text}"
try:
from core.interface.gui import MainWindow
MainWindow.add_log(f"[{current_time}] {text}")
MainWindow.add_log(formatted_text)
except Exception:
pass
global _log_buffer
_log_buffer.append(formatted_text)
if state.debug or printAnyways:
print(f"[{current_time}] {text}")
print(formatted_text)
+4 -3
View File
@@ -47,17 +47,18 @@ if __name__ == "__main__":
if args.debug:
state.debug = args.debug # override of read_config
signal.signal(signal.SIGINT, keyboardinterrupthandler)
consoleLog("Started check_completed thread")
consoleLog("Starting SoftwareManager...")
consoleLog("Fetching Network Interfaces...")
list_interfaces()
consoleLog("Initialiting Interface variables...")
init_interfaces()
consoleLog(f"Current Bound: {state.bound_interface}")
run_thread(threading.Thread(target=send_notification, args=(shutdown_event,), daemon=True))
consoleLog("Started send_notification thread")
consoleLog("Started Thread: send_notification")
run_thread(threading.Thread(target=update_log, args=(shutdown_event,), daemon=True))
consoleLog("Started update_log thread")
consoleLog("Started Thread: update_log")
run_thread(threading.Thread(target=check_completed, args=(downloads, state.autoresume)))
consoleLog("Started Thread: check_completed")
consoleLog("Launching GUI")
run_gui()
-35
View File
@@ -1,35 +0,0 @@
import psutil
addrs = psutil.net_if_addrs()
stats = psutil.net_if_stats()
def get_active_interfaces():
active = []
for interface, addr_list in addrs.items():
up = stats[interface].isup
for addr in addr_list:
if addr.family == 2: # ipv4
ipv4 = addr.address
if not ipv4.startswith("127.") and not ipv4.startswith("169.254") and up == True:
print(f'"{interface}": True')
active.append(interface)
print(active)
return active
print(list(addrs.keys()))
# print(addrs)
# print()
# sigmer = list()
# for interface in stats.keys():
# print(f"{interface}: UP = {stats[interface].isup}")
# sigmer.append(f"{interface}: {stats[interface].isup}")
# print(sigmer)