kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-24 04:03:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use ZIMFile instead of download task, which can be deleted

Browse Source
This commit is contained in:
Balazs Perlaki-Horvath 2024-08-07 11:57:30 +02:00
parent ceed6a4299
commit a69145e8a2
4 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Model/DownloadService.swift
View File

@ -221,8 +221,8 @@ final class DownloadService: NSObject, URLSessionDelegate, URLSessionTaskDelegat
Task { @MainActor [weak progress] in
progress?.resetFor(uuid: zimFileID)
}
Database.shared.performBackgroundTask { context in
context.mergePolicy = NSMergePolicy.mergeByPropertyObjectTrump
let context = Database.shared.viewContext
context.perform {
do {
let request = DownloadTask.fetchRequest(fileID: zimFileID)
guard let downloadTask = try context.fetch(request).first else { return }

35
Views/BuildingBlocks/DownloadTaskCell.swift
View File

@ -23,9 +23,9 @@ struct DownloadTaskCell: View {
@State private var isHovering: Bool = false
@State private var downloadState = DownloadState(downloaded: 0, total: 1, resumeData: nil)
let downloadTask: DownloadTask
init(_ downloadTask: DownloadTask) {
self.downloadTask = downloadTask
let downloadZimFile: ZimFile
init(_ downloadZimFile: ZimFile) {
self.downloadZimFile = downloadZimFile
}
var body: some View {
@ -38,21 +38,17 @@ struct DownloadTaskCell: View {
return prog
}()
VStack(spacing: 8) {
if let zimFile = downloadTask.zimFile {
HStack {
Text(zimFile.name).fontWeight(.semibold).foregroundColor(.primary).lineLimit(1)
Spacer()
Favicon(
category: Category(rawValue: zimFile.category) ?? .other,
imageData: zimFile.faviconData,
imageURL: zimFile.faviconURL
).frame(height: 20)
}
} else {
Text(downloadTask.fileID.uuidString)
HStack {
Text(downloadZimFile.name).fontWeight(.semibold).foregroundColor(.primary).lineLimit(1)
Spacer()
Favicon(
category: Category(rawValue: downloadZimFile.category) ?? .other,
imageData: downloadZimFile.faviconData,
imageURL: downloadZimFile.faviconURL
).frame(height: 20)
}
VStack(alignment: .leading, spacing: 4) {
if downloadTask.error != nil {
if downloadZimFile.downloadTask?.error != nil {
Text("download_task_cell.status.failed".localized)
} else if downloadState.resumeData == nil {
Text("download_task_cell.status.downloading".localized)
@ -70,7 +66,7 @@ struct DownloadTaskCell: View {
.modifier(CellBackground(isHovering: isHovering))
.onHover { self.isHovering = $0 }
.onReceive(DownloadService.shared.progress.publisher) { states in
if let state = states[downloadTask.fileID] {
if let state = states[downloadZimFile.fileID] {
self.downloadState = state
}
}
@ -91,6 +87,7 @@ struct DownloadTaskCell_Previews: PreviewProvider {
zimFile.name = "Wikipedia"
zimFile.persistentID = ""
zimFile.size = 1000000000
zimFile.downloadTask = downloadTask
return zimFile
}()
static let downloadTask: DownloadTask = {
@ -100,12 +97,12 @@ struct DownloadTaskCell_Previews: PreviewProvider {
}()
static var previews: some View {
DownloadTaskCell(DownloadTaskCell_Previews.downloadTask)
DownloadTaskCell(zimFile)
.preferredColorScheme(.light)
.padding()
.frame(width: 300, height: 125)
.previewLayout(.sizeThatFits)
DownloadTaskCell(DownloadTaskCell_Previews.downloadTask)
DownloadTaskCell(zimFile)
.preferredColorScheme(.dark)
.padding()
.frame(width: 300, height: 125)

37
Views/Library/ZimFileDetail.swift
View File

@ -90,8 +90,8 @@ struct ZimFileDetail: View {
@ViewBuilder
var actions: some View {
if let downloadTask = zimFile.downloadTask { // zim file is being downloaded
DownloadTaskDetail(downloadTask: downloadTask)
if let _ = zimFile.downloadTask { // zim file is being downloaded
DownloadTaskDetail(downloadZimFile: zimFile)
} else if zimFile.isMissing { // zim file was opened, but is now missing
Action(title: "zim_file.action.locate.title".localized) { isPresentingFileLocator = true }
unlinkAction
@ -254,46 +254,45 @@ private struct FileLocator: ViewModifier {
}
private struct DownloadTaskDetail: View {
@ObservedObject var downloadTask: DownloadTask
@ObservedObject var downloadZimFile: ZimFile
@EnvironmentObject var viewModel: LibraryViewModel
@State private var downloadState = DownloadState.empty()
private var downloadFileID: UUID? {
viewModel.selectedZimFile?.fileID
}
var body: some View {
Group {
Action(title: "zim_file.download_task.action.title.cancel".localized, isDestructive: true) {
DownloadService.shared.cancel(zimFileID: downloadTask.fileID)
DownloadService.shared.cancel(zimFileID: downloadZimFile.fileID)
viewModel.selectedZimFile = nil
}
if let error = downloadTask.error {
if let error = downloadZimFile.downloadTask?.error {
if downloadState.resumeData != nil {
Action(title: "zim_file.download_task.action.try_recover".localized) {
DownloadService.shared.resume(zimFileID: downloadTask.fileID)
DownloadService.shared.resume(zimFileID: downloadZimFile.fileID)
}
}
Attribute(title: "zim_file.download_task.action.failed".localized, detail: detail)
Text(error)
} else if downloadState.resumeData == nil {
Action(title: "zim_file.download_task.action.pause".localized) {
DownloadService.shared.pause(zimFileID: downloadTask.fileID)
DownloadService.shared.pause(zimFileID: downloadZimFile.fileID)
}
Attribute(title: "zim_file.download_task.action.downloading".localized, detail: detail)
} else {
Action(title: "zim_file.download_task.action.resume".localized) {
DownloadService.shared.resume(zimFileID: downloadTask.fileID)
DownloadService.shared.resume(zimFileID: downloadZimFile.fileID)
}
Attribute(title: "zim_file.download_task.action.paused".localized, detail: detail)
}
}.onReceive(DownloadService.shared.progress.publisher) { [self] (states: [UUID: DownloadState]) in
if let downloadFileID,
let state = states[downloadFileID] {
downloadState = state
} else {
downloadState = .empty()
}
}
}.onReceive(
DownloadService.shared.progress.publisher
.compactMap { [self] (states: [UUID: DownloadState]) -> DownloadState? in
return states[downloadZimFile.fileID]
}, perform: { [self] (state: DownloadState?) in
if let state {
self.downloadState = state
}
}
)
}
var detail: String {

2
Views/Library/ZimFilesDownloads.swift
View File

@ -37,7 +37,7 @@ struct ZimFilesDownloads: View {
) {
ForEach(downloadTasks) { downloadTask in
if let zimFile = downloadTask.zimFile {
DownloadTaskCell(downloadTask).modifier(LibraryZimFileContext(zimFile: zimFile, dismiss: dismiss))
DownloadTaskCell(zimFile).modifier(LibraryZimFileContext(zimFile: zimFile, dismiss: dismiss))
}
}
}