CI

CI + artifacts for Linux, Windows

src/main.rs

@@ -35,32 +35,12 @@ struct CmdOpts {
     files: Vec<String>,
 }
 
-// Returns whether we hit EOF or not
-fn read_valid_str(buf: &mut String) -> bool {
-    lazy_static! {
-        static ref INCOMPLETE_ESCAPE: Regex =
-            Regex::new("\x1B(?:[ -/]*|[\\]PX^_][^\x07\x1B]*|\\[[0-?]*)$").unwrap();
+fn read_line() -> Option<(String, usize)> {
+    let mut input = String::new();
+    match stdin().read_line(&mut input) {
+        Ok(n) => Some((input, n)),
+        _ => None,
     }
-
-    let mut hit_eof = false;
-    loop {
-        match stdin().take(4096).read_to_string(buf) {
-            Ok(n) => {
-                if n == 0 {
-                    hit_eof = true;
-                }
-
-                if hit_eof || !INCOMPLETE_ESCAPE.is_match(&buf) {
-                    break;
-                }
-            }
-            Err(_) => {
-                exit(1);
-            }
-        }
-    }
-
-    hit_eof
 }
 
 fn main() {
@@ -78,23 +58,13 @@ fn main() {
 
     for file_path in files {
         if file_path == "-" {
-            let mut hit_eof = false;
-            while !hit_eof {
-                let mut buf = String::new();
-                hit_eof = read_valid_str(&mut buf);
-
-                let mut ran = false;
-                for (i, line) in buf.lines().enumerate() {
-                    if i != 0 {
-                        println!();
-                        ran = true;
-                    }
-                    lol::print_rainbow(&line, opts.freq, seed, opts.spread, opts.invert);
-                    seed += 1.0;
-                }
-                if ran {
-                    println!();
+            while let Some((x, n)) = read_line() {
+                lol::print_rainbow(&x, opts.freq, seed, opts.spread, opts.invert);
+                if n == 0 {
+                    // EOF
+                    break;
                 }
+                seed += 1.0;
             }
         } else {
             let file = match File::open(&file_path) {