~matthiasbeyer/imag

d12844aff04b4b78e5aba3e79f0ba79da7326b4f — Matthias Beyer 3 years ago f882f6e
Add markdown viewer functionality
M lib/entry/libimagentryview/Cargo.toml => lib/entry/libimagentryview/Cargo.toml +20 -0
@@ 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"]


A lib/entry/libimagentryview/src/builtin/md.rs => lib/entry/libimagentryview/src/builtin/md.rs +73 -0
@@ 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)
    }
}


M lib/entry/libimagentryview/src/builtin/mod.rs => lib/entry/libimagentryview/src/builtin/mod.rs +4 -0
@@ 20,3 20,7 @@
pub mod editor;
pub mod plain;
pub mod stdout;

#[cfg(feature = "markdownviewer")]
pub mod md;


M lib/entry/libimagentryview/src/error.rs => lib/entry/libimagentryview/src/error.rs +1 -0
@@ 23,6 23,7 @@ error_chain! {
    }

    foreign_links {
        Failure(::failure::Compat<::failure::Error>) #[cfg(feature = "markdownviewer")];
        IO(::std::io::Error);
    }


M lib/entry/libimagentryview/src/lib.rs => lib/entry/libimagentryview/src/lib.rs +12 -0
@@ 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;