coursewatcher 1.3.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "coursewatcher",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "description": "A CLI tool and web interface for tracking progress in downloaded video courses",
     "main": "src/server.js",
     "bin": {

package/public/js/player.js

@@ -27,17 +27,17 @@
     const countdownProgress = document.getElementById('countdownProgress');
     const nextVideoTitle = document.getElementById('nextVideoTitle');
     const cancelAutoplayBtn = document.getElementById('cancelAutoplay');
-
-    if (!videoElement) return;
-
-    const videoId = videoElement.dataset.videoId;
-    const savedPosition = parseFloat(videoElement.dataset.savedPosition) || 0;
-    const nextVideoUrl = videoElement.dataset.nextVideoUrl;
-
-    let saveTimeout = null;
-    let lastSavedPosition = savedPosition;
-    let autoplayInterval = null;
-    let autoplayCountdown = AUTOPLAY_COUNTDOWN;
+
+    if (!videoElement) return;
+
+    const videoId = videoElement.dataset.videoId;
+    const startPosition = parseFloat(videoElement.dataset.startPosition) || 0;
+    const nextVideoUrl = videoElement.dataset.nextVideoUrl;
+
+    let saveTimeout = null;
+    let lastSavedPosition = startPosition;
+    let autoplayInterval = null;
+    let autoplayCountdown = AUTOPLAY_COUNTDOWN;
 
     // ==========================================
     // Initialization
@@ -67,14 +67,14 @@
             ]
         });
 
