Add markdown viewer functionality

5 files changed, 110 insertions, 0 deletions

diff --git a/lib/entry/libimagentryview/Cargo.toml b/lib/entry/libimagentryview/Cargo.toml
index 4c702043..b10dd040 100644
--- a/lib/entry/libimagentryview/Cargo.toml
+++ b/lib/entry/libimagentryview/Cargo.toml
@@ -29,3 +29,23 @@ libimagrt        = { version = "0.8.0", path = "../../../lib/core/libimagrt" }
 libimagstore     = { version = "0.8.0", path = "../../../lib/core/libimagstore" }
 libimagerror     = { version = "0.8.0", path = "../../../lib/core/libimagerror" }
 libimagentryedit = { version = "0.8.0", path = "../../../lib/entry/libimagentryedit" }
+
+mdcat   = { version = "0.8", optional = true }
+failure = { version = "0.1", optional = true }
+
+[dependencies.pulldown-cmark]
+version          = "^0.1"
+optional         = true
+default-features = false
+features         = []
+
+[dependencies.syntect]
+version          = "^2"
+optional         = true
+default-features = false
+features         = ["parsing", "assets", "dump-load"]
+
+[features]
+default        = [ "markdownviewer" ]
+markdownviewer = ["mdcat", "failure", "pulldown-cmark", "syntect"]
+
diff --git a/lib/entry/libimagentryview/src/builtin/md.rs b/lib/entry/libimagentryview/src/builtin/md.rs
new file mode 100644
index 00000000..630719e3
--- /dev/null
+++ b/lib/entry/libimagentryview/src/builtin/md.rs
@@ -0,0 +1,73 @@
+//
+// imag - the personal information management suite for the commandline
+// Copyright (C) 2015-2018 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::io::Write;
+
+use libimagstore::store::Entry;
+use libimagrt::runtime::Runtime;
+
+use mdcat::{ResourceAccess, Terminal, TerminalSize};
+use pulldown_cmark::Parser;
+use syntect::parsing::SyntaxSet;
+use mdcat;
+
+use viewer::Viewer;
+use error::Result;
+
+pub struct MarkdownViewer<'a> {
+    rt:                 &'a Runtime<'a>,
+    resource_access:    ResourceAccess,
+    terminal:           Terminal,
+    termsize:           TerminalSize,
+}
+
+impl<'a> MarkdownViewer<'a> {
+    pub fn new(rt: &'a Runtime) -> Self {
+        MarkdownViewer {
+            rt,
+            resource_access: ResourceAccess::LocalOnly,
+            terminal:        Terminal::detect(),
+            termsize:        TerminalSize::detect().unwrap_or(TerminalSize {
+                width: 80,
+                height: 20,
+            }),
+        }
+    }
+}
+
+impl<'a> Viewer for MarkdownViewer<'a> {
+    fn view_entry<W>(&self, e: &Entry, sink: &mut W) -> Result<()>
+        where W: Write
+    {
+        let parser          = Parser::new(e.get_content());
+        let base_dir        = self.rt.rtp();
+        let syntax_set      = SyntaxSet::load_defaults_newlines();
+
+        mdcat::push_tty(sink,
+                        self.terminal.clone(),
+                        self.termsize.clone(),
+                        parser,
+                        base_dir,
+                        self.resource_access.clone(),
+                        syntax_set)
+        .map_err(|e| e.compat())
+        .map_err(::error::ViewError::from)
+    }
+}
+
diff --git a/lib/entry/libimagentryview/src/builtin/mod.rs b/lib/entry/libimagentryview/src/builtin/mod.rs
index a859f8bf..bf9a5b6e 100644
--- a/lib/entry/libimagentryview/src/builtin/mod.rs
+++ b/lib/entry/libimagentryview/src/builtin/mod.rs
@@ -20,3 +20,7 @@
 pub mod editor;
 pub mod plain;
 pub mod stdout;
+
+#[cfg(feature = "markdownviewer")]
+pub mod md;
+
diff --git a/lib/entry/libimagentryview/src/error.rs b/lib/entry/libimagentryview/src/error.rs
index e910fd87..c549fe88 100644
--- a/lib/entry/libimagentryview/src/error.rs
+++ b/lib/entry/libimagentryview/src/error.rs
@@ -23,6 +23,7 @@ error_chain! {
     }
 
     foreign_links {
+        Failure(::failure::Compat<::failure::Error>) #[cfg(feature = "markdownviewer")];
         IO(::std::io::Error);
     }
 
diff --git a/lib/entry/libimagentryview/src/lib.rs b/lib/entry/libimagentryview/src/lib.rs
index 170f415c..52f30a0f 100644
--- a/lib/entry/libimagentryview/src/lib.rs
+++ b/lib/entry/libimagentryview/src/lib.rs
@@ -39,6 +39,18 @@ extern crate toml;
 #[macro_use] extern crate error_chain;
 extern crate textwrap;
 
+#[cfg(feature = "markdownviewer")]
+extern crate mdcat;
+
+#[cfg(feature = "markdownviewer")]
+extern crate failure;
+
+#[cfg(feature = "markdownviewer")]
+extern crate pulldown_cmark;
+
+#[cfg(feature = "markdownviewer")]
+extern crate syntect;
+
 extern crate libimagstore;
 extern crate libimagrt;
 extern crate libimagerror;