Merge 23f09bf26c into 49c8094b53

Issue Description:

When sdcv found multiple items, whatever your choice is, sdcv will add
double the current history entries to history file. For example, if
current history is "a\nb", you search akjk and there's multiple results,
whatever you choose, even -1,  after this is done, the history file will
be rewritten to "a\nb\nakjk\na\nb", note here \n is newline character.
So if you have 1000 lines of history, you search akjk and there's
multiple results, you choose -1, after done there's 2001 lines of
history.

How to reproduce:

You can download this dictionary file
https://github.com/skywind3000/ECDICT/releases/download/1.0.28/ecdict-stardict-28.zip
and put into your dictionary directory, on Arch, with AUR, you can
install from https://aur.archlinux.org/packages/stardict-ecdict. Then,
make sure you also add the dictionary name to ~/.config/sdcv_ordering if
you have one. Add some lines to your history file if you do not have.
Then search for "akjk" with sdcv, e,g, `sdcv akjk`, then it will prompt
you to choose, you can choose -1, then ctrl-d to exit. Expected result
is history file add akjk at the end. Actual result is history file now
contain original content + akjk + original content duplicate as I
described in the issue description.

Fix and reasons:

I'm a hobbyist and I'm not a professional, I haven't use C++ for years
so many of my writings is very likely wrong. After some trail and error,
I found that call read_history() multiple times will add repeat
histories to history lists. In the commit d2327e2, a new IReadLine
object is created (note name changes, also note I know this description
of a IReadLine object is wrong). Here's a permalink:
49c8094b53/src/libwrapper.cpp (L418).
The problem of this new IReadLine object `choice_readline` is it called
read_history() again from ./src/readline.cpp constructor, because
there's already a IReadLine object `io` constructed at ./src/sdcv.cpp.
When read_history() is called twice, there's a "history lists" read from
history file first then append from history file again, so when you
destruct IReadLine object with write_history() in ./src/readline.cpp,
the history file contain duplicate content after write. Here are
permalinks:
49c8094b53/src/readline.cpp (L88),
and
49c8094b53/src/readline.cpp (L94).

So my fix is to just to use `io` IReadLine object and not to create a
new `choice_readline` object.

Misc:

During my trial and errors process, I made an example code to show
read_history()'s weird behavior. I did not dig deeper, I just guess
maybe there's some kind of werid history list as mentioned in
https://tiswww.cwru.edu/php/chet/readline/history.html#History-List-Management.

Here's the example code a.c, note you need to include stdio.h,
readline/history.h, and readline/readline.h. I did not include them here
because commit message seems will make them comment.
```c
...
int main (void)
{
	rl_readline_name="learn_readline";
	using_history();
	read_history("/home/xyz/test/learn_readline/history.txt");
	write_history("/home/xyz/test/learn_readline/history2.txt");
	{
		rl_readline_name="learn_readline";
		using_history();
		read_history("/home/xyz/test/learn_readline/history.txt");
		write_history("/home/xyz/test/learn_readline/history3.txt");
	}
	write_history("/home/xyz/test/learn_readline/history4.txt");
	return 0;
}
```
Here's the content of history.txt:
```
a
b
```
After build and run, as you can guess, history2.txt is same as
history.txt. But history3.txt and history4.txt content are:
```
a
b
a
b
```

Signed-off-by: Xiao Pan <xyz@flylightning.xyz>

.github/workflows/main.yml

@@ -20,12 +20,15 @@ jobs:
       fail-fast: true
 
       matrix:
-        os: [ubuntu-22.04, ubuntu-latest]
+        os: [ubuntu-20.04, ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4
-      - uses: jwlawson/actions-setup-cmake@v2
+      - uses: actions/checkout@v3
         with:
-          cmake-version: '3.10'
+          submodules: 'recursive'
+      - uses: jwlawson/actions-setup-cmake@v1.4
+        if: matrix.os != 'ubuntu-latest'
+        with:
+          cmake-version: '3.5.1'
           github-api-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Check versions
         run: |
@@ -34,10 +37,6 @@ jobs:
           gcc --version
           echo "end of versions checking"
         shell: bash
-      - uses: awalsh128/cache-apt-pkgs-action@v1
-        with:
-          packages: libglib2.0-dev
-          version: 1.0
       - name: Run tests
         run: |
           set -e

CMakeLists.txt

@@ -1,8 +1,8 @@
-cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
-cmake_policy(VERSION 3.10)
-
 project(sdcv)
 
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+cmake_policy(VERSION 3.5)
+
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_CXX_EXTENSIONS False)
@@ -27,8 +27,7 @@ if (WITH_READLINE)
   find_path(READLINE_INCLUDE_DIR readline/readline.h)
   find_library(READLINE_LIBRARY NAMES readline)
   if (NOT (READLINE_INCLUDE_DIR AND READLINE_LIBRARY))
