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

Merge branch 'develop' into main

This commit is contained in:
tastytea 2019-12-11 14:33:20 +01:00
parent 0431b4a8ca c5dc9d4098
commit c68f77262f
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
6 changed files with 100 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.drone.yml
View File

@ -24,7 +24,7 @@ steps:
- rm /etc/apt/apt.conf.d/docker-clean
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
- apt-get update -q
- apt-get install -qy g++-7 cmake libpoco-dev asciidoc catch
- apt-get install -qy g++-7 cmake libpoco-dev libboost-locale-dev asciidoc catch
- rm -rf build && mkdir -p build && cd build
- cmake -DWITH_MOZILLA=YES -DWITH_TESTS=YES ..
- make VERBOSE=1
@ -52,7 +52,7 @@ steps:
- gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
- apt-get update -q
- apt-get install -qy -t bionic g++-9
- apt-get install -qy cmake libpoco-dev asciidoc catch
- apt-get install -qy cmake libpoco-dev libboost-locale-dev asciidoc catch
- rm -rf build && mkdir -p build && cd build
- cmake -DWITH_MOZILLA=YES ..
- make VERBOSE=1
@ -71,7 +71,7 @@ steps:
- rm /etc/apt/apt.conf.d/docker-clean
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
- apt-get update -q
- apt-get install -qy clang-6.0 cmake libpoco-dev asciidoc catch
- apt-get install -qy clang-6.0 cmake libpoco-dev libboost-locale-dev asciidoc catch
- rm -rf build && mkdir -p build && cd build
- cmake -DWITH_MOZILLA=YES ..
- make VERBOSE=1
@ -90,7 +90,7 @@ steps:
- rm /etc/apt/apt.conf.d/docker-clean
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
- apt-get update -q
- apt-get install -qy clang cmake libpoco-dev asciidoc catch
- apt-get install -qy clang cmake libpoco-dev libboost-locale-dev asciidoc catch
- rm -rf build && mkdir -p build && cd build
- cmake -DWITH_MOZILLA=YES ..
- make VERBOSE=1
@ -140,7 +140,7 @@ steps:
- rm /etc/apt/apt.conf.d/docker-clean
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
- apt-get update -q
- apt-get install -qy g++ cmake libpoco-dev asciidoc catch
- apt-get install -qy g++ cmake libpoco-dev libboost-locale-dev asciidoc catch
- apt-get install -qy build-essential file zip
- rm -rf build && mkdir -p build && cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_MOZILLA=YES -DMOZILLA_NMH_DIR="lib/mozilla/native-messaging-hosts" -DWITH_DEB=YES ..

4
CMakeLists.txt
View File

@ -25,7 +25,8 @@ if(${HUNTER_ENABLED})
# FetchContent_MakeAvailable needs 3.14.
if(NOT (${CMAKE_VERSION} VERSION_LESS 3.14))
set(HUNTER_PACKAGES PocoCpp)
set(HUNTER_Boost_COMPONENTS locale)
set(HUNTER_PACKAGES PocoCpp Boost)
include(FetchContent)
FetchContent_Declare(SetupHunter GIT_REPOSITORY https://github.com/cpp-pm/gate)
FetchContent_MakeAvailable(SetupHunter)
@ -44,6 +45,7 @@ project(remwharead
if(${HUNTER_ENABLED} AND ${CMAKE_VERSION} VERSION_LESS 3.14)
hunter_add_package(PocoCpp)
hunter_add_package(Boost COMPONENTS locale)
endif()
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")

30
include/uri.hpp
View File

@ -107,6 +107,8 @@ public:
protected:
string _uri;
string _encoding;
string _document;
/*!
* @brief Make a HTTP(S) request.
@ -122,7 +124,7 @@ protected:
* @since 0.6.0
*/
[[nodiscard]]
string extract_title(const string &html) const;
string extract_title() const;
/*!
* @brief Extract the description from an HTML page.
@ -130,7 +132,7 @@ protected:
* @since 0.6.0
*/
[[nodiscard]]
string extract_description(const string &html) const;
string extract_description() const;
/*!
* @brief Removes HTML tags and superflous spaces from an HTML page.
@ -138,7 +140,7 @@ protected:
* @since 0.6.0
*/
[[nodiscard]]
string strip_html(const string &html) const;
string strip_html() const;
/*!
* @brief Remove HTML tags.
@ -181,6 +183,28 @@ protected:
*/
[[nodiscard]]
string cut_text(const string &text, uint16_t n_chars) const;
/*!
* @brief Converts string to UTF-8.
*
* @since 0.9.2
*/
[[nodiscard]]
inline string to_utf8(const string &str);
/*!
* @brief Try to detect the encoding of the document.
*
* @since 0.9.2
*/
void detect_encoding();
/*!
* @brief Returns true if document is *HTML.
*
* @since 0.9.2
*/
bool is_html() const;
};
} // namespace remwharead

9
src/lib/CMakeLists.txt
View File

