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

server/controllers/LibraryController.js

@@ -82,6 +82,11 @@ class LibraryController {
     return res.json(req.library)
   }
 
+  async getEpisodeDownloadQueue(req, res) {
+    const libraryDownloadQueueDetails = this.podcastManager.getDownloadQueueDetails(req.library.id)
+    return res.json(libraryDownloadQueueDetails)
+  }
+
   async update(req, res) {
     const library = req.library
 
@@ -229,6 +234,16 @@ class LibraryController {
     if (payload.sortBy === 'book.volumeNumber') payload.sortBy = null // TODO: Remove temp fix after mobile release 0.9.60
     if (filterSeries && !payload.sortBy) {
       sortArray.push({ asc: (li) => li.media.metadata.getSeries(filterSeries).sequence })
+      // If no series sequence then fallback to sorting by title (or collapsed series name for sub-series)
+      sortArray.push({
+        asc: (li) => {
+          if (this.db.serverSettings.sortingIgnorePrefix) {
+            return li.collapsedSeries?.nameIgnorePrefix || li.media.metadata.titleIgnorePrefix
+          } else {
+            return li.collapsedSeries?.name || li.media.metadata.title
+          }
+        }
+      })
     }
 
     if (payload.sortBy) {
@@ -637,6 +652,7 @@ class LibraryController {
     var authorsWithCount = libraryHelpers.getAuthorsWithCount(libraryItems)
     var genresWithCount = libraryHelpers.getGenresWithCount(libraryItems)
     var durationStats = libraryHelpers.getItemDurationStats(libraryItems)
+    var sizeStats = libraryHelpers.getItemSizeStats(libraryItems)
     var stats = {
       totalItems: libraryItems.length,
       totalAuthors: Object.keys(authorsWithCount).length,
@@ -645,6 +661,7 @@ class LibraryController {
       longestItems: durationStats.longestItems,
       numAudioTracks: durationStats.numAudioTracks,
       totalSize: libraryHelpers.getLibraryItemsTotalSize(libraryItems),
+      largestItems: sizeStats.largestItems,
       authorsWithCount,
       genresWithCount
     }
@@ -755,4 +772,4 @@ class LibraryController {
     next()
   }
 }
-module.exports = new LibraryController()
+module.exports = new LibraryController()

server/controllers/LibraryItemController.js

@@ -36,8 +36,11 @@ class LibraryItemController {
           }).filter(au => au)
         }
       } else if (includeEntities.includes('downloads')) {
-        var downloadsInQueue = this.podcastManager.getEpisodeDownloadsInQueue(req.libraryItem.id)
-        item.episodesDownloading = downloadsInQueue.map(d => d.toJSONForClient())
+        const downloadsInQueue = this.podcastManager.getEpisodeDownloadsInQueue(req.libraryItem.id)
+        item.episodeDownloadsQueued = downloadsInQueue.map(d => d.toJSONForClient())
+        if (this.podcastManager.currentDownload?.libraryItemId === req.libraryItem.id) {
+          item.episodesDownloading = [this.podcastManager.currentDownload.toJSONForClient()]
+        }
       }
 
       return res.json(item)

server/controllers/PodcastController.js

@@ -225,6 +225,20 @@ class PodcastController {
     res.json(libraryItem.toJSONExpanded())
   }
 
+  // GET: api/podcasts/:id/episode/:episodeId
+  async getEpisode(req, res) {
+    const episodeId = req.params.episodeId
+    const libraryItem = req.libraryItem
+
+    const episode = libraryItem.media.episodes.find(ep => ep.id === episodeId)
+    if (!episode) {
+      Logger.error(`[PodcastController] getEpisode episode ${episodeId} not found for item ${libraryItem.id}`)
+      return res.sendStatus(404)
+    }
+
+    res.json(episode)
+  }
+
   // DELETE: api/podcasts/:id/episode/:episodeId
   async removeEpisode(req, res) {
     var episodeId = req.params.episodeId
@@ -283,4 +297,4 @@ class PodcastController {
     next()
   }
 }
-module.exports = new PodcastController()
+module.exports = new PodcastController()

server/controllers/RSSFeedController.js

@@ -134,4 +134,4 @@ class RSSFeedController {
     next()
   }
 }
-module.exports = new RSSFeedController()
+module.exports = new RSSFeedController()