mega_venik/sdcv
1
0
Fork 0
mirror of https://github.com/Dushistov/sdcv.git synced 2025-12-15 17:31:56 +00:00
Code Issues Projects Releases Wiki Activity

fix: do not give interactive menu via pager

Browse Source 
fixes #28
This commit is contained in:
Evgeniy A. Dushistov
2017-08-09 07:41:33 +03:00
parent d5698bdf33
commit d0c0a0837f
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/libwrapper.cpp
View File

@@ -286,12 +286,13 @@ void Library::print_search_result(FILE *out, const TSearchResult & res, bool &fi
} }
namespace { namespace {
class sdcv_pager { class sdcv_pager final {
public: public:
sdcv_pager(bool ignore_env = false) { explicit sdcv_pager(bool ignore_env = false) {
output = stdout; output = stdout;
if (ignore_env) if (ignore_env) {
return; return;
}
const gchar *pager = g_getenv("SDCV_PAGER"); const gchar *pager = g_getenv("SDCV_PAGER");
if (pager && (output = popen(pager, "w")) == nullptr) { if (pager && (output = popen(pager, "w")) == nullptr) {
perror(_("popen failed")); perror(_("popen failed"));
@@ -301,8 +302,9 @@ namespace {
sdcv_pager(const sdcv_pager&) = delete; sdcv_pager(const sdcv_pager&) = delete;
sdcv_pager& operator=(const sdcv_pager&) = delete; sdcv_pager& operator=(const sdcv_pager&) = delete;
~sdcv_pager() { ~sdcv_pager() {
if (output != stdout) if (output != stdout) {
pclose(output); pclose(output);
}
} }
FILE *get_stream() { return output; } FILE *get_stream() { return output; }
private: private:
@@ -360,10 +362,9 @@ bool Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
/*nothing*/; /*nothing*/;
} }
sdcv_pager pager(force);
bool first_result = true; bool first_result = true;
if(json_) { if (json_) {
fputc('[', pager.get_stream()); fputc('[', stdout);
} }
if (!res_list.empty()) { if (!res_list.empty()) {
/* try to be more clever, if there are /* try to be more clever, if there are
@@ -389,9 +390,10 @@ bool Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
}//if (!force) }//if (!force)
if (!show_all_results && !force) { if (!show_all_results && !force) {
if(!json_) if (!json_) {
printf(_("Found %zu items, similar to %s.\n"), res_list.size(), printf(_("Found %zu items, similar to %s.\n"), res_list.size(),
utf8_output_ ? get_impl(str) : utf8_to_locale_ign_err(get_impl(str)).c_str()); utf8_output_ ? get_impl(str) : utf8_to_locale_ign_err(get_impl(str)).c_str());
}
for (size_t i = 0; i < res_list.size(); ++i) { for (size_t i = 0; i < res_list.size(); ++i) {
const std::string loc_bookname = utf8_to_locale_ign_err(res_list[i].bookname); const std::string loc_bookname = utf8_to_locale_ign_err(res_list[i].bookname);
const std::string loc_def = utf8_to_locale_ign_err(res_list[i].def); const std::string loc_def = utf8_to_locale_ign_err(res_list[i].def);
@@ -410,6 +412,7 @@ bool Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
choice_readline->read(_("Your choice[-1 to abort]: "), str_choise); choice_readline->read(_("Your choice[-1 to abort]: "), str_choise);
sscanf(str_choise.c_str(), "%d", &choise); sscanf(str_choise.c_str(), "%d", &choise);
if (choise >= 0 && choise < int(res_list.size())) { if (choise >= 0 && choise < int(res_list.size())) {
sdcv_pager pager;
io.add_to_history(res_list[choise].def.c_str()); io.add_to_history(res_list[choise].def.c_str());
print_search_result(pager.get_stream(), res_list[choise], first_result); print_search_result(pager.get_stream(), res_list[choise], first_result);
break; break;
@@ -420,12 +423,14 @@ bool Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
res_list.size()-1); res_list.size()-1);
} }
} else { } else {
for (const TSearchResult& search_res : res_list) { sdcv_pager pager(force || json_);
if(!json_) if (!json_) {
fprintf(pager.get_stream(), _("Found %zu items, similar to %s.\n"), fprintf(pager.get_stream(), _("Found %zu items, similar to %s.\n"),
res_list.size(), utf8_output_ ? get_impl(str) : utf8_to_locale_ign_err(get_impl(str)).c_str()); res_list.size(), utf8_output_ ? get_impl(str) : utf8_to_locale_ign_err(get_impl(str)).c_str());
print_search_result(pager.get_stream(), search_res, first_result); }
} for (const TSearchResult& search_res : res_list) {
print_search_result(pager.get_stream(), search_res, first_result);
}
} }
} else { } else {
@@ -436,8 +441,8 @@ bool Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
printf(_("Nothing similar to %s, sorry :(\n"), utf8_output_ ? get_impl(str) : loc_str.c_str()); printf(_("Nothing similar to %s, sorry :(\n"), utf8_output_ ? get_impl(str) : loc_str.c_str());
} }
if(json_) { if (json_) {
fputs("]\n", pager.get_stream()); fputs("]\n", stdout);
} }
return true; return true;
} }