Merge remote-tracking branch 'origin/master' into auth_passportjs

server/objects/settings/EmailSettings.js

@@ -0,0 +1,104 @@
+const Logger = require('../../Logger')
+const { areEquivalent, copyValue, isNullOrNaN } = require('../../utils')
+
+// REF: https://nodemailer.com/smtp/
+class EmailSettings {
+  constructor(settings = null) {
+    this.id = 'email-settings'
+    this.host = null
+    this.port = 465
+    this.secure = true
+    this.user = null
+    this.pass = null
+    this.testAddress = null
+    this.fromAddress = null
+
+    // Array of { name:String, email:String }
+    this.ereaderDevices = []
+
+    if (settings) {
+      this.construct(settings)
+    }
+  }
+
+  construct(settings) {
+    this.host = settings.host
+    this.port = settings.port
+    this.secure = !!settings.secure
+    this.user = settings.user
+    this.pass = settings.pass
+    this.testAddress = settings.testAddress
+    this.fromAddress = settings.fromAddress
+    this.ereaderDevices = settings.ereaderDevices?.map(d => ({ ...d })) || []
+  }
+
+  toJSON() {
+    return {
+      id: this.id,
+      host: this.host,
+      port: this.port,
+      secure: this.secure,
+      user: this.user,
+      pass: this.pass,
+      testAddress: this.testAddress,
+      fromAddress: this.fromAddress,
+      ereaderDevices: this.ereaderDevices.map(d => ({ ...d }))
+    }
+  }
+
+  update(payload) {
+    if (!payload) return false
+
+    if (payload.port !== undefined) {
+      if (isNullOrNaN(payload.port)) payload.port = 465
+      else payload.port = Number(payload.port)
+    }
+    if (payload.secure !== undefined) payload.secure = !!payload.secure
+
+    if (payload.ereaderDevices !== undefined && !Array.isArray(payload.ereaderDevices)) payload.ereaderDevices = undefined
+
+    let hasUpdates = false
+
+    const json = this.toJSON()
+    for (const key in json) {
+      if (key === 'id') continue
+
+      if (payload[key] !== undefined && !areEquivalent(payload[key], json[key])) {
+        this[key] = copyValue(payload[key])
+        hasUpdates = true
+      }
+    }
+
+    return hasUpdates
+  }
+
+  getTransportObject() {
+    const payload = {
+      host: this.host,
+      secure: this.secure
+    }
+    if (this.port) payload.port = this.port
+    if (this.user && this.pass !== undefined) {
+      payload.auth = {
+        user: this.user,
+        pass: this.pass
+      }
+    }
+
+    return payload
+  }
+
+  getEReaderDevices(user) {
+    // Only accessible to admin or up
+    if (!user.isAdminOrUp) {
+      return []
+    }
+
+    return this.ereaderDevices.map(d => ({ ...d }))
+  }
+
+  getEReaderDevice(deviceName) {
+    return this.ereaderDevices.find(d => d.name === deviceName)
+  }
+}
+module.exports = EmailSettings

server/objects/settings/LibrarySettings.js