@ -1,9 +1,10 @@
include(GNUInstallDirs)
# Some distributions do not contain Poco*Config.cmake recipes.
find_package(Poco
COMPONENTS Foundation Net NetSSL Data DataSQLite JSON XML
CONFIG)
find_package(Poco CONFIG
COMPONENTS Foundation Net NetSSL Data DataSQLite JSON XML)
find_package(Boost 1.48.0 REQUIRED COMPONENTS locale)
file(GLOB_RECURSE sources_lib *.cpp)
file(GLOB_RECURSE headers_lib ../../include/*.hpp)
@ -22,7 +23,7 @@ target_include_directories(${PROJECT_NAME}
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
target_link_libraries(${PROJECT_NAME}
PRIVATE pthread
PRIVATE pthread Boost::locale
PUBLIC stdc++fs)
# If no Poco*Config.cmake recipes are found, look for headers in standard dirs.

66
src/lib/uri.cpp
View File

@ -16,6 +16,7 @@
#include "uri.hpp"
#include "version.hpp"
#include <boost/locale.hpp>
#include <Poco/Environment.h>
#include <Poco/Exception.h>
#include <Poco/Net/HTTPClientSession.h>
@ -66,7 +67,7 @@ archive_answer::operator bool()
}
URI::URI(string uri)
:_uri(move(uri))
: _uri(move(uri))
{
Poco::Net::initializeSSL();
@ -130,16 +131,17 @@ html_extract URI::get()
{
try
{
const string answer = make_request(_uri);
if (!answer.empty())
_document = make_request(_uri);
_document = to_utf8(_document);
if (!_document.empty())
{
return
{
true,
"",
extract_title(answer),
extract_description(answer),
strip_html(answer)
extract_title(),
extract_description(),
strip_html()
};
}
}
@ -224,14 +226,13 @@ string URI::make_request(const string &uri, bool archive) const
}
}
string URI::extract_title(const string &html) const
string URI::extract_title() const
{
const RegEx re_htmlfile(".*\\.(.?html?|xml|rss)$", RegEx::RE_CASELESS);
if (_uri.substr(0, 4) == "http" || re_htmlfile.match(_uri))
if (is_html())
{
const RegEx re_title("<title(?: [^>]+)?>([^<]+)", RegEx::RE_CASELESS);
vector<string> matches;
re_title.split(html, matches);
re_title.split(_document, matches);
if (matches.size() >= 2)
{
return remove_newlines(unescape_html(matches[1]));
@ -241,29 +242,28 @@ string URI::extract_title(const string &html) const
return "";
}
string URI::extract_description(const string &html) const
string URI::extract_description() const
{
const RegEx re_htmlfile(".*\\.(.?html?|xml|rss)$", RegEx::RE_CASELESS);
if (_uri.substr(0, 4) == "http" || re_htmlfile.match(_uri))
if (is_html())
{
const RegEx re_desc(R"(description"[^>]+content="([^"]+))",
RegEx::RE_CASELESS);
vector<string> matches;
re_desc.split(html, matches);
re_desc.split(_document, matches);
if (matches.size() >= 2)
{
return remove_newlines(cut_text(unescape_html(matches[1]), 500));
return cut_text(remove_newlines(unescape_html(matches[1])), 500);
}
}
return "";
}
string URI::strip_html(const string &html) const
string URI::strip_html() const
{
string out;
out = remove_html_tags(html, "script"); // Remove JavaScript.
out = remove_html_tags(_document, "script"); // Remove JavaScript.
out = remove_html_tags(out, "style"); // Remove CSS.
out = remove_html_tags(out); // Remove tags.
@ -681,4 +681,36 @@ string URI::cut_text(const string &text, const uint16_t n_chars) const
return text;
}
string URI::to_utf8(const string &str)
{
if (_encoding.empty())
{
detect_encoding();
}
return boost::locale::conv::to_utf<char>(str, _encoding);
}
void URI::detect_encoding()
{
const RegEx re_encoding(R"(<meta.+charset=(.+)[";])", RegEx::RE_CASELESS);
vector<string> matches;
re_encoding.split(_document, matches);
if (matches.size() >= 2)
{
_encoding = matches[1];
}
}
bool URI::is_html() const
{
const RegEx re_htmlfile(".*\\.(.?html?|xml|rss)$", RegEx::RE_CASELESS);
if (_uri.substr(0, 4) == "http" || re_htmlfile.match(_uri))
{
return true;
}
return false;
}
} // namespace remwharead

34
tests/test_uri.cpp
View File

@ -32,41 +32,29 @@ SCENARIO ("URI works correctly")
explicit URITest(const string &)
: URI("") {}
URITest()
: URI("test.html") {}
: URI("test.html")
{
_document =
"<html><head><title>title</title>"
"<meta name=\"description\" content=\"description\" />"
"<body><p>A short <span style=\"\">sentence</span>.</p>"
"</body></head></html>";
}
bool test_title()
{
if (extract_title(_html) == "title")
{
return true;
}
return false;
return (extract_title() == "title");
}
bool test_description()
{
if (extract_description(_html) == "description")
{
return true;
}
return false;
return (extract_description() == "description");
}
bool test_fulltext()
{
if (strip_html(_html) == "titleA short sentence.")
{
return true;
}
return false;
return (strip_html() == "titleA short sentence.");
}
private:
const string _html =
"<html><head><title>title</title>"
"<meta name=\"description\" content=\"description\" />"
"<body><p>A short <span style=\"\">sentence</span>.</p>"
"</body></head></html>";
};
WHEN ("extract_title() is called")