diff options
Diffstat (limited to 'lib/entry')
-rw-r--r-- | lib/entry/libimagentryannotation/Cargo.toml | 2 | ||||
-rw-r--r-- | lib/entry/libimagentryfilter/Cargo.toml | 4 | ||||
-rw-r--r-- | lib/entry/libimagentrylink/Cargo.toml | 2 | ||||
-rw-r--r-- | lib/entry/libimagentryref/Cargo.toml | 2 | ||||
-rw-r--r-- | lib/entry/libimagentrytag/Cargo.toml | 2 | ||||
-rw-r--r-- | lib/entry/libimagentryurl/Cargo.toml | 2 | ||||
-rw-r--r-- | lib/entry/libimagentryview/Cargo.toml | 4 | ||||
-rw-r--r-- | lib/entry/libimagentryview/src/builtin/md.rs | 39 |
8 files changed, 25 insertions, 32 deletions
diff --git a/lib/entry/libimagentryannotation/Cargo.toml b/lib/entry/libimagentryannotation/Cargo.toml index d618115e..1f26fdec 100644 --- a/lib/entry/libimagentryannotation/Cargo.toml +++ b/lib/entry/libimagentryannotation/Cargo.toml @@ -25,7 +25,7 @@ toml = "0.5.1" toml-query = "0.10" anyhow = "1" -uuid = { version = "0.7.4", features = ["v4"] } +uuid = { version = "0.8", features = ["v4"] } log = "0.4.6" diff --git a/lib/entry/libimagentryfilter/Cargo.toml b/lib/entry/libimagentryfilter/Cargo.toml index bf15d9d9..b954d954 100644 --- a/lib/entry/libimagentryfilter/Cargo.toml +++ b/lib/entry/libimagentryfilter/Cargo.toml @@ -21,10 +21,10 @@ maintenance = { status = "actively-developed" } [dependencies] filters = "0.3.0" -itertools = "0.8.0" +itertools = "0.9.0" log = "0.4.6" regex = "1.1.7" -semver = "0.9.0" +semver = "0.10.0" toml = "0.5.1" toml-query = "0.10" anyhow = "1" diff --git a/lib/entry/libimagentrylink/Cargo.toml b/lib/entry/libimagentrylink/Cargo.toml index 09ed3ded..3c6bbc5b 100644 --- a/lib/entry/libimagentrylink/Cargo.toml +++ b/lib/entry/libimagentrylink/Cargo.toml @@ -20,7 +20,7 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -itertools = "0.8.0" +itertools = "0.9.0" log = "0.4.6" toml = "0.5.1" url = "2" diff --git a/lib/entry/libimagentryref/Cargo.toml b/lib/entry/libimagentryref/Cargo.toml index 6b665121..769a31bc 100644 --- a/lib/entry/libimagentryref/Cargo.toml +++ b/lib/entry/libimagentryref/Cargo.toml @@ -20,7 +20,7 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -itertools = "0.8.0" +itertools = "0.9.0" log = "0.4.6" anyhow = "1" sha-1 = "0.8.1" diff --git a/lib/entry/libimagentrytag/Cargo.toml b/lib/entry/libimagentrytag/Cargo.toml index 1b17757b..218ef914 100644 --- a/lib/entry/libimagentrytag/Cargo.toml +++ b/lib/entry/libimagentrytag/Cargo.toml @@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" } log = "0.4.6" regex = "1.1.7" toml = "0.5.1" -itertools = "0.8.0" +itertools = "0.9.0" filters = "0.3.0" anyhow = "1" serde = "1.0.94" diff --git a/lib/entry/libimagentryurl/Cargo.toml b/lib/entry/libimagentryurl/Cargo.toml index 26a896a2..272f06d3 100644 --- a/lib/entry/libimagentryurl/Cargo.toml +++ b/lib/entry/libimagentryurl/Cargo.toml @@ -20,7 +20,7 @@ is-it-maintained-open-issues = { repository = "matthiasbeyer/imag" } maintenance = { status = "actively-developed" } [dependencies] -itertools = "0.8.0" +itertools = "0.9.0" log = "0.4.6" toml = "0.5.1" url = "2" diff --git a/lib/entry/libimagentryview/Cargo.toml b/lib/entry/libimagentryview/Cargo.toml index 4e0a1f78..bd5044ce 100644 --- a/lib/entry/libimagentryview/Cargo.toml +++ b/lib/entry/libimagentryview/Cargo.toml @@ -30,7 +30,7 @@ libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" } libimagentryedit = { version = "0.10.0", path = "../../../lib/entry/libimagentryedit" } -mdcat = { version = "0.15.0", optional = true } +mdcat = { version = "0.17.0", optional = true } [dependencies.pulldown-cmark] version = "^0.7" @@ -39,7 +39,7 @@ default-features = false features = [] [dependencies.syntect] -version = "3" +version = "4" optional = true default-features = false features = ["parsing", "assets", "dump-load"] diff --git a/lib/entry/libimagentryview/src/builtin/md.rs b/lib/entry/libimagentryview/src/builtin/md.rs index b4bd13c6..771be295 100644 --- a/lib/entry/libimagentryview/src/builtin/md.rs +++ b/lib/entry/libimagentryview/src/builtin/md.rs @@ -30,22 +30,11 @@ use anyhow::format_err; use crate::viewer::Viewer; -pub struct MarkdownViewer<'a> { - rt: &'a Runtime<'a>, - resource_access: ResourceAccess, - termsize: TerminalSize, -} +pub struct MarkdownViewer<'a>(&'a Runtime<'a>); impl<'a> MarkdownViewer<'a> { pub fn new(rt: &'a Runtime) -> Self { - MarkdownViewer { - rt, - resource_access: ResourceAccess::LocalOnly, - termsize: TerminalSize::detect().unwrap_or(TerminalSize { - width: 80, - height: 20, - }), - } + MarkdownViewer(rt) } } @@ -53,18 +42,22 @@ 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(); - let capa = TerminalCapabilities::ansi(); + let parser = Parser::new(e.get_content()); + let base_dir = self.0.rtp(); + let settings = mdcat::Settings { + terminal_capabilities: TerminalCapabilities::ansi(), + syntax_set: SyntaxSet::load_defaults_newlines(), + resource_access: ResourceAccess::LocalOnly, + terminal_size: TerminalSize::detect().unwrap_or(TerminalSize { + width: 80, + height: 20, + }), + }; - ::mdcat::push_tty(sink, - &capa, - self.termsize, - parser, + ::mdcat::push_tty(&settings, + sink, base_dir, - self.resource_access, - syntax_set) + parser) .map_err(|_| format_err!("Failed while formatting markdown")) } } |