mirror/advplyr.audiobookshelf-app
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf-app.git synced 2025-08-16 07:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Clean up progress logic

Browse source
This commit is contained in:
ronaldheft 2022-08-06 18:31:59 -04:00
parent af2c609405
commit dc8bc2fccd
2 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

44
ios/App/App/plugins/AbsDownloader.swift
View file

@ -34,25 +34,30 @@ public class AbsDownloader: CAPPlugin, URLSessionDownloadDelegate {
} }
public func urlSession(_ session: URLSession, downloadTask: URLSessionDownloadTask, didWriteData bytesWritten: Int64, totalBytesWritten: Int64, totalBytesExpectedToWrite: Int64) { public func urlSession(_ session: URLSession, downloadTask: URLSessionDownloadTask, didWriteData bytesWritten: Int64, totalBytesWritten: Int64, totalBytesExpectedToWrite: Int64) {
// Find the download item do {
guard let downloadItemPartId = downloadTask.taskDescription else { return } guard let downloadItemPartId = downloadTask.taskDescription else { throw LibraryItemDownloadError.noTaskDescription }
let downloadItem = Database.shared.getDownloadItem(downloadItemPartId: downloadItemPartId)
guard let downloadItem = downloadItem else { // Calculate the download percentage
NSLog("Download item part (%@) not found!", downloadItemPartId) let percentDownloaded = (Double(totalBytesWritten) / Double(totalBytesExpectedToWrite)) * 100
return NSLog("Received download status \(downloadItemPartId): \(percentDownloaded)")
// Find the download item
let downloadItem = Database.shared.getDownloadItem(downloadItemPartId: downloadItemPartId)
guard let downloadItem = downloadItem else { throw LibraryItemDownloadError.downloadItemNotFound }
// Find the download item part
let downloadItemPart = downloadItem.downloadItemParts.filter { $0.id == downloadItemPartId }.first
guard var downloadItemPart = downloadItemPart else { throw LibraryItemDownloadError.downloadItemPartNotFound }
// Update the progress
downloadItemPart.progress = percentDownloaded
Database.shared.updateDownloadItemPart(downloadItemPart)
// Notify the UI
try! notifyListeners("onItemDownloadUpdate", data: downloadItem.asDictionary())
} catch {
NSLog("DownloadItemError: \(error)")
} }
// Calculate the download percentage
let percentDownloaded = (Double(totalBytesWritten) / Double(totalBytesExpectedToWrite)) * 100
NSLog("Received download status \(downloadItemPartId): \(percentDownloaded)")
Database.shared.updateDownloadItemPartPercent(downloadItemPartId: downloadItemPartId, percent: percentDownloaded)
let downloadItemPart = downloadItem.downloadItemParts.filter { part in
part.id == downloadItemPartId
}.first
// Notify the UI
NSLog("Download progress: \(downloadItemPart?.progress ?? 0)")
try! notifyListeners("onItemDownloadUpdate", data: downloadItem.asDictionary())
} }
@objc func downloadLibraryItem(_ call: CAPPluginCall) { @objc func downloadLibraryItem(_ call: CAPPluginCall) {
@ -153,4 +158,7 @@ enum LibraryItemDownloadError: String, Error {
case noMetadata = "No metadata for track, unable to download" case noMetadata = "No metadata for track, unable to download"
case failedDirectory = "Failed to create directory" case failedDirectory = "Failed to create directory"
case failedDownload = "Failed to download item" case failedDownload = "Failed to download item"
case noTaskDescription = "No task description"
case downloadItemNotFound = "DownloadItem not found"
case downloadItemPartNotFound = "DownloadItemPart not found"
} }

8
ios/App/Shared/util/Database.swift
View file

@ -169,15 +169,9 @@ class Database {
} }
} }
public func updateDownloadItemPartPercent(downloadItemPartId: String, percent: Double) { public func updateDownloadItemPart(_ part: DownloadItemPart) {
Database.realmQueue.sync { Database.realmQueue.sync {
try! instance.write { try! instance.write {
let part = instance.object(ofType: DownloadItemPart.self, forPrimaryKey: downloadItemPartId)
guard var part = part else {
NSLog("downloadItemPartId not found (\(downloadItemPartId)")
return
}
part.progress = percent
instance.add(part, update: .modified) instance.add(part, update: .modified)
} }
} }