refactor: add type guard for osd size

4ndrs · Jan 4, 2023 · 84049f3 · 84049f3
1 parent 82c7b0f
commit 84049f3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/cropbox.ts b/src/cropbox.ts
@@ -4,7 +4,7 @@
 import { MouseProperties, VideoProperties } from "./properties";
 import { printMessage } from "./utils";
 import PureBox from "./purebox";
-import { Box, MousePos, SetBox } from "./types";
+import { Box, MousePos, OSDSize, SetBox } from "./types";
 
 class CropBox {
   pureBox!: PureBox;
@@ -75,11 +75,7 @@ class CropBox {
       throw new Error("Unable to get the video's properties");
     }
 
-    if (
-      osdSize === undefined ||
-      osdSize.width === undefined ||
-      osdSize.height === undefined
-    ) {
+    if (!isOSDSize(osdSize)) {
       throw new Error("Unable to get the OSD sizes");
     }
 
@@ -171,11 +167,7 @@ const drawBox = () => {
 
   const osdSize = mp.get_osd_size();
 
-  if (
-    osdSize !== undefined &&
-    osdSize.width !== undefined &&
-    osdSize.height !== undefined
-  ) {
+  if (isOSDSize(osdSize)) {
     ({ width: overlay.res_x, height: overlay.res_y } = osdSize);
   } else {
     mp.msg.error(
@@ -233,6 +225,11 @@ const calculateBox = (mousePos: MousePos) => {
 const isMousePos = (value: unknown): value is MousePos =>
   (value as MousePos)?.x !== undefined && (value as MousePos)?.y !== undefined;
 
+const isOSDSize = (value: mp.OSDSize | undefined): value is OSDSize =>
+  typeof value !== "undefined" &&
+  typeof value?.width === "number" &&
+  typeof value?.height === "number";
+
 const boxIsSet = (box: Box): box is SetBox =>
   typeof box.w === "number" &&
   typeof box.h === "number" &&

diff --git a/src/types.ts b/src/types.ts
@@ -34,6 +34,11 @@ export interface SetBox {
   y: number;
 }
 
+export interface OSDSize {
+  width: number;
+  height: number;
+}
+
 export type Selection = "primary" | "clipboard";
 export type CopyUtility = "detect" | "xclip" | "wl-copy";
 export type CopyMode = "ffmpeg" | "purewebm";