Compare commits

..

2 Commits

Author SHA1 Message Date
d1570711ac
Minor update required for libWiiPy v0.6.0 compatibility 2025-02-18 20:11:12 -05:00
449a680d32
Add safeguards to system Qt library loading on Linux
Also made minor update for libWiiPy v0.6.0 compatibility
2025-02-18 20:10:27 -05:00
3 changed files with 16 additions and 8 deletions

View File

@ -502,11 +502,21 @@ if __name__ == "__main__":
# it looks nice, but fallback on kvantum if it isn't, since kvantum is likely to exist. If all else fails, fusion.
if platform.system() == "Linux":
if os.path.isdir("/usr/lib/qt6/plugins"):
app.addLibraryPath("/usr/lib/qt6/plugins")
if "Breeze" in QStyleFactory.keys():
app.setStyle("Breeze")
elif "kvantum" in QStyleFactory.keys():
app.setStyle("kvantum")
import subprocess
try:
# This CANNOT be the best way to get the system Qt version, but it's what I came up with for now.
result = subprocess.run(['/usr/lib/qt6/bin/qtdiag'], stdout=subprocess.PIPE)
result_str = result.stdout.decode("utf-8").split("\n")[0]
sys_qt_ver = result_str.split(" ")[1].split(".")
pyside_qt_ver = version("PySide6").split(".")
if sys_qt_ver[0:2] == pyside_qt_ver[0:2]:
app.addLibraryPath("/usr/lib/qt6/plugins")
if "Breeze" in QStyleFactory.keys():
app.setStyle("Breeze")
elif "kvantum" in QStyleFactory.keys():
app.setStyle("kvantum")
except Exception as e:
print(e)
# Load qtbase translations, and then apps-specific translations.
path = QLibraryInfo.path(QLibraryInfo.LibraryPath.TranslationsPath)

View File

@ -2,7 +2,6 @@
# Copyright 2024-2025 NinjaCheetah
import pathlib
from typing import List, Tuple
import libTWLPy

View File

@ -2,7 +2,6 @@
# Copyright 2024-2025 NinjaCheetah
import pathlib
from typing import List, Tuple
import libWiiPy
@ -112,7 +111,7 @@ def run_nus_download_wii(out_folder: pathlib.Path, tid: str, version: str, pack_
title.ticket.title_key_enc = title_key_common
# Get the WAD certificate chain, courtesy of libWiiPy.
progress_callback.emit(" - Building certificate...")
title.wad.set_cert_data(libWiiPy.title.download_cert(wiiu_endpoint=wiiu_nus_enabled))
title.load_cert_chain(libWiiPy.title.download_cert_chain(wiiu_endpoint=wiiu_nus_enabled))
# Use a typed WAD name if there is one, and auto generate one based on the TID and version if there isn't.
progress_callback.emit(" - Packing WAD...")
if wad_file_name != "" and wad_file_name is not None: