refactor: new completion logic

Signed-off-by: wxiwnd <[email protected]>

Author: wxiwnd

scripts/bash_pinyin_completion

@@ -21,10 +21,61 @@ _comp_compgen_filedir() {
     # ignore empty
     [ -z "$cur" ] && return
 
-    local -a pinyin_matches=()
-    while IFS= read -r line; do
-        pinyin_matches+=( "$line" )
-    done < <( bash-pinyin-completion-rs "$cur" 2>/dev/null )
 
-    COMPREPLY+=( "${pinyin_matches[@]}" )
+    local dirpart="$(dirname -- "$cur")"
+    local basepart="$(basename -- "$cur")"
+
+    [[ "$dirpart" == "." && "$cur" != */* ]] && dirpart=""
+
+    local savedPWD="$PWD"
+    local resolved_dir
+    local compgen_opts=(-f)
+    [[ "${1-}" == -d ]] && compgen_opts=(-d)
+
+    if [[ -n "$dirpart" ]]; then
+        resolved_dir="$(realpath -- "$dirpart" 2>/dev/null)"
+        if [[ -d "$resolved_dir" ]]; then
+            cd -- "$resolved_dir" 2>/dev/null || return
+        else
+            cd "$savedPWD" || return
+            return
+        fi
+    fi
+
+    local -a pinyin_matched
+    mapfile -t pinyin_matched < <(
+        compgen "${compgen_opts[@]}" -- "" | while IFS= read -r line; do
+            if [[ "${compgen_opts[0]}" == -d ]]; then
+                printf "%s/\n" "${line%%/}"
+            else
+                if [ -d "$line" ]; then
+                    printf "%s/\n" "${line%%/}"
+                else
+                    printf "%s\n" "$line"
+                fi
+            fi
+        done | bash-pinyin-completion-rs "$basepart" 2>/dev/null
+    )
+
+    if [[ -n "$dirpart" ]]; then
+        for i in "${!pinyin_matched[@]}"; do
+            pinyin_matched[$i]="${dirpart}/${pinyin_matched[$i]}"
+        done
+    fi
+
+    cd "$savedPWD" || return
+
+    # merge result
+    local -a old_candidates=("${COMPREPLY[@]}")
+    COMPREPLY=("${old_candidates[@]}" "${pinyin_matched[@]}")
+
+    # remove dup
+    IFS=$'\n' read -r -d '' -a COMPREPLY < <(
+        printf '%s\n' "${COMPREPLY[@]}" | awk '!seen[$0]++' | sort
+    )
+
+    # fix space postfix
+    if ((${#COMPREPLY[@]} == 1)) && [[ ${COMPREPLY[0]} != */ ]]; then
+        compopt -o nospace 2>/dev/null
+    fi
 }

src/main.rs

@@ -1,4 +1,5 @@
 use ib_pinyin::{matcher::PinyinMatcher, pinyin::PinyinNotation};
+use std::io::{BufRead, BufReader};
 
 fn main() {
     let args: Vec<String> = std::env::args().collect();
@@ -10,26 +11,17 @@ fn main() {
 
     let input: &str = &args[1];
     let matcher = PinyinMatcher::builder(input)
-    .pinyin_notations(PinyinNotation::Ascii | PinyinNotation::AsciiFirstLetter)
-    .build();
+        .pinyin_notations(PinyinNotation::Ascii | PinyinNotation::AsciiFirstLetter)
+        .build();
 
     let han_re = regex::Regex::new(r"\p{Han}").unwrap();
 
-    let mut results: Vec<String> = Vec::new();
-    // Read current location
-    if let Ok(entries) = std::fs::read_dir(".") {
-        for entry in entries.flatten() {
-                let path = entry.path();
-                if let Some(file_name) = path.file_name() {
-                    if let Some(file_name_str) = file_name.to_str() {
-                        if matcher.is_match(file_name_str) && han_re.is_match(file_name_str) {
-                            results.push(file_name_str.to_string());
-                        }
-                    }
-                }
+    let stdin = std::io::stdin();
+    let reader = BufReader::new(stdin.lock());
+    for line_result in reader.lines() {
+            let candidate = line_result.unwrap().trim_end().to_string();
+            if han_re.is_match(&candidate) && matcher.is_match(&candidate) {
+                println!("{}", candidate);
             }
         }
-        for result in results {
-            println!("{}", result);
-        }
     }