tastytea
/
remwharead
1
0
Fork 0
Code Issues 1 Pull Requests Releases 37 Activity

Merge branch 'develop' into main
continuous-integration/drone/push Build is passing Details

This commit is contained in:
tastytea 2020-01-27 06:55:05 +01:00
parent a28d674ac0 8a4f518cb9
commit ee4debb005
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
19 changed files with 96 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.clang-tidy
View File

@ -5,6 +5,7 @@
Checks: '*, Checks: '*,
-cppcoreguidelines-non-private-member-variables-in-classes, -cppcoreguidelines-non-private-member-variables-in-classes,
-fuchsia-default-arguments-calls, -fuchsia-default-arguments-calls,
-fuchsia-default-arguments-declarations,
-fuchsia-default-arguments, -fuchsia-default-arguments,
-llvm-include-order, -llvm-include-order,
-llvm-header-guard, -llvm-header-guard,
@ -25,17 +26,18 @@ Checks: '*,
-fuchsia-statically-constructed-objects, -fuchsia-statically-constructed-objects,
-google-readability-todo, -google-readability-todo,
-modernize-use-trailing-return-type' -modernize-use-trailing-return-type'
CheckOptions: - { key: readability-identifier-naming.ClassCase, value: CamelCase } CheckOptions: - { key: readability-identifier-naming.ClassCase, value: CamelCase }
# Clashes with constant private member prefix. (const int _var;) # Clashes with constant private member prefix. (const int _var;)
# - { key: readability-identifier-naming.ConstantCase, value: lower_case } # - { key: readability-identifier-naming.ConstantCase, value: lower_case }
- { key: readability-identifier-naming.EnumCase, value: lower_case } - { key: readability-identifier-naming.EnumCase, value: lower_case }
- { key: readability-identifier-naming.FunctionCase, value: lower_case } - { key: readability-identifier-naming.FunctionCase, value: lower_case }
- { key: readability-identifier-naming.MemberCase, value: lower_case } - { key: readability-identifier-naming.MemberCase, value: lower_case }
- { key: readability-identifier-naming.NamespaceCase, value: lower_case } - { key: readability-identifier-naming.ParameterCase, value: lower_case }
- { key: readability-identifier-naming.ParameterCase, value: lower_case } - { key: readability-identifier-naming.PrivateMemberCase, value: lower_case }
- { key: readability-identifier-naming.PrivateMemberCase, value: lower_case } - { key: readability-identifier-naming.PrivateMemberPrefix, value: _ }
- { key: readability-identifier-naming.PrivateMemberPrefix, value: _ } - { key: readability-identifier-naming.ProtextedMemberCase, value: lower_case }
- { key: readability-identifier-naming.StructCase, value: lower_case } - { key: readability-identifier-naming.ProtectedMemberPrefix, value: _ }
- { key: readability-identifier-naming.StructCase, value: lower_case }
# Clashes with static private member prefix. (static int _var;) # Clashes with static private member prefix. (static int _var;)
# - { key: readability-identifier-naming.VariableCase, value: lower_case } # - { key: readability-identifier-naming.VariableCase, value: lower_case }
... ...

37
browser-plugins/webextension/native-wrapper/remwharead_wrapper.cpp
View File

