From dace38c8dd9de9a262de4e595d0c88645708fb37 Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Thu, 11 Jan 2024 02:24:16 -0500 Subject: [PATCH] Remove sync info from requested fields --- .../components/library/GenresSectionContainer.tsx | 3 +-- src/components/favoriteitems.js | 2 +- .../homesections/sections/activeRecordings.ts | 2 +- src/components/homesections/sections/nextUp.ts | 2 +- .../homesections/sections/recentlyAdded.ts | 2 +- src/components/homesections/sections/resume.ts | 2 +- src/components/search/LiveTVSearchResults.tsx | 2 +- src/components/search/SearchResults.tsx | 2 +- src/controllers/favorites.js | 2 +- src/controllers/itemDetails/index.js | 6 +++--- src/controllers/list.js | 2 +- src/controllers/livetv/livetvrecordings.js | 2 +- src/controllers/livetv/livetvschedule.js | 2 +- src/controllers/movies/moviegenres.js | 2 +- src/controllers/movies/movies.js | 2 +- src/controllers/movies/moviesrecommended.js | 6 +++--- src/controllers/movies/movietrailers.js | 2 +- src/controllers/music/musicalbums.js | 2 +- src/controllers/music/musicartists.js | 2 +- src/controllers/music/musicrecommended.js | 2 +- src/controllers/shows/tvgenres.js | 2 +- src/controllers/shows/tvrecommended.js | 6 +++--- src/controllers/shows/tvshows.js | 2 +- src/hooks/useFetchItems.ts | 12 ++++-------- src/scripts/itemsByName.js | 2 +- src/utils/items.ts | 2 +- 26 files changed, 35 insertions(+), 40 deletions(-) diff --git a/src/apps/experimental/components/library/GenresSectionContainer.tsx b/src/apps/experimental/components/library/GenresSectionContainer.tsx index 506728c76..ca1fb39dc 100644 --- a/src/apps/experimental/components/library/GenresSectionContainer.tsx +++ b/src/apps/experimental/components/library/GenresSectionContainer.tsx @@ -35,8 +35,7 @@ const GenresSectionContainer: FC = ({ recursive: true, fields: [ ItemFields.PrimaryImageAspectRatio, - ItemFields.MediaSourceCount, - ItemFields.BasicSyncInfo + ItemFields.MediaSourceCount ], imageTypeLimit: 1, enableImageTypes: [ImageType.Primary], diff --git a/src/components/favoriteitems.js b/src/components/favoriteitems.js index b26c25ede..25d1875f7 100644 --- a/src/components/favoriteitems.js +++ b/src/components/favoriteitems.js @@ -100,7 +100,7 @@ function loadSection(elem, userId, topParentId, section, isSingleSection) { SortOrder: 'Ascending', Filters: 'IsFavorite', Recursive: true, - Fields: 'PrimaryImageAspectRatio,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio', CollapseBoxSetItems: false, ExcludeLocationTypes: 'Virtual', EnableTotalRecordCount: false diff --git a/src/components/homesections/sections/activeRecordings.ts b/src/components/homesections/sections/activeRecordings.ts index 8b8129f78..a06869837 100644 --- a/src/components/homesections/sections/activeRecordings.ts +++ b/src/components/homesections/sections/activeRecordings.ts @@ -17,7 +17,7 @@ function getLatestRecordingsFetchFn( return apiClient.getLiveTvRecordings({ userId: apiClient.getCurrentUserId(), Limit: enableOverflow ? 12 : 5, - Fields: 'PrimaryImageAspectRatio,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio', EnableTotalRecordCount: false, IsLibraryItem: activeRecordingsOnly ? null : false, IsInProgress: activeRecordingsOnly ? true : null diff --git a/src/components/homesections/sections/nextUp.ts b/src/components/homesections/sections/nextUp.ts index 4ab401ab8..e0e123f86 100644 --- a/src/components/homesections/sections/nextUp.ts +++ b/src/components/homesections/sections/nextUp.ts @@ -22,7 +22,7 @@ function getNextUpFetchFn( oldestDateForNextUp.setDate(oldestDateForNextUp.getDate() - userSettings.maxDaysForNextUp()); return apiClient.getNextUpEpisodes({ Limit: enableOverflow ? 24 : 15, - Fields: 'PrimaryImageAspectRatio,DateCreated,BasicSyncInfo,Path,MediaSourceCount', + Fields: 'PrimaryImageAspectRatio,DateCreated,Path,MediaSourceCount', UserId: apiClient.getCurrentUserId(), ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Banner,Thumb', diff --git a/src/components/homesections/sections/recentlyAdded.ts b/src/components/homesections/sections/recentlyAdded.ts index 3c46ecbbe..a849e8122 100644 --- a/src/components/homesections/sections/recentlyAdded.ts +++ b/src/components/homesections/sections/recentlyAdded.ts @@ -37,7 +37,7 @@ function getFetchLatestItemsFn( const options = { Limit: limit, - Fields: 'PrimaryImageAspectRatio,BasicSyncInfo,Path', + Fields: 'PrimaryImageAspectRatio,Path', ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Thumb', ParentId: parentId diff --git a/src/components/homesections/sections/resume.ts b/src/components/homesections/sections/resume.ts index e96dde3ee..a38dcc1c8 100644 --- a/src/components/homesections/sections/resume.ts +++ b/src/components/homesections/sections/resume.ts @@ -28,7 +28,7 @@ function getItemsToResumeFn( const options = { Limit: limit, Recursive: true, - Fields: 'PrimaryImageAspectRatio,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio', ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Thumb', EnableTotalRecordCount: false, diff --git a/src/components/search/LiveTVSearchResults.tsx b/src/components/search/LiveTVSearchResults.tsx index 12d862804..c72199e9a 100644 --- a/src/components/search/LiveTVSearchResults.tsx +++ b/src/components/search/LiveTVSearchResults.tsx @@ -43,7 +43,7 @@ const LiveTVSearchResults: FunctionComponent = ({ serv ParentId: parentId, searchTerm: query, Limit: 24, - Fields: 'PrimaryImageAspectRatio,CanDelete,BasicSyncInfo,MediaSourceCount', + Fields: 'PrimaryImageAspectRatio,CanDelete,MediaSourceCount', Recursive: true, EnableTotalRecordCount: false, ImageTypeLimit: 1, diff --git a/src/components/search/SearchResults.tsx b/src/components/search/SearchResults.tsx index 2f4befcc2..3b7d67e2b 100644 --- a/src/components/search/SearchResults.tsx +++ b/src/components/search/SearchResults.tsx @@ -52,7 +52,7 @@ const SearchResults: FunctionComponent = ({ serverId = windo ParentId: parentId, searchTerm: query, Limit: 100, - Fields: 'PrimaryImageAspectRatio,CanDelete,BasicSyncInfo,MediaSourceCount', + Fields: 'PrimaryImageAspectRatio,CanDelete,MediaSourceCount', Recursive: true, EnableTotalRecordCount: false, ImageTypeLimit: 1, diff --git a/src/controllers/favorites.js b/src/controllers/favorites.js index 50c53d90b..bee641463 100644 --- a/src/controllers/favorites.js +++ b/src/controllers/favorites.js @@ -137,7 +137,7 @@ function getFetchDataFn(section) { SortOrder: 'Ascending', Filters: 'IsFavorite', Recursive: true, - Fields: 'PrimaryImageAspectRatio,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio', CollapseBoxSetItems: false, ExcludeLocationTypes: 'Virtual', EnableTotalRecordCount: false diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js index 9f214856f..11e5340fb 100644 --- a/src/controllers/itemDetails/index.js +++ b/src/controllers/itemDetails/index.js @@ -1075,7 +1075,7 @@ function renderMoreFromSeason(view, item, apiClient) { apiClient.getEpisodes(item.SeriesId, { SeasonId: item.SeasonId, UserId: userId, - Fields: 'ItemCounts,PrimaryImageAspectRatio,BasicSyncInfo,CanDelete,MediaSourceCount' + Fields: 'ItemCounts,PrimaryImageAspectRatio,CanDelete,MediaSourceCount' }).then(function (result) { if (result.Items.length < 2) { section.classList.add('hide'); @@ -1264,7 +1264,7 @@ function renderTags(page, item) { } function renderChildren(page, item) { - let fields = 'ItemCounts,PrimaryImageAspectRatio,BasicSyncInfo,CanDelete,MediaSourceCount'; + let fields = 'ItemCounts,PrimaryImageAspectRatio,CanDelete,MediaSourceCount'; const query = { ParentId: item.Id, Fields: fields @@ -1681,7 +1681,7 @@ function renderMusicVideos(page, item, user) { SortOrder: 'Ascending', IncludeItemTypes: 'MusicVideo', Recursive: true, - Fields: 'PrimaryImageAspectRatio,BasicSyncInfo,CanDelete,MediaSourceCount' + Fields: 'PrimaryImageAspectRatio,CanDelete,MediaSourceCount' }; if (item.Type == 'MusicAlbum') { diff --git a/src/controllers/list.js b/src/controllers/list.js index de439c1f5..5d4c7069c 100644 --- a/src/controllers/list.js +++ b/src/controllers/list.js @@ -252,7 +252,7 @@ function getItems(instance, params, item, sortBy, startIndex, limit) { if (params.type === 'nextup') { return apiClient.getNextUpEpisodes(modifyQueryWithFilters(instance, { Limit: limit, - Fields: 'PrimaryImageAspectRatio,DateCreated,BasicSyncInfo,MediaSourceCount', + Fields: 'PrimaryImageAspectRatio,DateCreated,MediaSourceCount', UserId: apiClient.getCurrentUserId(), ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Thumb', diff --git a/src/controllers/livetv/livetvrecordings.js b/src/controllers/livetv/livetvrecordings.js index be62a110a..b591e1700 100644 --- a/src/controllers/livetv/livetvrecordings.js +++ b/src/controllers/livetv/livetvrecordings.js @@ -94,7 +94,7 @@ export default function (view, params, tabContent) { latestPromise = ApiClient.getLiveTvRecordings({ UserId: Dashboard.getCurrentUserId(), Limit: 12, - Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo', + Fields: 'CanDelete,PrimaryImageAspectRatio', EnableTotalRecordCount: false, EnableImageTypes: 'Primary,Thumb,Backdrop' }); diff --git a/src/controllers/livetv/livetvschedule.js b/src/controllers/livetv/livetvschedule.js index 595daab7a..84d51b651 100644 --- a/src/controllers/livetv/livetvschedule.js +++ b/src/controllers/livetv/livetvschedule.js @@ -105,7 +105,7 @@ export default function (view, params, tabContent) { activeRecordingsPromise = ApiClient.getLiveTvRecordings({ UserId: Dashboard.getCurrentUserId(), IsInProgress: true, - Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo', + Fields: 'CanDelete,PrimaryImageAspectRatio', EnableTotalRecordCount: false, EnableImageTypes: 'Primary,Thumb,Backdrop' }); diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js index 36c433c70..22d535bf3 100644 --- a/src/controllers/movies/moviegenres.js +++ b/src/controllers/movies/moviegenres.js @@ -68,7 +68,7 @@ export default function (view, params, tabContent) { SortOrder: 'Ascending', IncludeItemTypes: 'Movie', Recursive: true, - Fields: 'PrimaryImageAspectRatio,MediaSourceCount,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio,MediaSourceCount', ImageTypeLimit: 1, EnableImageTypes: enableImageTypes, Limit: limit, diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js index 0d89706cf..d8c836487 100644 --- a/src/controllers/movies/movies.js +++ b/src/controllers/movies/movies.js @@ -269,7 +269,7 @@ export default function (view, params, tabContent, options) { SortOrder: 'Ascending', IncludeItemTypes: 'Movie', Recursive: true, - Fields: 'PrimaryImageAspectRatio,MediaSourceCount,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio,MediaSourceCount', ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Banner,Thumb', StartIndex: 0, diff --git a/src/controllers/movies/moviesrecommended.js b/src/controllers/movies/moviesrecommended.js index ea593f805..37c4896c8 100644 --- a/src/controllers/movies/moviesrecommended.js +++ b/src/controllers/movies/moviesrecommended.js @@ -28,7 +28,7 @@ function loadLatest(page, userId, parentId) { const options = { IncludeItemTypes: 'Movie', Limit: 18, - Fields: 'PrimaryImageAspectRatio,MediaSourceCount,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio,MediaSourceCount', ParentId: parentId, ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Banner,Thumb', @@ -62,7 +62,7 @@ function loadResume(page, userId, parentId) { Filters: 'IsResumable', Limit: screenWidth >= 1600 ? 5 : 3, Recursive: true, - Fields: 'PrimaryImageAspectRatio,MediaSourceCount,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio,MediaSourceCount', CollapseBoxSetItems: false, ParentId: parentId, ImageTypeLimit: 1, @@ -162,7 +162,7 @@ function loadSuggestions(page, userId) { userId: userId, categoryLimit: 6, ItemLimit: itemLimit, - Fields: 'PrimaryImageAspectRatio,MediaSourceCount,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio,MediaSourceCount', ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Banner,Thumb' }); diff --git a/src/controllers/movies/movietrailers.js b/src/controllers/movies/movietrailers.js index 8e9f7c4ac..2bab2930c 100644 --- a/src/controllers/movies/movietrailers.js +++ b/src/controllers/movies/movietrailers.js @@ -22,7 +22,7 @@ export default function (view, params, tabContent) { SortOrder: 'Ascending', IncludeItemTypes: 'Trailer', Recursive: true, - Fields: 'PrimaryImageAspectRatio,SortName,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio,SortName', ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Banner,Thumb', StartIndex: 0 diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js index f878b7e65..fe2acb7b6 100644 --- a/src/controllers/music/musicalbums.js +++ b/src/controllers/music/musicalbums.js @@ -37,7 +37,7 @@ export default function (view, params, tabContent) { SortOrder: 'Ascending', IncludeItemTypes: 'MusicAlbum', Recursive: true, - Fields: 'PrimaryImageAspectRatio,SortName,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio,SortName', ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Banner,Thumb', StartIndex: 0 diff --git a/src/controllers/music/musicartists.js b/src/controllers/music/musicartists.js index c42bda4c7..3ae5d05d3 100644 --- a/src/controllers/music/musicartists.js +++ b/src/controllers/music/musicartists.js @@ -19,7 +19,7 @@ export default function (view, params, tabContent, options) { SortBy: 'SortName', SortOrder: 'Ascending', Recursive: true, - Fields: 'PrimaryImageAspectRatio,SortName,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio,SortName', StartIndex: 0, ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Banner,Thumb' diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js index 6dc14b9b5..3428f6745 100644 --- a/src/controllers/music/musicrecommended.js +++ b/src/controllers/music/musicrecommended.js @@ -48,7 +48,7 @@ function loadLatest(page, parentId) { const options = { IncludeItemTypes: 'Audio', Limit: enableScrollX() ? 3 * itemsPerRow() : 2 * itemsPerRow(), - Fields: 'PrimaryImageAspectRatio,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio', ParentId: parentId, ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Banner,Thumb', diff --git a/src/controllers/shows/tvgenres.js b/src/controllers/shows/tvgenres.js index 3a45be7d5..6ca140cda 100644 --- a/src/controllers/shows/tvgenres.js +++ b/src/controllers/shows/tvgenres.js @@ -68,7 +68,7 @@ export default function (view, params, tabContent) { SortOrder: 'Ascending', IncludeItemTypes: 'Series', Recursive: true, - Fields: 'PrimaryImageAspectRatio,MediaSourceCount,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio,MediaSourceCount', ImageTypeLimit: 1, EnableImageTypes: enableImageTypes, Limit: limit, diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js index 982420bde..32ea4a0c9 100644 --- a/src/controllers/shows/tvrecommended.js +++ b/src/controllers/shows/tvrecommended.js @@ -101,7 +101,7 @@ function loadResume(view, userId, parentId) { Filters: 'IsResumable', Limit: screenWidth >= 1600 ? 5 : 3, Recursive: true, - Fields: 'PrimaryImageAspectRatio,MediaSourceCount,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio,MediaSourceCount', CollapseBoxSetItems: false, ParentId: parentId, ImageTypeLimit: 1, @@ -141,7 +141,7 @@ function loadLatest(view, userId, parentId) { userId: userId, IncludeItemTypes: 'Episode', Limit: 30, - Fields: 'PrimaryImageAspectRatio,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio', ParentId: parentId, ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Thumb' @@ -179,7 +179,7 @@ function loadNextUp(view, userId, parentId) { const query = { userId: userId, Limit: 24, - Fields: 'PrimaryImageAspectRatio,DateCreated,BasicSyncInfo,MediaSourceCount', + Fields: 'PrimaryImageAspectRatio,DateCreated,MediaSourceCount', ParentId: parentId, ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Thumb', diff --git a/src/controllers/shows/tvshows.js b/src/controllers/shows/tvshows.js index f6751f38f..1578f0d9f 100644 --- a/src/controllers/shows/tvshows.js +++ b/src/controllers/shows/tvshows.js @@ -22,7 +22,7 @@ export default function (view, params, tabContent) { SortOrder: 'Ascending', IncludeItemTypes: 'Series', Recursive: true, - Fields: 'PrimaryImageAspectRatio,BasicSyncInfo', + Fields: 'PrimaryImageAspectRatio', ImageTypeLimit: 1, EnableImageTypes: 'Primary,Backdrop,Banner,Thumb', StartIndex: 0 diff --git a/src/hooks/useFetchItems.ts b/src/hooks/useFetchItems.ts index 6f8580b0b..07eeca1e3 100644 --- a/src/hooks/useFetchItems.ts +++ b/src/hooks/useFetchItems.ts @@ -101,8 +101,7 @@ const fetchGetMovieRecommendations = async ( userId: user.Id, fields: [ ItemFields.PrimaryImageAspectRatio, - ItemFields.MediaSourceCount, - ItemFields.BasicSyncInfo + ItemFields.MediaSourceCount ], parentId: parentId ?? undefined, categoryLimit: 6, @@ -144,8 +143,7 @@ const fetchGetItemsBySuggestionsType = async ( limit: 25, fields: [ ItemFields.PrimaryImageAspectRatio, - ItemFields.MediaSourceCount, - ItemFields.BasicSyncInfo + ItemFields.MediaSourceCount ], parentId: parentId ?? undefined, imageTypeLimit: 1, @@ -172,8 +170,7 @@ const fetchGetItemsBySuggestionsType = async ( parentId: parentId ?? undefined, fields: [ ItemFields.PrimaryImageAspectRatio, - ItemFields.MediaSourceCount, - ItemFields.BasicSyncInfo + ItemFields.MediaSourceCount ], imageTypeLimit: 1, enableImageTypes: [ImageType.Thumb], @@ -194,8 +191,7 @@ const fetchGetItemsBySuggestionsType = async ( userId: user.Id, fields: [ ItemFields.PrimaryImageAspectRatio, - ItemFields.MediaSourceCount, - ItemFields.BasicSyncInfo + ItemFields.MediaSourceCount ], parentId: parentId ?? undefined, imageTypeLimit: 1, diff --git a/src/scripts/itemsByName.js b/src/scripts/itemsByName.js index 11a3cb169..6a5687c23 100644 --- a/src/scripts/itemsByName.js +++ b/src/scripts/itemsByName.js @@ -343,7 +343,7 @@ function getQuery(options, item) { SortOrder: 'Ascending', IncludeItemTypes: '', Recursive: true, - Fields: 'AudioInfo,ParentId,PrimaryImageAspectRatio,BasicSyncInfo', + Fields: 'AudioInfo,ParentId,PrimaryImageAspectRatio', Limit: 100, StartIndex: 0, CollapseBoxSetItems: false diff --git a/src/utils/items.ts b/src/utils/items.ts index 3008ec5e6..752226db2 100644 --- a/src/utils/items.ts +++ b/src/utils/items.ts @@ -79,7 +79,7 @@ const getItemFieldsEnum = ( const itemFields: ItemFields[] = []; if (viewType !== LibraryTab.Networks) { - itemFields.push(ItemFields.BasicSyncInfo, ItemFields.MediaSourceCount); + itemFields.push(ItemFields.MediaSourceCount); } if (libraryViewSettings.ImageType === ImageType.Primary) {