Have not resolved problems with Downloads yet

Author: Vladyslav Yakovlev

MusicPlayer/AppDelegate.swift

@@ -20,13 +20,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let config = Realm.Configuration(
             // Set the new schema version. This must be greater than the previously used
             // version (if you've never set a schema version before, the version is 0).
-            schemaVersion: 1,
+            schemaVersion: 2,
 
             // Set the block which will be called automatically when opening a Realm with
             // a schema version lower than the one set above
             migrationBlock: { migration, oldSchemaVersion in
                 // We haven’t migrated anything yet, so oldSchemaVersion == 0
-                if (oldSchemaVersion < 1) {
+                if (oldSchemaVersion < 2) {
                     // Nothing to do!
                     // Realm will automatically detect new properties and removed properties
                     // And will update the schema on disk automatically
@@ -36,6 +36,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Tell Realm to use this new configuration object for the default Realm
         Realm.Configuration.defaultConfiguration = config
 
+//        let realm = try! Realm()
+//        try! realm.write {
+//            realm.deleteAll()
+//        }
+        
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = BrowserVC()
         window?.makeKeyAndVisible()

MusicPlayer/Controllers/BrowserVC.swift

@@ -25,7 +25,7 @@ final class BrowserVC: UIViewController {
 
     private let downloadService = DownloadService.shared
 
-    private var downloadsManager: DownloadsManager! //= DownloadsManager()
+    private let downloadsManager = DownloadsManager()
 
     private let musicFormats = ["mp3", "aac", "aiff", "wav", "alac"]
 
@@ -78,7 +78,7 @@ final class BrowserVC: UIViewController {
         //let queue = DispatchQueue(label: "realm")
 
         //queue.async {
-            self.downloadsManager = DownloadsManager()
+            //self.downloadsManager = DownloadsManager()
             //self.downloadsManager.queue = queue
         //}
 
@@ -137,7 +137,7 @@ final class BrowserVC: UIViewController {
         alertVC.showClearButton = true
         alertVC.textFieldPlaceholder = "Name"
         alertVC.textFieldText = url.lastPathComponent
-        alertVC.font = UIFont(name: Fonts.general, size: 21)!    // UIFont(name: Fonts.gotham, size: 19)!
+        alertVC.font = UIFont(name: Fonts.general, size: 21)!
         let cancelAction = Action(title: "Cancel", type: .cancel)
         let saveAction = Action(title: "Save", type: .normal) { _ in
             let songName = alertVC.textFieldText!
@@ -149,12 +149,11 @@ final class BrowserVC: UIViewController {
     }
 
     private func downloadSong(with url: URL, with name: String) {
-        let songDownload = SongDownload()
-        songDownload.title = name
-        songDownload.url = url
-        downloadsManager.addDownload(songDownload)
-        downloadService.startDownload(with: url, title: name)
-        print("startDownloadWithUrl *** \(songDownload.url) ***")
+        let download = SongDownload(url: url, title: name)
+        downloadsManager.addDownload(download) {
+            self.downloadService.startDownload(with: url, title: name)
+        }
+        print("startDownloadWithUrl *** \(download.url) ***")
     }
 
     deinit {
@@ -171,11 +170,11 @@ extension BrowserVC: DownloadServiceDelegate {
     }
 
     func downloadServiceFinishedDownloading(to location: URL, with url: URL, title: String) {
+        downloadsManager.setupStatus(.downloaded, forDownloadWith: url)
         let song = Song(url: location)
         song.title = title
         Library.main.addSong(song)
         print("delegate: downloadManagerFinishedDownloading")
-        downloadsManager.setupStatus(.downloaded, forDownloadWith: url)
     }
 
     func downloadServiceDownloadedData(from url: URL, with byteCount: Int64, of totalByteCount: Int64) {

MusicPlayer/Controllers/DownloadsVC.swift

@@ -12,6 +12,8 @@ final class DownloadsVC: UIViewController {
 
     var downloadsManager: DownloadsManager!
 
+    var browserVC: BrowserVC!
+    
     private let downloadService = DownloadService.shared
 
     private let titleLabel: UILabel = {
@@ -68,7 +70,9 @@ final class DownloadsVC: UIViewController {
         downloadsView.dataSource = self
         downloadsView.register(SongDownloadCell.self, forCellWithReuseIdentifier: SongDownloadCell.reuseId)
 
+        //downloadService.delegate.remove(browserVC)
         downloadService.delegate.add(self)
+        //downloadService.delegate.add(browserVC)
 
         closeButton.addTarget(self, action: #selector(tapCloseButton), for: .touchUpInside)
         clearButton.addTarget(self, action: #selector(tapClearButton), for: .touchUpInside)
@@ -108,7 +112,15 @@ extension DownloadsVC: SongDownloadCellDelegate {
     func tapRemoveButton(_ cell: SongDownloadCell) {
         guard let indexPath = downloadsView.indexPath(for: cell) else { return }
         downloadsManager.download(for: indexPath.item) { download in
-            self.downloadService.cancelDownload(with: download.url)
+            if download.status == .downloaded {
+                self.downloadsManager.removeDownload(download) {
+                    DispatchQueue.main.async {
+                        self.downloadsView.deleteItems(at: [indexPath])
+                    }
+                }
+            } else {
+                self.downloadService.cancelDownload(with: download.url)
+            }
         }
     }
 
@@ -126,8 +138,11 @@ extension DownloadsVC: DownloadServiceDelegate {
     func downloadServiceFinishedDownloading(to location: URL, with title: String, url: URL) {
         //guard let download = download else { return }
         //self.downloadsManager.setupStatus(.downloaded, forDownloadWith: url)
+        print("*******WILL reloadItems")
         self.downloadsManager.indexForDownload(with: url) { index in
+            print("WILL reloadItems")
             if let index = index {
+                print("WILL reloadItems")
                 self.downloadsView.reloadItems(at: [IndexPath(item: index, section: 0)])
             }
         }
@@ -143,6 +158,7 @@ extension DownloadsVC: DownloadServiceDelegate {
     }
 
     func downloadServiceDownloadedData(from url: URL, with byteCount: Int64, of totalByteCount: Int64) {
+        print("########downloadServiceDownloadedData")
         downloadsManager.download(with: url) { download in
             guard let download = download else { return }
             self.downloadsManager.indexForDownload(with: url) { index in
@@ -159,10 +175,13 @@ extension DownloadsVC: DownloadServiceDelegate {
     func downloadServiceCanceledDownloading(with url: URL) {
         downloadsManager.download(with: url) { download in
             guard let download = download else { return }
-            self.downloadsManager.removeDownload(download)
             self.downloadsManager.indexForDownload(with: url) { index in
                 if let index = index {
-                    self.downloadsView.deleteItems(at: [IndexPath(item: index, section: 0)])
+                    self.downloadsManager.removeDownload(download) {
+                        DispatchQueue.main.async {
+                            self.downloadsView.deleteItems(at: [IndexPath(item: index, section: 0)])
+                        }
+                    }
                 }
             }
         }

MusicPlayer/Helpers/MulticastDelegate.swift

@@ -29,7 +29,9 @@ class MulticastDelegate<T> {
 	}
 
 	func invoke(_ invocation: (T) -> ()) {
+        print("MulticastDelegates - \(delegates.count)")
 		for delegate in delegates.allObjects {
+            print("!!!!!!!invoke delegate:", delegate)
 			invocation(delegate as! T)
 		}
 	}

MusicPlayer/Models/DownloadsManager.swift

@@ -10,59 +10,48 @@ import RealmSwift
 
 class DownloadsManager {
 
-    private var realm: Realm!
-    
-    //private var downloads: Results<SongDownload>!
-    
-    var queue = DispatchQueue(label: "realm")
+    private let realmQueue = DispatchQueue(label: "com.MusicPlayer.realmQueue", qos: .userInteractive, attributes: .concurrent)
 
     private var downloads: Results<SongDownload> {
-        
+        return try! Realm().objects(SongDownload.self).sorted(byKeyPath: "creationDate", ascending: false)
     }
 
     var downloadsCount: Int {
         return try! Realm().objects(SongDownload.self).count
     }
 
-    init() {
-        queue = DispatchQueue(label: "realm")
-        queue.async {
-            Realm.asyncOpen(configuration: Realm.Configuration.defaultConfiguration) { realm, error in
-                if let realm = realm {
-                    self.realm = realm
-                    self.downloads = self.realm.objects(SongDownload.self).sorted(byKeyPath: "creationDate")
-                    // Realm successfully opened, with migration applied on background thread
-                } else if let error = error {
-                    // Handle error that occurred while opening the Realm
+    func addDownload(_ download: SongDownload, completion: @escaping () -> ()) {
+        realmQueue.async {
+            autoreleasepool {
+                let realm = try! Realm()
+                try! realm.write {
+                    realm.add(download)
+                }
+                realm.refresh()
+                DispatchQueue.main.async {
+                    completion()
                 }
             }
-            //self.realm = try! Realm()
-//            self.downloads = self.realm.objects(SongDownload.self).sorted(byKeyPath: "creationDate")
         }
     }
 
-    func addDownload(_ download: SongDownload) {
-        queue.async {
-            autoreleasepool {
-            try! self.realm.write {
-                self.realm.add(download)
-            }
-            self.realm.refresh()
+    func removeDownload(_ download: SongDownload, completion: @escaping () -> ()) {
+        let downloadRef = ThreadSafeReference(to: download)
+        realmQueue.async {
+            let realm = try! Realm()
+            guard let download = realm.resolve(downloadRef) else {
+                return
             }
-        }
-    }
-    
-    func removeDownload(_ download: SongDownload) {
-        queue.async {
-            try! self.realm.write {
-                self.realm.delete(download)
+            try! realm.write {
+                realm.delete(download)
             }
-            self.realm.refresh()
+            realm.refresh()
+            completion()
         }
     }
 
     func download(for index: Int, completion: @escaping (SongDownload) -> ()) {
-        queue.async {
+        realmQueue.async {
             let download = self.downloads[index]
             let downloadRef = ThreadSafeReference(to: download)
             DispatchQueue.main.async {
@@ -76,7 +65,7 @@ class DownloadsManager {
     }
 
     func download(with url: URL, completion: @escaping (SongDownload?) -> ()) {
-        queue.async {
+        realmQueue.async {
             guard let download = self.download(with: url) else {
                 DispatchQueue.main.async {
                     completion(nil)
@@ -95,7 +84,7 @@ class DownloadsManager {
     }
 
     func indexForDownload(with url: URL, completion: @escaping (Int?) -> ()) {
-        queue.async {
+        realmQueue.async {
             let index = self.downloads.index {
                 $0.url == url
             }
@@ -106,26 +95,20 @@ class DownloadsManager {
     }
 
     func setupStatus(_ status: DownloadStatus, forDownloadWith url: URL) {
-        queue.async {
+        realmQueue.async {
             guard let download = self.download(with: url) else {
                 return
             }
-            //try! self.realm.write {
-                download.status = status
-            //}
-            self.realm.refresh()
+            download.status = status
         }
     }
 
     func setupProgress(_ progress: Progress, forDownloadWith url: URL) {
-        queue.async {
+        realmQueue.async {
             guard let download = self.download(with: url) else {
                 return
             }
-            //try! self.realm.write {
-                download.progress = progress
-            //}
-            self.realm.refresh()
+            download.progress = progress
         }
     }
 

MusicPlayer/Models/Library.swift

@@ -25,8 +25,12 @@ class Library {
     }
 
     func addSong(_ song: Song) {
-        try! realm.write {
-            realm.add(song)
+        DispatchQueue.global(qos: .userInteractive).async {
+            let realm = try! Realm()
+            try! realm.write {
+                realm.add(song)
+            }
+            realm.refresh()
         }
     }