CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-26 10:11:19 +12:00
Code Issues Projects Releases Wiki Activity

WineResolver: Pass LegendaryCore at instantiation

Browse source 
Signed-off-by: loathingKernel <142770+loathingKernel@users.noreply.github.com>
This commit is contained in:
loathingKernel 2022-12-26 17:26:33 +02:00
parent b73fc328d2
commit 857b3a3cc0
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rare/components/tabs/games/game_info/game_settings.py
View file

@ -62,7 +62,7 @@ class GameSettings(DefaultGameSettings):
new_path = self.core.get_save_path(self.game.app_name)
except Exception as e:
logger.warning(str(e))
resolver = WineResolver(get_raw_save_path(self.game), self.game.app_name)
resolver = WineResolver(self.core, get_raw_save_path(self.game), self.game.app_name)
if not resolver.wine_env.get("WINEPREFIX"):
self.cloud_save_path_edit.setText("")
QMessageBox.warning(self, "Warning", "No wine prefix selected. Please set it in settings")

6
rare/components/tabs/games/integrations/egl_sync_group.py
View file

@ -11,9 +11,7 @@ from rare.models.pathspec import PathSpec
from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton
from rare.shared.workers.wine_resolver import WineResolver
from rare.ui.components.tabs.games.integrations.egl_sync_group import Ui_EGLSyncGroup
from rare.ui.components.tabs.games.integrations.egl_sync_list_group import (
Ui_EGLSyncListGroup,
)
from rare.ui.components.tabs.games.integrations.egl_sync_list_group import Ui_EGLSyncListGroup
from rare.utils.extra_widgets import PathEdit
logger = getLogger("EGLSync")
@ -49,7 +47,7 @@ class EGLSyncGroup(QGroupBox, Ui_EGLSyncGroup):
if not self.core.egl.programdata_path:
self.egl_path_info.setText(self.tr("Updating..."))
wine_resolver = WineResolver(
PathSpec.egl_programdata, "default"
self.core, PathSpec.egl_programdata, "default"
)
wine_resolver.signals.result_ready.connect(self.wine_resolver_cb)
self.thread_pool.start(wine_resolver)

4
rare/shared/workers/wine_resolver.py
View file

@ -3,6 +3,7 @@ import subprocess
from PyQt5.QtCore import pyqtSignal, QRunnable, QObject, pyqtSlot
from rare.lgndr.core import LegendaryCore
from rare.models.pathspec import PathSpec
@ -10,12 +11,11 @@ class WineResolver(QRunnable):
class Signals(QObject):
result_ready = pyqtSignal(str)
def __init__(self, rare_core, path: str, app_name: str):
def __init__(self, core: LegendaryCore, path: str, app_name: str):
super(WineResolver, self).__init__()
self.signals = WineResolver.Signals()
self.setAutoDelete(True)
self.wine_env = os.environ.copy()
core = rare_core.core()
self.wine_env.update(core.get_app_environment(app_name))
self.wine_env["WINEDLLOVERRIDES"] = "winemenubuilder=d;mscoree=d;mshtml=d;"
self.wine_env["DISPLAY"] = ""