Update watcher to re-scan library items when non-media files are added/updated #4245

Improves Year in Review display logic

client/components/player/PlayerTrackBar.vue

@@ -74,6 +74,9 @@ export default {
     currentChapterStart() {
       if (!this.currentChapter) return 0
       return this.currentChapter.start
+    },
+    isMobile() {
+      return this.$store.state.globals.isMobile
     }
   },
   methods: {
@@ -145,6 +148,9 @@ export default {
       })
     },
     mousemoveTrack(e) {
+      if (this.isMobile) {
+        return
+      }
       const offsetX = e.offsetX
 
       const baseTime = this.useChapterTrack ? this.currentChapterStart : 0
@@ -198,6 +204,7 @@ export default {
     setTrackWidth() {
       if (this.$refs.track) {
         this.trackWidth = this.$refs.track.clientWidth
+        this.trackOffsetLeft = this.$refs.track.getBoundingClientRect().left
       } else {
         console.error('Track not loaded', this.$refs)
       }

client/components/stats/YearInReviewBanner.vue

@@ -164,14 +164,15 @@ export default {
   beforeMount() {
     this.yearInReviewYear = new Date().getFullYear()
 
-    // When not December show previous year
-    if (new Date().getMonth() < 11) {
+    this.availableYears = this.getAvailableYears()
+    const availableYearValues = this.availableYears.map((y) => y.value)
+
+    // When not December show previous year if data is available
+    if (new Date().getMonth() < 11 && availableYearValues.includes(this.yearInReviewYear - 1)) {
       this.yearInReviewYear--
     }
   },
   mounted() {
-    this.availableYears = this.getAvailableYears()
-
     if (typeof navigator.share !== 'undefined' && navigator.share) {
       this.showShareButton = true
     } else {

client/pages/share/_slug.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="w-full h-dvh max-h-dvh overflow-hidden" :style="{ backgroundColor: coverRgb }">
+  <div class="w-full max-w-full h-dvh max-h-dvh overflow-hidden" :style="{ backgroundColor: coverRgb }">
     <div class="w-screen h-screen absolute inset-0 pointer-events-none" style="background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(38, 38, 38, 1) 80%)"></div>
     <div class="absolute inset-0 w-screen h-dvh flex items-center justify-center z-10">
       <div class="w-full p-2 sm:p-4 md:p-8">
@@ -335,8 +335,11 @@ export default {
       }
     },
     resize() {
-      this.windowWidth = window.innerWidth
-      this.windowHeight = window.innerHeight
+      setTimeout(() => {
+        this.windowWidth = window.innerWidth
+        this.windowHeight = window.innerHeight
+        this.$store.commit('globals/updateWindowSize', { width: window.innerWidth, height: window.innerHeight })
+      }, 100)
     },
     playerError(error) {
       console.error('Player error', error)

server/controllers/MiscController.js

@@ -222,7 +222,7 @@ class MiscController {
 
     // Update nameIgnorePrefix column on series
     const allSeries = await Database.seriesModel.findAll({
-      attributes: ['id', 'name', 'nameIgnorePrefix']
+      attributes: ['id', 'name', 'nameIgnorePrefix', 'libraryId']
     })
     const bulkUpdateSeries = []
     allSeries.forEach((series) => {
@@ -230,6 +230,8 @@ class MiscController {
       if (nameIgnorePrefix !== series.nameIgnorePrefix) {
         bulkUpdateSeries.push({
           id: series.id,
+          name: series.name,
+          libraryId: series.libraryId,
           nameIgnorePrefix
         })
       }

server/models/LibraryItem.js

@@ -246,7 +246,6 @@ class LibraryItem extends Model {
       include
     })
     if (!libraryItem) {
-      Logger.error(`[LibraryItem] Library item not found`)
       return null
     }
 

server/scanner/LibraryScanner.js

@@ -407,7 +407,7 @@ class LibraryScanner {
       const folder = library.libraryFolders[0]
 
       const filePathItems = folderGroups[folderId].fileUpdates.map((fileUpdate) => fileUtils.getFilePathItemFromFileUpdate(fileUpdate))
-      const fileUpdateGroup = scanUtils.groupFileItemsIntoLibraryItemDirs(library.mediaType, filePathItems, !!library.settings?.audiobooksOnly)
+      const fileUpdateGroup = scanUtils.groupFileItemsIntoLibraryItemDirs(library.mediaType, filePathItems, !!library.settings?.audiobooksOnly, true)
 
       if (!Object.keys(fileUpdateGroup).length) {
         Logger.info(`[LibraryScanner] No important changes to scan for in folder "${folderId}"`)

server/utils/scandir.js

@@ -24,6 +24,12 @@ function isMediaFile(mediaType, ext, audiobooksOnly = false) {
   return globals.SupportedAudioTypes.includes(extclean) || globals.SupportedEbookTypes.includes(extclean)
 }
 
+function isScannableNonMediaFile(ext) {
+  if (!ext) return false
+  const extclean = ext.slice(1).toLowerCase()
+  return globals.TextFileTypes.includes(extclean) || globals.MetadataFileTypes.includes(extclean) || globals.SupportedImageTypes.includes(extclean)
+}
+
 function checkFilepathIsAudioFile(filepath) {
   const ext = Path.extname(filepath)
   if (!ext) return false
@@ -35,27 +41,31 @@ module.exports.checkFilepathIsAudioFile = checkFilepathIsAudioFile
 /**
  * @param {string} mediaType
  * @param {import('./fileUtils').FilePathItem[]} fileItems
- * @param {boolean} [audiobooksOnly=false]
+ * @param {boolean} audiobooksOnly
+ * @param {boolean} [includeNonMediaFiles=false] - Used by the watcher to re-scan when covers/metadata files are added/removed
  * @returns {Record<string,string[]>} map of files grouped into potential libarary item dirs
  */
-function groupFileItemsIntoLibraryItemDirs(mediaType, fileItems, audiobooksOnly = false) {
+function groupFileItemsIntoLibraryItemDirs(mediaType, fileItems, audiobooksOnly, includeNonMediaFiles = false) {
   // Step 1: Filter out non-book-media files in root dir (with depth of 0)
   const itemsFiltered = fileItems.filter((i) => {
     return i.deep > 0 || (mediaType === 'book' && isMediaFile(mediaType, i.extension, audiobooksOnly))
   })
 
   // Step 2: Separate media files and other files
-  //     - Directories without a media file will not be included
+  //     - Directories without a media file will not be included (unless includeNonMediaFiles is true)
   /** @type {import('./fileUtils').FilePathItem[]} */
   const mediaFileItems = []
   /** @type {import('./fileUtils').FilePathItem[]} */
   const otherFileItems = []
   itemsFiltered.forEach((item) => {
-    if (isMediaFile(mediaType, item.extension, audiobooksOnly)) mediaFileItems.push(item)
-    else otherFileItems.push(item)
+    if (isMediaFile(mediaType, item.extension, audiobooksOnly) || (includeNonMediaFiles && isScannableNonMediaFile(item.extension))) {
+      mediaFileItems.push(item)
+    } else {
+      otherFileItems.push(item)
+    }
   })
 
-  // Step 3: Group audio files in library items
+  // Step 3: Group media files (or non-media files if includeNonMediaFiles is true) in library items
   const libraryItemGroup = {}
   mediaFileItems.forEach((item) => {
     const dirparts = item.reldirpath.split('/').filter((p) => !!p)