prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update share extension save service to work outside of a operation queue

Browse source
This commit is contained in:
Satindar Dhillon 2022-06-30 14:17:49 -07:00
parent 098771f566
commit 0b3993215f
2 changed files with 62 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
apple/OmnivoreKit/Sources/App/AppExtensions/Share/ExtensionSaveService.swift
View file

@ -5,6 +5,10 @@ import Utils
import Views
class ExtensionSaveService {
#if os(macOS)
let services = Services()
#endif
let queue: OperationQueue
init() {
@ -66,9 +70,13 @@ class ExtensionSaveService {
}
}
}
#if os(iOS)
// TODO: need alternative call for macos
self.queueSaveOperation(payload, shareExtensionViewModel: shareExtensionViewModel)
#else
Task {
await shareExtensionViewModel.createPage(services: self.services, pageScrapePayload: payload)
}
#endif
case .failure:
DispatchQueue.main.async {
@ -138,61 +146,73 @@ class ExtensionSaveService {
queue = OperationQueue()
Task {
await persist(services: self.services, pageScrapePayload: self.pageScrapePayload)
let pageCreated = await shareExtensionViewModel.createPage(
services: services,
pageScrapePayload: pageScrapePayload
)
if pageCreated {
state = .finished
}
}
}
override func cancel() {
super.cancel()
}
}
}
private func updateStatus(_ requestId: String?, newStatus: ShareExtensionStatus) {
DispatchQueue.main.async {
self.shareExtensionViewModel.status = newStatus
if let requestId = requestId {
self.shareExtensionViewModel.requestId = requestId
}
}
extension ShareExtensionChildViewModel {
func createPage(services: Services, pageScrapePayload: PageScrapePayload) async -> Bool {
do {
try await services.dataService.persistPageScrapePayload(pageScrapePayload, requestId: requestId)
} catch {
updateStatusOnMain(
requestId: nil,
newStatus: .failed(error: SaveArticleError.unknown(description: "Unable to access content"))
)
return false
}
private func persist(services: Services, pageScrapePayload: PageScrapePayload) async {
var requestId = shareExtensionViewModel.requestId
do {
updateStatusOnMain(requestId: requestId, newStatus: .saved)
do {
try await services.dataService.persistPageScrapePayload(pageScrapePayload, requestId: requestId)
} catch {
updateStatus(nil, newStatus: .failed(error: SaveArticleError.unknown(description: "Unable to access content")))
return
switch pageScrapePayload.contentType {
case .none:
requestId = try await services.dataService.createPageFromUrl(id: requestId, url: pageScrapePayload.url)
case let .pdf(localUrl):
try await services.dataService.createPageFromPdf(
id: requestId,
localPdfURL: localUrl,
url: pageScrapePayload.url
)
case let .html(html, title, _):
requestId = try await services.dataService.createPage(
id: requestId,
originalHtml: html,
title: title,
url: pageScrapePayload.url
)
}
do {
updateStatus(requestId, newStatus: .saved)
} catch {
updateStatusOnMain(
requestId: nil,
newStatus: .syncFailed(error: SaveArticleError.unknown(description: "Unknown Error"))
)
return false
}
switch pageScrapePayload.contentType {
case .none:
requestId = try await services.dataService.createPageFromUrl(id: requestId, url: pageScrapePayload.url)
case let .pdf(localUrl):
try await services.dataService.createPageFromPdf(
id: requestId,
localPdfURL: localUrl,
url: pageScrapePayload.url
)
case let .html(html, title, _):
requestId = try await services.dataService.createPage(
id: requestId,
originalHtml: html,
title: title,
url: pageScrapePayload.url
)
}
updateStatusOnMain(requestId: requestId, newStatus: .synced)
return true
}
} catch {
updateStatus(nil, newStatus: .syncFailed(error: SaveArticleError.unknown(description: "Unknown Error")))
return
public func updateStatusOnMain(requestId: String?, newStatus: ShareExtensionStatus) {
DispatchQueue.main.async {
self.status = newStatus
if let requestId = requestId {
self.requestId = requestId
}
updateStatus(requestId, newStatus: .synced)
state = .finished
}
}
}

1
apple/OmnivoreKit/Sources/App/AppExtensions/Share/ShareExtensionScene.swift
View file

@ -26,6 +26,7 @@ public class ShareExtensionViewModel: ObservableObject {
let saveService = ExtensionSaveService()
func handleReadNowAction(requestId: String, extensionContext: NSExtensionContext?) {
// TODO: write macos version
#if os(iOS)
if let application = UIApplication.value(forKeyPath: #keyPath(UIApplication.shared)) as? UIApplication {
let deepLinkUrl = NSURL(string: "omnivore://shareExtensionRequestID/\(requestId)")