King_DuckZ/dindexer
1
0
Fork 0
mirror of https://github.com/KingDuckZ/dindexer.git synced 2025-07-16 16:24:12 +00:00
Code Issues Releases Wiki Activity

Import duckhandy as a submodule and fix includes.

Browse source
This commit is contained in:
King_DuckZ 2016-07-14 15:52:03 +01:00
parent aeb8dee561
commit a5477c99cf
45 changed files with 55 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -10,3 +10,6 @@
[submodule "lib/sprout"]
path = lib/sprout
url = https://github.com/bolero-MURAKAMI/Sprout.git
[submodule "lib/duckhandy"]
path = lib/duckhandy
url = https://github.com/KingDuckZ/duckhandy.git

2
CMakeLists.txt
View file

@ -132,6 +132,7 @@ add_subdirectory(lib/glob2regex)
add_subdirectory(src/backends)
add_subdirectory(src/core)
add_subdirectory(src/incredis)
add_shared_git_project(lib/duckhandy)
#Actions
add_subdirectory(src/main)
@ -153,6 +154,7 @@ target_link_libraries(${PROJECT_NAME}
INTERFACE ${Boost_LIBRARIES}
INTERFACE ${bare_name}-pq
INTERFACE ${bare_name}-inc
INTERFACE duckhandy
)
target_compile_definitions(${PROJECT_NAME}

2
README.md
View file

@ -132,8 +132,6 @@ and the following libraries:
* **machinery** the bulk of dindexer, such as the indexing functionality
* **pq** a c++ wrapper for libpq (PostgreSql)
Additionally inside include/helpers/ you will find header-only implementations of very generic helper tools.
Currently, actions are just the command line frontend to access the functionalities in the libraries. This way writing a new CLI or GUI should be relatively easy.
This structure might change in the future.

2
include/backends/db_backend.hpp
View file

@ -19,7 +19,7 @@
#define id7506CA9825454B80856154ACFE8A9DE2
#include "backends/backend_loader.hpp"
#include "helpers/MaxSizedArray.hpp"
#include "duckhandy/MaxSizedArray.hpp"
#include <cstdint>
#include <string>
#include <vector>

2
include/dindexer-core/split_tags.hpp
View file

@ -21,7 +21,7 @@
#include <vector>
#include <string>
#include <boost/utility/string_ref.hpp>
#include "helpers/compatibility.h"
#include "duckhandy/compatibility.h"
namespace dincore {
std::vector<boost::string_ref> split_and_trim ( const std::string& parList, char parSeparator ) a_pure;

2
include/dindexer-machinery/guess_content_type.hpp
View file

@ -20,7 +20,7 @@
#include "dindexer-machinery/mediatypes.hpp"
#include "dindexer-machinery/recorddata.hpp"
#include "helpers/compatibility.h"
#include "duckhandy/compatibility.h"
#include <vector>
namespace mchlib {

2
include/dindexer-machinery/mediatypes.hpp
View file

@ -18,7 +18,7 @@
#ifndef id700AFD0F33634ACC88079BB8853A9E13
#define id700AFD0F33634ACC88079BB8853A9E13
#include "helpers/compatibility.h"
#include "duckhandy/compatibility.h"
#include "enum.h"
#include <string>

2
include/pq/implem/pq_type_helpers.hpp
View file

@ -18,7 +18,7 @@
#ifndef idEC73C3E4D64D44ABA0DB7D41FA8A7EB7
#define idEC73C3E4D64D44ABA0DB7D41FA8A7EB7
#include "helpers/string_bt.hpp"
#include "duckhandy/string_bt.hpp"
#include <chrono>
#include <type_traits>
#include <boost/utility/string_ref.hpp>

1
lib/duckhandy Submodule

@ -0,0 +1 @@
Subproject commit 0da25f9094c08ccb1312e502e020db6a68504d34

2
src/backends/postgresql/delete.cpp
View file

@ -17,7 +17,7 @@
#include "delete.hpp"
#include "pq/connection.hpp"
#include "helpers/infix_iterator.hpp"
#include "duckhandy/infix_iterator.hpp"
#include <sstream>
#include <utility>
#include <iterator>

2
src/backends/postgresql/navigate.cpp
View file

@ -17,7 +17,7 @@
#include "navigate.hpp"
#include "pq/connection.hpp"
#include "helpers/infix_iterator.hpp"
#include "duckhandy/infix_iterator.hpp"
#include "query_count_limit.hpp"
#include <ciso646>
#include <utility>

2
src/backends/postgresql/navigate.hpp
View file

@ -20,7 +20,7 @@
#include "dindexer-machinery/recorddata.hpp"
#include "flatinsertin2dlist.hpp"
#include "helpers/MaxSizedArray.hpp"
#include "duckhandy/MaxSizedArray.hpp"
#include "backends/db_backend.hpp"
#include <memory>
#include <cstdint>

4
src/backends/redis/backend_redis.cpp
View file

@ -19,10 +19,10 @@
#include "dindexer-machinery/recorddata.hpp"
#include "backends/exposed_functions.hpp"
#include "backends/backend_version.hpp"
#include "helpers/lexical_cast.hpp"
#include "duckhandy/lexical_cast.hpp"
#include "dindexerConfig.h"
#include "redisConfig.h"
#include "helpers/stringize.h"
#include "duckhandy/stringize.h"
#include "tag.hpp"
#include "delete.hpp"
#include "find.hpp"

4
src/backends/redis/delete.cpp
View file

@ -18,8 +18,8 @@
#include "delete.hpp"
#include "tag.hpp"
#include "incredis.hpp"
#include "helpers/lexical_cast.hpp"
#include "helpers/sequence_bt.hpp"
#include "duckhandy/lexical_cast.hpp"
#include "duckhandy/sequence_bt.hpp"
#include "dindexerConfig.h"
#include <vector>
#include <tuple>

4
src/backends/redis/find.cpp
View file

@ -17,11 +17,11 @@
#include "find.hpp"
#include "incredis.hpp"
#include "helpers/lexical_cast.hpp"
#include "duckhandy/lexical_cast.hpp"
#include "dindexerConfig.h"
#include "dindexer-core/split_tags.hpp"
#include "dindexer-machinery/tiger.hpp"
#include "helpers/compatibility.h"
#include "duckhandy/compatibility.h"
#include <boost/regex.hpp>
#include <ciso646>
#include <algorithm>

2
src/backends/redis/find.hpp
View file

@ -19,7 +19,7 @@
#define idB4972996B4494E66A03B6AE205B1FA36
#include "backends/db_backend.hpp"
#include "helpers/MaxSizedArray.hpp"
#include "duckhandy/MaxSizedArray.hpp"
#include <vector>
#include <string>
#include <boost/utility/string_ref.hpp>

2
src/backends/redis/record_data_adapt.hpp
View file

@ -19,7 +19,7 @@
#define id2949D72CC2F246D4A289FFB820CC3A8F
#include "dindexer-machinery/recorddata.hpp"
#include "helpers/lexical_cast.hpp"
#include "duckhandy/lexical_cast.hpp"
#include <array>
#include <string>
#include <cstdint>

2
src/backends/redis/tag.cpp
View file

@ -18,7 +18,7 @@
#include "tag.hpp"
#include "incredis.hpp"
#include "dindexerConfig.h"
#include "helpers/lexical_cast.hpp"
#include "duckhandy/lexical_cast.hpp"
#include "dindexer-core/split_tags.hpp"
#include <sstream>
#include <tuple>

6
src/common/commandline.cpp
View file

@ -18,9 +18,9 @@
#include "dindexer-common/commandline.hpp"
#include "dindexerConfig.h"
#include "gitinfo.h"
#include "helpers/lengthof.h"
#include "helpers/stringize.h"
#include "helpers/infix_iterator.hpp"
#include "duckhandy/lengthof.h"
#include "duckhandy/stringize.h"
#include "duckhandy/infix_iterator.hpp"
#include <boost/program_options.hpp>
#include <ostream>
#include <utility>

2
src/common/common_info.cpp
View file

@ -17,7 +17,7 @@
#include "dindexer-common/common_info.hpp"
#include "dindexerConfig.h"
#include "helpers/stringize.h"
#include "duckhandy/stringize.h"
namespace dinlib {
namespace {

2
src/dindexerConfig.h.in
View file

@ -18,7 +18,7 @@
#ifndef id48D6E1D45238460F99C2BCBFDE920791
#define id48D6E1D45238460F99C2BCBFDE920791
#include "helpers/cmake_on_off.h"
#include "duckhandy/cmake_on_off.h"
#define PROGRAM_NAME "@bare_name@"
#define VERSION_MAJOR @PROJECT_VERSION_MAJOR@

2
src/incredis/arg_to_bin_safe.hpp
View file

@ -18,7 +18,7 @@
#ifndef id9348909738B047B7B6912D73CB519039
#define id9348909738B047B7B6912D73CB519039
#include "helpers/compatibility.h"
#include "duckhandy/compatibility.h"
#include <cstddef>
#include <boost/utility/string_ref.hpp>
#include <string>

4
src/incredis/incredis.cpp
View file

@ -16,8 +16,8 @@
*/
#include "incredis.hpp"
#include "helpers/compatibility.h"
#include "helpers/lexical_cast.hpp"
#include "duckhandy/compatibility.h"
#include "duckhandy/lexical_cast.hpp"
#include <cassert>
#include <ciso646>

2
src/incredis/incredisConfig.h.in
View file

@ -18,7 +18,7 @@
#ifndef id2F97AF7626CE45F08742867A2A737482
#define id2F97AF7626CE45F08742867A2A737482
#include "helpers/cmake_on_off.h"
#include "duckhandy/cmake_on_off.h"
#if CMAKE_@has_cryptopp_lib@
# define WITH_CRYPTOPP

2
src/incredis/incredis_batch.cpp
View file

@ -16,7 +16,7 @@
*/
#include "incredis_batch.hpp"
#include "helpers/lexical_cast.hpp"
#include "duckhandy/lexical_cast.hpp"
#include <sstream>
#include <utility>
#include <ciso646>

2
src/incredis/incredis_batch.hpp
View file

@ -19,7 +19,7 @@
#define id3C772A92AB0E440DA84DAFD807BC962D
#include "batch.hpp"
#include "helpers/sequence_bt.hpp"
#include "duckhandy/sequence_bt.hpp"
#include <boost/utility/string_ref.hpp>
#include <boost/lexical_cast.hpp>
#include <type_traits>

2
src/incredis/reply.cpp
View file

@ -16,7 +16,7 @@
*/
#include "reply.hpp"
#include "helpers/lexical_cast.hpp"
#include "duckhandy/lexical_cast.hpp"
#include <boost/variant/get.hpp>
namespace redis {

2
src/incredis/scan_iterator.cpp
View file

@ -16,7 +16,7 @@
*/
#include "scan_iterator.hpp"
#include "helpers/lexical_cast.hpp"
#include "duckhandy/lexical_cast.hpp"
#include "command.hpp"
#include <cassert>
#include <ciso646>

2
src/incredis/scan_iterator.hpp
View file

@ -19,7 +19,7 @@
#define id774125B851514A26BD7C2AD1D804D732
#include "reply.hpp"
#include "helpers/has_method.hpp"
#include "duckhandy/has_method.hpp"
#include "enum.h"
#include <boost/iterator/iterator_facade.hpp>
#include <type_traits>

4
src/incredis/script.hpp
View file

@ -19,8 +19,8 @@
#define id5B30CDA57F894CD6888093B64F9433DA
#include "batch.hpp"
#include "helpers/lexical_cast.hpp"
#include "helpers/sequence_bt.hpp"
#include "duckhandy/lexical_cast.hpp"
#include "duckhandy/sequence_bt.hpp"
#include <boost/utility/string_ref.hpp>
#include <tuple>
#include <cassert>

2
src/incredis/script_manager.cpp
View file

@ -16,7 +16,7 @@
*/
#include "script_manager.hpp"
#include "helpers/lexical_cast.hpp"
#include "duckhandy/lexical_cast.hpp"
#include "command.hpp"
#include <cassert>
#if defined(MAKE_SHA1_WITH_CRYPTOPP)

2
src/machinery/discinfo.cpp
View file

@ -17,7 +17,7 @@
#include "discinfo.hpp"
#include "pathname.hpp"
#include "helpers/lengthof.h"
#include "duckhandy/lengthof.h"
#include <map>
#include <fstream>
#include <boost/tokenizer.hpp>

2
src/machinery/machineryConfig.h.in
View file

@ -18,7 +18,7 @@
#ifndef id32A00B72E29D463795CBF66517387E8D
#define id32A00B72E29D463795CBF66517387E8D
#include "helpers/cmake_on_off.h"
#include "duckhandy/cmake_on_off.h"
#if CMAKE_@DINDEXER_WITH_NICE_MEDIA_TYPES@
# define WITH_NICE_MEDIA_TYPES

2
src/machinery/machinery_info.cpp
View file

@ -17,7 +17,7 @@
#include "dindexer-machinery/machinery_info.hpp"
#include "dindexerConfig.h"
#include "helpers/stringize.h"
#include "duckhandy/stringize.h"
namespace mchlib {
boost::string_ref lib_signature() {

2
src/machinery/scantask/dirtree.cpp
View file

@ -18,7 +18,7 @@
#include "dindexer-machinery/scantask/dirtree.hpp"
#include "dindexer-machinery/recorddata.hpp"
#include "dindexer-machinery/set_listing.hpp"
#include "helpers/compatibility.h"
#include "duckhandy/compatibility.h"
#include "filesearcher.hpp"
#include "pathname.hpp"
#include <utility>

2
src/machinery/tiger.cpp
View file

@ -16,7 +16,7 @@
*/
#include "dindexer-machinery/tiger.hpp"
#include "helpers/lexical_cast.hpp"
#include "duckhandy/lexical_cast.hpp"
#include <fstream>
#include <cstdint>
#include <memory>

2
src/main/damerau_levenshtein.h
View file

@ -18,7 +18,7 @@
#ifndef id88738025C6B24BDEB604A5AE3C36EE8D
#define id88738025C6B24BDEB604A5AE3C36EE8D
#include "helpers/compatibility.h"
#include "duckhandy/compatibility.h"
#if defined(__cplusplus)
# include <cstddef>
#else

2
src/main/findactions.c
View file

@ -17,7 +17,7 @@
#include "findactions.h"
#include "dindexerConfig.h"
#include "helpers/lengthof.h"
#include "duckhandy/lengthof.h"
#include <dirent.h>
#include <string.h>
#include <stdlib.h>

2
src/main/main.c
View file

@ -19,7 +19,7 @@
#include "dindexerConfig.h"
#include "findactions.h"
#include "helpers/lengthof.h"
#include "duckhandy/lengthof.h"
#include "builtin_feats.h"
#include "damerau_levenshtein.h"
#include <string.h>

2
src/main/timestamp.h.in
View file

@ -18,7 +18,7 @@
#ifndef id4A9E94ACFA43498097637025A5BA69E5
#define id4A9E94ACFA43498097637025A5BA69E5
#include "helpers/cmake_on_off.h"
#include "duckhandy/cmake_on_off.h"
#if CMAKE_@DINDEXER_WITH_BUILD_DATE@
# define DINDEXER_BUILD_DATE "@DINDEXER_BUILD_DATE@"

2
src/main/utf8_ops.h
View file

@ -20,7 +20,7 @@
#include <stddef.h>
#include <stdint.h>
#include "helpers/compatibility.h"
#include "duckhandy/compatibility.h"
typedef uint32_t Character;

2
src/navigate/entrypath.cpp
View file

@ -16,7 +16,7 @@
*/
#include "entrypath.hpp"
#include "helpers/infix_iterator.hpp"
#include "duckhandy/infix_iterator.hpp"
#include <boost/spirit/include/qi_core.hpp>
#include <boost/spirit/include/qi_parse.hpp>
#include <boost/spirit/include/qi_lit.hpp>

2
src/navigate/listdircontent.cpp
View file

@ -18,7 +18,7 @@
#include "listdircontent.hpp"
#include "entrypath.hpp"
#include "backends/db_backend.hpp"
#include "helpers/infix_iterator.hpp"
#include "duckhandy/infix_iterator.hpp"
#include <cassert>
#include <utility>
#include <boost/range/algorithm/copy.hpp>

2
test/unit/test_diriterator.cpp
View file

@ -17,7 +17,7 @@
#include "dindexer-machinery/set_listing.hpp"
#include "dindexer-machinery/set_listing_helpers.hpp"
#include "helpers/lengthof.h"
#include "duckhandy/lengthof.h"
#include <gtest/gtest.h>
#include <vector>
#include <utility>

4
test/unit/test_lexical_cast.cpp
View file

@ -15,13 +15,13 @@
* along with "dindexer". If not, see <http://www.gnu.org/licenses/>.
*/
#include "helpers/lexical_cast.hpp"
#include "duckhandy/lexical_cast.hpp"
#include <gtest/gtest.h>
#include <cstdint>
#include <string>
#include <boost/utility/string_ref.hpp>
TEST(helpers, lexical_cast) {
TEST(duckhandy, lexical_cast) {
using dinhelp::lexical_cast;
using dinhelp::tags::hex;
using dinhelp::tags::dec;