-        // Restore saved position and autoplay
-        player.on('ready', () => {
-            if (savedPosition > 0) {
-                player.currentTime = savedPosition;
-            }
-
-            // Always try to autoplay
-            player.play().catch(() => {
+        // Restore saved position and autoplay
+        player.on('ready', () => {
+            if (startPosition > 0) {
+                player.currentTime = startPosition;
+            }
+
+            // Always try to autoplay
+            player.play().catch(() => {
                 // Autoplay might be blocked by browser on first visit, ignore
                 console.log('Autoplay was prevented by browser');
             });

package/src/controllers/video-controller.js

@@ -6,9 +6,21 @@
  * @module controllers/video-controller
  */
 
-const path = require('path');
-const express = require('express');
-const { NotFoundError } = require('../utils/errors');
+const path = require('path');
+const express = require('express');
+const { config } = require('../utils/config');
+const { NotFoundError } = require('../utils/errors');
+
+function getPlaybackStartPosition(video) {
+    const isShortVideo = video.duration > 0
+        && video.duration < config.shortVideoResumeCutoffSeconds;
+
+    if (video.status === 'completed' || isShortVideo) {
+        return 0;
+    }
+
+    return video.status === 'in-progress' ? video.position : 0;
+}
 
 /**
  * Create video routes
@@ -46,20 +58,22 @@ function createVideoRoutes(services) {
         try {
             const videoId = parseInt(req.params.id, 10);
             const video = videoService.getVideoById(videoId);
-            const adjacent = videoService.getAdjacentVideos(videoId);
-            const notes = notesService.getNotes(videoId);
-            const queue = videoService.getQueueVideos(videoId);
-
-            res.render('pages/player', {
-                title: video.title,
-                video,
-                adjacent,
-                notes,
-                queue,
-            });
-        } catch (err) {
-            next(err);
-        }
+            const adjacent = videoService.getAdjacentVideos(videoId);
+            const notes = notesService.getNotes(videoId);
+            const queue = videoService.getQueueVideos(videoId);
+            const startPosition = getPlaybackStartPosition(video);
+
+            res.render('pages/player', {
+                title: video.title,
+                video,
+                adjacent,
+                notes,
+                queue,
+                startPosition,
+            });
+        } catch (err) {
+            next(err);
+        }
     });
 
     /**

package/src/services/progress-service.js

@@ -28,47 +28,68 @@ class ProgressService {
      * @param {number} [duration] - Video duration in seconds
      * @returns {Object} Updated video
      */
-    updatePosition(videoId, position, duration = null) {
-        // Validate inputs
-        if (typeof position !== 'number' || position < 0) {
-            throw new ValidationError('Position must be a non-negative number');
-        }
+    updatePosition(videoId, position, duration = null) {
+        // Validate inputs
+        if (typeof position !== 'number' || position < 0) {
+            throw new ValidationError('Position must be a non-negative number');
+        }
 
         // Get current video
         const video = this._db.get('SELECT * FROM videos WHERE id = ?', [videoId]);
         if (!video) {
             throw new NotFoundError(`Video with id ${videoId}`);
         }
-
-        // Determine new status based on position
-        let newStatus = video.status;
-        const videoDuration = duration || video.duration;
-
-        if (videoDuration > 0) {
-            const watchPercent = position / videoDuration;
-
-            if (watchPercent >= config.completionThreshold) {
-                newStatus = 'completed';
-            } else if (position > 0) {
-                newStatus = 'in-progress';
-            }
-        } else if (position > 0 && video.status === 'unwatched') {
-            newStatus = 'in-progress';
-        }
-
-        // Update database
-        this._db.run(
-            `UPDATE videos 
-       SET position = ?, 
-           duration = COALESCE(?, duration),
-           status = ?,
-           updated_at = CURRENT_TIMESTAMP
-       WHERE id = ?`,
-            [position, duration, newStatus, videoId]
-        );
-
-        return this._db.get('SELECT * FROM videos WHERE id = ?', [videoId]);
-    }
+
+        // Determine new status based on position
+        let newStatus = video.status;
+        const videoDuration = typeof duration === 'number' && !Number.isNaN(duration)
+            ? duration
+            : video.duration;
+        const isShortVideo = videoDuration > 0
+            && videoDuration < config.shortVideoResumeCutoffSeconds;
+        const completionPosition = videoDuration * config.completionThreshold;
+
+        if (videoDuration > 0) {
+            const watchPercent = position / videoDuration;
+
+            if (watchPercent >= config.completionThreshold) {
+                newStatus = 'completed';
+            } else if (position > 0) {
+                newStatus = 'in-progress';
+            }
+        } else if (position > 0 && video.status === 'unwatched') {
+            newStatus = 'in-progress';
+        }
+
+        const shouldPreserveCompletedProgress = video.status === 'completed'
+            && videoDuration > 0
+            && position < completionPosition;
+
+        if (shouldPreserveCompletedProgress) {
+            newStatus = 'completed';
+        }
+
+        let newPosition = position;
+
+        if (shouldPreserveCompletedProgress) {
+            newPosition = video.position;
+        } else if (isShortVideo && newStatus !== 'completed') {
+            newPosition = 0;
+        }
+
+        // Update database
+        this._db.run(
+            `UPDATE videos 
+       SET position = ?, 
+           duration = COALESCE(?, duration),
+           status = ?,
+           updated_at = CURRENT_TIMESTAMP
+       WHERE id = ?`,
+            [newPosition, duration, newStatus, videoId]
+        );
+
+        return this._db.get('SELECT * FROM videos WHERE id = ?', [videoId]);
+    }
 
     /**
      * Update video status manually

package/src/utils/config.js

@@ -16,12 +16,13 @@ const config = {
     dbFolder: '.coursewatcher',
     dbFilename: 'database.sqlite',
 
-    // Video settings
-    videoExtensions: ['.mp4', '.webm', '.ogv', '.ogg'],
-    completionThreshold: 0.9, // 90% watched = completed
-
-    // Playback settings
-    defaultPlaybackSpeed: 1.0,
+    // Video settings
+    videoExtensions: ['.mp4', '.webm', '.ogv', '.ogg'],
+    completionThreshold: 0.9, // 90% watched = completed
+    shortVideoResumeCutoffSeconds: 300,
+
+    // Playback settings
+    defaultPlaybackSpeed: 1.0,
     speedStep: 0.25,
     seekShort: 5,
     seekMedium: 10,

package/views/pages/player.ejs

@@ -13,14 +13,14 @@
                         <section class="player-section">
                             <h1 class="video-title">
                                 <%= video.title %>
-                            </h1>
-                            <div class="video-wrapper">
-                                <video id="videoPlayer" class="plyr" playsinline controls
-                                    data-video-id="<%= video.id %>" data-saved-position="<%= video.position %>"
-                                    data-next-video-url="<%= adjacent.next ? '/video/' + adjacent.next : '' %>">
-                                    <source src="/api/videos/<%= video.id %>/stream" type="video/mp4">
-                                    Your browser does not support the video tag.
-                                </video>
+                            </h1>
+                            <div class="video-wrapper">
+                                <video id="videoPlayer" class="plyr" playsinline controls
+                                    data-video-id="<%= video.id %>" data-start-position="<%= startPosition %>"
+                                    data-next-video-url="<%= adjacent.next ? '/video/' + adjacent.next : '' %>">
+                                    <source src="/api/videos/<%= video.id %>/stream" type="video/mp4">
+                                    Your browser does not support the video tag.
+                                </video>
 
                                 <!-- Auto-play Countdown Overlay -->
                                 <div id="autoplayOverlay" class="autoplay-overlay hidden">
@@ -158,4 +158,4 @@
                 <script src="/static/js/player.js"></script>
     </body>
 
-</html>
+</html>