Add verbose logging flag

src/commands/common.ts

@@ -25,3 +25,9 @@ export const skipCorrectionsArg = flag({
   long: 'skip-corrections',
   description: 'Skips renaming wrong extensions identified by ExifTool.',
 });
+
+export const verboseArg = flag({
+  short: 'v',
+  long: 'verbose',
+  description: 'Enables verbose logging.',
+});

src/commands/migrate-flat.ts

@@ -5,6 +5,7 @@ import {
   errorDirArg,
   forceArg,
   timeoutArg,
+  verboseArg,
 } from './common';
 import { migrateDirFlatGen } from '../dir/migrate-flat';
 import { ExifTool } from 'exiftool-vendored';
@@ -28,8 +29,16 @@ export const migrateFlat = command({
     force: forceArg,
     timeout: timeoutArg,
     skipCorrections: skipCorrectionsArg,
+    verbose: verboseArg,
   },
-  handler: async ({ inputDir, outputDir, errorDir, force, timeout }) => {
+  handler: async ({
+    inputDir,
+    outputDir,
+    errorDir,
+    force,
+    timeout,
+    verbose,
+  }) => {
     const errs: string[] = [];
     const checkErrs = () => {
       if (errs.length !== 0) {
@@ -71,6 +80,7 @@ export const migrateFlat = command({
       errorDir,
       log: console.log,
       warnLog: console.error,
+      verboseLog: verbose ? console.log : undefined,
       exiftool: new ExifTool({ taskTimeoutMillis: timeout }),
       endExifTool: true,
     });

src/commands/migrate-full.ts

@@ -5,6 +5,7 @@ import {
   errorDirArg,
   forceArg,
   timeoutArg,
+  verboseArg,
 } from './common';
 import { migrateDirFullGen } from '..';
 import { ExifTool } from 'exiftool-vendored';
@@ -29,6 +30,7 @@ export const migrateFull = command({
     force: forceArg,
     timeout: timeoutArg,
     skipCorrections: skipCorrectionsArg,
+    verbose: verboseArg,
   },
   handler: async ({
     inputDir,
@@ -37,6 +39,7 @@ export const migrateFull = command({
     force,
     timeout,
     skipCorrections,
+    verbose,
   }) => {
     const errs: string[] = [];
     const checkErrs = () => {
@@ -71,6 +74,7 @@ export const migrateFull = command({
       outputDir,
       log: console.log,
       warnLog: console.error,
+      verboseLog: verbose ? console.log : undefined,
       exiftool: new ExifTool({ taskTimeoutMillis: timeout }),
       endExifTool: true,
       skipCorrections,

src/dir/migrate-full.ts

@@ -36,6 +36,7 @@ export async function* migrateDirFullGen(
     yield new NoPhotosDirError(migCtx.inputDir);
     return;
   }
+  migCtx.verboseLog(`Found google photos directory: ${googlePhotosDir}`);
 
   yield* restructureAndProcess(googlePhotosDir, migCtx);
 

src/dir/migration-args.ts

@@ -6,6 +6,7 @@ export type MigrationArgs = {
   errorDir: string;
   log?: (msg: string) => void;
   warnLog?: (msg: string) => void;
+  verboseLog?: (msg: string) => void;
   exiftool?: ExifTool;
   endExifTool?: boolean;
   skipCorrections?: boolean;
@@ -22,6 +23,7 @@ export async function migrationArgsDefaults(
     endExifTool: args.endExifTool ?? !args.exiftool,
     log: args.log ?? (() => {}),
     warnLog: args.warnLog ?? (() => {}),
+    verboseLog: args.verboseLog ?? (() => {}),
     skipCorrections: args.skipCorrections ?? false,
   };
 }

src/dir/restructure-and-process.ts

@@ -3,6 +3,7 @@ import { mkdir, readdir } from 'fs/promises';
 import { migrateDirFlatGen } from './migrate-flat';
 import { FullMigrationContext } from './migrate-full';
 import { untitledDirs } from '../config/langs';
+import { Dirent } from 'fs';
 
 async function* _restructureAndProcess(
   folders: string[],
@@ -47,9 +48,15 @@ export async function* restructureAndProcess(
   // $rootdir/AlbumsProcessed/My Album 2/*
   // $rootdir/PhotosProcessed/*
 
-  const allDirs = (await readdir(sourceDir, { withFileTypes: true })).filter(
-    (f) => f.isDirectory()
-  );
+  const verboseLogFiles = (label: string, files: (Dirent | string)[]) =>
+    migCtx.verboseLog(
+      `${label}: ${files.map((f) => (typeof f === 'string' ? basename(f) : f.name)).join(', ')}`
+    );
+
+  const dirents = await readdir(sourceDir, { withFileTypes: true });
+  verboseLogFiles('All entries', dirents);
+  const allDirs = dirents.filter((f) => f.isDirectory());
+  verboseLogFiles('Only dirs', allDirs);
 
   // move the "Photos from $YEAR" directories to Photos/
   migCtx.log('Processing photos...');
@@ -58,12 +65,14 @@ export async function* restructureAndProcess(
       .filter((f) => f.name === 'Photos' || f.name.startsWith('Photos from '))
       .map((f) => join(f.path, f.name))
   );
+  verboseLogFiles('Photos from year dirs', [...photosFromDirs]);
   yield* _restructureAndProcess([...photosFromDirs], false, migCtx);
 
   // move everythingg else to Albums/, so we end up with two top level folders
   migCtx.log('Processing albums...');
   const albumDirs = allDirs
     .filter((f) => !photosFromDirs.has(join(f.path, f.name)))
     .map((f) => join(f.path, f.name));
+  verboseLogFiles('Album list', albumDirs);
   yield* _restructureAndProcess(albumDirs, true, migCtx);
 }