@lodev09/react-native-exify 0.2.2 → 0.2.4

package/README.md

@@ -1,5 +1,9 @@
 # React Native Exify
 
+[![CI](https://github.com/lodev09/react-native-exify/actions/workflows/ci.yml/badge.svg)](https://github.com/lodev09/react-native-exify/actions/workflows/ci.yml)
+![GitHub Release](https://img.shields.io/github/v/release/lodev09/react-native-exify)
+![NPM Downloads](https://img.shields.io/npm/dw/%40lodev09%2Freact-native-exify)
+
 A simple library to read and write image Exif metadata in React Native. Inspired from [this thread](https://github.com/mrousavy/react-native-vision-camera/issues/780).
 
 ## Features
@@ -42,11 +46,11 @@ const result = await writeAsync(uri, newTags)
 console.log(result.tags)
 ```
 
-See [example](example) for more detailed usage.
-
-ℹ️ Note that on IOS, writing exif into an Asset file will duplicate the image. IOS does not allow writing exif into an Asset file directly.
+> **Note**:
+> On IOS, writing exif into an Asset file will duplicate the image. IOS does not allow writing exif into an Asset file directly.
+> If you're getting the photo from a [camera](https://github.com/mrousavy/react-native-vision-camera/), write it into the output file first before saving to the Asset library!
 
-If you're getting the photo from a [camera](https://github.com/mrousavy/react-native-vision-camera/), write it into the output file first before saving to the Asset library!
+See [example](example) for more detailed usage.
 
 ## Contributing
 Contributions are welcome!

package/android/build.gradle

@@ -44,7 +44,7 @@ def supportsNamespace() {
 
 android {
   if (supportsNamespace()) {
-    namespace "com.exify"
+    namespace "com.lodev09.exify"
 
     sourceSets {
       main {

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.exify">
+          package="com.lodev09.exify">
 </manifest>

package/android/src/main/java/com/{exify → lodev09/exify}/ExifyModule.kt

@@ -1,9 +1,9 @@
-package com.exify
+package com.lodev09.exify
 
 import android.content.Context
 import android.net.Uri
 import androidx.exifinterface.media.ExifInterface
-import com.exify.ExifyUtils.formatTags
+import com.lodev09.exify.ExifyUtils.formatTags
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext

package/android/src/main/java/com/{exify → lodev09/exify}/ExifyPackage.kt

@@ -1,4 +1,4 @@
-package com.exify
+package com.lodev09.exify
 
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule

package/android/src/main/java/com/{exify → lodev09/exify}/ExifyTags.kt

@@ -1,4 +1,4 @@
-package com.exify
+package com.lodev09.exify
 import androidx.exifinterface.media.ExifInterface
 
 /**

package/android/src/main/java/com/{exify → lodev09/exify}/ExifyUtils.kt

@@ -1,4 +1,4 @@
-package com.exify
+package com.lodev09.exify
 
 import androidx.exifinterface.media.ExifInterface
 import com.facebook.react.bridge.Arguments

package/ios/Exify.swift

@@ -11,19 +11,18 @@ import PhotosUI
 
 @objc(Exify)
 class Exify: NSObject {
-  
-  func readExif(uri: String, resolve: @escaping RCTPromiseResolveBlock) -> Void {
+  func readExif(uri: String, resolve: @escaping RCTPromiseResolveBlock) {
     guard let url = URL(string: uri) else {
       resolve(nil)
       return
     }
-    
+
     readExifTags(from: url) { tags in
       resolve(tags)
     }
   }
 
-  func readExif(assetId: String, resolve: @escaping RCTPromiseResolveBlock) -> Void {
+  func readExif(assetId: String, resolve: @escaping RCTPromiseResolveBlock) {
     guard let asset = getAssetBy(id: assetId) else {
       resolve(nil)
       return
@@ -32,62 +31,61 @@ class Exify: NSObject {
     let imageOptions = PHContentEditingInputRequestOptions()
     imageOptions.isNetworkAccessAllowed = true
 
-    asset.requestContentEditingInput(with: imageOptions) { contentInput, info in
+    asset.requestContentEditingInput(with: imageOptions) { contentInput, _ in
       guard let url = contentInput?.fullSizeImageURL else {
         resolve(nil)
         return
       }
-      
+
       readExifTags(from: url) { tags in
         resolve(tags)
       }
     }
   }
-  
-  func writeExif(assetId: String, tags: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+
+  func writeExif(assetId: String, tags: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     guard let asset = getAssetBy(id: assetId) else {
       reject("Error", "Cannot retrieve asset.", nil)
       return
     }
-    
+
     let imageOptions = PHContentEditingInputRequestOptions()
     imageOptions.isNetworkAccessAllowed = true
-    
+
     asset.requestContentEditingInput(with: imageOptions) { contentInput, _ in
       guard let contentInput, let url = contentInput.fullSizeImageURL else {
         reject("Error", "Unable to read metadata from asset", nil)
         return
       }
-      
+
       updateMetadata(url: url, with: tags) { metadata, data in
         guard let metadata, let data else {
           reject("Error", "Could not update metadata", nil)
           return
         }
-        
+
         do {
-          try PHPhotoLibrary.shared().performChangesAndWait{
+          try PHPhotoLibrary.shared().performChangesAndWait {
             let request = PHAssetCreationRequest.forAsset()
             request.addResource(with: .photo, data: data, options: nil)
             request.creationDate = Date()
-            
+
             let newAssetId = request.placeholderForCreatedAsset!.localIdentifier
             resolve([
               "uri": "ph://\(newAssetId)",
               "assetId": newAssetId,
               "tags": getExifTags(from: metadata),
             ])
-            
           }
-        } catch let error {
+        } catch {
           reject("Error", "Could not save to image file", nil)
           print(error)
         }
       }
     }
   }
-  
-  func writeExif(uri: String, tags: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+
+  func writeExif(uri: String, tags: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     guard let url = URL(string: uri) else {
       reject("Error", "Invalid URL", nil)
       return
@@ -98,7 +96,7 @@ class Exify: NSObject {
         reject("Error", "Could not update metadata", nil)
         return
       }
-      
+
       do {
         // Write to the current file
         try data.write(to: url, options: .atomic)
@@ -107,8 +105,7 @@ class Exify: NSObject {
           "uri": uri,
           "tags": getExifTags(from: metadata),
         ])
-        
-      } catch let error {
+      } catch {
         reject("Error", "Could not save to image file", nil)
         print(error)
       }
@@ -116,7 +113,7 @@ class Exify: NSObject {
   }
 
   @objc(readAsync:withResolver:withRejecter:)
-  func readAsync(uri: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+  func readAsync(uri: String, resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
     if uri.starts(with: "ph://") {
       let assetId = String(uri[uri.index(uri.startIndex, offsetBy: 5)...])
       readExif(assetId: assetId, resolve: resolve)
@@ -126,7 +123,7 @@ class Exify: NSObject {
   }
 
   @objc(writeAsync:withExif:withResolver:withRejecter:)
-  func writeAsync(uri: String, tags: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+  func writeAsync(uri: String, tags: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     if uri.starts(with: "ph://") {
       let assetId = String(uri[uri.index(uri.startIndex, offsetBy: 5)...])
       writeExif(assetId: assetId, tags: tags, resolve: resolve, reject: reject)

package/ios/ExifyUtils.swift

@@ -27,7 +27,7 @@ func getAssetsBy(assetIds: [String]) -> PHFetchResult<PHAsset> {
   return PHAsset.fetchAssets(withLocalIdentifiers: assetIds, options: options)
 }
 
-func addTagEntries(from dictionary: CFString, metadata: NSDictionary, to tags: NSMutableDictionary) -> Void {
+func addTagEntries(from dictionary: CFString, metadata: NSDictionary, to tags: NSMutableDictionary) {
   if let entries = metadata[dictionary] as? [String: Any] {
     tags.addEntries(from: entries)
   }
@@ -35,54 +35,56 @@ func addTagEntries(from dictionary: CFString, metadata: NSDictionary, to tags: N
 
 func getExifTags(from metadata: NSDictionary) -> [String: Any] {
   let tags: NSMutableDictionary = [:]
-  
+
   // Add root non-dictionary properties
   for (key, value) in metadata {
     if value as? [String: Any] == nil {
       tags[key] = value
     }
   }
-  
+
   // Append all {Exif} properties
   addTagEntries(from: kCGImagePropertyExifDictionary, metadata: metadata, to: tags)
-  
+
   // Prefix {GPS} dictionary with "GPS"
   if let gps = metadata[kCGImagePropertyGPSDictionary as String] as? [String: Any] {
     for (key, value) in gps {
       tags["GPS" + key] = value
     }
   }
-  
+
   // Include tags from formats
   addTagEntries(from: kCGImagePropertyTIFFDictionary, metadata: metadata, to: tags)
   addTagEntries(from: kCGImagePropertyPNGDictionary, metadata: metadata, to: tags)
   addTagEntries(from: kCGImagePropertyHEICSDictionary, metadata: metadata, to: tags)
-  
-  return tags as! [String: Any]
+
+  return tags as? [String: Any] ?? [:]
 }
 
-func readExifTags(from url: URL?, completionHandler: ([String: Any]?) -> Void) -> Void {
+func readExifTags(from url: URL?, completionHandler: ([String: Any]?) -> Void) {
   guard let url, let sourceImage = CGImageSourceCreateWithURL(url as CFURL, nil),
         let metadataDict = CGImageSourceCopyPropertiesAtIndex(sourceImage, 0, nil) else {
+    completionHandler(nil)
     return
   }
-  
+
   let tags = getExifTags(from: metadataDict)
   completionHandler(tags)
 }
 
-func updateMetadata(url: URL, with tags: [String: Any], completionHanlder: (NSDictionary?, Data?) -> Void) -> Void {
+func updateMetadata(url: URL, with tags: [String: Any], completionHanlder: (NSDictionary?, Data?) -> Void) {
   guard let cgImageSource = CGImageSourceCreateWithURL(url as CFURL, nil) else {
+    completionHanlder(nil, nil)
     return
   }
-  
+
   let metadataDict = CGImageSourceCopyPropertiesAtIndex(cgImageSource, 0, nil) ?? [:] as CFDictionary
   let metadata = NSMutableDictionary(dictionary: metadataDict)
 
   // Append additional Exif data
   let exifDict = metadata[kCGImagePropertyExifDictionary as String] as? NSMutableDictionary
-  exifDict!.addEntries(from: tags)
-  
+  exifDict?.addEntries(from: tags)
+
   // Handle GPS Tags
   var gpsDict = [String: Any]()
 
@@ -100,15 +102,14 @@ func updateMetadata(url: URL, with tags: [String: Any], completionHanlder: (NSDi
     gpsDict[kCGImagePropertyGPSAltitude as String] = abs(altitude)
     gpsDict[kCGImagePropertyGPSAltitudeRef as String] = altitude >= 0 ? 0 : 1
   }
-  
+
   if let gpsDate = tags["GPSDateStamp"] as? String {
     gpsDict[kCGImagePropertyGPSDateStamp as String] = gpsDate
   }
-  
+
   if let gpsTime = tags["GPSTimeStamp"] as? String {
     gpsDict[kCGImagePropertyGPSTimeStamp as String] = gpsTime
   }
-  
 
   if metadata[kCGImagePropertyGPSDictionary as String] == nil {
     metadata[kCGImagePropertyGPSDictionary as String] = gpsDict
@@ -117,19 +118,20 @@ func updateMetadata(url: URL, with tags: [String: Any], completionHanlder: (NSDi
       metadataGpsDict.addEntries(from: gpsDict)
     }
   }
-  
+
   metadata.setObject(NSNumber(value: 1), forKey: kCGImageDestinationLossyCompressionQuality as NSString)
-  
+
   let destinationData = NSMutableData()
 
-  guard let sourceType = CGImageSourceGetType(cgImageSource),
-    let destination = CGImageDestinationCreateWithData(destinationData, sourceType, 1, nil) else {
+  guard let uiImage = UIImage(contentsOfFile: url.path),
+        let sourceType = CGImageSourceGetType(cgImageSource),
+        let destination = CGImageDestinationCreateWithData(destinationData, sourceType, 1, nil) else {
+    completionHanlder(nil, nil)
     return
   }
 
-  CGImageDestinationAddImageFromSource(destination, cgImageSource, 0, metadata)
-  if CGImageDestinationFinalize(destination) {
-    completionHanlder(metadata, destinationData as Data)
-  }
-}
+  CGImageDestinationAddImage(destination, uiImage.cgImage!, metadata)
+  CGImageDestinationFinalize(destination)
 
+  completionHanlder(metadata, destinationData as Data)
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lodev09/react-native-exify",
-  "version": "0.2.2",
-  "description": "Read and write exif data into an image.",
+  "version": "0.2.4",
+  "description": "Read and write exif data into an image 🏷️",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
   "types": "lib/typescript/src/index.d.ts",
@@ -31,7 +31,7 @@
     "typecheck": "tsc --noEmit",
     "lint": "eslint --fix \"**/*.{js,ts,tsx}\"",
     "format": "prettier --write \"**/*.{js,ts,tsx}\"",
-    "tidy": "yarn typecheck && yarn lint && yarn format",
+    "tidy": "yarn typecheck && yarn lint && yarn format && scripts/swiftlint.sh && scripts/swiftformat.sh",
     "clean": "del-cli android/build lib && yarn workspace exify-example clean",
     "prepare": "bob build",
     "release": "release-it"

package/ios/Exify.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

package/ios/Exify.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

package/ios/Exify.xcodeproj/xcuserdata/lodev09.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>Exify.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>