1
0
Fork 0
mirror of synced 2024-09-29 17:02:20 +13:00

LaunchHelper: Move console into the game_launch_helper folder

LaunchHelper: Log stderr to the console
This commit is contained in:
loathingKernel 2022-07-11 21:03:39 +03:00
parent 406cfc136f
commit 43c8cf8b52
4 changed files with 10 additions and 5 deletions

View file

@ -1,9 +1,9 @@
import datetime
import json import json
import os import os
import platform import platform
import shutil import shutil
from dataclasses import dataclass from dataclasses import dataclass
import datetime
from logging import getLogger from logging import getLogger
from PyQt5.QtCore import QObject, QSettings, QProcess, QProcessEnvironment, pyqtSignal, QUrl, QTimer from PyQt5.QtCore import QObject, QSettings, QProcess, QProcessEnvironment, pyqtSignal, QUrl, QTimer
@ -12,13 +12,13 @@ from PyQt5.QtNetwork import QLocalSocket
from PyQt5.QtWidgets import QMessageBox, QPushButton from PyQt5.QtWidgets import QMessageBox, QPushButton
from rare.components.dialogs.uninstall_dialog import UninstallDialog from rare.components.dialogs.uninstall_dialog import UninstallDialog
from rare.components.extra.console import Console
from rare.components.tabs.games import CloudSaveUtils from rare.components.tabs.games import CloudSaveUtils
from rare.game_launch_helper import message_models
from rare.game_launch_helper.console import Console
from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton, ArgumentsSingleton from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton, ArgumentsSingleton
from rare.utils import legendary_utils from rare.utils import legendary_utils
from rare.utils import utils from rare.utils import utils
from rare.utils.meta import RareGameMeta from rare.utils.meta import RareGameMeta
from rare.game_launch_helper import message_models
logger = getLogger("GameUtils") logger = getLogger("GameUtils")

View file

@ -11,9 +11,9 @@ from PyQt5.QtCore import QObject, QProcess, pyqtSignal, QUrl, QRunnable, QThread
from PyQt5.QtGui import QDesktopServices from PyQt5.QtGui import QDesktopServices
from PyQt5.QtNetwork import QLocalServer, QLocalSocket from PyQt5.QtNetwork import QLocalServer, QLocalSocket
from .console import Console
from .lgd_helper import get_launch_args, InitArgs, get_configured_process, LaunchArgs, GameArgsError from .lgd_helper import get_launch_args, InitArgs, get_configured_process, LaunchArgs, GameArgsError
from .message_models import ErrorModel, Actions, FinishedModel, BaseModel, StateChangedModel from .message_models import ErrorModel, Actions, FinishedModel, BaseModel, StateChangedModel
from ..components.extra.console import Console
from ..shared import LegendaryCoreSingleton from ..shared import LegendaryCoreSingleton
from ..widgets.rare_app import RareApp from ..widgets.rare_app import RareApp
@ -94,7 +94,12 @@ class GameProcessApp(RareApp):
if self.console: if self.console:
self.game_process.readyReadStandardOutput.connect( self.game_process.readyReadStandardOutput.connect(
lambda: self.console.log( lambda: self.console.log(
str(self.game_process.readAllStandardOutput().data(), "utf-8", "ignore") self.game_process.readAllStandardOutput().data().decode("utf-8", "ignore")
)
)
self.game_process.readyReadStandardError.connect(
lambda: self.console.log(
self.game_process.readAllStandardError().data().decode("utf-8", "ignore")
) )
) )