matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Remove CLI for mainpage setting

Browse source
This commit is contained in:
Matthias Beyer 2018-04-16 10:48:45 +02:00
parent adede7bf26
commit 2a0bf1cd51
2 changed files with 14 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
bin/domain/imag-wiki/src/main.rs
View file

@ -143,6 +143,9 @@ fn idof(rt: &Runtime, wiki_name: &str) {
} }
fn create(rt: &Runtime, wiki_name: &str) { fn create(rt: &Runtime, wiki_name: &str) {
use libimagwiki::entry::WikiEntry;
use libimagutil::warn_result::WarnResult;
let scmd = rt.cli().subcommand_matches("create").unwrap(); // safed by clap let scmd = rt.cli().subcommand_matches("create").unwrap(); // safed by clap
let name = String::from(scmd.value_of("create-name").unwrap()); // safe by clap let name = String::from(scmd.value_of("create-name").unwrap()); // safe by clap
@ -155,36 +158,10 @@ fn create(rt: &Runtime, wiki_name: &str) {
::std::process::exit(1) ::std::process::exit(1)
}); });
create_in_wiki(rt, &name, &wiki, scmd, let mut entry = wiki.create_entry(name).map_err_trace_exit_unwrap(1);
"create-noedit", "create-editheader", "create-printid");
}
fn create_wiki(rt: &Runtime, wiki_name: &str) { if !scmd.is_present("create-noedit") {
let scmd = rt.cli().subcommand_matches("create-wiki").unwrap(); // safed by clap if scmd.is_present("create-editheader") {
let wiki_name = String::from(scmd.value_of("create-wiki-name").unwrap()); // safe by clap
let main = String::from(scmd.value_of("create-wiki-mainpagename").unwrap_or("main"));
let wiki = rt.store().create_wiki(&wiki_name, Some(&main)).map_err_trace_exit_unwrap(1);
create_in_wiki(rt, &main, &wiki, scmd,
"create-wiki-noedit", "create-wiki-editheader", "create-wiki-printid");
}
fn create_in_wiki(rt: &Runtime,
entry_name: &str,
wiki: &Wiki,
scmd: &ArgMatches,
noedit_flag: &'static str,
editheader_flag: &'static str,
printid_flag: &'static str)
{
use libimagwiki::entry::WikiEntry;
use libimagutil::warn_result::WarnResult;
let mut entry = wiki.create_entry(entry_name).map_err_trace_exit_unwrap(1);
if !scmd.is_present(noedit_flag) {
if scmd.is_present(editheader_flag) {
let _ = entry.edit_header_and_content(rt).map_err_trace_exit_unwrap(1); let _ = entry.edit_header_and_content(rt).map_err_trace_exit_unwrap(1);
} else { } else {
let _ = entry.edit_content(rt).map_err_trace_exit_unwrap(1); let _ = entry.edit_content(rt).map_err_trace_exit_unwrap(1);
@ -200,7 +177,7 @@ fn create_in_wiki(rt: &Runtime,
.map_warn_err_str("Safed entry") .map_warn_err_str("Safed entry")
.map_err_trace_exit_unwrap(1); .map_err_trace_exit_unwrap(1);
if scmd.is_present(printid_flag) { if scmd.is_present("create-printid") {
let out = rt.stdout(); let out = rt.stdout();
let mut lock = out.lock(); let mut lock = out.lock();
let id = entry.get_location(); let id = entry.get_location();
@ -209,6 +186,13 @@ fn create_in_wiki(rt: &Runtime,
} }
} }
fn create_wiki(rt: &Runtime, wiki_name: &str) {
let scmd = rt.cli().subcommand_matches("create-wiki").unwrap(); // safed by clap
let wiki_name = String::from(scmd.value_of("create-wiki-name").unwrap()); // safe by clap
let wiki = rt.store().create_wiki(&wiki_name).map_err_trace_exit_unwrap(1);
}
fn show(rt: &Runtime, wiki_name: &str) { fn show(rt: &Runtime, wiki_name: &str) {
use filters::filter::Filter; use filters::filter::Filter;

8
bin/domain/imag-wiki/src/ui.rs
View file

@ -72,14 +72,6 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
.value_name("NAME") .value_name("NAME")
.help("Name of the wiki")) .help("Name of the wiki"))
.arg(Arg::with_name("create-wiki-mainpagename")
.long("mainpage")
.short("M")
.takes_value(true)
.required(false)
.multiple(false)
.help("Name of the main page. Currently only for the first page to be created. Defaults to 'main'."))
.arg(Arg::with_name("create-wiki-noedit") .arg(Arg::with_name("create-wiki-noedit")
.long("no-edit") .long("no-edit")
.short("E") .short("E")