Compare commits

..

10 Commits

34 changed files with 35 additions and 36 deletions
+15 -15
View File
@@ -106,7 +106,7 @@ jobs:
run: | run: |
python -c " python -c "
from PIL import Image from PIL import Image
img = Image.open('src/core/interface/assets/logo.png') img = Image.open('core/interface/assets/logo.png')
img.save('app_icon.ico', format='ICO', sizes=[(256,256),(128,128),(64,64),(48,48),(32,32),(16,16)]) img.save('app_icon.ico', format='ICO', sizes=[(256,256),(128,128),(64,64),(48,48),(32,32),(16,16)])
print('Icon converted successfully') print('Icon converted successfully')
" "
@@ -126,12 +126,12 @@ jobs:
--enable-plugin=upx \ --enable-plugin=upx \
--upx-binary="${{ env.UPX_BINARY }}" \ --upx-binary="${{ env.UPX_BINARY }}" \
--noinclude-qt-translations \ --noinclude-qt-translations \
--include-data-dir=src/core/interface/assets=src/core/interface/assets \ --include-data-dir=core/interface/assets=core/interface/assets \
--include-data-files=build_info.json=build_info.json \ --include-data-files=build_info.json=build_info.json \
--include-data-files=build_info.json=src/build_info.json \ --include-data-files=build_info.json=core/build_info.json \
--include-data-files=build_info.json=src/core/interface/build_info.json \ --include-data-files=build_info.json=core/interface/build_info.json \
--output-filename=${{ env.APP_NAME }}.exe \ --output-filename=${{ env.APP_NAME }}.exe \
src/main.py main.py
- name: Build with PyInstaller (Linux) - name: Build with PyInstaller (Linux)
if: runner.os == 'Linux' if: runner.os == 'Linux'
@@ -139,10 +139,10 @@ jobs:
run: | run: |
pyinstaller --onefile --windowed \ pyinstaller --onefile --windowed \
--add-data "build_info.json:." \ --add-data "build_info.json:." \
--add-data "build_info.json:src/core" \ --add-data "build_info.json:core" \
--add-data "build_info.json:src/core/interface" \ --add-data "build_info.json:core/interface" \
--add-data "src/core/interface/assets:src/core/interface/assets" \ --add-data "core/interface/assets:core/interface/assets" \
--icon "src/core/interface/assets/logo.png" \ --icon "core/interface/assets/logo.png" \
--exclude-module PyQt6 \ --exclude-module PyQt6 \
--exclude-module PyQt5 \ --exclude-module PyQt5 \
--hidden-import=backports.tarfile \ --hidden-import=backports.tarfile \
@@ -151,7 +151,7 @@ jobs:
--hidden-import=jaraco.text \ --hidden-import=jaraco.text \
--hidden-import=jaraco.functools \ --hidden-import=jaraco.functools \
--name ${{ env.APP_NAME }} \ --name ${{ env.APP_NAME }} \
src/main.py main.py
- name: Build with PyInstaller (macOS) - name: Build with PyInstaller (macOS)
if: runner.os == 'macOS' if: runner.os == 'macOS'
@@ -159,10 +159,10 @@ jobs:
run: | run: |
pyinstaller --onefile \ pyinstaller --onefile \
--add-data "build_info.json:." \ --add-data "build_info.json:." \
--add-data "build_info.json:src/core" \ --add-data "build_info.json:core" \
--add-data "build_info.json:src/core/interface" \ --add-data "build_info.json:core/interface" \
--add-data "src/core/interface/assets:src/core/interface/assets" \ --add-data "core/interface/assets:core/interface/assets" \
--icon "src/core/interface/assets/fr logo.png" \ --icon "core/interface/assets/logo.png" \
--exclude-module PyQt6 \ --exclude-module PyQt6 \
--exclude-module PyQt5 \ --exclude-module PyQt5 \
--hidden-import=backports.tarfile \ --hidden-import=backports.tarfile \
@@ -171,7 +171,7 @@ jobs:
--hidden-import=jaraco.text \ --hidden-import=jaraco.text \
--hidden-import=jaraco.functools \ --hidden-import=jaraco.functools \
--name ${{ env.APP_NAME }} \ --name ${{ env.APP_NAME }} \
src/main.py main.py
- name: Rename artifact - name: Rename artifact
shell: bash shell: bash
+1 -1
View File
@@ -30,7 +30,7 @@ SoftwareManager is a Python-based GUI tool that simplifies searching and downloa
## Additional Information ## Additional Information
- SoftwareManager is still in Development and most likely contains issues. Please report any bugs you find via the Issues tab. Contributions are also greatly appreciated. - SoftwareManager is still in Development and most likely contains issues. Please report any bugs you find via the Issues tab. Contributions are also greatly appreciated.
- MacOS Builds haven't been properly tested - We're thankful to receive feedback. - MacOS Builds haven't been properly tested - We're thankful to receive feedback.
- If you want to host your own server, clone our [server repository](https://github.com/KeksPirates/SoftwareManager-Server), enter your cookie for rutracker.org and run server.py. Detailed Instructions on how to get your rutracker cookie are in the README of the server repo. - If you want to host your own server, clone the server branch of this repo, enter your cookie for rutracker.org and run server.py. Detailed Instructions on how to get your rutracker cookie are in the README of the server branch.
## Python Dependencies ## Python Dependencies
(also included in requirements.txt) (also included in requirements.txt)

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

@@ -29,7 +29,6 @@ import libtorrent as lt
import time import time
import sys import sys
import json import json
import asyncio
from core.utils.general.logs import consoleLog, remove_download_log, flush_log_buffer from core.utils.general.logs import consoleLog, remove_download_log, flush_log_buffer
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
@@ -104,7 +103,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
state.version = build_info.get("version") state.version = build_info.get("version")
# Check for updates on Windows # Check for updates on Windows
if state.ignore_updates is False and platform.system() == "Windows": if state.ignore_updates is False:
if platform.system() == "Windows":
result = check_for_updates() result = check_for_updates()
if result != (None, None): if result != (None, None):
assets, latest_version = result assets, latest_version = result
@@ -476,7 +476,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
MainWindow._instance.log_signal.emit(text) MainWindow._instance.log_signal.emit(text)
def _on_log_signal(self, text): def _on_log_signal(self, text):
if hasattr(self, 'consoleLog'):
self.consoleLog.append(text) self.consoleLog.append(text)
self.consoleLog.verticalScrollBar().setValue( self.consoleLog.verticalScrollBar().setValue(
self.consoleLog.verticalScrollBar().maximum() self.consoleLog.verticalScrollBar().maximum()
View File