Merge branch 'advplyr:master' into master

server/models/Library.js

@@ -12,6 +12,8 @@ const Logger = require('../Logger')
  * @property {boolean} hideSingleBookSeries Do not show series that only have 1 book
  * @property {boolean} onlyShowLaterBooksInContinueSeries Skip showing books that are earlier than the max sequence read
  * @property {string[]} metadataPrecedence
+ * @property {number} markAsFinishedTimeRemaining Time remaining in seconds to mark as finished. (defaults to 10s)
+ * @property {number} markAsFinishedPercentComplete Percent complete to mark as finished (0-100). If this is set it will be used over markAsFinishedTimeRemaining.
  */
 
 class Library extends Model {
@@ -57,7 +59,9 @@ class Library extends Model {
         coverAspectRatio: 1, // Square
         disableWatcher: false,
         autoScanCronExpression: null,
-        podcastSearchRegion: 'us'
+        podcastSearchRegion: 'us',
+        markAsFinishedPercentComplete: null,
+        markAsFinishedTimeRemaining: 10
       }
     } else {
       return {
@@ -70,7 +74,9 @@ class Library extends Model {
         epubsAllowScriptedContent: false,
         hideSingleBookSeries: false,
         onlyShowLaterBooksInContinueSeries: false,
-        metadataPrecedence: this.defaultMetadataPrecedence
+        metadataPrecedence: this.defaultMetadataPrecedence,
+        markAsFinishedPercentComplete: null,
+        markAsFinishedTimeRemaining: 10
       }
     }
   }
@@ -196,6 +202,13 @@ class Library extends Model {
     return this.extraData?.lastScanMetadataPrecedence || []
   }
 
+  /**
+   * @returns {LibrarySettingsObject}
+   */
+  get librarySettings() {
+    return this.settings || Library.getDefaultLibrarySettingsForMediaType(this.mediaType)
+  }
+
   /**
    * TODO: Update to use new model
    */

server/models/MediaProgress.js

@@ -229,30 +229,30 @@ class MediaProgress extends Model {
     const timeRemaining = this.duration - this.currentTime
 
     // Check if progress is far enough to mark as finished
-    //   - If markAsFinishedPercentageComplete is provided, use that otherwise use markAsFinishedTimeRemaining (default 5 seconds)
+    //   - If markAsFinishedPercentComplete is provided, use that otherwise use markAsFinishedTimeRemaining (default 10 seconds)
     let shouldMarkAsFinished = false
-    if (!this.isFinished && this.duration) {
-      if (!isNullOrNaN(progressPayload.markAsFinishedPercentageComplete)) {
-        const markAsFinishedPercentageComplete = Number(progressPayload.markAsFinishedPercentageComplete) / 100
-        shouldMarkAsFinished = markAsFinishedPercentageComplete <= this.progress
+    if (this.duration) {
+      if (!isNullOrNaN(progressPayload.markAsFinishedPercentComplete) && progressPayload.markAsFinishedPercentComplete > 0) {
+        const markAsFinishedPercentComplete = Number(progressPayload.markAsFinishedPercentComplete) / 100
+        shouldMarkAsFinished = markAsFinishedPercentComplete < this.progress
         if (shouldMarkAsFinished) {
-          Logger.debug(`[MediaProgress] Marking media progress as finished because progress (${this.progress}) is greater than ${markAsFinishedPercentageComplete}`)
+          Logger.debug(`[MediaProgress] Marking media progress as finished because progress (${this.progress}) is greater than ${markAsFinishedPercentComplete}`)
         }
       } else {
-        const markAsFinishedTimeRemaining = isNullOrNaN(progressPayload.markAsFinishedTimeRemaining) ? 5 : Number(progressPayload.markAsFinishedTimeRemaining)
-        shouldMarkAsFinished = timeRemaining <= markAsFinishedTimeRemaining
+        const markAsFinishedTimeRemaining = isNullOrNaN(progressPayload.markAsFinishedTimeRemaining) ? 10 : Number(progressPayload.markAsFinishedTimeRemaining)
+        shouldMarkAsFinished = timeRemaining < markAsFinishedTimeRemaining
         if (shouldMarkAsFinished) {
           Logger.debug(`[MediaProgress] Marking media progress as finished because time remaining (${timeRemaining}) is less than ${markAsFinishedTimeRemaining} seconds`)
         }
       }
     }
 
-    if (shouldMarkAsFinished) {
+    if (!this.isFinished && shouldMarkAsFinished) {
       this.isFinished = true
       this.finishedAt = this.finishedAt || Date.now()
       this.extraData.progress = 1
       this.changed('extraData', true)
-    } else if (this.isFinished && this.changed('currentTime') && this.currentTime < this.duration) {
+    } else if (this.isFinished && this.changed('currentTime') && !shouldMarkAsFinished) {
       this.isFinished = false
       this.finishedAt = null
     }

server/models/User.js

@@ -28,7 +28,7 @@ const { DataTypes, Model } = sequelize
  * @property {string} [finishedAt]
  * @property {number} [lastUpdate]
  * @property {number} [markAsFinishedTimeRemaining]
- * @property {number} [markAsFinishedPercentageComplete]
+ * @property {number} [markAsFinishedPercentComplete]
  */
 
 class User extends Model {
@@ -82,6 +82,7 @@ class User extends Model {
     canAccessExplicitContent: 'accessExplicitContent',
     canAccessAllLibraries: 'accessAllLibraries',
     canAccessAllTags: 'accessAllTags',
+    canCreateEReader: 'createEreader',
     tagsAreDenylist: 'selectedTagsNotAccessible',
     // Direct mapping for array-based permissions
     allowedLibraries: 'librariesAccessible',
@@ -122,6 +123,7 @@ class User extends Model {
       update: type === 'root' || type === 'admin',
       delete: type === 'root',
       upload: type === 'root' || type === 'admin',
+      createEreader: type === 'root' || type === 'admin',
       accessAllLibraries: true,
       accessAllTags: true,
       accessExplicitContent: type === 'root' || type === 'admin',