Merge branch 'imag-markdown/init' into master

Cargo.toml

@@ -12,6 +12,7 @@ members = [
     "bin/core/imag-ids",
     "bin/core/imag-init",
     "bin/core/imag-link",
+    "bin/core/imag-markdown",
     "bin/core/imag-mv",
     "bin/core/imag-ref",
     "bin/core/imag-store",

bin/core/imag-markdown/Cargo.toml

@@ -0,0 +1,38 @@
+[package]
+name = "imag-markdown"
+version = "0.10.0"
+authors = ["Matthias Beyer <mail@beyermatthias.de>"]
+edition = "2018"
+
+description = "Part of the imag core distribution: imag-markdown command"
+
+keywords    = ["imag", "PIM", "personal", "information", "management"]
+readme      = "../../../README.md"
+license     = "LGPL-2.1"
+
+documentation = "https://imag-pim.org/doc/"
+repository    = "https://github.com/matthiasbeyer/imag"
+homepage      = "http://imag-pim.org"
+
+build = "../../../build.rs"
+
+[badges]
+travis-ci                         = { repository = "matthiasbeyer/imag" }
+is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }
+is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
+maintenance                       = { status     = "actively-developed" }
+
+[dependencies]
+log        = "0.4"
+failure    = "0.1"
+
+libimagstore         = { version = "0.10.0", path = "../../../lib/core/libimagstore" }
+libimagrt            = { version = "0.10.0", path = "../../../lib/core/libimagrt" }
+libimagerror         = { version = "0.10.0", path = "../../../lib/core/libimagerror" }
+libimagentrymarkdown = { version = "0.10.0", path = "../../../lib/entry/libimagentrymarkdown" }
+
+[dependencies.clap]
+version          = "^2.29"
+default-features = false
+features         = ["color", "suggestions", "wrap_help"]
+

bin/core/imag-markdown/src/main.rs

@@ -0,0 +1,97 @@
+//
+// imag - the personal information management suite for the commandline
+// Copyright (C) 2015-2019 Matthias Beyer <mail@beyermatthias.de> 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
+//
+
+#![forbid(unsafe_code)]
+
+#![deny(
+    non_camel_case_types,
+    non_snake_case,
+    path_statements,
+    trivial_numeric_casts,
+    unstable_features,
+    unused_allocation,
+    unused_import_braces,
+    unused_imports,
+    unused_must_use,
+    unused_mut,
+    unused_qualifications,
+    while_true,
+)]
+
+extern crate clap;
+#[macro_use] extern crate log;
+extern crate failure;
+
+extern crate libimagerror;
+#[macro_use] extern crate libimagrt;
+extern crate libimagstore;
+
+use std::io::Write;
+
+use failure::Error;
+use failure::err_msg;
+
+use libimagerror::trace::MapErrTrace;
+use libimagerror::iter::TraceIterator;
+use libimagrt::setup::generate_runtime_setup;
+use libimagstore::iter::get::StoreIdGetIteratorExtension;
+
+mod ui;
+
+fn main() {
+    let version = make_imag_version!();
+    let rt = generate_runtime_setup("imag-markdown",
+                                    &version,
+                                    "Print one or more imag entries after processing them with a markdown parser",
+                                    ui::build_ui);
+
+    let only_links = rt.cli().is_present("links");
+    let out = rt.stdout();
+    let mut outlock = out.lock();
+
+    let iter = rt.ids::<crate::ui::PathProvider>()
+        .map_err_trace_exit_unwrap()
+        .into_iter()
+        .map(Ok)
+        .into_get_iter(rt.store())
+        .trace_unwrap_exit()
+        .map(|ofle| ofle.ok_or_else(|| {
+            err_msg("Entry does not exist but is in store. This is a BUG, please report!")
+        }))
+        .trace_unwrap_exit();
+
+    if only_links {
+        iter.map(|fle| libimagentrymarkdown::link::extract_links(fle.get_content()))
+            .for_each(|links| {
+                links.iter().for_each(|link| {
+                    writeln!(outlock, "{title}: {link}", title = link.title, link = link.link)
+                        .map_err(Error::from)
+                        .map_err_trace_exit_unwrap();
+                })
+            })
+
+    } else {
+        iter.map(|fle| libimagentrymarkdown::html::to_html(fle.get_content()))
+            .trace_unwrap_exit()
+            .for_each(|html| {
+                writeln!(outlock, "{}", html).map_err(Error::from).map_err_trace_exit_unwrap();
+            })
+    }
+}
+

bin/core/imag-markdown/src/ui.rs

@@ -0,0 +1,64 @@
+//
+// imag - the personal information management suite for the commandline
+// Copyright (C) 2015-2019 Matthias Beyer <mail@beyermatthias.de> 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::path::PathBuf;
+
+use clap::{Arg, ArgMatches, App};
+
+use libimagstore::storeid::StoreId;
+use libimagstore::storeid::IntoStoreId;
+use libimagrt::runtime::IdPathProvider;
+use libimagerror::trace::MapErrTrace;
+
+pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
+    app
+        .arg(Arg::with_name("links")
+             .long("links")
+             .short("l")
+             .takes_value(false)
+             .required(false)
+             .multiple(false)
+             .help("Print only the links that can be found in the markdown"))
+
+        .arg(Arg::with_name("entry")
+             .index(1)
+             .takes_value(true)
+             .required(false)
+             .multiple(true)
+             .help("The entries to process")
+             .value_name("ENTRY"))
+}
+
+pub struct PathProvider;
+impl IdPathProvider for PathProvider {
+    fn get_ids(matches: &ArgMatches) -> Vec<StoreId> {
+        matches.values_of("entry")
+            .ok_or_else(|| {
+                error!("No StoreId found");
+                ::std::process::exit(1)
+            })
+            .unwrap()
+            .into_iter()
+            .map(PathBuf::from)
+            .map(|pb| pb.into_storeid())
+            .collect::<Result<Vec<_>, _>>()
+            .map_err_trace_exit_unwrap()
+    }
+}
+