Merge branch 'jellyfin:main' into tvOSLetterPicker

jellyfin · Jan 26, 2025 · 0ec5f9c · 0ec5f9c
2 parents 8914395 + 35c39a8
commit 0ec5f9c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/Shared/ViewModels/ItemAdministration/ItemImagesViewModel.swift b/Shared/ViewModels/ItemAdministration/ItemImagesViewModel.swift
@@ -149,6 +149,10 @@ class ItemImagesViewModel: ViewModel, Stateful, Eventful {
 
                     try await self.uploadPhoto(image, type: type)
                     try await self.getAllImages()
+
+                    await MainActor.run {
+                        self.eventSubject.send(.updated)
+                    }
                 } catch {
                     let apiError = JellyfinAPIError(error.localizedDescription)
                     await MainActor.run {

diff --git a/Shared/ViewModels/LibraryViewModel/ItemLibraryViewModel.swift b/Shared/ViewModels/LibraryViewModel/ItemLibraryViewModel.swift
@@ -56,9 +56,9 @@ final class ItemLibraryViewModel: PagingLibraryViewModel<BaseItemDto> {
         var includeItemTypes: [BaseItemKind] = [.movie, .series, .boxSet]
         var isRecursive: Bool? = true
 
-        // TODO: determine `includeItemTypes` better
-        //       - look at parent collection type if necessary
-        //       - condense supported values
+        // TODO: this logic should be moved to a `LibraryParent` function
+        //       that transforms a `GetItemsByUserIDParameters` struct, instead
+        //       of having to do this case-by-case.
 
         if let libraryType = parent?.libraryType, let id = parent?.id {
             switch libraryType {

diff --git a/Shared/ViewModels/LibraryViewModel/ItemTypeLibraryViewModel.swift b/Shared/ViewModels/LibraryViewModel/ItemTypeLibraryViewModel.swift
@@ -11,7 +11,8 @@ import Foundation
 import Get
 import JellyfinAPI
 
-// TODO: atow, this is only really used for tvOS tabs
+// TODO: filtering on `itemTypes` should be moved to `ItemFilterCollection`,
+//       but there is additional logic based on the parent type, mainly `.folder`.
 final class ItemTypeLibraryViewModel: PagingLibraryViewModel<BaseItemDto> {
 
     let itemTypes: [BaseItemKind]

diff --git a/Shared/ViewModels/LibraryViewModel/PagingLibraryViewModel.swift b/Shared/ViewModels/LibraryViewModel/PagingLibraryViewModel.swift
@@ -49,6 +49,8 @@ protocol LibraryIdentifiable: Identifiable {
 //       on refresh. Should make bidirectional/offset index start?
 //       - use startIndex/index ranges instead of pages
 //       - source of data doesn't guarantee that all items in 0 ..< startIndex exist
+// TODO: have `filterViewModel` be private to the parent and the `get_` overrides recieve the
+//       current filters as a parameter
 
 /*
  Note: if `rememberSort == true`, then will override given filters with stored sorts