Update media library integration

fkuehne · fkuehne · commit cd23a240e337 · 2024-08-23T20:11:25.000+02:00
diff --git a/Sources/App/iOS/SirikitIntentCoordinator.swift b/Sources/App/iOS/SirikitIntentCoordinator.swift
@@ -87,7 +87,7 @@ extension SirikitIntentCoordinator: INAddMediaIntentHandling {
     }
     
     func handle(intent: INAddMediaIntent) async -> INAddMediaIntentResponse {
-        if let playlistName = intent.mediaDestination?.playlistName, let playlist = mediaLibraryService.medialib.searchPlaylists(byName: playlistName)?.first, let identifier = intent.mediaItems?.first?.identifier, let vlcIdentifier = Int64(identifier) {
+        if let playlistName = intent.mediaDestination?.playlistName, let playlist = mediaLibraryService.medialib.searchPlaylists(byName: playlistName, of: .all)?.first, let identifier = intent.mediaItems?.first?.identifier, let vlcIdentifier = Int64(identifier) {
             let appendMediaBool = playlist.appendMedia(withIdentifier: vlcIdentifier)
             let responsesCode: INAddMediaIntentResponseCode = appendMediaBool ? .success : .failure
             return .init(code: responsesCode, userActivity: nil)
@@ -134,7 +134,7 @@ private extension SirikitIntentCoordinator {
                 return .init(identifier: String(genre.identifier()), title: genre.name, type: .genre, artwork: nil)
             }
         case .playlist, .podcastPlaylist:
-            if let playlist = mediaLibraryService.medialib.searchPlaylists(byName: searchText)?.first {
+            if let playlist = mediaLibraryService.medialib.searchPlaylists(byName: searchText, of: .all)?.first {
                 return .init(identifier: String(playlist.identifier()), title: playlist.title(), type: .playlist, artwork: nil)
             }
         case .unknown:
diff --git a/Sources/Media Library/MediaCategories/MediaCategoryViewController.swift b/Sources/Media Library/MediaCategories/MediaCategoryViewController.swift
@@ -823,7 +823,7 @@ extension MediaCategoryViewController {
         let cancelAction: UIAlertAction = UIAlertAction(title: NSLocalizedString("BUTTON_CANCEL", comment: ""), style: .cancel)
 
         let clearAction: UIAlertAction = UIAlertAction(title: NSLocalizedString("BUTTON_CLEAR", comment: ""), style: .destructive) { _ in
-            self.mediaLibraryService.medialib.clearHistory()
+            self.mediaLibraryService.medialib.clearHistory(of: .global)
         }
 
         let alertController: UIAlertController = UIAlertController(title: NSLocalizedString("CLEAR_HISTORY_TITLE", comment: ""),
diff --git a/Sources/Media Library/MediaLibraryModel/HistoryModel.swift b/Sources/Media Library/MediaLibraryModel/HistoryModel.swift
@@ -52,7 +52,7 @@ extension HistoryModel: MediaLibraryObserver {
             fileArrayLock.unlock()
         }
         fileArrayLock.lock()
-        files = medialibrary.medialib.history(of: mediaType) ?? []
+        files = medialibrary.medialib.history(of: .global) ?? []
         observable.observers.forEach() {
             $0.value.observer?.mediaLibraryBaseModelReloadView()
         }
@@ -63,7 +63,7 @@ extension HistoryModel: MediaLibraryObserver {
             fileArrayLock.unlock()
         }
         fileArrayLock.lock()
-        files = medialibrary.medialib.history(of: mediaType) ?? []
+        files = medialibrary.medialib.history(of: .global) ?? []
         observable.observers.forEach() {
             $0.value.observer?.mediaLibraryBaseModelReloadView()
         }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ extension SirikitIntentCoordinator: INAddMediaIntentHandling {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`func handle(intent: INAddMediaIntent) async -> INAddMediaIntentResponse {`
`90`		`- if let playlistName = intent.mediaDestination?.playlistName, let playlist = mediaLibraryService.medialib.searchPlaylists(byName: playlistName)?.first, let identifier = intent.mediaItems?.first?.identifier, let vlcIdentifier = Int64(identifier) {`
	`90`	`+ if let playlistName = intent.mediaDestination?.playlistName, let playlist = mediaLibraryService.medialib.searchPlaylists(byName: playlistName, of: .all)?.first, let identifier = intent.mediaItems?.first?.identifier, let vlcIdentifier = Int64(identifier) {`
`91`	`91`	`let appendMediaBool = playlist.appendMedia(withIdentifier: vlcIdentifier)`
`92`	`92`	`let responsesCode: INAddMediaIntentResponseCode = appendMediaBool ? .success : .failure`
`93`	`93`	`return .init(code: responsesCode, userActivity: nil)`
`@@ -134,7 +134,7 @@ private extension SirikitIntentCoordinator {`
`134`	`134`	`return .init(identifier: String(genre.identifier()), title: genre.name, type: .genre, artwork: nil)`
`135`	`135`	`}`
`136`	`136`	`case .playlist, .podcastPlaylist:`
`137`		`- if let playlist = mediaLibraryService.medialib.searchPlaylists(byName: searchText)?.first {`
	`137`	`+ if let playlist = mediaLibraryService.medialib.searchPlaylists(byName: searchText, of: .all)?.first {`
`138`	`138`	`return .init(identifier: String(playlist.identifier()), title: playlist.title(), type: .playlist, artwork: nil)`
`139`	`139`	`}`
`140`	`140`	`case .unknown:`
Original file line number	Diff line number	Diff line change
`@@ -823,7 +823,7 @@ extension MediaCategoryViewController {`
`823`	`823`	`let cancelAction: UIAlertAction = UIAlertAction(title: NSLocalizedString("BUTTON_CANCEL", comment: ""), style: .cancel)`
`824`	`824`
`825`	`825`	`let clearAction: UIAlertAction = UIAlertAction(title: NSLocalizedString("BUTTON_CLEAR", comment: ""), style: .destructive) { _ in`
`826`		`- self.mediaLibraryService.medialib.clearHistory()`
	`826`	`+ self.mediaLibraryService.medialib.clearHistory(of: .global)`
`827`	`827`	`}`
`828`	`828`
`829`	`829`	`let alertController: UIAlertController = UIAlertController(title: NSLocalizedString("CLEAR_HISTORY_TITLE", comment: ""),`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ extension HistoryModel: MediaLibraryObserver {`
`52`	`52`	`fileArrayLock.unlock()`
`53`	`53`	`}`
`54`	`54`	`fileArrayLock.lock()`
`55`		`- files = medialibrary.medialib.history(of: mediaType) ?? []`
	`55`	`+ files = medialibrary.medialib.history(of: .global) ?? []`
`56`	`56`	`observable.observers.forEach() {`
`57`	`57`	`$0.value.observer?.mediaLibraryBaseModelReloadView()`
`58`	`58`	`}`
`@@ -63,7 +63,7 @@ extension HistoryModel: MediaLibraryObserver {`
`63`	`63`	`fileArrayLock.unlock()`
`64`	`64`	`}`
`65`	`65`	`fileArrayLock.lock()`
`66`		`- files = medialibrary.medialib.history(of: mediaType) ?? []`
	`66`	`+ files = medialibrary.medialib.history(of: .global) ?? []`
`67`	`67`	`observable.observers.forEach() {`
`68`	`68`	`$0.value.observer?.mediaLibraryBaseModelReloadView()`
`69`	`69`	`}`