mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-04 09:59:41 +02:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 48ed11c248 | |||
| d672e3d85f | |||
| 564c0f2ac5 | |||
| 8a48c6c730 | |||
| 6432511639 | |||
| 054e1d0aa5 | |||
| 6f7a9e13f4 |
+10
-26
@@ -44,30 +44,22 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v6
|
||||||
with:
|
with:
|
||||||
python-version: ${{ env.PYTHON_VERSION }}
|
python-version: ${{ env.PYTHON_VERSION }}
|
||||||
|
|
||||||
- name: Install system dependencies (Linux)
|
- name: Install uv
|
||||||
if: runner.os == 'Linux'
|
uses: astral-sh/setup-uv@v7
|
||||||
run: |
|
with:
|
||||||
sudo apt-get update
|
version: "0.9.7"
|
||||||
sudo apt-get install -y \
|
enable-cache: true
|
||||||
libxcb-xinerama0 \
|
|
||||||
libxkbcommon-x11-0 \
|
|
||||||
libxcb-cursor0 \
|
|
||||||
libxcb-keysyms1 \
|
|
||||||
libxcb-render-util0 \
|
|
||||||
libxcb-icccm4 \
|
|
||||||
libxcb-image0 \
|
|
||||||
libxcb-shape0 \
|
|
||||||
libxcb-util1
|
|
||||||
|
|
||||||
- name: Install Python dependencies
|
- name: Install Python dependencies
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
uv pip install -r requirements.txt
|
||||||
pip install -r requirements.txt
|
uv pip install pyinstaller backports.tarfile pillow
|
||||||
pip install pyinstaller backports.tarfile pillow
|
env:
|
||||||
|
UV_SYSTEM_PYTHON: 1
|
||||||
|
|
||||||
- name: Generate version
|
- name: Generate version
|
||||||
id: version
|
id: version
|
||||||
@@ -90,13 +82,6 @@ jobs:
|
|||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
- name: Download aria2c (Windows)
|
|
||||||
if: runner.os == 'Windows'
|
|
||||||
run: |
|
|
||||||
mkdir -p deps
|
|
||||||
C:\msys64\usr\bin\wget.exe https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0-win-64bit-build1.zip
|
|
||||||
unzip -j aria2-1.37.0-win-64bit-build1.zip aria2-1.37.0-win-64bit-build1/aria2c.exe -d deps/
|
|
||||||
|
|
||||||
- name: Build executable with PyInstaller (Windows)
|
- name: Build executable with PyInstaller (Windows)
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -105,7 +90,6 @@ jobs:
|
|||||||
--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" \
|
||||||
--add-data "deps/aria2c.exe;." \
|
|
||||||
--add-data "core/interface/assets;core/interface/assets" \
|
--add-data "core/interface/assets;core/interface/assets" \
|
||||||
--icon "core/interface/assets/logo.png" \
|
--icon "core/interface/assets/logo.png" \
|
||||||
--exclude-module PyQt6 \
|
--exclude-module PyQt6 \
|
||||||
|
|||||||
@@ -60,31 +60,6 @@ def settings_dialog(self):
|
|||||||
autoresume_layout.addWidget(autoresume_checkbox)
|
autoresume_layout.addWidget(autoresume_checkbox)
|
||||||
dialog.layout().addWidget(autoresume_container)
|
dialog.layout().addWidget(autoresume_container)
|
||||||
|
|
||||||
#####################
|
|
||||||
# DOWNLOAD SETTINGS #
|
|
||||||
#####################
|
|
||||||
thread_box = QSpinBox()
|
|
||||||
thread_box.setMinimum(1)
|
|
||||||
thread_box.setMaximum(16)
|
|
||||||
thread_box.setValue(state.aria2_threads)
|
|
||||||
|
|
||||||
|
|
||||||
# container for tight space
|
|
||||||
thread_container = QWidget()
|
|
||||||
thread_layout = QHBoxLayout()
|
|
||||||
|
|
||||||
thread_layout.addWidget(QLabel("Threads:"))
|
|
||||||
thread_layout.addWidget(thread_box)
|
|
||||||
thread_container.setLayout(thread_layout)
|
|
||||||
thread_container.setMaximumHeight(80)
|
|
||||||
|
|
||||||
|
|
||||||
# Dimensions
|
|
||||||
thread_box.setFixedWidth(90)
|
|
||||||
thread_box.setFixedHeight(30)
|
|
||||||
|
|
||||||
dialog.layout().addWidget(thread_container)
|
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# SERVER SETTING #
|
# SERVER SETTING #
|
||||||
##################
|
##################
|
||||||
@@ -124,6 +99,30 @@ def settings_dialog(self):
|
|||||||
download_path_layout.addWidget(browse_button)
|
download_path_layout.addWidget(browse_button)
|
||||||
browse_button.clicked.connect(browse_download_path)
|
browse_button.clicked.connect(browse_download_path)
|
||||||
|
|
||||||
|
###############
|
||||||
|
# IMAGE PATH #
|
||||||
|
###############
|
||||||
|
|
||||||
|
image_path_container = QWidget()
|
||||||
|
image_path_layout = QHBoxLayout()
|
||||||
|
|
||||||
|
image_path = QLineEdit()
|
||||||
|
image_path_layout.addWidget(QLabel("Image Path (requires restart):"))
|
||||||
|
image_path_layout.addWidget(image_path)
|
||||||
|
image_path_container.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
|
||||||
|
image_path_container.setLayout(image_path_layout)
|
||||||
|
image_path.setText(state.image_path)
|
||||||
|
dialog.layout().addWidget(image_path_container)
|
||||||
|
|
||||||
|
def browse_image_path():
|
||||||
|
file_path = QFileDialog.getOpenFileName(dialog, "Select Image File", state.image_path, "Image Files (*.png *.jpg)")[0]
|
||||||
|
if file_path:
|
||||||
|
image_path.setText(file_path)
|
||||||
|
|
||||||
|
browse_button = QPushButton("📁")
|
||||||
|
image_path_layout.addWidget(browse_button)
|
||||||
|
browse_button.clicked.connect(browse_image_path)
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# SPEED LIMITING #
|
# SPEED LIMITING #
|
||||||
##################
|
##################
|
||||||
@@ -192,31 +191,6 @@ def settings_dialog(self):
|
|||||||
max_downloads.setFixedHeight(30)
|
max_downloads.setFixedHeight(30)
|
||||||
dialog.layout().addWidget(max_downloads_container)
|
dialog.layout().addWidget(max_downloads_container)
|
||||||
|
|
||||||
|
|
||||||
###############
|
|
||||||
# IMAGE PATH #
|
|
||||||
###############
|
|
||||||
|
|
||||||
image_path_container = QWidget()
|
|
||||||
image_path_layout = QHBoxLayout()
|
|
||||||
|
|
||||||
image_path = QLineEdit()
|
|
||||||
image_path_layout.addWidget(QLabel("Image Path (requires restart):"))
|
|
||||||
image_path_layout.addWidget(image_path)
|
|
||||||
image_path_container.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
|
|
||||||
image_path_container.setLayout(image_path_layout)
|
|
||||||
image_path.setText(state.image_path)
|
|
||||||
dialog.layout().addWidget(image_path_container)
|
|
||||||
|
|
||||||
def browse_image_path():
|
|
||||||
file_path = QFileDialog.getOpenFileName(dialog, "Select Image File", state.image_path, "Image Files (*.png *.jpg)")[0]
|
|
||||||
if file_path:
|
|
||||||
image_path.setText(file_path)
|
|
||||||
|
|
||||||
browse_button = QPushButton("📁")
|
|
||||||
image_path_layout.addWidget(browse_button)
|
|
||||||
browse_button.clicked.connect(browse_image_path)
|
|
||||||
|
|
||||||
###############
|
###############
|
||||||
# SAVE/CANCEL #
|
# SAVE/CANCEL #
|
||||||
###############
|
###############
|
||||||
|
|||||||
@@ -89,6 +89,9 @@ def dl_status_loop():
|
|||||||
|
|
||||||
def update_settings():
|
def update_settings():
|
||||||
|
|
||||||
|
if state.dl_session is None:
|
||||||
|
return
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
"upload_rate_limit": state.up_speed_limit,
|
"upload_rate_limit": state.up_speed_limit,
|
||||||
"download_rate_limit": state.down_speed_limit,
|
"download_rate_limit": state.down_speed_limit,
|
||||||
@@ -97,4 +100,4 @@ def update_settings():
|
|||||||
}
|
}
|
||||||
|
|
||||||
state.dl_session.apply_settings(settings)
|
state.dl_session.apply_settings(settings)
|
||||||
consoleLog("Updated Settings")
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
from core.network.libtorrent_int import update_settings
|
from core.network.libtorrent_int import update_settings
|
||||||
from core.utils.data.state import state
|
from core.utils.data.state import state
|
||||||
|
from core.utils.general.logs import consoleLog
|
||||||
from .config import create_config
|
from .config import create_config
|
||||||
|
|
||||||
|
|
||||||
@@ -21,6 +22,8 @@ def save_settings(close=lambda: None, apiurl=None, download_path=None, down_spee
|
|||||||
if max_downloads is not None:
|
if max_downloads is not None:
|
||||||
state.max_downloads = max_downloads
|
state.max_downloads = max_downloads
|
||||||
|
|
||||||
|
|
||||||
update_settings()
|
update_settings()
|
||||||
|
consoleLog("Saved Settings")
|
||||||
create_config()
|
create_config()
|
||||||
close()
|
close()
|
||||||
|
|||||||
@@ -23,10 +23,6 @@ class AppState(QObject):
|
|||||||
self.down_speed_limit: int = 0
|
self.down_speed_limit: int = 0
|
||||||
self.max_connections: int = 200
|
self.max_connections: int = 200
|
||||||
self.max_downloads: int = 10
|
self.max_downloads: int = 10
|
||||||
self.aria2process: Optional[Any] = None
|
|
||||||
self.aria2: Any = None
|
|
||||||
self.aria2p: Any = None
|
|
||||||
self.aria2_threads: int = 4
|
|
||||||
self.settings_path: str = None
|
self.settings_path: str = None
|
||||||
self.dl_session: Any = None
|
self.dl_session: Any = None
|
||||||
self.active_downloads: List[str] = {}
|
self.active_downloads: List[str] = {}
|
||||||
|
|||||||
Reference in New Issue
Block a user