VLCMediaLibraryManager: Rename to MediaLibraryService

SharedSources/MediaLibraryModel/AlbumModel.swift

@@ -23,11 +23,11 @@ class AlbumModel: MLBaseModel {
 
     var cellType: BaseCollectionViewCell.Type { return AudioCollectionViewCell.self }
 
-    var medialibrary: VLCMediaLibraryManager
+    var medialibrary: MediaLibraryService
 
     var indicatorName: String = NSLocalizedString("ALBUMS", comment: "")
 
-    required init(medialibrary: VLCMediaLibraryManager) {
+    required init(medialibrary: MediaLibraryService) {
         self.medialibrary = medialibrary
         medialibrary.addObserver(self)
         files = medialibrary.albums()
@@ -53,7 +53,7 @@ extension AlbumModel {
 }
 
 extension AlbumModel: MediaLibraryObserver {
-    func medialibrary(_ medialibrary: VLCMediaLibraryManager, didAddAlbums albums: [VLCMLAlbum]) {
+    func medialibrary(_ medialibrary: MediaLibraryService, didAddAlbums albums: [VLCMLAlbum]) {
         albums.forEach({ append($0) })
         updateView?()
     }

SharedSources/MediaLibraryModel/ArtistModel.swift

@@ -20,11 +20,11 @@ class ArtistModel: MLBaseModel {
 
     var cellType: BaseCollectionViewCell.Type { return ArtistCollectionViewCell.self }
 
-    var medialibrary: VLCMediaLibraryManager
+    var medialibrary: MediaLibraryService
 
     var indicatorName: String = NSLocalizedString("ARTISTS", comment: "")
 
-    required init(medialibrary: VLCMediaLibraryManager) {
+    required init(medialibrary: MediaLibraryService) {
         self.medialibrary = medialibrary
         medialibrary.addObserver(self)
         files = medialibrary.artists()
@@ -50,7 +50,7 @@ extension ArtistModel {
 }
 
 extension ArtistModel: MediaLibraryObserver {
-    func medialibrary(_ medialibrary: VLCMediaLibraryManager, didAddArtists artists: [VLCMLArtist]) {
+    func medialibrary(_ medialibrary: MediaLibraryService, didAddArtists artists: [VLCMLArtist]) {
         artists.forEach({ append($0) })
         updateView?()
     }

SharedSources/MediaLibraryModel/AudioModel.swift

@@ -22,11 +22,11 @@ class AudioModel: MediaModel {
 
     var cellType: BaseCollectionViewCell.Type { return AudioCollectionViewCell.self }
 
-    var medialibrary: VLCMediaLibraryManager
+    var medialibrary: MediaLibraryService
 
     var indicatorName: String = NSLocalizedString("SONGS", comment: "")
 
-    required init(medialibrary: VLCMediaLibraryManager) {
+    required init(medialibrary: MediaLibraryService) {
         self.medialibrary = medialibrary
         medialibrary.addObserver(self)
         files = medialibrary.media(ofType: .audio)
@@ -47,12 +47,12 @@ extension AudioModel {
 // MARK: - MediaLibraryObserver
 
 extension AudioModel: MediaLibraryObserver {
-    func medialibrary(_ medialibrary: VLCMediaLibraryManager, didAddAudios audios: [VLCMLMedia]) {
+    func medialibrary(_ medialibrary: MediaLibraryService, didAddAudios audios: [VLCMLMedia]) {
         audios.forEach({ append($0) })
         updateView?()
     }
 
-    func medialibrary(_ medialibrary: VLCMediaLibraryManager, didDeleteMediaWithIds ids: [NSNumber]) {
+    func medialibrary(_ medialibrary: MediaLibraryService, didDeleteMediaWithIds ids: [NSNumber]) {
         files = files.filter() {
             for id in ids where $0.identifier() == id.int64Value {
                 return false

SharedSources/MediaLibraryModel/GenreModel.swift

@@ -20,11 +20,11 @@ class GenreModel: MLBaseModel {
 
     var cellType: BaseCollectionViewCell.Type { return GenreCollectionViewCell.self }
 
-    var medialibrary: VLCMediaLibraryManager
+    var medialibrary: MediaLibraryService
 
     var indicatorName: String = NSLocalizedString("GENRES", comment: "")
 
-    required init(medialibrary: VLCMediaLibraryManager) {
+    required init(medialibrary: MediaLibraryService) {
         self.medialibrary = medialibrary
         medialibrary.addObserver(self)
         files = medialibrary.genres()
@@ -50,7 +50,7 @@ extension GenreModel {
 }
 
 extension GenreModel: MediaLibraryObserver {
-    func medialibrary(_ medialibrary: VLCMediaLibraryManager, didAddGenres genres: [VLCMLGenre]) {
+    func medialibrary(_ medialibrary: MediaLibraryService, didAddGenres genres: [VLCMLGenre]) {
         genres.forEach({ append($0) })
         updateView?()
     }

SharedSources/MediaLibraryModel/MediaLibraryBaseModel.swift

@@ -11,7 +11,7 @@
 
 // Expose a "shadow" version without associatedType in order to use it as a type
 protocol MediaLibraryBaseModel {
-    init(medialibrary: VLCMediaLibraryManager)
+    init(medialibrary: MediaLibraryService)
 
     var anyfiles: [VLCMLObject] { get }
 
@@ -30,11 +30,11 @@ protocol MediaLibraryBaseModel {
 protocol MLBaseModel: AnyObject, MediaLibraryBaseModel {
     associatedtype MLType where MLType: VLCMLObject
 
-    init(medialibrary: VLCMediaLibraryManager)
+    init(medialibrary: MediaLibraryService)
 
     var files: [MLType] { get set }
 
-    var medialibrary: VLCMediaLibraryManager { get }
+    var medialibrary: MediaLibraryService { get }
 
     var updateView: (() -> Void)? { get set }
 

SharedSources/MediaLibraryModel/PlaylistModel.swift

@@ -21,11 +21,11 @@ class PlaylistModel: MLBaseModel {
 
     var cellType: BaseCollectionViewCell.Type { return MovieCollectionViewCell.self }
 
-    var medialibrary: VLCMediaLibraryManager
+    var medialibrary: MediaLibraryService
 
     var indicatorName: String = NSLocalizedString("PLAYLISTS", comment: "")
 
-    required init(medialibrary: VLCMediaLibraryManager) {
+    required init(medialibrary: MediaLibraryService) {
         self.medialibrary = medialibrary
         medialibrary.addObserver(self)
         files = medialibrary.playlists()
@@ -66,12 +66,12 @@ extension PlaylistModel {
 }
 
 extension PlaylistModel: MediaLibraryObserver {
-    func medialibrary(_ medialibrary: VLCMediaLibraryManager, didAddPlaylists playlists: [VLCMLPlaylist]) {
+    func medialibrary(_ medialibrary: MediaLibraryService, didAddPlaylists playlists: [VLCMLPlaylist]) {
         playlists.forEach({ append($0) })
         updateView?()
     }
 
-    func medialibrary(_ medialibrary: VLCMediaLibraryManager, didDeletePlaylistsWithIds playlistsIds: [NSNumber]) {
+    func medialibrary(_ medialibrary: MediaLibraryService, didDeletePlaylistsWithIds playlistsIds: [NSNumber]) {
         files = files.filter() {
             for id in playlistsIds where $0.identifier() == id.int64Value {
                 return false

SharedSources/MediaLibraryModel/ShowEpisodeModel.swift

@@ -24,11 +24,11 @@ class ShowEpisodeModel: MLBaseModel {
 
     var cellType: BaseCollectionViewCell.Type { return MovieCollectionViewCell.self }
 
-    var medialibrary: VLCMediaLibraryManager
+    var medialibrary: MediaLibraryService
 
     var indicatorName: String = NSLocalizedString("EPISODES", comment: "")
 
-    required init(medialibrary: VLCMediaLibraryManager) {
+    required init(medialibrary: MediaLibraryService) {
         self.medialibrary = medialibrary
         medialibrary.addObserver(self)
     }
@@ -51,7 +51,7 @@ extension ShowEpisodeModel {
 }
 
 extension ShowEpisodeModel: MediaLibraryObserver {
-    func medialibrary(_ medialibrary: VLCMediaLibraryManager, didAddShowEpisodes showEpisodes: [VLCMLMedia]) {
+    func medialibrary(_ medialibrary: MediaLibraryService, didAddShowEpisodes showEpisodes: [VLCMLMedia]) {
         showEpisodes.forEach({ append($0) })
         updateView?()
     }

SharedSources/MediaLibraryModel/VideoModel.swift

@@ -24,11 +24,11 @@ class VideoModel: MediaModel {
 
     var cellType: BaseCollectionViewCell.Type { return MovieCollectionViewCell.self }
 
-    var medialibrary: VLCMediaLibraryManager
+    var medialibrary: MediaLibraryService
 
     var indicatorName: String = NSLocalizedString("MOVIES", comment: "")
 
-    required init(medialibrary: VLCMediaLibraryManager) {
+    required init(medialibrary: MediaLibraryService) {
         self.medialibrary = medialibrary
         medialibrary.addObserver(self)
         files = medialibrary.media(ofType: .video)
@@ -57,12 +57,12 @@ extension VideoModel {
 // MARK: - MediaLibraryObserver
 
 extension VideoModel: MediaLibraryObserver {
-    func medialibrary(_ medialibrary: VLCMediaLibraryManager, didAddVideos videos: [VLCMLMedia]) {
+    func medialibrary(_ medialibrary: MediaLibraryService, didAddVideos videos: [VLCMLMedia]) {
         videos.forEach({ append($0) })
         updateView?()
     }
 
-    func medialibrary(_ medialibrary: VLCMediaLibraryManager, didDeleteMediaWithIds ids: [NSNumber]) {
+    func medialibrary(_ medialibrary: MediaLibraryService, didDeleteMediaWithIds ids: [NSNumber]) {
         files = files.filter() {
             for id in ids where $0.identifier() == id.int64Value {
                 return false
@@ -76,7 +76,7 @@ extension VideoModel: MediaLibraryObserver {
 // MARK: MediaLibraryObserver - Thumbnail
 
 extension VideoModel {
-    func medialibrary(_ medialibrary: VLCMediaLibraryManager, thumbnailReady media: VLCMLMedia) {
+    func medialibrary(_ medialibrary: MediaLibraryService, thumbnailReady media: VLCMLMedia) {
         for (index, file) in files.enumerated() {
             if file == media {
                 files[index] = media

SharedSources/VLCMediaLibraryManager.swift

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VLCMediaLibraryManager.swift
+ * MediaLibraryService.swift
  * VLC for iOS
  *****************************************************************************
  * Copyright © 2018 VideoLAN. All rights reserved.
@@ -21,64 +21,64 @@ extension NSNotification {
 
 @objc protocol MediaLibraryObserver: class {
     // Video
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didModifyVideo video: [VLCMLMedia])
 
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didDeleteMediaWithIds ids: [NSNumber])
 
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didAddVideos videos: [VLCMLMedia])
 
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didAddShowEpisodes showEpisodes: [VLCMLMedia])
 
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      thumbnailReady media: VLCMLMedia)
 
     // Audio
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didAddAudios audios: [VLCMLMedia])
 
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didAddArtists artists: [VLCMLArtist])
 
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didDeleteArtistsWithIds artistsIds: [NSNumber])
 
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didAddAlbums albums: [VLCMLAlbum])
 
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didDeleteAlbumsWithIds albumsIds: [NSNumber])
 
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didAddAlbumTracks albumTracks: [VLCMLMedia])
 
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didAddGenres genres: [VLCMLGenre])
 
     // Playlist
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didAddPlaylists playlists: [VLCMLPlaylist])
 
-    @objc optional func medialibrary(_ medialibrary: VLCMediaLibraryManager,
+    @objc optional func medialibrary(_ medialibrary: MediaLibraryService,
                                      didDeletePlaylistsWithIds playlistsIds: [NSNumber])
 }
 
 protocol MediaLibraryMigrationDelegate: class {
-    func medialibraryDidStartMigration(_ medialibrary: VLCMediaLibraryManager)
+    func medialibraryDidStartMigration(_ medialibrary: MediaLibraryService)
 
-    func medialibraryDidFinishMigration(_ medialibrary: VLCMediaLibraryManager)
+    func medialibraryDidFinishMigration(_ medialibrary: MediaLibraryService)
 
-    func medialibraryDidStopMigration(_ medialibrary: VLCMediaLibraryManager)
+    func medialibraryDidStopMigration(_ medialibrary: MediaLibraryService)
 }
 
-class VLCMediaLibraryManager: NSObject {
+class MediaLibraryService: NSObject {
     private static let databaseName: String = "medialibrary.db"
     private static let migrationKey: String = "MigratedToVLCMediaLibraryKit"
 
-    private var didMigrate = UserDefaults.standard.bool(forKey: VLCMediaLibraryManager.migrationKey)
+    private var didMigrate = UserDefaults.standard.bool(forKey: MediaLibraryService.migrationKey)
     private var didFinishDiscovery = false
     // Using ObjectIdentifier to avoid duplication and facilitate
     // identification of observing object
@@ -109,12 +109,12 @@ class VLCMediaLibraryManager: NSObject {
     private func setupMediaLibrary() {
         guard let documentPath = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first,
             let libraryPath = NSSearchPathForDirectoriesInDomains(.libraryDirectory, .userDomainMask, true).first else {
-                preconditionFailure("VLCMediaLibraryManager: Unable to init medialibrary.")
+                preconditionFailure("MediaLibraryService: Unable to init medialibrary.")
         }
 
         setupMediaDiscovery(at: documentPath)
 
-        let databasePath = libraryPath + "/MediaLibrary/" + VLCMediaLibraryManager.databaseName
+        let databasePath = libraryPath + "/MediaLibrary/" + MediaLibraryService.databaseName
         let thumbnailPath = libraryPath + "/MediaLibrary/Thumbnails"
 
         do {
@@ -130,18 +130,18 @@ class VLCMediaLibraryManager: NSObject {
         switch medialibraryStatus {
         case .success:
             guard medialib.start() else {
-                assertionFailure("VLCMediaLibraryManager: Medialibrary failed to start.")
+                assertionFailure("MediaLibraryService: Medialibrary failed to start.")
                 return
             }
             medialib.reload()
             medialib.discover(onEntryPoint: "file://" + documentPath)
         case .alreadyInitialized:
-            assertionFailure("VLCMediaLibraryManager: Medialibrary already initialized.")
+            assertionFailure("MediaLibraryService: Medialibrary already initialized.")
         case .failed:
-            preconditionFailure("VLCMediaLibraryManager: Failed to setup medialibrary.")
+            preconditionFailure("MediaLibraryService: Failed to setup medialibrary.")
         case .dbReset:
             // should still start and discover but warn the user that the db has been wipped
-            assertionFailure("VLCMediaLibraryManager: The database was resetted, please re-configure.")
+            assertionFailure("MediaLibraryService: The database was resetted, please re-configure.")
         }
     }
 
@@ -181,7 +181,7 @@ class VLCMediaLibraryManager: NSObject {
 
 // MARK: - Migration
 
-private extension VLCMediaLibraryManager {
+private extension MediaLibraryService {
     func startMigrationIfNeeded() {
         guard !didMigrate else {
             return
@@ -197,7 +197,7 @@ private extension VLCMediaLibraryManager {
 
     func migrateMedia(_ oldMedialibrary: MLMediaLibrary) -> Bool {
         guard let allFiles = MLFile.allFiles() as? [MLFile] else {
-            assertionFailure("VLCMediaLibraryManager: Migration: Unable to retreive all files")
+            assertionFailure("MediaLibraryService: Migration: Unable to retreive all files")
             return false
         }
 
@@ -222,7 +222,7 @@ private extension VLCMediaLibraryManager {
     // Note: This removes **only** files that are in a playlist
     func migratePlaylists(_ oldMedialibrary: MLMediaLibrary) -> Bool {
         guard let allLabels = MLLabel.allLabels() as? [MLLabel] else {
-            assertionFailure("VLCMediaLibraryManager: Migration: Unable to retreive all labels")
+            assertionFailure("MediaLibraryService: Migration: Unable to retreive all labels")
             return false
         }
 
@@ -230,7 +230,7 @@ private extension VLCMediaLibraryManager {
             let newPlaylist = createPlaylist(with: label.name)
 
             guard let files = label.files as? Set<MLFile> else {
-                assertionFailure("VLCMediaLibraryManager: Migration: Unable to retreive files from label")
+                assertionFailure("MediaLibraryService: Migration: Unable to retreive files from label")
                 oldMedialibrary.remove(label)
                 continue
             }
@@ -250,12 +250,12 @@ private extension VLCMediaLibraryManager {
 
     func migrateToNewMediaLibrary() -> Bool {
         guard let oldMedialibrary = MLMediaLibrary.sharedMediaLibrary() as? MLMediaLibrary else {
-            assertionFailure("VLCMediaLibraryManager: Migration: Unable to retreive old medialibrary")
+            assertionFailure("MediaLibraryService: Migration: Unable to retreive old medialibrary")
             return false
         }
 
         if migrateMedia(oldMedialibrary) && migratePlaylists(oldMedialibrary) {
-            UserDefaults.standard.set(true, forKey: VLCMediaLibraryManager.migrationKey)
+            UserDefaults.standard.set(true, forKey: MediaLibraryService.migrationKey)
             return true
         }
         return false
@@ -264,13 +264,13 @@ private extension VLCMediaLibraryManager {
 
 // MARK: - Observer
 
-private extension VLCMediaLibraryManager {
+private extension MediaLibraryService {
     struct Observer {
         weak var observer: MediaLibraryObserver?
     }
 }
 
-extension VLCMediaLibraryManager {
+extension MediaLibraryService {
     func addObserver(_ observer: MediaLibraryObserver) {
         let identifier = ObjectIdentifier(observer)
         observers[identifier] = Observer(observer: observer)
@@ -284,7 +284,7 @@ extension VLCMediaLibraryManager {
 
 // MARK: MediaLibrary - Audio methods
 
-extension VLCMediaLibraryManager {
+extension MediaLibraryService {
     func artists(sortingCriteria sort: VLCMLSortingCriteria = .artist, desc: Bool = false) -> [VLCMLArtist] {
         return medialib.artists(with: sort, desc: desc, all: true)
     }
@@ -296,13 +296,13 @@ extension VLCMediaLibraryManager {
 
 // MARK: MediaLibrary - Video methods
 
-extension VLCMediaLibraryManager {
+extension MediaLibraryService {
     func requestThumbnail(for media: [VLCMLMedia]) {
         media.forEach() {
             guard !$0.isThumbnailGenerated() else { return }
 
             if !medialib.requestThumbnail(for: $0) {
-                assertionFailure("VLCMediaLibraryManager: Failed to generate thumbnail for: \($0.identifier())")
+                assertionFailure("MediaLibraryService: Failed to generate thumbnail for: \($0.identifier())")
             }
         }
     }
@@ -310,7 +310,7 @@ extension VLCMediaLibraryManager {
 
 // MARK: MediaLibrary - Playlist methods
 
-extension VLCMediaLibraryManager {
+extension MediaLibraryService {
 
     func createPlaylist(with name: String) -> VLCMLPlaylist {
         return medialib.createPlaylist(withName: name)
@@ -325,7 +325,7 @@ extension VLCMediaLibraryManager {
     }
 }
 
-extension VLCMediaLibraryManager: VLCMediaFileDiscovererDelegate {
+extension MediaLibraryService: VLCMediaFileDiscovererDelegate {
     func mediaFileAdded(_ filePath: String!, loading isLoading: Bool) {
         guard !isLoading else {
             return
@@ -339,7 +339,7 @@ extension VLCMediaLibraryManager: VLCMediaFileDiscovererDelegate {
         do {
             try excludeURL.setResourceValues(resourceValue)
         } catch let error {
-            assertionFailure("VLCMediaLibraryManager: VLCMediaFileDiscovererDelegate: \(error.localizedDescription)")
+            assertionFailure("MediaLibraryService: VLCMediaFileDiscovererDelegate: \(error.localizedDescription)")
         }
 
         reload()
@@ -352,7 +352,7 @@ extension VLCMediaLibraryManager: VLCMediaFileDiscovererDelegate {
 
 // MARK: - VLCMediaLibraryDelegate - Media
 
-extension VLCMediaLibraryManager: VLCMediaLibraryDelegate {
+extension MediaLibraryService: VLCMediaLibraryDelegate {
     func medialibrary(_ medialibrary: VLCMediaLibrary, didAddMedia media: [VLCMLMedia]) {
         let videos = media.filter {( $0.type() == .video )}
         let audio = media.filter {( $0.type() == .audio )}
@@ -391,7 +391,7 @@ extension VLCMediaLibraryManager: VLCMediaLibraryDelegate {
 
 // MARK: - VLCMediaLibraryDelegate - Artists
 
-extension VLCMediaLibraryManager {
+extension MediaLibraryService {
     func medialibrary(_ medialibrary: VLCMediaLibrary, didAdd artists: [VLCMLArtist]) {
         for observer in observers {
             observer.value.observer?.medialibrary?(self, didAddArtists: artists)
@@ -407,7 +407,7 @@ extension VLCMediaLibraryManager {
 
 // MARK: - VLCMediaLibraryDelegate - Albums
 
-extension VLCMediaLibraryManager {
+extension MediaLibraryService {
     func medialibrary(_ medialibrary: VLCMediaLibrary, didAdd albums: [VLCMLAlbum]) {
         for observer in observers {
             observer.value.observer?.medialibrary?(self, didAddAlbums: albums)
@@ -423,7 +423,7 @@ extension VLCMediaLibraryManager {
 
 // MARK: - VLCMediaLibraryDelegate - Playlists
 
-extension VLCMediaLibraryManager {
+extension MediaLibraryService {
     func medialibrary(_ medialibrary: VLCMediaLibrary, didAdd playlists: [VLCMLPlaylist]) {
         for observer in observers {
             observer.value.observer?.medialibrary?(self, didAddPlaylists: playlists)
@@ -439,7 +439,7 @@ extension VLCMediaLibraryManager {
 
 // MARK: - VLCMediaLibraryDelegate - Discovery
 
-extension VLCMediaLibraryManager {
+extension MediaLibraryService {
     func medialibrary(_ medialibrary: VLCMediaLibrary, didStartDiscovery entryPoint: String) {
     }
 

Sources/Coordinators/AppCoordinator.swift

@@ -12,7 +12,7 @@
 
 @objc(VLCService)
 class Services: NSObject {
-    @objc let medialibraryManager = VLCMediaLibraryManager()
+    @objc let medialibraryManager = MediaLibraryService()
     @objc let rendererDiscovererManager = VLCRendererDiscovererManager(presentingViewController: nil)
 }
 
@@ -62,14 +62,14 @@ class Services: NSObject {
 }
 
 extension AppCoordinator: MediaLibraryMigrationDelegate {
-    func medialibraryDidStartMigration(_ medialibrary: VLCMediaLibraryManager) {
+    func medialibraryDidStartMigration(_ medialibrary: MediaLibraryService) {
         DispatchQueue.main.async {
             [tabBarController, migrationViewController] in
             tabBarController.present(migrationViewController, animated: true, completion: nil)
         }
     }
 
-    func medialibraryDidFinishMigration(_ medialibrary: VLCMediaLibraryManager) {
+    func medialibraryDidFinishMigration(_ medialibrary: MediaLibraryService) {
         if tabBarController.presentedViewController === migrationViewController {
             DispatchQueue.main.async {
                 [tabBarController] in
@@ -78,7 +78,7 @@ extension AppCoordinator: MediaLibraryMigrationDelegate {
         }
     }
 
-    func medialibraryDidStopMigration(_ medialibrary: VLCMediaLibraryManager) {
+    func medialibraryDidStopMigration(_ medialibrary: MediaLibraryService) {
         if tabBarController.presentedViewController === migrationViewController {
             DispatchQueue.main.async {
                 [tabBarController] in

VLC.xcodeproj/project.pbxproj

@@ -252,7 +252,7 @@
 		8D43712D2056AF1600F36458 /* VLCRendererDiscovererManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D43712C2056AF1600F36458 /* VLCRendererDiscovererManager.swift */; };
 		8D437154205808FF00F36458 /* VLCActionSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D437153205808FF00F36458 /* VLCActionSheet.swift */; };
 		8D4F9B472141630000E478BE /* MediaModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D4F9B462141630000E478BE /* MediaModel.swift */; };
-		8D66A47320AC61B900FA5B92 /* VLCMediaLibraryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D66A47220AC61B900FA5B92 /* VLCMediaLibraryManager.swift */; };
+		8D66A47320AC61B900FA5B92 /* MediaLibraryService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D66A47220AC61B900FA5B92 /* MediaLibraryService.swift */; };
 		8DD6516F208C89BC0052EE68 /* VLCAccessibilityIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DD6516E208C89BC0052EE68 /* VLCAccessibilityIdentifier.swift */; };
 		8DD651BA208F6AF00052EE68 /* VLCActionSheetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DD651B9208F6AF00052EE68 /* VLCActionSheetCell.swift */; };
 		8DD651C4208F786F0052EE68 /* VLCActionSheetSectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DD651C3208F786F0052EE68 /* VLCActionSheetSectionHeader.swift */; };
@@ -822,7 +822,7 @@
 		8D43712C2056AF1600F36458 /* VLCRendererDiscovererManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = VLCRendererDiscovererManager.swift; path = Sources/VLCRendererDiscovererManager.swift; sourceTree = "<group>"; };
 		8D437153205808FF00F36458 /* VLCActionSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VLCActionSheet.swift; sourceTree = "<group>"; };
 		8D4F9B462141630000E478BE /* MediaModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaModel.swift; sourceTree = "<group>"; };
-		8D66A47220AC61B900FA5B92 /* VLCMediaLibraryManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VLCMediaLibraryManager.swift; sourceTree = "<group>"; };
+		8D66A47220AC61B900FA5B92 /* MediaLibraryService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaLibraryService.swift; sourceTree = "<group>"; };
 		8DD6516E208C89BC0052EE68 /* VLCAccessibilityIdentifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VLCAccessibilityIdentifier.swift; sourceTree = "<group>"; };
 		8DD651B9208F6AF00052EE68 /* VLCActionSheetCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VLCActionSheetCell.swift; sourceTree = "<group>"; };
 		8DD651C3208F786F0052EE68 /* VLCActionSheetSectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VLCActionSheetSectionHeader.swift; sourceTree = "<group>"; };
@@ -1716,7 +1716,7 @@
 				7D37849D183A98DD009EE944 /* VLCThumbnailsCache.m */,
 				DD7110EE1AF38B2B00854776 /* MLMediaLibrary+playlist.h */,
 				DD7110EF1AF38B2B00854776 /* MLMediaLibrary+playlist.m */,
-				8D66A47220AC61B900FA5B92 /* VLCMediaLibraryManager.swift */,
+				8D66A47220AC61B900FA5B92 /* MediaLibraryService.swift */,
 			);
 			name = Library;
 			sourceTree = "<group>";
@@ -2922,7 +2922,7 @@
 				8D437154205808FF00F36458 /* VLCActionSheet.swift in Sources */,
 				DDF908E41CFCD97400108B70 /* VLCNetworkLoginDataSourceProtocol.m in Sources */,
 				41CF03E821D117D100B449E0 /* GenreCollectionViewCell.swift in Sources */,
-				8D66A47320AC61B900FA5B92 /* VLCMediaLibraryManager.swift in Sources */,
+				8D66A47320AC61B900FA5B92 /* MediaLibraryService.swift in Sources */,
 				7D378492183A98BF009EE944 /* VLCExternalDisplayController.m in Sources */,
 				8DE1888C210B459000A091D2 /* ShowEpisodeModel.swift in Sources */,
 				4170152C209A1D3600802E44 /* MediaViewController.swift in Sources */,