tronclass-auto 1.2.7 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tronclass-auto",
-  "version": "1.2.7",
+  "version": "1.3.2",
   "description": "自動觀看 eclass/TronClass 影片、填寫表單的 CLI 工具",
   "main": "src/index.js",
   "bin": {

package/src/index.js

@@ -26,7 +26,20 @@ async function getUncompleted(page, courseId) {
       const a = actScope.activity;
       let completeness = '';
       try { completeness = scope.getActivityCompleteness(a); } catch (e) {}
-      if (completeness !== 'full') {
+      if (completeness === 'full') return;
+
+      let isUpcoming = false;
+      let isExpired = false;
+      try { isUpcoming = scope.activityUpcoming(a); } catch (e) {}
+      try { isExpired = scope.activityExpired(a); } catch (e) {}
+      if (isUpcoming) return;
+
+      let timeRange = '';
+      try {
+        const txt = actEl.textContent || '';
+        const tm = txt.match(/時間:\s*(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2})\s*~\s*(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2})/);
+        if (tm) timeRange = tm[0];
+      } catch (e) {}
         let durationSec = 0;
         try {
           const durText = actEl.querySelector('.activity-attribute');
@@ -48,9 +61,9 @@ async function getUncompleted(page, courseId) {
           id: a.id,
           title: (a.title || '').substring(0, 60),
           type: a.type || '',
-          durationSec
+          durationSec,
+          timeRange
         });
-      }
     });
     return result;
   });
@@ -161,23 +174,30 @@ async function showStatus() {
     try {
       const uncompleted = await getUncompleted(page, courseId);
       const videos = uncompleted.filter(u => u.type === 'online_video');
+      const remaining = videos.filter(v => !isDone(courseId, v.id));
       const exams = uncompleted.filter(u => u.type === 'exam').length;
-      const other = uncompleted.length - videos.length - exams;
       totalVideos += videos.length;
-      totalRemaining += videos.length;
+      totalRemaining += remaining.length;
       totalExams += exams;
 
-      const bar = generateBar(videos.length, 50);
-      console.log(chalk.cyan('│') + `  [${courseId}] ${videos.length} videos ${exams} exams`.padEnd(50) + chalk.cyan('│'));
-      console.log(chalk.cyan('│') + `    ${bar}`.padEnd(50) + chalk.cyan('│'));
+      const pct = videos.length > 0 ? Math.floor(((videos.length - remaining.length) / videos.length) * 100) : 100;
+      const filled = Math.floor(50 * pct / 100);
+      const empty = 50 - filled;
+      const bar = pct === 100
+        ? chalk.green('█'.repeat(50))
+        : chalk.green('█'.repeat(filled)) + chalk.gray('░'.repeat(empty));
+
+      const doneCount = videos.length - remaining.length;
+      console.log(chalk.cyan('│') + `  [${courseId}] ${doneCount}/${videos.length} videos  ${exams} exams`.padEnd(50) + chalk.cyan('│'));
+      console.log(chalk.cyan('│') + `    ${bar} ${pct}%`.padEnd(52) + chalk.cyan('│'));
     } catch (e) {
       console.log(chalk.cyan('│') + `  [${courseId}] ERROR`.padEnd(50) + chalk.cyan('│'));
     }
   }
 
   console.log(chalk.cyan('├' + '─'.repeat(48) + '┤'));
-  console.log(chalk.cyan('│') + `  總計: ${totalRemaining} videos, ${totalExams} exams`.padEnd(50) + chalk.cyan('│'));
-  console.log(chalk.cyan('│') + `  預估時間: ${formatTime(totalRemaining * 120)}`.padEnd(50) + chalk.cyan('│'));
+  console.log(chalk.cyan('│') + `  剩餘: ${totalRemaining} videos  |  考試: ${totalExams}`.padEnd(50) + chalk.cyan('│'));
+  console.log(chalk.cyan('│') + `  預估: ${formatTime(totalRemaining * 120)}`.padEnd(50) + chalk.cyan('│'));
   console.log(chalk.cyan('└' + '─'.repeat(48) + '┘'));
   console.log('');
 

package/src/video.js

@@ -17,8 +17,7 @@ function progress(msg) {
 }
 
 function log(msg) {
-  process.stdout.write('\n');
-  progress(msg);
+  console.log(msg);
 }
 
 async function watchVideo(page, stats) {