Fix large gaps before and after lists (#151)

Changes made:
* fix: fix large gaps before and after lists

src/wiki/article.rs

@@ -22,7 +22,7 @@ fn action_parse(params: Vec<(&str, String)>) -> Result<Response> {
         .context("failed sending the request")
 }
 
-#[derive(Debug, PartialEq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum ElementType {
     Text,
     Newline,
@@ -389,14 +389,14 @@ impl<I, P> ArticleBuilder<I, P> {
             .and_then(|x| x.get("title"))
             .and_then(|x| x.as_str())
             .map(|x| x.to_string())
-            .ok_or(anyhow!("missing the title"))?;
+            .ok_or_else(|| anyhow!("missing the title"))?;
 
         let pageid = res_json
             .get("parse")
             .and_then(|x| x.get("pageid"))
             .and_then(|x| x.as_u64())
             .map(|x| x as usize)
-            .ok_or(anyhow!("missing the pageid"))?;
+            .ok_or_else(|| anyhow!("missing the pageid"))?;
 
         let content = res_json
             .get("parse")

src/wiki/parser.rs

@@ -9,6 +9,7 @@ use crate::config;
 use super::article::{Element, ElementType};
 
 const SHOW_UNSUPPORTED: bool = false;
+const LIST_MARKER: char = '-';
 
 pub struct Parser {
     elements: Vec<Element>,
@@ -79,6 +80,23 @@ impl Parser {
         style
     }
 
+    fn push_newline(&mut self) {
+        self.elements.push(Element::new(
+            self.next_id(),
+            ElementType::Newline,
+            "",
+            Style::none(),
+            HashMap::new(),
+        ));
+    }
+
+    fn is_last_newline(&self) -> bool {
+        self.elements
+            .last()
+            .map(|x| x.kind() == ElementType::Newline)
+            .unwrap_or(false)
+    }
+
     fn parse_header(&mut self, node: Node) {
         if let Some(headline_node) = node.find(Class("mw-headline")).into_selection().first() {
             let mut attributes = HashMap::new();
@@ -157,11 +175,16 @@ impl Parser {
             .children()
             .filter(|x| x.name().unwrap_or_default() == "li")
         {
-            self.push_newline();
+            // to avoid having large gaps between lists and other elements, we only want to add a
+            // newline when there isn't another one already added
+            if !self.is_last_newline() {
+                self.push_newline();
+            }
+
             self.elements.push(Element::new(
                 self.next_id(),
                 ElementType::Text,
-                "\t-".to_string(),
+                format!("\t{}", LIST_MARKER),
                 self.combine_effects(Style::from(config::CONFIG.theme.text)),
                 HashMap::new(),
             ));
@@ -170,14 +193,4 @@ impl Parser {
         self.push_newline();
         self.push_newline();
     }
-
-    fn push_newline(&mut self) {
-        self.elements.push(Element::new(
-            self.next_id(),
-            ElementType::Newline,
-            "",
-            Style::none(),
-            HashMap::new(),
-        ));
-    }
 }

src/wiki/search.rs

@@ -447,7 +447,7 @@ impl SearchBuilder<Query> {
             res_json
                 .get("query")
                 .and_then(|x| x.get("search"))
-                .ok_or(anyhow!("missing the search results"))?
+                .ok_or_else(|| anyhow!("missing the search results"))?
                 .to_owned(),
         )
         .context("failed deserializing the search results")?;