Merge pull request #10 from JeromeSchmied/dev

empty universe fix
JeromeSchmied · Sep 29, 2024 · 566029d · 566029d
2 parents 823dc7e + d9d035d
commit 566029d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cgol-tui"
-version = "0.5.2"
+version = "0.5.3"
 authors = ["Jeromos Kovacs <[email protected]>"]
 edition = "2021"
 description = "Conway's Game of Life implementation with a TUI"

diff --git a/src/main.rs b/src/main.rs
@@ -21,16 +21,19 @@ where <pattern> is either a .cells file, or - for stdin"
         if args.len() == 1 && args[0] == "-" {
             std::io::stdin().read_to_string(&mut univ)?;
         }
-        Universe::from_str(&univ)?
+        if univ.is_empty() {
+            vec![]
+        } else {
+            vec![Universe::from_str(&univ)?]
+        }
     };
-
-    let mut universes = args
+    let universes = args
         .iter()
         .flat_map(std::fs::read_to_string)
         .map(|s| Universe::from_str(&s))
         .collect::<Result<Vec<_>, _>>()?;
-    universes.push(piped_universe);
-    let mut app = App::default().with_universes(universes);
+
+    let mut app = App::default().with_universes([universes, piped_universe].concat());
 
     let mut terminal = ratatui::try_init()?;