mirror of
https://github.com/Dushistov/sdcv.git
synced 2025-12-15 17:31:56 +00:00
Compare commits
39 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
49c8094b53 | ||
|
|
4346e65bd3 | ||
|
|
d144e0310c | ||
|
|
6e36e7730c | ||
|
|
abe5e9e72f | ||
|
|
488ec68854 | ||
|
|
b698445ead | ||
|
|
504e7807e6 | ||
|
|
6c80bf2d99 | ||
|
|
8742575c33 | ||
|
|
b294b76fb5 | ||
|
|
823ec3d840 | ||
|
|
6ab8b51e6c | ||
|
|
881657b336 | ||
|
|
911fc2f561 | ||
|
|
f488f5350b | ||
|
|
e72220e748 | ||
|
|
b77c0e793a | ||
|
|
ebaa6f2136 | ||
|
|
d054adb37c | ||
|
|
4a9b1dae3d | ||
|
|
6d385221d0 | ||
|
|
3d15ce3b07 | ||
|
|
51338ac5bb | ||
|
|
5ada75e08d | ||
|
|
c7d9944f7d | ||
|
|
3963e358cd | ||
|
|
3b26731b02 | ||
|
|
070a9fb0bd | ||
|
|
8f096629ec | ||
|
|
25768c6b80 | ||
|
|
4ae4207349 | ||
|
|
994c1c7ae6 | ||
|
|
d38f8f13c9 | ||
|
|
cc7bcb8b73 | ||
|
|
8e9f72ae57 | ||
|
|
88af1a077c | ||
|
|
b66799f358 | ||
|
|
be5c3a35bf |
@@ -15,7 +15,7 @@ BreakBeforeBinaryOperators: true
|
|||||||
BreakBeforeTernaryOperators: true
|
BreakBeforeTernaryOperators: true
|
||||||
BreakConstructorInitializersBeforeComma: true
|
BreakConstructorInitializersBeforeComma: true
|
||||||
BinPackParameters: true
|
BinPackParameters: true
|
||||||
ColumnLimit: 0
|
ColumnLimit: 120
|
||||||
ConstructorInitializerAllOnOneLineOrOnePerLine: false
|
ConstructorInitializerAllOnOneLineOrOnePerLine: false
|
||||||
DerivePointerAlignment: false
|
DerivePointerAlignment: false
|
||||||
ExperimentalAutoDetectBinPacking: false
|
ExperimentalAutoDetectBinPacking: false
|
||||||
|
|||||||
7
.github/workflows/main.yml
vendored
7
.github/workflows/main.yml
vendored
@@ -20,12 +20,13 @@ jobs:
|
|||||||
fail-fast: true
|
fail-fast: true
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest]
|
os: [ubuntu-20.04, ubuntu-latest]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
submodules: 'recursive'
|
submodules: 'recursive'
|
||||||
- uses: jwlawson/actions-setup-cmake@v1.0
|
- uses: jwlawson/actions-setup-cmake@v1.4
|
||||||
|
if: matrix.os != 'ubuntu-latest'
|
||||||
with:
|
with:
|
||||||
cmake-version: '3.5.1'
|
cmake-version: '3.5.1'
|
||||||
github-api-token: ${{ secrets.GITHUB_TOKEN }}
|
github-api-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
@@ -3,6 +3,10 @@ project(sdcv)
|
|||||||
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
|
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
|
||||||
cmake_policy(VERSION 3.5)
|
cmake_policy(VERSION 3.5)
|
||||||
|
|
||||||
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
||||||
|
set(CMAKE_CXX_EXTENSIONS False)
|
||||||
|
|
||||||
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler.cmake")
|
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler.cmake")
|
||||||
|
|
||||||
set(ZLIB_FIND_REQUIRED True)
|
set(ZLIB_FIND_REQUIRED True)
|
||||||
@@ -91,7 +95,7 @@ set(CPACK_PACKAGE_VENDOR "Evgeniy Dushistov <dushistov@mail.ru>")
|
|||||||
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.org")
|
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.org")
|
||||||
set(CPACK_PACKAGE_VERSION_MAJOR "0")
|
set(CPACK_PACKAGE_VERSION_MAJOR "0")
|
||||||
set(CPACK_PACKAGE_VERSION_MINOR "5")
|
set(CPACK_PACKAGE_VERSION_MINOR "5")
|
||||||
set(CPACK_PACKAGE_VERSION_PATCH "3")
|
set(CPACK_PACKAGE_VERSION_PATCH "5")
|
||||||
|
|
||||||
set(sdcv_VERSION
|
set(sdcv_VERSION
|
||||||
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
|
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
|
||||||
@@ -143,5 +147,7 @@ if (BUILD_TESTS)
|
|||||||
add_sdcv_shell_test(t_utf8input)
|
add_sdcv_shell_test(t_utf8input)
|
||||||
add_sdcv_shell_test(t_datadir)
|
add_sdcv_shell_test(t_datadir)
|
||||||
add_sdcv_shell_test(t_return_code)
|
add_sdcv_shell_test(t_return_code)
|
||||||
|
add_sdcv_shell_test(t_multiple_results)
|
||||||
|
add_sdcv_shell_test(t_newlines_in_ifo)
|
||||||
|
|
||||||
endif (BUILD_TESTS)
|
endif (BUILD_TESTS)
|
||||||
|
|||||||
12
NEWS
12
NEWS
@@ -1,3 +1,13 @@
|
|||||||
|
Version 0.5.5
|
||||||
|
- Avoid crashes when passing unknown dicts to the -u flag (by NiLuJe)
|
||||||
|
- Use off_t for stuff mainly assigned to a stat.st_size value
|
||||||
|
Version 0.5.4
|
||||||
|
- Use binary search for synonyms
|
||||||
|
- Various improvments in work with synonyms
|
||||||
|
- Added --json (same as --json-output) to match man
|
||||||
|
- Show all matched result
|
||||||
|
- More robust parsing of ifo file
|
||||||
|
- Prevent crash if file size of files not matched expecting one for .oft files
|
||||||
Version 0.5.3
|
Version 0.5.3
|
||||||
- Use single quotes around JSON data to reduce need for escaping
|
- Use single quotes around JSON data to reduce need for escaping
|
||||||
- Store integer magic in cache file
|
- Store integer magic in cache file
|
||||||
@@ -36,7 +46,7 @@ Version 0.4.2
|
|||||||
* Russian translation update
|
* Russian translation update
|
||||||
|
|
||||||
Version 0.4.1
|
Version 0.4.1
|
||||||
* Recreate cache if idx file was modified
|
* Recreate cache if idx file was modified
|
||||||
* Abbility to use pager(SDCV_PAGER)
|
* Abbility to use pager(SDCV_PAGER)
|
||||||
* Add Chinese (traditional) translation
|
* Add Chinese (traditional) translation
|
||||||
* Add Ukrainian translation
|
* Add Ukrainian translation
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
#+OPTIONS: ^:nil
|
#+OPTIONS: ^:nil
|
||||||
[[https://github.com/Dushistov/sdcv/actions?query=workflow%3ACI+branch%3Amaster][https://github.com/Dushistov/sdcv/workflows/CI/badge.svg]]
|
[[https://github.com/Dushistov/sdcv/actions?query=workflow%3ACI+branch%3Amaster][https://github.com/Dushistov/sdcv/workflows/CI/badge.svg]]
|
||||||
[[https://github.com/Dushistov/sdcv/blob/master/LICENSE][https://img.shields.io/badge/license-GPL%202-brightgreen.svg]]
|
[[https://github.com/Dushistov/sdcv/blob/master/LICENSE][https://img.shields.io/badge/license-GPL%202-brightgreen.svg]]
|
||||||
|
|
||||||
|
* sdcv
|
||||||
|
*sdcv* is a simple, cross-platform, text-based utility for working with dictionaries in [[http://stardict-4.sourceforge.net/][StarDict]] format.
|
||||||
* How to compile and install
|
* How to compile and install
|
||||||
#+BEGIN_SRC sh
|
#+BEGIN_SRC sh
|
||||||
mkdir /tmp/build-sdcv
|
mkdir /tmp/build-sdcv
|
||||||
|
|||||||
@@ -16,19 +16,6 @@ if (NOT DEFINED SDCV_COMPILER_IS_GCC_COMPATIBLE)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (MSVC AND (MSVC_VERSION LESS 1900))
|
|
||||||
message(FATAL_ERROR "MSVC version ${MSVC_VERSION} have no full c++11 support")
|
|
||||||
elseif (MSVC)
|
|
||||||
add_definitions(-DNOMINMAX)
|
|
||||||
elseif (NOT MSVC)
|
|
||||||
check_cxx_compiler_flag("-std=c++11" CXX_SUPPORTS_CXX11)
|
|
||||||
if (CXX_SUPPORTS_CXX11)
|
|
||||||
append("-std=c++11" CMAKE_CXX_FLAGS)
|
|
||||||
else ()
|
|
||||||
message(FATAL_ERROR "sdcv requires C++11 support but the '-std=c++11' flag isn't supported.")
|
|
||||||
endif()
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (SDCV_COMPILER_IS_GCC_COMPATIBLE)
|
if (SDCV_COMPILER_IS_GCC_COMPATIBLE)
|
||||||
append("-Wall" "-Wextra" "-Wformat-security" "-Wcast-align" "-Werror=format" "-Wcast-qual" CMAKE_C_FLAGS)
|
append("-Wall" "-Wextra" "-Wformat-security" "-Wcast-align" "-Werror=format" "-Wcast-qual" CMAKE_C_FLAGS)
|
||||||
append("-Wall" "-pedantic" "-Wextra" "-Wformat-security" "-Wcast-align" "-Werror=format" "-Wcast-qual" CMAKE_CXX_FLAGS)
|
append("-Wall" "-pedantic" "-Wextra" "-Wformat-security" "-Wcast-align" "-Werror=format" "-Wcast-qual" CMAKE_CXX_FLAGS)
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
const char *start; /* start of mmap'd area */
|
const char *start; /* start of mmap'd area */
|
||||||
const char *end; /* end of mmap'd area */
|
const char *end; /* end of mmap'd area */
|
||||||
unsigned long size; /* size of mmap */
|
off_t size; /* size of mmap */
|
||||||
|
|
||||||
int type;
|
int type;
|
||||||
z_stream zStream;
|
z_stream zStream;
|
||||||
@@ -47,7 +47,7 @@ private:
|
|||||||
std::string origFilename;
|
std::string origFilename;
|
||||||
std::string comment;
|
std::string comment;
|
||||||
unsigned long crc;
|
unsigned long crc;
|
||||||
unsigned long length;
|
off_t length;
|
||||||
unsigned long compressedLength;
|
unsigned long compressedLength;
|
||||||
DictCache cache[DICT_CACHE_SIZE];
|
DictCache cache[DICT_CACHE_SIZE];
|
||||||
MapFile mapfile;
|
MapFile mapfile;
|
||||||
|
|||||||
@@ -199,14 +199,18 @@ static std::string parse_data(const gchar *data, bool colorize_output)
|
|||||||
|
|
||||||
void Library::SimpleLookup(const std::string &str, TSearchResultList &res_list)
|
void Library::SimpleLookup(const std::string &str, TSearchResultList &res_list)
|
||||||
{
|
{
|
||||||
glong ind;
|
std::set<glong> wordIdxs;
|
||||||
res_list.reserve(ndicts());
|
res_list.reserve(ndicts());
|
||||||
for (gint idict = 0; idict < ndicts(); ++idict)
|
for (gint idict = 0; idict < ndicts(); ++idict) {
|
||||||
if (SimpleLookupWord(str.c_str(), ind, idict))
|
wordIdxs.clear();
|
||||||
res_list.push_back(
|
if (SimpleLookupWord(str.c_str(), wordIdxs, idict))
|
||||||
TSearchResult(dict_name(idict),
|
for (auto &wordIdx : wordIdxs)
|
||||||
poGetWord(ind, idict),
|
res_list.push_back(
|
||||||
parse_data(poGetWordData(ind, idict), colorize_output_)));
|
TSearchResult(dict_name(idict),
|
||||||
|
poGetWord(wordIdx, idict),
|
||||||
|
parse_data(poGetWordData(wordIdx, idict),
|
||||||
|
colorize_output_)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Library::LookupWithFuzzy(const std::string &str, TSearchResultList &res_list)
|
void Library::LookupWithFuzzy(const std::string &str, TSearchResultList &res_list)
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
#ifdef HAVE_MMAP
|
#ifdef HAVE_MMAP
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
@@ -21,13 +22,13 @@ public:
|
|||||||
~MapFile();
|
~MapFile();
|
||||||
MapFile(const MapFile &) = delete;
|
MapFile(const MapFile &) = delete;
|
||||||
MapFile &operator=(const MapFile &) = delete;
|
MapFile &operator=(const MapFile &) = delete;
|
||||||
bool open(const char *file_name, unsigned long file_size);
|
bool open(const char *file_name, off_t file_size);
|
||||||
gchar *begin() { return data; }
|
gchar *begin() { return data; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
char *data = nullptr;
|
char *data = nullptr;
|
||||||
unsigned long size = 0ul;
|
|
||||||
#ifdef HAVE_MMAP
|
#ifdef HAVE_MMAP
|
||||||
|
size_t size = 0u;
|
||||||
int mmap_fd = -1;
|
int mmap_fd = -1;
|
||||||
#elif defined(_WIN32)
|
#elif defined(_WIN32)
|
||||||
HANDLE hFile = 0;
|
HANDLE hFile = 0;
|
||||||
@@ -35,25 +36,31 @@ private:
|
|||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
inline bool MapFile::open(const char *file_name, unsigned long file_size)
|
inline bool MapFile::open(const char *file_name, off_t file_size)
|
||||||
{
|
{
|
||||||
size = file_size;
|
|
||||||
#ifdef HAVE_MMAP
|
#ifdef HAVE_MMAP
|
||||||
if ((mmap_fd = ::open(file_name, O_RDONLY)) < 0) {
|
if ((mmap_fd = ::open(file_name, O_RDONLY)) < 0) {
|
||||||
//g_print("Open file %s failed!\n",fullfilename);
|
// g_print("Open file %s failed!\n",fullfilename);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
data = (gchar *)mmap(nullptr, file_size, PROT_READ, MAP_SHARED, mmap_fd, 0);
|
struct stat st;
|
||||||
|
if (fstat(mmap_fd, &st) == -1 || st.st_size < 0 || (st.st_size == 0 && S_ISREG(st.st_mode))
|
||||||
|
|| st.st_size != file_size) {
|
||||||
|
close(mmap_fd);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
size = static_cast<size_t>(st.st_size);
|
||||||
|
data = (gchar *)mmap(nullptr, size, PROT_READ, MAP_SHARED, mmap_fd, 0);
|
||||||
if ((void *)data == (void *)(-1)) {
|
if ((void *)data == (void *)(-1)) {
|
||||||
//g_print("mmap file %s failed!\n",idxfilename);
|
// g_print("mmap file %s failed!\n",idxfilename);
|
||||||
|
size = 0u;
|
||||||
data = nullptr;
|
data = nullptr;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#elif defined(_WIN32)
|
#elif defined(_WIN32)
|
||||||
hFile = CreateFile(file_name, GENERIC_READ, 0, nullptr, OPEN_ALWAYS,
|
hFile = CreateFile(file_name, GENERIC_READ, 0, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
|
||||||
FILE_ATTRIBUTE_NORMAL, 0);
|
hFileMap = CreateFileMapping(hFile, nullptr, PAGE_READONLY, 0, file_size, nullptr);
|
||||||
hFileMap = CreateFileMapping(hFile, nullptr, PAGE_READONLY, 0,
|
|
||||||
file_size, nullptr);
|
|
||||||
data = (gchar *)MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, file_size);
|
data = (gchar *)MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, file_size);
|
||||||
#else
|
#else
|
||||||
gsize read_len;
|
gsize read_len;
|
||||||
|
|||||||
42
src/sdcv.cpp
42
src/sdcv.cpp
@@ -83,6 +83,7 @@ try {
|
|||||||
glib::CharStr opt_data_dir;
|
glib::CharStr opt_data_dir;
|
||||||
gboolean only_data_dir = FALSE;
|
gboolean only_data_dir = FALSE;
|
||||||
gboolean colorize = FALSE;
|
gboolean colorize = FALSE;
|
||||||
|
glib::StrArr word_list;
|
||||||
|
|
||||||
const GOptionEntry entries[] = {
|
const GOptionEntry entries[] = {
|
||||||
{ "version", 'v', 0, G_OPTION_ARG_NONE, &show_version,
|
{ "version", 'v', 0, G_OPTION_ARG_NONE, &show_version,
|
||||||
@@ -96,6 +97,8 @@ try {
|
|||||||
_("for use in scripts"), nullptr },
|
_("for use in scripts"), nullptr },
|
||||||
{ "json-output", 'j', 0, G_OPTION_ARG_NONE, &json_output,
|
{ "json-output", 'j', 0, G_OPTION_ARG_NONE, &json_output,
|
||||||
_("print the result formatted as JSON"), nullptr },
|
_("print the result formatted as JSON"), nullptr },
|
||||||
|
{ "json", 'j', 0, G_OPTION_ARG_NONE, &json_output,
|
||||||
|
_("print the result formatted as JSON"), nullptr },
|
||||||
{ "exact-search", 'e', 0, G_OPTION_ARG_NONE, &no_fuzzy,
|
{ "exact-search", 'e', 0, G_OPTION_ARG_NONE, &no_fuzzy,
|
||||||
_("do not fuzzy-search for similar words, only return exact matches"), nullptr },
|
_("do not fuzzy-search for similar words, only return exact matches"), nullptr },
|
||||||
{ "utf8-output", '0', 0, G_OPTION_ARG_NONE, &utf8_output,
|
{ "utf8-output", '0', 0, G_OPTION_ARG_NONE, &utf8_output,
|
||||||
@@ -109,11 +112,13 @@ try {
|
|||||||
_("only use the dictionaries in data-dir, do not search in user and system directories"), nullptr },
|
_("only use the dictionaries in data-dir, do not search in user and system directories"), nullptr },
|
||||||
{ "color", 'c', 0, G_OPTION_ARG_NONE, &colorize,
|
{ "color", 'c', 0, G_OPTION_ARG_NONE, &colorize,
|
||||||
_("colorize the output"), nullptr },
|
_("colorize the output"), nullptr },
|
||||||
|
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, get_addr(word_list),
|
||||||
|
_("search terms"), _(" words") },
|
||||||
{},
|
{},
|
||||||
};
|
};
|
||||||
|
|
||||||
glib::Error error;
|
glib::Error error;
|
||||||
GOptionContext *context = g_option_context_new(_(" words"));
|
GOptionContext *context = g_option_context_new(nullptr);
|
||||||
g_option_context_set_help_enabled(context, TRUE);
|
g_option_context_set_help_enabled(context, TRUE);
|
||||||
g_option_context_add_main_entries(context, entries, nullptr);
|
g_option_context_add_main_entries(context, entries, nullptr);
|
||||||
const gboolean parse_res = g_option_context_parse(context, &argc, &argv, get_addr(error));
|
const gboolean parse_res = g_option_context_parse(context, &argc, &argv, get_addr(error));
|
||||||
@@ -181,10 +186,13 @@ try {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// add bookname to list
|
// add bookname to list
|
||||||
gchar **p = get_impl(use_dict_list);
|
for (gchar **p = get_impl(use_dict_list); *p != nullptr; ++p) {
|
||||||
while (*p) {
|
auto it = bookname_to_ifo.find(*p);
|
||||||
order_list.push_back(bookname_to_ifo.at(*p));
|
if (it != bookname_to_ifo.end()) {
|
||||||
++p;
|
order_list.push_back(it->second);
|
||||||
|
} else {
|
||||||
|
fprintf(stderr, _("Unknown dictionary: %s\n"), *p);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
std::string ordering_cfg_file = std::string(g_get_user_config_dir()) + G_DIR_SEPARATOR_S "sdcv_ordering";
|
std::string ordering_cfg_file = std::string(g_get_user_config_dir()) + G_DIR_SEPARATOR_S "sdcv_ordering";
|
||||||
@@ -196,7 +204,12 @@ try {
|
|||||||
if (ordering_file != nullptr) {
|
if (ordering_file != nullptr) {
|
||||||
std::string line;
|
std::string line;
|
||||||
while (stdio_getline(ordering_file, line)) {
|
while (stdio_getline(ordering_file, line)) {
|
||||||
order_list.push_back(bookname_to_ifo.at(line));
|
auto it = bookname_to_ifo.find(line);
|
||||||
|
if (it != bookname_to_ifo.end()) {
|
||||||
|
order_list.push_back(it->second);
|
||||||
|
} else {
|
||||||
|
fprintf(stderr, _("Unknown dictionary: %s\n"), line.c_str());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
fclose(ordering_file);
|
fclose(ordering_file);
|
||||||
}
|
}
|
||||||
@@ -210,14 +223,19 @@ try {
|
|||||||
lib.load(dicts_dir_list, order_list, disable_list);
|
lib.load(dicts_dir_list, order_list, disable_list);
|
||||||
|
|
||||||
std::unique_ptr<IReadLine> io(create_readline_object());
|
std::unique_ptr<IReadLine> io(create_readline_object());
|
||||||
if (optind < argc) {
|
if (word_list != nullptr) {
|
||||||
search_result rval = SEARCH_SUCCESS;
|
search_result rval = SEARCH_SUCCESS;
|
||||||
for (int i = optind; i < argc; ++i)
|
gchar **p = get_impl(word_list);
|
||||||
if ((rval = lib.process_phrase(argv[i], *io, non_interactive)) != SEARCH_SUCCESS) {
|
while (*p) {
|
||||||
return rval;
|
search_result this_rval = lib.process_phrase(*p++, *io, non_interactive);
|
||||||
}
|
// If we encounter any error, save it but continue through the word
|
||||||
|
// list to check all requested words.
|
||||||
|
if (rval == SEARCH_SUCCESS)
|
||||||
|
rval = this_rval;
|
||||||
|
}
|
||||||
|
if (rval != SEARCH_SUCCESS)
|
||||||
|
return rval;
|
||||||
} else if (!non_interactive) {
|
} else if (!non_interactive) {
|
||||||
|
|
||||||
std::string phrase;
|
std::string phrase;
|
||||||
while (io->read(_("Enter word or phrase: "), phrase)) {
|
while (io->read(_("Enter word or phrase: "), phrase)) {
|
||||||
if (lib.process_phrase(phrase.c_str(), *io) == SEARCH_FAILURE)
|
if (lib.process_phrase(phrase.c_str(), *io) == SEARCH_FAILURE)
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,11 +1,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <cstdio>
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <map>
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <set>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
@@ -29,7 +28,7 @@ inline void set_uint32(gchar *addr, guint32 val)
|
|||||||
struct cacheItem {
|
struct cacheItem {
|
||||||
guint32 offset;
|
guint32 offset;
|
||||||
gchar *data;
|
gchar *data;
|
||||||
//write code here to make it inline
|
// write code here to make it inline
|
||||||
cacheItem() { data = nullptr; }
|
cacheItem() { data = nullptr; }
|
||||||
~cacheItem() { g_free(data); }
|
~cacheItem() { g_free(data); }
|
||||||
};
|
};
|
||||||
@@ -67,7 +66,7 @@ private:
|
|||||||
gint cache_cur = 0;
|
gint cache_cur = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
//this structure contain all information about dictionary
|
// this structure contain all information about dictionary
|
||||||
struct DictInfo {
|
struct DictInfo {
|
||||||
std::string ifo_file_name;
|
std::string ifo_file_name;
|
||||||
guint32 wordcount;
|
guint32 wordcount;
|
||||||
@@ -78,8 +77,8 @@ struct DictInfo {
|
|||||||
std::string website;
|
std::string website;
|
||||||
std::string date;
|
std::string date;
|
||||||
std::string description;
|
std::string description;
|
||||||
guint32 index_file_size;
|
off_t index_file_size;
|
||||||
guint32 syn_file_size;
|
off_t syn_file_size;
|
||||||
std::string sametypesequence;
|
std::string sametypesequence;
|
||||||
|
|
||||||
bool load_from_ifo_file(const std::string &ifofilename, bool istreedict);
|
bool load_from_ifo_file(const std::string &ifofilename, bool istreedict);
|
||||||
@@ -92,21 +91,31 @@ public:
|
|||||||
guint32 wordentry_size;
|
guint32 wordentry_size;
|
||||||
|
|
||||||
virtual ~IIndexFile() {}
|
virtual ~IIndexFile() {}
|
||||||
virtual bool load(const std::string &url, gulong wc, gulong fsize, bool verbose) = 0;
|
virtual bool load(const std::string &url, gulong wc, off_t fsize, bool verbose) = 0;
|
||||||
virtual const gchar *get_key(glong idx) = 0;
|
virtual const gchar *get_key(glong idx) = 0;
|
||||||
virtual void get_data(glong idx) = 0;
|
virtual void get_data(glong idx) = 0;
|
||||||
virtual const gchar *get_key_and_data(glong idx) = 0;
|
virtual const gchar *get_key_and_data(glong idx) = 0;
|
||||||
virtual bool lookup(const char *str, glong &idx) = 0;
|
virtual bool lookup(const char *str, std::set<glong> &idxs, glong &next_idx) = 0;
|
||||||
|
virtual bool lookup(const char *str, std::set<glong> &idxs)
|
||||||
|
{
|
||||||
|
glong unused_next_idx;
|
||||||
|
return lookup(str, idxs, unused_next_idx);
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
class SynFile
|
class SynFile
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
SynFile() {}
|
||||||
|
~SynFile() {}
|
||||||
bool load(const std::string &url, gulong wc);
|
bool load(const std::string &url, gulong wc);
|
||||||
bool lookup(const char *str, glong &idx);
|
bool lookup(const char *str, std::set<glong> &idxs, glong &next_idx);
|
||||||
|
bool lookup(const char *str, std::set<glong> &idxs);
|
||||||
|
const gchar *get_key(glong idx) { return synlist[idx]; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::map<std::string, gulong> synonyms;
|
MapFile synfile;
|
||||||
|
std::vector<gchar *> synlist;
|
||||||
};
|
};
|
||||||
|
|
||||||
class Dict : public DictBase
|
class Dict : public DictBase
|
||||||
@@ -133,7 +142,12 @@ public:
|
|||||||
*offset = idx_file->wordentry_offset;
|
*offset = idx_file->wordentry_offset;
|
||||||
*size = idx_file->wordentry_size;
|
*size = idx_file->wordentry_size;
|
||||||
}
|
}
|
||||||
bool Lookup(const char *str, glong &idx);
|
bool Lookup(const char *str, std::set<glong> &idxs, glong &next_idx);
|
||||||
|
bool Lookup(const char *str, std::set<glong> &idxs)
|
||||||
|
{
|
||||||
|
glong unused_next_idx;
|
||||||
|
return Lookup(str, idxs, unused_next_idx);
|
||||||
|
}
|
||||||
|
|
||||||
bool LookupWithRule(GPatternSpec *pspec, glong *aIndex, int iBuffLen);
|
bool LookupWithRule(GPatternSpec *pspec, glong *aIndex, int iBuffLen);
|
||||||
|
|
||||||
@@ -146,7 +160,7 @@ private:
|
|||||||
std::unique_ptr<IIndexFile> idx_file;
|
std::unique_ptr<IIndexFile> idx_file;
|
||||||
std::unique_ptr<SynFile> syn_file;
|
std::unique_ptr<SynFile> syn_file;
|
||||||
|
|
||||||
bool load_ifofile(const std::string &ifofilename, gulong &idxfilesize);
|
bool load_ifofile(const std::string &ifofilename, off_t &idxfilesize);
|
||||||
};
|
};
|
||||||
|
|
||||||
class Libs
|
class Libs
|
||||||
@@ -155,7 +169,7 @@ public:
|
|||||||
Libs(std::function<void(void)> f = std::function<void(void)>())
|
Libs(std::function<void(void)> f = std::function<void(void)>())
|
||||||
{
|
{
|
||||||
progress_func = f;
|
progress_func = f;
|
||||||
iMaxFuzzyDistance = MAX_FUZZY_DISTANCE; //need to read from cfg.
|
iMaxFuzzyDistance = MAX_FUZZY_DISTANCE; // need to read from cfg.
|
||||||
}
|
}
|
||||||
void setVerbose(bool verbose) { verbose_ = verbose; }
|
void setVerbose(bool verbose) { verbose_ = verbose; }
|
||||||
void setFuzzy(bool fuzzy) { fuzzy_ = fuzzy; }
|
void setFuzzy(bool fuzzy) { fuzzy_ = fuzzy; }
|
||||||
@@ -181,15 +195,12 @@ public:
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
return oLib[iLib]->get_data(iIndex);
|
return oLib[iLib]->get_data(iIndex);
|
||||||
}
|
}
|
||||||
const gchar *poGetCurrentWord(glong *iCurrent);
|
bool LookupWord(const gchar *sWord, std::set<glong> &iWordIndices, int iLib)
|
||||||
const gchar *poGetNextWord(const gchar *word, glong *iCurrent);
|
|
||||||
const gchar *poGetPreWord(glong *iCurrent);
|
|
||||||
bool LookupWord(const gchar *sWord, glong &iWordIndex, int iLib)
|
|
||||||
{
|
{
|
||||||
return oLib[iLib]->Lookup(sWord, iWordIndex);
|
return oLib[iLib]->Lookup(sWord, iWordIndices);
|
||||||
}
|
}
|
||||||
bool LookupSimilarWord(const gchar *sWord, glong &iWordIndex, int iLib);
|
bool LookupSimilarWord(const gchar *sWord, std::set<glong> &iWordIndices, int iLib);
|
||||||
bool SimpleLookupWord(const gchar *sWord, glong &iWordIndex, int iLib);
|
bool SimpleLookupWord(const gchar *sWord, std::set<glong> &iWordIndices, int iLib);
|
||||||
|
|
||||||
bool LookupWithFuzzy(const gchar *sWord, gchar *reslist[], gint reslist_size);
|
bool LookupWithFuzzy(const gchar *sWord, gchar *reslist[], gint reslist_size);
|
||||||
gint LookupWithRule(const gchar *sWord, gchar *reslist[]);
|
gint LookupWithRule(const gchar *sWord, gchar *reslist[]);
|
||||||
|
|||||||
0
tests/not-unix-newlines-ifo/russian/russian.dict
Normal file
0
tests/not-unix-newlines-ifo/russian/russian.dict
Normal file
0
tests/not-unix-newlines-ifo/russian/russian.idx
Normal file
0
tests/not-unix-newlines-ifo/russian/russian.idx
Normal file
9
tests/not-unix-newlines-ifo/russian/russian.ifo
Normal file
9
tests/not-unix-newlines-ifo/russian/russian.ifo
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
StarDict's dict ifo file
|
||||||
|
version=3.0.0
|
||||||
|
bookname=Russian-English Dictionary (ru-en)
|
||||||
|
wordcount=415144
|
||||||
|
idxfilesize=12344255
|
||||||
|
sametypesequence=h
|
||||||
|
synwordcount=1277580
|
||||||
|
author=Vuizur
|
||||||
|
description=
|
||||||
0
tests/not-unix-newlines-ifo/russian/russian.syn
Normal file
0
tests/not-unix-newlines-ifo/russian/russian.syn
Normal file
BIN
tests/stardict-test_multiple_results-2.4.2/test.dict
Normal file
BIN
tests/stardict-test_multiple_results-2.4.2/test.dict
Normal file
Binary file not shown.
BIN
tests/stardict-test_multiple_results-2.4.2/test.idx
Normal file
BIN
tests/stardict-test_multiple_results-2.4.2/test.idx
Normal file
Binary file not shown.
7
tests/stardict-test_multiple_results-2.4.2/test.ifo
Normal file
7
tests/stardict-test_multiple_results-2.4.2/test.ifo
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
StarDict's dict ifo file
|
||||||
|
version=3.0.0
|
||||||
|
bookname=Test multiple results
|
||||||
|
wordcount=246
|
||||||
|
idxfilesize=5977
|
||||||
|
synwordcount=124
|
||||||
|
description=
|
||||||
BIN
tests/stardict-test_multiple_results-2.4.2/test.syn
Normal file
BIN
tests/stardict-test_multiple_results-2.4.2/test.syn
Normal file
Binary file not shown.
@@ -18,8 +18,15 @@ test_json() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
test_json '[{"name": "Test synonyms", "wordcount": "2"},{"name": "Sample 1 test dictionary", "wordcount": "1"},{"name": "test_dict", "wordcount": "1"}]' -x -j -l -n --data-dir "$TEST_DIR"
|
test_json '[{"name": "Russian-English Dictionary (ru-en)", "wordcount": "415144"},
|
||||||
|
{"name": "Test synonyms", "wordcount": "2"},
|
||||||
|
{"name": "Test multiple results", "wordcount": "246"},
|
||||||
|
{"name": "Sample 1 test dictionary", "wordcount": "1"},
|
||||||
|
{"name": "test_dict", "wordcount": "1"}]' -x -j -l -n --data-dir "$TEST_DIR"
|
||||||
test_json '[{"dict": "Test synonyms","word":"test","definition":"\u000aresult of test"}]' -x -j -n --data-dir "$TEST_DIR" foo
|
test_json '[{"dict": "Test synonyms","word":"test","definition":"\u000aresult of test"}]' -x -j -n --data-dir "$TEST_DIR" foo
|
||||||
test_json '[]' -x -j -n --data-dir "$TEST_DIR" foobarbaaz
|
test_json '[]' -x -j -n --data-dir "$TEST_DIR" foobarbaaz
|
||||||
|
|
||||||
|
# Test multiple searches, with the first failing.
|
||||||
|
test_json '[][{"dict": "Test synonyms","word":"test","definition":"\u000aresult of test"}]' -x -j -n --data-dir "$TEST_DIR" foobarbaaz foo
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
67
tests/t_multiple_results
Executable file
67
tests/t_multiple_results
Executable file
@@ -0,0 +1,67 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
SDCV="$1"
|
||||||
|
TEST_DIR="$2"
|
||||||
|
|
||||||
|
unset SDCV_PAGER
|
||||||
|
unset STARDICT_DATA_DIR
|
||||||
|
|
||||||
|
test_json() {
|
||||||
|
word="$1"
|
||||||
|
jq_cmp="$2"
|
||||||
|
result="$("$SDCV" --data-dir "$TEST_DIR" -exjn "$word" | sed 's|\\n|\\u000a|g')"
|
||||||
|
cmp_result="$(echo "$result" | jq "$jq_cmp")"
|
||||||
|
if [ "$cmp_result" != "true" ]; then
|
||||||
|
echo "expected '$jq_cmp' to return true, but $result didn't"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Basic two-result search for the same headword.
|
||||||
|
test_json bark \
|
||||||
|
'. == [
|
||||||
|
{"dict":"Test multiple results","word":"bark","definition":"\u000aThe harsh sound made by a dog."},
|
||||||
|
{"dict":"Test multiple results","word":"bark","definition":"\u000aThe tough outer covering of trees and other woody plants."}
|
||||||
|
]'
|
||||||
|
|
||||||
|
# Multi-result search where one word exists as both a synyonym and a separate
|
||||||
|
# headword. This ensures that if there is a matching synyonym we don't skip the
|
||||||
|
# regular search.
|
||||||
|
test_json cat \
|
||||||
|
'. == [
|
||||||
|
{"dict":"Test multiple results","word":"cat","definition":"\u000aA cute animal which (rarely) barks."},
|
||||||
|
{"dict":"Test multiple results","word":"lion","definition":"\u000aA larger cat which might bite your head off."},
|
||||||
|
{"dict":"Test multiple results","word":"panther","definition":"\u000aI know very little about panthers, sorry."}
|
||||||
|
]'
|
||||||
|
|
||||||
|
# Many-result search for a word that matches 120 distinct headwords.
|
||||||
|
test_json many_headwords 'length == 120'
|
||||||
|
test_json many_headwords 'all(.word == "many_headwords")'
|
||||||
|
test_json many_headwords \
|
||||||
|
'to_entries | map(.value.definition == "\u000aDefinition for [many_headwords] entry #\(.key+1) (same headword).") | all'
|
||||||
|
|
||||||
|
# Many-result search for 120 words that have the same synonym.
|
||||||
|
test_json many_synonyms 'length == 120'
|
||||||
|
test_json many_synonyms \
|
||||||
|
'to_entries | map(.value.word == "many_synonyms-\(.key+101)") | all'
|
||||||
|
test_json many_synonyms \
|
||||||
|
'to_entries | map(.value.definition == "\u000aDefinition for [many_synonyms-\(.key+101)] (same synonym).") | all'
|
||||||
|
|
||||||
|
# Ensure that we don't return more than one result even if a word can be
|
||||||
|
# resolved in more than one way.
|
||||||
|
#
|
||||||
|
# Most well-formed dictionaries don't have entries like this (it basically
|
||||||
|
# requires you to have a dictionary where there is a synonym that is identical
|
||||||
|
# to a word's headword or multiple identical synyonym entries).
|
||||||
|
#
|
||||||
|
# This entry was created by creating extra synonyms with different names then
|
||||||
|
# modifying the .syn file manually.
|
||||||
|
test_json many_resolution_paths \
|
||||||
|
'. == [
|
||||||
|
{"dict":"Test multiple results","word":"many_resolution_paths",
|
||||||
|
"definition":"\u000aDefinition for [many_resolution_paths] headword (same word, multiple synonym entries)."}
|
||||||
|
]'
|
||||||
|
|
||||||
|
exit 0
|
||||||
18
tests/t_newlines_in_ifo
Executable file
18
tests/t_newlines_in_ifo
Executable file
@@ -0,0 +1,18 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
PATH_TO_SDCV="$1"
|
||||||
|
TEST_DIR="$2"
|
||||||
|
|
||||||
|
unset SDCV_PAGER
|
||||||
|
unset STARDICT_DATA_DIR
|
||||||
|
|
||||||
|
RES=$("$PATH_TO_SDCV" -n -x --data-dir="$TEST_DIR/not-unix-newlines-ifo" -l | tail -n 1)
|
||||||
|
|
||||||
|
if [ "$RES" = "Russian-English Dictionary (ru-en) 415144" ]; then
|
||||||
|
exit 0
|
||||||
|
else
|
||||||
|
echo "test failed, unexpected result: $RES" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
Reference in New Issue
Block a user