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

Reformat uri.cpp.

This commit is contained in:
tastytea 2020-10-31 13:21:40 +01:00
parent 6d45af58a2
commit eab10e28ae
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
1 changed files with 126 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

427
src/lib/uri.cpp
View File

@ -15,8 +15,9 @@
*/ */
#include "uri.hpp" #include "uri.hpp"
#include "version.hpp" #include "version.hpp"
#include <boost/locale.hpp>
#include <Poco/Environment.h> #include <Poco/Environment.h>
#include <Poco/Exception.h> #include <Poco/Exception.h>
#include <Poco/Net/HTTPClientSession.h> #include <Poco/Net/HTTPClientSession.h>
@ -26,6 +27,8 @@
#include <Poco/RegularExpression.h> #include <Poco/RegularExpression.h>
#include <Poco/StreamCopier.h> #include <Poco/StreamCopier.h>
#include <Poco/URI.h> #include <Poco/URI.h>
#include <boost/locale.hpp>
#include <codecvt> #include <codecvt>
#include <cstdint> #include <cstdint>
#include <exception> #include <exception>
@ -38,22 +41,22 @@
namespace remwharead namespace remwharead
{ {
using std::array; using Poco::Environment;
using std::istream; using Poco::StreamCopier;
using std::unique_ptr;
using std::make_unique;
using std::vector;
using std::cerr;
using std::endl;
using std::move;
using std::uint32_t;
using Poco::Net::HTTPClientSession; using Poco::Net::HTTPClientSession;
using Poco::Net::HTTPSClientSession; using Poco::Net::HTTPMessage;
using Poco::Net::HTTPRequest; using Poco::Net::HTTPRequest;
using Poco::Net::HTTPResponse; using Poco::Net::HTTPResponse;
using Poco::Net::HTTPMessage; using Poco::Net::HTTPSClientSession;
using Poco::StreamCopier; using std::array;
using Poco::Environment; using std::cerr;
using std::endl;
using std::istream;
using std::make_unique;
using std::move;
using std::uint32_t;
using std::unique_ptr;
using std::vector;
using RegEx = Poco::RegularExpression; using RegEx = Poco::RegularExpression;
html_extract::operator bool() html_extract::operator bool()
@ -69,8 +72,9 @@ archive_answer::operator bool()
URI::URI(string uri) URI::URI(string uri)
: _uri(move(uri)) : _uri(move(uri))
{ {
// FIXME(tastytea): Only call locale-stuff once after getting rid OF POCO. // FIXME: Only call locale-stuff once after getting rid of POCO.
// Set global locale with Boost extras. Needed for Boost functions. // Set global locale with Boost extras. Needed for Boost functions.
// Uhm… I don't remember what I meant with the above. 🤦
const boost::locale::generator locgen; const boost::locale::generator locgen;
const std::locale loc = locgen(""); const std::locale loc = locgen("");
std::locale::global(loc); std::locale::global(loc);
@ -141,22 +145,16 @@ html_extract URI::get()
_document = to_utf8(_document); _document = to_utf8(_document);
if (!_document.empty()) if (!_document.empty())
{ {
return return {true, "", extract_title(), extract_description(),
{ strip_html()};
true,
"",
extract_title(),
extract_description(),
strip_html()
};
} }
} }
catch (const Poco::Exception &e) catch (const Poco::Exception &e)
{ {
return { false, e.displayText(), "", "", "" }; return {false, e.displayText(), "", "", ""};
} }
return { false, "Unknown error.", "", "", "" }; return {false, "Unknown error.", "", "", ""};
} }
string URI::make_request(const string &uri, bool archive) const string URI::make_request(const string &uri, bool archive) const
@ -197,17 +195,17 @@ string URI::make_request(const string &uri, bool archive) const
// Not using the constants because some are too new for Debian stretch. // Not using the constants because some are too new for Debian stretch.
switch (response.getStatus()) switch (response.getStatus())
{ {
case 301: // HTTPResponse::HTTP_MOVED_PERMANENTLY case 301: // HTTPResponse::HTTP_MOVED_PERMANENTLY
case 308: // HTTPResponse::HTTP_PERMANENT_REDIRECT case 308: // HTTPResponse::HTTP_PERMANENT_REDIRECT
case 302: // HTTPResponse::HTTP_FOUND case 302: // HTTPResponse::HTTP_FOUND
case 303: // HTTPResponse::HTTP_SEE_OTHER case 303: // HTTPResponse::HTTP_SEE_OTHER
case 307: // HTTPResponse::HTTP_TEMPORARY_REDIRECT case 307: // HTTPResponse::HTTP_TEMPORARY_REDIRECT
{ {
string location = response.get("Location"); string location = response.get("Location");
if (location.substr(0, 4) != "http") if (location.substr(0, 4) != "http")
{ {
location = poco_uri.getScheme() + "://" + poco_uri.getHost() location = poco_uri.getScheme() + "://" + poco_uri.getHost()
+ location; + location;
} }
return make_request(location, archive); return make_request(location, archive);
} }
@ -277,8 +275,8 @@ string URI::strip_html() const
string out; string out;
out = remove_html_tags(_document, "script"); // Remove JavaScript. out = remove_html_tags(_document, "script"); // Remove JavaScript.
out = remove_html_tags(out, "style"); // Remove CSS. out = remove_html_tags(out, "style"); // Remove CSS.
out = remove_html_tags(out); // Remove tags. out = remove_html_tags(out); // Remove tags.
size_t pos = 0; size_t pos = 0;
while ((pos = out.find('\r', pos)) != std::string::npos) // Remove CR. while ((pos = out.find('\r', pos)) != std::string::npos) // Remove CR.
@ -359,267 +357,93 @@ string URI::unescape_html(string html)
// Source: https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_ // Source: https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_
// entity_references#Character_entity_references_in_HTML // entity_references#Character_entity_references_in_HTML
const array<const std::pair<const string, const char32_t>, 258> names = const array<const std::pair<const string, const char32_t>, 258> names = {
{{ {{"exclamation", 0x0021}, {"quot", 0x0022}, {"percent", 0x0025},
{ "exclamation", 0x0021 }, {"amp", 0x0026}, {"apos", 0x0027}, {"add", 0x002B},
{ "quot", 0x0022 }, {"lt", 0x003C}, {"equal", 0x003D}, {"gt", 0x003E},
{ "percent", 0x0025 }, {"nbsp", 0x00A0}, {"iexcl", 0x00A1}, {"cent", 0x00A2},
{ "amp", 0x0026 }, {"pound", 0x00A3}, {"curren", 0x00A4}, {"yen", 0x00A5},
{ "apos", 0x0027 }, {"brvbar", 0x00A6}, {"sect", 0x00A7}, {"uml", 0x00A8},
{ "add", 0x002B }, {"copy", 0x00A9}, {"ordf", 0x00AA}, {"laquo", 0x00AB},
{ "lt", 0x003C }, {"not", 0x00AC}, {"shy", 0x00AD}, {"reg", 0x00AE},
{ "equal", 0x003D }, {"macr", 0x00AF}, {"deg", 0x00B0}, {"plusmn", 0x00B1},
{ "gt", 0x003E }, {"sup2", 0x00B2}, {"sup3", 0x00B3}, {"acute", 0x00B4},
{ "nbsp", 0x00A0 }, {"micro", 0x00B5}, {"para", 0x00B6}, {"middot", 0x00B7},
{ "iexcl", 0x00A1 }, {"cedil", 0x00B8}, {"sup1", 0x00B9}, {"ordm", 0x00BA},
{ "cent", 0x00A2 }, {"raquo", 0x00BB}, {"frac14", 0x00BC}, {"frac12", 0x00BD},
{ "pound", 0x00A3 }, {"frac34", 0x00BE}, {"iquest", 0x00BF}, {"Agrave", 0x00C0},
{ "curren", 0x00A4 }, {"Aacute", 0x00C1}, {"Acirc", 0x00C2}, {"Atilde", 0x00C3},
{ "yen", 0x00A5 }, {"Auml", 0x00C4}, {"Aring", 0x00C5}, {"AElig", 0x00C6},
{ "brvbar", 0x00A6 }, {"Ccedil", 0x00C7}, {"Egrave", 0x00C8}, {"Eacute", 0x00C9},
{ "sect", 0x00A7 }, {"Ecirc", 0x00CA}, {"Euml", 0x00CB}, {"Igrave", 0x00CC},
{ "uml", 0x00A8 }, {"Iacute", 0x00CD}, {"Icirc", 0x00CE}, {"Iuml", 0x00CF},
{ "copy", 0x00A9 }, {"ETH", 0x00D0}, {"Ntilde", 0x00D1}, {"Ograve", 0x00D2},
{ "ordf", 0x00AA }, {"Oacute", 0x00D3}, {"Ocirc", 0x00D4}, {"Otilde", 0x00D5},
{ "laquo", 0x00AB }, {"Ouml", 0x00D6}, {"times", 0x00D7}, {"Oslash", 0x00D8},
{ "not", 0x00AC }, {"Ugrave", 0x00D9}, {"Uacute", 0x00DA}, {"Ucirc", 0x00DB},
{ "shy", 0x00AD }, {"Uuml", 0x00DC}, {"Yacute", 0x00DD}, {"THORN", 0x00DE},
{ "reg", 0x00AE }, {"szlig", 0x00DF}, {"agrave", 0x00E0}, {"aacute", 0x00E1},
{ "macr", 0x00AF }, {"acirc", 0x00E2}, {"atilde", 0x00E3}, {"auml", 0x00E4},
{ "deg", 0x00B0 }, {"aring", 0x00E5}, {"aelig", 0x00E6}, {"ccedil", 0x00E7},
{ "plusmn", 0x00B1 }, {"egrave", 0x00E8}, {"eacute", 0x00E9}, {"ecirc", 0x00EA},
{ "sup2", 0x00B2 }, {"euml", 0x00EB}, {"igrave", 0x00EC}, {"iacute", 0x00ED},
{ "sup3", 0x00B3 }, {"icirc", 0x00EE}, {"iuml", 0x00EF}, {"eth", 0x00F0},
{ "acute", 0x00B4 }, {"ntilde", 0x00F1}, {"ograve", 0x00F2}, {"oacute", 0x00F3},
{ "micro", 0x00B5 }, {"ocirc", 0x00F4}, {"otilde", 0x00F5}, {"ouml", 0x00F6},
{ "para", 0x00B6 }, {"divide", 0x00F7}, {"oslash", 0x00F8}, {"ugrave", 0x00F9},
{ "middot", 0x00B7 }, {"uacute", 0x00FA}, {"ucirc", 0x00FB}, {"uuml", 0x00FC},
{ "cedil", 0x00B8 }, {"yacute", 0x00FD}, {"thorn", 0x00FE}, {"yuml", 0x00FF},
{ "sup1", 0x00B9 }, {"OElig", 0x0152}, {"oelig", 0x0153}, {"Scaron", 0x0160},
{ "ordm", 0x00BA }, {"scaron", 0x0161}, {"Yuml", 0x0178}, {"fnof", 0x0192},
{ "raquo", 0x00BB }, {"circ", 0x02C6}, {"tilde", 0x02DC}, {"Alpha", 0x0391},
{ "frac14", 0x00BC }, {"Beta", 0x0392}, {"Gamma", 0x0393}, {"Delta", 0x0394},
{ "frac12", 0x00BD }, {"Epsilon", 0x0395}, {"Zeta", 0x0396}, {"Eta", 0x0397},
{ "frac34", 0x00BE }, {"Theta", 0x0398}, {"Iota", 0x0399}, {"Kappa", 0x039A},
{ "iquest", 0x00BF }, {"Lambda", 0x039B}, {"Mu", 0x039C}, {"Nu", 0x039D},
{ "Agrave", 0x00C0 }, {"Xi", 0x039E}, {"Omicron", 0x039F}, {"Pi", 0x03A0},
{ "Aacute", 0x00C1 }, {"Rho", 0x03A1}, {"Sigma", 0x03A3}, {"Tau", 0x03A4},
{ "Acirc", 0x00C2 }, {"Upsilon", 0x03A5}, {"Phi", 0x03A6}, {"Chi", 0x03A7},
{ "Atilde", 0x00C3 }, {"Psi", 0x03A8}, {"Omega", 0x03A9}, {"alpha", 0x03B1},
{ "Auml", 0x00C4 }, {"beta", 0x03B2}, {"gamma", 0x03B3}, {"delta", 0x03B4},
{ "Aring", 0x00C5 }, {"epsilon", 0x03B5}, {"zeta", 0x03B6}, {"eta", 0x03B7},
{ "AElig", 0x00C6 }, {"theta", 0x03B8}, {"iota", 0x03B9}, {"kappa", 0x03BA},
{ "Ccedil", 0x00C7 }, {"lambda", 0x03BB}, {"mu", 0x03BC}, {"nu", 0x03BD},
{ "Egrave", 0x00C8 }, {"xi", 0x03BE}, {"omicron", 0x03BF}, {"pi", 0x03C0},
{ "Eacute", 0x00C9 }, {"rho", 0x03C1}, {"sigmaf", 0x03C2}, {"sigma", 0x03C3},
{ "Ecirc", 0x00CA }, {"tau", 0x03C4}, {"upsilon", 0x03C5}, {"phi", 0x03C6},
{ "Euml", 0x00CB }, {"chi", 0x03C7}, {"psi", 0x03C8}, {"omega", 0x03C9},
{ "Igrave", 0x00CC }, {"thetasym", 0x03D1}, {"upsih", 0x03D2}, {"piv", 0x03D6},
{ "Iacute", 0x00CD }, {"ensp", 0x2002}, {"emsp", 0x2003}, {"thinsp", 0x2009},
{ "Icirc", 0x00CE }, {"zwnj", 0x200C}, {"zwj", 0x200D}, {"lrm", 0x200E},
{ "Iuml", 0x00CF }, {"rlm", 0x200F}, {"ndash", 0x2013}, {"mdash", 0x2014},
{ "ETH", 0x00D0 }, {"horbar", 0x2015}, {"lsquo", 0x2018}, {"rsquo", 0x2019},
{ "Ntilde", 0x00D1 }, {"sbquo", 0x201A}, {"ldquo", 0x201C}, {"rdquo", 0x201D},
{ "Ograve", 0x00D2 }, {"bdquo", 0x201E}, {"dagger", 0x2020}, {"Dagger", 0x2021},
{ "Oacute", 0x00D3 }, {"bull", 0x2022}, {"hellip", 0x2026}, {"permil", 0x2030},
{ "Ocirc", 0x00D4 }, {"prime", 0x2032}, {"Prime", 0x2033}, {"lsaquo", 0x2039},
{ "Otilde", 0x00D5 }, {"rsaquo", 0x203A}, {"oline", 0x203E}, {"frasl", 0x2044},
{ "Ouml", 0x00D6 }, {"euro", 0x20AC}, {"image", 0x2111}, {"weierp", 0x2118},
{ "times", 0x00D7 }, {"real", 0x211C}, {"trade", 0x2122}, {"alefsym", 0x2135},
{ "Oslash", 0x00D8 }, {"larr", 0x2190}, {"uarr", 0x2191}, {"rarr", 0x2192},
{ "Ugrave", 0x00D9 }, {"darr", 0x2193}, {"harr", 0x2194}, {"crarr", 0x21B5},
{ "Uacute", 0x00DA }, {"lArr", 0x21D0}, {"uArr", 0x21D1}, {"rArr", 0x21D2},
{ "Ucirc", 0x00DB }, {"dArr", 0x21D3}, {"hArr", 0x21D4}, {"forall", 0x2200},
{ "Uuml", 0x00DC }, {"part", 0x2202}, {"exist", 0x2203}, {"empty", 0x2205},
{ "Yacute", 0x00DD }, {"nabla", 0x2207}, {"isin", 0x2208}, {"notin", 0x2209},
{ "THORN", 0x00DE }, {"ni", 0x220B}, {"prod", 0x220F}, {"sum", 0x2211},
{ "szlig", 0x00DF }, {"minus", 0x2212}, {"lowast", 0x2217}, {"radic", 0x221A},
{ "agrave", 0x00E0 }, {"prop", 0x221D}, {"infin", 0x221E}, {"ang", 0x2220},
{ "aacute", 0x00E1 }, {"and", 0x2227}, {"or", 0x2228}, {"cap", 0x2229},
{ "acirc", 0x00E2 }, {"cup", 0x222A}, {"int", 0x222B}, {"there4", 0x2234},
{ "atilde", 0x00E3 }, {"sim", 0x223C}, {"cong", 0x2245}, {"asymp", 0x2248},
{ "auml", 0x00E4 }, {"ne", 0x2260}, {"equiv", 0x2261}, {"le", 0x2264},
{ "aring", 0x00E5 }, {"ge", 0x2265}, {"sub", 0x2282}, {"sup", 0x2283},
{ "aelig", 0x00E6 }, {"nsub", 0x2284}, {"sube", 0x2286}, {"supe", 0x2287},
{ "ccedil", 0x00E7 }, {"oplus", 0x2295}, {"otimes", 0x2297}, {"perp", 0x22A5},
{ "egrave", 0x00E8 }, {"sdot", 0x22C5}, {"lceil", 0x2308}, {"rceil", 0x2309},
{ "eacute", 0x00E9 }, {"lfloor", 0x230A}, {"rfloor", 0x230B}, {"lang", 0x2329},
{ "ecirc", 0x00EA }, {"rang", 0x232A}, {"loz", 0x25CA}, {"spades", 0x2660},
{ "euml", 0x00EB }, {"clubs", 0x2663}, {"hearts", 0x2665}, {"diams", 0x2666}}};
{ "igrave", 0x00EC },
{ "iacute", 0x00ED },
{ "icirc", 0x00EE },
{ "iuml", 0x00EF },
{ "eth", 0x00F0 },
{ "ntilde", 0x00F1 },
{ "ograve", 0x00F2 },
{ "oacute", 0x00F3 },
{ "ocirc", 0x00F4 },
{ "otilde", 0x00F5 },
{ "ouml", 0x00F6 },
{ "divide", 0x00F7 },
{ "oslash", 0x00F8 },
{ "ugrave", 0x00F9 },
{ "uacute", 0x00FA },
{ "ucirc", 0x00FB },
{ "uuml", 0x00FC },
{ "yacute", 0x00FD },
{ "thorn", 0x00FE },
{ "yuml", 0x00FF },
{ "OElig", 0x0152 },
{ "oelig", 0x0153 },
{ "Scaron", 0x0160 },
{ "scaron", 0x0161 },
{ "Yuml", 0x0178 },
{ "fnof", 0x0192 },
{ "circ", 0x02C6 },
{ "tilde", 0x02DC },
{ "Alpha", 0x0391 },
{ "Beta", 0x0392 },
{ "Gamma", 0x0393 },
{ "Delta", 0x0394 },
{ "Epsilon", 0x0395 },
{ "Zeta", 0x0396 },
{ "Eta", 0x0397 },
{ "Theta", 0x0398 },
{ "Iota", 0x0399 },
{ "Kappa", 0x039A },
{ "Lambda", 0x039B },
{ "Mu", 0x039C },
{ "Nu", 0x039D },
{ "Xi", 0x039E },
{ "Omicron", 0x039F },
{ "Pi", 0x03A0 },
{ "Rho", 0x03A1 },
{ "Sigma", 0x03A3 },
{ "Tau", 0x03A4 },
{ "Upsilon", 0x03A5 },
{ "Phi", 0x03A6 },
{ "Chi", 0x03A7 },
{ "Psi", 0x03A8 },
{ "Omega", 0x03A9 },
{ "alpha", 0x03B1 },
{ "beta", 0x03B2 },
{ "gamma", 0x03B3 },
{ "delta", 0x03B4 },
{ "epsilon", 0x03B5 },
{ "zeta", 0x03B6 },
{ "eta", 0x03B7 },
{ "theta", 0x03B8 },
{ "iota", 0x03B9 },
{ "kappa", 0x03BA },
{ "lambda", 0x03BB },
{ "mu", 0x03BC },
{ "nu", 0x03BD },
{ "xi", 0x03BE },
{ "omicron", 0x03BF },
{ "pi", 0x03C0 },
{ "rho", 0x03C1 },
{ "sigmaf", 0x03C2 },
{ "sigma", 0x03C3 },
{ "tau", 0x03C4 },
{ "upsilon", 0x03C5 },
{ "phi", 0x03C6 },
{ "chi", 0x03C7 },
{ "psi", 0x03C8 },
{ "omega", 0x03C9 },
{ "thetasym", 0x03D1 },
{ "upsih", 0x03D2 },
{ "piv", 0x03D6 },
{ "ensp", 0x2002 },
{ "emsp", 0x2003 },
{ "thinsp", 0x2009 },
{ "zwnj", 0x200C },
{ "zwj", 0x200D },
{ "lrm", 0x200E },
{ "rlm", 0x200F },
{ "ndash", 0x2013 },
{ "mdash", 0x2014 },
{ "horbar", 0x2015 },
{ "lsquo", 0x2018 },
{ "rsquo", 0x2019 },
{ "sbquo", 0x201A },
{ "ldquo", 0x201C },
{ "rdquo", 0x201D },
{ "bdquo", 0x201E },
{ "dagger", 0x2020 },
{ "Dagger", 0x2021 },
{ "bull", 0x2022 },
{ "hellip", 0x2026 },
{ "permil", 0x2030 },
{ "prime", 0x2032 },
{ "Prime", 0x2033 },
{ "lsaquo", 0x2039 },
{ "rsaquo", 0x203A },
{ "oline", 0x203E },
{ "frasl", 0x2044 },
{ "euro", 0x20AC },
{ "image", 0x2111 },
{ "weierp", 0x2118 },
{ "real", 0x211C },
{ "trade", 0x2122 },
{ "alefsym", 0x2135 },
{ "larr", 0x2190 },
{ "uarr", 0x2191 },
{ "rarr", 0x2192 },
{ "darr", 0x2193 },
{ "harr", 0x2194 },
{ "crarr", 0x21B5 },
{ "lArr", 0x21D0 },
{ "uArr", 0x21D1 },
{ "rArr", 0x21D2 },
{ "dArr", 0x21D3 },
{ "hArr", 0x21D4 },
{ "forall", 0x2200 },
{ "part", 0x2202 },
{ "exist", 0x2203 },
{ "empty", 0x2205 },
{ "nabla", 0x2207 },
{ "isin", 0x2208 },
{ "notin", 0x2209 },
{ "ni", 0x220B },
{ "prod", 0x220F },
{ "sum", 0x2211 },
{ "minus", 0x2212 },
{ "lowast", 0x2217 },
{ "radic", 0x221A },
{ "prop", 0x221D },
{ "infin", 0x221E },
{ "ang", 0x2220 },
{ "and", 0x2227 },
{ "or", 0x2228 },
{ "cap", 0x2229 },
{ "cup", 0x222A },
{ "int", 0x222B },
{ "there4", 0x2234 },
{ "sim", 0x223C },
{ "cong", 0x2245 },
{ "asymp", 0x2248 },
{ "ne", 0x2260 },
{ "equiv", 0x2261 },
{ "le", 0x2264 },
{ "ge", 0x2265 },
{ "sub", 0x2282 },
{ "sup", 0x2283 },
{ "nsub", 0x2284 },
{ "sube", 0x2286 },
{ "supe", 0x2287 },
{ "oplus", 0x2295 },
{ "otimes", 0x2297 },
{ "perp", 0x22A5 },
{ "sdot", 0x22C5 },
{ "lceil", 0x2308 },
{ "rceil", 0x2309 },
{ "lfloor", 0x230A },
{ "rfloor", 0x230B },
{ "lang", 0x2329 },
{ "rang", 0x232A },
{ "loz", 0x25CA },
{ "spades", 0x2660 },
{ "clubs", 0x2663 },
{ "hearts", 0x2665 },
{ "diams", 0x2666 }
}};
for (auto &pair : names) for (auto &pair : names)
{ {
@ -634,25 +458,26 @@ archive_answer URI::archive() const
{ {
if (_uri.substr(0, 4) != "http") if (_uri.substr(0, 4) != "http")
{ {
return { false, "Only HTTP(S) is archivable.", "" }; return {false, "Only HTTP(S) is archivable.", ""};
} }
try try
{ {
const string answer = make_request("https://web.archive.org/save/" const string answer = make_request("https://web.archive.org/save/"
+ _uri, true); + _uri,
true);
if (!answer.empty()) if (!answer.empty())
{ {
return { true, "", "https://web.archive.org" + answer }; return {true, "", "https://web.archive.org" + answer};
} }
} }
catch (const Poco::Exception &e) catch (const Poco::Exception &e)
{ {
return { false, e.displayText(), "" }; return {false, e.displayText(), ""};
} }
return { false, "Unknown error.", "" }; return {false, "Unknown error.", ""};
} }
string URI::remove_newlines(string text) string URI::remove_newlines(string text)
@ -685,8 +510,8 @@ string URI::cut_text(const string &text, const uint16_t n_chars)
+ std::to_string(suffix_len)); + std::to_string(suffix_len));
} }
const size_t pos = const size_t pos = text.rfind(' ', static_cast<size_t>(n_chars
text.rfind(' ', static_cast<size_t>(n_chars - suffix_len)); - suffix_len));
return text.substr(0, pos) + suffix; return text.substr(0, pos) + suffix;
} }