canvaslms-cli 1.2.0 → 1.3.1

package/CHANGELOG.md

@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Remove files from selection
   - Show currently selected files
   - Smart file filtering (excludes hidden files, package files)
+  - **Wildcard support**: Use patterns like *.html, *.js, *.pdf to select multiple files
+  - File type icons for better visual identification
 
 - **Improved Grade Viewing**:
   - Interactive course selection for grade viewing
@@ -41,6 +43,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Announcements Command**: Show course names instead of IDs
 - **User Experience**: More consistent and intuitive interfaces across all commands
 
+### Fixed
+
+- **Assignment Name Display**: Fixed "Unknown Assignment" issue in submission summary
+- **File Selection Flow**: Better error handling and user guidance during file selection
+- **Variable Scope**: Proper assignment variable handling throughout submission process
+
 ### Technical
 
 - Enhanced interactive utilities in `lib/interactive.js`

package/commands/submit.js

@@ -5,7 +5,7 @@
 const fs = require('fs');
 const path = require('path');
 const { makeCanvasRequest } = require('../lib/api-client');
-const { createReadlineInterface, askQuestion } = require('../lib/interactive');
+const { createReadlineInterface, askQuestion, askConfirmation, selectFilesImproved } = require('../lib/interactive');
 const { uploadSingleFileToCanvas, submitAssignmentWithFiles } = require('../lib/file-upload');
 
 async function submitAssignment(options) {
@@ -130,9 +130,7 @@ async function submitAssignment(options) {
           console.log(`   📋 Note: This assignment doesn't accept file uploads`);
         }
       });
