Merge branch 'master' into watcher-update-api

client/components/readers/EpubReader.vue

@@ -42,6 +42,7 @@ export default {
       rendition: null,
       ereaderSettings: {
         theme: 'dark',
+        font: 'serif',
         fontScale: 100,
         lineSpacing: 115,
         spread: 'auto'
@@ -130,6 +131,7 @@ export default {
 
       const fontScale = settings.fontScale || 100
       this.rendition.themes.fontSize(`${fontScale}%`)
+      this.rendition.themes.font(settings.font)
       this.rendition.spread(settings.spread || 'auto')
     },
     prev() {

client/components/readers/Reader.vue

@@ -63,7 +63,13 @@
           <div class="w-40">
             <p class="text-lg">{{ $strings.LabelTheme }}:</p>
           </div>
-          <ui-toggle-btns v-model="ereaderSettings.theme" :items="themeItems" @input="settingsUpdated" />
+          <ui-toggle-btns v-model="ereaderSettings.theme" :items="themeItems.theme" @input="settingsUpdated" />
+        </div>
+        <div class="flex items-center mb-4">
+          <div class="w-40">
+            <p class="text-lg">{{ $strings.LabelFontFamily }}:</p>
+          </div>
+          <ui-toggle-btns v-model="ereaderSettings.font" :items="themeItems.font" @input="settingsUpdated" />
         </div>
         <div class="flex items-center mb-4">
           <div class="w-40">
@@ -103,6 +109,7 @@ export default {
       showSettings: false,
       ereaderSettings: {
         theme: 'dark',
+        font: 'serif',
         fontScale: 100,
         lineSpacing: 115,
         spread: 'auto'
@@ -142,16 +149,28 @@ export default {
       ]
     },
     themeItems() {
-      return [
+      return {
-        {
+        theme: [
-          text: this.$strings.LabelThemeDark,
+          {
-          value: 'dark'
+            text: this.$strings.LabelThemeDark,
-        },
+            value: 'dark'
-        {
+          },
-          text: this.$strings.LabelThemeLight,
+          {
-          value: 'light'
+            text: this.$strings.LabelThemeLight,
-        }
+            value: 'light'
-      ]
+          }
+        ],
+        font: [
+          {
+            text: 'Sans',
+            value: 'sans-serif',
+          },
+          {
+            text: 'Serif',
+            value: 'serif',
+          }
+        ]
+      }
     },
     componentName() {
       if (this.ebookType === 'epub') return 'readers-epub-reader'

client/strings/da.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Færdig",
   "LabelFolder": "Mappe",
   "LabelFolders": "Mapper",
+  "LabelFontFamily": "Fontfamilie",
   "LabelFontScale": "Skriftstørrelse",
   "LabelFormat": "Format",
   "LabelGenre": "Genre",

client/strings/de.json

@@ -260,6 +260,7 @@
   "LabelFinished": "beendet",
   "LabelFolder": "Ordner",
   "LabelFolders": "Verzeichnisse",
+  "LabelFontFamily": "Schriftfamilie",
   "LabelFontScale": "Schriftgröße",
   "LabelFormat": "Format",
   "LabelGenre": "Kategorie",

client/strings/en-us.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Finished",
   "LabelFolder": "Folder",
   "LabelFolders": "Folders",
+  "LabelFontFamily": "Font family",
   "LabelFontScale": "Font scale",
   "LabelFormat": "Format",
   "LabelGenre": "Genre",

client/strings/es.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Terminado",
   "LabelFolder": "Carpeta",
   "LabelFolders": "Carpetas",
+  "LabelFontFamily": "Familia tipográfica",
   "LabelFontScale": "Tamaño de Fuente",
   "LabelFormat": "Formato",
   "LabelGenre": "Genero",

client/strings/fr.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Fini(e)",
   "LabelFolder": "Dossier",
   "LabelFolders": "Dossiers",
+  "LabelFontFamily": "Famille de polices",
   "LabelFontScale": "Taille de la police de caractère",
   "LabelFormat": "Format",
   "LabelGenre": "Genre",

client/strings/gu.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Finished",
   "LabelFolder": "Folder",
   "LabelFolders": "Folders",
+  "LabelFontFamily": "ફોન્ટ કુટુંબ",
   "LabelFontScale": "Font scale",
   "LabelFormat": "Format",
   "LabelGenre": "Genre",

client/strings/hi.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Finished",
   "LabelFolder": "Folder",
   "LabelFolders": "Folders",
+  "LabelFontFamily": "फुहारा परिवार",
   "LabelFontScale": "Font scale",
   "LabelFormat": "Format",
   "LabelGenre": "Genre",

client/strings/hr.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Finished",
   "LabelFolder": "Folder",
   "LabelFolders": "Folderi",
+  "LabelFontFamily": "Font family",
   "LabelFontScale": "Font scale",
   "LabelFormat": "Format",
   "LabelGenre": "Genre",

client/strings/it.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Finita",
   "LabelFolder": "Cartella",
   "LabelFolders": "Cartelle",
+  "LabelFontFamily": "Font family",
   "LabelFontScale": "Dimensione Font",
   "LabelFormat": "Formato",
   "LabelGenre": "Genere",

client/strings/lt.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Baigta",
   "LabelFolder": "Aplankas",
   "LabelFolders": "Aplankai",
+  "LabelFontFamily": "Famiglia di font",
   "LabelFontScale": "Šrifto mastelis",
   "LabelFormat": "Formatas",
   "LabelGenre": "Žanras",

client/strings/nl.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Voltooid",
   "LabelFolder": "Map",
   "LabelFolders": "Mappen",
+  "LabelFontFamily": "Lettertypefamilie",
   "LabelFontScale": "Lettertype schaal",
   "LabelFormat": "Formaat",
   "LabelGenre": "Genre",

client/strings/no.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Fullført",
   "LabelFolder": "Mappe",
   "LabelFolders": "Mapper",
+  "LabelFontFamily": "Fontfamilie",
   "LabelFontScale": "Font størrelse",
   "LabelFormat": "Format",
   "LabelGenre": "Sjanger",

client/strings/pl.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Zakończone",
   "LabelFolder": "Folder",
   "LabelFolders": "Foldery",
+  "LabelFontFamily": "Rodzina czcionek",
   "LabelFontScale": "Font scale",
   "LabelFormat": "Format",
   "LabelGenre": "Gatunek",

client/strings/ru.json

@@ -260,6 +260,7 @@
   "LabelFinished": "Закончен",
   "LabelFolder": "Папка",
   "LabelFolders": "Папки",
+  "LabelFontFamily": "Семейство шрифтов",
   "LabelFontScale": "Масштаб шрифта",
   "LabelFormat": "Формат",
   "LabelGenre": "Жанр",

client/strings/zh-cn.json

@@ -260,6 +260,7 @@
   "LabelFinished": "已听完",
   "LabelFolder": "文件夹",
   "LabelFolders": "文件夹",
+  "LabelFontFamily": "字体系列",
   "LabelFontScale": "字体比例",
   "LabelFormat": "编码格式",
   "LabelGenre": "流派",

server/Watcher.js

@@ -6,7 +6,7 @@ const LibraryScanner = require('./scanner/LibraryScanner')
 const Task = require('./objects/Task')
 const TaskManager = require('./managers/TaskManager')
 
-const { filePathToPOSIX, isSameOrSubPath } = require('./utils/fileUtils')
+const { filePathToPOSIX, isSameOrSubPath, getFileMTimeMs } = require('./utils/fileUtils')
 
 /**
  * @typedef PendingFileUpdate
@@ -29,6 +29,8 @@ class FolderWatcher extends EventEmitter {
     /** @type {Task} */
     this.pendingTask = null
 
+    this.filesBeingAdded = new Set()
+
     /** @type {string[]} */
     this.ignoreDirs = []
     /** @type {string[]} */
@@ -64,14 +66,13 @@ class FolderWatcher extends EventEmitter {
     })
     watcher
       .on('add', (path) => {
-        this.onNewFile(library.id, path)
+        this.onFileAdded(library.id, filePathToPOSIX(path))
       }).on('change', (path) => {
         // This is triggered from metadata changes, not what we want
-        // this.onFileUpdated(path)
       }).on('unlink', path => {
-        this.onFileRemoved(library.id, path)
+        this.onFileRemoved(library.id, filePathToPOSIX(path))
       }).on('rename', (path, pathNext) => {
-        this.onRename(library.id, path, pathNext)
+        this.onFileRename(library.id, filePathToPOSIX(path), filePathToPOSIX(pathNext))
       }).on('error', (error) => {
         Logger.error(`[Watcher] ${error}`)
       }).on('ready', () => {
@@ -137,14 +138,31 @@ class FolderWatcher extends EventEmitter {
     return this.libraryWatchers.map(lib => lib.watcher.close())
   }
 
-  onNewFile(libraryId, path) {
+  /**
+   * Watcher detected file added
+   * 
+   * @param {string} libraryId 
+   * @param {string} path 
+   */
+  onFileAdded(libraryId, path) {
     if (this.checkShouldIgnorePath(path)) {
       return
     }
     Logger.debug('[Watcher] File Added', path)
     this.addFileUpdate(libraryId, path, 'added')
+
+    if (!this.filesBeingAdded.has(path)) {
+      this.filesBeingAdded.add(path)
+      this.waitForFileToAdd(path)
+    }
   }
 
+  /**
+   * Watcher detected file removed
+   * 
+   * @param {string} libraryId 
+   * @param {string} path 
+   */
   onFileRemoved(libraryId, path) {
     if (this.checkShouldIgnorePath(path)) {
       return
@@ -153,11 +171,13 @@ class FolderWatcher extends EventEmitter {
     this.addFileUpdate(libraryId, path, 'deleted')
   }
 
-  onFileUpdated(path) {
+  /**
-    Logger.debug('[Watcher] Updated File', path)
+   * Watcher detected file renamed
-  }
+   * 
-
+   * @param {string} libraryId 
-  onRename(libraryId, pathFrom, pathTo) {
+   * @param {string} path 
+   */
+  onFileRename(libraryId, pathFrom, pathTo) {
     if (this.checkShouldIgnorePath(pathTo)) {
       return
     }
@@ -166,13 +186,41 @@ class FolderWatcher extends EventEmitter {
   }
 
   /**
-   * File update detected from watcher
+   * Get mtimeMs from an added file every second until it is no longer changing
+   * Times out after 180s
+   * 
+   * @param {string} path 
+   * @param {number} [lastMTimeMs=0] 
+   * @param {number} [loop=0] 
+   */
+  async waitForFileToAdd(path, lastMTimeMs = 0, loop = 0) {
+    // Safety to catch infinite loop (180s)
+    if (loop >= 180) {
+      Logger.warn(`[Watcher] Waiting to add file at "${path}" timeout (loop ${loop}) - proceeding`)
+      return this.filesBeingAdded.delete(path)
+    }
+
+    const mtimeMs = await getFileMTimeMs(path)
+    if (mtimeMs === lastMTimeMs) {
+      if (lastMTimeMs) Logger.debug(`[Watcher] File finished adding at "${path}"`)
+      return this.filesBeingAdded.delete(path)
+    }
+    if (lastMTimeMs % 5 === 0) {
+      Logger.debug(`[Watcher] Waiting to add file at "${path}". mtimeMs=${mtimeMs} lastMTimeMs=${lastMTimeMs} (loop ${loop})`)
+    }
+    // Wait 1 second
+    await new Promise((resolve) => setTimeout(resolve, 1000))
+    this.waitForFileToAdd(path, mtimeMs, ++loop)
+  }
+
+  /**
+   * Queue file update
+   * 
    * @param {string} libraryId 
    * @param {string} path 
    * @param {string} type 
    */
   addFileUpdate(libraryId, path, type) {
-    path = filePathToPOSIX(path)
     if (this.pendingFilePaths.includes(path)) return
 
     // Get file library
@@ -222,12 +270,26 @@ class FolderWatcher extends EventEmitter {
       type
     })
 
-    // Notify server of update after "pendingDelay"
+    this.handlePendingFileUpdatesTimeout()
+  }
+
+  /**
+   * Wait X seconds before notifying scanner that files changed
+   * reset timer if files are still copying
+   */
+  handlePendingFileUpdatesTimeout() {
     clearTimeout(this.pendingTimeout)
     this.pendingTimeout = setTimeout(() => {
+      // Check that files are not still being added
+      if (this.pendingFileUpdates.some(pfu => this.filesBeingAdded.has(pfu.path))) {
+        Logger.debug(`[Watcher] Still waiting for pending files "${[...this.filesBeingAdded].join(', ')}"`)
+        return this.handlePendingFileUpdatesTimeout()
+      }
+
       LibraryScanner.scanFilesChanged(this.pendingFileUpdates, this.pendingTask)
       this.pendingTask = null
       this.pendingFileUpdates = []
+      this.filesBeingAdded.clear()
     }, this.pendingDelay)
   }
 

server/controllers/LibraryController.js

@@ -621,7 +621,7 @@ class LibraryController {
         model: Database.bookModel,
         attributes: ['id', 'tags', 'explicit'],
         where: bookWhere,
-        required: false,
+        required: !req.user.isAdminOrUp, // Only show authors with 0 books for admin users or up
         through: {
           attributes: []
         }

server/utils/fileUtils.js

@@ -38,22 +38,14 @@ function isSameOrSubPath(parentPath, childPath) {
 }
 module.exports.isSameOrSubPath = isSameOrSubPath
 
-async function getFileStat(path) {
+function getFileStat(path) {
   try {
-    var stat = await fs.stat(path)
+    return fs.stat(path)
-    return {
-      size: stat.size,
-      atime: stat.atime,
-      mtime: stat.mtime,
-      ctime: stat.ctime,
-      birthtime: stat.birthtime
-    }
   } catch (err) {
     Logger.error('[fileUtils] Failed to stat', err)
-    return false
+    return null
   }
 }
-module.exports.getFileStat = getFileStat
 
 async function getFileTimestampsWithIno(path) {
   try {
@@ -72,12 +64,25 @@ async function getFileTimestampsWithIno(path) {
 }
 module.exports.getFileTimestampsWithIno = getFileTimestampsWithIno
 
-async function getFileSize(path) {
+/**
-  var stat = await getFileStat(path)
+ * Get file size
-  if (!stat) return 0
+ * 
-  return stat.size || 0
+ * @param {string} path 
+ * @returns {Promise<number>}
+ */
+module.exports.getFileSize = async (path) => {
+  return (await getFileStat(path))?.size || 0
+}
+
+/**
+ * Get file mtimeMs
+ * 
+ * @param {string} path 
+ * @returns {Promise<number>} epoch timestamp
+ */
+module.exports.getFileMTimeMs = async (path) => {
+  return (await getFileStat(path))?.mtimeMs || 0
 }
-module.exports.getFileSize = getFileSize
 
 /**
  * 

server/utils/queries/libraryFilters.js

@@ -308,6 +308,8 @@ module.exports = {
   async getNewestAuthors(library, user, limit) {
     if (library.mediaType !== 'book') return { authors: [], count: 0 }
 
+    const { bookWhere, replacements } = libraryItemsBookFilters.getUserPermissionBookWhereQuery(user)
+
     const { rows: authors, count } = await Database.authorModel.findAndCountAll({
       where: {
         libraryId: library.id,
@@ -315,9 +317,15 @@ module.exports = {
           [Sequelize.Op.gte]: new Date(new Date() - (60 * 24 * 60 * 60 * 1000)) // 60 days ago
         }
       },
+      replacements,
       include: {
-        model: Database.bookAuthorModel,
+        model: Database.bookModel,
-        required: true // Must belong to a book
+        attributes: ['id', 'tags', 'explicit'],
+        where: bookWhere,
+        required: true, // Must belong to a book
+        through: {
+          attributes: []
+        }
       },
       limit,
       distinct: true,
@@ -328,7 +336,7 @@ module.exports = {
 
     return {
       authors: authors.map((au) => {
-        const numBooks = au.bookAuthors?.length || 0
+        const numBooks = au.books.length || 0
         return au.getOldAuthor().toJSONExpanded(numBooks)
       }),
       count