diff --git a/flake-info/src/data/export.rs b/flake-info/src/data/export.rs index 932c66ee..d0e3ba93 100644 --- a/flake-info/src/data/export.rs +++ b/flake-info/src/data/export.rs @@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize}; use super::{ import::{self, DocString, DocValue, ModulePath, NixOption}, - pandoc::PandocExt, + //pandoc::PandocExt, utility::{Flatten, OneOrMany}, }; @@ -127,7 +127,7 @@ impl TryFrom<(import::FlakeEntry, super::Flake)> for Derivation { }) .into(); - let long_description = long_description.map(|s| s.render_markdown()).transpose()?; + let long_description = Some(String::new()); //long_description.map(|s| s.render_markdown()).transpose()?; let package_license: Vec = license .map(OneOrMany::into_list) @@ -233,11 +233,11 @@ impl TryFrom for Derivation { .flat_map(|m| m.name.to_owned()) .collect(); - let long_description = package - .meta - .long_description - .map(|s| s.render_markdown()) - .transpose()?; + let long_description = Some(String::new()); //package + //.meta + //.long_description + //.map(|s| s.render_markdown()) + //.transpose()?; let position: Option = package.meta.position.map(|p| { if p.starts_with("/nix/store") { diff --git a/flake-info/src/data/import.rs b/flake-info/src/data/import.rs index ad195d4a..6da7d870 100644 --- a/flake-info/src/data/import.rs +++ b/flake-info/src/data/import.rs @@ -9,7 +9,7 @@ use serde::de::{self, MapAccess, Visitor}; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde_json::Value; -use super::pandoc::PandocExt; +//use super::pandoc::PandocExt; use super::prettyprint::print_value; use super::utility::{Flatten, OneOrMany}; @@ -118,10 +118,7 @@ impl Serialize for DocString { { match self { DocString::String(md) | DocString::DocFormat(DocFormat::MarkdownDoc(md)) => serializer - .serialize_str(&md.render_markdown().unwrap_or_else(|e| { - warn!("Could not render Markdown content: {}", e); - md.to_owned() - })), + .serialize_str("ok"), } } } @@ -134,16 +131,10 @@ impl Serialize for DocValue { match self { DocValue::Literal(Literal::LiteralExpression(s)) => serializer.serialize_str(&s), DocValue::Literal(Literal::LiteralDocBook(db)) => { - serializer.serialize_str(&db.render_docbook().unwrap_or_else(|e| { - warn!("Could not render DocBook content: {}", e); - db.to_owned() - })) + serializer.serialize_str("ok") } DocValue::Literal(Literal::LiteralMarkdown(md)) => { - serializer.serialize_str(&md.render_markdown().unwrap_or_else(|e| { - warn!("Could not render Markdown content: {}", e); - md.to_owned() - })) + serializer.serialize_str("ok") } DocValue::Value(v) => serializer.serialize_str(&print_value(v)), }