mirror of
https://github.com/OMGeeky/google-apis-rs.git
synced 2026-02-23 15:49:49 +01:00
fix(version-up): code updated to v0.1.6, latest CLI
* also includes publishing tag files
This commit is contained in:
Sebastian Thiel
@@ -105,7 +105,7 @@ pub fn parse_kv_arg<'a>(kv: &'a str, err: &mut InvalidOptionsError, for_hashmap:
|
||||
let key = &kv[..pos];
|
||||
if kv.len() <= pos + 1 {
|
||||
add_err();
|
||||
return (key, None)
|
||||
return (key, Some(""))
|
||||
}
|
||||
(key, Some(&kv[pos+1..]))
|
||||
}
|
||||
|
||||
@@ -19,31 +19,32 @@ use std::io::{self, Write};
|
||||
|
||||
docopt!(Options derive Debug, "
|
||||
Usage:
|
||||
gan1-beta1 [options] advertisers get <role> <role-id> [-p <v>]... [-o <out>]
|
||||
gan1-beta1 [options] advertisers list <role> <role-id> [-p <v>]... [-o <out>]
|
||||
gan1-beta1 [options] cc-offers list <publisher> [-p <v>]... [-o <out>]
|
||||
gan1-beta1 [options] events list <role> <role-id> [-p <v>]... [-o <out>]
|
||||
gan1-beta1 [options] links get <role> <role-id> <link-id> [-p <v>]... [-o <out>]
|
||||
gan1-beta1 [options] links insert <role> <role-id> -r <kv>... [-p <v>]... [-o <out>]
|
||||
gan1-beta1 [options] links list <role> <role-id> [-p <v>]... [-o <out>]
|
||||
gan1-beta1 [options] publishers get <role> <role-id> [-p <v>]... [-o <out>]
|
||||
gan1-beta1 [options] publishers list <role> <role-id> [-p <v>]... [-o <out>]
|
||||
gan1-beta1 [options] reports get <role> <role-id> <report-type> [-p <v>]... [-o <out>]
|
||||
gan1-beta1 [options] advertisers get <role> <role-id> [-p <v>...] [-o <out>]
|
||||
gan1-beta1 [options] advertisers list <role> <role-id> [-p <v>...] [-o <out>]
|
||||
gan1-beta1 [options] cc-offers list <publisher> [-p <v>...] [-o <out>]
|
||||
gan1-beta1 [options] events list <role> <role-id> [-p <v>...] [-o <out>]
|
||||
gan1-beta1 [options] links get <role> <role-id> <link-id> [-p <v>...] [-o <out>]
|
||||
gan1-beta1 [options] links insert <role> <role-id> -r <kv>... [-p <v>...] [-o <out>]
|
||||
gan1-beta1 [options] links list <role> <role-id> [-p <v>...] [-o <out>]
|
||||
gan1-beta1 [options] publishers get <role> <role-id> [-p <v>...] [-o <out>]
|
||||
gan1-beta1 [options] publishers list <role> <role-id> [-p <v>...] [-o <out>]
|
||||
gan1-beta1 [options] reports get <role> <role-id> <report-type> [-p <v>...] [-o <out>]
|
||||
gan1-beta1 --help
|
||||
|
||||
All documentation details can be found TODO: <URL to github.io docs here, see #51>
|
||||
All documentation details can be found at
|
||||
http://byron.github.io/google-apis-rs/google_gan1_beta1_cli/index.html
|
||||
|
||||
Configuration:
|
||||
--config-dir <folder>
|
||||
A directory into which we will store our persistent data. Defaults to a user-writable
|
||||
directory that we will create during the first invocation.
|
||||
A directory into which we will store our persistent data. Defaults to
|
||||
a user-writable directory that we will create during the first invocation.
|
||||
[default: ~/.google-service-cli]
|
||||
--debug
|
||||
Output all server communication to standard error. `tx` and `rx` are placed into
|
||||
the same stream.
|
||||
Output all server communication to standard error. `tx` and `rx` are placed
|
||||
into the same stream.
|
||||
--debug-auth
|
||||
Output all communication related to authentication to standard error. `tx` and `rx` are placed into
|
||||
the same stream.
|
||||
Output all communication related to authentication to standard error. `tx`
|
||||
and `rx` are placed into the same stream.
|
||||
");
|
||||
|
||||
mod cmn;
|
||||
@@ -358,36 +359,23 @@ impl Engine {
|
||||
|
||||
fn _links_insert(&self, dry_run: bool, err: &mut InvalidOptionsError)
|
||||
-> Option<api::Error> {
|
||||
let mut request = api::Link::default();
|
||||
let mut call = self.hub.links().insert(&request, &self.opt.arg_role, &self.opt.arg_role_id);
|
||||
for parg in self.opt.arg_v.iter() {
|
||||
let (key, value) = parse_kv_arg(&*parg, err, false);
|
||||
match key {
|
||||
"alt"
|
||||
|"fields"
|
||||
|"key"
|
||||
|"oauth-token"
|
||||
|"pretty-print"
|
||||
|"quota-user"
|
||||
|"user-ip" => {
|
||||
let map = [
|
||||
("oauth-token", "oauth_token"),
|
||||
("pretty-print", "prettyPrint"),
|
||||
("quota-user", "quotaUser"),
|
||||
("user-ip", "userIp"),
|
||||
];
|
||||
call = call.param(map.iter().find(|t| t.0 == key).unwrap_or(&("", key)).1, value.unwrap_or("unset"))
|
||||
},
|
||||
_ => err.issues.push(CLIError::UnknownParameter(key.to_string())),
|
||||
}
|
||||
}
|
||||
|
||||
let mut field_name = FieldCursor::default();
|
||||
let mut request = api::Link::default();
|
||||
let mut field_cursor = FieldCursor::default();
|
||||
for kvarg in self.opt.arg_kv.iter() {
|
||||
let last_errc = err.issues.len();
|
||||
let (key, value) = parse_kv_arg(&*kvarg, err, false);
|
||||
if let Err(field_err) = field_name.set(&*key) {
|
||||
let mut temp_cursor = field_cursor.clone();
|
||||
if let Err(field_err) = temp_cursor.set(&*key) {
|
||||
err.issues.push(field_err);
|
||||
}
|
||||
if value.is_none() {
|
||||
field_cursor = temp_cursor.clone();
|
||||
if err.issues.len() > last_errc {
|
||||
err.issues.remove(last_errc);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
fn request_epc_ninety_day_average_init(request: &mut api::Link) {
|
||||
if request.epc_ninety_day_average.is_none() {
|
||||
request.epc_ninety_day_average = Some(Default::default());
|
||||
@@ -434,7 +422,7 @@ impl Engine {
|
||||
}
|
||||
}
|
||||
|
||||
match &field_name.to_string()[..] {
|
||||
match &temp_cursor.to_string()[..] {
|
||||
"link-type" => {
|
||||
request.link_type = Some(value.unwrap_or("").to_string());
|
||||
},
|
||||
@@ -569,10 +557,32 @@ impl Engine {
|
||||
request.destination_url = Some(value.unwrap_or("").to_string());
|
||||
},
|
||||
_ => {
|
||||
err.issues.push(CLIError::Field(FieldError::Unknown(field_name.to_string())));
|
||||
err.issues.push(CLIError::Field(FieldError::Unknown(temp_cursor.to_string())));
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut call = self.hub.links().insert(request, &self.opt.arg_role, &self.opt.arg_role_id);
|
||||
for parg in self.opt.arg_v.iter() {
|
||||
let (key, value) = parse_kv_arg(&*parg, err, false);
|
||||
match key {
|
||||
"alt"
|
||||
|"fields"
|
||||
|"key"
|
||||
|"oauth-token"
|
||||
|"pretty-print"
|
||||
|"quota-user"
|
||||
|"user-ip" => {
|
||||
let map = [
|
||||
("oauth-token", "oauth_token"),
|
||||
("pretty-print", "prettyPrint"),
|
||||
("quota-user", "quotaUser"),
|
||||
("user-ip", "userIp"),
|
||||
];
|
||||
call = call.param(map.iter().find(|t| t.0 == key).unwrap_or(&("", key)).1, value.unwrap_or("unset"))
|
||||
},
|
||||
_ => err.issues.push(CLIError::UnknownParameter(key.to_string())),
|
||||
}
|
||||
}
|
||||
let protocol = "standard-request";
|
||||
if dry_run {
|
||||
None
|
||||
@@ -982,6 +992,7 @@ impl Engine {
|
||||
|
||||
fn main() {
|
||||
let opts: Options = Options::docopt().decode().unwrap_or_else(|e| e.exit());
|
||||
let debug = opts.flag_debug;
|
||||
match Engine::new(opts) {
|
||||
Err(err) => {
|
||||
writeln!(io::stderr(), "{}", err).ok();
|
||||
@@ -989,8 +1000,11 @@ fn main() {
|
||||
},
|
||||
Ok(engine) => {
|
||||
if let Some(err) = engine.doit() {
|
||||
writeln!(io::stderr(), "{:?}", err).ok();
|
||||
writeln!(io::stderr(), "{}", err).ok();
|
||||
if debug {
|
||||
writeln!(io::stderr(), "{:?}", err).ok();
|
||||
} else {
|
||||
writeln!(io::stderr(), "{}", err).ok();
|
||||
}
|
||||
env::set_exit_status(1);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user