@ -30,6 +30,8 @@ using std::system;
string read_input(); string read_input();
void send_message(const string &message); void send_message(const string &message);
int launch(const string &args); int launch(const string &args);
string decode_args(const string &args);
void replace_in_field(string &field);
string read_input() string read_input()
{ {
@ -78,11 +80,44 @@ int launch(const string &args)
return ret; return ret;
} }
string decode_args(const string &args)
{
constexpr char separator{'\u001F'}; // UNIT SEPARATOR.
if (args[0] != separator) // Extension uses old method.
{
return args;
}
size_t pos{1};
size_t endpos{0};
string newargs;
while ((endpos = args.find(separator, pos)) != string::npos)
{
string field{args.substr(pos, endpos - pos)};
replace_in_field(field);
newargs += " \"" + field + '"';
pos = endpos + 1;
}
return newargs;
}
void replace_in_field(string &field)
{
size_t pos{0};
while ((pos = field.find('"', pos)) != string::npos)
{
field.replace(pos, 1, R"(\")"); // Replace " with \".
pos += 2;
}
}
int main() int main()
{ {
const string args = read_input(); const string args = read_input();
const int ret = launch(args); cout << decode_args(args) << std::endl;
const int ret = launch(decode_args(args));
if (ret == 0) if (ret == 0)
{ {

12
include/export/adoc.hpp
View File

@ -47,30 +47,30 @@ private:
//! Replace strings in text. //! Replace strings in text.
[[nodiscard]] [[nodiscard]]
string replace(string text, const replacemap &replacements) const; static string replace(string text, const replacemap &replacements);
//! Replaces characters in tags that asciidoctor doesn't like. //! Replaces characters in tags that asciidoctor doesn't like.
[[nodiscard]] [[nodiscard]]
string replace_in_tag(const string &text) const; static string replace_in_tag(const string &text);
//! Replaces characters in title that asciidoctor doesn't like. //! Replaces characters in title that asciidoctor doesn't like.
[[nodiscard]] [[nodiscard]]
string replace_in_title(const string &text) const; static string replace_in_title(const string &text);
//! Replaces characters in URI that asciidoctor doesn't like. //! Replaces characters in URI that asciidoctor doesn't like.
[[nodiscard]] [[nodiscard]]
string replace_in_uri(const string &text) const; static string replace_in_uri(const string &text);
//! Print things sorted by tag. //! Print things sorted by tag.
void print_tags(const tagmap &tags) const; void print_tags(const tagmap &tags) const;
//! Get ISO-8601 day from Database::entry. //! Get ISO-8601 day from Database::entry.
[[nodiscard]] [[nodiscard]]
string get_day(const Database::entry &entry) const; static string get_day(const Database::entry &entry);
//! Get ISO-8601 time from Database::entry. //! Get ISO-8601 time from Database::entry.
[[nodiscard]] [[nodiscard]]
string get_time(const Database::entry &entry) const; static string get_time(const Database::entry &entry);
}; };
} // namespace remwharead::Export } // namespace remwharead::Export

2
include/export/csv.hpp
View File

@ -41,7 +41,7 @@ namespace remwharead::Export
private: private:
//! replaces " with "". //! replaces " with "".
[[nodiscard]] [[nodiscard]]
string quote(string field) const; static string quote(string field);
}; };
} // namespace remwharead::Export } // namespace remwharead::Export

2
include/export/export.hpp
View File

@ -68,7 +68,7 @@ protected:
* @return Sorted list of Database::entry. * @return Sorted list of Database::entry.
*/ */
[[nodiscard]] [[nodiscard]]
list<Database::entry> sort_entries(list<Database::entry> entries) const; static list<Database::entry> sort_entries(list<Database::entry> entries);
}; };
} // namespace remwharead::Export } // namespace remwharead::Export

4
include/search.hpp
View File

@ -110,7 +110,7 @@ private:
* @since 0.7.0 * @since 0.7.0
*/ */
[[nodiscard]] [[nodiscard]]
vector<vector<string>> parse_expression(const string &expression) const; static vector<vector<string>> parse_expression(const string &expression);
/*! /*!
* @brief Convert str to lowercase. Works with unicode. * @brief Convert str to lowercase. Works with unicode.
@ -118,7 +118,7 @@ private:
* @since 0.7.0 * @since 0.7.0
*/ */
[[nodiscard]] [[nodiscard]]
inline string to_lowercase(const string &str) const; static inline string to_lowercase(const string &str);
}; };
} // namespace remwharead } // namespace remwharead

2
include/sqlite.hpp
View File

@ -132,7 +132,7 @@ private:
bool _connected; bool _connected;
[[nodiscard]] [[nodiscard]]
fs::path get_data_home() const; static fs::path get_data_home();
}; };
} // namespace remwharead } // namespace remwharead

11
include/uri.hpp
View File

