From 06c9d0d7c65954d123fbd0a8e3faa6d5b4f985ff Mon Sep 17 00:00:00 2001
From: Torsten Simon <anfragen@tsgames.de>
Date: Sun, 19 Sep 2021 09:01:55 +0000
Subject: [PATCH] fix: Better status scene, now displaying error messages.

---
 src/contexts/RyzenAdjContext.tsx |  4 ++--
 src/locales/de.json              |  4 +++-
 src/locales/en.json              |  4 +++-
 src/scenes/StatusScene.tsx       | 41 +++++++++++++++++++++++++++++---
 4 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/contexts/RyzenAdjContext.tsx b/src/contexts/RyzenAdjContext.tsx
index 8a52277..9e58694 100644
--- a/src/contexts/RyzenAdjContext.tsx
+++ b/src/contexts/RyzenAdjContext.tsx
@@ -230,9 +230,9 @@ export const ryzenAdjProcess = function(parameters: Array<string>): Promise<stri
     console.log(`${executablePath} ${parameters.join(" ")}`);
 
     child(executablePath, parameters, function(err: string, data: Buffer) {
-      var output = data?.toString();
+      const output = data?.toString();
       if (err) {
-        rej(err);
+        rej({ error: err, output });
       } else if (output) {
         res(output);
       }
diff --git a/src/locales/de.json b/src/locales/de.json
index 5e35a04..d5e3816 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -126,5 +126,7 @@
   "statusScene.showRawData": "Rohdaten anzeigen",
   "statusScene.tableParameter": "Parameter",
   "statusScene.tableValue": "Aktueller Wert",
-  "statusScene.tableMaxValue": "Max. Wert"
+  "statusScene.tableMaxValue": "Max. Wert",
+  "statusScene.failed": "Fehler beim Laden der Daten von rjzenadj. Bitte prüfe die Einstellungen",
+  "statusScene.permissions": "Fehler beim Datenzugriff. Stelle sicher, dass Ryzen Controller als Administrator ausgeführt wird"
 }
diff --git a/src/locales/en.json b/src/locales/en.json
index f7bfee6..0b9c662 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -126,5 +126,7 @@
   "statusScene.showRawData": "Show raw data",
   "statusScene.tableParameter": "Parameter",
   "statusScene.tableValue": "Current value",
-  "statusScene.tableMaxValue": "Max. value"
+  "statusScene.tableMaxValue": "Max. value",
+  "statusScene.failed": "Failed to fetch data from ryzenadj. Please check your settings",
+  "statusScene.permissions": "Error accessing data. Make sure Ryzen Controller is running as Administrator"
 }
diff --git a/src/scenes/StatusScene.tsx b/src/scenes/StatusScene.tsx
index 7ca419c..68499ac 100644
--- a/src/scenes/StatusScene.tsx
+++ b/src/scenes/StatusScene.tsx
@@ -6,8 +6,19 @@ import LightModeContext from "../contexts/LightModeContext";
 import { appContextSettingsKey, RyzenControllerSettingsDefinitions } from "../contexts/RyzenControllerAppContext";
 const electronSettings = window.require("electron-settings");
 
+enum State {
+  Init,
+  Valid,
+  PermissionError,
+  GernericError,
+}
 const i18n = {
   noData: getTranslation("statusScene.noData", "No data to show"),
+  failed: getTranslation("statusScene.failed", "Failed to fetch data from ryzenadj. Please check your settings"),
+  permissions: getTranslation(
+    "statusScene.permissions",
+    "Error accessing data. Make sure Ryzen Controller is running as Administrator"
+  ),
   thmValueCore: getTranslation("statusScene.thmValueCore", "Core Temperature"),
   pptValueApu: getTranslation("statusScene.pptValueApu", "Package Power Consumption"),
   showRawData: getTranslation("statusScene.showRawData", "Show raw data"),
@@ -18,12 +29,25 @@ const i18n = {
 
 class PresetsScene extends React.Component {
   _isMounted = false;
+  _state = State.Init;
   data: { [key: string]: number } = {};
   allData = false;
   __constructor() {}
+  async loadData() {
+    try {
+      this.parseData(await ryzenAdjProcess(["-i"]));
+    } catch (e) {
+      console.warn(e.output);
+      if (e.output.includes("check permission")) {
+        this._state = State.PermissionError;
+      } else {
+        this._state = State.GernericError;
+      }
+    }
+  }
   async componentDidMount() {
     this._isMounted = true;
-    this.parseData(await ryzenAdjProcess(["-i"]));
+    this.loadData();
     let intervalDuration =
       electronSettings.get(appContextSettingsKey)?.settings.statusUpdateInterval ||
       RyzenControllerSettingsDefinitions["statusUpdateInterval"].default;
@@ -33,10 +57,15 @@ class PresetsScene extends React.Component {
         clearInterval(interval);
         return;
       }
-      this.parseData(await ryzenAdjProcess(["-i"]));
+      this.loadData();
     }, intervalDuration as number);
   }
   parseData(output: string) {
+    if (!output && this._state !== State.Valid) {
+      this._state = State.GernericError;
+      return;
+    }
+    console.warn(output);
     output
       .split("\n")
       .slice(2)
@@ -60,8 +89,14 @@ class PresetsScene extends React.Component {
   }
 
   render() {
+    if (this._state === State.GernericError) {
+      return <h2 className="uk-flex uk-flex-center uk-text-center">{i18n.failed}</h2>;
+    }
+    if (this._state === State.PermissionError) {
+      return <h2 className="uk-flex uk-flex-center uk-text-center">{i18n.permissions}</h2>;
+    }
     if (Object.keys(this.data).length === 0) {
-      return <h2 className="uk-flex uk-flex-center">{i18n.noData}</h2>;
+      return <h2 className="uk-flex uk-flex-center uk-text-center">{i18n.noData}</h2>;
     }
     return (
       <LightModeContext.Consumer>