mega_venik/sdcv
1
0
Fork 0
mirror of https://github.com/Dushistov/sdcv.git synced 2025-12-16 18:01:54 +00:00
Code Issues Projects Releases Wiki Activity

c++11 for readline + libwrapper

Browse Source
This commit is contained in:
Evgeniy Dushistov
2013-07-06 22:44:11 +00:00
parent 7274a61efa
commit 3812fad586
4 changed files with 116 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/libwrapper.cpp
View File

@@ -67,7 +67,7 @@ static std::string xdxf2text(const char *p)
res+="";
else if (name=="k") {
const char *begin=next;
if ((next=strstr(begin, "</k>"))!=NULL)
if ((next=strstr(begin, "</k>"))!=nullptr)
next+=sizeof("</k>")-1-1;
else
next=begin;
@@ -199,7 +199,7 @@ void Library::LookupWithRule(const string &str, TSearchResultList& res_list)
{
std::vector<gchar *> match_res((MAX_MATCH_ITEM_PER_LIB) * ndicts());
gint nfound=Libs::LookupWithRule(str.c_str(), &match_res[0]);
const gint nfound = Libs::LookupWithRule(str.c_str(), &match_res[0]);
if (!nfound)
return;
@@ -237,6 +237,7 @@ void Library::print_search_result(FILE *out, const TSearchResult & res)
utf8_output ? res.exp.c_str() : loc_exp.c_str());
}
namespace {
class sdcv_pager {
public:
sdcv_pager(bool ignore_env=false) {
@@ -244,11 +245,13 @@ public:
if (ignore_env)
return;
const gchar *pager = g_getenv("SDCV_PAGER");
if (pager && (output=popen(pager, "w"))==NULL) {
if (pager && (output = popen(pager, "w")) == nullptr) {
perror(_("popen failed"));
output = stdout;
}
}
sdcv_pager(const sdcv_pager&) = delete;
sdcv_pager& operator=(const sdcv_pager&) = delete;
~sdcv_pager() {
if (output != stdout)
fclose(output);
@@ -257,31 +260,29 @@ public:
private:
FILE *output;
};
}
bool Library::process_phrase(const char *loc_str, read_line &io, bool force)
bool Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
{
if (NULL==loc_str)
if (nullptr==loc_str)
return true;
std::string query;
analyze_query(loc_str, query);
if (!query.empty())
io.add_to_history(query.c_str());
gsize bytes_read;
gsize bytes_written;
GError *err=NULL;
char *str=NULL;
GError *err = nullptr;
char *str = nullptr;
if (!utf8_input)
str = g_locale_to_utf8(loc_str, -1, &bytes_read, &bytes_written, &err);
else
str = g_strdup(loc_str);
if (NULL==str) {
if (nullptr==str) {
fprintf(stderr, _("Can not convert %s to utf8.\n"), loc_str);
fprintf(stderr, "%s\n", err->message);
g_error_free(err);
@@ -291,10 +292,8 @@ bool Library::process_phrase(const char *loc_str, read_line &io, bool force)
if (str[0]=='\0')
return true;
TSearchResultList res_list;
switch (analyze_query(str, query)) {
case qtFUZZY:
LookupWithFuzzy(query, res_list);
@@ -322,12 +321,11 @@ bool Library::process_phrase(const char *loc_str, read_line &io, bool force)
typedef std::map< string, int, std::less<string> > DictResMap;
if (!force) {
DictResMap res_per_dict;
for(TSearchResultList::iterator ptr=res_list.begin(); ptr!=res_list.end(); ++ptr){
std::pair<DictResMap::iterator, DictResMap::iterator> r =
res_per_dict.equal_range(ptr->bookname);
for (const TSearchResult& search_res : res_list) {
auto r = res_per_dict.equal_range(search_res.bookname);
DictResMap tmp(r.first, r.second);
if (tmp.empty()) //there are no yet such bookname in map
res_per_dict.insert(DictResMap::value_type(ptr->bookname, 1));
res_per_dict.insert(DictResMap::value_type(search_res.bookname, 1));
else {
++((tmp.begin())->second);
if (tmp.begin()->second > 1) {
@@ -342,17 +340,16 @@ bool Library::process_phrase(const char *loc_str, read_line &io, bool force)
printf(_("Found %zu items, similar to %s.\n"), res_list.size(),
utf8_output ? str : utf8_to_locale_ign_err(str).c_str());
for (size_t i = 0; i < res_list.size(); ++i) {
string loc_bookname, loc_def;
loc_bookname=utf8_to_locale_ign_err(res_list[i].bookname);
loc_def=utf8_to_locale_ign_err(res_list[i].def);
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);
printf("%zu)%s-->%s\n", i,
utf8_output ? res_list[i].bookname.c_str() : loc_bookname.c_str(),
utf8_output ? res_list[i].def.c_str() : loc_def.c_str());
}
int choise;
std::auto_ptr<read_line> choice_readline(create_readline_object());
std::unique_ptr<IReadLine> choice_readline(create_readline_object());
for (;;) {
string str_choise;
std::string str_choise;
choice_readline->read(_("Your choice[-1 to abort]: "), str_choise);
sscanf(str_choise.c_str(), "%d", &choise);
if (choise >= 0 && choise < int(res_list.size())) {
@@ -369,8 +366,8 @@ bool Library::process_phrase(const char *loc_str, read_line &io, bool force)
sdcv_pager pager(force);
fprintf(pager.get_stream(), _("Found %zu items, similar to %s.\n"),
res_list.size(), utf8_output ? str : utf8_to_locale_ign_err(str).c_str());
for (PSearchResult ptr=res_list.begin(); ptr!=res_list.end(); ++ptr)
print_search_result(pager.get_stream(), *ptr);
for (const TSearchResult& search_res : res_list)
print_search_result(pager.get_stream(), search_res);
}
} else {

11
src/libwrapper.hpp
View File

@@ -1,11 +1,10 @@
#ifndef _LIBWRAPPER_HPP_
#define _LIBWRAPPER_HPP_
#pragma once
#include <string>
#include <vector>
#include "file.hpp"
#include "lib.h"
#include "lib.hpp"
#include "readline.hpp"
using std::string;
@@ -24,8 +23,7 @@ struct TSearchResult {
}
};
typedef vector<TSearchResult> TSearchResultList;
typedef TSearchResultList::iterator PSearchResult;
typedef std::vector<TSearchResult> TSearchResultList;
//this class is wrapper around Dicts class for easy use
//of it
@@ -34,7 +32,7 @@ public:
Library(bool uinput, bool uoutput) :
utf8_input(uinput), utf8_output(uoutput) {}
bool process_phrase(const char *loc_str, read_line &io, bool force=false);
bool process_phrase(const char *loc_str, IReadLine &io, bool force=false);
private:
bool utf8_input, utf8_output;
@@ -45,4 +43,3 @@ private:
void print_search_result(FILE *out, const TSearchResult & res);
};
#endif//!_LIBWRAPPER_HPP_

44
src/readline.cpp
View File

@@ -35,41 +35,40 @@
#include "readline.hpp"
#ifndef WITH_READLINE
namespace {
static bool stdio_getline(FILE *in, std::string & str)
{
str.clear();
int ch;
while ((ch=fgetc(in)) != EOF && ch != '\n')
str += ch;
if (EOF==ch)
return false;
return true;
return EOF != ch;
}
class dummy_readline : public read_line {
class dummy_readline : public IReadLine {
public:
bool read(const string& banner, string& line) {
bool read(const string& banner, string& line) override {
printf("%s", banner.c_str());
return stdio_getline(stdin, line);
}
};
}
#else
class real_readline : public read_line {
namespace {
class real_readline : public IReadLine {
public:
real_readline()
{
real_readline() {
rl_readline_name = "sdcv";
using_history();
string histname=(string(g_get_home_dir())+G_DIR_SEPARATOR+".sdcv_history");
read_history(histname.c_str());;
const std::string histname = std::string(g_get_home_dir()) + G_DIR_SEPARATOR + ".sdcv_history";
read_history(histname.c_str());
}
~real_readline()
{
string histname=(string(g_get_home_dir())+G_DIR_SEPARATOR+".sdcv_history");
~real_readline() {
const std::string histname = std::string(g_get_home_dir()) + G_DIR_SEPARATOR + ".sdcv_history";
write_history(histname.c_str());
const gchar *hist_size_str=g_getenv("SDCV_HISTSIZE");
int hist_size;
@@ -77,9 +76,9 @@ public:
hist_size = 2000;
history_truncate_file(histname.c_str(), hist_size);
}
bool read(const string &banner, string& line)
{
char *phrase=NULL;
bool read(const std::string &banner, std::string& line) override {
char *phrase = nullptr;
phrase = readline(banner.c_str());
if (phrase) {
line = phrase;
@@ -88,12 +87,15 @@ public:
}
return false;
}
void add_to_history(const std::string& phrase) { add_history(phrase.c_str()); }
};
void add_to_history(const std::string& phrase) override {
add_history(phrase.c_str());
}
};
}
#endif//WITH_READLINE
read_line *create_readline_object()
IReadLine *create_readline_object()
{
#ifdef WITH_READLINE
return new real_readline;

16
src/readline.hpp
View File

@@ -1,16 +1,14 @@
#ifndef _READLINE_HPP_
#define _READLINE_HPP_
#pragma once
#include <string>
using std::string;
class read_line {
class IReadLine {
public:
virtual ~read_line() {}
virtual bool read(const string &banner, string& line)=0;
virtual ~IReadLine() {}
virtual bool read(const std::string &banner, std::string& line) = 0;
virtual void add_to_history(const std::string& phrase) {}
};
extern string sdcv_readline;
extern read_line *create_readline_object();
#endif//!_READLINE_HPP_
extern std::string sdcv_readline;
extern IReadLine *create_readline_object();