@@ -7,6 +7,8 @@ class LibrarySettings {
     this.skipMatchingMediaWithAsin = false
     this.skipMatchingMediaWithIsbn = false
     this.autoScanCronExpression = null
+    this.audiobooksOnly = false
+    this.hideSingleBookSeries = false // Do not show series that only have 1 book 
 
     if (settings) {
       this.construct(settings)
@@ -19,6 +21,8 @@ class LibrarySettings {
     this.skipMatchingMediaWithAsin = !!settings.skipMatchingMediaWithAsin
     this.skipMatchingMediaWithIsbn = !!settings.skipMatchingMediaWithIsbn
     this.autoScanCronExpression = settings.autoScanCronExpression || null
+    this.audiobooksOnly = !!settings.audiobooksOnly
+    this.hideSingleBookSeries = !!settings.hideSingleBookSeries
   }
 
   toJSON() {
@@ -27,12 +31,14 @@ class LibrarySettings {
       disableWatcher: this.disableWatcher,
       skipMatchingMediaWithAsin: this.skipMatchingMediaWithAsin,
       skipMatchingMediaWithIsbn: this.skipMatchingMediaWithIsbn,
-      autoScanCronExpression: this.autoScanCronExpression
+      autoScanCronExpression: this.autoScanCronExpression,
+      audiobooksOnly: this.audiobooksOnly,
+      hideSingleBookSeries: this.hideSingleBookSeries
     }
   }
 
   update(payload) {
-    var hasUpdates = false
+    let hasUpdates = false
     for (const key in payload) {
       if (this[key] !== payload[key]) {
         this[key] = payload[key]

server/objects/settings/ServerSettings.js

@@ -15,7 +15,6 @@ class ServerSettings {
     this.scannerPreferMatchedMetadata = false
     this.scannerDisableWatcher = false
     this.scannerPreferOverdriveMediaMarker = false
-    this.scannerUseTone = false
 
     // Metadata - choose to store inside users library item folder
     this.storeCoverWithItem = false
@@ -30,7 +29,6 @@ class ServerSettings {
     this.backupSchedule = false // If false then auto-backups are disabled
     this.backupsToKeep = 2
     this.maxBackupSize = 1
-    this.backupMetadataCovers = true
 
     // Logger
     this.loggerDailyLogsToKeep = 7
@@ -49,7 +47,6 @@ class ServerSettings {
 
     // Misc Flags
     this.chromecastEnabled = false
-    this.enableEReader = false
     this.dateFormat = 'MM/dd/yyyy'
     this.timeFormat = 'HH:mm'
     this.language = 'en-us'
@@ -91,7 +88,6 @@ class ServerSettings {
     this.scannerPreferMatchedMetadata = !!settings.scannerPreferMatchedMetadata
     this.scannerDisableWatcher = !!settings.scannerDisableWatcher
     this.scannerPreferOverdriveMediaMarker = !!settings.scannerPreferOverdriveMediaMarker
-    this.scannerUseTone = !!settings.scannerUseTone
 
     this.storeCoverWithItem = !!settings.storeCoverWithItem
     this.storeMetadataWithItem = !!settings.storeMetadataWithItem
@@ -103,7 +99,6 @@ class ServerSettings {
     this.backupSchedule = settings.backupSchedule || false
     this.backupsToKeep = settings.backupsToKeep || 2
     this.maxBackupSize = settings.maxBackupSize || 1
-    this.backupMetadataCovers = settings.backupMetadataCovers !== false
 
     this.loggerDailyLogsToKeep = settings.loggerDailyLogsToKeep || 7
     this.loggerScannerLogsToKeep = settings.loggerScannerLogsToKeep || 2
@@ -114,7 +109,6 @@ class ServerSettings {
     this.sortingIgnorePrefix = !!settings.sortingIgnorePrefix
     this.sortingPrefixes = settings.sortingPrefixes || ['the']
     this.chromecastEnabled = !!settings.chromecastEnabled
-    this.enableEReader = !!settings.enableEReader
     this.dateFormat = settings.dateFormat || 'MM/dd/yyyy'
     this.timeFormat = settings.timeFormat || 'HH:mm'
     this.language = settings.language || 'en-us'
@@ -205,7 +199,6 @@ class ServerSettings {
       scannerPreferMatchedMetadata: this.scannerPreferMatchedMetadata,
       scannerDisableWatcher: this.scannerDisableWatcher,
       scannerPreferOverdriveMediaMarker: this.scannerPreferOverdriveMediaMarker,
-      scannerUseTone: this.scannerUseTone,
       storeCoverWithItem: this.storeCoverWithItem,
       storeMetadataWithItem: this.storeMetadataWithItem,
       metadataFileFormat: this.metadataFileFormat,
@@ -214,7 +207,6 @@ class ServerSettings {
       backupSchedule: this.backupSchedule,
       backupsToKeep: this.backupsToKeep,
       maxBackupSize: this.maxBackupSize,
-      backupMetadataCovers: this.backupMetadataCovers,
       loggerDailyLogsToKeep: this.loggerDailyLogsToKeep,
       loggerScannerLogsToKeep: this.loggerScannerLogsToKeep,
       homeBookshelfView: this.homeBookshelfView,
@@ -222,7 +214,6 @@ class ServerSettings {
       sortingIgnorePrefix: this.sortingIgnorePrefix,
       sortingPrefixes: [...this.sortingPrefixes],
       chromecastEnabled: this.chromecastEnabled,
-      enableEReader: this.enableEReader,
       dateFormat: this.dateFormat,
       timeFormat: this.timeFormat,
       language: this.language,