auto-organize 1.0.0 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auto-organize",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "CLI tool to organize files in a directory based on their file types.",
   "main": "./bin/auto-organize.js",
   "bin": {
@@ -45,6 +45,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "chalk": "^5.6.2"
+    "chalk": "^5.6.2",
+    "ora": "^9.1.0"
   }
 }

package/src/cli/spinner.js

@@ -0,0 +1,8 @@
+import ora from "ora";
+
+function startSpinner(spinnerMessage) {
+  const spinner = ora(spinnerMessage).start();
+  return spinner;
+}
+
+export { startSpinner };

package/src/index.js

@@ -3,6 +3,7 @@ import { renderFoldersSummary } from './cli/renderSummary.js';
 import { parseArgs } from './utils/parseArgs.js';
 import { getAvailableTypes } from './rules/byType.js';
 import { cliActions } from './cli/cliActions.js';
+import { startSpinner } from './cli/spinner.js';
 
 function main() {
   try {
@@ -10,6 +11,7 @@ function main() {
     const cliFlags = parseArgs(cliArguments);
     const availableTypes = getAvailableTypes();
     const currentDir = process.cwd();
+    let spinner;
 
     const cliResult = cliActions(cliFlags, availableTypes);
 
@@ -17,13 +19,27 @@ function main() {
       process.exit(cliResult.code);
     }
 
+    spinner = startSpinner('Organizing files...');
     const summary = organizeDirectory(currentDir, cliFlags);
 
-    if(!summary) return;
+    if(!summary){
+      spinner.stop();
+      return;
+    } 
     
     renderFoldersSummary(summary);
 
+    if(summary.previewMode){
+      console.log("");
+      spinner.succeed('Preview generated successfully!');
+    }else{
+      spinner.succeed('Files organized successfully!');
+    }
+
   } catch (error) {
+    if(spinner){
+      spinner.fail('Error organizing files');
+    }
     console.error(`\nError: ${error.message}`);
     process.exit(1);
   }

package/src/organizer/organizeDirectory.js

@@ -1,8 +1,9 @@
 import path from 'path';
-import { getFilesFromDirectory, ensureDirectoryExists, moveFile } from '../utils/fsHelpers.js';
+import { getFilesFromDirectory, ensureDirectoryExists, fileExists, moveFile } from '../utils/fsHelpers.js';
 import { getFolderNameByExtensionType } from '../rules/byType.js';
 import { shouldSkipFile } from '../utils/filesFilters.js';
 import { renderEmptyFolderText } from '../cli/renderEmptyFolderText.js';
+import chalk from 'chalk';
 
 function organizeDirectory(baseDir, cliFlags = {}) {
   try{
@@ -37,10 +38,14 @@ function organizeDirectory(baseDir, cliFlags = {}) {
 
       if (folderByExtensionTypeWasCreated) folderByExtensionTypeCreated = true;
 
+      if (fileExists(filePathByExtension)){
+        throw new Error(`File collision detected: "${chalk.red(file.name)}" already exists in "${chalk.blueBright(folderNameByExtensionType)}/"`);
+      }
+
       moveFile(file.path, filePathByExtension);
     });
 
-    return {
+    return{
       foldersByExtensionType: outputFoldersSummary,
       folderWasCreated: folderByExtensionTypeCreated,
       previewMode: cliFlags.preview,

package/src/utils/fsHelpers.js

@@ -26,8 +26,12 @@ function ensureDirectoryExists(dirPath) {
   return false;
 }
 
+function fileExists(filePath) {
+  return fs.existsSync(filePath);
+}
+
 function moveFile(sourcePath, targetPath) {
   fs.renameSync(sourcePath, targetPath);
 }
 
-export { getFilesFromDirectory, ensureDirectoryExists, moveFile };
+export { getFilesFromDirectory, ensureDirectoryExists, fileExists, moveFile };