Add support for more friendly usages of --key (#501)
Add support for more friendly usages of --key
- Support multiple `--key` parameters.
- Support `,` as a separator of keys on a single parameters
- Support `&` as a separator of keys on a single parameters
- Change documentation to show more user-friendly `,` key separator
diff --git a/README.md b/README.md
index 9666828..b623b25 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@
-E, --error_output <file> write stderr to this file
--detect_deadlocks <sec> start printing backtraces for all threads periodically after specific amount of seconds
-f, --file_system specify file system for mkdir / list / upload / download / rm
- -k, --key keys for the properties of the bundle. Joined by '&' and used only with -B <list_bundle_id> and -j <json>
+ -k, --key keys for the properties of the bundle. Joined by ',' and used only with -B <list_bundle_id> and -j <json>
-F, --non-recursively specify non-recursively walk directory
-j, --json format output as JSON
@@ -154,7 +154,8 @@
ios-deploy -f -o/Users/ryan/Downloads/test.png -2/DCIM/test.png
// get more properties of the bundle
- ios-deploy -B -j --key=UIFileSharingEnabled&CFBundlePackageType
+ ios-deploy -B -j --key=UIFileSharingEnabled,CFBundlePackageType
+ ios-deploy -B -j --key=UIFileSharingEnabled --key=CFBundlePackageType
## Demo
diff --git a/src/ios-deploy/ios-deploy.m b/src/ios-deploy/ios-deploy.m
index 1da08a7..9d082a5 100644
--- a/src/ios-deploy/ios-deploy.m
+++ b/src/ios-deploy/ios-deploy.m
@@ -99,7 +99,7 @@
char const*target_filename = NULL;
char const*upload_pathname = NULL;
char *bundle_id = NULL;
-char *key = NULL;
+NSMutableArray *keys = NULL;
bool interactive = true;
bool justlaunch = false;
bool file_system = false;
@@ -1766,9 +1766,11 @@
@"CFBundleDisplayName",
@"CFBundleVersion",
@"CFBundleShortVersionString", nil];
- if (key) {
- NSArray * ns_keys = [[NSString stringWithUTF8String:key] componentsSeparatedByString:@"&"];
- [a addObjectsFromArray:ns_keys];
+ if (keys) {
+ for (NSString * key in keys) {
+ [a addObjectsFromArray:[key componentsSeparatedByCharactersInSet:
+ [NSCharacterSet characterSetWithCharactersInString:@",&"]]];
+ }
}
NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:a forKey:@"ReturnAttributes"];
CFDictionaryRef options = (CFDictionaryRef)optionsDict;
@@ -2346,7 +2348,7 @@
@" -f, --file_system specify file system for mkdir / list / upload / download / rm\n"
@" -F, --non-recursively specify non-recursively walk directory\n"
@" -j, --json format output as JSON\n"
- @" -k, --key keys for the properties of the bundle. Joined by '&' and used only with -B <list_bundle_id> and -j <json> \n"
+ @" -k, --key keys for the properties of the bundle. Joined by ',' and used only with -B <list_bundle_id> and -j <json> \n"
@" --custom-script <script> path to custom python script to execute in lldb\n"
@" --custom-command <command> specify additional lldb commands to execute\n",
[NSString stringWithUTF8String:app]);
@@ -2558,7 +2560,8 @@
[custom_commands appendFormat:@"%s\n", optarg];
break;
case 'k':
- key = optarg;
+ if (!keys) keys = [[NSMutableArray alloc] init];
+ [keys addObject: [NSString stringWithUTF8String:optarg]];
break;
default:
usage(argv[0]);
