canvaslms-cli 1.4.1 → 1.4.2

package/commands/submit.js

@@ -5,7 +5,7 @@
 import fs from 'fs';
 import path from 'path';
 import { makeCanvasRequest } from '../lib/api-client.js';
-import { createReadlineInterface, askQuestion, askConfirmation, selectFilesImproved, pad } from '../lib/interactive.js';
+import { createReadlineInterface, askQuestion, askConfirmation, selectFilesImproved, selectFilesInteractive, pad } from '../lib/interactive.js';
 import { uploadSingleFileToCanvas, submitAssignmentWithFiles } from '../lib/file-upload.js';
 import chalk from 'chalk';
 
@@ -146,15 +146,32 @@ export async function submitAssignment(options) {
           return;
         }
       }
-    }
-    // Step 3: Always list files in current directory and prompt user to select
+    }    // Step 3: Choose file selection method and select files
     let filePaths = [];
     console.log(chalk.cyan.bold('-'.repeat(60)));
-    console.log(chalk.cyan.bold('File Selection'));
+    console.log(chalk.cyan.bold('File Selection Method'));
     console.log(chalk.cyan('-'.repeat(60)));
     console.log(chalk.white('Course: ') + chalk.bold(selectedCourse.name));
     console.log(chalk.white('Assignment: ') + chalk.bold(selectedAssignment.name) + '\n');
-    filePaths = await selectFilesImproved(rl);
+    
+    console.log(chalk.yellow('📁 Choose file selection method:'));
+    console.log(chalk.white('1. ') + chalk.cyan('Enhanced Interactive Selector') + chalk.gray(' (Recommended - Visual browser with search, filters, and navigation)'));
+    console.log(chalk.white('2. ') + chalk.cyan('Text-based Selector') + chalk.gray(' (Traditional - Type filenames and wildcards)'));
+    console.log(chalk.white('3. ') + chalk.cyan('Basic Directory Listing') + chalk.gray(' (Simple - Select from numbered list)'));
+    
+    const selectorChoice = await askQuestion(rl, chalk.bold.cyan('\nChoose method (1-3): '));
+    
+    console.log(chalk.cyan.bold('-'.repeat(60)));
+    console.log(chalk.cyan.bold('File Selection'));
+    console.log(chalk.cyan('-'.repeat(60)));
+    
+    if (selectorChoice === '1') {
+      filePaths = await selectFilesInteractive(rl);
+    } else if (selectorChoice === '2') {
+      filePaths = await selectFilesImproved(rl);
+    } else {
+      filePaths = await selectFiles(rl);
+    }
     // Validate all selected files exist
     const validFiles = [];
     for (const file of filePaths) {

package/lib/file-upload.js

@@ -3,6 +3,7 @@
  */
 
 import fs from 'fs';
+import path from 'path';
 import axios from 'axios';
 import FormData from 'form-data';
 import { makeCanvasRequest } from './api-client.js';
@@ -17,7 +18,7 @@ export async function uploadSingleFileToCanvas(courseId, assignmentId, filePath)
       throw new Error(`File not found: ${filePath}`);
     }
 
-    const fileName = require('path').basename(filePath);
+    const fileName = path.basename(filePath);
     const fileContent = fs.readFileSync(filePath);
     
     // Step 1: Get upload URL from Canvas

package/lib/interactive.js

@@ -359,6 +359,421 @@ async function selectFilesImproved(rl, currentDir = process.cwd()) {
   return selectedFiles;
 }
 
