redate-cli 0.3.0 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redate-cli",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "A CLI tool for renaming images based on EXIF data.",
   "type": "module",
   "main": "./src/core.js",

package/src/config.js

@@ -1,53 +1,10 @@
 import os from "os";
 import path from "path";
 import fs from "fs";
+import { DEFAULT_CONFIG, TOKENS } from "./defaults.js";
+const CONFIG_DIR = getConfigDir();
+const CONFIG_FILE = path.join(CONFIG_DIR, "cli-config.json");
 
-const CONFIG_DIR = path.join(os.homedir(), ".redate");
-const CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
-
-export const DEFAULT_CONFIG = {
-    format: "yyyy-mm-dd hh-min-ss",
-
-    fileHandling: "rename" // rename, copy, copy_in_folder
-};
-
-export const TOKENS = {
-    yyyy: { desc: "4-digit year", value: (date) => date.getFullYear() },
-    yy: { desc: "2-digit year", value: (date) => String(date.getFullYear()).slice(-2) },
-    mm: { desc: "Month with leading zero", value: (date) => String(date.getMonth() + 1).padStart(2, "0") },
-    m: { desc: "Month without leading zero", value: (date) => date.getMonth() + 1 },
-    mmm: { desc: "Short month name", value: (date) => date.toLocaleString("en-US", { month: "short" }) },
-    mmmm: { desc: "Full month name", value: (date) => date.toLocaleString("en-US", { month: "long" }) },
-    dd: { desc: "Day with leading zero", value: (date) => String(date.getDate()).padStart(2, "0") },
-    d: { desc: "Day without leading zero", value: (date) => date.getDate() },
-    ddd: { desc: "Day short name", value: (date) => date.toLocaleString("en-US", { weekday: "short" }) },
-    dddd: { desc: "Day full name", value: (date) => date.toLocaleString("en-US", { weekday: "long" }) },
-    hh: { desc: "Hour 00-23", value: (date) => String(date.getHours()).padStart(2, "0") },
-    h: { desc: "Hour 0-23", value: (date) => date.getHours() },
-    H: { desc: "Hour 1-12", value: (date) => ((date.getHours() + 11) % 12 + 1) },
-    HH: { desc: "Hour 01-12", value: (date) => String((date.getHours() + 11) % 12 + 1).padStart(2, "0") },
-    a: { desc: "AM/PM", value: (date) => date.getHours() < 12 ? "AM" : "PM" },
-    A: { desc: "am/pm", value: (date) => date.getHours() < 12 ? "am" : "pm" },
-    min: { desc: "Minutes with leading zero", value: (date) => String(date.getMinutes()).padStart(2, "0") },
-    m_: { desc: "Minutes without leading zero", value: (date) => date.getMinutes() },
-    ss: { desc: "Seconds with leading zero", value: (date) => String(date.getSeconds()).padStart(2, "0") },
-    s: { desc: "Seconds without leading zero", value: (date) => date.getSeconds() },
-    ms: { desc: "Milliseconds", value: (date) => date.getMilliseconds() },
-    w: {
-        desc: "Week of year", value: (date) => {
-            const start = new Date(date.getFullYear(), 0, 1);
-            const diff = (date - start) + ((start.getDay() + 6) % 7) * 86400000;
-            return Math.floor(diff / (7 * 86400000)) + 1;
-        }
-    },
-    D: {
-        desc: "Day of year", value: (date) => {
-            const start = new Date(date.getFullYear(), 0, 0);
-            const diff = date - start;
-            return Math.floor(diff / 86400000);
-        }
-    },
-};
 
 function ensureConfig() {
     if (!fs.existsSync(CONFIG_DIR)) {
@@ -93,4 +50,20 @@ function deepMerge(target, source) {
     }
 
     return output;
+}
+
+
+function getConfigDir() {
+
+    switch (process.platform) {
+        case "win32":
+            return path.join(process.env.LOCALAPPDATA || process.env.APPDATA, "Poutanen", "ReDate");
+
+        case "darwin":
+            return path.join(os.homedir(), "Library", "Application Support", "ReDate");
+
+        default:
+            const xdg = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
+            return path.join(xdg, appName);
+    }
 }

package/src/core.js

@@ -1,7 +1,8 @@
 import fs from "fs";
 import path from "path";
 import exifr from "exifr";
-import { getConfig, TOKENS } from "./config.js";
+import { getConfig } from "./config.js";
+import { TOKENS } from "./defaults.js";
 
 const fileHandlers = {
     rename: (src, dest) => {
@@ -24,52 +25,62 @@ const fileHandlers = {
 
 export async function redate(paths) {
     const config = getConfig();
+    const result = {
+        totalFiles: 0,
+        processed: 0,
+        skippedNoDate: 0,
+        errors: []
+    };
 
     for (const p of paths) {
         if (!fs.existsSync(p)) {
-            console.error(`Path does not exist: ${p}`);
+            result.errors.push(`Path does not exist: ${p}`);
             continue;
         }
 
         const stats = fs.statSync(p);
 
         if (stats.isFile()) {
-            await processFile(p, config);
+            await processFile(p, config, result);
         } else if (stats.isDirectory()) {
-            await processFiles(p, config);
+            await processFiles(p, config, result);
         }
     }
+
+    return result;
 }
 
 
-export async function processFiles(folderPath, config) {
-    if (!config || config == null) {
-        config = getConfig();
-    }
+export async function processFiles(folderPath, config, result) {
+    if (!config) config = getConfig();
     const files = fs.readdirSync(folderPath);
+
     for (const file of files) {
         const filePath = path.join(folderPath, file);
-
         if (!fs.statSync(filePath).isFile()) continue;
 
-        await processFile(filePath, config);
+        await processFile(filePath, config, result);
     }
 }
+export async function processFile(filePath, config, result) {
+    result.totalFiles += 1;
+
+    try {
+        const date = await getDateFromFile(filePath);
+        if (!date) {
+            result.skippedNoDate += 1;
+            return;
+        }
 
-export async function processFile(filePath, config) {
-    if (!config || config == null) {
-        config = getConfig();
-    }
-
-    const date = await getDateFromFile(filePath);
-    if (!date) return;
-
-    const originalName = path.basename(filePath);
-    const newFileName = formatFileName(date, originalName, config);
+        const originalName = path.basename(filePath);
+        const newFileName = formatFileName(date, originalName, config);
 
-    applyFileHandling(filePath, newFileName, config);
+        applyFileHandling(filePath, newFileName, config);
 
-    console.log(`Processed: ${newFileName}`);
+        result.processed += 1;
+    } catch (err) {
+        result.errors.push(`Error processing file ${filePath}: ${err.message}`);
+    }
 }
 function applyFileHandling(srcPath, newFileName, config) {
     const dir = path.dirname(srcPath);
@@ -109,7 +120,6 @@ export async function getDateFromFile(filePath) {
         exif?.ModifyDate;
 
     if (!date) {
-        console.error(`No EXIF date found for file: ${filePath}`);
         return null;
     };
 

package/src/defaults.js

@@ -0,0 +1,43 @@
+export const DEFAULT_CONFIG = {
+    format: "yyyy-mm-dd hh-min-ss",
+    fileHandling: "rename" // rename, copy, copy_in_folder
+};
+
+export const TOKENS = {
+    yyyy: { desc: "4-digit year", value: (date) => date.getFullYear() },
+    yy: { desc: "2-digit year", value: (date) => String(date.getFullYear()).slice(-2) },
+    mm: { desc: "Month with leading zero", value: (date) => String(date.getMonth() + 1).padStart(2, "0") },
+    m: { desc: "Month without leading zero", value: (date) => date.getMonth() + 1 },
+    mmm: { desc: "Short month name", value: (date) => date.toLocaleString("en-US", { month: "short" }) },
+    mmmm: { desc: "Full month name", value: (date) => date.toLocaleString("en-US", { month: "long" }) },
+    dd: { desc: "Day with leading zero", value: (date) => String(date.getDate()).padStart(2, "0") },
+    d: { desc: "Day without leading zero", value: (date) => date.getDate() },
+    ddd: { desc: "Day short name", value: (date) => date.toLocaleString("en-US", { weekday: "short" }) },
+    dddd: { desc: "Day full name", value: (date) => date.toLocaleString("en-US", { weekday: "long" }) },
+    hh: { desc: "Hour 00-23", value: (date) => String(date.getHours()).padStart(2, "0") },
+    h: { desc: "Hour 0-23", value: (date) => date.getHours() },
+    H: { desc: "Hour 1-12", value: (date) => ((date.getHours() + 11) % 12 + 1) },
+    HH: { desc: "Hour 01-12", value: (date) => String((date.getHours() + 11) % 12 + 1).padStart(2, "0") },
+    a: { desc: "AM/PM", value: (date) => date.getHours() < 12 ? "AM" : "PM" },
+    A: { desc: "am/pm", value: (date) => date.getHours() < 12 ? "am" : "pm" },
+    min: { desc: "Minutes with leading zero", value: (date) => String(date.getMinutes()).padStart(2, "0") },
+    m_: { desc: "Minutes without leading zero", value: (date) => date.getMinutes() },
+    ss: { desc: "Seconds with leading zero", value: (date) => String(date.getSeconds()).padStart(2, "0") },
+    s: { desc: "Seconds without leading zero", value: (date) => date.getSeconds() },
+    ms: { desc: "Milliseconds", value: (date) => date.getMilliseconds() },
+    w: {
+        desc: "Week of year",
+        value: (date) => {
+            const start = new Date(date.getFullYear(), 0, 1);
+            const diff = (date - start) + ((start.getDay() + 6) % 7) * 86400000;
+            return Math.floor(diff / (7 * 86400000)) + 1;
+        }
+    },
+    D: {
+        desc: "Day of year",
+        value: (date) => {
+            const start = new Date(date.getFullYear(), 0, 0);
+            return Math.floor((date - start) / 86400000);
+        }
+    }
+};

package/src/redate.js

@@ -3,7 +3,8 @@ import { Command } from "commander";
 import https from "https";
 import { execSync } from "child_process";
 import readline from "readline";
-import { getConfig, setConfig, TOKENS, DEFAULT_CONFIG } from "./config.js";
+import { getConfig, setConfig } from "./config.js";
+import { DEFAULT_CONFIG } from "./defaults.js";
 import redate from "./core.js";
 
 const program = new Command();
@@ -11,13 +12,20 @@ const program = new Command();
 program
     .name("redate")
     .description("Rename images based on EXIF dates")
-    .version("0.3.0");
+    .version("0.4.0");
 
 program
     .command("process <paths...>")
     .description("Process file(s) or folder(s)")
     .action(async (paths) => {
-        await redate(paths);
+        const result = await redate(paths);
+        console.log(`Total files: ${result.totalFiles}`);
+        console.log(`Processed: ${result.processed}`);
+        console.log(`Skipped (no date): ${result.skippedNoDate}`);
+        if (result.errors.length > 0) {
+            console.log("Errors:");
+            result.errors.forEach((err) => console.log(`  - ${err}`));
+        }
     });
 
 const configCommand = program