Get config from read_input()

diff --git a/src/lib.rs b/src/lib.rs
index dbcfc7b90930da83effdcba5c75f60ecf2ae1254..5c994c9f20a0d8eeb63650d4d9618c6da6dc75dc 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -170,8 +170,13 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
     }
 }
 
     }
 }
 

-fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
-    Reader::new(std::io::BufReader::new(input).lines()).collect::<Result<Vec<_>, _>>()
+fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
+    let default_config = Config {
+        column_threshold: 2,
+    };
+    Reader::new(std::io::BufReader::new(input).lines())
+        .collect::<Result<Vec<_>, _>>()
+        .map(|rows| (rows, default_config))

 }
 
 fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {
 }
 
 fn column_counts(rows: &[Rowlike]) -> Vec<(usize, String)> {


@@ -303,9 +308,9 @@ fn render_column_headers(columns: &[String]) -> HTML {
 ///   * there's an i/o error while reading `input`
 ///   * the log has invalid syntax:
 ///     * an indented line with no preceding non-indented line
 ///   * there's an i/o error while reading `input`
 ///   * the log has invalid syntax:
 ///     * an indented line with no preceding non-indented line

-pub fn tablify(config: &Config, input: impl std::io::Read) -> Result<HTML, std::io::Error> {
-    let rows = read_rows(input)?;
-    let columns = column_order(config, &rows);
+pub fn tablify(input: impl std::io::Read) -> Result<HTML, std::io::Error> {
+    let (rows, config) = read_input(input)?;
+    let columns = column_order(&config, &rows);

     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
         render_column_headers(&columns),
     Ok(HTML(format!(
         "{HEADER}{}{}{FOOTER}",
         render_column_headers(&columns),


@@ -348,6 +353,9 @@ mod tests {
         );
     }
 
         );
     }
 

+    fn read_rows(input: impl std::io::Read) -> Result<Vec<Rowlike>, std::io::Error> {
+        read_input(input).map(|(rows, _)| rows)
+    }

     #[test]
     fn test_read_rows() {
         assert_eq!(
     #[test]
     fn test_read_rows() {
         assert_eq!(

diff --git a/src/main.rs b/src/main.rs
index 6102247044bcad0a52d3d7bc31e5ce05ce19b461..8cf48593c2ce89971951551dbfdba31bd0ade0df 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,12 +1,3 @@
 fn main() {
 fn main() {

-    print!(
-        "{}",
-        tablify::tablify(
-            &tablify::Config {
-                column_threshold: 2
-            },
-            std::io::stdin()
-        )
-        .unwrap()
-    );
+    print!("{}", tablify::tablify(std::io::stdin()).unwrap());

 }
 }