commit 7d38bac89a185e3eaea062f37cfbb4c0cfbe3412
author Gabe Giosia <gabe@ghearing.com> Sat Aug 03 18:37:50 2019 -0700
committer Shazron Abdullah <shazron@gmail.com> Sun Aug 04 09:37:50 2019 +0800
tree e7abbf82a7ea4952a5606a3db7a87812875c500d
parent 9fd5a5bcea9a2fdbf84bf878c3b0163e236daac8

feat: improve JSON errors (#404)

* Improve JSON errors

Add codes for errors and send all check_error() errors out as the JSON stream

* Standardize on "Status" instead of "Description"

* Better handling of the messages for both JSON and console.

src/ios-deploy/ios-deploy.m

diff --git a/src/ios-deploy/ios-deploy.m b/src/ios-deploy/ios-deploy.m
index 29c2c33..613dadd 100644
--- a/src/ios-deploy/ios-deploy.m
+++ b/src/ios-deploy/ios-deploy.m
@@ -121,8 +121,9 @@
         if (err != 0)                                                           \
         {                                                                       \
             const char* msg = get_error_message(err);                           \
-            /*on_error("Error 0x%x: %s " #call, err, msg ? msg : "unknown.");*/    \
-            on_error(@"Error 0x%x: %@ " #call, err, msg ? [NSString stringWithUTF8String:msg] : @"unknown."); \
+            NSString *description = msg ? [NSString stringWithUTF8String:msg] : @"unknown."; \
+            NSLogJSON(@{@"Event": @"Error", @"Code": @(err), @"Status": description}); \
+            on_error(@"Error 0x%x: %@ " #call, err, description);               \
         }                                                                       \
     } while (false);
 
@@ -558,12 +559,18 @@
     } else if (result == 0xe8000076 /* already mounted */) {
         NSLogOut(@"[ 95%%] Developer disk image already mounted");
     } else {
-        if (result == 0xe80000e2 /* device locked */) {
-            NSLogOut(@"The device is locked.");
+        if (result != 0) {
+            const char* msg = get_error_message(result);
+            NSString *description = @"unknown.";
+            if (msg) {
+                description = [NSString stringWithUTF8String:msg];
+                NSLogOut(@"Error: %@", description);
+            }
             NSLogJSON(@{@"Event": @"Error",
-                        @"Status": @"DeviceLocked"
-                        });
+                        @"Code": @(result),
+                        @"Status": description});
         }
+        
         on_error(@"Unable to mount developer disk image. (%x)", result);
     }