-    message(STATUS "readline library not FOUND, disable it's usage")
-    set(WITH_READLINE False CACHE BOOL "Use readline library" FORCE)
+    set(WITH_READLINE False CACHE FORCE)
   endif ()
 endif (WITH_READLINE)
 
@@ -83,13 +82,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
 include_directories(
 	${ZLIB_INCLUDE_DIR}
 	${GLIB2_INCLUDE_DIRS}
+	${READLINE_INCLUDE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/src/lib
 	${CMAKE_CURRENT_BINARY_DIR}
-      )
-
-if (WITH_READLINE)
-  include_directories(${READLINE_INCLUDE_DIR})
-endif()
+)
 
 #
 # Packing stuff
@@ -111,10 +107,8 @@ add_executable(sdcv ${sdcv_SRCS})
 target_link_libraries(sdcv
   ${GLIB2_LIBRARIES}
   ${ZLIB_LIBRARIES}
+  ${READLINE_LIBRARY}
 )
-if (WITH_READLINE)
-  target_link_libraries(sdcv ${READLINE_LIBRARY})
-endif()
 if (ENABLE_NLS)
   set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "locale")
 endif ()

README.org

@@ -29,26 +29,6 @@ To report bugs use https://github.com/Dushistov/sdcv/issues ,
 if it is not possible you can report it via email to dushistov at mail dot ru.
 Be sure to include the word "sdcv" somewhere in the "Subject:" field.
 
