change pvcsityping

Author: samfreund

photon-client/src/types/SettingTypes.ts

@@ -96,6 +96,7 @@ export interface PVUsbCameraInfo {
 }
 export interface PVCSICameraInfo {
   baseName: string;
+  name: string;
   path: string;
 
   // In Java, PVCameraInfo provides a uniquePath property so we can have one Source of Truth here

photon-client/src/views/CameraMatchingView.vue

@@ -64,23 +64,24 @@ const deleteThisCamera = (cameraUniqueName: string) => {
   });
 };
 
-const cameraConnected = (uniquePath: string): boolean => {
+const cameraConnected = (uniquePath: string | undefined): boolean => {
+  if (!uniquePath) return false;
   return (
-    useStateStore().vsmState.allConnectedCameras.find((it) => cameraInfoFor(it).uniquePath === uniquePath) !== undefined
+    useStateStore().vsmState.allConnectedCameras.find((it) => cameraInfoFor(it)?.uniquePath === uniquePath) !== undefined
   );
 };
 
 const unmatchedCameras = computed(() => {
   const activeVmPaths = Object.values(useCameraSettingsStore().cameras).map(
-    (it) => cameraInfoFor(it.matchedCameraInfo).uniquePath
+    (it) => cameraInfoFor(it.matchedCameraInfo)?.uniquePath
   );
   const disabledVmPaths = useStateStore().vsmState.disabledConfigs.map(
-    (it) => cameraInfoFor(it.matchedCameraInfo).uniquePath
+    (it) => cameraInfoFor(it.matchedCameraInfo)?.uniquePath
   );
 
   return useStateStore().vsmState.allConnectedCameras.filter(
     (it) =>
-      !activeVmPaths.includes(cameraInfoFor(it).uniquePath) && !disabledVmPaths.includes(cameraInfoFor(it).uniquePath)
+      !activeVmPaths.includes(cameraInfoFor(it)?.uniquePath) && !disabledVmPaths.includes(cameraInfoFor(it)?.uniquePath)
   );
 });
 
@@ -91,8 +92,8 @@ const activeVisionModules = computed(() =>
     // Display connected cameras first
     .sort(
       (first, second) =>
-        (cameraConnected(cameraInfoFor(second.matchedCameraInfo).uniquePath) ? 1 : 0) -
-        (cameraConnected(cameraInfoFor(first.matchedCameraInfo).uniquePath) ? 1 : 0)
+        (cameraConnected(cameraInfoFor(second.matchedCameraInfo)?.uniquePath) ? 1 : 0) -
+        (cameraConnected(cameraInfoFor(first.matchedCameraInfo)?.uniquePath) ? 1 : 0)
     )
 );
 
@@ -108,7 +109,7 @@ const setCameraView = (camera: PVCameraInfo | null, isConnected: boolean | null)
 /**
  * Get the connection-type-specific camera info from the given PVCameraInfo object.
  */
-const cameraInfoFor = (camera: PVCameraInfo | null): PVUsbCameraInfo | PVCSICameraInfo | PVFileCameraInfo | any => {
+const cameraInfoFor = (camera: PVCameraInfo | null): PVUsbCameraInfo | PVCSICameraInfo | PVFileCameraInfo | null => {
   if (!camera) return null;
   if (camera.PVUsbCameraInfo) {
     return camera.PVUsbCameraInfo;
@@ -119,7 +120,7 @@ const cameraInfoFor = (camera: PVCameraInfo | null): PVUsbCameraInfo | PVCSICame
   if (camera.PVFileCameraInfo) {
     return camera.PVFileCameraInfo;
   }
-  return {};
+  return null;
 };
 
 /**
@@ -135,7 +136,7 @@ const getMatchedDevice = (info: PVCameraInfo | undefined): PVCameraInfo => {
   }
   return (
     useStateStore().vsmState.allConnectedCameras.find(
-      (it) => cameraInfoFor(it).uniquePath === cameraInfoFor(info).uniquePath
+      (it) => cameraInfoFor(it)?.uniquePath === cameraInfoFor(info)?.uniquePath
     ) || {
       PVFileCameraInfo: undefined,
       PVCSICameraInfo: undefined,
@@ -158,12 +159,12 @@ const getMatchedDevice = (info: PVCameraInfo | undefined): PVCameraInfo => {
         class="pr-0"
       >
         <v-card color="surface" class="rounded-12">
-          <v-card-title>{{ cameraInfoFor(module.matchedCameraInfo).name }}</v-card-title>
-          <v-card-subtitle v-if="!cameraConnected(cameraInfoFor(module.matchedCameraInfo).uniquePath)"
+          <v-card-title>{{ cameraInfoFor(module.matchedCameraInfo)?.name }}</v-card-title>
+          <v-card-subtitle v-if="!cameraConnected(cameraInfoFor(module.matchedCameraInfo)?.uniquePath)"
             >Status: <span class="inactive-status">Disconnected</span></v-card-subtitle
           >
           <v-card-subtitle
-            v-else-if="cameraConnected(cameraInfoFor(module.matchedCameraInfo).uniquePath) && !module.mismatch"
+            v-else-if="cameraConnected(cameraInfoFor(module.matchedCameraInfo)?.uniquePath) && !module.mismatch"
             >Status: <span class="active-status">Active</span></v-card-subtitle
           >
           <v-card-subtitle v-else>Status: <span class="mismatch-status">Mismatch</span></v-card-subtitle>
@@ -172,7 +173,7 @@ const getMatchedDevice = (info: PVCameraInfo | undefined): PVCameraInfo => {
               <tbody>
                 <tr
                   v-if="
-                    cameraConnected(cameraInfoFor(module.matchedCameraInfo).uniquePath) &&
+                    cameraConnected(cameraInfoFor(module.matchedCameraInfo)?.uniquePath) &&
                     useStateStore().backendResults[module.uniqueName]
                   "
                 >
@@ -214,7 +215,7 @@ const getMatchedDevice = (info: PVCameraInfo | undefined): PVCameraInfo => {
               </tbody>
             </v-table>
             <div
-              v-if="cameraConnected(cameraInfoFor(module.matchedCameraInfo).uniquePath)"
+              v-if="cameraConnected(cameraInfoFor(module.matchedCameraInfo)?.uniquePath)"
               :id="`stream-container-${index}`"
               class="d-flex flex-column justify-center align-center mt-3"
               style="height: 250px"
@@ -236,7 +237,7 @@ const getMatchedDevice = (info: PVCameraInfo | undefined): PVCameraInfo => {
                   @click="
                     setCameraView(
                       module.matchedCameraInfo,
-                      cameraConnected(cameraInfoFor(module.matchedCameraInfo).uniquePath)
+                      cameraConnected(cameraInfoFor(module.matchedCameraInfo)?.uniquePath)
                     )
                   "
                 >
@@ -315,7 +316,7 @@ const getMatchedDevice = (info: PVCameraInfo | undefined): PVCameraInfo => {
                 </tr>
                 <tr>
                   <td>Connected</td>
-                  <td>{{ cameraConnected(cameraInfoFor(module.matchedCameraInfo).uniquePath) }}</td>
+                  <td>{{ cameraConnected(cameraInfoFor(module.matchedCameraInfo)?.uniquePath) }}</td>
                 </tr>
               </tbody>
             </v-table>
@@ -330,7 +331,7 @@ const getMatchedDevice = (info: PVCameraInfo | undefined): PVCameraInfo => {
                   @click="
                     setCameraView(
                       module.matchedCameraInfo,
-                      cameraConnected(cameraInfoFor(module.matchedCameraInfo).uniquePath)
+                      cameraConnected(cameraInfoFor(module.matchedCameraInfo)?.uniquePath)
                     )
                   "
                 >
@@ -381,7 +382,7 @@ const getMatchedDevice = (info: PVCameraInfo | undefined): PVCameraInfo => {
             <span v-else-if="camera.PVCSICameraInfo">CSI Camera:</span>
             <span v-else-if="camera.PVFileCameraInfo">File Camera:</span>
             <span v-else>Unknown Camera:</span>
-            &nbsp;<span>{{ cameraInfoFor(camera)?.name ?? cameraInfoFor(camera)?.baseName }}</span>
+            &nbsp;<span>{{ cameraInfoFor(camera)?.name }}</span>
           </v-card-title>
           <v-card-subtitle>Status: Unassigned</v-card-subtitle>
           <v-card-text class="pt-3">
@@ -436,7 +437,7 @@ const getMatchedDevice = (info: PVCameraInfo | undefined): PVCameraInfo => {
     <v-dialog v-model="viewingDetails" max-width="800">
       <v-card v-if="viewingCamera[0] !== null" flat color="surface">
         <v-card-title class="d-flex justify-space-between">
-          <span>{{ cameraInfoFor(viewingCamera[0])?.name ?? cameraInfoFor(viewingCamera[0])?.baseName }}</span>
+          <span>{{ cameraInfoFor(viewingCamera[0])?.name }}</span>
           <v-btn variant="text" @click="setCameraView(null, null)">
             <v-icon size="x-large">mdi-close</v-icon>
           </v-btn>
@@ -447,7 +448,7 @@ const getMatchedDevice = (info: PVCameraInfo | undefined): PVCameraInfo => {
         <v-card-text
           v-else-if="
             activeVisionModules.find(
-              (it) => cameraInfoFor(it.matchedCameraInfo).uniquePath === cameraInfoFor(viewingCamera[0]).uniquePath
+              (it) => cameraInfoFor(it.matchedCameraInfo)?.uniquePath === cameraInfoFor(viewingCamera[0])?.uniquePath
             )?.mismatch
           "
         >

photon-core/src/main/java/org/photonvision/vision/camera/PVCameraInfo.java

@@ -172,12 +172,14 @@ public String toString() {
     public static final class PVCSICameraInfo implements PVCameraInfo {
         public final String path;
         public final String baseName;
+        public final String name;
 
         @JsonCreator
         public PVCSICameraInfo(
                 @JsonProperty("path") String path, @JsonProperty("baseName") String baseName) {
             this.path = path;
             this.baseName = baseName;
+            this.name = baseName.replaceAll("[^\\x00-\\x7F]", "");
         }
 
         @Override
@@ -187,7 +189,7 @@ public String path() {
 
         @Override
         public String name() {
-            return baseName.replaceAll("[^\\x00-\\x7F]", "");
+            return name;
         }
 
         @Override
@@ -229,6 +231,8 @@ public String toString() {
                     + path
                     + "', uniquePath='"
                     + uniquePath()
+                    + "', name='"
+                    + name
                     + "']";
         }
     }