mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-04 01:49:42 +02:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e95ad11672 | |||
| 62c6afe350 | |||
| 1aaf56a4dc | |||
| 47b643d68b | |||
| de1c8577d6 |
+12
-18
@@ -28,8 +28,8 @@ jobs:
|
|||||||
artifact_name: SoftwareManager-dev-${{ github.sha }}-linux
|
artifact_name: SoftwareManager-dev-${{ github.sha }}-linux
|
||||||
asset_name: SoftwareManager-dev-${{ github.sha }}-linux
|
asset_name: SoftwareManager-dev-${{ github.sha }}-linux
|
||||||
- os: windows-latest
|
- os: windows-latest
|
||||||
artifact_name: SoftwareManager-dev-${{ github.sha }}-windows.zip
|
artifact_name: SoftwareManager-dev-${{ github.sha }}-windows.exe
|
||||||
asset_name: SoftwareManager-dev-${{ github.sha }}-windows.zip
|
asset_name: SoftwareManager-dev-${{ github.sha }}-windows.exe
|
||||||
- os: macos-latest
|
- os: macos-latest
|
||||||
artifact_name: SoftwareManager-dev-${{ github.sha }}-macos
|
artifact_name: SoftwareManager-dev-${{ github.sha }}-macos
|
||||||
asset_name: SoftwareManager-dev-${{ github.sha }}-macos
|
asset_name: SoftwareManager-dev-${{ github.sha }}-macos
|
||||||
@@ -86,7 +86,7 @@ jobs:
|
|||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
pyinstaller --onedir --windowed \
|
pyinstaller --onefile --windowed \
|
||||||
--add-data "build_info.json;." \
|
--add-data "build_info.json;." \
|
||||||
--add-data "build_info.json;core" \
|
--add-data "build_info.json;core" \
|
||||||
--add-data "build_info.json;core/interface" \
|
--add-data "build_info.json;core/interface" \
|
||||||
@@ -122,21 +122,15 @@ jobs:
|
|||||||
--name ${{ env.APP_NAME }} \
|
--name ${{ env.APP_NAME }} \
|
||||||
main.py
|
main.py
|
||||||
|
|
||||||
- name: Package and rename artifact (Windows)
|
- name: Make executable (Unix)
|
||||||
if: runner.os == 'Windows'
|
|
||||||
shell: powershell
|
|
||||||
run: |
|
|
||||||
cd dist
|
|
||||||
Compress-Archive -Path '${{ env.APP_NAME }}' -DestinationPath '${{ matrix.artifact_name }}'
|
|
||||||
ls -la
|
|
||||||
|
|
||||||
- name: Rename artifact (Unix)
|
|
||||||
if: runner.os != 'Windows'
|
if: runner.os != 'Windows'
|
||||||
|
run: chmod +x dist/${{ env.APP_NAME }}
|
||||||
|
|
||||||
|
- name: Rename artifact
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
cd dist
|
cd dist
|
||||||
chmod +x ${{ env.APP_NAME }}
|
mv ${{ env.APP_NAME }}${{ runner.os == 'Windows' && '.exe' || '' }} ${{ matrix.artifact_name }}
|
||||||
mv ${{ env.APP_NAME }} ${{ matrix.artifact_name }}
|
|
||||||
ls -la
|
ls -la
|
||||||
|
|
||||||
- name: Upload build artifact
|
- name: Upload build artifact
|
||||||
@@ -163,7 +157,7 @@ jobs:
|
|||||||
mkdir -p release
|
mkdir -p release
|
||||||
SHORT_SHA="${{ needs.build.outputs.short_sha }}"
|
SHORT_SHA="${{ needs.build.outputs.short_sha }}"
|
||||||
cp artifacts/ubuntu-22.04-build/SoftwareManager-dev-*-linux release/SoftwareManager-dev-${SHORT_SHA}-linux
|
cp artifacts/ubuntu-22.04-build/SoftwareManager-dev-*-linux release/SoftwareManager-dev-${SHORT_SHA}-linux
|
||||||
cp artifacts/windows-latest-build/SoftwareManager-dev-*-windows.zip release/SoftwareManager-dev-${SHORT_SHA}-windows.zip
|
cp artifacts/windows-latest-build/SoftwareManager-dev-*-windows.exe release/SoftwareManager-dev-${SHORT_SHA}-windows.exe
|
||||||
cp artifacts/macos-latest-build/SoftwareManager-dev-*-macos release/SoftwareManager-dev-${SHORT_SHA}-macos
|
cp artifacts/macos-latest-build/SoftwareManager-dev-*-macos release/SoftwareManager-dev-${SHORT_SHA}-macos
|
||||||
chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos
|
chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos
|
||||||
ls -la release/
|
ls -la release/
|
||||||
@@ -181,7 +175,7 @@ jobs:
|
|||||||
|
|
||||||
### Downloads
|
### Downloads
|
||||||
- Linux: \`SoftwareManager-dev-${SHORT_SHA}-linux\`
|
- Linux: \`SoftwareManager-dev-${SHORT_SHA}-linux\`
|
||||||
- Windows: \`SoftwareManager-dev-${SHORT_SHA}-windows.zip\`
|
- Windows: \`SoftwareManager-dev-${SHORT_SHA}-windows.exe\`
|
||||||
- macOS: \`SoftwareManager-dev-${SHORT_SHA}-macos\`
|
- macOS: \`SoftwareManager-dev-${SHORT_SHA}-macos\`
|
||||||
EOF
|
EOF
|
||||||
cat release_notes.md
|
cat release_notes.md
|
||||||
@@ -194,7 +188,7 @@ jobs:
|
|||||||
body_path: release_notes.md
|
body_path: release_notes.md
|
||||||
files: |
|
files: |
|
||||||
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-linux
|
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-linux
|
||||||
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.zip
|
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.exe
|
||||||
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos
|
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
+74
-12
@@ -18,7 +18,7 @@ from PySide6.QtWidgets import (
|
|||||||
QStyledItemDelegate,
|
QStyledItemDelegate,
|
||||||
)
|
)
|
||||||
|
|
||||||
from PySide6.QtGui import QIcon, QCloseEvent, QImage, QPixmap
|
from PySide6.QtGui import QIcon, QCloseEvent, QImage, QPixmap, QContextMenuEvent
|
||||||
import darkdetect
|
import darkdetect
|
||||||
import threading
|
import threading
|
||||||
import platform
|
import platform
|
||||||
@@ -29,7 +29,7 @@ import libtorrent as lt
|
|||||||
import time
|
import time
|
||||||
import sys
|
import sys
|
||||||
import json
|
import json
|
||||||
from core.utils.general.logs import consoleLog
|
from core.utils.general.logs import consoleLog, remove_download_log
|
||||||
from core.utils.general.wrappers import run_thread
|
from core.utils.general.wrappers import run_thread
|
||||||
from core.utils.data.state import state
|
from core.utils.data.state import state
|
||||||
from core.utils.network.download import download_selected
|
from core.utils.network.download import download_selected
|
||||||
@@ -273,7 +273,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
|||||||
status = magnetdl.status()
|
status = magnetdl.status()
|
||||||
|
|
||||||
if status.state == lt.torrent_status.seeding:
|
if status.state == lt.torrent_status.seeding:
|
||||||
if state.download_path is not None and os.path.exists(state.download_path):
|
if state.download_path and os.path.exists(state.download_path):
|
||||||
if platform.system() == "Windows":
|
if platform.system() == "Windows":
|
||||||
os.startfile(os.path.normpath(state.download_path))
|
os.startfile(os.path.normpath(state.download_path))
|
||||||
elif platform.system() == "Linux":
|
elif platform.system() == "Linux":
|
||||||
@@ -328,7 +328,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
|||||||
layout.addStretch()
|
layout.addStretch()
|
||||||
widget.setLayout(layout)
|
widget.setLayout(layout)
|
||||||
return widget
|
return widget
|
||||||
|
|
||||||
def editorEvent(self, event, model, option, index):
|
def editorEvent(self, event, model, option, index):
|
||||||
if index.column() == 0 and event.type() == QEvent.Type.MouseButtonPress:
|
if index.column() == 0 and event.type() == QEvent.Type.MouseButtonPress:
|
||||||
self.clicked.emit(index.row())
|
self.clicked.emit(index.row())
|
||||||
@@ -377,7 +376,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
|||||||
self.horizontal_layout.addWidget(self.qtablewidget)
|
self.horizontal_layout.addWidget(self.qtablewidget)
|
||||||
|
|
||||||
self.tab1 = create_tab("Search", self.searchbar, self.qtablewidget, 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.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)
|
self.tab3 = create_tab("Downloads", self.emptyDownload, self.downloadList, self.tabs, None, None)
|
||||||
|
|
||||||
if state.image_path is not None and os.path.exists(state.image_path):
|
if state.image_path is not None and os.path.exists(state.image_path):
|
||||||
@@ -405,7 +404,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
|||||||
|
|
||||||
self.tracker_list = QComboBox()
|
self.tracker_list = QComboBox()
|
||||||
self.tracker_list.addItems(["rutracker", "uztracker", "m0nkrus"])
|
self.tracker_list.addItems(["rutracker", "uztracker", "m0nkrus"])
|
||||||
self.tracker_list.setCursor(Qt.PointingHandCursor)
|
self.tracker_list.setCursor(Qt.CursorShape.PointingHandCursor)
|
||||||
self.tracker_list.activated.connect(self.set_tracker)
|
self.tracker_list.activated.connect(self.set_tracker)
|
||||||
self.corner_layout.addWidget(self.tracker_list)
|
self.corner_layout.addWidget(self.tracker_list)
|
||||||
|
|
||||||
@@ -417,16 +416,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
|||||||
else:
|
else:
|
||||||
self.settings_btn.setIcon(QIcon(get_asset_path("settings_black.png")))
|
self.settings_btn.setIcon(QIcon(get_asset_path("settings_black.png")))
|
||||||
self.settings_btn.setToolTip("Settings")
|
self.settings_btn.setToolTip("Settings")
|
||||||
self.settings_btn.setCursor(Qt.PointingHandCursor)
|
self.settings_btn.setCursor(Qt.CursorShape.PointingHandCursor)
|
||||||
self.settings_btn.clicked.connect(lambda: settings_dialog(self))
|
self.settings_btn.clicked.connect(lambda: settings_dialog(self))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
self.corner_layout.addWidget(self.settings_btn)
|
self.corner_layout.addWidget(self.settings_btn)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
self.tab_wrapper = QWidget()
|
self.tab_wrapper = QWidget()
|
||||||
self.tab_layout = QVBoxLayout()
|
self.tab_layout = QVBoxLayout()
|
||||||
self.tab_layout.setContentsMargins(0, 0, 0, 0)
|
self.tab_layout.setContentsMargins(0, 0, 0, 0)
|
||||||
@@ -463,6 +457,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
|||||||
self.active_timer.timeout.connect(self.show_empty_downloads)
|
self.active_timer.timeout.connect(self.show_empty_downloads)
|
||||||
self.active_timer.start(500)
|
self.active_timer.start(500)
|
||||||
|
|
||||||
|
self.context_menu = QtWidgets.QMenu(self)
|
||||||
|
self.context_menu.addAction("Open Containing Folder", self.openFolderAction)
|
||||||
|
self.context_menu.addAction("Copy Magnet URI", self.copyMagnetURIAction)
|
||||||
|
self.context_menu.addAction("Cancel Download", self.cancelDownload)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def add_log(text):
|
def add_log(text):
|
||||||
if MainWindow._instance:
|
if MainWindow._instance:
|
||||||
@@ -519,3 +518,66 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
|||||||
super().resizeEvent(event)
|
super().resizeEvent(event)
|
||||||
table_width = self.qtablewidget.viewport().width()
|
table_width = self.qtablewidget.viewport().width()
|
||||||
self.qtablewidget.setColumnWidth(1, int(table_width * 0.3))
|
self.qtablewidget.setColumnWidth(1, int(table_width * 0.3))
|
||||||
|
|
||||||
|
def contextMenuEvent(self, event: QContextMenuEvent):
|
||||||
|
if self.downloadList.underMouse():
|
||||||
|
pos = self.downloadList.viewport().mapFromGlobal(event.globalPos())
|
||||||
|
index = self.downloadList.indexAt(pos)
|
||||||
|
|
||||||
|
if index.isValid():
|
||||||
|
row = index.row()
|
||||||
|
self._context_menu_row = row
|
||||||
|
self.context_menu.exec(event.globalPos())
|
||||||
|
else:
|
||||||
|
super().contextMenuEvent(event)
|
||||||
|
|
||||||
|
def openFolderAction(self):
|
||||||
|
if not hasattr(self, '_context_menu_row'):
|
||||||
|
return
|
||||||
|
|
||||||
|
row = self._context_menu_row
|
||||||
|
if row < 0 or row >= len(state.active_downloads):
|
||||||
|
return
|
||||||
|
|
||||||
|
magnet_link = list(state.active_downloads.keys())[row]
|
||||||
|
magnetdl = state.active_downloads[magnet_link]
|
||||||
|
|
||||||
|
download_path = magnetdl.save_path()
|
||||||
|
|
||||||
|
if download_path and os.path.exists(download_path):
|
||||||
|
if platform.system() == "Windows":
|
||||||
|
os.startfile(os.path.normpath(download_path))
|
||||||
|
elif platform.system() == "Linux":
|
||||||
|
subprocess.Popen(["xdg-open", download_path])
|
||||||
|
elif platform.system() == "Darwin":
|
||||||
|
subprocess.Popen(["open", download_path])
|
||||||
|
|
||||||
|
def copyMagnetURIAction(self):
|
||||||
|
if not hasattr(self, '_context_menu_row'):
|
||||||
|
return
|
||||||
|
|
||||||
|
row = self._context_menu_row
|
||||||
|
if row < 0 or row >= len(state.active_downloads):
|
||||||
|
return
|
||||||
|
|
||||||
|
magnet_link = list(state.active_downloads.keys())[row]
|
||||||
|
|
||||||
|
clipboard = QtWidgets.QApplication.clipboard()
|
||||||
|
clipboard.setText(magnet_link)
|
||||||
|
|
||||||
|
def cancelDownload(self):
|
||||||
|
if not hasattr(self, '_context_menu_row'):
|
||||||
|
return
|
||||||
|
|
||||||
|
row = self._context_menu_row
|
||||||
|
if row < 0 or row >= len(state.active_downloads):
|
||||||
|
return
|
||||||
|
|
||||||
|
magnet_link = list(state.active_downloads.keys())[row]
|
||||||
|
magnetdl = state.active_downloads[magnet_link]
|
||||||
|
|
||||||
|
confirm = QMessageBox.question(self, "Cancel Download", f"Are you sure you want to cancel the download of '{magnetdl.status().name}'?", QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
|
||||||
|
if confirm == QMessageBox.StandardButton.Yes:
|
||||||
|
del state.active_downloads[magnet_link]
|
||||||
|
remove_download_log(magnet_link)
|
||||||
|
consoleLog(f"Cancelled download: {magnetdl.status().name}", True)
|
||||||
|
|||||||
@@ -41,6 +41,30 @@ def add_download_log(title, url, magnet_uri, completed) -> DownloadList:
|
|||||||
|
|
||||||
return download_list
|
return download_list
|
||||||
|
|
||||||
|
def remove_download_log(magnet_uri) -> DownloadList:
|
||||||
|
downloads_file = os.path.join(state.settings_path, "downloads.json")
|
||||||
|
|
||||||
|
if os.path.exists(downloads_file) and os.path.getsize(downloads_file) > 0:
|
||||||
|
try:
|
||||||
|
with open(downloads_file, "r") as file:
|
||||||
|
existing_data = json.load(file)
|
||||||
|
downloads = [Download(**d) for d in existing_data.get("data", [])]
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
downloads = []
|
||||||
|
else:
|
||||||
|
downloads = []
|
||||||
|
|
||||||
|
magnet_link = (magnet_uri or "").strip()
|
||||||
|
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 {magnet_link} from Log File")
|
||||||
|
|
||||||
|
download_list = DownloadList(data=downloads, count=len(downloads))
|
||||||
|
with open(downloads_file, "w") as file:
|
||||||
|
json.dump(asdict(download_list), file, indent=4)
|
||||||
|
|
||||||
|
return download_list
|
||||||
|
|
||||||
def update_download_completed(magnet_uri, completed) -> DownloadList:
|
def update_download_completed(magnet_uri, completed) -> DownloadList:
|
||||||
downloads_file = os.path.join(state.settings_path, "downloads.json")
|
downloads_file = os.path.join(state.settings_path, "downloads.json")
|
||||||
|
|
||||||
@@ -176,4 +200,4 @@ def consoleLog(text, printAnyways = False):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
if state.debug or printAnyways:
|
if state.debug or printAnyways:
|
||||||
print(f"[{current_time}] {text}")
|
print(f"[{current_time}] {text}")
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import sys
|
|||||||
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
parser.add_argument("--debug", action="store_true")
|
parser.add_argument("--debug", action="store_true")
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
def run_gui():
|
def run_gui():
|
||||||
@@ -28,7 +28,7 @@ def run_gui():
|
|||||||
|
|
||||||
if state.window_transparency and platform.system() != "Windows":
|
if state.window_transparency and platform.system() != "Windows":
|
||||||
widget.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
|
widget.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
|
||||||
widget.setStyleSheet("MainWindow { background: transparent; }")
|
qdarktheme.setup_theme("auto", custom_colors={"background": "#00000000"})
|
||||||
|
|
||||||
from core.utils.general.logs import set_main_window
|
from core.utils.general.logs import set_main_window
|
||||||
set_main_window(widget)
|
set_main_window(widget)
|
||||||
|
|||||||
Reference in New Issue
Block a user