Allow to disable image resizing when uploading attachments

feditext · Nov 30, 2023 · 8605d1b · 8605d1b
1 parent 0ca42f7
commit 8605d1b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/Localizations/en.lproj/Localizable.strings b/Localizations/en.lproj/Localizable.strings
@@ -351,6 +351,7 @@
 "preferences.notifications.include-pictures" = "Include pictures";
 "preferences.notifications.grouping" = "Group follow, favourite, and boost notifications";
 "preferences.notifications.sounds" = "Sounds";
+"preferences.optimize-images-before-upload" = "Optimize images before upload";
 "preferences.muted-users" = "Muted Users";
 "preferences.home-timeline-position-on-startup" = "Home timeline position on startup";
 "preferences.notifications-position-on-startup" = "Notifications position on startup";

diff --git a/ServiceLayer/Sources/ServiceLayer/Services/MediaProcessingService.swift b/ServiceLayer/Sources/ServiceLayer/Services/MediaProcessingService.swift
@@ -35,7 +35,7 @@ enum AltTextError: String, Error {
 public enum MediaProcessingService {}
 
 public extension MediaProcessingService {
-    static func dataAndMimeType(itemProvider: NSItemProvider) -> AnyPublisher<(data: InputStream, mimeType: String), Error> {
+    static func dataAndMimeType(itemProvider: NSItemProvider, optimizeImages: Bool) -> AnyPublisher<(data: InputStream, mimeType: String), Error> {
         let registeredTypes = itemProvider.registeredTypeIdentifiers.compactMap(UTType.init)
 
         let mimeType: String
@@ -47,10 +47,10 @@ public extension MediaProcessingService {
             return uploadableMimeTypes.contains(mimeType)
         }), let preferredMIMEType = type.preferredMIMEType {
             mimeType = preferredMIMEType
-            dataPublisher = fileRepresentationDataPublisher(itemProvider: itemProvider, type: type)
+            dataPublisher = fileRepresentationDataPublisher(itemProvider: itemProvider, type: type, optimizeImages: optimizeImages)
         } else if registeredTypes == [UTType.image], let pngMIMEType = UTType.png.preferredMIMEType { // screenshot
             mimeType = pngMIMEType
-            dataPublisher = UIImagePNGDataPublisher(itemProvider: itemProvider)
+            dataPublisher = UIImagePNGDataPublisher(itemProvider: itemProvider, optimize: optimizeImages)
         } else {
             return Fail(error: MediaProcessingError.invalidMimeType).eraseToAnyPublisher()
         }
@@ -105,15 +105,16 @@ private extension MediaProcessingService {
     ] as [CFString: Any] as CFDictionary
 
     static func fileRepresentationDataPublisher(itemProvider: NSItemProvider,
-                                                type: UTType) -> AnyPublisher<InputStream, Error> {
+                                                type: UTType,
+                                                optimizeImages: Bool) -> AnyPublisher<InputStream, Error> {
         Future<InputStream, Error> { promise in
             itemProvider.loadFileRepresentation(forTypeIdentifier: type.identifier) { url, error in
                 if let error = error {
                     promise(.failure(error))
                 } else if let url = url {
                     promise(Result {
                         if type.conforms(to: .image) && type != .gif {
-                            return try imageData(url: url, type: type)
+                            return try imageData(url: url, type: type, optimize: optimizeImages)
                         } else {
                             guard let stream = InputStream(url: url) else { throw MediaProcessingError.fileURLNotFound }
                             // The temporary file will be removed upon return. Opening a stream gives us a file descriptor, which allows
@@ -130,7 +131,7 @@ private extension MediaProcessingService {
         .eraseToAnyPublisher()
     }
 
-    static func UIImagePNGDataPublisher(itemProvider: NSItemProvider) -> AnyPublisher<InputStream, Error> {
+    static func UIImagePNGDataPublisher(itemProvider: NSItemProvider, optimize: Bool) -> AnyPublisher<InputStream, Error> {
         #if canImport(UIKit)
         return Future<InputStream, Error> { promise in
             itemProvider.loadItem(forTypeIdentifier: UTType.image.identifier, options: nil) { item, error in
@@ -143,7 +144,7 @@ private extension MediaProcessingService {
 
                         try data.write(to: url)
 
-                        return try imageData(url: url, type: .png)
+                        return try imageData(url: url, type: .png, optimize: optimize)
                     })
                 } else {
                     promise(.failure(MediaProcessingError.imageNotFound))
@@ -156,7 +157,11 @@ private extension MediaProcessingService {
         #endif
     }
 
-    static func imageData(url: URL, type: UTType) throws -> InputStream {
+    static func imageData(url: URL, type: UTType, optimize: Bool) throws -> InputStream {
+        if !optimize, let stream = InputStream(url: url) {
+            stream.open()
+            return stream
+        }
         guard let source = CGImageSourceCreateWithURL(url as CFURL, Self.imageSourceOptions) else {
             throw MediaProcessingError.unableToCreateImageSource
         }

diff --git a/ServiceLayer/Sources/ServiceLayer/Utilities/AppPreferences.swift b/ServiceLayer/Sources/ServiceLayer/Utilities/AppPreferences.swift
@@ -258,6 +258,11 @@ public extension AppPreferences {
         }
         set { self[.postingLanguages] = newValue }
     }
+
+    var optimizeImagesBeforeUpload: Bool {
+        get { self[.optimizeImagesBeforeUpload] ?? true }
+        set { self[.optimizeImagesBeforeUpload] = newValue }
+    }
 }
 
 private extension AppPreferences {
@@ -288,6 +293,7 @@ private extension AppPreferences {
         case useMediaDescriptionMetadata
         case visibilityIconColors
         case postingLanguages
+        case optimizeImagesBeforeUpload
     }
 
     subscript<T>(index: Item) -> T? {

diff --git a/ViewModels/Sources/ViewModels/View Models/CompositionViewModel.swift b/ViewModels/Sources/ViewModels/View Models/CompositionViewModel.swift
@@ -225,7 +225,7 @@ public extension CompositionViewModel {
 
     func attach(itemProviders: [NSItemProvider], parentViewModel: ComposeStatusViewModel) {
         Publishers.MergeMany(itemProviders.map {
-            MediaProcessingService.dataAndMimeType(itemProvider: $0)
+            MediaProcessingService.dataAndMimeType(itemProvider: $0, optimizeImages: identityContext.appPreferences.optimizeImagesBeforeUpload)
                 .zip(
                     identityContext.appPreferences.useMediaDescriptionMetadata
                         ? MediaProcessingService.description(itemProvider: $0)

diff --git a/Views/SwiftUI/Preferences/AppPreferencesSection.swift b/Views/SwiftUI/Preferences/AppPreferencesSection.swift
@@ -136,6 +136,10 @@ struct AppPreferencesSection: View {
                     }
                 }
             }
+            Group {
+                Toggle("preferences.optimize-images-before-upload",
+                    isOn: $identityContext.appPreferences.optimizeImagesBeforeUpload)
+            }
         }
         Section(header: Text("preferences.app.advanced")) {
             Picker("preferences.api-compatibility-mode", selection: Binding<APICompatibilityMode?>(