From 43c8cf8b52f84f6c8c73422ad62ede01d0c694e7 Mon Sep 17 00:00:00 2001
From: loathingKernel <142770+loathingKernel@users.noreply.github.com>
Date: Mon, 11 Jul 2022 21:03:39 +0300
Subject: [PATCH] LaunchHelper: Move console into the game_launch_helper folder
 LaunchHelper: Log stderr to the console

---
 rare/components/extra/__init__.py                        | 0
 rare/components/tabs/games/game_utils.py                 | 6 +++---
 rare/game_launch_helper/__init__.py                      | 9 +++++++--
 rare/{components/extra => game_launch_helper}/console.py | 0
 4 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 rare/components/extra/__init__.py
 rename rare/{components/extra => game_launch_helper}/console.py (100%)

diff --git a/rare/components/extra/__init__.py b/rare/components/extra/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/rare/components/tabs/games/game_utils.py b/rare/components/tabs/games/game_utils.py
index beedf4c8..fd3ee422 100644
--- a/rare/components/tabs/games/game_utils.py
+++ b/rare/components/tabs/games/game_utils.py
@@ -1,9 +1,9 @@
+import datetime
 import json
 import os
 import platform
 import shutil
 from dataclasses import dataclass
-import datetime
 from logging import getLogger
 
 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 rare.components.dialogs.uninstall_dialog import UninstallDialog
-from rare.components.extra.console import Console
 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.utils import legendary_utils
 from rare.utils import utils
 from rare.utils.meta import RareGameMeta
-from rare.game_launch_helper import message_models
 
 logger = getLogger("GameUtils")
 
diff --git a/rare/game_launch_helper/__init__.py b/rare/game_launch_helper/__init__.py
index abad9926..5f94cff2 100644
--- a/rare/game_launch_helper/__init__.py
+++ b/rare/game_launch_helper/__init__.py
@@ -11,9 +11,9 @@ from PyQt5.QtCore import QObject, QProcess, pyqtSignal, QUrl, QRunnable, QThread
 from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtNetwork import QLocalServer, QLocalSocket
 
+from .console import Console
 from .lgd_helper import get_launch_args, InitArgs, get_configured_process, LaunchArgs, GameArgsError
 from .message_models import ErrorModel, Actions, FinishedModel, BaseModel, StateChangedModel
-from ..components.extra.console import Console
 from ..shared import LegendaryCoreSingleton
 from ..widgets.rare_app import RareApp
 
@@ -94,7 +94,12 @@ class GameProcessApp(RareApp):
         if self.console:
             self.game_process.readyReadStandardOutput.connect(
                 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")
                 )
             )
 
diff --git a/rare/components/extra/console.py b/rare/game_launch_helper/console.py
similarity index 100%
rename from rare/components/extra/console.py
rename to rare/game_launch_helper/console.py