revert some work and fix collections

This commit is contained in:
Ethan Pippin 2022-01-13 23:13:49 -07:00
parent 1c74928d93
commit 7f55945c94
3 changed files with 4 additions and 31 deletions

View File

@ -56,7 +56,7 @@ extension BaseItemDto: PortraitImageStackable {
public var showTitle: Bool {
switch self.itemType {
case .episode, .series, .movie:
case .episode, .series, .movie, .boxset:
return Defaults[.showPosterLabels]
default:
return true

View File

@ -13,8 +13,6 @@ final class LibraryListViewModel: ViewModel {
@Published
var libraries: [BaseItemDto] = []
@Published
var libraryRandomItems: [BaseItemDto: BaseItemDto] = [:]
// temp
var withFavorites = LibraryFilters(filters: [.isFavorite], sortOrder: [], withGenres: [], sortBy: [])
@ -31,34 +29,8 @@ final class LibraryListViewModel: ViewModel {
.sink(receiveCompletion: { completion in
self.handleAPIRequestError(completion: completion)
}, receiveValue: { response in
if let libraries = response.items {
self.libraries = libraries
for library in libraries {
self.getRandomLibraryItem(for: library)
}
}
self.libraries = response.items ?? []
})
.store(in: &cancellables)
}
// MARK: Library random item
func getRandomLibraryItem(for library: BaseItemDto) {
guard library.itemType == .collectionFolder else { return }
ItemsAPI.getItems(userId: SessionManager.main.currentLogin.user.id,
limit: 1,
parentId: library.id)
.sink { completion in
self.handleAPIRequestError(completion: completion)
} receiveValue: { result in
if let item = result.items?.first {
self.libraryRandomItems[library] = item
} else {
self.libraryRandomItems[library] = library
}
}
.store(in: &cancellables)
}
}

View File

@ -111,7 +111,8 @@ final class LibraryViewModel: ViewModel {
.chapters,
],
includeItemTypes: filters.filters
.contains(.isFavorite) ? ["Movie", "Series", "Season", "Episode"] : ["Movie", "Series"],
.contains(.isFavorite) ? ["Movie", "Series", "Season", "Episode", "BoxSet"] :
["Movie", "Series", "BoxSet"],
filters: filters.filters,
sortBy: sortBy,
tags: filters.tags,