Merge pull request #93 from lotabout/ticket-90

Ticket 90

ci/script.sh

@@ -2,13 +2,13 @@
 set -ex
 
 main() {
-    cross build --target $TARGET --release
-
     if [ ! -z $DISABLE_TESTS ]; then
         return
     fi
 
-    cargo test --verbose
+    cross build --release --target $TARGET
+    mkdir -p target/release
+    cp target/$TARGET/release/sk target/release
 
     case $TARGET in
         x86_64-unknown-linux-gnu|i686-unknown-linux-gnu)

src/lib.rs

@@ -24,6 +24,7 @@ mod query;
 mod reader;
 mod score;
 mod sender;
+mod util;
 
 use curses::Curses;
 use event::Event::*;

src/model.rs

@@ -17,14 +17,16 @@ use std::sync::mpsc::Sender;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use unicode_width::UnicodeWidthChar;
+use std::env;
+use util::escape_single_quote;
 
 pub type ClosureType = Box<Fn(&mut Window) + Send>;
 
 const SPINNER_DURATION: u32 = 200;
 const SPINNERS: [char; 8] = ['-', '\\', '|', '/', '-', '\\', '|', '/'];
 
 lazy_static! {
-    static ref RE_FILEDS: Regex = Regex::new(r"(\{-?[0-9.,q]*?})").unwrap();
+    static ref RE_FILEDS: Regex = Regex::new(r"\\?(\{-?[0-9.,q]*?})").unwrap();
     static ref REFRESH_DURATION: Duration = Duration::from_millis(200);
 }
 
@@ -642,13 +644,21 @@ impl Model {
             .expect("model:inject_preview_command: invalid preview command");
         debug!("replace: {:?}, text: {:?}", cmd, text);
         RE_FILEDS.replace_all(cmd, |caps: &Captures| {
+            // \{...
+            if &caps[0][0..1] == "\\" {
+                return caps[0].to_string();
+            }
+
+            // {1..} and other variant
             assert!(caps[1].len() >= 2);
             let range = &caps[1][1..caps[1].len() - 1];
-            if range == "" {
-                format!("'{}'", text)
+            let replacement = if range == "" {
+                text
             } else {
-                format!("'{}'", get_string_by_range(&self.delimiter, text, range).unwrap_or(""))
-            }
+                get_string_by_range(&self.delimiter, text, range).unwrap_or("")
+            };
+
+            format!("'{}'", escape_single_quote(replacement))
         })
     }
 
@@ -777,7 +787,8 @@ impl Model {
 }
 
 fn get_command_output(cmd: &str, lines: u16, cols: u16) -> Result<String, Box<Error>> {
-    let output = Command::new("sh")
+    let shell = env::var("SHELL").unwrap_or("sh".to_string());
+    let output = Command::new(shell)
         .env("LINES", lines.to_string())
         .env("COLUMNS", cols.to_string())
         .arg("-c")

src/reader.rs

@@ -16,6 +16,7 @@ use field::FieldRange;
 use options::SkimOptions;
 use regex::Regex;
 use sender::CachedSender;
+use std::env;
 
 struct ReaderOption {
     pub use_ansi_color: bool,
@@ -180,7 +181,8 @@ impl Reader {
 }
 
 fn get_command_output(cmd: &str) -> Result<(Option<Child>, Box<BufRead + Send>), Box<Error>> {
-    let mut command = Command::new("sh")
+    let shell = env::var("SHELL").unwrap_or("sh".to_string());
+    let mut command = Command::new(shell)
         .arg("-c")
         .arg(cmd)
         .stdout(Stdio::piped())

src/util.rs

@@ -0,0 +1,3 @@
+pub fn escape_single_quote(text: &str) -> String {
+    text.replace("'", "'\\''")
+}

test/test_skim.py

@@ -10,25 +10,28 @@
 import time
 import re
 import inspect
+import sys
 
 INPUT_RECORD_SEPARATOR = '\n'
 DEFAULT_TIMEOUT = 2000
 
 SCRIPT_PATH = os.path.realpath(__file__)
-BASE = os.path.expanduser(os.path.join(os.path.dirname(SCRIPT_PATH), '../'))
+BASE = os.path.expanduser(os.path.join(os.path.dirname(SCRIPT_PATH), '..'))
 os.chdir(BASE)
 SK = f"SKIM_DEFAULT_OPTIONS= SKIM_DEFAULT_COMMAND= {BASE}/target/release/sk"
 
 def now_mills():
     return int(round(time.time() * 1000))
 
-def wait(func):
+def wait(func, timeout_handler=None):
     since = now_mills()
     while now_mills() - since < DEFAULT_TIMEOUT:
-        time.sleep(0.01)
+        time.sleep(0.02)
         ret = func()
         if ret is not None and ret:
             return
+    if timeout_handler is not None:
+        timeout_handler()
     raise BaseException('Timeout on wait')
 
 class Shell(object):
@@ -94,7 +97,9 @@ def select_count(self):
         return self.counts()[2]
 
     def any_include(self, val):
-        if isinstance(val, re._pattern_type):
+        if hasattr(re, '_pattern_type') and isinstance(val, re._pattern_type):
+            method = lambda l: val.match(l)
+        if hasattr(re, 'Pattern') and isinstance(val, re.Pattern):
             method = lambda l: val.match(l)
         else:
             method = lambda l: l.find(val) >= 0
@@ -175,7 +180,10 @@ def wait_callback():
             if pred:
                 self.send_keys(Ctrl('l') if refresh else None)
             return pred
-        wait(wait_callback)
+        def timeout_handler():
+            lines = self.capture()
+            print(lines)
+        wait(wait_callback, timeout_handler)
 
     def prepare(self):
         try:
@@ -353,6 +361,7 @@ def test_key_bindings(self):
 
     def test_read0(self):
         self.tmux.send_keys(f"find . | wc -l", Key('Enter'))
+        self.tmux.until(lambda lines: re.search('\d', lines[-1]) is not None)
         lines = self.tmux.capture()
         num_of_files = int(lines[-1])
 
@@ -750,5 +759,21 @@ def test_multiple_option_values_should_be_accepted(self):
         self.tmux.until(lambda lines: lines[-1].startswith('>'))
         self.tmux.send_keys(Key('Enter'))
 
+    def test_single_quote_of_preview_command(self):
+        # echo "'\"ABC\"'" | sk --preview="echo X{}X" => X'"ABC"'X
+        echo_command = '''echo "'\\"ABC\\"'" | '''
+        sk_command = self.sk('--preview=\"echo X{}X\"')
+        command = echo_command + sk_command
+        self.tmux.send_keys(command, Key('Enter'))
+        self.tmux.until(lambda lines: lines.any_include('''X'"ABC"'X'''))
+
+        # echo "'\"ABC\"'" | sk --preview="echo X\{}X" => X{}X
+        echo_command = '''echo "'\\"ABC\\"'" | '''
+        sk_command = self.sk('--preview=\"echo X\\{}X\"')
+        command = echo_command + sk_command
+        self.tmux.send_keys(command, Key('Enter'))
+        self.tmux.until(lambda lines: lines.any_include('''X{}X'''))
+
+
 if __name__ == '__main__':
     unittest.main()