@ -151,7 +151,7 @@ protected:
* @since 0.6.0 * @since 0.6.0
*/ */
[[nodiscard]] [[nodiscard]]
string remove_html_tags(const string &html, const string &tag = "") const; static string remove_html_tags(const string &html, const string &tag = "");
/*! /*!
* @brief Convert HTML entities to UTF-8. * @brief Convert HTML entities to UTF-8.
@ -159,7 +159,7 @@ protected:
* @since 0.6.0 * @since 0.6.0
*/ */
[[nodiscard]] [[nodiscard]]
string unescape_html(string html) const; static string unescape_html(string html);
/*! /*!
* @brief Replace newlines with spaces. * @brief Replace newlines with spaces.
@ -167,14 +167,14 @@ protected:
* @since 0.6.0 * @since 0.6.0
*/ */
[[nodiscard]] [[nodiscard]]
string remove_newlines(string text) const; static string remove_newlines(string text);
/*! /*!
* @brief Set proxy server. * @brief Set proxy server.
* *
* @since 0.8.5 * @since 0.8.5
*/ */
void set_proxy(); static void set_proxy();
/*! /*!
* @brief Limits text to N characters, cuts at space. * @brief Limits text to N characters, cuts at space.
@ -182,7 +182,7 @@ protected:
* @since 0.8.5 * @since 0.8.5
*/ */
[[nodiscard]] [[nodiscard]]
string cut_text(const string &text, uint16_t n_chars) const; static string cut_text(const string &text, uint16_t n_chars);
/*! /*!
* @brief Converts string to UTF-8. * @brief Converts string to UTF-8.
@ -204,6 +204,7 @@ protected:
* *
* @since 0.9.2 * @since 0.9.2
*/ */
[[nodiscard]]
bool is_html() const; bool is_html() const;
}; };
} // namespace remwharead } // namespace remwharead

14
src/cli/parse_options.cpp
View File

