feat(Admin > Resize): Move MP4s to videos folder

Author: danactive

src/lib/__tests__/rename-moveRaw.vitest.ts

@@ -22,24 +22,32 @@ describe('moveRaws function', () => {
   beforeEach(() => {
     vi.resetAllMocks()
     originalPath = '/'
-    filesOnDisk = ['image.heic', 'photo.heif', 'clip.raw', 'movie.mov', 'document.txt', 'photo.jpg']
+    filesOnDisk = [
+      'image.heic', 'photo.heif', 'clip.raw', 'movie.mov',
+      'document.txt', 'photo.jpg', 'video.mp4', 'video.orig.mp4',
+    ]
     errors = []
     formatErrorMessage = vi.fn((err, msg) => `${msg}: ${err.message}`)
   })
 
 
-  test("should create 'raws' folder and move all configured raw files", async () => {
+  test("should create 'raws' and 'videos' folder and move all configured raw and video files", async () => {
     vi.mocked(fs.mkdir).mockResolvedValue(undefined)
     vi.mocked(fs.rename).mockResolvedValue(undefined)
 
     await moveRaws({ originalPath, filesOnDisk, errors, formatErrorMessage })
 
     expect(fs.mkdir).toHaveBeenCalledWith(path.join(originalPath, 'raws'), { recursive: true })
-    expect(fs.rename).toHaveBeenCalledTimes(4)
+    expect(fs.mkdir).toHaveBeenCalledWith(path.join(originalPath, 'videos'), { recursive: true })
+    // 4 raw + 1 mp4 = 5 moves (movie.mov is raw, video.orig.mp4 should NOT be moved)
+    expect(fs.rename).toHaveBeenCalledTimes(5)
     expect(fs.rename).toHaveBeenCalledWith(path.join(originalPath, 'image.heic'), path.join(originalPath, 'raws/image.heic'))
     expect(fs.rename).toHaveBeenCalledWith(path.join(originalPath, 'photo.heif'), path.join(originalPath, 'raws/photo.heif'))
     expect(fs.rename).toHaveBeenCalledWith(path.join(originalPath, 'clip.raw'), path.join(originalPath, 'raws/clip.raw'))
     expect(fs.rename).toHaveBeenCalledWith(path.join(originalPath, 'movie.mov'), path.join(originalPath, 'raws/movie.mov'))
+    expect(fs.rename).toHaveBeenCalledWith(path.join(originalPath, 'video.mp4'), path.join(originalPath, 'videos/video.mp4'))
+    // .orig.mp4 should NOT be moved
+    expect(fs.rename).not.toHaveBeenCalledWith(path.join(originalPath, 'video.orig.mp4'), expect.any(String))
     expect(errors).toHaveLength(0)
   })
 
@@ -49,10 +57,14 @@ describe('moveRaws function', () => {
 
     await moveRaws({ originalPath, filesOnDisk, errors, formatErrorMessage })
 
-    // Only raw files should trigger errors
-    expect(errors).toHaveLength(4)
-    expect(formatErrorMessage).toHaveBeenCalledTimes(4)
+    // 4 raw files + 1 video file should trigger errors
+    expect(errors).toHaveLength(5)
+    expect(formatErrorMessage).toHaveBeenCalledTimes(5)
     expect(errors[0]).toContain('Error moving raw file: image.heic')
+    expect(errors[1]).toContain('Error moving raw file: photo.heif')
+    expect(errors[2]).toContain('Error moving raw file: clip.raw')
+    expect(errors[3]).toContain('Error moving raw file: movie.mov')
+    expect(errors[4]).toContain('Error moving video file: video.mp4')
   })
 
   test('should not move files not in config', async () => {

src/lib/rename.ts

@@ -124,7 +124,9 @@ async function moveRaws(
   { originalPath: string, filesOnDisk: string[], errors: string[], formatErrorMessage: ErrorFormatter },
 ) {
   const rawsPath = path.join(path.dirname(originalPath), 'raws')
+  const videosPath = path.join(path.dirname(originalPath), 'videos')
   await fs.mkdir(rawsPath, { recursive: true })
+  await fs.mkdir(videosPath, { recursive: true })
 
   // Collect all raw extensions from config (lowercase, with dot)
   const rawExtensions = new Set(
@@ -134,6 +136,11 @@ async function moveRaws(
       ...(config.rawFileTypes?.video ?? []),
     ].map(ext => `.${ext.toLowerCase()}`),
   )
+  const videoExtensions = new Set(
+    [
+      ...['mp4'],
+    ].map(ext => `.${ext.toLowerCase()}`),
+  )
 
   for (const file of filesOnDisk) {
     const ext = path.extname(file).toLowerCase()
@@ -148,6 +155,21 @@ async function moveRaws(
         errors.push(formatErrorMessage(err, `Error moving raw file: ${file}`))
       }
     }
+    // Skip .orig.mp4 files for video
+    if (
+      videoExtensions.has(ext) &&
+      !file.toLowerCase().endsWith('.orig.mp4')
+    ) {
+      const sourceFile = path.join(originalPath, file)
+      const destinationFile = path.join(videosPath, file)
+
+      try {
+        await fs.rename(sourceFile, destinationFile) // Move file
+        console.log(`Moved: ${file} → videos`)
+      } catch (err) {
+        errors.push(formatErrorMessage(err, `Error moving video file: ${file}`))
+      }
+    }
   }
 }