+/**
+ * Enhanced interactive file selector with real-time preview and navigation
+ */
+async function selectFilesInteractive(rl, currentDir = process.cwd()) {
+  const selectedFiles = [];
+  let currentPath = currentDir;
+  let fileList = [];
+  let currentPage = 0;
+  const itemsPerPage = 10;
+
+  // Helper function to refresh file list
+  function refreshFileList() {
+    try {
+      const entries = fs.readdirSync(currentPath);
+      fileList = [];
+      
+      // Add parent directory option if not at root
+      if (currentPath !== currentDir) {
+        fileList.push({
+          name: '📁 .. (Parent Directory)',
+          path: path.dirname(currentPath),
+          type: 'parent',
+          size: 0
+        });
+      }
+      
+      // Add directories first
+      entries.forEach(entry => {
+        const fullPath = path.join(currentPath, entry);
+        try {
+          const stats = fs.statSync(fullPath);
+          if (stats.isDirectory() && !['node_modules', '.git', 'dist', 'build', '.vscode'].includes(entry)) {
+            fileList.push({
+              name: `📁 ${entry}`,
+              path: fullPath,
+              type: 'directory',
+              size: 0
+            });
+          }
+        } catch (e) {}
+      });
+      
+      // Add files
+      entries.forEach(entry => {
+        const fullPath = path.join(currentPath, entry);
+        try {
+          const stats = fs.statSync(fullPath);
+          if (stats.isFile()) {
+            const icon = getFileIcon(entry);
+            fileList.push({
+              name: `${icon} ${entry}`,
+              path: fullPath,
+              type: 'file',
+              size: stats.size
+            });
+          }
+        } catch (e) {}
+      });
+    } catch (error) {
+      console.log(chalk.red('Error reading directory: ' + error.message));
+    }
+  }
+
+  // Helper function to get file icon based on extension
+  function getFileIcon(filename) {
+    const ext = path.extname(filename).toLowerCase();
+    const icons = {
+      '.pdf': '📄', '.doc': '📄', '.docx': '📄', '.txt': '📄',
+      '.js': '📜', '.ts': '📜', '.py': '📜', '.java': '📜', '.cpp': '📜', '.c': '📜',
+      '.html': '🌐', '.css': '🎨', '.scss': '🎨', '.less': '🎨',
+      '.json': '⚙️', '.xml': '⚙️', '.yml': '⚙️', '.yaml': '⚙️',
+      '.zip': '📦', '.rar': '📦', '.7z': '📦', '.tar': '📦',
+      '.jpg': '🖼️', '.jpeg': '🖼️', '.png': '🖼️', '.gif': '🖼️', '.svg': '🖼️',
+      '.mp4': '🎬', '.avi': '🎬', '.mov': '🎬', '.mkv': '🎬',
+      '.mp3': '🎵', '.wav': '🎵', '.flac': '🎵'
+    };
+    return icons[ext] || '📋';
+  }
+
+  // Helper function to display current page
+  function displayPage() {
+    console.clear();
+    console.log(chalk.cyan.bold('╭' + '─'.repeat(78) + '╮'));
+    console.log(chalk.cyan.bold('│') + chalk.white.bold(' Interactive File Selector'.padEnd(76)) + chalk.cyan.bold('│'));
+    console.log(chalk.cyan.bold('╰' + '─'.repeat(78) + '╯'));
+    
+    // Display current path
+    const relativePath = path.relative(currentDir, currentPath) || '.';
+    console.log(chalk.yellow('📂 Current folder: ') + chalk.white.bold(relativePath));
+    
+    // Display selected files count
+    if (selectedFiles.length > 0) {
+      const totalSize = selectedFiles.reduce((sum, file) => {
+        try {
+          return sum + fs.statSync(file).size;
+        } catch {
+          return sum;
+        }
+      }, 0);
+      console.log(chalk.green(`✅ Selected: ${selectedFiles.length} files (${(totalSize / 1024).toFixed(1)} KB)`));
+    }
+    
+    console.log();
+    
+    if (fileList.length === 0) {
+      console.log(chalk.yellow('📭 No files found in this directory.'));
+      return;
+    }
+    
+    const startIdx = currentPage * itemsPerPage;
+    const endIdx = Math.min(startIdx + itemsPerPage, fileList.length);
+    const pageItems = fileList.slice(startIdx, endIdx);
+    
+    // Display page header
+    console.log(chalk.cyan(`📋 Showing ${startIdx + 1}-${endIdx} of ${fileList.length} items (Page ${currentPage + 1}/${Math.ceil(fileList.length / itemsPerPage)})`));
+    console.log(chalk.gray('─'.repeat(80)));
+    
+    // Display items
+    pageItems.forEach((item, index) => {
+      const globalIndex = startIdx + index + 1;
+      const isSelected = selectedFiles.includes(item.path);
+      const prefix = isSelected ? chalk.green('✓') : chalk.white(globalIndex.toString().padStart(2));
+      const sizeDisplay = item.type === 'file' ? chalk.gray(`(${(item.size / 1024).toFixed(1)} KB)`) : '';
+      
+      if (isSelected) {
+        console.log(`${prefix} ${chalk.green(item.name)} ${sizeDisplay}`);
+      } else if (item.type === 'parent') {
+        console.log(`${prefix} ${chalk.blue(item.name)}`);
+      } else if (item.type === 'directory') {
+        console.log(`${prefix} ${chalk.cyan(item.name)}`);
+      } else {
+        console.log(`${prefix} ${chalk.white(item.name)} ${sizeDisplay}`);
+      }
+    });
+    
+    console.log(chalk.gray('─'.repeat(80)));
+    displayCommands();
+  }
+  // Helper function to display available commands
+  function displayCommands() {
+    console.log(chalk.yellow.bold('Commands:'));
+    console.log(chalk.white('  1-9, 10+     ') + chalk.gray('Select/deselect file by number'));
+    console.log(chalk.white('  n/next/→    ') + chalk.gray('Next page'));
+    console.log(chalk.white('  p/prev/←    ') + chalk.gray('Previous page'));
+    console.log(chalk.white('  a/all       ') + chalk.gray('Select all files on current page'));
+    console.log(chalk.white('  c/clear     ') + chalk.gray('Clear all selections'));
+    console.log(chalk.white('  r/remove    ') + chalk.gray('Remove specific file from selection'));
+    console.log(chalk.white('  s/search    ') + chalk.gray('Search files by name or extension'));
+    console.log(chalk.white('  f/filter    ') + chalk.gray('Filter by file extension'));
+    console.log(chalk.white('  h/help      ') + chalk.gray('Show detailed help'));
+    console.log(chalk.white('  q/quit      ') + chalk.gray('Finish selection'));
+    console.log();
+  }
+
+  // Main interaction loop
+  while (true) {
+    refreshFileList();
+    displayPage();
+    
+    const input = await askQuestion(rl, chalk.cyan.bold('Enter command: '));
+    const cmd = input.trim().toLowerCase();
+    
+    if (!cmd || cmd === 'q' || cmd === 'quit') {
+      break;
+    }
+      // Handle navigation
+    if (cmd === 'n' || cmd === 'next' || cmd === '→') {
+      if ((currentPage + 1) * itemsPerPage < fileList.length) {
+        currentPage++;
+      } else {
+        console.log(chalk.yellow('Already on last page!'));
+        await new Promise(resolve => setTimeout(resolve, 1000));
+      }
+      continue;
+    }
+    
+    if (cmd === 'p' || cmd === 'prev' || cmd === '←') {
+      if (currentPage > 0) {
+        currentPage--;
+      } else {
+        console.log(chalk.yellow('Already on first page!'));
+        await new Promise(resolve => setTimeout(resolve, 1000));
+      }
+      continue;
+    }
+    
+    // Handle help
+    if (cmd === 'h' || cmd === 'help') {
+      console.clear();
+      console.log(chalk.cyan.bold('╭' + '─'.repeat(78) + '╮'));
+      console.log(chalk.cyan.bold('│') + chalk.white.bold(' Interactive File Selector - Help'.padEnd(76)) + chalk.cyan.bold('│'));
+      console.log(chalk.cyan.bold('╰' + '─'.repeat(78) + '╯'));
+      console.log();
+      console.log(chalk.yellow.bold('📋 File Selection:'));
+      console.log(chalk.white('  • Type a number (1-9999) to toggle file selection'));
+      console.log(chalk.white('  • Files show with checkmarks (✓) when selected'));
+      console.log(chalk.white('  • Directories and parent folders can be navigated into'));
+      console.log();
+      console.log(chalk.yellow.bold('📁 Navigation:'));
+      console.log(chalk.white('  • Use n/next/→ to go to next page'));
+      console.log(chalk.white('  • Use p/prev/← to go to previous page'));
+      console.log(chalk.white('  • Click on folder numbers to enter directories'));
+      console.log(chalk.white('  • Use .. (Parent Directory) to go up one level'));
+      console.log();
+      console.log(chalk.yellow.bold('🔍 Advanced Features:'));
+      console.log(chalk.white('  • s/search: Find files by name or extension'));
+      console.log(chalk.white('  • f/filter: Filter and select by file extension'));
+      console.log(chalk.white('  • a/all: Select all files on current page'));
+      console.log(chalk.white('  • c/clear: Remove all selections'));
+      console.log(chalk.white('  • r/remove: Remove specific files from selection'));
+      console.log();
+      console.log(chalk.yellow.bold('💡 Tips:'));
+      console.log(chalk.white('  • File sizes are shown in KB'));
+      console.log(chalk.white('  • Your current selection count and size is displayed at top'));
+      console.log(chalk.white('  • Use search for large directories to find files quickly'));
+      console.log(chalk.white('  • Filter by extension (e.g., .pdf, .docx) for specific file types'));
+      console.log();
+      console.log(chalk.green('Press Enter to continue...'));
+      await askQuestion(rl, '');
+      continue;
+    }
+    
+    // Handle selection commands
+    if (cmd === 'a' || cmd === 'all') {
+      const startIdx = currentPage * itemsPerPage;
+      const endIdx = Math.min(startIdx + itemsPerPage, fileList.length);
+      let addedCount = 0;
+      
+      for (let i = startIdx; i < endIdx; i++) {
+        const item = fileList[i];
+        if (item.type === 'file' && !selectedFiles.includes(item.path)) {
+          selectedFiles.push(item.path);
+          addedCount++;
+        }
+      }
+      
+      console.log(chalk.green(`Added ${addedCount} files to selection!`));
+      await new Promise(resolve => setTimeout(resolve, 1000));
+      continue;
+    }
+    
+    if (cmd === 'c' || cmd === 'clear') {
+      const count = selectedFiles.length;
+      selectedFiles.length = 0;
+      console.log(chalk.yellow(`Cleared ${count} files from selection!`));
+      await new Promise(resolve => setTimeout(resolve, 1000));
+      continue;
+    }
+    
+    if (cmd === 'r' || cmd === 'remove') {
+      if (selectedFiles.length === 0) {
+        console.log(chalk.red('No files selected to remove!'));
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        continue;
+      }
+      
+      console.log(chalk.cyan('\nSelected files:'));
+      selectedFiles.forEach((file, index) => {
+        console.log(`${index + 1}. ${path.basename(file)}`);
+      });
+      
+      const removeInput = await askQuestion(rl, chalk.cyan('Enter number to remove (or press Enter to cancel): '));
+      const removeIndex = parseInt(removeInput) - 1;
+      
+      if (removeIndex >= 0 && removeIndex < selectedFiles.length) {
+        const removed = selectedFiles.splice(removeIndex, 1)[0];
+        console.log(chalk.green(`Removed: ${path.basename(removed)}`));
+      }
+      
+      await new Promise(resolve => setTimeout(resolve, 1000));
+      continue;
+    }
+    
+    if (cmd === 's' || cmd === 'search') {
+      const searchTerm = await askQuestion(rl, chalk.cyan('Enter search term (filename or extension): '));
+      if (searchTerm) {
+        const matches = fileList.filter(item => 
+          item.type === 'file' && 
+          (item.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
+           path.extname(item.path).toLowerCase() === searchTerm.toLowerCase())
+        );
+        
+        if (matches.length > 0) {
+          console.log(chalk.cyan(`\nFound ${matches.length} matches:`));
+          matches.forEach((item, index) => {
+            const isSelected = selectedFiles.includes(item.path);
+            const prefix = isSelected ? chalk.green('✓') : chalk.white((index + 1).toString());
+            console.log(`${prefix} ${item.name} ${chalk.gray(`(${(item.size / 1024).toFixed(1)} KB)`)}`);
+          });
+          
+          const selectAll = await askConfirmation(rl, chalk.cyan('Select all search results?'), false);
+          if (selectAll) {
+            matches.forEach(item => {
+              if (!selectedFiles.includes(item.path)) {
+                selectedFiles.push(item.path);
+              }
+            });
+            console.log(chalk.green(`Added ${matches.length} files!`));
+          }
+        } else {
+          console.log(chalk.yellow('No matches found.'));
+        }
+        
+        await new Promise(resolve => setTimeout(resolve, 2000));
+      }
+      continue;
+    }
+    
+    if (cmd === 'f' || cmd === 'filter') {
+      const allExtensions = [...new Set(
+        fileList
+          .filter(item => item.type === 'file')
+          .map(item => path.extname(item.path).toLowerCase())
+          .filter(ext => ext)
+      )].sort();
+      
+      if (allExtensions.length === 0) {
+        console.log(chalk.yellow('No file extensions found!'));
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        continue;
+      }
+      
+      console.log(chalk.cyan('\nAvailable extensions:'));
+      allExtensions.forEach((ext, index) => {
+        const count = fileList.filter(item => 
+          item.type === 'file' && path.extname(item.path).toLowerCase() === ext
+        ).length;
+        console.log(`${index + 1}. ${ext} (${count} files)`);
+      });
+      
+      const extChoice = await askQuestion(rl, chalk.cyan('Enter extension number (or press Enter to cancel): '));
+      const extIndex = parseInt(extChoice) - 1;
+      
+      if (extIndex >= 0 && extIndex < allExtensions.length) {
+        const selectedExt = allExtensions[extIndex];
+        const matches = fileList.filter(item => 
+          item.type === 'file' && path.extname(item.path).toLowerCase() === selectedExt
+        );
+        
+        const selectAll = await askConfirmation(rl, chalk.cyan(`Select all ${selectedExt} files?`), false);
+        if (selectAll) {
+          matches.forEach(item => {
+            if (!selectedFiles.includes(item.path)) {
+              selectedFiles.push(item.path);
+            }
+          });
+          console.log(chalk.green(`Added ${matches.length} ${selectedExt} files!`));
+        }
+      }
+      
+      await new Promise(resolve => setTimeout(resolve, 1000));
+      continue;
+    }
+    
+    // Handle numeric selection
+    const num = parseInt(cmd);
+    if (!isNaN(num) && num > 0 && num <= fileList.length) {
+      const item = fileList[num - 1];
+      
+      if (item.type === 'parent') {
+        currentPath = item.path;
+        currentPage = 0;
+        continue;
+      }
+      
+      if (item.type === 'directory') {
+        currentPath = item.path;
+        currentPage = 0;
+        continue;
+      }
+        if (item.type === 'file') {
+        const index = selectedFiles.indexOf(item.path);
+        if (index === -1) {
+          selectedFiles.push(item.path);
+          const size = (item.size / 1024).toFixed(1);
+          console.log(chalk.green(`✓ Added: ${path.basename(item.path)} (${size} KB)`));
+        } else {
+          selectedFiles.splice(index, 1);
+          console.log(chalk.yellow(`✗ Removed: ${path.basename(item.path)}`));
+        }
+        await new Promise(resolve => setTimeout(resolve, 800));
+        continue;
+      }
+    }
+      console.log(chalk.red('Invalid command!'));
+    await new Promise(resolve => setTimeout(resolve, 1000));
+  }
+  
+  // Display completion summary
+  if (selectedFiles.length > 0) {
+    console.clear();
+    console.log(chalk.green.bold('✅ File Selection Complete!'));
+    console.log(chalk.cyan('-'.repeat(50)));
+    
+    const totalSize = selectedFiles.reduce((sum, file) => {
+      try {
+        return sum + fs.statSync(file).size;
+      } catch {
+        return sum;
+      }
+    }, 0);
+    
+    console.log(chalk.white(`Selected ${selectedFiles.length} files (${(totalSize / 1024).toFixed(1)} KB total):`));
+    selectedFiles.forEach((file, index) => {
+      const stats = fs.statSync(file);
+      const size = (stats.size / 1024).toFixed(1) + ' KB';
+      console.log(pad(chalk.green(`${index + 1}.`), 5) + pad(path.basename(file), 35) + chalk.gray(size));
+    });
+    console.log(chalk.cyan('-'.repeat(50)));
+  } else {
+    console.log(chalk.yellow('No files selected.'));
+  }
+  
+  return selectedFiles;
+}
 
 export {
   createReadlineInterface,
@@ -367,6 +782,7 @@ export {
   askConfirmation,
   selectFromList,
   selectFilesImproved,
+  selectFilesInteractive,
   getFilesMatchingWildcard,
   getSubfoldersRecursive,
   pad

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canvaslms-cli",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "A command line tool for interacting with Canvas LMS API",
   "keywords": [
     "canvas",