diff --git a/src/uri.cpp b/src/uri.cpp index ca5763e..4a01304 100644 --- a/src/uri.cpp +++ b/src/uri.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -48,10 +47,7 @@ const html_extract URI::get() { std::ostringstream oss; curlpp::Easy request; - request.setOpt(string("remwharead/") - + global::version); - request.setOpt({ "Connection: close" }); - request.setOpt(true); + set_curlpp_options(request); request.setOpt(_uri); request.setOpt(&oss); request.perform(); @@ -80,6 +76,14 @@ const html_extract URI::get() return { "", "", "" }; } +void URI::set_curlpp_options(curlpp::Easy &request) +{ + request.setOpt(string("remwharead/") + + global::version); + request.setOpt({ "Connection: close" }); + request.setOpt(true); +} + const string URI::extract_title(const string &html) { const regex re_htmlfile("\\.(.?html?|xml|rss)$"); @@ -474,10 +478,7 @@ const string URI::archive() { std::ostringstream oss; curlpp::Easy request; - request.setOpt(string("remwharead/") - + global::version); - request.setOpt({ "Connection: close" }); - request.setOpt(true); + set_curlpp_options(request); request.setOpt("https://web.archive.org/save/" + _uri); request.setOpt(&oss); request.setOpt(true); // Make a HEAD request. diff --git a/src/uri.hpp b/src/uri.hpp index 3217013..f76b305 100644 --- a/src/uri.hpp +++ b/src/uri.hpp @@ -18,6 +18,7 @@ #define REMWHAREAD_URI_HPP #include +#include using std::string; @@ -41,6 +42,7 @@ public: protected: string _uri; + void set_curlpp_options(curlpp::Easy &request); const string extract_title(const string &html); const string extract_description(const string &html); const string strip_html(const string &html);