From 0c121b7086043572be58637e7c3754234738c963 Mon Sep 17 00:00:00 2001
From: Arthur Knoepflin <arthur@knoepflin.eu>
Date: Thu, 15 Apr 2021 22:47:41 +0200
Subject: [PATCH] [~] splitOut timestamp

Signed-off-by: Arthur Knoepflin <arthur@knoepflin.eu>
---
 src/renderer/components/dock/log-list.tsx |  6 +++---
 src/renderer/components/dock/log.store.ts | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/renderer/components/dock/log-list.tsx b/src/renderer/components/dock/log-list.tsx
index 666ebc6cb6..959d8482c0 100644
--- a/src/renderer/components/dock/log-list.tsx
+++ b/src/renderer/components/dock/log-list.tsx
@@ -87,9 +87,9 @@ export class LogList extends React.Component<Props> {
       return logStore.logsWithoutTimestamps;
     }
 
-    return this.props.logs.map(log => (
-      `${moment.tz(logStore.getTimestamps(log)[0] || "", preferences.localeTimezone).format()} ${logStore.removeTimestamps(log)}`
-    ));
+    return this.props.logs
+      .map(log => logStore.splitOutTimestamp(log))
+      .map(([logTimestamp, log]) => (`${moment.tz(logTimestamp, preferences.localeTimezone).format()} ${log}`));
   }
 
   /**
diff --git a/src/renderer/components/dock/log.store.ts b/src/renderer/components/dock/log.store.ts
index ec80cf4d58..aabaffc989 100644
--- a/src/renderer/components/dock/log.store.ts
+++ b/src/renderer/components/dock/log.store.ts
@@ -146,6 +146,16 @@ export class LogStore {
     return stamp.toISOString();
   }
 
+  splitOutTimestamp(logs: string): [string, string] {
+    const extraction = /^(\d+\S+) (.*)/gm.exec(logs);
+
+    if (extraction.length < 3) {
+      return ["", ""];
+    }
+
+    return [extraction[1], extraction[2]];
+  }
+
   getTimestamps(logs: string) {
     return logs.match(/^\d+\S+/gm);
   }