tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add performance upgrades to media picker

Browse Source 
- Use jpeg instead of png data when processing a UIImage.
- Make processing of media occur after user confirms upload selection when possible for better responsiveness.
- Reduce redundant data fetching.

Lightning-address: kernelkind@getalby.com
Signed-off-by: kernelkind <kernelkind@gmail.com>
Link: 20240228033235.66935-2-kernelkind@gmail.com
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
kernelkind
2024-02-27 22:32:34 -05:00
committed by William Casarin
parent 75d87fee9d
commit 6de44223f2
8 changed files with 203 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
damus/Views/MediaPicker.swift
View File

@@ -16,7 +16,8 @@ struct MediaPicker: UIViewControllerRepresentable {
@Binding var image_upload_confirm: Bool
var imagesOnly: Bool = false
let onMediaPicked: (MediaUpload) -> Void
let onMediaPicked: (PreUploadedMedia) -> Void
final class Coordinator: NSObject, PHPickerViewControllerDelegate {
let parent: MediaPicker
@@ -37,17 +38,17 @@ struct MediaPicker: UIViewControllerRepresentable {
if canGetSourceTypeFromUrl(url: url) {
// Media was not taken from camera
if let savedURL = self.saveImageToTemporaryFolder(from: url) {
self.chooseImage(url: savedURL)
}
self.attemptAcquireResourceAndChooseMedia(
url: url,
fallback: processImage,
unprocessedEnum: {.unprocessed_image($0)},
processedEnum: {.processed_image($0)}
)
} else {
// Media was taken from camera
result.itemProvider.loadObject(ofClass: UIImage.self) { (image, error) in
guard let image = image as? UIImage, error == nil else { return }
let fixedImage = image.fixOrientation()
if let savedURL = self.saveImageToTemporaryFolder(image: fixedImage) {
self.chooseImage(url: savedURL)
if let image = image as? UIImage, error == nil {
self.chooseMedia(.uiimage(image))
}
}
}
@@ -56,80 +57,36 @@ struct MediaPicker: UIViewControllerRepresentable {
result.itemProvider.loadFileRepresentation(forTypeIdentifier: UTType.movie.identifier) { (url, error) in
guard let url, error == nil else { return }
guard let url = self.saveVideoToTemporaryFolder(videoURL: url) else { return }
self.parent.onMediaPicked(.video(url))
self.parent.image_upload_confirm = true
self.attemptAcquireResourceAndChooseMedia(
url: url,
fallback: processVideo,
unprocessedEnum: {.unprocessed_video($0)},
processedEnum: {.processed_video($0)}
)
}
}
}
}
func chooseImage(url: URL) {
if removeGPSDataFromImage(fromImageURL: url) {
self.parent.onMediaPicked(.image(url))
self.parent.image_upload_confirm = true
}
private func chooseMedia(_ media: PreUploadedMedia) {
self.parent.onMediaPicked(media)
self.parent.image_upload_confirm = true
}
func saveImageToTemporaryFolder(from imageUrl: URL) -> URL? {
let fileExtension = imageUrl.pathExtension
guard let imageData = try? Data(contentsOf: imageUrl) else {
print("Failed to load image data from URL.")
return nil
private func attemptAcquireResourceAndChooseMedia(url: URL, fallback: (URL) -> URL?, unprocessedEnum: (URL) -> PreUploadedMedia, processedEnum: (URL) -> PreUploadedMedia) {
if url.startAccessingSecurityScopedResource() {
// Have permission from system to use url out of scope
print("Acquired permission to security scoped resource")
self.chooseMedia(unprocessedEnum(url))
} else {
// Need to copy URL to non-security scoped location
guard let newUrl = fallback(url) else { return }
self.chooseMedia(processedEnum(newUrl))
}
return saveImageToTemporaryFolder(imageData: imageData, imageType: fileExtension)
}
func saveImageToTemporaryFolder(image: UIImage, imageType: String = "png") -> URL? {
// Convert UIImage to Data
let imageData: Data?
if imageType.lowercased() == "jpeg" {
imageData = image.jpegData(compressionQuality: 1.0)
} else {
imageData = image.pngData()
}
guard let data = imageData else {
print("Failed to convert UIImage to Data.")
return nil
}
return saveImageToTemporaryFolder(imageData: data, imageType: imageType)
}
private func saveImageToTemporaryFolder(imageData: Data, imageType: String) -> URL? {
// Generate a temporary URL with a unique filename
let temporaryDirectoryURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
let uniqueImageName = "\(UUID().uuidString).\(imageType)"
let temporaryImageURL = temporaryDirectoryURL.appendingPathComponent(uniqueImageName)
// Save the image data to the temporary URL
do {
try imageData.write(to: temporaryImageURL)
return temporaryImageURL
} catch {
print("Error saving image data to temporary URL: \(error.localizedDescription)")
return nil
}
}
func saveVideoToTemporaryFolder(videoURL: URL) -> URL? {
let temporaryDirectoryURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
let fileExtension = videoURL.pathExtension
let uniqueFileName = UUID().uuidString + (fileExtension.isEmpty ? "" : ".\(fileExtension)")
let destinationURL = temporaryDirectoryURL.appendingPathComponent(uniqueFileName)
do {
try FileManager.default.copyItem(at: videoURL, to: destinationURL)
return destinationURL
} catch {
print("Error copying file: \(error.localizedDescription)")
return nil
}
}
}
func makeCoordinator() -> Coordinator {
Coordinator(self)
}
@@ -147,16 +104,3 @@ struct MediaPicker: UIViewControllerRepresentable {
func updateUIViewController(_ uiViewController: PHPickerViewController, context: Context) {
}
}
extension UIImage {
func fixOrientation() -> UIImage {
guard imageOrientation != .up else { return self }
UIGraphicsBeginImageContextWithOptions(size, false, scale)
draw(in: CGRect(origin: .zero, size: size))
let normalizedImage = UIGraphicsGetImageFromCurrentImageContext()
UIGraphicsEndImageContext()
return normalizedImage ?? self
}
}

8
damus/Views/PostView.swift
View File

@@ -57,7 +57,7 @@ struct PostView: View {
@State var newCursorIndex: Int?
@State var textHeight: CGFloat? = nil
@State var mediaToUpload: MediaUpload? = nil
@State var preUploadedMedia: PreUploadedMedia? = nil
@StateObject var image_upload: ImageUploadModel = ImageUploadModel()
@StateObject var tagModel: TagModel = TagModel()
@@ -420,12 +420,12 @@ struct PostView: View {
}
.background(DamusColors.adaptableWhite.edgesIgnoringSafeArea(.all))
.sheet(isPresented: $attach_media) {
MediaPicker(image_upload_confirm: $image_upload_confirm) { media in
self.mediaToUpload = media
MediaPicker(image_upload_confirm: $image_upload_confirm){ media in
self.preUploadedMedia = media
}
.alert(NSLocalizedString("Are you sure you want to upload this media?", comment: "Alert message asking if the user wants to upload media."), isPresented: $image_upload_confirm) {
Button(NSLocalizedString("Upload", comment: "Button to proceed with uploading."), role: .none) {
if let mediaToUpload {
if let mediaToUpload = generateMediaUpload(preUploadedMedia) {
self.handle_upload(media: mediaToUpload)
self.attach_media = false
}

14
damus/Views/Profile/EditPictureControl.swift
View File

@@ -24,7 +24,7 @@ struct EditPictureControl: View {
@State private var show_library = false
@State var image_upload_confirm: Bool = false
@State var mediaToUpload: MediaUpload? = nil
@State var preUploadedMedia: PreUploadedMedia? = nil
var body: some View {
Menu {
@@ -62,11 +62,11 @@ struct EditPictureControl: View {
.sheet(isPresented: $show_camera) {
MediaPicker(image_upload_confirm: $image_upload_confirm, imagesOnly: true) { media in
self.mediaToUpload = media
self.preUploadedMedia = media
}
.alert(NSLocalizedString("Are you sure you want to upload this image?", comment: "Alert message asking if the user wants to upload an image."), isPresented: $image_upload_confirm) {
Button(NSLocalizedString("Upload", comment: "Button to proceed with uploading."), role: .none) {
if let mediaToUpload {
if let mediaToUpload = generateMediaUpload(preUploadedMedia) {
self.handle_upload(media: mediaToUpload)
self.show_camera = false
}
@@ -76,15 +76,11 @@ struct EditPictureControl: View {
}
.sheet(isPresented: $show_library) {
MediaPicker(image_upload_confirm: $image_upload_confirm, imagesOnly: true) { media in
if case .image = media {
self.mediaToUpload = media
} else {
print("Cannot upload videos as profile image")
}
self.preUploadedMedia = media
}
.alert(NSLocalizedString("Are you sure you want to upload this image?", comment: "Alert message asking if the user wants to upload an image."), isPresented: $image_upload_confirm) {
Button(NSLocalizedString("Upload", comment: "Button to proceed with uploading."), role: .none) {
if let mediaToUpload {
if let mediaToUpload = generateMediaUpload(preUploadedMedia) {
self.handle_upload(media: mediaToUpload)
self.show_library = false
}