thinkncollab-cli 0.0.32 → 0.0.34

package/bin/index.js

@@ -85,10 +85,11 @@ function shouldIgnore(relativePath, ignoreList) {
   });
 }
 
-/** ------------------ SCAN FOLDER ------------------ **/
+/** ------------------ SCAN FOLDER - FIXED ------------------ **/
 function scanFolder(folderPath, ignoreList, rootPath = folderPath) {
   const items = fs.readdirSync(folderPath, { withFileTypes: true });
   const result = [];
+  
   for (const item of items) {
     const fullPath = path.join(folderPath, item.name);
     const relativePath = path.relative(rootPath, fullPath);
@@ -102,15 +103,15 @@ function scanFolder(folderPath, ignoreList, rootPath = folderPath) {
       result.push({
         name: item.name,
         type: "folder",
-        children: scanFolder(fullPath, ignoreList, rootPath),
-        path: relativePath
+        children: scanFolder(fullPath, ignoreList, rootPath), // ✅ Keep same rootPath
+        path: item.name // ✅ Only store folder name, not full path
       });
     } else {
       const stats = fs.statSync(fullPath);
       result.push({
         name: item.name,
         type: "file",
-        path: relativePath,
+        path: relativePath, // ✅ Keep relative path for files
         size: stats.size
       });
     }
@@ -238,11 +239,18 @@ async function uploadFileSigned(filePath, folder, roomId, token, email) {
   return cloudRes.data.secure_url;
 }
 
+/** ------------------ UPLOAD TREE - FIXED PATH CONSTRUCTION ------------------ **/
 async function uploadTree(fileTree, folderHex, roomId, token, email, previousVersions, parentPath = "") {
   const uploaded = [];
 
   for (const node of fileTree) {
-    const relativePath = node.path || path.join(parentPath, node.name).replace(/\\/g, "/");
+    // ✅ FIXED: Correct path construction without duplication
+    let relativePath;
+    if (parentPath) {
+      relativePath = path.join(parentPath, node.name).replace(/\\/g, "/");
+    } else {
+      relativePath = node.path || node.name;
+    }
 
     if (node.type === "folder") {
       const children = await uploadTree(node.children, folderHex, roomId, token, email, previousVersions, relativePath);
@@ -259,7 +267,7 @@ async function uploadTree(fileTree, folderHex, roomId, token, email, previousVer
       if (node.changed) {
         try {
           console.log(`📤 Uploading changed file: ${relativePath}`);
-          const url = await uploadFileSigned(node.path, `tnc_uploads/${folderHex}`, roomId, token, email);
+          const url = await uploadFileSigned(path.join(CWD, node.path), `tnc_uploads/${folderHex}`, roomId, token, email);
           console.log(`✅ Uploaded: ${relativePath}`);
 
           uploaded.push({

package/commands/pull.js

@@ -54,33 +54,26 @@ async function processFolderContent(content, basePath = "") {
   let errorCount = 0;
 
   for (const item of content) {
-    const relPath = item.path ? item.path.replace(/^[\\/]+/, "") : item.name;
-    const itemPath = path.join(basePath, relPath);
-
-    // ✅ Skip .tnc folder and its contents
-    if (relPath.includes('.tnc') || itemPath.includes('.tnc')) {
-      console.log(chalk.gray(`⏭️  Skipping .tnc folder: ${itemPath}`));
-      skippedCount++;
+    // Skip folders entirely - only process files
+    if (item.type === "folder" && item.children) {
+      const result = await processFolderContent(item.children, basePath);
+      downloadedCount += result.downloadedCount;
+      skippedCount += result.skippedCount;
+      errorCount += result.errorCount;
       continue;
     }
 
-    // ✅ ONLY PROCESS FILES - Skip folders entirely
-    if (item.type === "folder") {
-      // Skip folder processing - we only care about files
-      if (item.children && item.children.length > 0) {
-        // Recursively process children files, but don't create folders
-        const result = await processFolderContent(item.children, itemPath);
-        downloadedCount += result.downloadedCount;
-        skippedCount += result.skippedCount;
-        errorCount += result.errorCount;
+    // Only process files
+    if (item.type === "file" && item.url) {
+      const itemPath = path.join(basePath, item.path);
+
+      // Skip .tnc files
+      if (itemPath.includes('.tnc')) {
+        skippedCount++;
+        continue;
       }
-      continue; // Skip the folder itself
-    }
 
-    // ✅ ONLY FILE PROCESSING LOGIC
-    if (item.type === "file" && item.url) {
       try {
-        // downloadFile will create necessary directories automatically
         if (fs.existsSync(itemPath)) {
           const existingStats = fs.statSync(itemPath);
           if (existingStats.size === item.size) {
@@ -98,9 +91,6 @@ async function processFolderContent(content, basePath = "") {
         console.error(chalk.red(`❌ Failed to download ${itemPath}: ${err.message}`));
         errorCount++;
       }
-    } else if (item.type === "file" && !item.url) {
-      console.log(chalk.magenta(`⚠️  No URL available for: ${itemPath}`));
-      skippedCount++;
     }
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thinkncollab-cli",
   "author": "Raman Singh",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "CLI tool for ThinkNCollab",
   "main": "index.js",
   "bin": {