From f5df7cf3323686d146ed6020fd847ea490b720b2 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 20 Feb 2018 13:40:52 +0100 Subject: [PATCH] Revert "Dump all StoreIds" This reverts commit 1f84643486cecc1c5a0a96e4a49d007ca2d9bb22. --- bin/core/imag-store/src/ids.rs | 47 --------------------------------- bin/core/imag-store/src/main.rs | 3 --- bin/core/imag-store/src/ui.rs | 11 -------- 3 files changed, 61 deletions(-) delete mode 100644 bin/core/imag-store/src/ids.rs diff --git a/bin/core/imag-store/src/ids.rs b/bin/core/imag-store/src/ids.rs deleted file mode 100644 index d64659c8..00000000 --- a/bin/core/imag-store/src/ids.rs +++ /dev/null @@ -1,47 +0,0 @@ -// -// imag - the personal information management suite for the commandline -// Copyright (C) 2015-2018 Matthias Beyer and contributors -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; version -// 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// - -use std::io::Write; - -use libimagrt::runtime::Runtime; -use libimagerror::trace::*; -use libimagerror::io::ToExitCode; -use libimagerror::exit::ExitUnwrap; - -pub fn ids(rt: &Runtime) { - let full = rt.cli().subcommand_matches("ids").unwrap() //secured by main - .is_present("full"); - let base = rt.store().path(); - let _ = rt - .store() - .entries() - .map_err_trace_exit_unwrap(1) - .map(|e| if full { - e.with_base(base.clone()) - } else { - e.without_base() - }) - .map(|i| i.to_str()) - .map(|elem| elem.map_err_trace_exit_unwrap(1)) - .map(|i| writeln!(::std::io::stdout(), "{}", i)) - .collect::, ::std::io::Error>>() - .to_exit_code() - .unwrap_or_exit(); -} - diff --git a/bin/core/imag-store/src/main.rs b/bin/core/imag-store/src/main.rs index 2b16b047..60f80d1c 100644 --- a/bin/core/imag-store/src/main.rs +++ b/bin/core/imag-store/src/main.rs @@ -61,7 +61,6 @@ mod ui; mod update; mod verify; mod util; -mod ids; use std::ops::Deref; @@ -73,7 +72,6 @@ use retrieve::retrieve; use ui::build_ui; use update::update; use verify::verify; -use ids::ids; fn main() { let version = make_imag_version!(); @@ -94,7 +92,6 @@ fn main() { "update" => update(&rt), "verify" => verify(&rt), "dump" => dump(&mut rt), - "ids" => ids(&rt), _ => { debug!("Unknown command"); // More error handling diff --git a/bin/core/imag-store/src/ui.rs b/bin/core/imag-store/src/ui.rs index 09de5117..b44665b7 100644 --- a/bin/core/imag-store/src/ui.rs +++ b/bin/core/imag-store/src/ui.rs @@ -195,15 +195,4 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> { .about("Dump the complete store to stdout. Currently does only support JSON") .version("0.1") ) - .subcommand(SubCommand::with_name("ids") - .about("List of Storeids") - .version("0.1") - .arg(Arg::with_name("full") - .long("full") - .short("F") - .takes_value(false) - .multiple(false) - .required(false) - .help("Print full filepath instead of storeid part")) - ) }