feat: allow multiline matching and double quotes in regexp expression

Cargo.toml

@@ -13,8 +13,8 @@ termion = "1.5.6"
 regex = "1.7.1"
 clap = "2.34.0"
 base64 = "0.13.1"
-unicode-width = "0.1.10"
 lazy_static = "1.4.0"
+itertools = "0.10.5"
 
 [[bin]]
 name = "thumbs"

src/alphabets.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-const ALPHABETS: [(&'static str, &'static str); 22] = [
+const ALPHABETS: [(&str, &str); 22] = [
   ("numeric", "1234567890"),
   ("abcd", "abcd"),
   ("qwerty", "asdfqwerzxcvjklmiuopghtybn"),
@@ -44,18 +44,17 @@ impl<'a> Alphabet<'a> {
       if expansion.len() + expanded.len() >= matches {
         break;
       }
-      if expansion.is_empty() {
+      if let Some(prefix) = expansion.pop() {
+        let sub_expansion: Vec<String> = letters
+          .iter()
+          .take(matches - expansion.len() - expanded.len())
+          .map(|s| prefix.clone() + s)
+          .collect();
+
+        expanded.splice(0..0, sub_expansion);
+      } else {
         break;
       }
-
-      let prefix = expansion.pop().expect("Ouch!");
-      let sub_expansion: Vec<String> = letters
-        .iter()
-        .take(matches - expansion.len() - expanded.len())
-        .map(|s| prefix.clone() + s)
-        .collect();
-
-      expanded.splice(0..0, sub_expansion);
     }
 
     expansion = expansion.iter().take(matches - expanded.len()).cloned().collect();
@@ -69,7 +68,7 @@ pub fn get_alphabet(alphabet_name: &str) -> Alphabet {
 
   alphabets
     .get(alphabet_name)
-    .expect(format!("Unknown alphabet: {}", alphabet_name).as_str()); // FIXME
+    .unwrap_or_else(|| panic!("Unknown alphabet: {}", alphabet_name)); // FIXME
 
   Alphabet::new(alphabets[alphabet_name])
 }

src/main.rs

@@ -18,6 +18,7 @@ use std::io::{self, Read, Write};
 fn dbg(msg: &str) {
   let mut file = std::fs::OpenOptions::new()
     .append(true)
+    .create(true)
     .open("/tmp/thumbs.log")
     .expect("Unable to open log file");
 
@@ -170,9 +171,7 @@ fn main() {
 
   handle.read_to_string(&mut output).unwrap();
 
-  let lines = output.split('\n').collect::<Vec<&str>>();
-
-  let mut state = state::State::new(&lines, alphabet, &regexp);
+  let mut state = state::State::new(output.as_str(), alphabet, &regexp);
 
   let selected = {
     let mut viewbox = view::View::new(
@@ -204,11 +203,15 @@ fn main() {
         let mut output = format.to_string();
 
         output = str::replace(&output, "%U", upcase_value);
-        output = str::replace(&output, "%H", text.as_str());
+        output = str::replace(&output, "%H", text
+                              .split('\n')
+                              .map(|line| line.trim_end())
+                              .collect::<Vec<&str>>()
+                              .join("\n").as_str());
         output
       })
       .collect::<Vec<_>>()
-      .join("\n");
+      .join("\0");
 
     if let Some(target) = target {
       let mut file = OpenOptions::new()
@@ -218,7 +221,7 @@ fn main() {
         .open(target)
         .expect("Unable to open the target file");
 
-      file.write(output.as_bytes()).unwrap();
+      file.write_all(output.as_bytes()).unwrap();
     } else {
       print!("{}", output);
     }