-      
-      const assignmentChoice = await askQuestion(rl, '\nEnter assignment number: ');
-      const assignmentIndex = parseInt(assignmentChoice) - 1;
+        const assignmentIndex = parseInt(assignmentChoice) - 1;
       
       if (assignmentIndex < 0 || assignmentIndex >= assignments.length) {
         console.log('Invalid assignment selection.');
@@ -140,7 +138,7 @@ async function submitAssignment(options) {
         return;
       }
       
-      const      selectedAssignment = assignments[assignmentIndex];
+      selectedAssignment = assignments[assignmentIndex];
       
       // Check if assignment accepts file uploads
       if (!selectedAssignment.submission_types || 
@@ -156,8 +154,8 @@ async function submitAssignment(options) {
       
       // Check if already submitted
       if (selectedAssignment.submission && selectedAssignment.submission.submitted_at) {
-        const resubmit = await askQuestion(rl, 'This assignment has already been submitted. Do you want to resubmit? (y/N): ');
-        if (resubmit.toLowerCase() !== 'y' && resubmit.toLowerCase() !== 'yes') {
+        const resubmit = await askConfirmation(rl, 'This assignment has already been submitted. Do you want to resubmit?', false);
+        if (!resubmit) {
           console.log('Submission cancelled.');
           rl.close();
           return;
@@ -167,16 +165,20 @@ async function submitAssignment(options) {
       // Fetch assignment details if ID was provided
       try {
         selectedAssignment = await makeCanvasRequest('get', `courses/${courseId}/assignments/${assignmentId}`);
+        console.log(`✅ Using assignment: ${selectedAssignment.name}\n`);
       } catch (error) {
         console.log(`⚠️  Could not fetch assignment details for ID ${assignmentId}`);
         selectedAssignment = { id: assignmentId, name: `Assignment ${assignmentId}` };
       }
-    }
-      // Step 3: Select Files (if not provided)
+    }    // Step 3: Select Files (if not provided)
     let filePaths = [];
     if (filePath) {
       filePaths = [filePath]; // Single file provided via option
     } else {
+      console.log('\n📁 File Selection');
+      console.log(`📚 Course: ${selectedCourse.name}`);
+      console.log(`📝 Assignment: ${selectedAssignment.name}\n`);
+      
       filePaths = await selectFilesImproved(rl);
     }
     
@@ -197,7 +199,8 @@ async function submitAssignment(options) {
     }
     
     filePaths = validFiles;
-      // Step 4: Confirm and Submit
+
+    // Step 4: Confirm and Submit
     console.log('\n📋 Submission Summary:');
     console.log(`📚 Course: ${selectedCourse?.name || 'Unknown Course'}`);
     console.log(`📝 Assignment: ${selectedAssignment?.name || 'Unknown Assignment'}`);
@@ -208,8 +211,8 @@ async function submitAssignment(options) {
       console.log(`  ${index + 1}. ${path.basename(file)} (${size})`);
     });
     
-    const confirm = await askQuestion(rl, '\nProceed with submission? (Y/n): ');
-    if (confirm.toLowerCase() === 'n' || confirm.toLowerCase() === 'no') {
+    const confirm = await askConfirmation(rl, '\nProceed with submission?', true);
+    if (!confirm) {
       console.log('Submission cancelled.');
       rl.close();
       return;
@@ -226,11 +229,10 @@ async function submitAssignment(options) {
       try {
         const fileId = await uploadSingleFileToCanvas(courseId, assignmentId, currentFile);
         uploadedFileIds.push(fileId);
-        console.log(`✅ ${path.basename(currentFile)} uploaded successfully`);
-      } catch (error) {
+        console.log(`✅ ${path.basename(currentFile)} uploaded successfully`);      } catch (error) {
         console.error(`❌ Failed to upload ${currentFile}: ${error.message}`);
-        const continueUpload = await askQuestion(rl, 'Continue with remaining files? (Y/n): ');
-        if (continueUpload.toLowerCase() === 'n' || continueUpload.toLowerCase() === 'no') {
+        const continueUpload = await askConfirmation(rl, 'Continue with remaining files?', true);
+        if (!continueUpload) {
           break;
         }
       }
@@ -378,127 +380,6 @@ async function selectSingleFileFromList(rl, files) {
   }
 }
 
-async function selectFilesImproved(rl) {
-  console.log('📁 Enhanced File Selection');
-  console.log('Choose files by entering their paths or browse current directory');
-  console.log('Press Enter with no input when done selecting files.\n');
-  
-  const allFiles = [];
-  let fileIndex = 1;
-  
-  while (true) {
-    console.log(`\n📎 File ${fileIndex} selection:`);
-    console.log('1. Enter file path directly');
-    console.log('2. Browse current directory');
-    console.log('3. Show currently selected files');
-    console.log('(Press Enter with no input to finish selection)');
-    
-    const choice = await askQuestion(rl, '\nChoose option (1-3 or Enter to finish): ');
-    
-    // Empty input means we're done selecting files
-    if (choice.trim() === '') {
-      if (allFiles.length === 0) {
-        console.log('⚠️  No files selected. Please select at least one file.');
-        continue;
-      }
-      break;
-    }
-    
-    if (choice === '1') {
-      // Direct file path entry
-      const filePath = await askQuestion(rl, 'Enter file path: ');
-      if (filePath.trim() !== '') {
-        if (fs.existsSync(filePath.trim())) {
-          if (!allFiles.includes(filePath.trim())) {
-            allFiles.push(filePath.trim());
-            const stats = fs.statSync(filePath.trim());
-            const size = (stats.size / 1024).toFixed(1) + ' KB';
-            console.log(`✅ Added: ${path.basename(filePath.trim())} (${size})`);
-            fileIndex++;
-          } else {
-            console.log('⚠️  File already selected.');
-          }
-        } else {
-          console.log('❌ File not found. Please check the path.');
-        }
-      }
-    } else if (choice === '2') {
-      // Browse current directory
-      try {
-        const files = fs.readdirSync('.').filter(file => {
-          const stats = fs.statSync(file);
-          return stats.isFile() && 
-                 !file.startsWith('.') &&
-                 !['package.json', 'package-lock.json', 'node_modules'].includes(file);
-        });
-        
-        if (files.length === 0) {
-          console.log('No suitable files found in current directory.');
-          continue;
-        }
-        
-        console.log('\n📂 Files in current directory:');
-        files.forEach((file, index) => {
-          const stats = fs.statSync(file);
-          const size = (stats.size / 1024).toFixed(1) + ' KB';
-          const alreadySelected = allFiles.includes(file) ? ' ✅' : '';
-          console.log(`${index + 1}. ${file} (${size})${alreadySelected}`);
-        });
-        
-        const fileChoice = await askQuestion(rl, '\nEnter file number (or Enter to go back): ');
-        if (fileChoice.trim() !== '') {
-          const fileIdx = parseInt(fileChoice) - 1;
-          if (fileIdx >= 0 && fileIdx < files.length) {
-            const selectedFile = files[fileIdx];
-            if (!allFiles.includes(selectedFile)) {
-              allFiles.push(selectedFile);
-              const stats = fs.statSync(selectedFile);
-              const size = (stats.size / 1024).toFixed(1) + ' KB';
-              console.log(`✅ Added: ${selectedFile} (${size})`);
-              fileIndex++;
-            } else {
-              console.log('⚠️  File already selected.');
-            }
-          } else {
-            console.log('❌ Invalid file number.');
-          }
-        }
-      } catch (error) {
-        console.log('❌ Error reading directory:', error.message);
-      }
-    } else if (choice === '3') {
-      // Show currently selected files
-      if (allFiles.length === 0) {
-        console.log('📋 No files selected yet.');
-      } else {
-        console.log(`\n📋 Currently selected files (${allFiles.length}):`);
-        allFiles.forEach((file, index) => {
-          const stats = fs.existsSync(file) ? fs.statSync(file) : null;
-          const size = stats ? (stats.size / 1024).toFixed(1) + ' KB' : 'File not found';
-          console.log(`  ${index + 1}. ${path.basename(file)} (${size})`);
-        });
-        
-        const removeFile = await askQuestion(rl, '\nRemove a file? Enter number or press Enter to continue: ');
-        if (removeFile.trim() !== '') {
-          const removeIdx = parseInt(removeFile) - 1;
-          if (removeIdx >= 0 && removeIdx < allFiles.length) {
-            const removedFile = allFiles.splice(removeIdx, 1)[0];
-            console.log(`🗑️  Removed: ${path.basename(removedFile)}`);
-            fileIndex--;
-          } else {
-            console.log('❌ Invalid file number.');
-          }
-        }
-      }
-    } else {
-      console.log('❌ Invalid option. Please choose 1, 2, 3, or press Enter to finish.');
-    }
-  }
-  
-  console.log(`\n✅ File selection complete! Selected ${allFiles.length} file(s).`);
-  return allFiles;
-}
-
 module.exports = {
   submitAssignment
 };

package/lib/interactive.js

@@ -3,6 +3,8 @@
  */
 
 const readline = require('readline');
+const fs = require('fs');
+const path = require('path');
 
 /**
  * Create readline interface for user input
@@ -98,10 +100,226 @@ async function selectFromList(rl, items, displayProperty = null, allowCancel = t
   return items[choice - 1];
 }
 
+/**
+ * Get files matching a wildcard pattern
+ */
+function getFilesMatchingWildcard(pattern, currentDir = process.cwd()) {
+  try {
+    const files = fs.readdirSync(currentDir);
+    const matchedFiles = [];
+    
+    // Convert wildcard pattern to regex
+    let regexPattern;
+    if (pattern.startsWith('*.')) {
+      // Handle *.extension patterns
+      const extension = pattern.slice(2);
+      regexPattern = new RegExp(`\\.${extension.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`, 'i');
+    } else if (pattern.includes('*')) {
+      // Handle other wildcard patterns
+      regexPattern = new RegExp(pattern.replace(/\*/g, '.*').replace(/\?/g, '.'), 'i');
+    } else {
+      // Exact match
+      regexPattern = new RegExp(`^${pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`, 'i');
+    }
+    
+    files.forEach(file => {
+      const filePath = path.join(currentDir, file);
+      const stats = fs.statSync(filePath);
+      
+      if (stats.isFile() && regexPattern.test(file)) {
+        matchedFiles.push(filePath);
+      }
+    });
+    
+    return matchedFiles;
+  } catch (error) {
+    console.error(`Error reading directory: ${error.message}`);
+    return [];
+  }
+}
+
+/**
+ * Enhanced file selection with wildcard support
+ */
+async function selectFilesImproved(rl, currentDir = process.cwd()) {
+  const selectedFiles = [];
+  
+  console.log('\n📁 Enhanced File Selection');
+  console.log('💡 Tips:');
+  console.log('  • Type filename to add individual files');
+  console.log('  • Use wildcards: *.html, *.js, *.pdf, etc.');
+  console.log('  • Type "browse" to see available files');
+  console.log('  • Type "remove" to remove files from selection');
+  console.log('  • Press Enter with no input to finish selection\n');
+  
+  while (true) {
+    // Show current selection
+    if (selectedFiles.length > 0) {
+      console.log(`\n📋 Currently selected (${selectedFiles.length} files):`);
+      selectedFiles.forEach((file, index) => {
+        const stats = fs.statSync(file);
+        const size = (stats.size / 1024).toFixed(1) + ' KB';
+        console.log(`  ${index + 1}. ${path.basename(file)} (${size})`);
+      });
+    }
+    
+    const input = await askQuestion(rl, '\n📎 Add file (or press Enter to finish): ');
+    
+    if (!input.trim()) {
+      // Empty input - finish selection
+      break;
+    }
+    
+    if (input.toLowerCase() === 'browse') {
+      // Show available files
+      console.log('\n📂 Available files in current directory:');
+      try {
+        const files = fs.readdirSync(currentDir);
+        const filteredFiles = files.filter(file => {
+          const filePath = path.join(currentDir, file);
+          const stats = fs.statSync(filePath);
+          return stats.isFile() && 
+                 !file.startsWith('.') && 
+                 !['package.json', 'package-lock.json', 'node_modules'].includes(file);
+        });
+        
+        if (filteredFiles.length === 0) {
+          console.log('  No suitable files found.');
+        } else {
+          filteredFiles.forEach((file, index) => {
+            const filePath = path.join(currentDir, file);
+            const stats = fs.statSync(filePath);
+            const size = (stats.size / 1024).toFixed(1) + ' KB';
+            const ext = path.extname(file);
+            const icon = getFileIcon(ext);
+            console.log(`  ${index + 1}. ${icon} ${file} (${size})`);
+          });
+        }
+      } catch (error) {
+        console.log(`  Error reading directory: ${error.message}`);
+      }
+      continue;
+    }
+    
+    if (input.toLowerCase() === 'remove') {
+      // Remove files from selection
+      if (selectedFiles.length === 0) {
+        console.log('❌ No files selected to remove.');
+        continue;
+      }
+      
+      console.log('\nSelect file to remove:');
+      selectedFiles.forEach((file, index) => {
+        console.log(`${index + 1}. ${path.basename(file)}`);
+      });
+      
+      const removeChoice = await askQuestion(rl, '\nEnter number to remove (or press Enter to cancel): ');
+      if (removeChoice.trim()) {
+        const removeIndex = parseInt(removeChoice) - 1;
+        if (removeIndex >= 0 && removeIndex < selectedFiles.length) {
+          const removedFile = selectedFiles.splice(removeIndex, 1)[0];
+          console.log(`✅ Removed: ${path.basename(removedFile)}`);
+        } else {
+          console.log('❌ Invalid selection.');
+        }
+      }
+      continue;
+    }
+    
+    // Check if input contains wildcards
+    if (input.includes('*') || input.includes('?')) {
+      const matchedFiles = getFilesMatchingWildcard(input, currentDir);
+      
+      if (matchedFiles.length === 0) {
+        console.log(`❌ No files found matching pattern: ${input}`);
+        continue;
+      }
+      
+      console.log(`\n🎯 Found ${matchedFiles.length} files matching "${input}":`);
+      matchedFiles.forEach((file, index) => {
+        const stats = fs.statSync(file);
+        const size = (stats.size / 1024).toFixed(1) + ' KB';
+        console.log(`  ${index + 1}. ${path.basename(file)} (${size})`);
+      });
+      
+      const confirmAll = await askConfirmation(rl, `Add all ${matchedFiles.length} files?`, true);
+      
+      if (confirmAll) {
+        const newFiles = matchedFiles.filter(file => !selectedFiles.includes(file));
+        selectedFiles.push(...newFiles);
+        console.log(`✅ Added ${newFiles.length} new files (${matchedFiles.length - newFiles.length} were already selected)`);
+      }
+      continue;
+    }
+    
+    // Handle individual file selection
+    let filePath = input;
+    
+    // If not absolute path, make it relative to current directory
+    if (!path.isAbsolute(filePath)) {
+      filePath = path.join(currentDir, filePath);
+    }
+    
+    try {
+      if (!fs.existsSync(filePath)) {
+        console.log(`❌ File not found: ${input}`);
+        continue;
+      }
+      
+      const stats = fs.statSync(filePath);
+      if (!stats.isFile()) {
+        console.log(`❌ Not a file: ${input}`);
+        continue;
+      }
+      
+      if (selectedFiles.includes(filePath)) {
+        console.log(`⚠️  File already selected: ${path.basename(filePath)}`);
+        continue;
+      }
+      
+      selectedFiles.push(filePath);
+      const size = (stats.size / 1024).toFixed(1) + ' KB';
+      console.log(`✅ Added: ${path.basename(filePath)} (${size})`);
+      
+    } catch (error) {
+      console.log(`❌ Error accessing file: ${error.message}`);
+    }
+  }
+  
+  return selectedFiles;
+}
+
+/**
+ * Get file icon based on extension
+ */
+function getFileIcon(extension) {
+  const iconMap = {
+    '.js': '📜',
+    '.html': '🌐',
+    '.css': '🎨',
+    '.pdf': '📄',
+    '.doc': '📝',
+    '.docx': '📝',
+    '.txt': '📄',
+    '.md': '📖',
+    '.json': '⚙️',
+    '.xml': '📋',
+    '.zip': '📦',
+    '.png': '🖼️',
+    '.jpg': '🖼️',
+    '.jpeg': '🖼️',
+    '.gif': '🖼️'
+  };
+  
+  return iconMap[extension.toLowerCase()] || '📎';
+}
+
 module.exports = {
   createReadlineInterface,
   askQuestion,
   askQuestionWithValidation,
   askConfirmation,
-  selectFromList
+  selectFromList,
+  selectFilesImproved,
+  getFilesMatchingWildcard
 };

package/package.json

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