@ -32,12 +32,12 @@ using Poco::Util::OptionCallback;
using Poco::Util::HelpFormatter; using Poco::Util::HelpFormatter;
App::App() App::App()
: _exit_requested(false) : _exit_requested{false}
, _argument_error(false) , _argument_error{false}
, _format(export_format::undefined) , _format{export_format::undefined}
, _timespan({ time_point(), system_clock::now() }) , _timespan{{time_point(), system_clock::now()}}
, _archive(true) , _archive{true}
, _regex(false) , _regex{false}
{} {}
void App::defineOptions(OptionSet& options) void App::defineOptions(OptionSet& options)
@ -237,7 +237,7 @@ void App::print_help(const string &option)
void App::print_version() void App::print_version()
{ {
cout << "remwharead " << global::version << endl << cout << "remwharead " << remwharead::version << endl <<
"Copyright (C) 2019 tastytea <tastytea@tastytea.de>\n" "Copyright (C) 2019 tastytea <tastytea@tastytea.de>\n"
"License GPLv3: GNU GPL version 3 " "License GPLv3: GNU GPL version 3 "
"<https://www.gnu.org/licenses/gpl-3.0.html>.\n" "<https://www.gnu.org/licenses/gpl-3.0.html>.\n"

2
src/cli/remwharead_cli.hpp
View File

@ -44,7 +44,7 @@ protected:
void defineOptions(OptionSet& options) override; void defineOptions(OptionSet& options) override;
void handle_options(const string &name, const string &value); void handle_options(const string &name, const string &value);
void print_help(const string &option); void print_help(const string &option);
void print_version(); static void print_version();
int main(const std::vector<string> &args) override; int main(const std::vector<string> &args) override;
private: private:

15
src/lib/export/adoc.cpp
View File

@ -36,7 +36,7 @@ void Export::AsciiDoc::print() const
try try
{ {
_out << "= Visited things\n" _out << "= Visited things\n"
<< ":Author: remwharead " << global::version << "\n" << ":Author: remwharead " << version << "\n"
<< ":Date: " << ":Date: "
<< timepoint_to_string(system_clock::now()) << "\n" << timepoint_to_string(system_clock::now()) << "\n"
<< ":TOC: right\n" << ":TOC: right\n"
@ -124,7 +124,6 @@ void Export::AsciiDoc::print() const
} }
string Export::AsciiDoc::replace(string text, const replacemap &replacements) string Export::AsciiDoc::replace(string text, const replacemap &replacements)
const
{ {
for (const std::pair<const string, const string> &sr : replacements) for (const std::pair<const string, const string> &sr : replacements)
{ {
@ -137,7 +136,7 @@ string Export::AsciiDoc::replace(string text, const replacemap &replacements)
} }
return text; return text;
} }
string Export::AsciiDoc::replace_in_tag(const string &text) const string Export::AsciiDoc::replace_in_tag(const string &text)
{ {
// TODO(tastytea): Find a better solution. // TODO(tastytea): Find a better solution.
const replacemap replacements = const replacemap replacements =
@ -165,13 +164,13 @@ string Export::AsciiDoc::replace_in_tag(const string &text) const
return replace(text, replacements); return replace(text, replacements);
} }
string Export::AsciiDoc::replace_in_title(const string &text) const string Export::AsciiDoc::replace_in_title(const string &text)
{ {
// [ is implicitly escaped if the corresponding ] is. // [ is implicitly escaped if the corresponding ] is.
return replace(text, {{ "]", "\\]" }}); return replace(text, {{ "]", "\\]" }});
} }
string Export::AsciiDoc::replace_in_uri(const string &text) const string Export::AsciiDoc::replace_in_uri(const string &text)
{ {
string out; string out;
Poco::URI::encode(text, "+", out); Poco::URI::encode(text, "+", out);
@ -196,7 +195,9 @@ void Export::AsciiDoc::print_tags(const tagmap &tags) const
const std::locale loc; const std::locale loc;
const auto &coll = std::use_facet<std::collate<char>>(loc); const auto &coll = std::use_facet<std::collate<char>>(loc);
return (coll.compare( return (coll.compare(
// NOLINTNEXTLINE – pointer arithmetic
&a.first[0], &a.first[0] + a.first.size(), &a.first[0], &a.first[0] + a.first.size(),
// NOLINTNEXTLINE – pointer arithmetic
&b.first[0], &b.first[0] + b.first.size()) == -1); &b.first[0], &b.first[0] + b.first.size()) == -1);
}; };
std::sort(sortedtags.begin(), sortedtags.end(), compare_tags); std::sort(sortedtags.begin(), sortedtags.end(), compare_tags);
@ -235,13 +236,13 @@ void Export::AsciiDoc::print_tags(const tagmap &tags) const
_out << endl; _out << endl;
} }
string Export::AsciiDoc::get_day(const Database::entry &entry) const string Export::AsciiDoc::get_day(const Database::entry &entry)
{ {
const string datetime = timepoint_to_string(entry.datetime); const string datetime = timepoint_to_string(entry.datetime);
return datetime.substr(0, datetime.find('T')); return datetime.substr(0, datetime.find('T'));
} }
string Export::AsciiDoc::get_time(const Database::entry &entry) const string Export::AsciiDoc::get_time(const Database::entry &entry)
{ {
const string datetime = timepoint_to_string(entry.datetime); const string datetime = timepoint_to_string(entry.datetime);
return datetime.substr(datetime.find('T') + 1); return datetime.substr(datetime.find('T') + 1);

2
src/lib/export/csv.cpp
View File

@ -45,7 +45,7 @@ void Export::CSV::print() const
} }
} }
string Export::CSV::quote(string field) const string Export::CSV::quote(string field)
{ {
size_t pos = 0; size_t pos = 0;
while ((pos = field.find('"', pos)) != std::string::npos) while ((pos = field.find('"', pos)) != std::string::npos)

2
src/lib/export/export.cpp
View File

@ -25,7 +25,7 @@ ExportBase::ExportBase(const list<Database::entry> &entries, ostream &out)
{} {}
list<Database::entry> list<Database::entry>
ExportBase::sort_entries(list<Database::entry> entries) const ExportBase::sort_entries(list<Database::entry> entries)
{ {
entries.sort([](const auto &a, const auto &b) entries.sort([](const auto &a, const auto &b)
{ {

2
src/lib/export/rss.cpp
View File

@ -66,7 +66,7 @@ void Export::RSS::print() const
writer.endElement("", "", "description"); writer.endElement("", "", "description");
writer.startElement("", "", "generator"); writer.startElement("", "", "generator");
writer.characters(string("remwharead ") + global::version); writer.characters(string("remwharead ") + version);
writer.endElement("", "", "generator"); writer.endElement("", "", "generator");
const string now = DateTimeFormatter::format(DateTime(), const string now = DateTimeFormatter::format(DateTime(),

4
src/lib/search.cpp
View File

@ -37,7 +37,7 @@ Search::Search(list<Database::entry> entries)
:_entries(move(entries)) :_entries(move(entries))
{} {}
vector<vector<string>> Search::parse_expression(const string &expression) const vector<vector<string>> Search::parse_expression(const string &expression)
{ {
vector<vector<string>> searchlist; vector<vector<string>> searchlist;
const RegEx re_or("(.+?) (OR|\\|\\|) "); const RegEx re_or("(.+?) (OR|\\|\\|) ");
@ -78,7 +78,7 @@ vector<vector<string>> Search::parse_expression(const string &expression) const
return searchlist; return searchlist;
} }
string Search::to_lowercase(const string &str) const string Search::to_lowercase(const string &str)
{ {
return Poco::UTF8::toLower(str); return Poco::UTF8::toLower(str);
} }

4
src/lib/sqlite.cpp
View File

@ -33,7 +33,7 @@ using Poco::Data::Statement;
using Poco::Environment; using Poco::Environment;
Database::Database() Database::Database()
: _connected(false) : _connected{false}
{ {
try try
{ {
@ -182,7 +182,7 @@ string Database::tags_to_string(const vector<string> &tags)
return strtags; return strtags;
} }
fs::path Database::get_data_home() const fs::path Database::get_data_home()
{ {
fs::path path; fs::path path;

10
src/lib/uri.cpp
View File

@ -187,7 +187,7 @@ string URI::make_request(const string &uri, bool archive) const
} }
HTTPRequest request(method, path, HTTPMessage::HTTP_1_1); HTTPRequest request(method, path, HTTPMessage::HTTP_1_1);
request.set("User-Agent", string("remwharead/") + global::version); request.set("User-Agent", string("remwharead/") + version);
HTTPResponse response; HTTPResponse response;
@ -286,7 +286,7 @@ string URI::strip_html() const
return unescape_html(out); return unescape_html(out);
} }
string URI::remove_html_tags(const string &html, const string &tag) const string URI::remove_html_tags(const string &html, const string &tag)
{ {
// NOTE: I did this with regex_replace before, but libstdc++ segfaulted. // NOTE: I did this with regex_replace before, but libstdc++ segfaulted.
string out; string out;
@ -324,7 +324,7 @@ string URI::remove_html_tags(const string &html, const string &tag) const
return out; return out;
} }
string URI::unescape_html(string html) const string URI::unescape_html(string html)
{ {
// Used to convert int to utf-8 char. // Used to convert int to utf-8 char.
std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> u8c; std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> u8c;
@ -648,7 +648,7 @@ archive_answer URI::archive() const
return { false, "Unknown error.", "" }; return { false, "Unknown error.", "" };
} }
string URI::remove_newlines(string text) const string URI::remove_newlines(string text)
{ {
size_t posn = 0; size_t posn = 0;
while ((posn = text.find('\n', posn)) != std::string::npos) while ((posn = text.find('\n', posn)) != std::string::npos)
@ -666,7 +666,7 @@ string URI::remove_newlines(string text) const
return text; return text;
} }
string URI::cut_text(const string &text, const uint16_t n_chars) const string URI::cut_text(const string &text, const uint16_t n_chars)
{ {
if (text.size() > n_chars) if (text.size() > n_chars)
{ {

4
src/version.hpp.in
View File

@ -1,9 +1,9 @@
#ifndef VERSION_HPP #ifndef VERSION_HPP
#define VERSION_HPP #define VERSION_HPP
namespace global namespace remwharead
{ {
static constexpr char version[] = "@PROJECT_VERSION@"; static constexpr char version[] = "@PROJECT_VERSION@";
} } // namespace remwharead
#endif // VERSION_HPP #endif // VERSION_HPP

2
tests/test_search.cpp
View File

@ -17,7 +17,6 @@
#include <exception> #include <exception>
#include <string> #include <string>
#include <chrono> #include <chrono>
#include <vector>
#include <catch.hpp> #include <catch.hpp>
#include "sqlite.hpp" #include "sqlite.hpp"
#include "search.hpp" #include "search.hpp"
@ -25,7 +24,6 @@
using namespace remwharead; using namespace remwharead;
using std::string; using std::string;
using std::chrono::system_clock; using std::chrono::system_clock;
using std::vector;
SCENARIO ("Searching works correctly") SCENARIO ("Searching works correctly")
{ {