small fixes

Author: awxkee

.swiftpm/xcode/xcuserdata/radzivonbartoshyk.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>JxlCoder.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>4</integer>
 		</dict>
 		<key>jxlcoder.xcscheme_^#shared#^_</key>
 		<dict>

Jxl Coder.xcodeproj/project.pbxproj

@@ -28,6 +28,7 @@
 		D3D2BA072A9BC06500EBB7A9 /* second.jxl in Resources */ = {isa = PBXBuildFile; fileRef = D3D2BA052A9BC06500EBB7A9 /* second.jxl */; };
 		D3D2BA092A9BD1B600EBB7A9 /* JXLSystemImage.mm in Sources */ = {isa = PBXBuildFile; fileRef = D3D2BA082A9BD1B600EBB7A9 /* JXLSystemImage.mm */; };
 		D3D2BA102A9BDADA00EBB7A9 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D2BA0F2A9BDADA00EBB7A9 /* Accelerate.framework */; };
+		D3D55DAD2AA4D0E800EA7CB0 /* JxlNukePlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D55DAC2AA4D0E800EA7CB0 /* JxlNukePlugin.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -57,6 +58,7 @@
 		D3D2BA082A9BD1B600EBB7A9 /* JXLSystemImage.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = JXLSystemImage.mm; sourceTree = "<group>"; };
 		D3D2BA0A2A9BD1C200EBB7A9 /* JXLSystemImage.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = JXLSystemImage.hpp; sourceTree = "<group>"; };
 		D3D2BA0F2A9BDADA00EBB7A9 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
+		D3D55DAC2AA4D0E800EA7CB0 /* JxlNukePlugin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JxlNukePlugin.swift; path = JxlNukePlugin/JxlNukePlugin.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -83,6 +85,7 @@
 		D341F4B82A97FC29003A496C = {
 			isa = PBXGroup;
 			children = (
+				D3D55DAC2AA4D0E800EA7CB0 /* JxlNukePlugin.swift */,
 				D341F4D22A97FC5A003A496C /* Sources */,
 				D341F4C32A97FC29003A496C /* Jxl Coder */,
 				D341F4C22A97FC29003A496C /* Products */,
@@ -288,6 +291,7 @@
 				D3D2BA002A9BB4AF00EBB7A9 /* JXLCoder.swift in Sources */,
 				D3D2BA022A9BB50F00EBB7A9 /* JXLSupport.swift in Sources */,
 				D341F4C72A97FC29003A496C /* ContentView.swift in Sources */,
+				D3D55DAD2AA4D0E800EA7CB0 /* JxlNukePlugin.swift in Sources */,
 				D341F4C52A97FC29003A496C /* Jxl_CoderApp.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

JxlNukePlugin.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
     s.source_files = 'JxlNukePlugin/JxlNukePlugin.swift'
     s.swift_version = ["5.3", "5.4", "5.5"]
     s.frameworks = "Foundation", "CoreGraphics"
-    s.dependency 'Nuke'
+    s.dependency 'Nuke', '~> 12.0'
     s.dependency 'JxlCoder'
     s.requires_arc = true
 end

JxlNukePlugin/JxlNukePlugin.swift

@@ -12,23 +12,30 @@ import JxlCoder
 #endif
 
 public final class JxlNukePlugin: Nuke.ImageDecoding {
-
-    public init() {
+    public func decode(_ data: Data) throws -> Nuke.ImageContainer {
+        guard try JXLCoder.isJXL(data: data) else { throw JXLNukePluginDecodeError() }
+        let image = try JXLCoder.decode(data: data)
+        return ImageContainer(image: image)
     }
 
-    public func decode(_ data: Data) -> ImageContainer? {
-        guard (try? JXLCoder.isJXL(data: data)) ?? false else { return nil }
-        guard let image = try? JXLCoder.decode(data: data) else {
-            return nil
-        }
-        return ImageContainer(image: image)
+    public init() {
     }
 
     public func decodePartiallyDownloadedData(_ data: Data) -> ImageContainer? {
         return nil
     }
 }
 
+public struct JXLNukePluginDecodeError: LocalizedError, CustomNSError {
+    public var errorDescription: String? {
+        "JXL file cannot be decoded"
+    }
+
+    public var errorUserInfo: [String : Any] {
+        [NSLocalizedDescriptionKey: "JXL file cannot be decoded"]
+    }
+}
+
 // MARK: - check JXL format data.
 extension JxlNukePlugin {
 

README.md

@@ -34,40 +34,28 @@ let data: Data = try JXLCoder.encode(data: UIImage())
 If you wish to use `JXL` with <a href="https://github.com/kean/Nuke" target="_blank">`Nuke`</a> you may add `JxlCoder` library to project and activate the plugin on app init
 ### Use code below in your project or add a pod `JxlNukePlugin`
 ```swift
-import Nuke
-#if canImport(JxlCoder)
-import JxlCoder
-#endif
-
 public final class JxlNukePlugin: Nuke.ImageDecoding {
-
-    public init() {
+    public func decode(_ data: Data) throws -> Nuke.ImageContainer {
+        guard try JXLCoder.isJXL(data: data) else { throw JXLNukePluginDecodeError() }
+        let image = try JXLCoder.decode(data: data)
+        return ImageContainer(image: image)
     }
 
-    public func decode(_ data: Data) -> ImageContainer? {
-        guard (try? JXLCoder.isJXL(data: data)) ?? false else { return nil }
-        guard let image = try? JXLCoder.decode(data: data) else {
-            return nil
-        }
-        return ImageContainer(image: image)
+    public init() {
     }
 
     public func decodePartiallyDownloadedData(_ data: Data) -> ImageContainer? {
         return nil
     }
 }
 
-// MARK: - check JXL format data.
-extension JxlNukePlugin {
-
-    public static func enable() {
-        Nuke.ImageDecoderRegistry.shared.register { (context) -> ImageDecoding? in
-            JxlNukePlugin.enable(context: context)
-        }
+public struct JXLNukePluginDecodeError: LocalizedError, CustomNSError {
+    public var errorDescription: String? {
+        "JXL file cannot be decoded"
     }
 
-    public static func enable(context: Nuke.ImageDecodingContext) -> Nuke.ImageDecoding? {
-        return try? JXLCoder.isJXL(data: context.data) ? JxlNukePlugin() : nil
+    public var errorUserInfo: [String : Any] {
+        [NSLocalizedDescriptionKey: "JXL file cannot be decoded"]
     }
 }
 

Sources/JxlCoder/JXLCoder.swift

@@ -10,16 +10,6 @@ import Foundation
 import jxlc
 #endif
 
-public struct AVIFNukePluginDecodeError: LocalizedError, CustomNSError {
-    public var errorDescription: String? {
-        "JXL file cannot be decoded"
-    }
-
-    public var errorUserInfo: [String : Any] {
-        [NSLocalizedDescriptionKey: "JXL file cannot be decoded"]
-    }
-}
-
 public class JXLCoder {
     private static let shared = JXLCPlusCoder()
     private static let magic1 = Data([0xFF, 0x0A])
@@ -115,4 +105,11 @@ public class JXLCoder {
         let srcStream = InputStream(data: data)
         return try getSize(srcStream: srcStream)
     }
+
+    /**
+     - Returns: Uniform type identifier
+     **/
+    public static func utiIdentifier() -> String {
+        "dyn.ah62d4rv4ge80y8dq"
+    }
 }