From 76ec8e00da4c460c9876bcdfb630b94b4ff94b8d Mon Sep 17 00:00:00 2001
From: Leo Dion <leogdion@brightdigit.com>
Date: Wed, 8 Apr 2020 20:47:49 -0400
Subject: [PATCH] improving error messages

---
 Speculid.xcodeproj/project.pbxproj                         | 6 ++++++
 .../xcshareddata/xcschemes/Speculid-Mac-App.xcscheme       | 4 ++++
 frameworks/cairosvg/ImageHandleBuilder.m                   | 4 ++--
 samples/Image Set.speculid                                 | 4 ++++
 samples/badJSON.speculid                                   | 7 +++++++
 samples/badSVG.speculid                                    | 7 +++++++
 samples/missingJSON.speculid                               | 6 ++++++
 7 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 samples/Image Set.speculid
 create mode 100644 samples/badJSON.speculid
 create mode 100644 samples/badSVG.speculid
 create mode 100644 samples/missingJSON.speculid

diff --git a/Speculid.xcodeproj/project.pbxproj b/Speculid.xcodeproj/project.pbxproj
index 33ec66cf..bee2e754 100644
--- a/Speculid.xcodeproj/project.pbxproj
+++ b/Speculid.xcodeproj/project.pbxproj
@@ -1856,6 +1856,9 @@
 		B3E9A9001FB4DCCA00FD8E7A /* autorevision.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = autorevision.json; sourceTree = "<group>"; };
 		B3E9A9021FB4DDE400FD8E7A /* Version.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Version.swift; sourceTree = "<group>"; };
 		B3E9A9041FB4E0B200FD8E7A /* bin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = bin; sourceTree = "<group>"; };
+		B3EC99A2243EA409008D5081 /* badSVG.speculid */ = {isa = PBXFileReference; lastKnownFileType = text; path = badSVG.speculid; sourceTree = "<group>"; };
+		B3EC99A3243EA409008D5081 /* badJSON.speculid */ = {isa = PBXFileReference; lastKnownFileType = text; path = badJSON.speculid; sourceTree = "<group>"; };
+		B3EC99A5243EA4D5008D5081 /* missingJSON.speculid */ = {isa = PBXFileReference; lastKnownFileType = text; path = missingJSON.speculid; sourceTree = "<group>"; };
 		B3F0ECEF1F9E6A4D0078690E /* SpeculidImageSpecificationBuilderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpeculidImageSpecificationBuilderProtocol.swift; sourceTree = "<group>"; };
 		B3F0ECF11F9E6AAD0078690E /* SpeculidImageSpecificationBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpeculidImageSpecificationBuilder.swift; sourceTree = "<group>"; };
 		B3F6E278233C3BF100B28DA2 /* AssetSpecificationFileProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetSpecificationFileProtocol.swift; sourceTree = "<group>"; };
@@ -4114,6 +4117,9 @@
 			isa = PBXGroup;
 			children = (
 				B3F8DE14243E77400028BD75 /* badsourcePath.speculid */,
+				B3EC99A3243EA409008D5081 /* badJSON.speculid */,
+				B3EC99A5243EA4D5008D5081 /* missingJSON.speculid */,
+				B3EC99A2243EA409008D5081 /* badSVG.speculid */,
 				B3F8DE13243E77250028BD75 /* badassetPath.speculid */,
 			);
 			path = samples;
diff --git a/Speculid.xcodeproj/xcshareddata/xcschemes/Speculid-Mac-App.xcscheme b/Speculid.xcodeproj/xcshareddata/xcschemes/Speculid-Mac-App.xcscheme
index 663ed39e..dd19bfe8 100644
--- a/Speculid.xcodeproj/xcshareddata/xcschemes/Speculid-Mac-App.xcscheme
+++ b/Speculid.xcodeproj/xcshareddata/xcschemes/Speculid-Mac-App.xcscheme
@@ -126,6 +126,10 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--process &quot;${SRCROOT}/samples/badsourcePath.speculid&quot;"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--process &quot;${SRCROOT}/samples/badJSON.speculid&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/frameworks/cairosvg/ImageHandleBuilder.m b/frameworks/cairosvg/ImageHandleBuilder.m
index a6bdf89d..5bf2e6db 100644
--- a/frameworks/cairosvg/ImageHandleBuilder.m
+++ b/frameworks/cairosvg/ImageHandleBuilder.m
@@ -33,8 +33,8 @@ + (ImageHandleBuilder*) shared {
   {
     case kSvg:
       rsvgHandle = rsvg_handle_new_from_file(file.url.path.UTF8String , &gerror);
-      *error = [[NSError alloc] initWithGError: gerror withURL:file.url];
-      if (error != nil) {
+      if (gerror != nil) {
+        *error = [[NSError alloc] initWithGError: gerror withURL:file.url];
         return nil;
       } else {
         return [[SVGImageHandle alloc] initWithRsvgHandle: rsvgHandle];
diff --git a/samples/Image Set.speculid b/samples/Image Set.speculid
new file mode 100644
index 00000000..d7c0c817
--- /dev/null
+++ b/samples/Image Set.speculid	
@@ -0,0 +1,4 @@
+{
+"set" : "Assets.xcassets/ImageSet.imageset",
+"source" : "geometry.svg"
+}
diff --git a/samples/badJSON.speculid b/samples/badJSON.speculid
new file mode 100644
index 00000000..10a726d3
--- /dev/null
+++ b/samples/badJSON.speculid
@@ -0,0 +1,7 @@
+{
+"set" : "AppIcon.appiconset",
+"source" : "geometry.svg",
+"background" : "#EC3ZZZSSX",
+"remove-alpha" : flase
+}
+
diff --git a/samples/badSVG.speculid b/samples/badSVG.speculid
new file mode 100644
index 00000000..1dace7d4
--- /dev/null
+++ b/samples/badSVG.speculid
@@ -0,0 +1,7 @@
+{
+"set" : "Assets.xcassets/iOS AppIcon.appiconset",
+"source" : "geometry-bad.svg",
+"background" : "#FFFFFF",
+"remove-alpha" : true
+}
+
diff --git a/samples/missingJSON.speculid b/samples/missingJSON.speculid
new file mode 100644
index 00000000..3a2fd268
--- /dev/null
+++ b/samples/missingJSON.speculid
@@ -0,0 +1,6 @@
+{
+"set" : "AppIcon.appiconset",
+"background" : "#FFFFFF",
+"remove-alpha" : true
+}
+