Compare commits
45 Commits
Author | SHA1 | Date |
---|---|---|
tastytea | 6123c7fbb3 | |
tastytea | 5b56ad00b3 | |
tastytea | abd97989f2 | |
tastytea | dead7481d8 | |
tastytea | 54afa6babf | |
tastytea | 79bf24942d | |
tastytea | 26f52d23a6 | |
tastytea | 6426305366 | |
tastytea | 4dc9faf1df | |
tastytea | a198f1323a | |
tastytea | 4e9e750e35 | |
tastytea | 5b82bb0ef0 | |
tastytea | b7d5b21899 | |
tastytea | eab10e28ae | |
tastytea | 6d45af58a2 | |
tastytea | 8b953ff817 | |
tastytea | 0b32de2846 | |
tastytea | b40f9910d0 | |
tastytea | 4f4f4dacad | |
tastytea | 4f78da24b5 | |
tastytea | 6802c7563d | |
tastytea | d75342e71f | |
tastytea | 7e147012fe | |
tastytea | 2b8e443da7 | |
tastytea | 5e9937c9a0 | |
tastytea | 1c2828369d | |
tastytea | 53230aedaa | |
tastytea | b79dacf742 | |
tastytea | ee4debb005 | |
tastytea | 8a4f518cb9 | |
tastytea | 3a7f4ba8e2 | |
tastytea | bb5d9cecad | |
tastytea | 8c1c18ed54 | |
tastytea | a28d674ac0 | |
tastytea | 4b6d1c19e3 | |
tastytea | 70cc91e0fc | |
tastytea | 2ce2530ac3 | |
tastytea | 62fd8a8abb | |
tastytea | 489e1fba99 | |
tastytea | 92db2241b0 | |
tastytea | f9101a3aa1 | |
tastytea | c3307dddf0 | |
tastytea | 56dc4083ce | |
tastytea | d4d7cd4efd | |
tastytea | ab94a9e6b0 |
|
@ -0,0 +1,131 @@
|
||||||
|
# -*- mode: yaml -*-
|
||||||
|
# Written for clang-format 10.
|
||||||
|
# https://releases.llvm.org/10.0.0/tools/clang/docs/ClangFormatStyleOptions.html
|
||||||
|
---
|
||||||
|
DisableFormat: false
|
||||||
|
Language: Cpp
|
||||||
|
|
||||||
|
AccessModifierOffset: -4
|
||||||
|
AlignAfterOpenBracket: Align
|
||||||
|
AlignConsecutiveAssignments: false
|
||||||
|
# AlignConsecutiveBitFields: false # clang-format 11
|
||||||
|
AlignConsecutiveDeclarations: false
|
||||||
|
AlignConsecutiveMacros: false
|
||||||
|
AlignEscapedNewlines: DontAlign
|
||||||
|
AlignOperands: true # clang-format 11: Align
|
||||||
|
AlignTrailingComments: true
|
||||||
|
AllowAllArgumentsOnNextLine: false
|
||||||
|
AllowAllConstructorInitializersOnNextLine: false
|
||||||
|
AllowAllParametersOfDeclarationOnNextLine: false
|
||||||
|
AllowShortBlocksOnASingleLine: Empty
|
||||||
|
AllowShortCaseLabelsOnASingleLine: false
|
||||||
|
# AllowShortEnumsOnASingleLine: false # clang-format 11
|
||||||
|
AllowShortFunctionsOnASingleLine: Empty
|
||||||
|
AllowShortIfStatementsOnASingleLine: Never
|
||||||
|
AllowShortLambdasOnASingleLine: Inline
|
||||||
|
AllowShortLoopsOnASingleLine: false
|
||||||
|
AlwaysBreakAfterReturnType: None
|
||||||
|
AlwaysBreakBeforeMultilineStrings: false
|
||||||
|
AlwaysBreakTemplateDeclarations: Yes
|
||||||
|
BinPackArguments: true
|
||||||
|
BinPackParameters: true
|
||||||
|
BraceWrapping: # If BreakBeforeBraces is set to Custom.
|
||||||
|
AfterCaseLabel: true
|
||||||
|
AfterClass: true
|
||||||
|
AfterControlStatement: Always
|
||||||
|
AfterEnum: true
|
||||||
|
AfterFunction: true
|
||||||
|
AfterNamespace: true
|
||||||
|
AfterStruct: true
|
||||||
|
AfterUnion: true
|
||||||
|
AfterExternBlock: true
|
||||||
|
BeforeCatch: true
|
||||||
|
BeforeElse: true
|
||||||
|
# BeforeLambdaBody: true # clang-format 11
|
||||||
|
# BeforeWhile: true # clang-format 11
|
||||||
|
IndentBraces: false
|
||||||
|
SplitEmptyFunction: false
|
||||||
|
SplitEmptyRecord: false
|
||||||
|
SplitEmptyNamespace: false
|
||||||
|
BreakBeforeBinaryOperators: NonAssignment
|
||||||
|
BreakBeforeBraces: Custom
|
||||||
|
BreakBeforeTernaryOperators: true
|
||||||
|
BreakConstructorInitializers: BeforeComma
|
||||||
|
BreakInheritanceList: BeforeComma
|
||||||
|
BreakStringLiterals: true
|
||||||
|
ColumnLimit: 80
|
||||||
|
# CommentPragmas: 'regex'
|
||||||
|
CompactNamespaces: false
|
||||||
|
ConstructorInitializerAllOnOneLineOrOnePerLine: false
|
||||||
|
ConstructorInitializerIndentWidth: 4
|
||||||
|
ContinuationIndentWidth: 4
|
||||||
|
Cpp11BracedListStyle: true
|
||||||
|
DeriveLineEnding: true
|
||||||
|
DerivePointerAlignment: false
|
||||||
|
FixNamespaceComments: true
|
||||||
|
ForEachMacros:
|
||||||
|
- FOREACH
|
||||||
|
- RANGES_FOR
|
||||||
|
- Q_FOREACH
|
||||||
|
- BOOST_FOREACH
|
||||||
|
IncludeBlocks: Regroup
|
||||||
|
IncludeCategories: # stdlib headers into own group.
|
||||||
|
- Regex: '^[^\.]+$'
|
||||||
|
Priority: 4
|
||||||
|
# IndentCaseBlocks: false # clang-format 11
|
||||||
|
IndentCaseLabels: false
|
||||||
|
# IndentExternBlock: NoIndent # clang-format 11
|
||||||
|
IndentGotoLabels: false
|
||||||
|
IndentPPDirectives: AfterHash
|
||||||
|
IndentWidth: 4
|
||||||
|
IndentWrappedFunctionNames: false
|
||||||
|
KeepEmptyLinesAtTheStartOfBlocks: true
|
||||||
|
# MacroBlockBegin: 'string'
|
||||||
|
# MacroBlockEnd: 'string'
|
||||||
|
MaxEmptyLinesToKeep: 1
|
||||||
|
NamespaceIndentation: None
|
||||||
|
# NamespaceMacros: 'string'
|
||||||
|
PenaltyBreakAssignment: 250
|
||||||
|
PenaltyBreakBeforeFirstCallParameter: 300
|
||||||
|
# PenaltyBreakComment: 300
|
||||||
|
# PenaltyBreakFirstLessLess: 120
|
||||||
|
# PenaltyBreakString: 1000
|
||||||
|
# PenaltyBreakTemplateDeclaration: 10
|
||||||
|
# PenaltyExcessCharacter: 1000000
|
||||||
|
# PenaltyReturnTypeOnItsOwnLine: 60
|
||||||
|
PointerAlignment: Right
|
||||||
|
# RawStringFormats: # <YAML>
|
||||||
|
ReflowComments: true
|
||||||
|
SortIncludes: true
|
||||||
|
SortUsingDeclarations: true
|
||||||
|
SpaceAfterCStyleCast: false
|
||||||
|
SpaceAfterLogicalNot: false
|
||||||
|
SpaceAfterTemplateKeyword: false
|
||||||
|
SpaceBeforeAssignmentOperators: true
|
||||||
|
SpaceBeforeCpp11BracedList: false
|
||||||
|
SpaceBeforeCtorInitializerColon: true
|
||||||
|
SpaceBeforeInheritanceColon: true
|
||||||
|
SpaceBeforeParens: ControlStatements
|
||||||
|
SpaceBeforeRangeBasedForLoopColon: true
|
||||||
|
SpaceBeforeSquareBrackets: false
|
||||||
|
SpaceInEmptyBlock: false
|
||||||
|
SpaceInEmptyParentheses: false
|
||||||
|
SpacesBeforeTrailingComments: 1
|
||||||
|
SpacesInAngles: false
|
||||||
|
SpacesInCStyleCastParentheses: false
|
||||||
|
SpacesInConditionalStatement: false
|
||||||
|
SpacesInContainerLiterals: false
|
||||||
|
SpacesInParentheses: false
|
||||||
|
SpacesInSquareBrackets: false
|
||||||
|
Standard: Auto
|
||||||
|
# StatementMacros:
|
||||||
|
# - Q_UNUSED
|
||||||
|
# - QT_REQUIRE_VERSION
|
||||||
|
TabWidth: 4
|
||||||
|
# TypenameMacros:
|
||||||
|
# - STACK_OF
|
||||||
|
# - LIST
|
||||||
|
UseCRLF: false
|
||||||
|
UseTab: Never
|
||||||
|
# WhitespaceSensitiveMacros: ['string', 'string'] # clang-format 11
|
||||||
|
...
|
|
@ -0,0 +1,43 @@
|
||||||
|
# -*- mode: conf; fill-column: 100; -*-
|
||||||
|
# Written for clang-tidy 9.
|
||||||
|
|
||||||
|
---
|
||||||
|
Checks: '*,
|
||||||
|
-cppcoreguidelines-non-private-member-variables-in-classes,
|
||||||
|
-fuchsia-default-arguments-calls,
|
||||||
|
-fuchsia-default-arguments-declarations,
|
||||||
|
-fuchsia-default-arguments,
|
||||||
|
-llvm-include-order,
|
||||||
|
-llvm-header-guard,
|
||||||
|
-misc-non-private-member-variables-in-classes,
|
||||||
|
-fuchsia-overloaded-operator,
|
||||||
|
-cppcoreguidelines-avoid-magic-numbers,
|
||||||
|
-readability-magic-numbers,
|
||||||
|
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,
|
||||||
|
-hicpp-no-array-decay,
|
||||||
|
-modernize-avoid-c-arrays,
|
||||||
|
-cppcoreguidelines-avoid-c-arrays,
|
||||||
|
-hicpp-avoid-c-arrays,
|
||||||
|
-google-build-using-namespace,
|
||||||
|
-readability-named-parameter,
|
||||||
|
-google-runtime-references,
|
||||||
|
-hicpp-avoid-goto,
|
||||||
|
-hicpp-vararg,
|
||||||
|
-fuchsia-statically-constructed-objects,
|
||||||
|
-google-readability-todo,
|
||||||
|
-modernize-use-trailing-return-type'
|
||||||
|
CheckOptions: - { key: readability-identifier-naming.ClassCase, value: CamelCase }
|
||||||
|
# Clashes with constant private member prefix. (const int _var;)
|
||||||
|
# - { key: readability-identifier-naming.ConstantCase, value: lower_case }
|
||||||
|
- { key: readability-identifier-naming.EnumCase, value: lower_case }
|
||||||
|
- { key: readability-identifier-naming.FunctionCase, value: lower_case }
|
||||||
|
- { key: readability-identifier-naming.MemberCase, value: lower_case }
|
||||||
|
- { key: readability-identifier-naming.ParameterCase, value: lower_case }
|
||||||
|
- { key: readability-identifier-naming.PrivateMemberCase, value: lower_case }
|
||||||
|
- { key: readability-identifier-naming.PrivateMemberPrefix, value: _ }
|
||||||
|
- { key: readability-identifier-naming.ProtextedMemberCase, 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;)
|
||||||
|
# - { key: readability-identifier-naming.VariableCase, value: lower_case }
|
||||||
|
...
|
10
.drone.yml
10
.drone.yml
|
@ -24,7 +24,7 @@ steps:
|
||||||
- rm /etc/apt/apt.conf.d/docker-clean
|
- rm /etc/apt/apt.conf.d/docker-clean
|
||||||
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
|
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
|
||||||
- apt-get update -q
|
- apt-get update -q
|
||||||
- apt-get install -qy g++-7 cmake libpoco-dev libboost-locale-dev asciidoc catch
|
- apt-get install -qy g++-7 cmake libpoco-dev libboost-locale-dev libcurl4-openssl-dev asciidoc catch
|
||||||
- rm -rf build && mkdir -p build && cd build
|
- rm -rf build && mkdir -p build && cd build
|
||||||
- cmake -DWITH_MOZILLA=YES -DWITH_TESTS=YES ..
|
- cmake -DWITH_MOZILLA=YES -DWITH_TESTS=YES ..
|
||||||
- make VERBOSE=1
|
- make VERBOSE=1
|
||||||
|
@ -52,7 +52,7 @@ steps:
|
||||||
- gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
|
- gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add -
|
||||||
- apt-get update -q
|
- apt-get update -q
|
||||||
- apt-get install -qy -t bionic g++-9
|
- apt-get install -qy -t bionic g++-9
|
||||||
- apt-get install -qy cmake libpoco-dev libboost-locale-dev asciidoc catch
|
- apt-get install -qy cmake libpoco-dev libboost-locale-dev libcurl4-openssl-dev asciidoc catch
|
||||||
- rm -rf build && mkdir -p build && cd build
|
- rm -rf build && mkdir -p build && cd build
|
||||||
- cmake -DWITH_MOZILLA=YES ..
|
- cmake -DWITH_MOZILLA=YES ..
|
||||||
- make VERBOSE=1
|
- make VERBOSE=1
|
||||||
|
@ -71,7 +71,7 @@ steps:
|
||||||
- rm /etc/apt/apt.conf.d/docker-clean
|
- rm /etc/apt/apt.conf.d/docker-clean
|
||||||
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
|
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
|
||||||
- apt-get update -q
|
- apt-get update -q
|
||||||
- apt-get install -qy clang-6.0 cmake libpoco-dev libboost-locale-dev asciidoc catch
|
- apt-get install -qy clang-6.0 cmake libpoco-dev libboost-locale-dev libcurl4-openssl-dev asciidoc catch
|
||||||
- rm -rf build && mkdir -p build && cd build
|
- rm -rf build && mkdir -p build && cd build
|
||||||
- cmake -DWITH_MOZILLA=YES ..
|
- cmake -DWITH_MOZILLA=YES ..
|
||||||
- make VERBOSE=1
|
- make VERBOSE=1
|
||||||
|
@ -90,7 +90,7 @@ steps:
|
||||||
- rm /etc/apt/apt.conf.d/docker-clean
|
- rm /etc/apt/apt.conf.d/docker-clean
|
||||||
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
|
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
|
||||||
- apt-get update -q
|
- apt-get update -q
|
||||||
- apt-get install -qy clang cmake libpoco-dev libboost-locale-dev asciidoc catch
|
- apt-get install -qy clang cmake libpoco-dev libboost-locale-dev libcurl4-openssl-dev asciidoc catch
|
||||||
- rm -rf build && mkdir -p build && cd build
|
- rm -rf build && mkdir -p build && cd build
|
||||||
- cmake -DWITH_MOZILLA=YES ..
|
- cmake -DWITH_MOZILLA=YES ..
|
||||||
- make VERBOSE=1
|
- make VERBOSE=1
|
||||||
|
@ -140,7 +140,7 @@ steps:
|
||||||
- rm /etc/apt/apt.conf.d/docker-clean
|
- rm /etc/apt/apt.conf.d/docker-clean
|
||||||
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
|
- alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
|
||||||
- apt-get update -q
|
- apt-get update -q
|
||||||
- apt-get install -qy g++ cmake libpoco-dev libboost-locale-dev asciidoc catch
|
- apt-get install -qy g++ cmake libpoco-dev libboost-locale-dev libcurl4-openssl-dev asciidoc catch
|
||||||
- apt-get install -qy build-essential file zip
|
- apt-get install -qy build-essential file zip
|
||||||
- rm -rf build && mkdir -p build && cd build
|
- 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 ..
|
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_MOZILLA=YES -DMOZILLA_NMH_DIR="lib/mozilla/native-messaging-hosts" -DWITH_DEB=YES ..
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Support version 3.9 and above, but use policy settings up to 3.14.
|
# Support version 3.9 and above, but use policy settings up to 3.17.
|
||||||
# 3.9 is needed for project description.
|
# 3.9 is needed for project description.
|
||||||
cmake_minimum_required(VERSION 3.9...3.14)
|
cmake_minimum_required(VERSION 3.9...3.17)
|
||||||
# Ranges are supported from 3.12, set policy to current for < 3.12.
|
# Ranges are supported from 3.12, set policy to current for < 3.12.
|
||||||
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
||||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||||
|
@ -9,45 +9,11 @@ endif()
|
||||||
# Global build options.
|
# Global build options.
|
||||||
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "The type of build.")
|
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "The type of build.")
|
||||||
option(BUILD_SHARED_LIBS "Build shared libraries." YES)
|
option(BUILD_SHARED_LIBS "Build shared libraries." YES)
|
||||||
option(HUNTER_ENABLED "Use the Hunter package manager" NO)
|
|
||||||
|
|
||||||
if(${HUNTER_ENABLED})
|
|
||||||
set(BUILD_SHARED_LIBS "NO")
|
|
||||||
set(HUNTER_PocoCpp_CMAKE_ARGS
|
|
||||||
ENABLE_CRYPTO=ON
|
|
||||||
ENABLE_DATA=ON
|
|
||||||
ENABLE_JSON=ON
|
|
||||||
ENABLE_NET=ON
|
|
||||||
ENABLE_NETSSL=ON
|
|
||||||
ENABLE_SQL_SQLITE=ON
|
|
||||||
ENABLE_UTIL=ON
|
|
||||||
ENABLE_XML=ON)
|
|
||||||
|
|
||||||
# FetchContent_MakeAvailable needs 3.14.
|
|
||||||
if(NOT (${CMAKE_VERSION} VERSION_LESS 3.14))
|
|
||||||
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)
|
|
||||||
else()
|
|
||||||
include("cmake/HunterGate.cmake")
|
|
||||||
HunterGate(
|
|
||||||
URL "https://github.com/cpp-pm/hunter/archive/v0.23.225.tar.gz"
|
|
||||||
SHA1 "4b018ec7b673817475c1fb9f0bd4dfb7c5e7f343"
|
|
||||||
LOCAL) # Load cmake/Hunter/config.cmake.
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
project(remwharead
|
project(remwharead
|
||||||
VERSION 0.9.2
|
VERSION 0.10.0
|
||||||
DESCRIPTION "Saves URIs of things you want to remember in a database.")
|
DESCRIPTION "Saves URIs of things you want to remember in a database.")
|
||||||
|
|
||||||
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")
|
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
|
@ -57,6 +23,7 @@ option(WITH_TESTS "Compile tests." NO)
|
||||||
option(WITH_MOZILLA "Build and install wrapper for Mozilla browsers." YES)
|
option(WITH_MOZILLA "Build and install wrapper for Mozilla browsers." YES)
|
||||||
set(MOZILLA_NMH_DIR "${CMAKE_INSTALL_LIBDIR}/mozilla/native-messaging-hosts"
|
set(MOZILLA_NMH_DIR "${CMAKE_INSTALL_LIBDIR}/mozilla/native-messaging-hosts"
|
||||||
CACHE STRING "Directory for the Mozilla extension wrapper.")
|
CACHE STRING "Directory for the Mozilla extension wrapper.")
|
||||||
|
option(WITH_CLANG-TIDY "Check sourcecode with clang-tidy while compiling." NO)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
@ -64,7 +31,15 @@ set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
|
||||||
include(debug_flags)
|
include(debug_flags)
|
||||||
|
|
||||||
|
if(WITH_CLANG-TIDY)
|
||||||
|
set(CMAKE_CXX_CLANG_TIDY
|
||||||
|
"clang-tidy"
|
||||||
|
"-header-filter=${PROJECT_SOURCE_DIR}"
|
||||||
|
"-quiet")
|
||||||
|
endif()
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
|
add_subdirectory(src/curl_wrapper)
|
||||||
add_subdirectory(src/lib)
|
add_subdirectory(src/lib)
|
||||||
add_subdirectory(include)
|
add_subdirectory(include)
|
||||||
add_subdirectory(src/cli)
|
add_subdirectory(src/cli)
|
||||||
|
|
26
README.adoc
26
README.adoc
|
@ -19,8 +19,10 @@
|
||||||
:uri-rpm: http://www.rpm.org/
|
:uri-rpm: http://www.rpm.org/
|
||||||
:uri-ff-addon: https://addons.mozilla.org/firefox/addon/remwharead
|
:uri-ff-addon: https://addons.mozilla.org/firefox/addon/remwharead
|
||||||
:uri-papirus: https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
|
:uri-papirus: https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
|
||||||
:uri-hunter: https://github.com/cpp-pm/hunter
|
|
||||||
:uri-rofi: https://github.com/davatorium/rofi
|
:uri-rofi: https://github.com/davatorium/rofi
|
||||||
|
:uri-boost: https://www.boost.org/
|
||||||
|
:uri-clang-tidy: https://clang.llvm.org/extra/clang-tidy/
|
||||||
|
:uri-curl: https://curl.haxx.se/libcurl/
|
||||||
|
|
||||||
*remwharead* saves URIs of things you want to remember in a database along with
|
*remwharead* saves URIs of things you want to remember in a database along with
|
||||||
an URI to the archived version, the current date and time, title, description,
|
an URI to the archived version, the current date and time, title, description,
|
||||||
|
@ -87,6 +89,8 @@ only.
|
||||||
* C++ compiler ({uri-gcc}[gcc] 6+, {uri-clang}[clang] 6+)
|
* C++ compiler ({uri-gcc}[gcc] 6+, {uri-clang}[clang] 6+)
|
||||||
* {uri-cmake}[cmake] (at least: 3.9)
|
* {uri-cmake}[cmake] (at least: 3.9)
|
||||||
* {uri-poco}[POCO] (tested: 1.9 / 1.7)
|
* {uri-poco}[POCO] (tested: 1.9 / 1.7)
|
||||||
|
* {uri-boost}[Boost] (tested: 1.71 / 1.67)
|
||||||
|
* {uri-curl}[libcurl] (at least: 7.52)
|
||||||
* Optional:
|
* Optional:
|
||||||
** Manpage: {uri-asciidoc}[asciidoc] (tested: 8.6)
|
** Manpage: {uri-asciidoc}[asciidoc] (tested: 8.6)
|
||||||
** Tests: {uri-catch}[catch] (tested: 2.5 / 1.2)
|
** Tests: {uri-catch}[catch] (tested: 2.5 / 1.2)
|
||||||
|
@ -97,7 +101,7 @@ only.
|
||||||
====
|
====
|
||||||
[source,zsh]
|
[source,zsh]
|
||||||
----
|
----
|
||||||
apt-get install g++ cmake libpoco-dev asciidoc dpkg
|
apt-get install g++ cmake libpoco-dev libboost-dev asciidoc dpkg
|
||||||
----
|
----
|
||||||
====
|
====
|
||||||
|
|
||||||
|
@ -132,7 +136,8 @@ cmake --build .
|
||||||
* `-DMOZILLA_NMH_DIR` lets you set the directory for the Mozilla
|
* `-DMOZILLA_NMH_DIR` lets you set the directory for the Mozilla
|
||||||
extension wrapper. The complete path is
|
extension wrapper. The complete path is
|
||||||
`${CMAKE_INSTALL_PREFIX}/${MOZILLA_NMH_DIR}`.
|
`${CMAKE_INSTALL_PREFIX}/${MOZILLA_NMH_DIR}`.
|
||||||
* `-DHUNTER_ENABLED=YES` to use the package manager link:{uri-hunter}[Hunter].
|
* `-DWITH_CLANG-TIDY=YES` to check the sourcecode with
|
||||||
|
link:{uri-clang-tidy}[clang-tidy] while compiling.
|
||||||
* One of:
|
* One of:
|
||||||
** `-DWITH_DEB=YES` if you want to be able to generate a deb-package.
|
** `-DWITH_DEB=YES` if you want to be able to generate a deb-package.
|
||||||
** `-DWITH_RPM=YES` if you want to be able to generate an rpm-package.
|
** `-DWITH_RPM=YES` if you want to be able to generate an rpm-package.
|
||||||
|
@ -140,21 +145,6 @@ cmake --build .
|
||||||
You can run the tests with `cd tests && ctest`. Install with `make install`,
|
You can run the tests with `cd tests && ctest`. Install with `make install`,
|
||||||
generate binary packages with `make package`.
|
generate binary packages with `make package`.
|
||||||
|
|
||||||
===== Compiling with Hunter
|
|
||||||
|
|
||||||
If your operating system doesn't provide all the dependencies or the versions
|
|
||||||
are too old, you can use the Hunter package manager to download and compile all
|
|
||||||
library dependencies. Keep in mind that the packages from Hunter are not
|
|
||||||
necessarily up to date.
|
|
||||||
|
|
||||||
[source,shell]
|
|
||||||
----
|
|
||||||
mkdir build
|
|
||||||
cd build/
|
|
||||||
cmake -DHUNTER_ENABLED=YES ..
|
|
||||||
cmake --build .
|
|
||||||
----
|
|
||||||
|
|
||||||
== Browser plugins
|
== Browser plugins
|
||||||
|
|
||||||
=== WebExtension
|
=== WebExtension
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"manifest_version": 2,
|
"manifest_version": 2,
|
||||||
"name": "remwharead",
|
"name": "remwharead",
|
||||||
"version": "0.4.1",
|
"version": "0.5.0",
|
||||||
|
|
||||||
"description": "Integrates remwharead into your Browser.",
|
"description": "Integrates remwharead into your Browser.",
|
||||||
"homepage_url": "https://schlomp.space/tastytea/remwharead",
|
"homepage_url": "https://schlomp.space/tastytea/remwharead",
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* This file is part of remwharead.
|
/* This file is part of remwharead.
|
||||||
* Copyright © 2019 tastytea <tastytea@tastytea.de>
|
* Copyright © 2019, 2020 tastytea <tastytea@tastytea.de>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -14,73 +14,50 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string>
|
#include <Poco/Message.h>
|
||||||
#include <iostream>
|
#include <sys/wait.h>
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <sys/wait.h>
|
#include <iostream>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::cin;
|
using std::cin;
|
||||||
using std::cout;
|
using std::cout;
|
||||||
using std::uint32_t;
|
using std::string;
|
||||||
using std::system;
|
using std::system;
|
||||||
|
using std::uint32_t;
|
||||||
|
|
||||||
string read_input();
|
class Message
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
//! Read message from stdin and store it in _msg.
|
||||||
|
Message();
|
||||||
|
|
||||||
|
//! Decode message and return argument string for launch().
|
||||||
|
[[nodiscard]] string decode();
|
||||||
|
|
||||||
|
private:
|
||||||
|
string _msg;
|
||||||
|
|
||||||
|
//! Replace "\u001f" with the char in _msg.
|
||||||
|
void unescape();
|
||||||
|
|
||||||
|
//! Replace " with \" in field.
|
||||||
|
static void replace_in_field(string &field);
|
||||||
|
};
|
||||||
|
|
||||||
|
//! Send a message back.
|
||||||
void send_message(const string &message);
|
void send_message(const string &message);
|
||||||
|
|
||||||
|
//! Launch remwharead with args.
|
||||||
int launch(const string &args);
|
int launch(const string &args);
|
||||||
|
|
||||||
string read_input()
|
|
||||||
{
|
|
||||||
// Read message length.
|
|
||||||
uint32_t length;
|
|
||||||
char buffer[4];
|
|
||||||
|
|
||||||
cin.read(buffer, sizeof(uint32_t));
|
|
||||||
std::memcpy(&length, buffer, 4);
|
|
||||||
|
|
||||||
// Ignore quotes.
|
|
||||||
length -= 2;
|
|
||||||
cin.ignore(1);
|
|
||||||
|
|
||||||
// Read message.
|
|
||||||
string input;
|
|
||||||
char c;
|
|
||||||
|
|
||||||
for (; length > 0; --length)
|
|
||||||
{
|
|
||||||
cin.read(&c, 1);
|
|
||||||
input += c;
|
|
||||||
}
|
|
||||||
|
|
||||||
return input;
|
|
||||||
}
|
|
||||||
|
|
||||||
void send_message(const string &message)
|
|
||||||
{
|
|
||||||
const auto length = static_cast<uint32_t>(message.length() + 2);
|
|
||||||
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) - Necessary.
|
|
||||||
cout.write(reinterpret_cast<const char*>(&length), sizeof(uint32_t));
|
|
||||||
cout << '"' << message << '"';
|
|
||||||
}
|
|
||||||
|
|
||||||
int launch(const string &args)
|
|
||||||
{
|
|
||||||
const string cmd = "remwharead " + args + " 2>/dev/null";
|
|
||||||
// NOLINTNEXTLINE(cert-env33-c) - We get the arguments in a string.
|
|
||||||
int ret = system(cmd.c_str());
|
|
||||||
if (WIFEXITED(ret)) // NOLINT(hicpp-signed-bitwise) - Necessary.
|
|
||||||
{
|
|
||||||
ret = WEXITSTATUS(ret); // NOLINT(hicpp-signed-bitwise) - Necessary.
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
const string args = read_input();
|
Message message;
|
||||||
|
const auto args{message.decode()};
|
||||||
|
|
||||||
const int ret = launch(args);
|
const int ret = launch(args);
|
||||||
|
|
||||||
|
@ -90,8 +67,93 @@ int main()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
send_message("Command failed with status: "
|
send_message("Command failed with status: " + std::to_string(ret)
|
||||||
+ std::to_string(ret) + '.');
|
+ '.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
Message::Message()
|
||||||
|
{
|
||||||
|
// Read message length.
|
||||||
|
uint32_t length{0};
|
||||||
|
char buffer[4];
|
||||||
|
cin.read(buffer, sizeof(length));
|
||||||
|
std::memcpy(&length, buffer, sizeof(length));
|
||||||
|
|
||||||
|
// Ignore quotes.
|
||||||
|
length -= 2;
|
||||||
|
cin.ignore(1);
|
||||||
|
|
||||||
|
// Read message.
|
||||||
|
char c{'\0'};
|
||||||
|
for (; length > 0; --length)
|
||||||
|
{
|
||||||
|
cin.read(&c, 1);
|
||||||
|
_msg += c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
string Message::decode()
|
||||||
|
{
|
||||||
|
unescape();
|
||||||
|
|
||||||
|
constexpr char separator{'\u001f'}; // UNIT SEPARATOR.
|
||||||
|
if (_msg[0] != separator) // Extension uses old method.
|
||||||
|
{
|
||||||
|
return _msg;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t pos{1};
|
||||||
|
size_t endpos{0};
|
||||||
|
string newargs;
|
||||||
|
while ((endpos = _msg.find(separator, pos)) != string::npos)
|
||||||
|
{
|
||||||
|
string field{_msg.substr(pos, endpos - pos)};
|
||||||
|
replace_in_field(field);
|
||||||
|
newargs += " \"" + field + '"';
|
||||||
|
pos = endpos + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return newargs;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Message::unescape()
|
||||||
|
{
|
||||||
|
size_t pos{0};
|
||||||
|
while ((pos = _msg.find(R"(\u001f)", pos)) != string::npos)
|
||||||
|
{
|
||||||
|
_msg.replace(pos, 6, "\u001f");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Message::replace_in_field(string &field)
|
||||||
|
{
|
||||||
|
size_t pos{0};
|
||||||
|
while ((pos = field.find('"', pos)) != string::npos)
|
||||||
|
{
|
||||||
|
field.replace(pos, 1, R"(\")");
|
||||||
|
pos += 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void send_message(const string &message)
|
||||||
|
{
|
||||||
|
const auto length = static_cast<uint32_t>(message.length() + 2);
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
|
||||||
|
cout.write(reinterpret_cast<const char *>(&length), sizeof(uint32_t));
|
||||||
|
cout << '"' << message << '"';
|
||||||
|
}
|
||||||
|
|
||||||
|
int launch(const string &args)
|
||||||
|
{
|
||||||
|
const string cmd = "remwharead " + args + " 2>/dev/null";
|
||||||
|
// NOLINTNEXTLINE(cert-env33-c)
|
||||||
|
int ret = system(cmd.c_str());
|
||||||
|
if (WIFEXITED(ret)) // NOLINT(hicpp-signed-bitwise)
|
||||||
|
{
|
||||||
|
ret = WEXITSTATUS(ret); // NOLINT(hicpp-signed-bitwise)
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -7,12 +7,13 @@ const chkarchive = document.getElementById("chkarchive");
|
||||||
const btnadd = document.getElementById("btnadd");
|
const btnadd = document.getElementById("btnadd");
|
||||||
const msgstatus = document.getElementById("msgstatus");
|
const msgstatus = document.getElementById("msgstatus");
|
||||||
const msgerror = document.getElementById("msgerror");
|
const msgerror = document.getElementById("msgerror");
|
||||||
|
const separator = '\u001f';
|
||||||
|
|
||||||
|
|
||||||
function set_taburl(tabs) // Set taburl to URL of current tab.
|
function set_taburl(tabs) // Set taburl to URL of current tab.
|
||||||
{
|
{
|
||||||
const tab = tabs[0];
|
const tab = tabs[0];
|
||||||
taburl = '\'' + tab.url + '\'';
|
taburl = separator + tab.url + separator;
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_tags() // get tags from text input.
|
function get_tags() // get tags from text input.
|
||||||
|
@ -20,7 +21,7 @@ function get_tags() // get tags from text input.
|
||||||
const tags = txttags.value;
|
const tags = txttags.value;
|
||||||
if (tags != "")
|
if (tags != "")
|
||||||
{
|
{
|
||||||
return "-t '" + tags + "' ";
|
return separator + "-t " + tags;
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
@ -72,7 +73,7 @@ function add()
|
||||||
let archive = "";
|
let archive = "";
|
||||||
if (chkarchive.checked === false)
|
if (chkarchive.checked === false)
|
||||||
{
|
{
|
||||||
archive = "--no-archive ";
|
archive = separator + "--no-archive";
|
||||||
}
|
}
|
||||||
const args = get_tags() + archive + taburl;
|
const args = get_tags() + archive + taburl;
|
||||||
console.log(args);
|
console.log(args);
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
hunter_config(PocoCpp
|
|
||||||
VERSION ${HUNTER_PocoCpp_VERSION}
|
|
||||||
CMAKE_ARGS ${HUNTER_PocoCpp_CMAKE_ARGS})
|
|
|
@ -1,539 +0,0 @@
|
||||||
# Copyright (c) 2013-2019, Ruslan Baratov
|
|
||||||
# All rights reserved.
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without
|
|
||||||
# modification, are permitted provided that the following conditions are met:
|
|
||||||
#
|
|
||||||
# * Redistributions of source code must retain the above copyright notice, this
|
|
||||||
# list of conditions and the following disclaimer.
|
|
||||||
#
|
|
||||||
# * Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
# this list of conditions and the following disclaimer in the documentation
|
|
||||||
# and/or other materials provided with the distribution.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
||||||
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
||||||
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
||||||
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
||||||
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
||||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
||||||
# This is a gate file to Hunter package manager.
|
|
||||||
# Include this file using `include` command and add package you need, example:
|
|
||||||
#
|
|
||||||
# cmake_minimum_required(VERSION 3.2)
|
|
||||||
#
|
|
||||||
# include("cmake/HunterGate.cmake")
|
|
||||||
# HunterGate(
|
|
||||||
# URL "https://github.com/path/to/hunter/archive.tar.gz"
|
|
||||||
# SHA1 "798501e983f14b28b10cda16afa4de69eee1da1d"
|
|
||||||
# )
|
|
||||||
#
|
|
||||||
# project(MyProject)
|
|
||||||
#
|
|
||||||
# hunter_add_package(Foo)
|
|
||||||
# hunter_add_package(Boo COMPONENTS Bar Baz)
|
|
||||||
#
|
|
||||||
# Projects:
|
|
||||||
# * https://github.com/hunter-packages/gate/
|
|
||||||
# * https://github.com/ruslo/hunter
|
|
||||||
|
|
||||||
option(HUNTER_ENABLED "Enable Hunter package manager support" ON)
|
|
||||||
|
|
||||||
if(HUNTER_ENABLED)
|
|
||||||
if(CMAKE_VERSION VERSION_LESS "3.2")
|
|
||||||
message(
|
|
||||||
FATAL_ERROR
|
|
||||||
"At least CMake version 3.2 required for Hunter dependency management."
|
|
||||||
" Update CMake or set HUNTER_ENABLED to OFF."
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include(CMakeParseArguments) # cmake_parse_arguments
|
|
||||||
|
|
||||||
option(HUNTER_STATUS_PRINT "Print working status" ON)
|
|
||||||
option(HUNTER_STATUS_DEBUG "Print a lot info" OFF)
|
|
||||||
option(HUNTER_TLS_VERIFY "Enable/disable TLS certificate checking on downloads" ON)
|
|
||||||
|
|
||||||
set(HUNTER_ERROR_PAGE "https://docs.hunter.sh/en/latest/reference/errors")
|
|
||||||
|
|
||||||
function(hunter_gate_status_print)
|
|
||||||
if(HUNTER_STATUS_PRINT OR HUNTER_STATUS_DEBUG)
|
|
||||||
foreach(print_message ${ARGV})
|
|
||||||
message(STATUS "[hunter] ${print_message}")
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(hunter_gate_status_debug)
|
|
||||||
if(HUNTER_STATUS_DEBUG)
|
|
||||||
foreach(print_message ${ARGV})
|
|
||||||
string(TIMESTAMP timestamp)
|
|
||||||
message(STATUS "[hunter *** DEBUG *** ${timestamp}] ${print_message}")
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(hunter_gate_error_page error_page)
|
|
||||||
message("------------------------------ ERROR ------------------------------")
|
|
||||||
message(" ${HUNTER_ERROR_PAGE}/${error_page}.html")
|
|
||||||
message("-------------------------------------------------------------------")
|
|
||||||
message("")
|
|
||||||
message(FATAL_ERROR "")
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(hunter_gate_internal_error)
|
|
||||||
message("")
|
|
||||||
foreach(print_message ${ARGV})
|
|
||||||
message("[hunter ** INTERNAL **] ${print_message}")
|
|
||||||
endforeach()
|
|
||||||
message("[hunter ** INTERNAL **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
|
|
||||||
message("")
|
|
||||||
hunter_gate_error_page("error.internal")
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(hunter_gate_fatal_error)
|
|
||||||
cmake_parse_arguments(hunter "" "ERROR_PAGE" "" "${ARGV}")
|
|
||||||
if("${hunter_ERROR_PAGE}" STREQUAL "")
|
|
||||||
hunter_gate_internal_error("Expected ERROR_PAGE")
|
|
||||||
endif()
|
|
||||||
message("")
|
|
||||||
foreach(x ${hunter_UNPARSED_ARGUMENTS})
|
|
||||||
message("[hunter ** FATAL ERROR **] ${x}")
|
|
||||||
endforeach()
|
|
||||||
message("[hunter ** FATAL ERROR **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
|
|
||||||
message("")
|
|
||||||
hunter_gate_error_page("${hunter_ERROR_PAGE}")
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(hunter_gate_user_error)
|
|
||||||
hunter_gate_fatal_error(${ARGV} ERROR_PAGE "error.incorrect.input.data")
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(hunter_gate_self root version sha1 result)
|
|
||||||
string(COMPARE EQUAL "${root}" "" is_bad)
|
|
||||||
if(is_bad)
|
|
||||||
hunter_gate_internal_error("root is empty")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
string(COMPARE EQUAL "${version}" "" is_bad)
|
|
||||||
if(is_bad)
|
|
||||||
hunter_gate_internal_error("version is empty")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
string(COMPARE EQUAL "${sha1}" "" is_bad)
|
|
||||||
if(is_bad)
|
|
||||||
hunter_gate_internal_error("sha1 is empty")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
string(SUBSTRING "${sha1}" 0 7 archive_id)
|
|
||||||
|
|
||||||
if(EXISTS "${root}/cmake/Hunter")
|
|
||||||
set(hunter_self "${root}")
|
|
||||||
else()
|
|
||||||
set(
|
|
||||||
hunter_self
|
|
||||||
"${root}/_Base/Download/Hunter/${version}/${archive_id}/Unpacked"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set("${result}" "${hunter_self}" PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
# Set HUNTER_GATE_ROOT cmake variable to suitable value.
|
|
||||||
function(hunter_gate_detect_root)
|
|
||||||
# Check CMake variable
|
|
||||||
string(COMPARE NOTEQUAL "${HUNTER_ROOT}" "" not_empty)
|
|
||||||
if(not_empty)
|
|
||||||
set(HUNTER_GATE_ROOT "${HUNTER_ROOT}" PARENT_SCOPE)
|
|
||||||
hunter_gate_status_debug("HUNTER_ROOT detected by cmake variable")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Check environment variable
|
|
||||||
string(COMPARE NOTEQUAL "$ENV{HUNTER_ROOT}" "" not_empty)
|
|
||||||
if(not_empty)
|
|
||||||
set(HUNTER_GATE_ROOT "$ENV{HUNTER_ROOT}" PARENT_SCOPE)
|
|
||||||
hunter_gate_status_debug("HUNTER_ROOT detected by environment variable")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Check HOME environment variable
|
|
||||||
string(COMPARE NOTEQUAL "$ENV{HOME}" "" result)
|
|
||||||
if(result)
|
|
||||||
set(HUNTER_GATE_ROOT "$ENV{HOME}/.hunter" PARENT_SCOPE)
|
|
||||||
hunter_gate_status_debug("HUNTER_ROOT set using HOME environment variable")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Check SYSTEMDRIVE and USERPROFILE environment variable (windows only)
|
|
||||||
if(WIN32)
|
|
||||||
string(COMPARE NOTEQUAL "$ENV{SYSTEMDRIVE}" "" result)
|
|
||||||
if(result)
|
|
||||||
set(HUNTER_GATE_ROOT "$ENV{SYSTEMDRIVE}/.hunter" PARENT_SCOPE)
|
|
||||||
hunter_gate_status_debug(
|
|
||||||
"HUNTER_ROOT set using SYSTEMDRIVE environment variable"
|
|
||||||
)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
string(COMPARE NOTEQUAL "$ENV{USERPROFILE}" "" result)
|
|
||||||
if(result)
|
|
||||||
set(HUNTER_GATE_ROOT "$ENV{USERPROFILE}/.hunter" PARENT_SCOPE)
|
|
||||||
hunter_gate_status_debug(
|
|
||||||
"HUNTER_ROOT set using USERPROFILE environment variable"
|
|
||||||
)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
hunter_gate_fatal_error(
|
|
||||||
"Can't detect HUNTER_ROOT"
|
|
||||||
ERROR_PAGE "error.detect.hunter.root"
|
|
||||||
)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(hunter_gate_download dir)
|
|
||||||
string(
|
|
||||||
COMPARE
|
|
||||||
NOTEQUAL
|
|
||||||
"$ENV{HUNTER_DISABLE_AUTOINSTALL}"
|
|
||||||
""
|
|
||||||
disable_autoinstall
|
|
||||||
)
|
|
||||||
if(disable_autoinstall AND NOT HUNTER_RUN_INSTALL)
|
|
||||||
hunter_gate_fatal_error(
|
|
||||||
"Hunter not found in '${dir}'"
|
|
||||||
"Set HUNTER_RUN_INSTALL=ON to auto-install it from '${HUNTER_GATE_URL}'"
|
|
||||||
"Settings:"
|
|
||||||
" HUNTER_ROOT: ${HUNTER_GATE_ROOT}"
|
|
||||||
" HUNTER_SHA1: ${HUNTER_GATE_SHA1}"
|
|
||||||
ERROR_PAGE "error.run.install"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
string(COMPARE EQUAL "${dir}" "" is_bad)
|
|
||||||
if(is_bad)
|
|
||||||
hunter_gate_internal_error("Empty 'dir' argument")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" is_bad)
|
|
||||||
if(is_bad)
|
|
||||||
hunter_gate_internal_error("HUNTER_GATE_SHA1 empty")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" is_bad)
|
|
||||||
if(is_bad)
|
|
||||||
hunter_gate_internal_error("HUNTER_GATE_URL empty")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(done_location "${dir}/DONE")
|
|
||||||
set(sha1_location "${dir}/SHA1")
|
|
||||||
|
|
||||||
set(build_dir "${dir}/Build")
|
|
||||||
set(cmakelists "${dir}/CMakeLists.txt")
|
|
||||||
|
|
||||||
hunter_gate_status_debug("Locking directory: ${dir}")
|
|
||||||
file(LOCK "${dir}" DIRECTORY GUARD FUNCTION)
|
|
||||||
hunter_gate_status_debug("Lock done")
|
|
||||||
|
|
||||||
if(EXISTS "${done_location}")
|
|
||||||
# while waiting for lock other instance can do all the job
|
|
||||||
hunter_gate_status_debug("File '${done_location}' found, skip install")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
file(REMOVE_RECURSE "${build_dir}")
|
|
||||||
file(REMOVE_RECURSE "${cmakelists}")
|
|
||||||
|
|
||||||
file(MAKE_DIRECTORY "${build_dir}") # check directory permissions
|
|
||||||
|
|
||||||
# Disabling languages speeds up a little bit, reduces noise in the output
|
|
||||||
# and avoids path too long windows error
|
|
||||||
file(
|
|
||||||
WRITE
|
|
||||||
"${cmakelists}"
|
|
||||||
"cmake_minimum_required(VERSION 3.2)\n"
|
|
||||||
"project(HunterDownload LANGUAGES NONE)\n"
|
|
||||||
"include(ExternalProject)\n"
|
|
||||||
"ExternalProject_Add(\n"
|
|
||||||
" Hunter\n"
|
|
||||||
" URL\n"
|
|
||||||
" \"${HUNTER_GATE_URL}\"\n"
|
|
||||||
" URL_HASH\n"
|
|
||||||
" SHA1=${HUNTER_GATE_SHA1}\n"
|
|
||||||
" DOWNLOAD_DIR\n"
|
|
||||||
" \"${dir}\"\n"
|
|
||||||
" TLS_VERIFY\n"
|
|
||||||
" ${HUNTER_TLS_VERIFY}\n"
|
|
||||||
" SOURCE_DIR\n"
|
|
||||||
" \"${dir}/Unpacked\"\n"
|
|
||||||
" CONFIGURE_COMMAND\n"
|
|
||||||
" \"\"\n"
|
|
||||||
" BUILD_COMMAND\n"
|
|
||||||
" \"\"\n"
|
|
||||||
" INSTALL_COMMAND\n"
|
|
||||||
" \"\"\n"
|
|
||||||
")\n"
|
|
||||||
)
|
|
||||||
|
|
||||||
if(HUNTER_STATUS_DEBUG)
|
|
||||||
set(logging_params "")
|
|
||||||
else()
|
|
||||||
set(logging_params OUTPUT_QUIET)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
hunter_gate_status_debug("Run generate")
|
|
||||||
|
|
||||||
# Need to add toolchain file too.
|
|
||||||
# Otherwise on Visual Studio + MDD this will fail with error:
|
|
||||||
# "Could not find an appropriate version of the Windows 10 SDK installed on this machine"
|
|
||||||
if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
|
|
||||||
get_filename_component(absolute_CMAKE_TOOLCHAIN_FILE "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE)
|
|
||||||
set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=${absolute_CMAKE_TOOLCHAIN_FILE}")
|
|
||||||
else()
|
|
||||||
# 'toolchain_arg' can't be empty
|
|
||||||
set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
string(COMPARE EQUAL "${CMAKE_MAKE_PROGRAM}" "" no_make)
|
|
||||||
if(no_make)
|
|
||||||
set(make_arg "")
|
|
||||||
else()
|
|
||||||
# Test case: remove Ninja from PATH but set it via CMAKE_MAKE_PROGRAM
|
|
||||||
set(make_arg "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
execute_process(
|
|
||||||
COMMAND
|
|
||||||
"${CMAKE_COMMAND}"
|
|
||||||
"-H${dir}"
|
|
||||||
"-B${build_dir}"
|
|
||||||
"-G${CMAKE_GENERATOR}"
|
|
||||||
"${toolchain_arg}"
|
|
||||||
${make_arg}
|
|
||||||
WORKING_DIRECTORY "${dir}"
|
|
||||||
RESULT_VARIABLE download_result
|
|
||||||
${logging_params}
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT download_result EQUAL 0)
|
|
||||||
hunter_gate_internal_error(
|
|
||||||
"Configure project failed."
|
|
||||||
"To reproduce the error run: ${CMAKE_COMMAND} -H${dir} -B${build_dir} -G${CMAKE_GENERATOR} ${toolchain_arg} ${make_arg}"
|
|
||||||
"In directory ${dir}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
hunter_gate_status_print(
|
|
||||||
"Initializing Hunter workspace (${HUNTER_GATE_SHA1})"
|
|
||||||
" ${HUNTER_GATE_URL}"
|
|
||||||
" -> ${dir}"
|
|
||||||
)
|
|
||||||
execute_process(
|
|
||||||
COMMAND "${CMAKE_COMMAND}" --build "${build_dir}"
|
|
||||||
WORKING_DIRECTORY "${dir}"
|
|
||||||
RESULT_VARIABLE download_result
|
|
||||||
${logging_params}
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT download_result EQUAL 0)
|
|
||||||
hunter_gate_internal_error("Build project failed")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
file(REMOVE_RECURSE "${build_dir}")
|
|
||||||
file(REMOVE_RECURSE "${cmakelists}")
|
|
||||||
|
|
||||||
file(WRITE "${sha1_location}" "${HUNTER_GATE_SHA1}")
|
|
||||||
file(WRITE "${done_location}" "DONE")
|
|
||||||
|
|
||||||
hunter_gate_status_debug("Finished")
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
# Must be a macro so master file 'cmake/Hunter' can
|
|
||||||
# apply all variables easily just by 'include' command
|
|
||||||
# (otherwise PARENT_SCOPE magic needed)
|
|
||||||
macro(HunterGate)
|
|
||||||
if(HUNTER_GATE_DONE)
|
|
||||||
# variable HUNTER_GATE_DONE set explicitly for external project
|
|
||||||
# (see `hunter_download`)
|
|
||||||
set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# First HunterGate command will init Hunter, others will be ignored
|
|
||||||
get_property(_hunter_gate_done GLOBAL PROPERTY HUNTER_GATE_DONE SET)
|
|
||||||
|
|
||||||
if(NOT HUNTER_ENABLED)
|
|
||||||
# Empty function to avoid error "unknown function"
|
|
||||||
function(hunter_add_package)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
set(
|
|
||||||
_hunter_gate_disabled_mode_dir
|
|
||||||
"${CMAKE_CURRENT_LIST_DIR}/cmake/Hunter/disabled-mode"
|
|
||||||
)
|
|
||||||
if(EXISTS "${_hunter_gate_disabled_mode_dir}")
|
|
||||||
hunter_gate_status_debug(
|
|
||||||
"Adding \"disabled-mode\" modules: ${_hunter_gate_disabled_mode_dir}"
|
|
||||||
)
|
|
||||||
list(APPEND CMAKE_PREFIX_PATH "${_hunter_gate_disabled_mode_dir}")
|
|
||||||
endif()
|
|
||||||
elseif(_hunter_gate_done)
|
|
||||||
hunter_gate_status_debug("Secondary HunterGate (use old settings)")
|
|
||||||
hunter_gate_self(
|
|
||||||
"${HUNTER_CACHED_ROOT}"
|
|
||||||
"${HUNTER_VERSION}"
|
|
||||||
"${HUNTER_SHA1}"
|
|
||||||
_hunter_self
|
|
||||||
)
|
|
||||||
include("${_hunter_self}/cmake/Hunter")
|
|
||||||
else()
|
|
||||||
set(HUNTER_GATE_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}")
|
|
||||||
|
|
||||||
string(COMPARE NOTEQUAL "${PROJECT_NAME}" "" _have_project_name)
|
|
||||||
if(_have_project_name)
|
|
||||||
hunter_gate_fatal_error(
|
|
||||||
"Please set HunterGate *before* 'project' command. "
|
|
||||||
"Detected project: ${PROJECT_NAME}"
|
|
||||||
ERROR_PAGE "error.huntergate.before.project"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
cmake_parse_arguments(
|
|
||||||
HUNTER_GATE "LOCAL" "URL;SHA1;GLOBAL;FILEPATH" "" ${ARGV}
|
|
||||||
)
|
|
||||||
|
|
||||||
string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" _empty_sha1)
|
|
||||||
string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" _empty_url)
|
|
||||||
string(
|
|
||||||
COMPARE
|
|
||||||
NOTEQUAL
|
|
||||||
"${HUNTER_GATE_UNPARSED_ARGUMENTS}"
|
|
||||||
""
|
|
||||||
_have_unparsed
|
|
||||||
)
|
|
||||||
string(COMPARE NOTEQUAL "${HUNTER_GATE_GLOBAL}" "" _have_global)
|
|
||||||
string(COMPARE NOTEQUAL "${HUNTER_GATE_FILEPATH}" "" _have_filepath)
|
|
||||||
|
|
||||||
if(_have_unparsed)
|
|
||||||
hunter_gate_user_error(
|
|
||||||
"HunterGate unparsed arguments: ${HUNTER_GATE_UNPARSED_ARGUMENTS}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
if(_empty_sha1)
|
|
||||||
hunter_gate_user_error("SHA1 suboption of HunterGate is mandatory")
|
|
||||||
endif()
|
|
||||||
if(_empty_url)
|
|
||||||
hunter_gate_user_error("URL suboption of HunterGate is mandatory")
|
|
||||||
endif()
|
|
||||||
if(_have_global)
|
|
||||||
if(HUNTER_GATE_LOCAL)
|
|
||||||
hunter_gate_user_error("Unexpected LOCAL (already has GLOBAL)")
|
|
||||||
endif()
|
|
||||||
if(_have_filepath)
|
|
||||||
hunter_gate_user_error("Unexpected FILEPATH (already has GLOBAL)")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
if(HUNTER_GATE_LOCAL)
|
|
||||||
if(_have_global)
|
|
||||||
hunter_gate_user_error("Unexpected GLOBAL (already has LOCAL)")
|
|
||||||
endif()
|
|
||||||
if(_have_filepath)
|
|
||||||
hunter_gate_user_error("Unexpected FILEPATH (already has LOCAL)")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
if(_have_filepath)
|
|
||||||
if(_have_global)
|
|
||||||
hunter_gate_user_error("Unexpected GLOBAL (already has FILEPATH)")
|
|
||||||
endif()
|
|
||||||
if(HUNTER_GATE_LOCAL)
|
|
||||||
hunter_gate_user_error("Unexpected LOCAL (already has FILEPATH)")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
hunter_gate_detect_root() # set HUNTER_GATE_ROOT
|
|
||||||
|
|
||||||
# Beautify path, fix probable problems with windows path slashes
|
|
||||||
get_filename_component(
|
|
||||||
HUNTER_GATE_ROOT "${HUNTER_GATE_ROOT}" ABSOLUTE
|
|
||||||
)
|
|
||||||
hunter_gate_status_debug("HUNTER_ROOT: ${HUNTER_GATE_ROOT}")
|
|
||||||
if(NOT HUNTER_ALLOW_SPACES_IN_PATH)
|
|
||||||
string(FIND "${HUNTER_GATE_ROOT}" " " _contain_spaces)
|
|
||||||
if(NOT _contain_spaces EQUAL -1)
|
|
||||||
hunter_gate_fatal_error(
|
|
||||||
"HUNTER_ROOT (${HUNTER_GATE_ROOT}) contains spaces."
|
|
||||||
"Set HUNTER_ALLOW_SPACES_IN_PATH=ON to skip this error"
|
|
||||||
"(Use at your own risk!)"
|
|
||||||
ERROR_PAGE "error.spaces.in.hunter.root"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
string(
|
|
||||||
REGEX
|
|
||||||
MATCH
|
|
||||||
"[0-9]+\\.[0-9]+\\.[0-9]+[-_a-z0-9]*"
|
|
||||||
HUNTER_GATE_VERSION
|
|
||||||
"${HUNTER_GATE_URL}"
|
|
||||||
)
|
|
||||||
string(COMPARE EQUAL "${HUNTER_GATE_VERSION}" "" _is_empty)
|
|
||||||
if(_is_empty)
|
|
||||||
set(HUNTER_GATE_VERSION "unknown")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
hunter_gate_self(
|
|
||||||
"${HUNTER_GATE_ROOT}"
|
|
||||||
"${HUNTER_GATE_VERSION}"
|
|
||||||
"${HUNTER_GATE_SHA1}"
|
|
||||||
_hunter_self
|
|
||||||
)
|
|
||||||
|
|
||||||
set(_master_location "${_hunter_self}/cmake/Hunter")
|
|
||||||
if(EXISTS "${HUNTER_GATE_ROOT}/cmake/Hunter")
|
|
||||||
# Hunter downloaded manually (e.g. by 'git clone')
|
|
||||||
set(_unused "xxxxxxxxxx")
|
|
||||||
set(HUNTER_GATE_SHA1 "${_unused}")
|
|
||||||
set(HUNTER_GATE_VERSION "${_unused}")
|
|
||||||
else()
|
|
||||||
get_filename_component(_archive_id_location "${_hunter_self}/.." ABSOLUTE)
|
|
||||||
set(_done_location "${_archive_id_location}/DONE")
|
|
||||||
set(_sha1_location "${_archive_id_location}/SHA1")
|
|
||||||
|
|
||||||
# Check Hunter already downloaded by HunterGate
|
|
||||||
if(NOT EXISTS "${_done_location}")
|
|
||||||
hunter_gate_download("${_archive_id_location}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT EXISTS "${_done_location}")
|
|
||||||
hunter_gate_internal_error("hunter_gate_download failed")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT EXISTS "${_sha1_location}")
|
|
||||||
hunter_gate_internal_error("${_sha1_location} not found")
|
|
||||||
endif()
|
|
||||||
file(READ "${_sha1_location}" _sha1_value)
|
|
||||||
string(COMPARE EQUAL "${_sha1_value}" "${HUNTER_GATE_SHA1}" _is_equal)
|
|
||||||
if(NOT _is_equal)
|
|
||||||
hunter_gate_internal_error(
|
|
||||||
"Short SHA1 collision:"
|
|
||||||
" ${_sha1_value} (from ${_sha1_location})"
|
|
||||||
" ${HUNTER_GATE_SHA1} (HunterGate)"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
if(NOT EXISTS "${_master_location}")
|
|
||||||
hunter_gate_user_error(
|
|
||||||
"Master file not found:"
|
|
||||||
" ${_master_location}"
|
|
||||||
"try to update Hunter/HunterGate"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
include("${_master_location}")
|
|
||||||
set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES)
|
|
||||||
endif()
|
|
||||||
endmacro()
|
|
|
@ -23,7 +23,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
|
||||||
"-Wformat=2"
|
"-Wformat=2"
|
||||||
"-ftrapv"
|
"-ftrapv"
|
||||||
"-fsanitize=undefined"
|
"-fsanitize=undefined"
|
||||||
"-g"
|
|
||||||
"-Og"
|
"-Og"
|
||||||
"-fno-omit-frame-pointer")
|
"-fno-omit-frame-pointer")
|
||||||
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
||||||
|
|
|
@ -44,7 +44,7 @@ if (WITH_RPM)
|
||||||
set(CPACK_RPM_PACKAGE_LICENSE "GPL-3")
|
set(CPACK_RPM_PACKAGE_LICENSE "GPL-3")
|
||||||
set(CPACK_RPM_PACKAGE_URL "https://schlomp.space/tastytea/${PROJECT_NAME}")
|
set(CPACK_RPM_PACKAGE_URL "https://schlomp.space/tastytea/${PROJECT_NAME}")
|
||||||
set(CPACK_RPM_PACKAGE_REQUIRES
|
set(CPACK_RPM_PACKAGE_REQUIRES
|
||||||
"poco-netssl >= 1.6, poco-sqlite >= 1.6")
|
"poco-net >= 1.6, poco-sqlite >= 1.6, libcurl >= 7.52")
|
||||||
set(CPACK_PACKAGE_FILE_NAME
|
set(CPACK_PACKAGE_FILE_NAME
|
||||||
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-0.${CPACK_PACKAGE_ARCHITECTURE}")
|
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-0.${CPACK_PACKAGE_ARCHITECTURE}")
|
||||||
set(CPACK_SOURCE_PACKAGE_FILE_NAME
|
set(CPACK_SOURCE_PACKAGE_FILE_NAME
|
||||||
|
|
|
@ -4,5 +4,7 @@ include(GNUInstallDirs)
|
||||||
find_depencency(Poco
|
find_depencency(Poco
|
||||||
COMPONENTS Foundation Net NetSSL Data DataSQLite JSON XML
|
COMPONENTS Foundation Net NetSSL Data DataSQLite JSON XML
|
||||||
CONFIG REQUIRED)
|
CONFIG REQUIRED)
|
||||||
|
find_dependency(Boost 1.48.0 REQUIRED COMPONENTS locale)
|
||||||
|
find_dependency(CURL 7.52 REQUIRED)
|
||||||
|
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* This file is part of remwharead.
|
/* This file is part of remwharead.
|
||||||
* Copyright © 2019 tastytea <tastytea@tastytea.de>
|
* Copyright © 2019, 2020 tastytea <tastytea@tastytea.de>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -17,13 +17,15 @@
|
||||||
#ifndef REMWHAREAD_URI_HPP
|
#ifndef REMWHAREAD_URI_HPP
|
||||||
#define REMWHAREAD_URI_HPP
|
#define REMWHAREAD_URI_HPP
|
||||||
|
|
||||||
|
#include <curl/curl.h>
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace remwharead
|
namespace remwharead
|
||||||
{
|
{
|
||||||
using std::uint16_t;
|
|
||||||
using std::string;
|
using std::string;
|
||||||
|
using std::uint16_t;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief A processed HTML page.
|
* @brief A processed HTML page.
|
||||||
|
@ -42,7 +44,7 @@ struct html_extract
|
||||||
string description;
|
string description;
|
||||||
string fulltext;
|
string fulltext;
|
||||||
|
|
||||||
explicit operator bool();
|
explicit operator bool() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -60,7 +62,7 @@ struct archive_answer
|
||||||
string error;
|
string error;
|
||||||
string uri;
|
string uri;
|
||||||
|
|
||||||
explicit operator bool();
|
explicit operator bool() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -82,7 +84,7 @@ public:
|
||||||
* @since 0.6.0
|
* @since 0.6.0
|
||||||
*/
|
*/
|
||||||
explicit URI(string uri);
|
explicit URI(string uri);
|
||||||
virtual ~URI();
|
virtual ~URI() = default;
|
||||||
|
|
||||||
URI(const URI &other) = default;
|
URI(const URI &other) = default;
|
||||||
URI &operator=(const URI &other) = default;
|
URI &operator=(const URI &other) = default;
|
||||||
|
@ -94,53 +96,40 @@ public:
|
||||||
*
|
*
|
||||||
* @since 0.6.0
|
* @since 0.6.0
|
||||||
*/
|
*/
|
||||||
[[nodiscard]]
|
[[nodiscard]] html_extract get();
|
||||||
html_extract get();
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief Save %URI in archive and return archive-URI.
|
* @brief Save %URI in archive and return archive-URI.
|
||||||
*
|
*
|
||||||
* @since 0.6.0
|
* @since 0.6.0
|
||||||
*/
|
*/
|
||||||
[[nodiscard]]
|
[[nodiscard]] archive_answer archive() const;
|
||||||
archive_answer archive() const;
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
string _uri;
|
string _uri;
|
||||||
string _encoding;
|
string _encoding;
|
||||||
string _document;
|
string _document;
|
||||||
|
|
||||||
/*!
|
|
||||||
* @brief Make a HTTP(S) request.
|
|
||||||
*
|
|
||||||
* @since 0.6.0
|
|
||||||
*/
|
|
||||||
[[nodiscard]]
|
|
||||||
string make_request(const string &uri, bool archive = false) const;
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief Extract the title from an HTML page.
|
* @brief Extract the title from an HTML page.
|
||||||
*
|
*
|
||||||
* @since 0.6.0
|
* @since 0.6.0
|
||||||
*/
|
*/
|
||||||
[[nodiscard]]
|
[[nodiscard]] string extract_title() const;
|
||||||
string extract_title() const;
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief Extract the description from an HTML page.
|
* @brief Extract the description from an HTML page.
|
||||||
*
|
*
|
||||||
* @since 0.6.0
|
* @since 0.6.0
|
||||||
*/
|
*/
|
||||||
[[nodiscard]]
|
[[nodiscard]] string extract_description() const;
|
||||||
string extract_description() const;
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief Removes HTML tags and superflous spaces from an HTML page.
|
* @brief Removes HTML tags and superflous spaces from an HTML page.
|
||||||
*
|
*
|
||||||
* @since 0.6.0
|
* @since 0.6.0
|
||||||
*/
|
*/
|
||||||
[[nodiscard]]
|
[[nodiscard]] string strip_html() const;
|
||||||
string strip_html() const;
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief Remove HTML tags.
|
* @brief Remove HTML tags.
|
||||||
|
@ -150,47 +139,43 @@ protected:
|
||||||
*
|
*
|
||||||
* @since 0.6.0
|
* @since 0.6.0
|
||||||
*/
|
*/
|
||||||
[[nodiscard]]
|
[[nodiscard]] static string remove_html_tags(const string &html,
|
||||||
string remove_html_tags(const string &html, const string &tag = "") const;
|
const string &tag = "");
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief Convert HTML entities to UTF-8.
|
* @brief Convert HTML entities to UTF-8.
|
||||||
*
|
*
|
||||||
* @since 0.6.0
|
* @since 0.6.0
|
||||||
*/
|
*/
|
||||||
[[nodiscard]]
|
[[nodiscard]] static string unescape_html(string html);
|
||||||
string unescape_html(string html) const;
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief Replace newlines with spaces.
|
* @brief Replace newlines with spaces.
|
||||||
*
|
*
|
||||||
* @since 0.6.0
|
* @since 0.6.0
|
||||||
*/
|
*/
|
||||||
[[nodiscard]]
|
[[nodiscard]] static string remove_newlines(string text);
|
||||||
string remove_newlines(string text) const;
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @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.
|
||||||
*
|
*
|
||||||
* @since 0.8.5
|
* @since 0.8.5
|
||||||
*/
|
*/
|
||||||
[[nodiscard]]
|
[[nodiscard]] static string cut_text(const string &text, uint16_t n_chars);
|
||||||
string cut_text(const string &text, uint16_t n_chars) const;
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief Converts string to UTF-8.
|
* @brief Converts string to UTF-8.
|
||||||
*
|
*
|
||||||
* @since 0.9.2
|
* @since 0.9.2
|
||||||
*/
|
*/
|
||||||
[[nodiscard]]
|
[[nodiscard]] inline string to_utf8(const string &str);
|
||||||
inline string to_utf8(const string &str);
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief Try to detect the encoding of the document.
|
* @brief Try to detect the encoding of the document.
|
||||||
|
@ -204,7 +189,7 @@ protected:
|
||||||
*
|
*
|
||||||
* @since 0.9.2
|
* @since 0.9.2
|
||||||
*/
|
*/
|
||||||
bool is_html() const;
|
[[nodiscard]] bool is_html() const;
|
||||||
};
|
};
|
||||||
} // namespace remwharead
|
} // namespace remwharead
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
:doctype: manpage
|
:doctype: manpage
|
||||||
:Author: tastytea
|
:Author: tastytea
|
||||||
:Email: tastytea@tastytea.de
|
:Email: tastytea@tastytea.de
|
||||||
:Date: 2019-11-28
|
:Date: 2020-10-31
|
||||||
:Revision: 0.0.0
|
:Revision: 0.0.0
|
||||||
:man source: remwharead
|
:man source: remwharead
|
||||||
:man manual: General Commands Manual
|
:man manual: General Commands Manual
|
||||||
|
@ -211,9 +211,8 @@ Currently only HTTP and HTTPS are supported.
|
||||||
|
|
||||||
== PROXY SUPPORT
|
== PROXY SUPPORT
|
||||||
|
|
||||||
*remwharead* supports HTTP proxies set via the environment variable
|
Since *remwharead* is built on libcurl, it respects the same proxy environment
|
||||||
_http_proxy_. Accepted formats are: _\http://[user[:password]@]host[:port]/_ or
|
variables. See *curl*(1), section _ENVIRONMENT_.
|
||||||
_[user[:password]@]host[:port]_. No SOCKS proxy support yet, sorry.
|
|
||||||
|
|
||||||
Example: http_proxy="http://localhost:3128/"
|
Example: http_proxy="http://localhost:3128/"
|
||||||
|
|
||||||
|
@ -235,7 +234,7 @@ Example: http_proxy="http://localhost:3128/"
|
||||||
|
|
||||||
== SEE ALSO
|
== SEE ALSO
|
||||||
|
|
||||||
*crontab*(1), *crontab*(5)
|
*crontab*(1), *crontab*(5), *curl*(1)
|
||||||
|
|
||||||
== REPORTING BUGS
|
== REPORTING BUGS
|
||||||
|
|
||||||
|
|
|
@ -82,10 +82,12 @@ int App::main(const std::vector<std::string> &args)
|
||||||
std::thread thread_archive;
|
std::thread thread_archive;
|
||||||
if (_archive)
|
if (_archive)
|
||||||
{
|
{
|
||||||
|
// clang-format off
|
||||||
thread_archive = std::thread([&archive_data, &uri]
|
thread_archive = std::thread([&archive_data, &uri]
|
||||||
{
|
{
|
||||||
archive_data = uri.archive();
|
archive_data = uri.archive();
|
||||||
});
|
});
|
||||||
|
// clang-format on
|
||||||
}
|
}
|
||||||
|
|
||||||
html_extract page = uri.get();
|
html_extract page = uri.get();
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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:
|
||||||
|
|
|
@ -0,0 +1,131 @@
|
||||||
|
# -*- mode: yaml -*-
|
||||||
|
# Written for clang-format 10.
|
||||||
|
# https://releases.llvm.org/10.0.0/tools/clang/docs/ClangFormatStyleOptions.html
|
||||||
|
---
|
||||||
|
DisableFormat: false
|
||||||
|
Language: Cpp
|
||||||
|
|
||||||
|
AccessModifierOffset: -4
|
||||||
|
AlignAfterOpenBracket: Align
|
||||||
|
AlignConsecutiveAssignments: false
|
||||||
|
# AlignConsecutiveBitFields: false # clang-format 11
|
||||||
|
AlignConsecutiveDeclarations: false
|
||||||
|
AlignConsecutiveMacros: false
|
||||||
|
AlignEscapedNewlines: DontAlign
|
||||||
|
AlignOperands: true # clang-format 11: Align
|
||||||
|
AlignTrailingComments: true
|
||||||
|
AllowAllArgumentsOnNextLine: false
|
||||||
|
AllowAllConstructorInitializersOnNextLine: false
|
||||||
|
AllowAllParametersOfDeclarationOnNextLine: false
|
||||||
|
AllowShortBlocksOnASingleLine: Empty
|
||||||
|
AllowShortCaseLabelsOnASingleLine: false
|
||||||
|
# AllowShortEnumsOnASingleLine: false # clang-format 11
|
||||||
|
AllowShortFunctionsOnASingleLine: Empty
|
||||||
|
AllowShortIfStatementsOnASingleLine: Never
|
||||||
|
AllowShortLambdasOnASingleLine: Inline
|
||||||
|
AllowShortLoopsOnASingleLine: false
|
||||||
|
AlwaysBreakAfterReturnType: None
|
||||||
|
AlwaysBreakBeforeMultilineStrings: false
|
||||||
|
AlwaysBreakTemplateDeclarations: Yes
|
||||||
|
BinPackArguments: true
|
||||||
|
BinPackParameters: true
|
||||||
|
BraceWrapping: # If BreakBeforeBraces is set to Custom.
|
||||||
|
AfterCaseLabel: true
|
||||||
|
AfterClass: true
|
||||||
|
AfterControlStatement: Always
|
||||||
|
AfterEnum: true
|
||||||
|
AfterFunction: true
|
||||||
|
AfterNamespace: true
|
||||||
|
AfterStruct: true
|
||||||
|
AfterUnion: true
|
||||||
|
AfterExternBlock: true
|
||||||
|
BeforeCatch: true
|
||||||
|
BeforeElse: true
|
||||||
|
# BeforeLambdaBody: true # clang-format 11
|
||||||
|
# BeforeWhile: true # clang-format 11
|
||||||
|
IndentBraces: false
|
||||||
|
SplitEmptyFunction: false
|
||||||
|
SplitEmptyRecord: false
|
||||||
|
SplitEmptyNamespace: false
|
||||||
|
BreakBeforeBinaryOperators: NonAssignment
|
||||||
|
BreakBeforeBraces: Custom
|
||||||
|
BreakBeforeTernaryOperators: true
|
||||||
|
BreakConstructorInitializers: BeforeComma
|
||||||
|
BreakInheritanceList: BeforeComma
|
||||||
|
BreakStringLiterals: true
|
||||||
|
ColumnLimit: 80
|
||||||
|
# CommentPragmas: 'regex'
|
||||||
|
CompactNamespaces: false
|
||||||
|
ConstructorInitializerAllOnOneLineOrOnePerLine: false
|
||||||
|
ConstructorInitializerIndentWidth: 4
|
||||||
|
ContinuationIndentWidth: 4
|
||||||
|
Cpp11BracedListStyle: true
|
||||||
|
DeriveLineEnding: true
|
||||||
|
DerivePointerAlignment: false
|
||||||
|
FixNamespaceComments: true
|
||||||
|
ForEachMacros:
|
||||||
|
- FOREACH
|
||||||
|
- RANGES_FOR
|
||||||
|
- Q_FOREACH
|
||||||
|
- BOOST_FOREACH
|
||||||
|
IncludeBlocks: Regroup
|
||||||
|
IncludeCategories: # stdlib headers into own group.
|
||||||
|
- Regex: '^[^\.]+$'
|
||||||
|
Priority: 4
|
||||||
|
# IndentCaseBlocks: false # clang-format 11
|
||||||
|
IndentCaseLabels: false
|
||||||
|
# IndentExternBlock: NoIndent # clang-format 11
|
||||||
|
IndentGotoLabels: false
|
||||||
|
IndentPPDirectives: AfterHash
|
||||||
|
IndentWidth: 4
|
||||||
|
IndentWrappedFunctionNames: false
|
||||||
|
KeepEmptyLinesAtTheStartOfBlocks: true
|
||||||
|
# MacroBlockBegin: 'string'
|
||||||
|
# MacroBlockEnd: 'string'
|
||||||
|
MaxEmptyLinesToKeep: 1
|
||||||
|
NamespaceIndentation: None
|
||||||
|
# NamespaceMacros: 'string'
|
||||||
|
PenaltyBreakAssignment: 250
|
||||||
|
PenaltyBreakBeforeFirstCallParameter: 300
|
||||||
|
# PenaltyBreakComment: 300
|
||||||
|
# PenaltyBreakFirstLessLess: 120
|
||||||
|
# PenaltyBreakString: 1000
|
||||||
|
# PenaltyBreakTemplateDeclaration: 10
|
||||||
|
# PenaltyExcessCharacter: 1000000
|
||||||
|
# PenaltyReturnTypeOnItsOwnLine: 60
|
||||||
|
PointerAlignment: Right
|
||||||
|
# RawStringFormats: # <YAML>
|
||||||
|
ReflowComments: true
|
||||||
|
SortIncludes: true
|
||||||
|
SortUsingDeclarations: true
|
||||||
|
SpaceAfterCStyleCast: false
|
||||||
|
SpaceAfterLogicalNot: false
|
||||||
|
SpaceAfterTemplateKeyword: false
|
||||||
|
SpaceBeforeAssignmentOperators: true
|
||||||
|
SpaceBeforeCpp11BracedList: false
|
||||||
|
SpaceBeforeCtorInitializerColon: true
|
||||||
|
SpaceBeforeInheritanceColon: true
|
||||||
|
SpaceBeforeParens: ControlStatements
|
||||||
|
SpaceBeforeRangeBasedForLoopColon: true
|
||||||
|
SpaceBeforeSquareBrackets: false
|
||||||
|
SpaceInEmptyBlock: false
|
||||||
|
SpaceInEmptyParentheses: false
|
||||||
|
SpacesBeforeTrailingComments: 1
|
||||||
|
SpacesInAngles: false
|
||||||
|
SpacesInCStyleCastParentheses: false
|
||||||
|
SpacesInConditionalStatement: false
|
||||||
|
SpacesInContainerLiterals: false
|
||||||
|
SpacesInParentheses: false
|
||||||
|
SpacesInSquareBrackets: false
|
||||||
|
Standard: Auto
|
||||||
|
# StatementMacros:
|
||||||
|
# - Q_UNUSED
|
||||||
|
# - QT_REQUIRE_VERSION
|
||||||
|
TabWidth: 4
|
||||||
|
# TypenameMacros:
|
||||||
|
# - STACK_OF
|
||||||
|
# - LIST
|
||||||
|
UseCRLF: false
|
||||||
|
UseTab: Never
|
||||||
|
# WhitespaceSensitiveMacros: ['string', 'string'] # clang-format 11
|
||||||
|
...
|
|
@ -0,0 +1,20 @@
|
||||||
|
# Configuration file for EditorConfig.
|
||||||
|
# More information is available under <https://editorconfig.org/>.
|
||||||
|
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
indent_style = space
|
||||||
|
end_of_line = lf
|
||||||
|
charset = utf-8
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
insert_final_newline = true
|
||||||
|
max_line_length = 80
|
||||||
|
|
||||||
|
[*.?pp]
|
||||||
|
indent_size = 4
|
||||||
|
tab_width = 4
|
||||||
|
|
||||||
|
[{CMakeLists.txt,*.cmake}]
|
||||||
|
indent_size = 2
|
||||||
|
tab_width = 2
|
|
@ -0,0 +1 @@
|
||||||
|
/build/
|
|
@ -0,0 +1,27 @@
|
||||||
|
# Support version 3.9 and above, but use policy settings up to 3.17.
|
||||||
|
cmake_minimum_required(VERSION 3.9...3.17)
|
||||||
|
# Ranges are supported from 3.12, set policy to current for < 3.12.
|
||||||
|
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
||||||
|
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
project(curl_wrapper
|
||||||
|
VERSION 0.1.0
|
||||||
|
DESCRIPTION "Light libcurl wrapper."
|
||||||
|
LANGUAGES CXX)
|
||||||
|
|
||||||
|
option(WITH_CURL_WRAPPER_TESTS "Compile tests for curl_wrapper." NO)
|
||||||
|
option(WITH_CURL_WRAPPER_DOC "Compile API reference for curl_wrapper." NO)
|
||||||
|
|
||||||
|
find_package(CURL 7.52 REQUIRED)
|
||||||
|
|
||||||
|
add_subdirectory("src")
|
||||||
|
|
||||||
|
if(WITH_CURL_WRAPPER_TESTS)
|
||||||
|
add_subdirectory("tests")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(WITH_CURL_WRAPPER_DOC)
|
||||||
|
include("cmake/Doxygen.cmake")
|
||||||
|
enable_doxygen("src")
|
||||||
|
endif()
|
|
@ -0,0 +1,661 @@
|
||||||
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU Affero General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
our General Public Licenses are intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero General Public License from time to time. Such new versions
|
||||||
|
will be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU Affero General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU Affero General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU Affero General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
|
@ -0,0 +1,65 @@
|
||||||
|
= curl_wrapper
|
||||||
|
:project: curl_wrapper
|
||||||
|
:uri-base: https://schlomp.space/tastytea/{project}
|
||||||
|
:uri-cmake: https://cmake.org/
|
||||||
|
:uri-libcurl: https://curl.haxx.se/libcurl/
|
||||||
|
:uri-catch: https://github.com/catchorg/Catch2
|
||||||
|
:uri-doxygen: http://www.doxygen.nl/
|
||||||
|
|
||||||
|
Light libcurl wrapper for when you need to GET a website with minimum effort.
|
||||||
|
|
||||||
|
This is _not_ supposed to be a package on its own, but a thing you drop into
|
||||||
|
your project.
|
||||||
|
|
||||||
|
I made this because the curl wrapper I used before is no longer maintained and
|
||||||
|
the other wrappers are either incomplete or unmaintained as well. _I do not
|
||||||
|
guarantee anything, use at your own risk._
|
||||||
|
|
||||||
|
URL: <{uri-base}>.
|
||||||
|
|
||||||
|
== Example program
|
||||||
|
|
||||||
|
[source,cpp]
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
#include "curl_wrapper.hpp"
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
|
namespace cw = curl_wrapper;
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
cw::CURLWrapper curl;
|
||||||
|
const auto answer{curl.make_http_request(cw::http_method::GET,
|
||||||
|
"http://example.com/")};
|
||||||
|
if (answer)
|
||||||
|
{
|
||||||
|
std::cout << answer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
== Use with CMake
|
||||||
|
|
||||||
|
Drop this project into a subfolder in your project tree. It will be compiled as
|
||||||
|
a static library.
|
||||||
|
|
||||||
|
[source,cmake]
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
add_subdirectory(curl_wrapper)
|
||||||
|
|
||||||
|
add_executable(test)
|
||||||
|
target_link_libraries(test PRIVATE curl_wrapper)
|
||||||
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
.CMake options:
|
||||||
|
* `-DWITH_CURL_WRAPPER_TESTS=YES` Compiles the tests.
|
||||||
|
* `-DWITH_CURL_WRAPPER_DOC=YES` Generate API reference.
|
||||||
|
|
||||||
|
== Dependencies
|
||||||
|
|
||||||
|
* C++17
|
||||||
|
* link:{uri-cmake}[CMake] >= 3.9
|
||||||
|
* link:{uri-libcurl}[libcurl] >= 7.52
|
||||||
|
* Optional:
|
||||||
|
** Tests: link:{uri-catch}[Catch] >= 1.2
|
||||||
|
** Documentation: link:{uri-doxygen}[Doxygen] >= 1.8
|
|
@ -0,0 +1,33 @@
|
||||||
|
function(enable_doxygen)
|
||||||
|
find_package(Doxygen REQUIRED dot)
|
||||||
|
|
||||||
|
set(DOXYGEN_RECURSIVE YES)
|
||||||
|
set(DOXYGEN_GENERATE_HTML YES)
|
||||||
|
set(DOXYGEN_HTML_OUTPUT "doc/html")
|
||||||
|
set(DOXYGEN_GENERATE_LATEX NO)
|
||||||
|
set(DOXYGEN_ALLOW_UNICODE_NAMES YES)
|
||||||
|
set(DOXYGEN_BRIEF_MEMBER_DESC YES)
|
||||||
|
set(DOXYGEN_REPEAT_BRIEF YES)
|
||||||
|
set(DOXYGEN_ALWAYS_DETAILED_SEC YES)
|
||||||
|
set(DOXYGEN_INLINE_INHERITED_MEMB NO)
|
||||||
|
set(DOXYGEN_INHERIT_DOCS YES)
|
||||||
|
set(DOXYGEN_SEPARATE_MEMBER_PAGES NO)
|
||||||
|
set(DOXYGEN_TAB_SIZE 4)
|
||||||
|
set(DOXYGEN_MARKDOWN_SUPPORT YES)
|
||||||
|
set(DOXYGEN_AUTOLINK_SUPPORT YES)
|
||||||
|
set(DOXYGEN_INLINE_SIMPLE_STRUCTS NO)
|
||||||
|
set(DOXYGEN_QUIET YES)
|
||||||
|
set(DOXYGEN_WARNINGS YES)
|
||||||
|
set(DOXYGEN_WARN_IF_UNDOCUMENTED YES)
|
||||||
|
set(DOXYGEN_BUILTIN_STL_SUPPORT YES)
|
||||||
|
set(DOXYGEN_VERBATIM_HEADERS YES)
|
||||||
|
set(DOXYGEN_INLINE_SOURCES YES)
|
||||||
|
set(DOXYGEN_SEARCHENGINE YES)
|
||||||
|
set(DOXYGEN_SHOW_FILES YES)
|
||||||
|
|
||||||
|
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc")
|
||||||
|
|
||||||
|
doxygen_add_docs(${PROJECT_NAME}_doxygen "${ARGV}")
|
||||||
|
# Make sure doxygen is run with every build.
|
||||||
|
add_custom_target(${PROJECT_NAME}_docs ALL DEPENDS ${PROJECT_NAME}_doxygen)
|
||||||
|
endfunction()
|
|
@ -0,0 +1,23 @@
|
||||||
|
file(GLOB sources "*.cpp")
|
||||||
|
file(GLOB headers "*.hpp")
|
||||||
|
add_library(${PROJECT_NAME} STATIC ${sources} ${headers})
|
||||||
|
unset(sources)
|
||||||
|
unset(headers)
|
||||||
|
|
||||||
|
set_target_properties(${PROJECT_NAME}
|
||||||
|
PROPERTIES
|
||||||
|
CXX_STANDARD 17
|
||||||
|
CXX_STANDARD_REQUIRED ON
|
||||||
|
CXX_EXTENSIONS OFF
|
||||||
|
POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
|
# FindCURL provides an IMPORTED target since CMake 3.12.
|
||||||
|
if(NOT ${CMAKE_VERSION} VERSION_LESS 3.12)
|
||||||
|
target_link_libraries(${PROJECT_NAME} PUBLIC CURL::libcurl)
|
||||||
|
else()
|
||||||
|
target_include_directories(${PROJECT_NAME} PUBLIC ${CURL_INCLUDE_DIRS})
|
||||||
|
target_link_libraries(${PROJECT_NAME} PUBLIC ${CURL_LIBRARIES})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
target_include_directories(${PROJECT_NAME}
|
||||||
|
PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>")
|
|
@ -0,0 +1,240 @@
|
||||||
|
/* This file is part of curl_wrapper.
|
||||||
|
* Copyright © 2020 tastytea <tastytea@tastytea.de>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, version 3.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "curl_wrapper.hpp"
|
||||||
|
|
||||||
|
#include "types.hpp"
|
||||||
|
|
||||||
|
#include <curl/curl.h>
|
||||||
|
|
||||||
|
#include <atomic>
|
||||||
|
#include <cstdint>
|
||||||
|
#include <exception>
|
||||||
|
#include <stdexcept>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace curl_wrapper
|
||||||
|
{
|
||||||
|
|
||||||
|
inline static std::atomic<std::uint64_t> curlwrapper_instances{0};
|
||||||
|
|
||||||
|
CURLWrapper::CURLWrapper()
|
||||||
|
{
|
||||||
|
if (curlwrapper_instances == 0)
|
||||||
|
{
|
||||||
|
// NOLINTNEXTLINE(hicpp-signed-bitwise)
|
||||||
|
check(curl_global_init(CURL_GLOBAL_ALL));
|
||||||
|
}
|
||||||
|
++curlwrapper_instances;
|
||||||
|
|
||||||
|
_connection = curl_easy_init();
|
||||||
|
if (_connection == nullptr)
|
||||||
|
{
|
||||||
|
throw std::runtime_error{"Failed to initialize curl."};
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
curl_easy_setopt(_connection, CURLOPT_ERRORBUFFER, _buffer_error);
|
||||||
|
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
curl_easy_setopt(_connection, CURLOPT_WRITEFUNCTION, writer_body_wrapper);
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
curl_easy_setopt(_connection, CURLOPT_WRITEDATA, this);
|
||||||
|
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
curl_easy_setopt(_connection, CURLOPT_HEADERFUNCTION,
|
||||||
|
writer_headers_wrapper);
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
curl_easy_setopt(_connection, CURLOPT_HEADERDATA, this);
|
||||||
|
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
check(curl_easy_setopt(_connection, CURLOPT_FOLLOWLOCATION, 1L));
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
curl_easy_setopt(_connection, CURLOPT_MAXREDIRS, 5L);
|
||||||
|
}
|
||||||
|
|
||||||
|
CURLWrapper::~CURLWrapper() noexcept
|
||||||
|
{
|
||||||
|
curl_easy_cleanup(_connection);
|
||||||
|
--curlwrapper_instances;
|
||||||
|
|
||||||
|
if (curlwrapper_instances == 0)
|
||||||
|
{
|
||||||
|
curl_global_cleanup();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
string CURLWrapper::escape_url(const string_view url) const
|
||||||
|
{
|
||||||
|
char *cbuf{curl_easy_escape(_connection, url.data(),
|
||||||
|
static_cast<int>(url.size()))};
|
||||||
|
string sbuf{cbuf};
|
||||||
|
curl_free(cbuf);
|
||||||
|
return sbuf;
|
||||||
|
}
|
||||||
|
|
||||||
|
string CURLWrapper::unescape_url(const string_view url) const
|
||||||
|
{
|
||||||
|
char *cbuf{curl_easy_unescape(_connection, url.data(),
|
||||||
|
static_cast<int>(url.size()), nullptr)};
|
||||||
|
string sbuf{cbuf};
|
||||||
|
curl_free(cbuf);
|
||||||
|
return sbuf;
|
||||||
|
}
|
||||||
|
|
||||||
|
void CURLWrapper::set_useragent(const string_view useragent)
|
||||||
|
{
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
check(curl_easy_setopt(_connection, CURLOPT_USERAGENT, useragent.data()));
|
||||||
|
}
|
||||||
|
|
||||||
|
void CURLWrapper::set_proxy(const string_view proxy)
|
||||||
|
{
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
check(curl_easy_setopt(_connection, CURLOPT_PROXY, proxy.data()));
|
||||||
|
}
|
||||||
|
|
||||||
|
answer CURLWrapper::make_http_request(http_method method, string_view uri)
|
||||||
|
{
|
||||||
|
_buffer_headers.clear();
|
||||||
|
_buffer_body.clear();
|
||||||
|
|
||||||
|
switch (method)
|
||||||
|
{
|
||||||
|
case http_method::DELETE:
|
||||||
|
{
|
||||||
|
// NOTE: Use CURLOPT_MIMEPOST, then set to DELETE to send data.
|
||||||
|
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
check(curl_easy_setopt(_connection, CURLOPT_CUSTOMREQUEST, "DELETE"));
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case http_method::GET:
|
||||||
|
{
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
curl_easy_setopt(_connection, CURLOPT_HTTPGET, 1L);
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case http_method::HEAD:
|
||||||
|
{
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
check(curl_easy_setopt(_connection, CURLOPT_CUSTOMREQUEST, "HEAD"));
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case http_method::PATCH:
|
||||||
|
{
|
||||||
|
// NOTE: Use CURLOPT_MIMEPOST, then set to PATCH to send data.
|
||||||
|
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
check(curl_easy_setopt(_connection, CURLOPT_CUSTOMREQUEST, "PATCH"));
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case http_method::POST:
|
||||||
|
{
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
curl_easy_setopt(_connection, CURLOPT_POST, 1L);
|
||||||
|
|
||||||
|
// NOTE: Use CURLOPT_MIMEPOST to send data.
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case http_method::PUT:
|
||||||
|
{
|
||||||
|
// NOTE: Use CURLOPT_MIMEPOST, then set to PUT to send data.
|
||||||
|
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
check(curl_easy_setopt(_connection, CURLOPT_CUSTOMREQUEST, "PUT"));
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
check(curl_easy_setopt(_connection, CURLOPT_URL, uri.data()));
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
check(curl_easy_perform(_connection));
|
||||||
|
}
|
||||||
|
catch (const CURLException &e)
|
||||||
|
{
|
||||||
|
// PARTIAL_FILE error seems to be normal for HEAD requests.
|
||||||
|
if (!(method == http_method::HEAD
|
||||||
|
&& e.error_code == CURLE_PARTIAL_FILE))
|
||||||
|
{
|
||||||
|
std::rethrow_exception(std::current_exception());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
long http_status{0}; // NOLINT(google-runtime-int)
|
||||||
|
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
|
||||||
|
check(curl_easy_getinfo(_connection, CURLINFO_RESPONSE_CODE, &http_status));
|
||||||
|
return {static_cast<std::uint16_t>(http_status), _buffer_headers,
|
||||||
|
_buffer_body};
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t CURLWrapper::writer_body(char *data, size_t size, size_t nmemb)
|
||||||
|
{
|
||||||
|
if (data == nullptr)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
_buffer_body.append(data, size * nmemb);
|
||||||
|
|
||||||
|
return size * nmemb;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t CURLWrapper::writer_headers(char *data, size_t size, size_t nmemb)
|
||||||
|
{
|
||||||
|
if (data == nullptr)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
_buffer_headers.append(data, size * nmemb);
|
||||||
|
|
||||||
|
return size * nmemb;
|
||||||
|
}
|
||||||
|
|
||||||
|
void CURLWrapper::check(const CURLcode code)
|
||||||
|
{
|
||||||
|
if (code != CURLE_OK)
|
||||||
|
{
|
||||||
|
throw CURLException{code, _buffer_error};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *CURLException::what() const noexcept
|
||||||
|
{
|
||||||
|
// NOTE: The string has to be static, or it'll vanish before it can be
|
||||||
|
// used. Couldn't find good documentation on that.
|
||||||
|
static string error_string;
|
||||||
|
error_string = _error_message;
|
||||||
|
if (!error_string.empty())
|
||||||
|
{
|
||||||
|
error_string = " – " + error_string;
|
||||||
|
}
|
||||||
|
error_string = "libcurl error: " + std::to_string(error_code)
|
||||||
|
+ error_string;
|
||||||
|
return error_string.c_str();
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace curl_wrapper
|
|
@ -0,0 +1,244 @@
|
||||||
|
/* This file is part of curl_wrapper.
|
||||||
|
* Copyright © 2020 tastytea <tastytea@tastytea.de>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, version 3.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef CURL_WRAPPER_HPP
|
||||||
|
#define CURL_WRAPPER_HPP
|
||||||
|
|
||||||
|
#include "types.hpp"
|
||||||
|
|
||||||
|
#include <curl/curl.h>
|
||||||
|
|
||||||
|
#include <exception>
|
||||||
|
#include <string>
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
|
namespace curl_wrapper
|
||||||
|
{
|
||||||
|
|
||||||
|
using std::string;
|
||||||
|
using std::string_view;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Light wrapper around libcurl.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
class CURLWrapper
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
/*!
|
||||||
|
* @brief Initializes curl and sets up connection.
|
||||||
|
*
|
||||||
|
* The first time an instance of CURLWrapper is created, it calls
|
||||||
|
* `curl_global_init`, which is not thread-safe. For more information
|
||||||
|
* consult [curl_global_init(3)]
|
||||||
|
* (https://curl.haxx.se/libcurl/c/curl_global_init.html).
|
||||||
|
*
|
||||||
|
* May throw CURLException or std::runtime_error.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
CURLWrapper();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Cleans up curl and connection.
|
||||||
|
*
|
||||||
|
* Calls `curl_global_cleanup`, which is not thread-safe, when the last
|
||||||
|
* instance of CURLWrapper is destroyed. For more information consult
|
||||||
|
* [curl_global_cleanup(3)]
|
||||||
|
* (https://curl.haxx.se/libcurl/c/curl_global_cleanup.html).
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
virtual ~CURLWrapper() noexcept;
|
||||||
|
|
||||||
|
//! Copy constructor. @since 0.1.0
|
||||||
|
CURLWrapper(const CURLWrapper &other) = delete;
|
||||||
|
|
||||||
|
//! Move constructor @since 0.1.0
|
||||||
|
CURLWrapper(CURLWrapper &&other) noexcept = delete;
|
||||||
|
|
||||||
|
//! Copy assignment operator @since 0.1.0
|
||||||
|
CURLWrapper &operator=(const CURLWrapper &other) = delete;
|
||||||
|
|
||||||
|
//! Move assignment operator @since 0.1.0
|
||||||
|
CURLWrapper &operator=(CURLWrapper &&other) noexcept = delete;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Returns pointer to the CURL easy handle.
|
||||||
|
*
|
||||||
|
* You can use this handle to set or modify curl options. For more
|
||||||
|
* information consult [curl_easy_setopt(3)]
|
||||||
|
* (https://curl.haxx.se/libcurl/c/curl_easy_setopt.html).
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
[[nodiscard]] inline CURL *get_curl_easy_handle() const
|
||||||
|
{
|
||||||
|
return _connection;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief URL encodes the given string.
|
||||||
|
*
|
||||||
|
* For more information consult [curl_easy_escape(3)]
|
||||||
|
* (https://curl.haxx.se/libcurl/c/curl_easy_escape.html).
|
||||||
|
*
|
||||||
|
* @param url String to escape.
|
||||||
|
*
|
||||||
|
* @return The escaped string or {} if it failed.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
[[nodiscard]] string escape_url(string_view url) const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief URL decodes the given string.
|
||||||
|
*
|
||||||
|
* For more information consult [curl_easy_unescape(3)]
|
||||||
|
* (https://curl.haxx.se/libcurl/c/curl_easy_unescape.html).
|
||||||
|
*
|
||||||
|
* @param url String to unescape.
|
||||||
|
*
|
||||||
|
* @return The unescaped string or {} if it failed.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
[[nodiscard]] string unescape_url(string_view url) const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Set the User-Agent.
|
||||||
|
*
|
||||||
|
* May throw CURLException.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
void set_useragent(string_view useragent);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Set a proxy.
|
||||||
|
*
|
||||||
|
* For more information consult [CURLOPT_PROXY(3)]
|
||||||
|
* (https://curl.haxx.se/libcurl/c/CURLOPT_PROXY.html).
|
||||||
|
*
|
||||||
|
* May throw CURLException.
|
||||||
|
*
|
||||||
|
* @since 0.1.1
|
||||||
|
*/
|
||||||
|
void set_proxy(string_view proxy);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Make a HTTP request.
|
||||||
|
*
|
||||||
|
* May throw CURLException.
|
||||||
|
*
|
||||||
|
* @param method The HTTP method.
|
||||||
|
* @param uri The full URI.
|
||||||
|
*
|
||||||
|
* @return The status code, headers and body of the page.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
[[nodiscard]] answer make_http_request(http_method method, string_view uri);
|
||||||
|
|
||||||
|
private:
|
||||||
|
CURL *_connection{};
|
||||||
|
char _buffer_error[CURL_ERROR_SIZE]{};
|
||||||
|
string _buffer_headers;
|
||||||
|
string _buffer_body;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief libcurl write callback function.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
size_t writer_body(char *data, size_t size, size_t nmemb);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Wrapper for curl, because it can only call static member
|
||||||
|
* functions.
|
||||||
|
*
|
||||||
|
* <https://curl.haxx.se/docs/faq.html#Using_C_non_static_functions_f>
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
static inline size_t writer_body_wrapper(char *data, size_t sz,
|
||||||
|
size_t nmemb, void *f)
|
||||||
|
{
|
||||||
|
return static_cast<CURLWrapper *>(f)->writer_body(data, sz, nmemb);
|
||||||
|
}
|
||||||
|
|
||||||
|
//! @copydoc writer_body
|
||||||
|
size_t writer_headers(char *data, size_t size, size_t nmemb);
|
||||||
|
|
||||||
|
//! @copydoc writer_body_wrapper
|
||||||
|
static inline size_t writer_headers_wrapper(char *data, size_t sz,
|
||||||
|
size_t nmemb, void *f)
|
||||||
|
{
|
||||||
|
return static_cast<CURLWrapper *>(f)->writer_headers(data, sz, nmemb);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Throw CURLException if command doesn't return CURLE_OK.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
void check(CURLcode code);
|
||||||
|
};
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Exception for libcurl errors.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
class CURLException : public std::exception
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
/*!
|
||||||
|
* @brief Constructor with error code.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
explicit CURLException(const CURLcode code)
|
||||||
|
: error_code{code}
|
||||||
|
{}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Constructor with error code and error buffer.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
explicit CURLException(const CURLcode code, string_view error_buffer)
|
||||||
|
: error_code{code}
|
||||||
|
, _error_message{error_buffer}
|
||||||
|
{}
|
||||||
|
|
||||||
|
const CURLcode error_code; //!< Error code from libcurl.
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Error message.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
[[nodiscard]] const char *what() const noexcept override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
string _error_message;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace curl_wrapper
|
||||||
|
|
||||||
|
#endif // CURL_WRAPPER_HPP
|
|
@ -0,0 +1,51 @@
|
||||||
|
/* This file is part of curl_wrapper.
|
||||||
|
* Copyright © 2020 tastytea <tastytea@tastytea.de>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, version 3.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "types.hpp"
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
#include <cctype>
|
||||||
|
#include <string>
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
|
namespace curl_wrapper
|
||||||
|
{
|
||||||
|
|
||||||
|
using std::tolower;
|
||||||
|
|
||||||
|
std::string_view answer::get_header(const std::string_view field) const
|
||||||
|
{
|
||||||
|
const string searchstring{string(field) += ":"};
|
||||||
|
// clang-format off
|
||||||
|
auto it{std::search(headers.begin(), headers.end(), searchstring.begin(),
|
||||||
|
searchstring.end(),
|
||||||
|
[](unsigned char a, unsigned char b)
|
||||||
|
{ return tolower(a) == tolower(b); })};
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
|
if (it != headers.end())
|
||||||
|
{
|
||||||
|
auto pos{static_cast<size_t>(it - headers.begin())};
|
||||||
|
pos = headers.find(':', pos) + 1;
|
||||||
|
pos = headers.find_first_not_of(' ', pos);
|
||||||
|
const auto endpos{headers.find_first_of("\r\n", pos)};
|
||||||
|
return string_view(&headers[pos], endpos - pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace curl_wrapper
|
|
@ -0,0 +1,106 @@
|
||||||
|
/* This file is part of curl_wrapper.
|
||||||
|
* Copyright © 2020 tastytea <tastytea@tastytea.de>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, version 3.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef CURL_WRAPPER_TYPES_HPP
|
||||||
|
#define CURL_WRAPPER_TYPES_HPP
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
#include <ostream>
|
||||||
|
#include <string>
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
|
namespace curl_wrapper
|
||||||
|
{
|
||||||
|
|
||||||
|
using std::ostream;
|
||||||
|
using std::string;
|
||||||
|
using std::string_view;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief The HTTP method.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
enum class http_method
|
||||||
|
{
|
||||||
|
DELETE,
|
||||||
|
GET,
|
||||||
|
HEAD,
|
||||||
|
PATCH,
|
||||||
|
POST,
|
||||||
|
PUT
|
||||||
|
};
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Return type for network requests.
|
||||||
|
*
|
||||||
|
* Currently only HTTP is considered.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
struct answer
|
||||||
|
{
|
||||||
|
std::uint16_t status{0}; //!< Status code.
|
||||||
|
string headers; //!< The headers of the response from the server.
|
||||||
|
string body; //!< The response from the server.
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Returns true if #status is 200.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
[[nodiscard]] inline explicit operator bool() const
|
||||||
|
{
|
||||||
|
return (status == 200);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Returns std::string_view of the #body.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
[[nodiscard]] inline explicit operator string_view() const
|
||||||
|
{
|
||||||
|
return body;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Returns #body as std::ostream.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
inline friend ostream &operator<<(ostream &out, const answer &answer)
|
||||||
|
{
|
||||||
|
out << answer.body;
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Returns the value of a header field.
|
||||||
|
*
|
||||||
|
* @param field Case insensitive, ASCII only.
|
||||||
|
*
|
||||||
|
* @return A std::string_view to the value of the header field or {} if not
|
||||||
|
* found.
|
||||||
|
*
|
||||||
|
* @since 0.1.0
|
||||||
|
*/
|
||||||
|
[[nodiscard]] string_view get_header(string_view field) const;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace curl_wrapper
|
||||||
|
|
||||||
|
#endif // CURL_WRAPPER_TYPES_HPP
|
|
@ -0,0 +1,37 @@
|
||||||
|
include(CTest)
|
||||||
|
|
||||||
|
file(GLOB sources_tests "test_*.cpp")
|
||||||
|
|
||||||
|
find_package(Catch2 CONFIG)
|
||||||
|
if(Catch2_FOUND) # Catch 2.x
|
||||||
|
include(Catch)
|
||||||
|
add_executable(all_tests main.cpp ${sources_tests})
|
||||||
|
set_target_properties(all_tests
|
||||||
|
PROPERTIES
|
||||||
|
CXX_STANDARD 17
|
||||||
|
CXX_STANDARD_REQUIRED ON
|
||||||
|
CXX_EXTENSIONS OFF)
|
||||||
|
target_link_libraries(all_tests
|
||||||
|
PRIVATE Catch2::Catch2 ${PROJECT_NAME})
|
||||||
|
target_include_directories(all_tests PRIVATE "/usr/include/catch2")
|
||||||
|
catch_discover_tests(all_tests EXTRA_ARGS "${EXTRA_TEST_ARGS}")
|
||||||
|
else() # Catch 1.x
|
||||||
|
if(EXISTS "/usr/include/catch.hpp")
|
||||||
|
message(STATUS "Catch 1.x found.")
|
||||||
|
foreach(src ${sources_tests})
|
||||||
|
get_filename_component(bin "${src}" NAME_WE)
|
||||||
|
add_executable(${bin} "main.cpp" "${src}")
|
||||||
|
set_target_properties(${bin}
|
||||||
|
PROPERTIES
|
||||||
|
CXX_STANDARD 17
|
||||||
|
CXX_STANDARD_REQUIRED ON
|
||||||
|
CXX_EXTENSIONS OFF)
|
||||||
|
target_link_libraries(${bin}
|
||||||
|
PRIVATE ${PROJECT_NAME})
|
||||||
|
add_test(${bin} ${bin} "${EXTRA_TEST_ARGS}")
|
||||||
|
endforeach()
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR
|
||||||
|
"Neither Catch 2.x nor Catch 1.x could be found.")
|
||||||
|
endif()
|
||||||
|
endif()
|
|
@ -0,0 +1,3 @@
|
||||||
|
#define CATCH_CONFIG_MAIN
|
||||||
|
|
||||||
|
#include <catch.hpp>
|
|
@ -0,0 +1,62 @@
|
||||||
|
#include "curl_wrapper.hpp"
|
||||||
|
|
||||||
|
#include <catch.hpp>
|
||||||
|
|
||||||
|
#include <exception>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace curl_wrapper
|
||||||
|
{
|
||||||
|
|
||||||
|
using std::string;
|
||||||
|
|
||||||
|
SCENARIO("URL encoding / decoding")
|
||||||
|
{
|
||||||
|
const string text_raw{"Hüpfburg am rande!"};
|
||||||
|
const string text_escaped("H%C3%BCpfburg%20am%20rande%21");
|
||||||
|
|
||||||
|
bool exception = false;
|
||||||
|
string answer;
|
||||||
|
|
||||||
|
WHEN("Encoding " + text_raw)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
CURLWrapper curl;
|
||||||
|
answer = curl.escape_url(text_raw);
|
||||||
|
}
|
||||||
|
catch (const std::exception &e)
|
||||||
|
{
|
||||||
|
exception = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
THEN("No exception is thrown")
|
||||||
|
AND_THEN("The text is successfully encoded")
|
||||||
|
{
|
||||||
|
REQUIRE_FALSE(exception);
|
||||||
|
REQUIRE(answer == text_escaped);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
WHEN("Decoding " + text_escaped)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
CURLWrapper curl;
|
||||||
|
answer = curl.unescape_url(text_escaped);
|
||||||
|
}
|
||||||
|
catch (const std::exception &e)
|
||||||
|
{
|
||||||
|
exception = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
THEN("No exception is thrown")
|
||||||
|
AND_THEN("The text is successfully decoded")
|
||||||
|
{
|
||||||
|
REQUIRE_FALSE(exception);
|
||||||
|
REQUIRE(answer == text_raw);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace curl_wrapper
|
|
@ -0,0 +1,41 @@
|
||||||
|
#include "curl_wrapper.hpp"
|
||||||
|
|
||||||
|
#include <catch.hpp>
|
||||||
|
|
||||||
|
#include <exception>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace curl_wrapper
|
||||||
|
{
|
||||||
|
|
||||||
|
using std::string;
|
||||||
|
|
||||||
|
SCENARIO("HTTP GET", "[http]")
|
||||||
|
{
|
||||||
|
const string uri{"https://schlomp.space/api/v1/version"};
|
||||||
|
|
||||||
|
bool exception = false;
|
||||||
|
string answer;
|
||||||
|
|
||||||
|
WHEN("GETing " + uri)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
CURLWrapper curl;
|
||||||
|
answer = curl.make_http_request(http_method::GET, uri).body;
|
||||||
|
}
|
||||||
|
catch (const std::exception &e)
|
||||||
|
{
|
||||||
|
exception = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
THEN("No exception is thrown")
|
||||||
|
AND_THEN("We get the right answer")
|
||||||
|
{
|
||||||
|
REQUIRE_FALSE(exception);
|
||||||
|
REQUIRE(answer.substr(0, 11) == R"({"version":)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace curl_wrapper
|
|
@ -0,0 +1,75 @@
|
||||||
|
#include "types.hpp"
|
||||||
|
|
||||||
|
#include <catch.hpp>
|
||||||
|
|
||||||
|
#include <exception>
|
||||||
|
#include <iostream>
|
||||||
|
#include <locale>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace curl_wrapper
|
||||||
|
{
|
||||||
|
|
||||||
|
using std::string;
|
||||||
|
|
||||||
|
SCENARIO("Extract header")
|
||||||
|
{
|
||||||
|
answer ret;
|
||||||
|
ret.headers = R"(HTTP/1.1 200 OK
|
||||||
|
Server: nginx/1.18.0
|
||||||
|
Date: Sat, 07 Nov 2020 22:26:13 GMT
|
||||||
|
Content-Type: application/rss+xml; charset=utf-8
|
||||||
|
Connection: keep-alive
|
||||||
|
Keep-Alive: timeout=20
|
||||||
|
Expires: Sat, 07 Nov 2020 22:56:13 GMT
|
||||||
|
Cache-Control: max-age=1800
|
||||||
|
X-Cache: HIT
|
||||||
|
X-UmläÜt: 🙂
|
||||||
|
)";
|
||||||
|
bool exception = false;
|
||||||
|
string value;
|
||||||
|
|
||||||
|
WHEN("We search for “cache-control”")
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
value = ret.get_header("cache-control");
|
||||||
|
}
|
||||||
|
catch (const std::exception &e)
|
||||||
|
{
|
||||||
|
std::cerr << "Exception: " << e.what() << '\n';
|
||||||
|
exception = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
THEN("No exception is thrown")
|
||||||
|
AND_THEN("The value is successfully extracted")
|
||||||
|
{
|
||||||
|
REQUIRE_FALSE(exception);
|
||||||
|
REQUIRE(value == "max-age=1800");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// WHEN("We search for “X-UMLÄÜT”")
|
||||||
|
// {
|
||||||
|
// std::locale::global(std::locale("de_DE.UTF-8"));
|
||||||
|
//
|
||||||
|
// try
|
||||||
|
// {
|
||||||
|
// value = ret.get_header("X-UMLÄÜT");
|
||||||
|
// }
|
||||||
|
// catch (const std::exception &e)
|
||||||
|
// {
|
||||||
|
// std::cerr << "Exception: " << e.what() << '\n';
|
||||||
|
// exception = true;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// THEN("No exception is thrown")
|
||||||
|
// AND_THEN("The value is successfully extracted")
|
||||||
|
// {
|
||||||
|
// REQUIRE_FALSE(exception);
|
||||||
|
// REQUIRE(value == "🙂");
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace curl_wrapper
|
|
@ -2,8 +2,7 @@ include(GNUInstallDirs)
|
||||||
|
|
||||||
# Some distributions do not contain Poco*Config.cmake recipes.
|
# Some distributions do not contain Poco*Config.cmake recipes.
|
||||||
find_package(Poco CONFIG
|
find_package(Poco CONFIG
|
||||||
COMPONENTS Foundation Net NetSSL Data DataSQLite JSON XML)
|
COMPONENTS Foundation Net Data DataSQLite JSON XML)
|
||||||
|
|
||||||
find_package(Boost 1.48.0 REQUIRED COMPONENTS locale)
|
find_package(Boost 1.48.0 REQUIRED COMPONENTS locale)
|
||||||
|
|
||||||
file(GLOB_RECURSE sources_lib *.cpp)
|
file(GLOB_RECURSE sources_lib *.cpp)
|
||||||
|
@ -23,13 +22,13 @@ target_include_directories(${PROJECT_NAME}
|
||||||
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE pthread Boost::locale
|
PRIVATE pthread Boost::locale curl_wrapper
|
||||||
PUBLIC stdc++fs)
|
PUBLIC stdc++fs)
|
||||||
|
|
||||||
# If no Poco*Config.cmake recipes are found, look for headers in standard dirs.
|
# If no Poco*Config.cmake recipes are found, look for headers in standard dirs.
|
||||||
if(PocoNetSSL_FOUND)
|
if(Poco_FOUND)
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE Poco::Foundation Poco::Net Poco::NetSSL Poco::DataSQLite
|
PRIVATE Poco::Foundation Poco::Net Poco::DataSQLite
|
||||||
Poco::JSON Poco::XML
|
Poco::JSON Poco::XML
|
||||||
PUBLIC Poco::Data)
|
PUBLIC Poco::Data)
|
||||||
else()
|
else()
|
||||||
|
@ -44,7 +43,7 @@ else()
|
||||||
"but the files seem to be in the standard directories. "
|
"but the files seem to be in the standard directories. "
|
||||||
"Let's hope this works.")
|
"Let's hope this works.")
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE PocoFoundation PocoNet PocoNetSSL PocoDataSQLite PocoJSON PocoXML
|
PRIVATE PocoFoundation PocoNet PocoDataSQLite PocoJSON PocoXML
|
||||||
PUBLIC PocoData)
|
PUBLIC PocoData)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include "export/adoc.hpp"
|
#include "export/adoc.hpp"
|
||||||
#include "time.hpp"
|
#include "time.hpp"
|
||||||
#include "version.hpp"
|
#include "version.hpp"
|
||||||
|
#include <Poco/URI.h>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <locale>
|
#include <locale>
|
||||||
|
@ -35,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"
|
||||||
|
@ -106,7 +107,7 @@ void Export::AsciiDoc::print() const
|
||||||
|
|
||||||
if (!entry.description.empty())
|
if (!entry.description.empty())
|
||||||
{
|
{
|
||||||
_out << " +" << endl << entry.description;
|
_out << " +\n+" << entry.description << '+';
|
||||||
}
|
}
|
||||||
_out << endl << endl;
|
_out << endl << endl;
|
||||||
}
|
}
|
||||||
|
@ -123,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)
|
||||||
{
|
{
|
||||||
|
@ -136,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 =
|
||||||
|
@ -164,18 +164,17 @@ 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)
|
||||||
{
|
{
|
||||||
return replace(text,
|
string out;
|
||||||
{
|
Poco::URI::encode(text, "+", out);
|
||||||
{ "[", "%5B" }, { "]", "%5D" }
|
return out;
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Export::AsciiDoc::print_tags(const tagmap &tags) const
|
void Export::AsciiDoc::print_tags(const tagmap &tags) const
|
||||||
|
@ -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);
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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(),
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
611
src/lib/uri.cpp
611
src/lib/uri.cpp
|
@ -1,5 +1,5 @@
|
||||||
/* This file is part of remwharead.
|
/* This file is part of remwharead.
|
||||||
* Copyright © 2019 tastytea <tastytea@tastytea.de>
|
* Copyright © 2019, 2020 tastytea <tastytea@tastytea.de>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -15,53 +15,41 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "uri.hpp"
|
#include "uri.hpp"
|
||||||
|
|
||||||
|
#include "curl_wrapper.hpp"
|
||||||
#include "version.hpp"
|
#include "version.hpp"
|
||||||
#include <boost/locale.hpp>
|
|
||||||
#include <Poco/Environment.h>
|
|
||||||
#include <Poco/Exception.h>
|
|
||||||
#include <Poco/Net/HTTPClientSession.h>
|
|
||||||
#include <Poco/Net/HTTPRequest.h>
|
|
||||||
#include <Poco/Net/HTTPResponse.h>
|
|
||||||
#include <Poco/Net/HTTPSClientSession.h>
|
|
||||||
#include <Poco/RegularExpression.h>
|
#include <Poco/RegularExpression.h>
|
||||||
#include <Poco/StreamCopier.h>
|
#include <boost/locale.hpp>
|
||||||
#include <Poco/URI.h>
|
|
||||||
|
#include <atomic>
|
||||||
#include <codecvt>
|
#include <codecvt>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <exception>
|
#include <exception>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <locale>
|
#include <locale>
|
||||||
#include <sstream>
|
#include <stdexcept>
|
||||||
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
namespace remwharead
|
namespace remwharead
|
||||||
{
|
{
|
||||||
using std::array;
|
using std::array;
|
||||||
using std::istream;
|
using std::exception;
|
||||||
using std::unique_ptr;
|
|
||||||
using std::make_unique;
|
|
||||||
using std::vector;
|
|
||||||
using std::cerr;
|
|
||||||
using std::endl;
|
|
||||||
using std::move;
|
using std::move;
|
||||||
|
using std::to_string;
|
||||||
using std::uint32_t;
|
using std::uint32_t;
|
||||||
using Poco::Net::HTTPClientSession;
|
using std::vector;
|
||||||
using Poco::Net::HTTPSClientSession;
|
|
||||||
using Poco::Net::HTTPRequest;
|
|
||||||
using Poco::Net::HTTPResponse;
|
|
||||||
using Poco::Net::HTTPMessage;
|
|
||||||
using Poco::StreamCopier;
|
|
||||||
using Poco::Environment;
|
|
||||||
using RegEx = Poco::RegularExpression;
|
using RegEx = Poco::RegularExpression;
|
||||||
|
|
||||||
html_extract::operator bool()
|
html_extract::operator bool() const
|
||||||
{
|
{
|
||||||
return successful;
|
return successful;
|
||||||
}
|
}
|
||||||
|
|
||||||
archive_answer::operator bool()
|
archive_answer::operator bool() const
|
||||||
{
|
{
|
||||||
return successful;
|
return successful;
|
||||||
}
|
}
|
||||||
|
@ -69,161 +57,36 @@ archive_answer::operator bool()
|
||||||
URI::URI(string uri)
|
URI::URI(string uri)
|
||||||
: _uri(move(uri))
|
: _uri(move(uri))
|
||||||
{
|
{
|
||||||
Poco::Net::initializeSSL();
|
// FIXME: Only call locale-stuff once after getting rid of POCO.
|
||||||
|
// Set global locale with Boost extras. Needed for Boost functions.
|
||||||
set_proxy();
|
// Uhm… I don't remember what I meant with the above. 🤦
|
||||||
}
|
const boost::locale::generator locgen;
|
||||||
|
const std::locale loc = locgen("");
|
||||||
void URI::set_proxy()
|
std::locale::global(loc);
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
HTTPClientSession::ProxyConfig proxy;
|
|
||||||
const string env_proxy = Environment::get("http_proxy");
|
|
||||||
const RegEx re_proxy("^(?:https?://)?(?:([^:]+):?([^@]*)@)?" // user:pw
|
|
||||||
"([^:/]+)(?::([\\d]{1,5}))?/?$"); // host:port
|
|
||||||
vector<string> matches;
|
|
||||||
|
|
||||||
if (re_proxy.split(env_proxy, matches) < 4)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
proxy.username = matches[1];
|
|
||||||
proxy.password = matches[2];
|
|
||||||
proxy.host = matches[3];
|
|
||||||
if (!matches[4].empty())
|
|
||||||
{
|
|
||||||
// NOLINTNEXTLINE(google-runtime-int) - Need to use same as stoul.
|
|
||||||
const unsigned long port = std::stoul(matches[4]);
|
|
||||||
if (port > 65535)
|
|
||||||
{
|
|
||||||
throw std::invalid_argument("Proxy port number out of range");
|
|
||||||
}
|
|
||||||
proxy.port = static_cast<uint16_t>(port);
|
|
||||||
}
|
|
||||||
HTTPClientSession::setGlobalProxyConfig(proxy);
|
|
||||||
}
|
|
||||||
catch (const Poco::RegularExpressionException &e)
|
|
||||||
{
|
|
||||||
cerr << "Error: Proxy could not be set (" << e.displayText() << ")\n";
|
|
||||||
}
|
|
||||||
catch (const std::invalid_argument &e)
|
|
||||||
{
|
|
||||||
cerr << "Error: " << e.what() << endl;
|
|
||||||
}
|
|
||||||
catch (const Poco::NotFoundException &)
|
|
||||||
{
|
|
||||||
// No proxy found, no problem.
|
|
||||||
}
|
|
||||||
catch (const std::exception &e)
|
|
||||||
{
|
|
||||||
cerr << "Unexpected exception: " << e.what() << endl;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
URI::~URI()
|
|
||||||
{
|
|
||||||
Poco::Net::uninitializeSSL();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
html_extract URI::get()
|
html_extract URI::get()
|
||||||
{
|
{
|
||||||
|
using namespace curl_wrapper;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_document = make_request(_uri);
|
CURLWrapper curl;
|
||||||
_document = to_utf8(_document);
|
_document = to_utf8(
|
||||||
|
curl.make_http_request(http_method::GET, _uri).body);
|
||||||
|
|
||||||
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 exception &e)
|
||||||
{
|
{
|
||||||
return { false, e.displayText(), "", "", "" };
|
return {false, e.what(), "", "", ""};
|
||||||
}
|
}
|
||||||
|
|
||||||
return { false, "Unknown error.", "", "", "" };
|
return {false, "Unknown error.", "", "", ""};
|
||||||
}
|
|
||||||
|
|
||||||
string URI::make_request(const string &uri, bool archive) const
|
|
||||||
{
|
|
||||||
Poco::URI poco_uri(uri);
|
|
||||||
string method = archive ? HTTPRequest::HTTP_HEAD : HTTPRequest::HTTP_GET;
|
|
||||||
string path = poco_uri.getPathAndQuery();
|
|
||||||
if (path.empty())
|
|
||||||
{
|
|
||||||
path = "/";
|
|
||||||
}
|
|
||||||
|
|
||||||
unique_ptr<HTTPClientSession> session;
|
|
||||||
if (poco_uri.getScheme() == "https")
|
|
||||||
{
|
|
||||||
session = make_unique<HTTPSClientSession>(poco_uri.getHost(),
|
|
||||||
poco_uri.getPort());
|
|
||||||
}
|
|
||||||
else if (poco_uri.getScheme() == "http")
|
|
||||||
{
|
|
||||||
session = make_unique<HTTPClientSession>(poco_uri.getHost(),
|
|
||||||
poco_uri.getPort());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// NOLINTNEXTLINE(cert-err60-cpp)
|
|
||||||
throw Poco::Exception("Protocol not supported.");
|
|
||||||
}
|
|
||||||
|
|
||||||
HTTPRequest request(method, path, HTTPMessage::HTTP_1_1);
|
|
||||||
request.set("User-Agent", string("remwharead/") + global::version);
|
|
||||||
|
|
||||||
HTTPResponse response;
|
|
||||||
|
|
||||||
session->sendRequest(request);
|
|
||||||
istream &rs = session->receiveResponse(response);
|
|
||||||
|
|
||||||
// Not using the constants because some are too new for Debian stretch.
|
|
||||||
switch (response.getStatus())
|
|
||||||
{
|
|
||||||
case 301: // HTTPResponse::HTTP_MOVED_PERMANENTLY
|
|
||||||
case 308: // HTTPResponse::HTTP_PERMANENT_REDIRECT
|
|
||||||
case 302: // HTTPResponse::HTTP_FOUND
|
|
||||||
case 303: // HTTPResponse::HTTP_SEE_OTHER
|
|
||||||
case 307: // HTTPResponse::HTTP_TEMPORARY_REDIRECT
|
|
||||||
{
|
|
||||||
string location = response.get("Location");
|
|
||||||
if (location.substr(0, 4) != "http")
|
|
||||||
{
|
|
||||||
location = poco_uri.getScheme() + "://" + poco_uri.getHost()
|
|
||||||
+ location;
|
|
||||||
}
|
|
||||||
return make_request(location, archive);
|
|
||||||
}
|
|
||||||
case HTTPResponse::HTTP_OK:
|
|
||||||
{
|
|
||||||
string answer;
|
|
||||||
if (archive)
|
|
||||||
{
|
|
||||||
answer = response.get("Content-Location");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
StreamCopier::copyToString(rs, answer);
|
|
||||||
}
|
|
||||||
return answer;
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
{
|
|
||||||
throw Poco::Exception(response.getReason()); // NOLINT(cert-err60-cpp)
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
string URI::extract_title() const
|
string URI::extract_title() const
|
||||||
|
@ -280,7 +143,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;
|
||||||
|
@ -318,7 +181,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;
|
||||||
|
@ -346,269 +209,95 @@ string URI::unescape_html(string html) const
|
||||||
|
|
||||||
// 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 (const auto &pair : names)
|
||||||
{
|
{
|
||||||
const RegEx re('&' + pair.first + ';');
|
const RegEx re('&' + pair.first + ';');
|
||||||
re.subst(html, u8c.to_bytes(pair.second), RegEx::RE_GLOBAL);
|
re.subst(html, u8c.to_bytes(pair.second), RegEx::RE_GLOBAL);
|
||||||
|
@ -619,30 +308,44 @@ string URI::unescape_html(string html) const
|
||||||
|
|
||||||
archive_answer URI::archive() const
|
archive_answer URI::archive() const
|
||||||
{
|
{
|
||||||
|
using namespace curl_wrapper;
|
||||||
|
|
||||||
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/"
|
CURLWrapper curl;
|
||||||
+ _uri, true);
|
const auto answer =
|
||||||
|
curl.make_http_request(http_method::HEAD,
|
||||||
|
"https://web.archive.org/save/" + _uri);
|
||||||
|
|
||||||
if (!answer.empty())
|
if (answer)
|
||||||
{
|
{
|
||||||
return { true, "", "https://web.archive.org" + answer };
|
string location{answer.get_header("location")};
|
||||||
}
|
if (location.empty())
|
||||||
}
|
|
||||||
catch (const Poco::Exception &e)
|
|
||||||
{
|
{
|
||||||
return { false, e.displayText(), "" };
|
location = answer.get_header("content-location");
|
||||||
|
}
|
||||||
|
if (!location.empty())
|
||||||
|
{
|
||||||
|
return {true, "", location};
|
||||||
}
|
}
|
||||||
|
|
||||||
return { false, "Unknown error.", "" };
|
return {false, "Could not extract location.", ""};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (const exception &e)
|
||||||
|
{
|
||||||
|
return {false, e.what(), ""};
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
@ -660,7 +363,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)
|
||||||
{
|
{
|
||||||
|
@ -672,8 +375,8 @@ string URI::cut_text(const string &text, const uint16_t n_chars) const
|
||||||
+ 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;
|
||||||
}
|
}
|
||||||
|
@ -688,29 +391,29 @@ string URI::to_utf8(const string &str)
|
||||||
detect_encoding();
|
detect_encoding();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_encoding == "utf-8")
|
||||||
|
{
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
|
||||||
return boost::locale::conv::to_utf<char>(str, _encoding);
|
return boost::locale::conv::to_utf<char>(str, _encoding);
|
||||||
}
|
}
|
||||||
|
|
||||||
void URI::detect_encoding()
|
void URI::detect_encoding()
|
||||||
{
|
{
|
||||||
const RegEx re_encoding(R"(<meta.+charset=(.+)[";])", RegEx::RE_CASELESS);
|
const RegEx re_encoding(R"(<meta.+charset="([^";]+))", RegEx::RE_CASELESS);
|
||||||
vector<string> matches;
|
vector<string> matches;
|
||||||
re_encoding.split(_document, matches);
|
re_encoding.split(_document, matches);
|
||||||
if (matches.size() >= 2)
|
if (matches.size() >= 2)
|
||||||
{
|
{
|
||||||
_encoding = matches[1];
|
_encoding = boost::locale::to_lower(matches[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool URI::is_html() const
|
bool URI::is_html() const
|
||||||
{
|
{
|
||||||
const RegEx re_htmlfile(".*\\.(.?html?|xml|rss)$", RegEx::RE_CASELESS);
|
const RegEx re_htmlfile(".*\\.(.?html?|xml|rss)$", RegEx::RE_CASELESS);
|
||||||
if (_uri.substr(0, 4) == "http" || re_htmlfile.match(_uri))
|
return (_uri.substr(0, 4) == "http" || re_htmlfile.match(_uri));
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace remwharead
|
} // namespace remwharead
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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")
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue