From 858ea5010a1f2743dcfeb448c9fa7ad9e1b00821 Mon Sep 17 00:00:00 2001 From: Vito0912 <86927734+Vito0912@users.noreply.github.com> Date: Sat, 24 Aug 2024 21:55:13 +0200 Subject: [PATCH] fixed wrong ide completions --- server/controllers/LibraryController.js | 2 +- server/utils/libraryHelpers.js | 28 ++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js index 69b13ab76..77ebbc5cb 100644 --- a/server/controllers/LibraryController.js +++ b/server/controllers/LibraryController.js @@ -46,7 +46,7 @@ class LibraryController { for (let i = 0; i < allLibrariesIds.length; i++) { req.library = { id: allLibrariesIds[i], - isBook: await Database.libraryModel.getOldById(allLibrariesIds[i]), + mediaType: (await Database.libraryModel.getOldById(allLibrariesIds[i])).mediaType, }; const libraryStats = await libraryHelpers.getLibraryStats(req); allStats.push({ libraryId: req.library.id, stats: libraryStats }); diff --git a/server/utils/libraryHelpers.js b/server/utils/libraryHelpers.js index 65dcf1aa7..af03ad939 100644 --- a/server/utils/libraryHelpers.js +++ b/server/utils/libraryHelpers.js @@ -1,10 +1,10 @@ const { createNewSortInstance } = require('../libs/fastSort') const Database = require('../Database') const { getTitlePrefixAtEnd, isNullOrNaN, getTitleIgnorePrefix } = require('../utils/index') -const { getLargestItems } = require('./queries/libraryItemFilters') -const { getAuthorsWithCount, getAuthorsTotalCount } = require('./queries/authorFilters') -const { getGenresWithCount, getBookLibraryStats, getLongestBooks } = require('./queries/libraryItemsBookFilters') -const { getPodcastLibraryStats, getLongestPodcasts } = require('./queries/libraryItemsPodcastFilters') +const libraryItemsBookFilters = require('../utils/queries/libraryItemsBookFilters') +const authorFilters = require('../utils/queries/authorFilters') +const libraryItemFilters = require('../utils/queries/libraryItemFilters') +const libraryItemsPodcastFilters = require('../utils/queries/libraryItemsPodcastFilters') const naturalSort = createNewSortInstance({ comparer: new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' }).compare }) @@ -89,16 +89,16 @@ module.exports = { */ async getLibraryStats(req) { const stats = { - largestItems: await getLargestItems(req.library.id, 10), + largestItems: await libraryItemFilters.getLargestItems(req.library.id, 10) }; - if (req.library.isBook) { - const authors = await getAuthorsWithCount(req.library.id, 10); - const genres = getGenresWithCount(req.library.id); - const bookStats = await getBookLibraryStats(req.library.id); - const longestBooks = await getLongestBooks(req.library.id, 10); + if (req.library.mediaType === 'book') { + const authors = await authorFilters.getAuthorsWithCount(req.library.id, 10) + const genres = await libraryItemsBookFilters.getGenresWithCount(req.library.id) + const bookStats = await libraryItemsBookFilters.getBookLibraryStats(req.library.id) + const longestBooks = await libraryItemsBookFilters.getLongestBooks(req.library.id, 10) - stats.totalAuthors = await getAuthorsTotalCount(req.library.id); + stats.totalAuthors = await authorFilters.getAuthorsTotalCount(req.library.id) stats.authorsWithCount = authors; stats.totalGenres = genres.length; stats.genresWithCount = genres; @@ -108,9 +108,9 @@ module.exports = { stats.totalDuration = bookStats.totalDuration; stats.numAudioTracks = bookStats.numAudioFiles; } else { - const genres = getGenresWithCount(req.library.id); - const podcastStats = await getPodcastLibraryStats(req.library.id); - const longestPodcasts = await getLongestPodcasts(req.library.id, 10); + const genres = await libraryItemsPodcastFilters.getGenresWithCount(req.library.id) + const podcastStats = await libraryItemsPodcastFilters.getPodcastLibraryStats(req.library.id) + const longestPodcasts = await libraryItemsPodcastFilters.getLongestPodcasts(req.library.id, 10) stats.totalGenres = genres.length; stats.genresWithCount = genres;