mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-03 17:39:42 +02:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8db9f3d9e2 | |||
| 80d3ad208d | |||
| 66217ff9b6 | |||
| 9ba11bfa78 | |||
| 43cbfe056c | |||
| 12df32f72a |
@@ -16,7 +16,9 @@ def scrape_uztracker(query):
|
||||
links = soup.find_all('tr', class_="tCenter hl-tr", id=lambda x: x and x.startswith('tor_'))
|
||||
for link in links:
|
||||
|
||||
theme_link = link.find('a', class_="genmed tLink", href=lambda x: x and x.startswith('./viewtopic'))
|
||||
theme_link = link.find('a', class_="genmed tLink", href=lambda x: x and x.startswith('./viewtopic'))
|
||||
if not theme_link or not theme_link.b:
|
||||
continue
|
||||
url = urljoin(base_url, theme_link['href'])
|
||||
title = theme_link.b.text
|
||||
author_link = link.find('a', class_="med")
|
||||
|
||||
@@ -224,8 +224,6 @@ def settings_dialog(self):
|
||||
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)
|
||||
@@ -246,7 +244,7 @@ def settings_dialog(self):
|
||||
download_path.text(),
|
||||
down_speed_limit.value(),
|
||||
up_speed_limit.value(),
|
||||
# image_path.text(),
|
||||
None,
|
||||
autoresume_checkbox.isChecked(),
|
||||
max_connections.value(),
|
||||
max_downloads.value(),
|
||||
|
||||
+24
-57
@@ -30,7 +30,6 @@ import libtorrent as lt
|
||||
import sys
|
||||
import json
|
||||
import base64
|
||||
import winreg
|
||||
from core.utils.logging.logs import consoleLog, remove_download_log, flush_log_buffer
|
||||
from core.utils.general.wrappers import run_thread
|
||||
from core.utils.data.state import state
|
||||
@@ -85,10 +84,19 @@ def _table_stylesheet(view_type="QTableWidget"):
|
||||
{view_type}::item {{
|
||||
border-bottom: 1px solid {c["border"]};
|
||||
padding: 6px 14px;
|
||||
outline: none;
|
||||
{color_rule}
|
||||
}}
|
||||
{view_type}::item:selected {{
|
||||
background: {c["selected"]};
|
||||
outline: none;
|
||||
border: none;
|
||||
border-bottom: 1px solid {c["border"]};
|
||||
}}
|
||||
{view_type}::item:focus {{
|
||||
outline: none;
|
||||
border: none;
|
||||
border-bottom: 1px solid {c["border"]};
|
||||
}}
|
||||
QHeaderView {{
|
||||
background: transparent;
|
||||
@@ -134,24 +142,6 @@ SVG_PAUSE = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><rect x
|
||||
SVG_FOLDER = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2 6c0-1.1.9-2 2-2h5l2 2h7c1.1 0 2 .9 2 2v10c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6z" fill="{color}"/></svg>'
|
||||
|
||||
|
||||
def _find_install_path():
|
||||
uninstall_key = r"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
|
||||
for hive in (winreg.HKEY_CURRENT_USER, winreg.HKEY_LOCAL_MACHINE):
|
||||
try:
|
||||
with winreg.OpenKey(hive, uninstall_key) as key:
|
||||
for i in range(winreg.QueryInfoKey(key)[0]):
|
||||
with winreg.OpenKey(key, winreg.EnumKey(key, i)) as subkey:
|
||||
try:
|
||||
name = winreg.QueryValueEx(subkey, "DisplayName")[0]
|
||||
if "SoftwareManager" in name:
|
||||
return winreg.QueryValueEx(subkey, "InstallLocation")[0]
|
||||
except OSError:
|
||||
continue
|
||||
except OSError:
|
||||
continue
|
||||
return None
|
||||
|
||||
|
||||
def download_update(latest_version):
|
||||
import tempfile
|
||||
import time
|
||||
@@ -175,17 +165,13 @@ def download_update(latest_version):
|
||||
response = r.get(url, allow_redirects=True, stream=True)
|
||||
total = int(response.headers.get("content-length", 0))
|
||||
downloaded = 0
|
||||
chunks = []
|
||||
for chunk in response.iter_content(chunk_size=65536):
|
||||
chunks.append(chunk)
|
||||
downloaded += len(chunk)
|
||||
if total > 0:
|
||||
progress.setValue(int(downloaded * 100 / total))
|
||||
QtWidgets.QApplication.processEvents()
|
||||
|
||||
with open(installer_path, "wb") as f:
|
||||
for chunk in chunks:
|
||||
for chunk in response.iter_content(chunk_size=65536):
|
||||
f.write(chunk)
|
||||
downloaded += len(chunk)
|
||||
if total > 0:
|
||||
progress.setValue(int(downloaded * 100 / total))
|
||||
QtWidgets.QApplication.processEvents()
|
||||
|
||||
if not os.path.exists(installer_path):
|
||||
progress.close()
|
||||
@@ -195,8 +181,6 @@ def download_update(latest_version):
|
||||
progress.setValue(100)
|
||||
QtWidgets.QApplication.processEvents()
|
||||
|
||||
# Launch installer and exit — the installer will close this process,
|
||||
# install the update, and relaunch the app via its [Run] section.
|
||||
subprocess.Popen([installer_path, "/VERYSILENT", "/SUPPRESSMSGBOXES", "/SP-", "/CLOSEAPPLICATIONS"])
|
||||
time.sleep(1)
|
||||
sys.exit(0)
|
||||
@@ -265,15 +249,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
self.searchbar.setMinimumHeight(30)
|
||||
self.searchbar.returnPressed.connect(self._start_search)
|
||||
|
||||
self._spinner_label = QLabel()
|
||||
self._spinner_label.setFixedSize(20, 20)
|
||||
self._spinner_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||
self._spinner_label.hide()
|
||||
self._spinner_angle = 0
|
||||
self._spinner_timer = QTimer()
|
||||
self._spinner_timer.setInterval(80)
|
||||
self._spinner_timer.timeout.connect(self._update_spinner)
|
||||
|
||||
self.dlbutton = QtWidgets.QPushButton("Download")
|
||||
self.dlbutton.setCursor(Qt.CursorShape.PointingHandCursor)
|
||||
self.libraryList = QListWidget()
|
||||
@@ -358,7 +333,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
|
||||
search_row = QHBoxLayout()
|
||||
search_row.addWidget(self.searchbar)
|
||||
search_row.addWidget(self._spinner_label)
|
||||
containerLayout.addLayout(search_row)
|
||||
containerLayout.addWidget(state.tracker_list[state.tracker])
|
||||
|
||||
@@ -484,21 +458,27 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
|
||||
class HoverRowDelegate(QStyledItemDelegate):
|
||||
def paint(self, painter, option, index):
|
||||
opt = QtWidgets.QStyleOptionViewItem(option)
|
||||
opt.state &= ~QtWidgets.QStyle.StateFlag.State_HasFocus
|
||||
opt.state &= ~QtWidgets.QStyle.StateFlag.State_Selected
|
||||
if index.row() == MainWindow._instance._hovered_row:
|
||||
painter.save()
|
||||
painter.fillRect(option.rect, _theme_colors()["hover"])
|
||||
painter.fillRect(opt.rect, _theme_colors()["hover"])
|
||||
painter.restore()
|
||||
super().paint(painter, option, index)
|
||||
super().paint(painter, opt, index)
|
||||
|
||||
class PauseResumeDelegate(QStyledItemDelegate):
|
||||
clicked = Signal(int)
|
||||
|
||||
def paint(self, painter, option, index):
|
||||
opt = QtWidgets.QStyleOptionViewItem(option)
|
||||
opt.state &= ~QtWidgets.QStyle.StateFlag.State_HasFocus
|
||||
opt.state &= ~QtWidgets.QStyle.StateFlag.State_Selected
|
||||
if index.row() == MainWindow._instance._hovered_row:
|
||||
painter.save()
|
||||
painter.fillRect(option.rect, _theme_colors()["hover"])
|
||||
painter.fillRect(opt.rect, _theme_colors()["hover"])
|
||||
painter.restore()
|
||||
super().paint(painter, option, index)
|
||||
super().paint(painter, opt, index)
|
||||
|
||||
def setEditorData(self, editor, index):
|
||||
button = editor.findChild(QtWidgets.QPushButton)
|
||||
@@ -723,10 +703,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
self.context_menu.addAction("Delete File", self.deleteFileAction)
|
||||
|
||||
def _start_search(self):
|
||||
self._spinner_label.show()
|
||||
self._spinner_angle = 0
|
||||
self._spinner_timer.start()
|
||||
self._update_spinner()
|
||||
self.searchbar.setEnabled(False)
|
||||
def _search_thread():
|
||||
try:
|
||||
@@ -736,18 +712,9 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
run_thread(threading.Thread(target=_search_thread))
|
||||
|
||||
def _on_search_finished(self):
|
||||
self._spinner_timer.stop()
|
||||
self._spinner_label.hide()
|
||||
self.searchbar.setEnabled(True)
|
||||
self.searchbar.setFocus()
|
||||
|
||||
def _update_spinner(self):
|
||||
frames = ["◐", "◓", "◑", "◒"]
|
||||
idx = (self._spinner_angle // 1) % len(frames)
|
||||
self._spinner_label.setText(frames[idx])
|
||||
self._spinner_label.setStyleSheet("font-size: 16px; color: gray;")
|
||||
self._spinner_angle += 1
|
||||
|
||||
@staticmethod
|
||||
def add_log(text):
|
||||
if MainWindow._instance:
|
||||
|
||||
@@ -50,7 +50,7 @@ def return_pressed(self):
|
||||
|
||||
elif state.tracker is not None:
|
||||
state.posts = scrapers[state.tracker](search_text)
|
||||
if state.posts == []:
|
||||
if not state.posts:
|
||||
consoleLog(f"No Results for {search_text}")
|
||||
state.tracker_list[state.tracker].clear()
|
||||
self.show_empty_results(True)
|
||||
|
||||
@@ -74,10 +74,13 @@ def add_download(magnet_uri, dl_path=state.download_path):
|
||||
consoleLog("Skipping Downloading, download already running... ")
|
||||
return False
|
||||
|
||||
magnetdl = lt.parse_magnet_uri(magnet_uri)
|
||||
magnetdl.save_path = dl_path
|
||||
|
||||
download = state.dl_session.add_torrent(magnetdl)
|
||||
try:
|
||||
magnetdl = lt.parse_magnet_uri(magnet_uri)
|
||||
magnetdl.save_path = dl_path
|
||||
download = state.dl_session.add_torrent(magnetdl)
|
||||
except Exception as e:
|
||||
consoleLog(f"Failed to add torrent: {e}")
|
||||
return False
|
||||
state.active_downloads[magnet_uri] = download
|
||||
consoleLog(f"Added {magnet_uri} to downloads")
|
||||
|
||||
@@ -95,10 +98,13 @@ def add_seed(magnet_uri, file_path):
|
||||
consoleLog("Already seeding this torrent")
|
||||
return False
|
||||
|
||||
magnetdl = lt.parse_magnet_uri(magnet_uri)
|
||||
magnetdl.save_path = os.path.dirname(file_path)
|
||||
|
||||
handle = state.dl_session.add_torrent(magnetdl)
|
||||
try:
|
||||
magnetdl = lt.parse_magnet_uri(magnet_uri)
|
||||
magnetdl.save_path = os.path.dirname(file_path)
|
||||
handle = state.dl_session.add_torrent(magnetdl)
|
||||
except Exception as e:
|
||||
consoleLog(f"Failed to add seed: {e}")
|
||||
return False
|
||||
state.active_downloads[magnet_uri] = handle
|
||||
state.seeded_magnets.add(magnet_uri)
|
||||
return True
|
||||
|
||||
@@ -30,7 +30,7 @@ def get_item_url(item, posts, post_titles): # softwarelist currentitem, post lis
|
||||
|
||||
def get_magnet_link(post_url):
|
||||
try:
|
||||
response = requests.get(post_url) # eventually impl. cloudscraper
|
||||
response = requests.get(post_url, timeout=15) # eventually impl. cloudscraper
|
||||
consoleLog("Sent Request to retrieve Magnet Link...")
|
||||
response.raise_for_status()
|
||||
soup = BeautifulSoup(response.text, 'html.parser')
|
||||
|
||||
@@ -22,7 +22,10 @@ def check_downloads(downloads):
|
||||
for download in downloads:
|
||||
if os.path.exists(download.path):
|
||||
consoleLog(f"Existing Download: {download.title}")
|
||||
seed_magnet(download.magnet_uri, download.path)
|
||||
try:
|
||||
seed_magnet(download.magnet_uri, download.path)
|
||||
except Exception as e:
|
||||
consoleLog(f"Failed to seed {download.title}: {e}")
|
||||
else:
|
||||
consoleLog(f"Inexistent Download: {download.title}")
|
||||
remove_download_log(download.magnet_uri)
|
||||
|
||||
@@ -89,7 +89,7 @@ def _remove_download_log_inner(magnet_uri) -> DownloadList:
|
||||
|
||||
|
||||
magnet_link = (magnet_uri or "").strip()
|
||||
title = next((getattr(d, 'title', 'Unknown') for d in downloads if (getattr(d, 'magnet_uri', None) or '').strip() == magnet_link or (getattr(d, 'url', None) or '').strip() == magnet_link))
|
||||
title = next((getattr(d, 'title', 'Unknown') for d in downloads if (getattr(d, 'magnet_uri', None) or '').strip() == magnet_link or (getattr(d, 'url', None) or '').strip() == magnet_link), 'Unknown')
|
||||
downloads = [d for d in downloads if (getattr(d, 'magnet_uri', None) or "").strip() != magnet_link and (getattr(d, 'url', None) or "").strip() != magnet_link]
|
||||
|
||||
consoleLog(f"Removed {title} from Log File")
|
||||
|
||||
@@ -4,11 +4,11 @@ from core.utils.logging.logs import consoleLog
|
||||
|
||||
def check_for_updates():
|
||||
url = f"https://api.github.com/repos/KeksPirates/SoftwareManager/releases"
|
||||
response = requests.get(url)
|
||||
response = requests.get(url, timeout=15)
|
||||
|
||||
if response.status_code != 200:
|
||||
consoleLog(f"Failed to fetch releases: {response.status_code}")
|
||||
exit(1)
|
||||
return None, None
|
||||
|
||||
releases = response.json()
|
||||
releases.sort(key=lambda r: r["published_at"], reverse=True)
|
||||
|
||||
+2
-1
@@ -56,7 +56,8 @@ def main():
|
||||
consoleLog("Started Thread: check_completed")
|
||||
run_thread(threading.Thread(target=check_deleted_files, args=(shutdown_event,), daemon=True))
|
||||
consoleLog("Started Thread: check_deleted_files")
|
||||
check_downloads(downloads)
|
||||
run_thread(threading.Thread(target=check_downloads, args=(downloads,)))
|
||||
consoleLog("Started Thread: check_downloads")
|
||||
elapsed = time.perf_counter() - start_time
|
||||
consoleLog(f"Initialization completed in {elapsed:.2f}s. Launching GUI")
|
||||
run_gui()
|
||||
|
||||
Reference in New Issue
Block a user