Skip to content

feat: add JSON Output Option #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 9, 2019
Merged

feat: add JSON Output Option #381

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11b5aaa
Add JSON Output option
gabebear Apr 25, 2019
e061f6e
oops, didn't grab correct model value in last commit
gabebear Apr 25, 2019
f441892
add -j option to check
gabebear May 7, 2019
d687c41
Make "-j" take no arguments in options string.
gabebear May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 80 additions & 8 deletions src/ios-deploy/ios-deploy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
char *list_root = NULL;
int _timeout = 0;
int _detectDeadlockTimeout = 0;
bool _json_output = false;
int port = 0; // 0 means "dynamically assigned"
CFStringRef last_path = NULL;
service_conn_t gdbfd;
Expand Down Expand Up @@ -150,21 +151,38 @@ void __NSLogOut(NSString* format, va_list valist) {
}

void NSLogOut(NSString* format, ...) {
va_list valist;
va_start(valist, format);
__NSLogOut(format, valist);
va_end(valist);
if (!_json_output) {
va_list valist;
va_start(valist, format);
__NSLogOut(format, valist);
va_end(valist);
}
}

void NSLogVerbose(NSString* format, ...) {
if (verbose) {
if (verbose && !_json_output) {
va_list valist;
va_start(valist, format);
__NSLogOut(format, valist);
va_end(valist);
}
}

void NSLogJSON(NSDictionary* jsonDict) {
if (_json_output) {
NSError *error;
NSData *data = [NSJSONSerialization dataWithJSONObject:jsonDict
options:NSJSONWritingPrettyPrinted
error:&error];
assert(data != NULL);
NSString *jsonString = @"{\"error\": \"JSON error\"}";
if (data) {
jsonString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
}
[jsonString writeToFile:@"/dev/stdout" atomically:NO encoding:NSUTF8StringEncoding error:nil];
}
}


BOOL mkdirp(NSString* path) {
NSError* error = nil;
Expand Down Expand Up @@ -380,6 +398,49 @@ CFStringRef get_device_full_name(const AMDeviceRef device) {
return full_name;
}

NSDictionary* get_device_json_dict(const AMDeviceRef device) {
NSMutableDictionary *json_dict = [NSMutableDictionary new];
AMDeviceConnect(device);

CFStringRef device_udid = AMDeviceCopyDeviceIdentifier(device);
if (device_udid) {
[json_dict setValue:(__bridge NSString *)device_udid forKey:@"DeviceIdentifier"];
CFRelease(device_udid);
}

CFStringRef device_hardware_model = AMDeviceCopyValue(device, 0, CFSTR("HardwareModel"));
if (device_hardware_model) {
[json_dict setValue:(NSString*)device_hardware_model forKey:@"HardwareModel"];
size_t device_db_length = sizeof(device_db) / sizeof(device_desc);
for (size_t i = 0; i < device_db_length; i ++) {
if (CFStringCompare(device_hardware_model, device_db[i].model, kCFCompareNonliteral | kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
device_desc dev = device_db[i];
[json_dict setValue:(__bridge NSString *)dev.name forKey:@"modelName"];
[json_dict setValue:(__bridge NSString *)dev.sdk forKey:@"modelSDK"];
[json_dict setValue:(__bridge NSString *)dev.arch forKey:@"modelArch"];
break;
}
}
CFRelease(device_hardware_model);
}

for (NSString *deviceValue in @[@"DeviceName",
@"BuildVersion",
@"DeviceClass",
@"ProductType",
@"ProductVersion"]) {
CFStringRef cf_value = AMDeviceCopyValue(device, 0, (__bridge CFStringRef)deviceValue);
if (cf_value) {
[json_dict setValue:(__bridge NSString *)cf_value forKey:deviceValue];
CFRelease(cf_value);
}
}

AMDeviceDisconnect(device);

return json_dict;
}

CFStringRef get_device_interface_name(const AMDeviceRef device) {
// AMDeviceGetInterfaceType(device) 0=Unknown, 1 = Direct/USB, 2 = Indirect/WIFI
switch(AMDeviceGetInterfaceType(device)) {
Expand Down Expand Up @@ -1526,7 +1587,13 @@ void handle_device(AMDeviceRef device) {
device_interface_name = get_device_interface_name(device);

if (detect_only) {
NSLogOut(@"[....] Found %@ connected through %@.", device_full_name, device_interface_name);
if (_json_output) {
NSLogJSON(@{@"Event": @"DeviceDetected",
@"Device": get_device_json_dict(device)
});
} else {
NSLogOut(@"[....] Found %@ connected through %@.", device_full_name, device_interface_name);
}
found_device = true;
return;
}
Expand Down Expand Up @@ -1771,7 +1838,8 @@ void usage(const char* app) {
@" -e, --exists check if the app with given bundle_id is installed or not \n"
@" -B, --list_bundle_id list bundle_id \n"
@" -W, --no-wifi ignore wifi devices\n"
@" --detect_deadlocks <sec> start printing backtraces for all threads periodically after specific amount of seconds\n",
@" --detect_deadlocks <sec> start printing backtraces for all threads periodically after specific amount of seconds\n"
@" -j, --json format output as JSON\n",
[NSString stringWithUTF8String:app]);
}

Expand Down Expand Up @@ -1819,11 +1887,12 @@ int main(int argc, char *argv[]) {
{ "list_bundle_id", no_argument, NULL, 'B'},
{ "no-wifi", no_argument, NULL, 'W'},
{ "detect_deadlocks", required_argument, NULL, 1000 },
{ "json", no_argument, NULL, 'j'},
{ NULL, 0, NULL, 0 },
};
int ch;

while ((ch = getopt_long(argc, argv, "VmcdvunNrILeD:R:i:b:a:s:t:g:x:p:1:2:o:l::w::9::B::W", longopts, NULL)) != -1)
while ((ch = getopt_long(argc, argv, "VmcdvunNrILeWjD:R:i:b:a:s:t:g:x:p:1:2:o:l::w::9::B::", longopts, NULL)) != -1)
{
switch (ch) {
case 'm':
Expand Down Expand Up @@ -1932,6 +2001,9 @@ int main(int argc, char *argv[]) {
case 1000:
_detectDeadlockTimeout = atoi(optarg);
break;
case 'j':
_json_output = true;
break;
default:
usage(argv[0]);
return exitcode_error;
Expand Down