From 52e825549dbe9c33c450cfc315be1958aa7feac9 Mon Sep 17 00:00:00 2001
From: uwap <me@uwap.name>
Date: Wed, 28 Mar 2018 04:08:50 +0200
Subject: [PATCH] Rename parseState to type

---
 config/rzl.js         | 14 +++++++-------
 config/utils.js       | 10 +++++-----
 src/components/App.js |  2 +-
 src/config/types.js   |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/config/rzl.js b/config/rzl.js
index 0b6c6fa..5b57be5 100644
--- a/config/rzl.js
+++ b/config/rzl.js
@@ -72,28 +72,28 @@ const config : Config = {
         command: "/service/onkyo/command",
         defaultValue: "PWR00",
         values: { off: "PWR00", on: "PWR01" },
-        parseState: msg => JSON.parse(msg.toString()).onkyo_raw
+        type: msg => JSON.parse(msg.toString()).onkyo_raw
       },
       onkyo_mute: {
         state: "/service/onkyo/status/audio-muting",
         command: "/service/onkyo/command",
         defaultValue: "AMT00",
         values: { off: "AMT00", on: "AMT01" },
-        parseState: msg => JSON.parse(msg.toString()).onkyo_raw
+        type: msg => JSON.parse(msg.toString()).onkyo_raw
       },
       onkyo_volume: {
         state: "/service/onkyo/status/volume",
         command: "/service/onkyo/set/volume",
         defaultValue: 0,
         values: {},
-        parseState: msg => JSON.parse(msg.toString()).val
+        type: msg => JSON.parse(msg.toString()).val
       },
       onkyo_inputs: {
         state: "/service/onkyo/status/input-selector",
         command: "/service/onkyo/command",
         defaultValue: "SLI00",
         values: { tisch: "SLI11", chromecast: "SLI01", pult: "SLI10", netzwerk: "SLI2B", front: "SLI03" },
-        parseState: msg => JSON.parse(msg.toString()).onkyo_raw
+        type: msg => JSON.parse(msg.toString()).onkyo_raw
       },
       onkyo_radios: {
         state: "/service/onkyo/status/latest-NPR",
@@ -120,7 +120,7 @@ const config : Config = {
         command: "",
         defaultValue: "",
         values: {},
-        parseState: msg => JSON.parse(msg.toString()).join(", ")
+        type: msg => JSON.parse(msg.toString()).join(", ")
       },
       infoscreen: {
         state: "/service/openhab/out/pca301_infoscreen/state",
@@ -133,7 +133,7 @@ const config : Config = {
         command: "",
         defaultValue: "unavailable",
         values: {},
-        parseState: msg => {
+        type: msg => {
           switch (msg.toString()) {
             case "unreachable":
             case "booting":
@@ -161,7 +161,7 @@ const config : Config = {
         command: "",
         defaultValue: "",
         values: {},
-        parseState: msg => JSON.parse(msg.toString()).progress || 0
+        type: msg => JSON.parse(msg.toString()).progress || 0
       }
     },
     esper_topics("afba40", "flyfry"),
diff --git a/config/utils.js b/config/utils.js
index 86d784f..a7c237a 100644
--- a/config/utils.js
+++ b/config/utils.js
@@ -7,28 +7,28 @@ export const esper_topics = (chip_id: string, name: string) => ({
     command: "",
     defaultValue: "UNKNOWN",
     values: {},
-    parseState: msg => JSON.parse(msg.toString()).version.esper
+    type: msg => JSON.parse(msg.toString()).version.esper
   },
   [ `esper_${name}_ip` ]: {
     state: `/service/esper/${chip_id}/info`,
     command: "",
     defaultValue: "UNKNOWN",
     values: {},
-    parseState: msg => JSON.parse(msg.toString()).network.ip
+    type: msg => JSON.parse(msg.toString()).network.ip
   },
   [ `esper_${name}_rssi` ]: {
     state: `/service/esper/${chip_id}/info`,
     command: "",
     defaultValue: "UNKNOWN",
     values: {},
-    parseState: msg => JSON.parse(msg.toString()).wifi.rssi
+    type: msg => JSON.parse(msg.toString()).wifi.rssi
   },
   [ `esper_${name}_uptime` ]: {
     state: `/service/esper/${chip_id}/info`,
     command: "",
     defaultValue: "UNKNOWN",
     values: {},
-    parseState: msg => new Date(JSON.parse(msg.toString()).time.startup * 1000)
+    type: msg => new Date(JSON.parse(msg.toString()).time.startup * 1000)
                           .toLocaleString()
   },
   [ `esper_${name}_device` ]: {
@@ -36,7 +36,7 @@ export const esper_topics = (chip_id: string, name: string) => ({
     command: "",
     defaultValue: "UNKNOWN",
     values: {},
-    parseState: msg => JSON.parse(msg.toString()).device
+    type: msg => JSON.parse(msg.toString()).device
   }
 });
 
diff --git a/src/components/App.js b/src/components/App.js
index 6190265..e4a30ed 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -87,7 +87,7 @@ class App extends React.Component<AppProps & Classes, AppState> {
     }
     for (let i in topics) {
       const topic = topics[i];
-      const parseValue = this.topics[topic].parseState;
+      const parseValue = this.topics[topic].type;
       const val = parseValue == null ? message.toString() : parseValue(message);
       this.setState({mqttState: merge(this.state.mqttState,
         { [topic]: {
diff --git a/src/config/types.js b/src/config/types.js
index e115fea..b2177f8 100644
--- a/src/config/types.js
+++ b/src/config/types.js
@@ -6,7 +6,7 @@ export type Topic = {
   command: string,
   defaultValue: Actual,
   values: Map<Internal, Actual>,
-  parseState?: (msg: Object) => any
+  type?: (msg: Buffer) => any
 };
 export type Topics = Map<string, Topic>;