mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-03 17:39:42 +02:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a11c1d7129 | |||
| dcc78ade44 | |||
| 10e80ab4b6 | |||
| 3290ff3fac | |||
| d5d99d6a0e | |||
| 3960612f94 | |||
| a37a47b65b |
+29
-16
@@ -15,8 +15,11 @@ from PySide6.QtWidgets import (
|
||||
QProgressBar,
|
||||
QHeaderView,
|
||||
QMessageBox,
|
||||
QTableWidget,
|
||||
QTableWidgetItem
|
||||
)
|
||||
from PySide6.QtGui import QIcon, QAction, QCloseEvent
|
||||
|
||||
from PySide6.QtGui import QIcon, QAction, QCloseEvent, QPalette
|
||||
import darkdetect
|
||||
import threading
|
||||
import platform
|
||||
@@ -56,7 +59,6 @@ def download_update(latest_version):
|
||||
class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
searchresults = []
|
||||
|
||||
# Check for updates on Windows
|
||||
if platform.system() == "Windows":
|
||||
@@ -89,8 +91,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
self.searchbar.returnPressed.connect(lambda: run_thread(threading.Thread(target=return_pressed, args=(self,)))) # Triggers data function thread on enter
|
||||
|
||||
self.dlbutton = QtWidgets.QPushButton("Download")
|
||||
self.softwareList = QListWidget()
|
||||
self.post_author_list = QListWidget()
|
||||
self.libraryList = QListWidget()
|
||||
|
||||
self.emptyResults = QLabel("No Results")
|
||||
@@ -103,14 +103,24 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
self.emptyLibrary = QLabel("No items in library.")
|
||||
self.emptyDownload = QLabel("No items in downloads.")
|
||||
self.progressbar = QProgressBar()
|
||||
self.qtablewidget = QTableWidget()
|
||||
|
||||
self.qtablewidget.setColumnCount(2)
|
||||
self.qtablewidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
|
||||
self.qtablewidget.verticalHeader().setVisible(False)
|
||||
self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
|
||||
self.qtablewidget.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
|
||||
self.qtablewidget.setAttribute(Qt.WA_TranslucentBackground)
|
||||
self.qtablewidget.viewport().setAttribute(Qt.WA_TranslucentBackground)
|
||||
|
||||
header = self.qtablewidget.horizontalHeader()
|
||||
header.setSectionResizeMode(1, QHeaderView.Fixed)
|
||||
header.resizeSection(1, 500)
|
||||
|
||||
container = QWidget()
|
||||
containerLayout = QVBoxLayout()
|
||||
containerLayout.addWidget(self.searchbar)
|
||||
|
||||
containerLayout.addWidget(self.softwareList)
|
||||
containerLayout.addWidget(self.post_author_list)
|
||||
self.softwareList.addItems(searchresults)
|
||||
containerLayout.addWidget(self.qtablewidget)
|
||||
|
||||
class DownloadModel(QAbstractTableModel):
|
||||
def __init__(self):
|
||||
@@ -152,9 +162,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
self.downloadList.horizontalHeader().setStretchLastSection(False)
|
||||
self.downloadList.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
|
||||
self.downloadList.setSelectionBehavior(QTableView.SelectRows)
|
||||
self.downloadList.setAttribute(Qt.WA_TranslucentBackground)
|
||||
self.downloadList.viewport().setAttribute(Qt.WA_TranslucentBackground)
|
||||
|
||||
# download button triggers
|
||||
self.dlbutton.clicked.connect(lambda: run_thread(threading.Thread(target=download_selected, args=(self.softwareList.currentItem(), state.posts, state.post_titles))))
|
||||
self.dlbutton.clicked.connect(lambda: run_thread(threading.Thread(target=download_selected, args=(self.qtablewidget.currentItem(), state.posts, state.post_titles))))
|
||||
|
||||
container.setLayout(containerLayout)
|
||||
self.setCentralWidget(container)
|
||||
@@ -163,13 +175,14 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
self.tabs = QTabWidget()
|
||||
|
||||
self.horizontal_layout = QHBoxLayout()
|
||||
self.horizontal_layout.addWidget(self.softwareList, stretch=3)
|
||||
self.horizontal_layout.addWidget(self.emptyResults, stretch=3)
|
||||
self.horizontal_layout.addWidget(self.post_author_list)
|
||||
self.horizontal_layout.addWidget(self.qtablewidget)
|
||||
|
||||
self.tab1 = create_tab("Search", self.searchbar, self.softwareList, self.tabs, self.dlbutton, self.horizontal_layout)
|
||||
self.tab1 = create_tab("Search", self.searchbar, self.qtablewidget, self.tabs, self.dlbutton, self.horizontal_layout)
|
||||
self.tab2 = create_tab("Library", self.emptyLibrary, self.libraryList, self.tabs, None, None)
|
||||
self.tab3 = create_tab("Downloads", self.emptyDownload, self.downloadList, self.tabs, None, None)
|
||||
|
||||
|
||||
|
||||
containerLayout.addWidget(self.tabs)
|
||||
|
||||
@@ -184,9 +197,9 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
self.tracker_list.activated.connect(self.set_tracker)
|
||||
|
||||
if darkdetect.isDark():
|
||||
settings_action = QAction(QIcon("core/interface/assets/settings_dark.png"), "Settings", self)
|
||||
settings_action = QAction(QIcon("core/interface/assets/settings_white.png"), "Settings", self)
|
||||
else:
|
||||
settings_action = QAction(QIcon("core/interface/assets/settings.png"), "Settings", self)
|
||||
settings_action = QAction(QIcon("core/interface/assets/settings_black.png"), "Settings", self)
|
||||
|
||||
settings_action.triggered.connect(lambda: settings_dialog(self))
|
||||
toolbar.addAction(settings_action)
|
||||
@@ -223,8 +236,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
||||
|
||||
def show_empty_results(self, show: bool):
|
||||
if show:
|
||||
self.softwareList.hide()
|
||||
self.qtablewidget.hide()
|
||||
self.emptyResults.show()
|
||||
else:
|
||||
self.emptyResults.hide()
|
||||
self.softwareList.show()
|
||||
self.qtablewidget.show()
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
from PySide6.QtWidgets import QTableWidgetItem
|
||||
from core.data.scrapers.uztracker import scrape_uztracker
|
||||
from core.data.scrapers.rutracker import scrape_rutracker
|
||||
from core.data.scrapers.monkrus import scrape_monkrus_telegram
|
||||
@@ -17,20 +18,24 @@ def return_pressed(self):
|
||||
response = scrape_uztracker(search_text)
|
||||
if response:
|
||||
state.post_titles, state.post_urls = response
|
||||
self.softwareList.clear()
|
||||
self.qtablewidget.clear()
|
||||
if state.post_titles and len(state.post_titles) > 0:
|
||||
self.softwareList.addItems(state.post_titles)
|
||||
self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
|
||||
self.qtablewidget.setRowCount(len(state.post_titles))
|
||||
for i, author in enumerate(state.post_author):
|
||||
self.qtablewidget.setItem(i, 1, QTableWidgetItem(author))
|
||||
for i, title in enumerate(state.post_titles):
|
||||
self.qtablewidget.setItem(i, 0, QTableWidgetItem(title))
|
||||
self.show_empty_results(False)
|
||||
self.post_author_list.clear()
|
||||
else:
|
||||
if state.debug:
|
||||
print(f"No Results for {search_text}")
|
||||
self.softwareList.clear()
|
||||
self.qtablewidget.clear()
|
||||
self.show_empty_results(True)
|
||||
else:
|
||||
if state.debug:
|
||||
print(f"No response from uztracker")
|
||||
self.softwareList.clear()
|
||||
self.qtablewidget.clear()
|
||||
self.show_empty_results(True)
|
||||
|
||||
elif state.tracker == "rutracker":
|
||||
@@ -40,21 +45,24 @@ def return_pressed(self):
|
||||
if state.posts == []:
|
||||
if state.debug:
|
||||
print(f"No Results for {search_text}")
|
||||
self.softwareList.clear()
|
||||
self.qtablewidget.clear()
|
||||
self.show_empty_results(True)
|
||||
else:
|
||||
state.post_titles, _, state.post_author = format_data(state.posts)
|
||||
self.show_empty_results(False)
|
||||
self.post_author_list.clear()
|
||||
self.post_author_list.addItems(state.post_author)
|
||||
self.softwareList.clear()
|
||||
self.softwareList.addItems(state.post_titles)
|
||||
self.qtablewidget.clear()
|
||||
self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
|
||||
self.qtablewidget.setRowCount(len(state.post_titles))
|
||||
for i, author in enumerate(state.post_author):
|
||||
self.qtablewidget.setItem(i, 1, QTableWidgetItem(author))
|
||||
for i, title in enumerate(state.post_titles):
|
||||
self.qtablewidget.setItem(i, 0, QTableWidgetItem(title))
|
||||
if state.debug == True:
|
||||
print(f"Response Cached: {cached}")
|
||||
else:
|
||||
if state.debug:
|
||||
print(f"No response from rutracker")
|
||||
self.softwareList.clear()
|
||||
self.qtablewidget.clear()
|
||||
self.show_empty_results(True)
|
||||
|
||||
elif state.tracker == "m0nkrus":
|
||||
@@ -63,12 +71,15 @@ def return_pressed(self):
|
||||
if state.posts == []:
|
||||
if state.debug:
|
||||
print(f"No Results for {search_text}")
|
||||
self.softwareList.clear()
|
||||
self.qtablewidget.clear()
|
||||
self.show_empty_results(True)
|
||||
else:
|
||||
state.post_titles, _, state.post_author = format_data(state.posts)
|
||||
self.show_empty_results(False)
|
||||
self.post_author_list.clear()
|
||||
self.post_author_list.addItems(state.post_author)
|
||||
self.softwareList.clear()
|
||||
self.softwareList.addItems(state.post_titles)
|
||||
self.qtablewidget.clear()
|
||||
self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
|
||||
self.qtablewidget.setRowCount(len(state.post_titles))
|
||||
for i, author in enumerate(state.post_author):
|
||||
self.qtablewidget.setItem(i, 1, QTableWidgetItem(author))
|
||||
for i, title in enumerate(state.post_titles):
|
||||
self.qtablewidget.setItem(i, 0, QTableWidgetItem(title))
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
import requests
|
||||
from core.utils.data.state import state
|
||||
|
||||
def check_for_updates():
|
||||
url = f"https://api.github.com/repos/KeksPirates/SoftwareManager/releases"
|
||||
response = requests.get(url)
|
||||
|
||||
if response.status_code != 200:
|
||||
print(f"Failed to fetch releases: {response.status_code}")
|
||||
exit(1)
|
||||
|
||||
releases = response.json()
|
||||
releases.sort(key=lambda r: r["published_at"], reverse=True)
|
||||
|
||||
latest_release = releases[0]
|
||||
latest_version = latest_release["name"]
|
||||
assets = latest_release["assets"]
|
||||
|
||||
|
||||
if state.version == "dev":
|
||||
if state.debug:
|
||||
print("Dev release detected, skipping version check")
|
||||
return None, None
|
||||
elif latest_version != state.version:
|
||||
if state.debug:
|
||||
print(f"New release available: {latest_version}")
|
||||
if assets:
|
||||
if state.debug:
|
||||
print("Assets:")
|
||||
for asset in assets:
|
||||
print(f" - {asset['name']}: {asset['browser_download_url']}")
|
||||
return assets, latest_version
|
||||
else:
|
||||
if state.debug:
|
||||
print("Already up-to-date.")
|
||||
return None, None
|
||||
Reference in New Issue
Block a user