-* Integration with [[https://github.com/junegunn/fzf][fzf]]
-Useful when you have multiple dictionaries
-#+BEGIN_SRC sh
-fzf --prompt="Dict: " \
-    --phony \
-    --bind "enter:reload(sdcv {q} -n --json | jq '.[].dict' -r)" \
-    --preview "sdcv {q} -en --use-dict={}" \
-    --preview-window=wrap \
-   < <(echo)
-#+END_SRC
-
-* Integration with readline
-This lines can be added to inputrc file (~/.inputrc, /etc/inputrc),
-to abort multiply usage with ESC:
-#+begin_src
-$if sdcv
-    "\e\e": "-1\n"
-$endif
-#+end_src
-
 * Notes to developer
 ** make source code release
 #+BEGIN_SRC sh

po/ka.po

@@ -1,147 +0,0 @@
-# Georgian translation for sdcv.
-# Copyright (C) 2025 sdcv authors
-# This file is distributed under the same license as the sdcv project.
-# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2025.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: sdcv 0.5\n"
-"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
-"POT-Creation-Date: 2020-08-14 12:58+0300\n"
-"PO-Revision-Date: 2025-01-26 03:17+0100\n"
-"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
-"Language-Team: Georgian <(nothing)>\n"
-"Language: ka\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.5\n"
-
-#: ../src/libwrapper.cpp:300
-msgid "popen failed"
-msgstr "popen ჩავარდა"
-
-#: ../src/libwrapper.cpp:341
-#, c-format
-msgid "Can not convert %s to utf8.\n"
-msgstr "%s-ის utf8-ში გადაყვანა შეუძლებელია.\n"
-
-#: ../src/libwrapper.cpp:399 ../src/libwrapper.cpp:433
-#, c-format
-msgid "Found %zu items, similar to %s.\n"
-msgstr "აღმოჩენილია %zu ელემენტი, რომელიც %s-ს ჰგავს.\n"
-
-#: ../src/libwrapper.cpp:417
-msgid "Your choice[-1 to abort]: "
-msgstr "თქვენი არჩევანი[-1 გასაუქმებლად]: "
-
-#: ../src/libwrapper.cpp:427
-#, c-format
-msgid ""
-"Invalid choice.\n"
-"It must be from 0 to %zu or -1.\n"
-msgstr ""
-"არასწორი არჩევანი.\n"
-"უნდა იყოს 0-დან %zu-მდე, ან -1.\n"
-
-#: ../src/libwrapper.cpp:446
-#, c-format
-msgid "Nothing similar to %s, sorry :(\n"
-msgstr "%s-ს არაფერი ჰგავს :(\n"
-
-#: ../src/sdcv.cpp:89
-msgid "display version information and exit"
-msgstr "ვერსიის ჩვენება და გასვლა"
-
-#: ../src/sdcv.cpp:91
-msgid "display list of available dictionaries and exit"
-msgstr "ხელმისაწვდომი ლექსიკონების ჩვენება და გასვლა"
-
-#: ../src/sdcv.cpp:93
-msgid "for search use only dictionary with this bookname"
-msgstr "ძებნისთვის, მხოლოდ, ამ სახელის მქონე ლექსიკონის გამოყენება"
-
-#: ../src/sdcv.cpp:94
-msgid "bookname"
-msgstr "ლექსიკონის_სახელი"
-
-#: ../src/sdcv.cpp:96
-msgid "for use in scripts"
-msgstr "სკრიპტებში გამოსაყენებლად"
-
-#: ../src/sdcv.cpp:98
-msgid "print the result formatted as JSON"
-msgstr "შედეგების JSON ფორმატში გამოტანა"
-
-#: ../src/sdcv.cpp:100
-msgid "do not fuzzy-search for similar words, only return exact matches"
-msgstr ""
-"მსგავსი სიტყვებისთვის არაზუსტი ძებნა გამოყენებული არ იქნება. "
-"დაბრუნდება, მხოლოდ, ზუსტი დამთხვევები"
-
-#: ../src/sdcv.cpp:102
-msgid "output must be in utf8"
-msgstr "გამოტანა utf8-ში უნდა იყოს"
-
-#: ../src/sdcv.cpp:104
-msgid "input of sdcv in utf8"
-msgstr "პროგრამაში შეყვანა utf8 -ში"
-
-#: ../src/sdcv.cpp:106
-msgid "use this directory as path to stardict data directory"
-msgstr ""
-"ამ საქაღალდის გამოყენება stardict-ის მონაცემების საქაღალდის ბილიკად"
-
-#: ../src/sdcv.cpp:107
-msgid "path/to/dir"
-msgstr "ბილიკი/სასურველ/საქაღალდემდე"
-
-#: ../src/sdcv.cpp:109
-msgid ""
-"only use the dictionaries in data-dir, do not search in user and system "
-"directories"
-msgstr ""
-"ლექსიკონების, მხოლოდ, data-dir-დან გამოყენება. მომხმარებლის და სისტემურ "
-"საქაღალდეებში ძებნა არ მოხდება"
-
-#: ../src/sdcv.cpp:111
-msgid "colorize the output"
-msgstr "ფერებში გამოტანა"
-
-#: ../src/sdcv.cpp:116
-msgid " words"
-msgstr " სიტყვა"
-
-#: ../src/sdcv.cpp:122
-#, c-format
-msgid "Invalid command line arguments: %s\n"
-msgstr "არასწორი ბრძანების სტრიქონის არგუმენტები: %s\n"
-
-#: ../src/sdcv.cpp:128
-#, c-format
-msgid "Console version of Stardict, version %s\n"
-msgstr "Startdict-ის კონსოლის ვერსია. ვერსია %s\n"
-
-#: ../src/sdcv.cpp:206
-#, c-format
-msgid "g_mkdir failed: %s\n"
-msgstr "g_mkdir ჩავარდა: %s\n"
-
-#: ../src/sdcv.cpp:222
-msgid "Enter word or phrase: "
-msgstr "შეიყვანეთ სიტყვა ან ფრაზა: "
-
-#: ../src/sdcv.cpp:230
-#, c-format
-msgid "There are no words/phrases to translate.\n"
-msgstr "სათარგმნი სიტყვების/ფრაზების გარეშე.\n"
-
-#: ../src/sdcv.cpp:242
-#, c-format
-msgid "Dictionary's name   Word count\n"
-msgstr "ლექსიკონის სახელი     სიტყვების რაოდენობა\n"
-
-#: ../src/utils.cpp:48
-#, c-format
-msgid "Can not convert %s to current locale.\n"
-msgstr "ვერ გადავიყვანე %s მიმდინარე ლოკალში.\n"

src/libwrapper.cpp

@@ -23,7 +23,6 @@
 #endif
 
 #include <cstring>
-#include <cstdio> //for popen
 #include <map>
 #include <memory>
 

src/stardict_lib.cpp

@@ -989,7 +989,7 @@ bool Dict::LookupWithRule(GPatternSpec *pspec, glong *aIndex, int iBuffLen)
     int iIndexCount = 0;
 
     for (guint32 i = 0; i < narticles() && iIndexCount < (iBuffLen - 1); i++)
-        if (g_pattern_spec_match_string(pspec, get_key(i)))
+        if (g_pattern_match_string(pspec, get_key(i)))
             aIndex[iIndexCount++] = i;
 
     aIndex[iIndexCount] = -1; // -1 is the end.
@@ -1047,12 +1047,12 @@ bool Libs::LookupSimilarWord(const gchar *sWord, std::set<glong> &iWordIndices,
         }
         // Upper the first character and lower others.
         if (!bFound) {
-            const gchar *rest = g_utf8_next_char(sWord);
-            gchar *firstchar = g_utf8_strup(sWord, rest - sWord);
-            gchar *rest_lowercase = g_utf8_strdown(rest, -1);
-            casestr =  g_strconcat(firstchar, rest_lowercase, nullptr);
-            g_free(rest_lowercase);
+            gchar *nextchar = g_utf8_next_char(sWord);
+            gchar *firstchar = g_utf8_strup(sWord, nextchar - sWord);
+            nextchar = g_utf8_strdown(nextchar, -1);
+            casestr = g_strdup_printf("%s%s", firstchar, nextchar);
             g_free(firstchar);
+            g_free(nextchar);
             if (strcmp(casestr, sWord)) {
                 if (oLib[iLib]->Lookup(casestr, iWordIndices))
                     bFound = true;