dnrops
/
WebDAV-Swift
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run thumbnail preview fetching on utility thread 

Closes #36
This commit is contained in:
Isvvc 2021-04-28 16:53:23 -06:00
parent 2368bb8d56
commit a42084f924
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Sources/WebDAV/WebDAV+Images.swift
View File

@ -86,11 +86,10 @@ public extension WebDAV {
/// - password: The WebDAV account's password.
/// - options: Options for caching the results. Empty set uses default caching behavior.
/// - preview: Behavior for running the completion closure with cached thumbnails before the full-sized image is fetched.
/// Note that `.diskAllowed` will load all thumbnails for the given image
/// will be fetched on the main thread, which can be an expensive process.
/// `.memoryOnly` and `.specific()` are recommended.
/// Note that `.diskAllowed` will load all thumbnails for the given image which can be an expensive process.
/// `.memoryOnly` and `.specific()` are recommended unless you do not know what thumbnails exist.
/// - completion: If account properties are invalid, this will run immediately on the same thread with an error.
/// Otherwise, it will run on the main thread with a preview if available and a `preview` mode is provided,
/// Otherwise, it will run on a utility thread with a preview (if available and a `preview` mode is provided),
/// then runs on a background thread when the network call finishes.
/// - image: The image downloaded, if successful.
/// The cached image if it has already been downloaded.

8
Sources/WebDAV/WebDAV.swift
View File

@ -416,9 +416,12 @@ extension WebDAV {
try? deleteCachedData(forItemAtPath: path, account: account)
}
if let placeholderValue = placeholder?() {
completion(placeholderValue, nil)
let placeholderTask = DispatchWorkItem {
if let placeholderValue = placeholder?() {
completion(placeholderValue, nil)
}
}
DispatchQueue.global(qos: .utility).async(execute: placeholderTask)
// Create network request
@ -436,6 +439,7 @@ extension WebDAV {
return completion(nil, error)
} else if let data = data,
let value = valueFromData(data) {
placeholderTask.cancel()
// Cache result
if !options.contains(.removeExistingCache),
!options.contains(.doNotCacheResult) {