Kitware
diff --git a/‎.github/workflows/docs.yml‎
Lines changed: 26 additions & 0 deletions b/‎.github/workflows/docs.yml‎
Lines changed: 26 additions & 0 deletions
diff --git a/‎.github/workflows/release.yml‎
Lines changed: 1 addition & 19 deletions b/‎.github/workflows/release.yml‎
Lines changed: 1 addition & 19 deletions
diff --git a/‎WEB_MULTICAM_PLAN.MD‎
Lines changed: 131 additions & 134 deletions b/‎WEB_MULTICAM_PLAN.MD‎
Lines changed: 131 additions & 134 deletions
diff --git a/‎client/dive-common/apispec.ts‎
Lines changed: 5 additions & 0 deletions b/‎client/dive-common/apispec.ts‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎client/dive-common/components/ImportMultiCamDialog/ImportMultiCamSubfolders.vue‎
Lines changed: 3 additions & 2 deletions b/‎client/dive-common/components/ImportMultiCamDialog/ImportMultiCamSubfolders.vue‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎client/dive-common/components/ImportMultiCamDialog/ImportMultiCamTypeSelector.vue‎
Lines changed: 1 addition & 1 deletion b/‎client/dive-common/components/ImportMultiCamDialog/ImportMultiCamTypeSelector.vue‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎client/dive-common/components/ImportMultiCamDialog/multicamSubfolderLayout.spec.ts‎
Lines changed: 60 additions & 2 deletions b/‎client/dive-common/components/ImportMultiCamDialog/multicamSubfolderLayout.spec.ts‎
Lines changed: 60 additions & 2 deletions
diff --git a/‎client/dive-common/components/ImportMultiCamDialog/multicamSubfolderLayout.ts‎
Lines changed: 62 additions & 1 deletion b/‎client/dive-common/components/ImportMultiCamDialog/multicamSubfolderLayout.ts‎
Lines changed: 62 additions & 1 deletion
diff --git a/‎client/dive-common/components/ImportMultiCamDialog/useImportMultiCamDialog.ts‎
Lines changed: 24 additions & 9 deletions b/‎client/dive-common/components/ImportMultiCamDialog/useImportMultiCamDialog.ts‎
Lines changed: 24 additions & 9 deletions
@@ -0,0 +1,26 @@
+name: Publish Docs
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+  push:
+    branches:
+      - main
+    paths:
+      - 'docs/**'
+      - 'mkdocs.yml'
+
+jobs:
+  docs:
+    name: Deploy docs
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ github.event_name == 'release' && github.event.release.target_commitish || github.ref }}
+    - name: Deploy docs
+      uses: mhausenblas/mkdocs-deploy-gh-pages@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CONFIG_FILE: mkdocs.yml
+        EXTRA_PACKAGES: build-base
@@ -1,4 +1,4 @@
-name: Electron Build and Docs Deployment
+name: Electron Build
 on:
   release:
     types: [published]
