From 82381ab48cbe18985a9dc9360197f7f2511c6832 Mon Sep 17 00:00:00 2001
From: woniuzfb <47843848+woniuzfb@users.noreply.github.com>
Date: Thu, 21 Mar 2024 23:14:11 +0800
Subject: [PATCH] feat: search in inquirer </> + keyword support

---
 src/lhh        | 145 ++++++++++++++-------------------
 utils/inquirer | 215 +++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 250 insertions(+), 110 deletions(-)

diff --git a/src/lhh b/src/lhh
index 6d57e08..7e2b273 100644
--- a/src/lhh
+++ b/src/lhh
@@ -300,7 +300,7 @@ reduce ({adapter,addtime,bookname,category_id,cover,drawing,m,muludir,original,p
         IFS="${delimiters[1]}" read -r -a result_publish <<< "$m_publish"
         IFS="${delimiters[1]}" read -r -a result_yd <<< "$m_yd"
 
-        local i j
+        local i j books new_book books_indices
 
         for((i=0;i<result_count;i++));
         do
@@ -310,18 +310,6 @@ reduce ({adapter,addtime,bookname,category_id,cover,drawing,m,muludir,original,p
                 do
                     if [ "${books_m[j]}" -eq "${result_m[i]}" ] 
                     then
-                        books_adapter[j]="${result_adapter[i]}"
-                        books_addtime[j]="${result_addtime[i]}"
-                        books_bookname[j]="${result_bookname[i]}"
-                        books_category_id[j]="${result_category_id[i]}"
-                        books_cover[j]="${result_cover[i]}"
-                        books_drawing[j]="${result_drawing[i]}"
-                        books_muludir[j]="${result_muludir[i]}"
-                        books_original[j]="${result_original[i]}"
-                        books_p[j]="${result_p[i]}"
-                        books_publish[j]="${result_publish[i]}"
-                        books_yd[j]="${result_yd[i]}"
-
                         if [ "${books_downloaded[j]}" = true ] 
                         then
                             result_bookname[i]="${result_bookname[i]} ${green}[已下载]${normal}"
@@ -331,6 +319,7 @@ reduce ({adapter,addtime,bookname,category_id,cover,drawing,m,muludir,original,p
                         then
                             result_bookname[i]="${result_bookname[i]} ${green}[已收藏]${normal}"
                         fi
+                        books_indices+=("$j")
                         break
                     fi
                 done
@@ -349,47 +338,43 @@ reduce ({adapter,addtime,bookname,category_id,cover,drawing,m,muludir,original,p
                 books_yd+=("${result_yd[i]}")
                 books_downloaded+=("false")
                 books_fav+=("false")
-            fi
-        done
-
-        books_total=${#books_adapter[@]}
-        local books new_book
+                new_book=$(
+                $JQ_FILE -n --arg adapter "${result_adapter[i]}" --arg addtime "${result_addtime[i]}" \
+                --arg bookname "${result_bookname[i]}" --arg category_id "${result_category_id[i]}" \
+                --arg cover "${result_cover[i]}" --arg drawing "${result_drawing[i]}" \
+                --arg m "${result_m[i]}" --arg muludir "${result_muludir[i]}" \
+                --arg original "${result_original[i]}" --arg p "${result_p[i]}" \
+                --arg publish "${result_publish[i]}" --arg yd "${result_yd[i]}" \
+                    '{
+                        adapter: $adapter,
+                        addtime: $addtime,
+                        bookname: $bookname,
+                        category_id: $category_id | tonumber,
+                        cover: $cover,
+                        drawing: $drawing,
+                        m: $m | tonumber,
+                        muludir: $muludir,
+                        original: $original,
+                        p: $p,
+                        publish: $publish,
+                        yd: $yd,
+                        downloaded: false,
+                        fav: false
+                    }'
+                )
 
-        for((i=0;i<books_total;i++));
-        do
-            new_book=$(
-            $JQ_FILE -n --arg adapter "${books_adapter[i]}" --arg addtime "${books_addtime[i]}" \
-            --arg bookname "${books_bookname[i]}" --arg category_id "${books_category_id[i]}" \
-            --arg cover "${books_cover[i]}" --arg drawing "${books_drawing[i]}" \
-            --arg m "${books_m[i]}" --arg muludir "${books_muludir[i]}" \
-            --arg original "${books_original[i]}" --arg p "${books_p[i]}" \
-            --arg publish "${books_publish[i]}" --arg yd "${books_yd[i]}" \
-            --arg downloaded "${books_downloaded[i]}" --arg fav "${books_fav[i]}" \
-                '{
-                    adapter: $adapter,
-                    addtime: $addtime,
-                    bookname: $bookname,
-                    category_id: $category_id | tonumber,
-                    cover: $cover,
-                    drawing: $drawing,
-                    m: $m | tonumber,
-                    muludir: $muludir,
-                    original: $original,
-                    p: $p,
-                    publish: $publish,
-                    yd: $yd,
-                    downloaded: $downloaded | test("true"),
-                    fav: $fav | test("true")
-                }'
-            )
-
-            [ -n "${books:-}" ] && books="${books},"
-            books="${books}${new_book}"
+                [ -n "${books:-}" ] && books="${books},"
+                books="${books}${new_book}"
+                books_indices+=("$books_total")
+                ((books_total++))
+            fi
         done
 
-        json=true
-        jq_path='["books","zhlhh"]'
-        JQ update "$ebooks_config" "[$books]"
+        if [ -n "${books:-}" ] 
+        then
+            jq_path='["books","zhlhh"]'
+            JQ add "$ebooks_config" "[$books]"
+        fi
     fi
 
     echo
@@ -421,21 +406,15 @@ reduce ({adapter,addtime,bookname,category_id,cover,drawing,m,muludir,original,p
 
             for result_index in "${result_indices[@]}"
             do
-                for((i=0;i<books_total;i++));
-                do
-                    if [ "${books_m[i]}" -eq "${result_m[result_index]}" ] 
-                    then
-                        book_url="http://www.zhlhh.com${iframe_paths[result_yd[result_index]]:-iframe_paths[0]}?libcode=$libcode&m=${result_m[result_index]}&p=${result_p[result_index]}&y_l_s="
-                        ZhLhhDownload "${book_url}" "${books_bookname[i]}"
-                        if [ "${books_downloaded[i]}" = false ] 
-                        then
-                            bool=true
-                            jq_path='["books","zhlhh",'"$i"',"downloaded"]'
-                            JQ update "$ebooks_config" true
-                        fi
-                        continue 2
-                    fi
-                done
+                books_index=${books_indices[result_index]}
+                book_url="http://www.zhlhh.com${iframe_paths[result_yd[result_index]]:-iframe_paths[0]}?libcode=$libcode&m=${result_m[result_index]}&p=${result_p[result_index]}&y_l_s="
+                ZhLhhDownload "${book_url}" "${books_bookname[books_index]}"
+                if [ "${books_downloaded[books_index]}" = false ] 
+                then
+                    bool=true
+                    jq_path='["books","zhlhh",'"$books_index"',"downloaded"]'
+                    JQ update "$ebooks_config" true
+                fi
             done
 
             Println "$info 下载完成\n"
@@ -443,31 +422,25 @@ reduce ({adapter,addtime,bookname,category_id,cover,drawing,m,muludir,original,p
         then
             for result_index in "${result_indices[@]}"
             do
-                for((i=0;i<books_total;i++));
-                do
-                    if [ "${books_m[i]}" -eq "${result_m[result_index]}" ] 
-                    then
-                        bool=true
-                        jq_path='["books","zhlhh",'"$i"',"fav"]'
-                        JQ update "$ebooks_config" true
-                        continue 2
-                    fi
-                done
+                books_index=${books_indices[result_index]}
+                if [ "${books_fav[books_index]}" = false ]
+                then
+                    bool=true
+                    jq_path='["books","zhlhh",'"$books_index"',"fav"]'
+                    JQ update "$ebooks_config" true
+                fi
             done
             Println "$info 已添加到收藏\n"
         else
             for result_index in "${result_indices[@]}"
             do
-                for((i=0;i<books_total;i++));
-                do
-                    if [ "${books_m[i]}" -eq "${result_m[result_index]}" ] 
-                    then
-                        bool=true
-                        jq_path='["books","zhlhh",'"$i"',"fav"]'
-                        JQ update "$ebooks_config" false
-                        continue 2
-                    fi
-                done
+                books_index=${books_indices[result_index]}
+                if [ "${books_fav[books_index]}" = true ]
+                then
+                    bool=true
+                    jq_path='["books","zhlhh",'"$books_index"',"fav"]'
+                    JQ update "$ebooks_config" false
+                fi
             done
             Println "$info 已取消收藏\n"
         fi
diff --git a/utils/inquirer b/utils/inquirer
index 4a2d055..bad7981 100644
--- a/utils/inquirer
+++ b/utils/inquirer
@@ -20,7 +20,7 @@ inquirer()
         local var=("$1"[@])
         if [[ -z ${!var:-} ]] 
         then
-            return 0
+            return
         fi
         local join_list=("${!var}") first=true item
         for item in "${join_list[@]}"
@@ -36,7 +36,7 @@ inquirer()
     }
 
     inquirer:on_default() {
-        return 0
+        return
     }
 
     inquirer:on_keypress() {
@@ -76,7 +76,7 @@ inquirer()
                 # The space is the first printable character listed on http://www.asciitable.com/, ~ is the last
                 # [^ -~]
                 *[$'\x80'-$'\xFF']*) 
-                    if [[ ${BASH_VERSINFO[0]} -lt 4 ]] && [ "$option" == "text_input" ] 
+                    if [[ ${BASH_VERSINFO[0]} -lt 4 ]] 
                     then
                         char_read="${char_read:-}$key"
                         LC_ALL= LANG=C
@@ -146,6 +146,46 @@ inquirer()
     }
 
     inquirer:on_checkbox_input_up() {
+        if [ "$checkbox_input_search" = true ] 
+        then
+            tput cub "$(tput cols)"
+            tput el
+            tput cuu1
+            tput el
+            tput cuu1
+            tput el
+
+            stty -echo
+            tput civis
+
+            local i
+
+            for((i=0;i<checkbox_page_list_count;i++));
+            do
+                if [ "$i" = "$current_index" ] 
+                then
+                    if [ "${checkbox_page_selected[i]}" = true ]
+                    then
+                        inquirer:print "${cyan}${arrow}${green}${checked}${normal} ${checkbox_page_list[i]}\n"
+                    else
+                        inquirer:print "${cyan}${arrow}${normal}${unchecked} ${checkbox_page_list[i]}\n"
+                    fi
+                else
+                    if [ "${checkbox_page_selected[i]}" = true ]
+                    then
+                        inquirer:print " ${green}${checked}${normal} ${checkbox_page_list[i]}\n"
+                    else
+                        inquirer:print " ${unchecked} ${checkbox_page_list[i]}\n"
+                    fi
+                fi
+            done
+
+            tput cuu $((checkbox_page_list_count-current_index))
+
+            checkbox_input_search=false
+            return
+        fi
+
         inquirer:remove_instructions
         tput cub "$(tput cols)"
 
@@ -176,6 +216,11 @@ inquirer()
     }
 
     inquirer:on_checkbox_input_down() {
+        if [ "$checkbox_input_search" = true ] 
+        then
+            return
+        fi
+
         inquirer:remove_instructions
         tput cub "$(tput cols)"
 
@@ -211,6 +256,12 @@ inquirer()
             return
         fi
 
+        if [ "$checkbox_input_search" = true ] 
+        then
+            inquirer:on_text_input_left
+            return
+        fi
+
         local i
 
         if [ "$checkbox_pages_index" -eq 0 ] 
@@ -307,6 +358,12 @@ inquirer()
             return
         fi
 
+        if [ "$checkbox_input_search" = true ] 
+        then
+            inquirer:on_text_input_right
+            return
+        fi
+
         local i
 
         if [ "$checkbox_pages_index" -eq $((checkbox_pages_count-1)) ] 
@@ -416,6 +473,41 @@ inquirer()
     inquirer:on_checkbox_input_enter() {
         local i
 
+        if [ "$checkbox_input_search" = true ] 
+        then
+            if [ -n "$text_input" ] 
+            then
+                tput cub "$(tput cols)"
+                tput el
+                tput cuu1
+                tput el
+                tput cuu1
+                tput el
+                tput cuu1
+                tput el
+
+                local checkbox_list_page
+
+                for i in "${!checkbox_list[@]}"
+                do
+                    if [[ "${checkbox_list[i]}" =~ "$text_input" ]] 
+                    then
+                        checkbox_list_page=$((i/checkbox_list_perpage+1))
+                        inquirer:print "${green}P${checkbox_list_page}${normal} ${checkbox_list[i]}\n"
+                    fi
+                done
+
+                if [ -n "${checkbox_list_page:-}" ] 
+                then
+                    tput cud1
+                fi
+
+                inquirer:print "${green}?${normal} ${bold}${bg_black}${white}${prompt} ${checkbox_pages_tip:-}${dim}`gettext \"(按 <space> 选择, <enter> 确认)\"`${normal}\n\n\n"
+            fi
+            inquirer:on_checkbox_input_up
+            return
+        fi
+
         if [ "$checkbox_input_page" = true ] 
         then
             checkbox_input_page=false
@@ -424,7 +516,7 @@ inquirer()
                 if [ "$checkbox_input_page_num" -gt "$checkbox_pages_count" ] || [ "$checkbox_input_page_num" -eq $((checkbox_pages_index+1)) ]
                 then
                     checkbox_input_page_num=""
-                    return 0
+                    return
                 fi
 
                 checkbox_pages_index=$((checkbox_input_page_num-1))
@@ -516,7 +608,7 @@ inquirer()
 
                 checkbox_input_page_num=""
             fi
-            return 0
+            return
         fi
 
         for i in "${!checkbox_list[@]}"
@@ -555,6 +647,12 @@ inquirer()
     }
 
     inquirer:on_checkbox_input_space() {
+        if [ "$checkbox_input_search" = true ] 
+        then
+            inquirer:on_text_input_ascii
+            return
+        fi
+
         local i
 
         inquirer:remove_instructions
@@ -607,13 +705,80 @@ inquirer()
 
     inquirer:on_checkbox_input_ascii() {
         local key=$1
-        case "$key" in
-            "w" ) inquirer:on_checkbox_input_up;;
-            "s" ) inquirer:on_checkbox_input_down;;
-            "a" ) inquirer:on_checkbox_input_left;;
-            "d" ) inquirer:on_checkbox_input_right;;
-            [0-9Pp] ) inquirer:on_checkbox_input_page "$1";;
-        esac
+
+        if [ "$checkbox_input_search" = false ] 
+        then
+            case "$key" in
+                "w" ) 
+                    inquirer:on_checkbox_input_up
+                    return
+                ;;
+                "s" ) 
+                    inquirer:on_checkbox_input_down
+                    return
+                ;;
+                "a" ) 
+                    inquirer:on_checkbox_input_left
+                    return
+                ;;
+                "d" ) 
+                    inquirer:on_checkbox_input_right
+                    return
+                ;;
+            esac
+            if [ "$key" == "/" ]
+            then
+                if [ "$checkbox_pages_count" -eq 1 ] 
+                then
+                    return
+                fi
+
+                checkbox_input_search=true
+                text_input=""
+                current_pos=0
+
+                tput cub "$(tput cols)"
+                tput cud $((checkbox_list_perpage-current_index+1))
+
+                for((i=0;i<=checkbox_list_perpage;i++));
+                do
+                    tput el
+                    tput cuu1
+                done
+
+                tput el
+                tput cud1
+
+                inquirer:print "${green}?${normal} ${bold}${bg_black}${white}输入搜索内容${bold} ${dim}( \xe2\x86\x91 返回)${normal}\n"
+
+                stty -echo
+                tput cnorm
+            elif [[ "$key" =~ [0-9Pp] ]]
+            then
+                inquirer:on_checkbox_input_page "$key"
+            fi
+            return
+        fi
+
+        inquirer:on_text_input_ascii "$key"
+    }
+
+    inquirer:on_checkbox_input_not_ascii() {
+        if [ "$checkbox_input_search" = false ] 
+        then
+            return
+        fi
+
+        inquirer:on_text_input_not_ascii "$1"
+    }
+
+    inquirer:on_checkbox_input_backspace() {
+        if [ "$checkbox_input_search" = false ] 
+        then
+            return
+        fi
+
+        inquirer:on_text_input_backspace
     }
 
     inquirer:_checkbox_input() {
@@ -627,7 +792,8 @@ inquirer()
             checkbox_selected_options=("${checkbox_list[@]}")
             checkbox_selected_indices=(0)
 
-            return 0
+            inquirer:print "${green}?${normal} ${bold}${bg_black}${white}${prompt} ${bg_black}${cyan}$(inquirer:join checkbox_selected_options)${normal}\n"
+            return
         fi
 
         checkbox_selected=()
@@ -721,7 +887,7 @@ inquirer()
 
         tput cuu $checkbox_page_list_count
 
-        inquirer:on_keypress inquirer:on_checkbox_input_up inquirer:on_checkbox_input_down inquirer:on_checkbox_input_space inquirer:on_checkbox_input_enter inquirer:on_checkbox_input_left inquirer:on_checkbox_input_right inquirer:on_checkbox_input_ascii
+        inquirer:on_keypress inquirer:on_checkbox_input_up inquirer:on_checkbox_input_down inquirer:on_checkbox_input_space inquirer:on_checkbox_input_enter inquirer:on_checkbox_input_left inquirer:on_checkbox_input_right inquirer:on_checkbox_input_ascii inquirer:on_checkbox_input_backspace inquirer:on_checkbox_input_not_ascii
     }
 
     inquirer:checkbox_input() {
@@ -751,7 +917,7 @@ inquirer()
     inquirer:on_sort_up() {
         if [ "${#sort_options[@]}" -eq 1 ]
         then
-            return 0
+            return
         fi
 
         tput cub "$(tput cols)"
@@ -775,7 +941,7 @@ inquirer()
     inquirer:on_sort_down() {
         if [ "${#sort_options[@]}" -eq 1 ]
         then
-            return 0
+            return
         fi
 
         tput cub "$(tput cols)"
@@ -799,7 +965,7 @@ inquirer()
     inquirer:on_sort_move_up() {
         if [ "${#sort_options[@]}" -eq 1 ]
         then
-            return 0
+            return
         fi
 
         local i
@@ -834,7 +1000,7 @@ inquirer()
     inquirer:on_sort_move_down() {
         if [ "${#sort_options[@]}" -eq 1 ]
         then
-            return 0
+            return
         fi
 
         local i
@@ -951,7 +1117,7 @@ inquirer()
 
         if [ "${#list_options[@]}" -eq 1 ]
         then
-            return 0
+            return
         fi
 
         tput cub "$(tput cols)"
@@ -977,7 +1143,7 @@ inquirer()
 
         if [ "${#list_options[@]}" -eq 1 ]
         then
-            return 0
+            return
         fi
 
         tput cub "$(tput cols)"
@@ -1030,7 +1196,7 @@ inquirer()
 
         if [ "${#list_options[@]}" -eq 1 ] 
         then
-            return 0
+            return
         fi
 
         first_keystroke=true
@@ -1235,7 +1401,7 @@ inquirer()
     }
 
     inquirer:text_input_default_validator() {
-        return 0
+        return
     }
 
     inquirer:text_input() {
@@ -1276,7 +1442,7 @@ inquirer()
         then
             return 1
         fi
-        return 0
+        return
     }
 
     inquirer:remove_date_instructions() {
@@ -1345,7 +1511,7 @@ inquirer()
         case $current_pos in
             3)  
                 local year=$((${date_pick:0:4}-1))
-                [ "$year" -eq 2020 ] && return 0
+                [ "$year" -eq 2020 ] && return
                 date_pick="$year${date_pick:4}"
             ;;
             6) 
@@ -1592,6 +1758,7 @@ inquirer()
     checkbox_page_select_all=true \
     checkbox_input_page=false \
     checkbox_input_page_num \
+    checkbox_input_search=false \
     checkbox_pages_tip \
     checkbox_pages_arrows="\xe2\x9d\xae\xe2\x9d\xaf" \
     checkbox_pages_index=0 \