From ba6fc0fdb35c5541d6f45d34a2af73e961269518 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Mon, 17 Jun 2024 06:19:16 -0600
Subject: [PATCH] UI Tweaks (#12002)

* Adjust review padding

* Fix mse check

* Don't fail when cpu property is missing

* ignore lines without any spaces
---
 frigate/api/app.py                      |  2 +-
 web/src/components/player/MsePlayer.tsx |  2 +-
 web/src/types/review.ts                 |  2 +-
 web/src/views/events/EventView.tsx      |  6 +++++-
 web/src/views/system/GeneralMetrics.tsx | 24 ++++++++++++++++--------
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/frigate/api/app.py b/frigate/api/app.py
index e97509998..787a08784 100644
--- a/frigate/api/app.py
+++ b/frigate/api/app.py
@@ -481,7 +481,7 @@ def logs(service: str):
         for rawLine in contents.splitlines():
             cleanLine = rawLine.strip()
 
-            if len(cleanLine) < 10:
+            if len(cleanLine) < 10 or " " not in cleanLine:
                 continue
 
             if dateEnd == 0:
diff --git a/web/src/components/player/MsePlayer.tsx b/web/src/components/player/MsePlayer.tsx
index 2b9a8d4fb..80844e749 100644
--- a/web/src/components/player/MsePlayer.tsx
+++ b/web/src/components/player/MsePlayer.tsx
@@ -330,7 +330,7 @@ function MSEPlayer({
             setTimeout(() => {
               if (
                 document.visibilityState === "visible" &&
-                wsRef.current != undefined
+                wsRef.current != null
               ) {
                 onError("stalled");
               }
diff --git a/web/src/types/review.ts b/web/src/types/review.ts
index ab1c2263b..e9d6ce88d 100644
--- a/web/src/types/review.ts
+++ b/web/src/types/review.ts
@@ -60,4 +60,4 @@ export type MotionData = {
   camera: string;
 };
 
-export const REVIEW_PADDING = 2;
+export const REVIEW_PADDING = 4;
diff --git a/web/src/views/events/EventView.tsx b/web/src/views/events/EventView.tsx
index a95524e02..dfcf0344d 100644
--- a/web/src/views/events/EventView.tsx
+++ b/web/src/views/events/EventView.tsx
@@ -167,9 +167,13 @@ export default function EventView({
         return;
       }
 
+      const endTime = review.end_time
+        ? review.end_time + REVIEW_PADDING
+        : Date.now() / 1000;
+
       axios
         .post(
-          `export/${review.camera}/start/${review.start_time}/end/${review.end_time}`,
+          `export/${review.camera}/start/${review.start_time - REVIEW_PADDING}/end/${endTime}`,
           { playback: "realtime" },
         )
         .then((response) => {
diff --git a/web/src/views/system/GeneralMetrics.tsx b/web/src/views/system/GeneralMetrics.tsx
index 59b71cda9..76bf9a537 100644
--- a/web/src/views/system/GeneralMetrics.tsx
+++ b/web/src/views/system/GeneralMetrics.tsx
@@ -163,10 +163,14 @@ export default function GeneralMetrics({
           series[key] = { name: key, data: [] };
         }
 
-        series[key].data.push({
-          x: statsIdx + 1,
-          y: stats.cpu_usages[detStats.pid.toString()].cpu,
-        });
+        const data = stats.cpu_usages[detStats.pid.toString()].cpu;
+
+        if (data != undefined) {
+          series[key].data.push({
+            x: statsIdx + 1,
+            y: data,
+          });
+        }
       });
     });
     return Object.values(series);
@@ -300,10 +304,14 @@ export default function GeneralMetrics({
             series[key] = { name: key, data: [] };
           }
 
-          series[key].data.push({
-            x: statsIdx + 1,
-            y: stats.cpu_usages[procStats.pid.toString()].cpu,
-          });
+          const data = stats.cpu_usages[procStats.pid.toString()].cpu;
+
+          if (data != undefined) {
+            series[key].data.push({
+              x: statsIdx + 1,
+              y: data,
+            });
+          }
         }
       });
     });