@@ -43,21 +43,3 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         asset_paths: '["./client/dist_electron/DIVE-Desktop*"]'
-
-  docs:
-    name: Deploy docs
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        # "ref" specifies the branch to check out.
-        # "github.event.release.target_commitish" is a global variable and specifies the branch the release targeted
-        ref: ${{ github.event.release.target_commitish }}
-
-    # Deploy docs
-    - name: Deploy docs
-      uses: mhausenblas/mkdocs-deploy-gh-pages@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        CONFIG_FILE: mkdocs.yml
-        EXTRA_PACKAGES: build-base
@@ -230,6 +230,11 @@ interface Api {
     Promise<{canceled?: boolean; filePaths: string[]; fileList?: File[]; root?: string}>;
   /** Desktop: immediate child directory names under a parent folder (multicam subfolder import). */
   listImmediateSubfolders?(parentPath: string): Promise<string[]>;
+  /** Desktop: subfolders or root-level video files under a parent folder (multicam import). */
+  listParentFolderCameras?(
+    parentPath: string,
+    mediaType: 'image-sequence' | 'video',
+  ): Promise<{ name: string; sourcePath: string }[]>;
   /** Desktop: folder path for image-sequence, or first video file inside the folder for video. */
   resolveMulticamCameraSourcePath?(
     subfolderPath: string,
 
@@ -55,8 +55,9 @@ export default defineComponent({
       dense
       class="mb-3"
     >
-      Choose a parent folder containing one subfolder per camera (2 or 3 subfolders).
-      Each subfolder name becomes the camera name (letters and numbers only).
+      Choose a parent folder with either one subfolder per camera (2 or 3 subfolders)
+      or separate video files in the folder (2 or 3 videos). Names come from the subfolder
+      or video file name (letters and numbers only).
     </v-alert>
     <v-row
       no-gutters
 
@@ -40,7 +40,7 @@ export default defineComponent({
       <v-radio
         v-if="enableSubfolderImport"
         value="subfolders"
-        label="Parent folder: each immediate subfolder is a camera"
+        label="Parent folder: subfolders or separate video files per camera"
       />
       <v-radio
         v-if="dataType === 'image-sequence'"
 
@@ -4,7 +4,10 @@ import { describe, expect, it } from 'vitest';
 import {
   applyParentPathToAssignments,
   groupFilesByImmediateSubfolder,
+  groupParentFolderByCamera,
+  groupRootLevelVideoFiles,
   isValidCameraName,
+  isVideoFileName,
   organizeSubfolderCameras,
   orderSubfolderCameraNames,
   preferLeftSubfolderFirst,
@@ -115,8 +118,63 @@ describe('organizeSubfolderCameras', () => {
   });
 
   it('rejects wrong folder count', () => {
-    expect(organizeSubfolderCameras(['only']).error).toMatch(/Expected 2 or 3/);
-    expect(organizeSubfolderCameras(['a', 'b', 'c', 'd']).error).toMatch(/Expected 2 or 3/);
+    expect(organizeSubfolderCameras(['only']).error).toMatch(/Expected 2 or 3 cameras/);
+    expect(organizeSubfolderCameras(['a', 'b', 'c', 'd']).error).toMatch(/Expected 2 or 3 cameras/);
+  });
+});
+
+describe('isVideoFileName', () => {
+  it('recognizes common video extensions', () => {
+    expect(isVideoFileName('left.mp4')).toBe(true);
+    expect(isVideoFileName('right.MOV')).toBe(true);
+    expect(isVideoFileName('notes.txt')).toBe(false);
+  });
+});
+
+describe('groupRootLevelVideoFiles', () => {
+  const mk = (path: string) => ({ webkitRelativePath: path, name: path.split('/').pop() } as File);
+
+  it('groups videos directly under the parent folder by file stem', () => {
+    const groups = groupRootLevelVideoFiles([
+      mk('stereo/left.mp4'),
+      mk('stereo/right.mp4'),
+      mk('stereo/readme.txt'),
+    ], 'stereo');
+    expect([...groups.keys()].sort()).toEqual(['left', 'right']);
+    expect(groups.get('left')?.length).toBe(1);
+    expect(groups.get('right')?.length).toBe(1);
+  });
+});
+
+describe('groupParentFolderByCamera', () => {
+  const mk = (path: string) => ({ webkitRelativePath: path, name: path.split('/').pop() } as File);
+
+  it('prefers subfolders when at least two exist', () => {
+    const groups = groupParentFolderByCamera([
+      mk('set/left/a.mp4'),
+      mk('set/right/b.mp4'),
+      mk('set/left_cam.mp4'),
+    ], { allowRootLevelVideos: true }, 'set');
+    expect([...groups.keys()].sort()).toEqual(['left', 'right']);
+  });
+
+  it('falls back to root-level videos when there are no subfolders', () => {
+    const groups = groupParentFolderByCamera([
+      mk('stereo/left.mp4'),
+      mk('stereo/right.mp4'),
+    ], { allowRootLevelVideos: true }, 'stereo');
+    expect([...groups.keys()].sort()).toEqual(['left', 'right']);
+    const organized = organizeSubfolderCameras([...groups.keys()], { preferLeftForStereo: true });
+    expect(organized.error).toBeNull();
+    expect(organized.assignments.map((a) => a.cameraName)).toEqual(['left', 'right']);
+  });
+
+  it('does not use root-level videos when subfolder import is disabled', () => {
+    const groups = groupParentFolderByCamera([
+      mk('stereo/left.mp4'),
+      mk('stereo/right.mp4'),
+    ], undefined, 'stereo');
+    expect(groups.size).toBe(0);
   });
 });
 
 
@@ -1,3 +1,5 @@
+import { fileVideoTypes } from 'dive-common/constants';
+
 /** Assign immediate child folders to multicam cameras (one camera per subfolder). */
 
 export interface SubfolderCameraAssignment {
@@ -162,7 +164,7 @@ export function organizeSubfolderCameras(
   if (unique.length < 2 || unique.length > 3) {
     return {
       ...empty,
-      error: `Expected 2 or 3 camera subfolders, found ${unique.length} (${unique.join(', ')})`,
+      error: `Expected 2 or 3 cameras (subfolders or video files), found ${unique.length} (${unique.join(', ')})`,
     };
   }
 
@@ -261,3 +263,62 @@ export function groupFilesByImmediateSubfolder(
 
   return groups;
 }
+
+export function isVideoFileName(fileName: string): boolean {
+  const parts = fileName.split('.');
+  if (parts.length < 2) {
+    return false;
+  }
+  const ext = parts.pop()?.toLowerCase() ?? '';
+  return fileVideoTypes.includes(ext);
+}
+
+/**
+ * Group video files that sit directly in the selected parent folder (one camera per file).
+ * Camera keys are the file stem (basename without extension).
+ */
+export function groupRootLevelVideoFiles(
+  fileList: File[],
+  root = '',
+): Map<string, File[]> {
+  const groups = new Map<string, File[]>();
+  const paths = fileList.map((file) => file.webkitRelativePath || file.name);
+  const effectiveRoot = root || commonPathPrefix(paths);
+
+  fileList.forEach((file, index) => {
+    const rel = paths[index];
+    const path = stripPathPrefix(rel, effectiveRoot);
+    const parts = path.split('/').filter(Boolean);
+    if (parts.length !== 1 || !isVideoFileName(parts[0])) {
+      return;
+    }
+    const stem = parts[0].replace(/\.[^.]+$/, '');
+    const existing = groups.get(stem) ?? [];
+    existing.push(file);
+    groups.set(stem, existing);
+  });
+
+  return groups;
+}
+
+/**
+ * Group a parent-folder selection by camera: prefer immediate subfolders; for video imports,
+ * fall back to separate video files in the parent folder when there are not enough subfolders.
+ */
+export function groupParentFolderByCamera(
+  fileList: File[],
+  options?: { allowRootLevelVideos?: boolean },
+  root = '',
+): Map<string, File[]> {
+  const subfolderGroups = groupFilesByImmediateSubfolder(fileList, root);
+  if (subfolderGroups.size >= 2) {
+    return subfolderGroups;
+  }
+  if (options?.allowRootLevelVideos) {
+    const videoGroups = groupRootLevelVideoFiles(fileList, root);
+    if (videoGroups.size >= 2) {
+      return videoGroups;
+    }
+  }
+  return subfolderGroups;
+}
@@ -17,7 +17,7 @@ import {
 import {
   applyParentPathToAssignments,
   commonPathPrefix,
-  groupFilesByImmediateSubfolder,
+  groupParentFolderByCamera,
   isValidCameraName,
   organizeSubfolderCameras,
   pickDefaultMulticamCamera,
@@ -51,7 +51,7 @@ export function useImportMultiCamDialog(
     openFromDisk,
     getLastCalibration,
     saveCalibration,
-    listImmediateSubfolders,
+    listParentFolderCameras,
     resolveMulticamCameraSourcePath,
   } = useApi();
   const importType: Ref<MulticamImportType> = ref('');
@@ -249,7 +249,7 @@ export function useImportMultiCamDialog(
       return;
     }
     const useDesktopDiscovery = !ret.fileList?.length && !!ret.filePaths?.[0]
-      && !!listImmediateSubfolders;
+      && !!listParentFolderCameras;
     if (!ret.fileList?.length && !useDesktopDiscovery) {
       return;
     }
@@ -258,16 +258,21 @@ export function useImportMultiCamDialog(
       let parentPath = '';
       let grouped: Map<string, File[]> | undefined;
       let folderNames: string[] = [];
+      let desktopCameras: { name: string; sourcePath: string }[] | undefined;
+      const mediaType = props.dataType === VideoType ? 'video' : 'image-sequence';
 
       if (ret.fileList?.length) {
         const paths = ret.fileList.map((f) => f.webkitRelativePath || f.name);
         parentPath = ret.root || commonPathPrefix(paths);
-        grouped = groupFilesByImmediateSubfolder(ret.fileList, parentPath);
+        grouped = groupParentFolderByCamera(ret.fileList, {
+          allowRootLevelVideos: props.dataType === VideoType,
+        }, parentPath);
         folderNames = [...grouped.keys()];
       } else {
         const [firstPath] = ret.filePaths;
         parentPath = firstPath;
-        folderNames = await listImmediateSubfolders!(parentPath);
+        desktopCameras = await listParentFolderCameras!(parentPath, mediaType);
+        folderNames = desktopCameras.map((camera) => camera.name);
       }
 
       const organized = organizeSubfolderCameras(folderNames, {
@@ -286,9 +291,19 @@ export function useImportMultiCamDialog(
 
       let { assignments } = organized;
       if (useDesktopDiscovery) {
-        assignments = applyParentPathToAssignments(parentPath, assignments);
+        if (desktopCameras?.length) {
+          assignments = assignments.map((assignment) => {
+            const discovered = desktopCameras?.find(
+              (camera) => camera.name === assignment.folderName,
+            );
+            return discovered
+              ? { ...assignment, sourcePath: discovered.sourcePath }
+              : assignment;
+          });
+        } else {
+          assignments = applyParentPathToAssignments(parentPath, assignments);
+        }
         if (resolveMulticamCameraSourcePath) {
-          const mediaType = props.dataType === VideoType ? 'video' : 'image-sequence';
           assignments = await Promise.all(assignments.map(async (assignment) => ({
             ...assignment,
             sourcePath: await resolveMulticamCameraSourcePath(assignment.sourcePath, mediaType),
@@ -313,7 +328,7 @@ export function useImportMultiCamDialog(
       for (let i = 0; i < registryPayload.length; i += 1) {
         const { cameraName, sourcePath, files } = registryPayload[i];
         if (grouped && !files.length) {
-          throw new Error(`Subfolder "${organized.assignments[i].folderName}" has no media files`);
+          throw new Error(`Camera "${organized.assignments[i].folderName}" has no media files`);
         }
         Vue.set(subfolderOriginalNames.value, cameraName, organized.assignments[i].folderName);
         Vue.set(folderList.value, cameraName, { sourcePath, trackFile: '' });
@@ -350,7 +365,7 @@ export function useImportMultiCamDialog(
     }
 
     Vue.set(folderList.value, newKey, {
-      sourcePath: (importType.value === 'subfolders' && !listImmediateSubfolders) ? newKey : sourcePath,
+      sourcePath: (importType.value === 'subfolders' && !listParentFolderCameras) ? newKey : sourcePath,
       trackFile: entry.trackFile,
     });
     Vue.delete(folderList.value, oldKey);