diff --git a/ios/App/App/plugins/AbsDownloader.swift b/ios/App/App/plugins/AbsDownloader.swift index d5d0581f..9220f744 100644 --- a/ios/App/App/plugins/AbsDownloader.swift +++ b/ios/App/App/plugins/AbsDownloader.swift @@ -157,14 +157,19 @@ public class AbsDownloader: CAPPlugin, URLSessionDownloadDelegate { } return LocalFile(libraryItem.id, part.filename!, part.mimeType()!, part.destinationUri!, fileSize: Int(part.destinationURL!.fileSize)) } - let localLibraryItem = LocalLibraryItem(libraryItem, localUrl: localDirectory, server: Store.serverConfig!, files: files, coverPath: coverFile) + var localLibraryItem = Database.shared.getLocalLibraryItemByLLId(libraryItem: libraryItem.id) + if (localLibraryItem != nil && localLibraryItem!.isPodcast) { + try! localLibraryItem?.addFiles(files, item: libraryItem) + } else { + localLibraryItem = LocalLibraryItem(libraryItem, localUrl: localDirectory, server: Store.serverConfig!, files: files, coverPath: coverFile) + } - Database.shared.saveLocalLibraryItem(localLibraryItem: localLibraryItem) + Database.shared.saveLocalLibraryItem(localLibraryItem: localLibraryItem!) statusNotification["localLibraryItem"] = try? localLibraryItem.asDictionary() if let progress = libraryItem.userMediaProgress { let episode = downloadItem.media?.episodes?.first(where: { $0.id == downloadItem.episodeId }) - let localMediaProgress = LocalMediaProgress(localLibraryItem: localLibraryItem, episode: episode, progress: progress) + let localMediaProgress = LocalMediaProgress(localLibraryItem: localLibraryItem!, episode: episode, progress: progress) Database.shared.saveLocalMediaProgress(localMediaProgress) statusNotification["localMediaProgress"] = try? localMediaProgress.asDictionary() } @@ -319,6 +324,7 @@ enum LibraryItemDownloadError: String, Error { case noMetadata = "No metadata for track, unable to download" case libraryItemNotPodcast = "Library item is not a podcast but episode was requested" case podcastEpisodeNotFound = "Invalid podcast episode not found" + case podcastOnlySupported = "Only podcasts are supported for this function" case unknownMediaType = "Unknown media type" case failedDirectory = "Failed to create directory" case failedDownload = "Failed to download item" diff --git a/ios/App/Shared/models/DataClasses.swift b/ios/App/Shared/models/DataClasses.swift index 70a10055..b525264f 100644 --- a/ios/App/Shared/models/DataClasses.swift +++ b/ios/App/Shared/models/DataClasses.swift @@ -207,11 +207,13 @@ struct AudioTrack: Realmable, Codable { mimeType = "" } - mutating func setLocalInfo(filenameIdMap: [String: String], serverIndex: Int) { + mutating func setLocalInfo(filenameIdMap: [String: String], serverIndex: Int) -> Bool { if let localFileId = filenameIdMap[self.metadata?.filename ?? ""] { self.localFileId = localFileId self.serverIndex = serverIndex + return true } + return false } } diff --git a/ios/App/Shared/models/LocalLibrary.swift b/ios/App/Shared/models/LocalLibrary.swift index 888f95ac..49af3994 100644 --- a/ios/App/Shared/models/LocalLibrary.swift +++ b/ios/App/Shared/models/LocalLibrary.swift @@ -9,7 +9,7 @@ import Foundation import Unrealm struct LocalLibraryItem: Realmable, Codable { - var id: String = "local_\(UUID().uuidString)" + var id: String = "" var basePath: String = "" var _contentUrl: String? var isInvalid: Bool = false @@ -39,6 +39,8 @@ struct LocalLibraryItem: Realmable, Codable { } } + var isPodcast: Bool { self.mediaType == "podcast" } + static func primaryKey() -> String? { return "id" } diff --git a/ios/App/Shared/models/LocalLibraryExtensions.swift b/ios/App/Shared/models/LocalLibraryExtensions.swift index c6b38dbc..eb36275b 100644 --- a/ios/App/Shared/models/LocalLibraryExtensions.swift +++ b/ios/App/Shared/models/LocalLibraryExtensions.swift @@ -10,6 +10,7 @@ import Foundation extension LocalLibraryItem { init(_ item: LibraryItem, localUrl: String, server: ServerConnectionConfig, files: [LocalFile], coverPath: String?) { self.init() + self.id = "local_\(item.id)" self._contentUrl = localUrl self.mediaType = item.mediaType self.localFiles = files @@ -20,22 +21,36 @@ extension LocalLibraryItem { self.serverUserId = server.userId // Link the audio tracks and files - var media = item.media - let fileIdByFilename = Dictionary(uniqueKeysWithValues: files.map { ($0.filename ?? "", $0.id) } ) - if ( item.mediaType == "book" ) { - if let tracks = media.tracks { + linkLocalFiles(files, fromMedia: item.media) + } + + mutating func addFiles(_ files: [LocalFile], item: LibraryItem) throws { + guard self.isPodcast else { throw LibraryItemDownloadError.podcastOnlySupported } + self.localFiles.append(contentsOf: files.filter({ $0.isAudioFile() })) + linkLocalFiles(self.localFiles, fromMedia: item.media) + } + + mutating private func linkLocalFiles(_ files: [LocalFile], fromMedia: MediaType) { + var fromMedia = fromMedia + let fileMap = files.map { ($0.filename ?? "", $0.id) } + let fileIdByFilename = Dictionary(fileMap, uniquingKeysWith: { (_, last) in last }) + if ( self.mediaType == "book" ) { + if let tracks = fromMedia.tracks { for i in tracks.indices { - media.tracks?[i].setLocalInfo(filenameIdMap: fileIdByFilename, serverIndex: i) + _ = fromMedia.tracks?[i].setLocalInfo(filenameIdMap: fileIdByFilename, serverIndex: i) } } - } else if ( item.mediaType == "podcast" ) { - if let episodes = media.episodes { - for i in episodes.indices { - media.episodes?[i].audioTrack?.setLocalInfo(filenameIdMap: fileIdByFilename, serverIndex: 0) + } else if ( self.mediaType == "podcast" ) { + if let episodes = fromMedia.episodes { + fromMedia.episodes = episodes.compactMap { episode in + // Filter out episodes not downloaded + var episode = episode + let episodeIsDownloaded = episode.audioTrack?.setLocalInfo(filenameIdMap: fileIdByFilename, serverIndex: 0) ?? false + return episodeIsDownloaded ? episode : nil } } } - self.media = media + self.media = fromMedia } func getDuration() -> Double { diff --git a/ios/App/Shared/util/Database.swift b/ios/App/Shared/util/Database.swift index 64ffc05e..849de8f8 100644 --- a/ios/App/Shared/util/Database.swift +++ b/ios/App/Shared/util/Database.swift @@ -168,7 +168,7 @@ class Database { public func saveLocalMediaProgress(_ mediaProgress: LocalMediaProgress) { let realm = try! Realm() - try! realm.write { realm.add(mediaProgress) } + try! realm.write { realm.add(mediaProgress, update: .modified) } } // For books this will just be the localLibraryItemId for podcast episodes this will be "{localLibraryItemId}-{episodeId}"