shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 78 Pull Requests Releases Wiki Activity

Make posting async

This commit is contained in:
Shadowfacts 2021-06-18 11:17:59 -04:00
parent c36a239f46
commit b9edf13b92
3 changed files with 81 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tusker/Controllers/MastodonController.swift
View File

@ -46,8 +46,8 @@ class MastodonController: ObservableObject {
@Published private(set) var instance: Instance! @Published private(set) var instance: Instance!
private(set) var customEmojis: [Emoji]? private(set) var customEmojis: [Emoji]?
private var pendingOwnInstanceRequestCallbacks = [(Instance) -> Void]() @MainActor private var pendingOwnInstanceRequestCallbacks = [(Instance) -> Void]()
private var ownInstanceRequest: URLSessionTask? @MainActor private var ownInstanceRequest: URLSessionTask?
var loggedIn: Bool { var loggedIn: Bool {
accountInfo != nil accountInfo != nil
@ -118,14 +118,13 @@ class MastodonController: ObservableObject {
} }
} }
@MainActor
func getOwnInstance(completion: ((Instance) -> Void)? = nil) { func getOwnInstance(completion: ((Instance) -> Void)? = nil) {
getOwnInstanceInternal(retryAttempt: 0, completion: completion) getOwnInstanceInternal(retryAttempt: 0, completion: completion)
} }
@MainActor
private func getOwnInstanceInternal(retryAttempt: Int, completion: ((Instance) -> Void)?) { private func getOwnInstanceInternal(retryAttempt: Int, completion: ((Instance) -> Void)?) {
// this is main thread only to prevent concurrent access to ownInstanceRequest and pendingOwnInstanceRequestCallbacks
assert(Thread.isMainThread)
if let instance = self.instance { if let instance = self.instance {
completion?(instance) completion?(instance)
} else { } else {

8
Tusker/Models/CompositionAttachmentData.swift
View File

@ -104,6 +104,14 @@ enum CompositionAttachmentData {
} }
} }
func getData() async -> (Data, String) {
return await withCheckedContinuation { continuation in
getData { data, mimeType in
continuation.resume(returning: (data, mimeType))
}
}
}
private static func exportVideoData(session: AVAssetExportSession, completion: @escaping (Data, String) -> Void) { private static func exportVideoData(session: AVAssetExportSession, completion: @escaping (Data, String) -> Void) {
session.outputFileType = .mp4 session.outputFileType = .mp4
session.outputURL = FileManager.default.temporaryDirectory.appendingPathComponent("exported_video_\(UUID())").appendingPathExtension("mp4") session.outputURL = FileManager.default.temporaryDirectory.appendingPathComponent("exported_video_\(UUID())").appendingPathExtension("mp4")

162
Tusker/Screens/Compose/ComposeView.swift
View File

@ -19,7 +19,7 @@ struct ComposeView: View {
@State private var postProgress: Double = 0 @State private var postProgress: Double = 0
@State private var postTotalProgress: Double = 0 @State private var postTotalProgress: Double = 0
@State private var isShowingPostErrorAlert = false @State private var isShowingPostErrorAlert = false
@State private var postError: PostError? @State private var postError: Error?
private let stackPadding: CGFloat = 8 private let stackPadding: CGFloat = 8
@ -148,7 +148,11 @@ struct ComposeView: View {
} }
private var postButton: some View { private var postButton: some View {
Button(action: self.postStatus) { Button {
async {
await self.postStatus()
}
} label: {
Text("Post") Text("Post")
} }
.disabled(!postButtonEnabled) .disabled(!postButtonEnabled)
@ -190,7 +194,7 @@ struct ComposeView: View {
]) ])
} }
private func postStatus() { private func postStatus() async {
guard draft.hasContent else { return } guard draft.hasContent else { return }
isPosting = true isPosting = true
@ -205,70 +209,57 @@ struct ComposeView: View {
postTotalProgress = Double(2 + (draft.attachments.count * 2)) postTotalProgress = Double(2 + (draft.attachments.count * 2))
postProgress = 1 postProgress = 1
uploadAttachments { (result) in let uploadedAttachments: [Attachment]
switch result { do {
case let .failure(error): uploadedAttachments = try await uploadAttachments()
self.isShowingPostErrorAlert = true } catch {
self.postError = error self.isShowingPostErrorAlert = true
self.postProgress = 0 self.postError = error
self.postTotalProgress = 0 self.postProgress = 0
self.isPosting = false self.postTotalProgress = 0
self.isPosting = false
return
}
case let .success(uploadedAttachments): let request = Client.createStatus(text: draft.textForPosting,
let request = Client.createStatus(text: draft.textForPosting, contentType: Preferences.shared.statusContentType,
contentType: Preferences.shared.statusContentType, inReplyTo: draft.inReplyToID,
inReplyTo: draft.inReplyToID, media: uploadedAttachments,
media: uploadedAttachments, sensitive: sensitive,
sensitive: sensitive, spoilerText: contentWarning,
spoilerText: contentWarning, visibility: draft.visibility,
visibility: draft.visibility, language: nil,
language: nil, pollOptions: draft.poll?.options.map(\.text),
pollOptions: draft.poll?.options.map(\.text), pollExpiresIn: draft.poll == nil ? nil : Int(draft.poll!.duration),
pollExpiresIn: draft.poll == nil ? nil : Int(draft.poll!.duration), pollMultiple: draft.poll?.multiple)
pollMultiple: draft.poll?.multiple) do {
self.mastodonController.run(request) { (response) in try await mastodonController.run(request)
switch response { self.postProgress += 1
case let .failure(error):
self.isShowingPostErrorAlert = true
self.postError = error
case .success(_, _): DraftsManager.shared.remove(self.draft)
self.postProgress += 1
DraftsManager.shared.remove(self.draft) // wait .25 seconds so the user can see the progress bar has completed
DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(250)) {
// wait .25 seconds so the user can see the progress bar has completed self.uiState.delegate?.dismissCompose(mode: .post)
DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(250)) {
self.uiState.delegate?.dismissCompose(mode: .post)
}
}
}
} }
} catch {
self.isShowingPostErrorAlert = true
self.postError = error
} }
} }
private func uploadAttachments(_ completion: @escaping (Result<[Attachment], AttachmentUploadError>) -> Void) { private func uploadAttachments() async throws -> [Attachment] {
let group = DispatchGroup() guard !draft.attachments.isEmpty else {
return []
var attachmentDatas = [(Data, String)?]()
for (index, compAttachment) in draft.attachments.enumerated() {
group.enter()
attachmentDatas.append(nil)
compAttachment.data.getData { (data, mimeType) in
postProgress += 1
attachmentDatas[index] = (data, mimeType)
group.leave()
}
} }
group.notify(queue: .global(qos: .userInitiated)) { return try await withThrowingTaskGroup(of: (CompositionAttachment, (Data, String)).self) { taskGroup in
for compAttachment in draft.attachments {
var anyFailed = false postProgress += 1
var uploadedAttachments = [Result<Attachment, Error>?]() taskGroup.async {
return (compAttachment, await compAttachment.data.getData())
}
}
// Mastodon does not respect the order of the `media_ids` parameter in the create post request, // Mastodon does not respect the order of the `media_ids` parameter in the create post request,
// it determines attachment order by which was uploaded first. Since the upload attachment request // it determines attachment order by which was uploaded first. Since the upload attachment request
@ -277,67 +268,40 @@ struct ComposeView: View {
// posted status reflects order the user set. // posted status reflects order the user set.
// Pleroma does respect the order of the `media_ids` parameter. // Pleroma does respect the order of the `media_ids` parameter.
for (index, (data, mimeType)) in attachmentDatas.map(\.unsafelyUnwrapped).enumerated() { var anyFailed = false
group.enter() var uploaded = [Result<Attachment, Error>]()
let compAttachment = draft.attachments[index] for try await (compAttachment, (data, mimeType)) in taskGroup {
let formAttachment = FormAttachment(mimeType: mimeType, data: data, fileName: "file") let formAttachment = FormAttachment(mimeType: mimeType, data: data, fileName: "file")
let request = Client.upload(attachment: formAttachment, description: compAttachment.attachmentDescription) let request = Client.upload(attachment: formAttachment, description: compAttachment.attachmentDescription)
self.mastodonController.run(request) { (response) in
switch response {
case let .failure(error):
uploadedAttachments.append(.failure(error))
anyFailed = true
case let .success(attachment, _): do {
self.postProgress += 1 let (uploadedAttachment, _) = try await mastodonController.run(request)
uploadedAttachments.append(.success(attachment)) uploaded.append(.success(uploadedAttachment))
} postProgress += 1
} catch {
group.leave() uploaded.append(.failure(error))
anyFailed = true
} }
group.wait()
} }
if anyFailed { if anyFailed {
let errors = uploadedAttachments.map { (result) -> Error? in let errors = uploaded.map { result -> Error? in
if case let .failure(error) = result { if case let .failure(error) = result {
return error return error
} else { } else {
return nil return nil
} }
} }
completion(.failure(AttachmentUploadError(errors: errors))) throw AttachmentUploadError(errors: errors)
} else { } else {
let uploadedAttachments = uploadedAttachments.map { return uploaded.map { try! $0.get() }
try! $0!.get()
}
completion(.success(uploadedAttachments))
} }
} }
} }
} }
fileprivate protocol PostError: LocalizedError {} fileprivate struct AttachmentUploadError: LocalizedError {
extension PostError {
var localizedDescription: String {
if let self = self as? Client.Error {
return self.localizedDescription
} else if let self = self as? AttachmentUploadError {
return self.localizedDescription
} else {
return "Unknown Error"
}
}
}
extension Client.Error: PostError {}
fileprivate struct AttachmentUploadError: PostError {
let errors: [Error?] let errors: [Error?]
var localizedDescription: String { var localizedDescription: String {