Update macOS to use new exporting functions

Automator/Sources/RedactOperation.swift

@@ -33,7 +33,7 @@ class RedactOperation: Operation, @unchecked Sendable {
                 let redactions = matchingObservations.map { Redaction($0, color: .black) }
 
                 guard let inputImage = input.image else { throw RedactActionExportError.noImageForInput }
-                let redactedImage = try await PhotoExportRenderer(image: inputImage, redactions: redactions).render()
+                let redactedImage = try await PhotoRenderer(image: inputImage, redactions: redactions).render()
                 let writeURL = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(UUID().uuidString, conformingTo: input.fileType ?? .png)
 
                 os_log("export representations: %{public}@", String(describing: redactedImage.representations))

Modules/Capabilities/Rendering/Sources/PhotoRenderer.swift

@@ -20,7 +20,7 @@ public actor PhotoRenderer {
     #if canImport(AppKit) && !targetEnvironment(macCatalyst)
     public init(image: NSImage, redactions: [Redaction]) throws {
         guard let sourceImage = image.cgImage(forProposedRect: nil, context: nil, hints: nil)
-        else { throw PhotoExportRenderError.noCGImage }
+        else { throw PhotoRenderError.noCGImage }
 
         self.sourceImage = sourceImage
         self.redactions = redactions
@@ -41,7 +41,7 @@ public actor PhotoRenderer {
             bitsPerPixel: 32
         ),
               let graphicsContext = NSGraphicsContext(bitmapImageRep: imageRep)
-        else { throw PhotoExportRenderError.noCurrentGraphicsContext }
+        else { throw PhotoRenderError.noCurrentGraphicsContext }
         let context = graphicsContext.cgContext
 
         let cgImage = try render(

Modules/Legacy/Core/Sources/Desktop/Toolbar Items/ShareItem.swift

@@ -25,22 +25,26 @@ class ShareItem: NSSharingServicePickerToolbarItem, UIActivityItemsConfiguration
         guard let delegate = delegate, delegate.canExportImage else { return [] }
 
         let itemProvider = NSItemProvider()
-        itemProvider.registerDataRepresentation(forTypeIdentifier: UTType.png.identifier, visibility: .all, loadHandler: { [weak self] loadHandler -> Progress? in
+        itemProvider.registerFileRepresentation(forTypeIdentifier: UTType.png.identifier, visibility: .all) { [weak self] loadHandler -> Progress? in
             Task { [weak self] in
-                let image = await self?.delegate?.exportImage()
-                loadHandler(image?.pngData(), nil)
-                self?.delegate?.didExportImage()
+                do {
+                    let url = try await self?.delegate?.exportedURL()
+                    loadHandler(url, false, nil)
+                    self?.delegate?.didExportImage()
+                } catch {
+                    loadHandler(nil, false, error)
+                }
             }
             return nil
-        })
+        }
 
         return [itemProvider]
     }
 }
 
 protocol ShareItemDelegate: AnyObject {
     var canExportImage: Bool { get }
-    func exportImage() async -> UIImage?
+    func exportedURL() async throws -> URL?
     func didExportImage()
 }
 #endif

Modules/Legacy/Core/Sources/Photo Editing/PhotoEditingViewController+Desktop.swift

@@ -20,77 +20,37 @@ extension PhotoEditingViewController {
 
     @objc func save(_ sender: Any) {
         guard let exportURL = fileURLProvider?.representedFileURL else { return saveAs(sender) }
-        guard let imageType = imageType else { return present(.missingImageType) }
 
-        Task { [weak self] in
-            let image = try? await exportImage()
-            let data: Data?
+        Task { @MainActor [weak self] in
+            guard let self else { return }
 
-            switch imageType {
-            case .jpeg:
-                data = image?.jpegData(compressionQuality: 0.9)
-            default:
-                data = image?.pngData()
-            }
-
-            guard let exportData = data else {
-                DispatchQueue.main.async { [weak self] in
-                    self?.present(.noImageData)
-                }
-                return
-            }
             do {
-                try exportData.write(to: exportURL)
-                self?.clearHasMadeEdits()
+                try await FileManager.default.copyItem(at: preparedURL, to: exportURL)
+                clearHasMadeEdits()
 
                 Defaults.numberOfSaves += 1
-                DispatchQueue.main.async { [weak self] in
-                    AppRatingsPrompter().displayRatingsPrompt(in: self?.view.window?.windowScene)
-                }
+                AppRatingsPrompter().displayRatingsPrompt(in: view.window?.windowScene)
             } catch {
                 ErrorHandler().log(error)
             }
         }
     }
 
     @objc func saveAs(_ sender: Any) {
-        guard let imageType = imageType else { return present(.missingImageType) }
-
-        let representedURLName = fileURLProvider?.representedFileURL?.lastPathComponent ?? "\(ExportingStrings.PhotoEditingExporter.defaultImageName).\(imageType.preferredFilenameExtension ?? "png")"
-        let temporaryURL = URL(fileURLWithPath: NSTemporaryDirectory())
-            .appendingPathComponent(representedURLName)
-
-        Task { [weak self] in
-            let image = try? await exportImage()
-            let data: Data?
-
-            switch imageType {
-            case .jpeg:
-                data = image?.jpegData(compressionQuality: 0.9)
-            default:
-                data = image?.pngData()
-            }
-
-            guard let exportData = data else {
-                DispatchQueue.main.async { [weak self] in
-                    self?.present(.noImageData)
-                }
-                return
-            }
+        Task { @MainActor [weak self] in
             do {
-                try exportData.write(to: temporaryURL)
                 self?.clearHasMadeEdits()
 
                 Defaults.numberOfSaves += 1
-                DispatchQueue.main.async { [weak self] in
-                    let saveViewController = DesktopSaveViewController(url: temporaryURL) { [weak self] urls in
-                        AppRatingsPrompter().displayRatingsPrompt(in: self?.view.window?.windowScene)
-                        if let exportURL = urls.first {
-                            self?.fileURLProvider?.updateRepresentedFileURL(to: exportURL)
-                        }
+                guard let self else { return }
+                let temporaryURL = try await preparedURL
+                let saveViewController = DesktopSaveViewController(url: temporaryURL) { [weak self] urls in
+                    AppRatingsPrompter().displayRatingsPrompt(in: self?.view.window?.windowScene)
+                    if let exportURL = urls.first {
+                        self?.fileURLProvider?.updateRepresentedFileURL(to: exportURL)
                     }
-                    self?.present(saveViewController, animated: true, completion: nil)
                 }
+                present(saveViewController, animated: true)
             } catch {
                 ErrorHandler().log(error)
             }

Modules/Legacy/Core/Sources/Scene/DesktopSceneDelegate.swift

@@ -102,8 +102,8 @@ class DesktopSceneDelegate: NSObject, UIWindowSceneDelegate, NSToolbarDelegate,
 
     var canExportImage: Bool { return editingViewController != nil }
 
-    func exportImage() async -> UIImage? {
-        return try? await editingViewController?.exportImage()
+    func exportedURL() async throws -> URL? {
+        return try await editingViewController?.preparedURL
     }
 
     func didExportImage() {