From 5203fbece2a942037f86fc0dc15ece1b109e9e18 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 22 May 2016 02:53:54 +0100
Subject: [PATCH 001/170] Move db tagging functions to a new postgresql backend
 lib.

---
 CMakeLists.txt                                |  1 +
 .../backends/postgresql/tag.hpp               |  0
 src/backends/postgresql/CMakeLists.txt        | 21 +++++++++++++++++++
 .../postgresql/tag.cpp}                       |  2 +-
 src/tag/CMakeLists.txt                        |  2 +-
 src/tag/main.cpp                              |  2 +-
 6 files changed, 25 insertions(+), 3 deletions(-)
 rename src/tag/tag_postgres.hpp => include/backends/postgresql/tag.hpp (100%)
 create mode 100644 src/backends/postgresql/CMakeLists.txt
 rename src/{tag/tag_postgres.cpp => backends/postgresql/tag.cpp} (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75f887d..1cee3d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,6 +128,7 @@ add_subdirectory(src/common)
 add_subdirectory(src/machinery)
 add_subdirectory(lib/pbl)
 add_subdirectory(lib/glob2regex)
+add_subdirectory(src/backends/postgresql)
 
 #Actions
 add_subdirectory(src/main)
diff --git a/src/tag/tag_postgres.hpp b/include/backends/postgresql/tag.hpp
similarity index 100%
rename from src/tag/tag_postgres.hpp
rename to include/backends/postgresql/tag.hpp
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
new file mode 100644
index 0000000..a57cd59
--- /dev/null
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -0,0 +1,21 @@
+project(${bare_name}-backend-postgresql CXX)
+
+add_library(${PROJECT_NAME} STATIC
+	tag.cpp
+)
+
+#target_include_directories(${PROJECT_NAME}
+#)
+#target_include_directories(${PROJECT_NAME} SYSTEM
+#)
+
+target_link_libraries(${PROJECT_NAME}
+	PRIVATE ${bare_name}-if
+	PRIVATE pq
+)
+
+install(TARGETS ${PROJECT_NAME}
+	LIBRARY DESTINATION lib
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib/static
+)
diff --git a/src/tag/tag_postgres.cpp b/src/backends/postgresql/tag.cpp
similarity index 99%
rename from src/tag/tag_postgres.cpp
rename to src/backends/postgresql/tag.cpp
index 7a41096..cc46cea 100644
--- a/src/tag/tag_postgres.cpp
+++ b/src/backends/postgresql/tag.cpp
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tag_postgres.hpp"
+#include "backends/postgresql/tag.hpp"
 #include "pq/connection.hpp"
 #include "dindexer-common/settings.hpp"
 #include <ciso646>
diff --git a/src/tag/CMakeLists.txt b/src/tag/CMakeLists.txt
index e642dc2..3a992c6 100644
--- a/src/tag/CMakeLists.txt
+++ b/src/tag/CMakeLists.txt
@@ -3,7 +3,6 @@ project(${bare_name}-tag CXX)
 add_executable(${PROJECT_NAME}
 	main.cpp
 	commandline.cpp
-	tag_postgres.cpp
 )
 
 target_include_directories(${PROJECT_NAME}
@@ -16,6 +15,7 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
 	PRIVATE glob2regex
+	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")
diff --git a/src/tag/main.cpp b/src/tag/main.cpp
index ed0e7e1..fba9d66 100644
--- a/src/tag/main.cpp
+++ b/src/tag/main.cpp
@@ -18,7 +18,7 @@
 #include "commandline.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexerConfig.h"
-#include "tag_postgres.hpp"
+#include "backends/postgresql/tag.hpp"
 #include "dindexer-common/split_tags.hpp"
 #include "glob2regex/glob2regex.hpp"
 #include "enum.h"

From 45ecdb9a2b66ab3c0ffe0308f826269ee107049f Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 22 May 2016 03:02:39 +0100
Subject: [PATCH 002/170] Move db delete to the postgresql backend lib.

---
 .../backends/postgresql/delete.hpp                             | 0
 src/backends/postgresql/CMakeLists.txt                         | 3 ++-
 .../postgre_delete.cpp => backends/postgresql/delete.cpp}      | 2 +-
 src/delete/CMakeLists.txt                                      | 2 +-
 src/delete/main.cpp                                            | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename src/delete/postgre_delete.hpp => include/backends/postgresql/delete.hpp (100%)
 rename src/{delete/postgre_delete.cpp => backends/postgresql/delete.cpp} (98%)

diff --git a/src/delete/postgre_delete.hpp b/include/backends/postgresql/delete.hpp
similarity index 100%
rename from src/delete/postgre_delete.hpp
rename to include/backends/postgresql/delete.hpp
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index a57cd59..01e7159 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -2,6 +2,7 @@ project(${bare_name}-backend-postgresql CXX)
 
 add_library(${PROJECT_NAME} STATIC
 	tag.cpp
+	delete.cpp
 )
 
 #target_include_directories(${PROJECT_NAME}
@@ -11,7 +12,7 @@ add_library(${PROJECT_NAME} STATIC
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
-	PRIVATE pq
+	PRIVATE ${bare_name}-pq
 )
 
 install(TARGETS ${PROJECT_NAME}
diff --git a/src/delete/postgre_delete.cpp b/src/backends/postgresql/delete.cpp
similarity index 98%
rename from src/delete/postgre_delete.cpp
rename to src/backends/postgresql/delete.cpp
index 6fe550c..610fabb 100644
--- a/src/delete/postgre_delete.cpp
+++ b/src/backends/postgresql/delete.cpp
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "postgre_delete.hpp"
+#include "backends/postgresql/delete.hpp"
 #include "pq/connection.hpp"
 #include "dindexer-common/settings.hpp"
 #include "helpers/infix_iterator.hpp"
diff --git a/src/delete/CMakeLists.txt b/src/delete/CMakeLists.txt
index 7d05e34..1563f35 100644
--- a/src/delete/CMakeLists.txt
+++ b/src/delete/CMakeLists.txt
@@ -3,7 +3,6 @@ project(${bare_name}-delete CXX)
 add_executable(${PROJECT_NAME}
 	main.cpp
 	commandline.cpp
-	postgre_delete.cpp
 )
 
 target_include_directories(${PROJECT_NAME}
@@ -13,6 +12,7 @@ target_include_directories(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
+	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")
diff --git a/src/delete/main.cpp b/src/delete/main.cpp
index c510d6f..29a1332 100644
--- a/src/delete/main.cpp
+++ b/src/delete/main.cpp
@@ -18,7 +18,7 @@
 #include "commandline.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexerConfig.h"
-#include "postgre_delete.hpp"
+#include "backends/postgresql/delete.hpp"
 #include <iostream>
 #include <ciso646>
 #include <ios>

From 641261306fe0d8b294a228e9aa8e124956556ecb Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 22 May 2016 03:05:58 +0100
Subject: [PATCH 003/170] Move db locate functions to the postgresql backend
 lib.

---
 .../backends/postgresql/locate.hpp                              | 0
 src/backends/postgresql/CMakeLists.txt                          | 1 +
 .../postgre_locate.cpp => backends/postgresql/locate.cpp}       | 2 +-
 src/locate/CMakeLists.txt                                       | 2 +-
 src/locate/main.cpp                                             | 2 +-
 5 files changed, 4 insertions(+), 3 deletions(-)
 rename src/locate/postgre_locate.hpp => include/backends/postgresql/locate.hpp (100%)
 rename src/{locate/postgre_locate.cpp => backends/postgresql/locate.cpp} (99%)

diff --git a/src/locate/postgre_locate.hpp b/include/backends/postgresql/locate.hpp
similarity index 100%
rename from src/locate/postgre_locate.hpp
rename to include/backends/postgresql/locate.hpp
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index 01e7159..0fbcaa5 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -3,6 +3,7 @@ project(${bare_name}-backend-postgresql CXX)
 add_library(${PROJECT_NAME} STATIC
 	tag.cpp
 	delete.cpp
+	locate.cpp
 )
 
 #target_include_directories(${PROJECT_NAME}
diff --git a/src/locate/postgre_locate.cpp b/src/backends/postgresql/locate.cpp
similarity index 99%
rename from src/locate/postgre_locate.cpp
rename to src/backends/postgresql/locate.cpp
index 00e0361..eb68e02 100644
--- a/src/locate/postgre_locate.cpp
+++ b/src/backends/postgresql/locate.cpp
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "postgre_locate.hpp"
+#include "backends/postgresql/locate.hpp"
 #include "pq/connection.hpp"
 #include "dindexer-machinery/tiger.hpp"
 #include <utility>
diff --git a/src/locate/CMakeLists.txt b/src/locate/CMakeLists.txt
index 9b68d0f..cddde1d 100644
--- a/src/locate/CMakeLists.txt
+++ b/src/locate/CMakeLists.txt
@@ -3,7 +3,6 @@ project(${bare_name}-locate CXX)
 add_executable(${PROJECT_NAME}
 	main.cpp
 	commandline.cpp
-	postgre_locate.cpp
 	hash.cpp
 )
 
@@ -17,6 +16,7 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-common
 	PRIVATE ${bare_name}-machinery
 	PRIVATE glob2regex
+	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")
diff --git a/src/locate/main.cpp b/src/locate/main.cpp
index 7b619c4..a30ae5f 100644
--- a/src/locate/main.cpp
+++ b/src/locate/main.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "commandline.hpp"
-#include "postgre_locate.hpp"
+#include "backends/postgresql/locate.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexer-common/split_tags.hpp"
 #include "dindexerConfig.h"

From b6d45eee3c00bb9b3fed9fb8c0063872268c66f9 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 22 May 2016 03:17:26 +0100
Subject: [PATCH 004/170] Move db scan functions to the postgresql backend lib.

---
 src/scan/dbbackend.hpp => include/backends/postgresql/scan.hpp | 0
 src/backends/postgresql/CMakeLists.txt                         | 1 +
 src/{scan/dbbackend.cpp => backends/postgresql/scan.cpp}       | 2 +-
 src/scan/CMakeLists.txt                                        | 2 +-
 src/scan/main.cpp                                              | 2 +-
 5 files changed, 4 insertions(+), 3 deletions(-)
 rename src/scan/dbbackend.hpp => include/backends/postgresql/scan.hpp (100%)
 rename src/{scan/dbbackend.cpp => backends/postgresql/scan.cpp} (99%)

diff --git a/src/scan/dbbackend.hpp b/include/backends/postgresql/scan.hpp
similarity index 100%
rename from src/scan/dbbackend.hpp
rename to include/backends/postgresql/scan.hpp
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index 0fbcaa5..00d2afc 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -4,6 +4,7 @@ add_library(${PROJECT_NAME} STATIC
 	tag.cpp
 	delete.cpp
 	locate.cpp
+	scan.cpp
 )
 
 #target_include_directories(${PROJECT_NAME}
diff --git a/src/scan/dbbackend.cpp b/src/backends/postgresql/scan.cpp
similarity index 99%
rename from src/scan/dbbackend.cpp
rename to src/backends/postgresql/scan.cpp
index 04f2ebc..14328f4 100644
--- a/src/scan/dbbackend.cpp
+++ b/src/backends/postgresql/scan.cpp
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dbbackend.hpp"
+#include "backends/postgresql/scan.hpp"
 #include "pq/connection.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexer-machinery/recorddata.hpp"
diff --git a/src/scan/CMakeLists.txt b/src/scan/CMakeLists.txt
index 7137249..b5e4d9e 100644
--- a/src/scan/CMakeLists.txt
+++ b/src/scan/CMakeLists.txt
@@ -4,7 +4,6 @@ include(WithMediaAutodetect)
 
 add_executable(${PROJECT_NAME}
 	main.cpp
-	dbbackend.cpp
 	commandline.cpp
 )
 
@@ -16,6 +15,7 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
 	PRIVATE ${bare_name}-machinery
+	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")
diff --git a/src/scan/main.cpp b/src/scan/main.cpp
index a8c9cac..e44b871 100644
--- a/src/scan/main.cpp
+++ b/src/scan/main.cpp
@@ -25,7 +25,7 @@
 #include "dindexer-common/common_info.hpp"
 #include "dindexer-common/settings.hpp"
 #include "commandline.hpp"
-#include "dbbackend.hpp"
+#include "backends/postgresql/scan.hpp"
 #include "dindexer-machinery/scantask/dirtree.hpp"
 #include "dindexer-machinery/scantask/mediatype.hpp"
 #include "dindexer-machinery/scantask/hashing.hpp"

From baa67138eb5bcbcae8e99852139eb73240f6fcbe Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 23 May 2016 10:06:59 +0200
Subject: [PATCH 005/170] Move MaxSizedArray to helpers include dir.

---
 {src/navigate => include/helpers}/MaxSizedArray.hpp       | 8 ++++----
 {src/navigate => include/helpers}/MaxSizedArray.inl       | 4 ++--
 {src/navigate => include/helpers/implem}/AutomemBase.hpp  | 4 ++--
 {src/navigate => include/helpers/implem}/AutomemBase.inl  | 4 ++--
 .../navigate => include/helpers/implem}/IteratorOnPtr.hpp | 4 ++--
 src/navigate/dbsource.hpp                                 | 4 +++-
 6 files changed, 15 insertions(+), 13 deletions(-)
 rename {src/navigate => include/helpers}/MaxSizedArray.hpp (97%)
 rename {src/navigate => include/helpers}/MaxSizedArray.inl (99%)
 rename {src/navigate => include/helpers/implem}/AutomemBase.hpp (98%)
 rename {src/navigate => include/helpers/implem}/AutomemBase.inl (99%)
 rename {src/navigate => include/helpers/implem}/IteratorOnPtr.hpp (99%)

diff --git a/src/navigate/MaxSizedArray.hpp b/include/helpers/MaxSizedArray.hpp
similarity index 97%
rename from src/navigate/MaxSizedArray.hpp
rename to include/helpers/MaxSizedArray.hpp
index 6082b7b..d147176 100644
--- a/src/navigate/MaxSizedArray.hpp
+++ b/include/helpers/MaxSizedArray.hpp
@@ -18,15 +18,15 @@
 #ifndef idBC9F804ADD33468A9C7657E823FFC706
 #define idBC9F804ADD33468A9C7657E823FFC706
 
-#include "AutomemBase.hpp"
-#include "IteratorOnPtr.hpp"
+#include "implem/AutomemBase.hpp"
+#include "implem/IteratorOnPtr.hpp"
 #include <memory>
 #include <cstddef>
 #include <type_traits>
 #include <cassert>
 #include <utility>
 
-namespace din {
+namespace dinhelp {
 	const size_t MAXSZARR_MAX_STACK_ALLOC_SIZE = MAX_STACK_ALLOC_SIZE;
 
 	//TODO: add a template parameter to force stack allocation regardless of
@@ -107,7 +107,7 @@ namespace din {
 		T* m_localMem; //A copy of memory pointer is required
 		size_type m_used;
 	};
-} //namespace din
+} //namespace dinhelp
 
 #include "MaxSizedArray.inl"
 
diff --git a/src/navigate/MaxSizedArray.inl b/include/helpers/MaxSizedArray.inl
similarity index 99%
rename from src/navigate/MaxSizedArray.inl
rename to include/helpers/MaxSizedArray.inl
index e89f6a2..f46661d 100644
--- a/src/navigate/MaxSizedArray.inl
+++ b/include/helpers/MaxSizedArray.inl
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace din {
+namespace dinhelp {
 	///-------------------------------------------------------------------------
 	///-------------------------------------------------------------------------
 	template <typename T, size_t S, typename A>
@@ -278,4 +278,4 @@ namespace din {
 			throw std::length_error("Unable to reserve more memory than the build-time size for MaxSizedArray");
 		}
 	}
-} //namespace din
+} //namespace dinhelp
diff --git a/src/navigate/AutomemBase.hpp b/include/helpers/implem/AutomemBase.hpp
similarity index 98%
rename from src/navigate/AutomemBase.hpp
rename to include/helpers/implem/AutomemBase.hpp
index fd2d78c..c632976 100644
--- a/src/navigate/AutomemBase.hpp
+++ b/include/helpers/implem/AutomemBase.hpp
@@ -30,7 +30,7 @@
 #	define ASSERTIONSENABLED
 #endif
 
-namespace din {
+namespace dinhelp {
 	const size_t MAX_STACK_ALLOC_SIZE = 128;
 
 	///-------------------------------------------------------------------------
@@ -81,7 +81,7 @@ namespace din {
 		void operator= (const AutomemRawBase_stack&);
 		typename std::aligned_storage<sizeof(T), alignof(T)>::type m_localMem[S];
 	};
-} //namespace din
+} //namespace dinhelp
 
 #include "AutomemBase.inl"
 
diff --git a/src/navigate/AutomemBase.inl b/include/helpers/implem/AutomemBase.inl
similarity index 99%
rename from src/navigate/AutomemBase.inl
rename to include/helpers/implem/AutomemBase.inl
index ba25d2e..6909bda 100644
--- a/src/navigate/AutomemBase.inl
+++ b/include/helpers/implem/AutomemBase.inl
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace din {
+namespace dinhelp {
 	namespace {
 #if defined(ASSERTIONSENABLED)
 		const char g_guard = 0xAB;
@@ -115,4 +115,4 @@ namespace din {
 #endif
 		return new(location) T(std::forward<Args...>(parArgs)...);
 	}
-} //namespace din
+} //namespace dinhelp
diff --git a/src/navigate/IteratorOnPtr.hpp b/include/helpers/implem/IteratorOnPtr.hpp
similarity index 99%
rename from src/navigate/IteratorOnPtr.hpp
rename to include/helpers/implem/IteratorOnPtr.hpp
index c384c40..4845592 100644
--- a/src/navigate/IteratorOnPtr.hpp
+++ b/include/helpers/implem/IteratorOnPtr.hpp
@@ -23,7 +23,7 @@
 #include <type_traits>
 #include <cassert>
 
-namespace din {
+namespace dinhelp {
 	namespace implem_iop {
 		template <typename P, typename T, int32_t I>
 		class IteratorOnPtr_base : public std::iterator<std::random_access_iterator_tag, T> {
@@ -309,6 +309,6 @@ namespace din {
 		this->MoveIterator(-parOther);
 		return *this;
 	}
-} //namespace din
+} //namespace dinhelp
 
 #endif
diff --git a/src/navigate/dbsource.hpp b/src/navigate/dbsource.hpp
index 5da8df9..acef295 100644
--- a/src/navigate/dbsource.hpp
+++ b/src/navigate/dbsource.hpp
@@ -20,7 +20,7 @@
 
 #include "dindexer-machinery/recorddata.hpp"
 #include "flatinsertin2dlist.hpp"
-#include "MaxSizedArray.hpp"
+#include "helpers/MaxSizedArray.hpp"
 #include <memory>
 #include <cstdint>
 #include <vector>
@@ -40,6 +40,8 @@ namespace pq {
 } //namespace pq
 
 namespace din {
+	using dinhelp::MaxSizedArray;
+
 	enum SetDetails {
 		SetDetail_Desc = 0x01,
 		SetDetail_Type = 0x02,

From 70caa9e26c3c7401911e33628e64dd3082c9dfe3 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 23 May 2016 19:28:50 +0200
Subject: [PATCH 006/170] Move db dbsource files to the postgresql backend lib
 and rename namespace.

---
 .../backends/postgresql}/dbsource.hpp         | 20 +++++------
 include/backends/postgresql/delete.hpp        | 10 +++---
 include/backends/postgresql/locate.hpp        | 15 ++++----
 include/backends/postgresql/scan.hpp          | 14 ++++----
 include/backends/postgresql/settings.hpp      | 34 +++++++++++++++++++
 include/backends/postgresql/tag.hpp           | 20 +++++------
 include/dindexer-common/settings.hpp          | 12 ++-----
 .../helpers}/flatinsertin2dlist.hpp           | 14 ++++++--
 .../helpers/implem}/flatinsertin2dlist.inl    |  4 +--
 src/backends/postgresql/CMakeLists.txt        |  1 +
 .../postgresql}/dbsource.cpp                  | 12 +++----
 src/backends/postgresql/delete.cpp            |  8 ++---
 src/backends/postgresql/locate.cpp            | 17 +++++-----
 src/backends/postgresql/scan.cpp              | 10 +++---
 src/backends/postgresql/tag.cpp               | 17 +++++-----
 src/common/settings.cpp                       |  8 ++---
 src/delete/main.cpp                           |  6 ++--
 src/locate/main.cpp                           | 16 ++++-----
 src/navigate/CMakeLists.txt                   |  2 +-
 src/navigate/listdircontent.cpp               |  8 ++---
 src/navigate/listdircontent.hpp               |  9 +++--
 src/navigate/main.cpp                         | 10 +++---
 src/scan/main.cpp                             |  8 ++---
 src/tag/main.cpp                              | 22 ++++++------
 24 files changed, 166 insertions(+), 131 deletions(-)
 rename {src/navigate => include/backends/postgresql}/dbsource.hpp (92%)
 create mode 100644 include/backends/postgresql/settings.hpp
 rename {src/navigate => include/helpers}/flatinsertin2dlist.hpp (73%)
 rename {src/navigate => include/helpers/implem}/flatinsertin2dlist.inl (98%)
 rename src/{navigate => backends/postgresql}/dbsource.cpp (95%)

diff --git a/src/navigate/dbsource.hpp b/include/backends/postgresql/dbsource.hpp
similarity index 92%
rename from src/navigate/dbsource.hpp
rename to include/backends/postgresql/dbsource.hpp
index acef295..087435a 100644
--- a/src/navigate/dbsource.hpp
+++ b/include/backends/postgresql/dbsource.hpp
@@ -19,7 +19,7 @@
 #define id63F35BA8B3C94A129291D963ABE66018
 
 #include "dindexer-machinery/recorddata.hpp"
-#include "flatinsertin2dlist.hpp"
+#include "helpers/flatinsertin2dlist.hpp"
 #include "helpers/MaxSizedArray.hpp"
 #include <memory>
 #include <cstdint>
@@ -31,17 +31,15 @@
 #include <functional>
 #include <boost/utility/string_ref.hpp>
 
-namespace dinlib {
-	struct SettingsDB;
-} //namespace dinlib
-
 namespace pq {
 	class Connection;
 } //namespace pq
 
-namespace din {
+namespace dinbpostgres {
 	using dinhelp::MaxSizedArray;
 
+	struct Settings;
+
 	enum SetDetails {
 		SetDetail_Desc = 0x01,
 		SetDetail_Type = 0x02,
@@ -69,7 +67,7 @@ namespace din {
 
 	class DBSource {
 	public:
-		explicit DBSource ( const dinlib::SettingsDB& parDBSettings );
+		explicit DBSource ( const Settings& parDBSettings );
 		~DBSource ( void ) noexcept;
 
 		void disconnect ( void );
@@ -121,8 +119,9 @@ namespace din {
 
 	template <SetDetails... D>
 	auto DBSource::set_details (const std::vector<uint32_t>& parIDs) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>> {
+		using dinhelp::FlatInsertIn2DList;
 		typedef std::vector<MaxSizedArray<std::string, sizeof...(D)>> ReturnType;
-		typedef void(din::FlatInsertIn2DList<ReturnType>::*FlatPushBackFunc)(std::string&&);
+		typedef void(FlatInsertIn2DList<ReturnType>::*FlatPushBackFunc)(std::string&&);
 
 		const auto columns = implem::make_columns_vec<SetDetails, D...>(m_set_details_map);
 
@@ -135,8 +134,9 @@ namespace din {
 
 	template <FileDetails... D>
 	auto DBSource::file_details (uint32_t parSetID, uint16_t parLevel, boost::string_ref parDir) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>> {
+		using dinhelp::FlatInsertIn2DList;
 		typedef std::vector<MaxSizedArray<std::string, sizeof...(D)>> ReturnType;
-		typedef void(din::FlatInsertIn2DList<ReturnType>::*FlatPushBackFunc)(std::string&&);
+		typedef void(FlatInsertIn2DList<ReturnType>::*FlatPushBackFunc)(std::string&&);
 
 		const auto columns = implem::make_columns_vec<FileDetails, D...>(m_file_details_map);
 
@@ -146,6 +146,6 @@ namespace din {
 		this->query_files_in_dir(columns, parDir, parLevel, parSetID, std::bind(pback_func, &flat_list, std::placeholders::_1));
 		return list;
 	}
-} //namespace din
+} //namespace dinbpostgres
 
 #endif
diff --git a/include/backends/postgresql/delete.hpp b/include/backends/postgresql/delete.hpp
index f6221b5..85bba77 100644
--- a/include/backends/postgresql/delete.hpp
+++ b/include/backends/postgresql/delete.hpp
@@ -24,15 +24,13 @@
 #include <cstdint>
 #include <map>
 
-namespace dinlib {
-	struct SettingsDB;
-} //namespace dinlib
+namespace dinbpostgres {
+	struct Settings;
 
-namespace din {
 	using IDDescMap = std::map<uint32_t, std::string>;
 	using ConfirmDeleCallback = std::function<bool(const IDDescMap&)>;
 
-	void delete_group_from_db ( const dinlib::SettingsDB& parDB, const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf );
-} //namespace din
+	void delete_group_from_db ( const Settings& parDB, const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf );
+} //namespace dinbpostgres
 
 #endif
diff --git a/include/backends/postgresql/locate.hpp b/include/backends/postgresql/locate.hpp
index b30c6fb..e982a17 100644
--- a/include/backends/postgresql/locate.hpp
+++ b/include/backends/postgresql/locate.hpp
@@ -18,7 +18,6 @@
 #ifndef id1AE05A59AE0E4A4490040FD85D9AF665
 #define id1AE05A59AE0E4A4490040FD85D9AF665
 
-#include "dindexer-common/settings.hpp"
 #include <vector>
 #include <string>
 #include <cstdint>
@@ -28,7 +27,9 @@ namespace mchlib {
 	struct TigerHash;
 } //namespace mchlib
 
-namespace din {
+namespace dinbpostgres {
+	struct Settings;
+
 	struct LocatedItem {
 		std::string path;
 		uint64_t id;
@@ -44,10 +45,10 @@ namespace din {
 
 	using TagList = std::vector<boost::string_ref>;
 
-	std::vector<LocatedItem> locate_in_db ( const dinlib::SettingsDB& parDB, const std::string& parSearch, const TagList& parTags );
-	std::vector<LocatedItem> locate_in_db ( const dinlib::SettingsDB& parDB, const mchlib::TigerHash& parSearch, const TagList& parTags );
-	std::vector<LocatedSet> locate_sets_in_db ( const dinlib::SettingsDB& parDB, const std::string& parSearch, bool parCaseInsensitive );
-	std::vector<LocatedSet> locate_sets_in_db ( const dinlib::SettingsDB& parDB, const std::string& parSearch, const std::vector<uint32_t>& parSets, bool parCaseInsensitive );
-} //namespace din
+	std::vector<LocatedItem> locate_in_db ( const Settings& parDB, const std::string& parSearch, const TagList& parTags );
+	std::vector<LocatedItem> locate_in_db ( const Settings& parDB, const mchlib::TigerHash& parSearch, const TagList& parTags );
+	std::vector<LocatedSet> locate_sets_in_db ( const Settings& parDB, const std::string& parSearch, bool parCaseInsensitive );
+	std::vector<LocatedSet> locate_sets_in_db ( const Settings& parDB, const std::string& parSearch, const std::vector<uint32_t>& parSets, bool parCaseInsensitive );
+} //namespace dinbpostgres
 
 #endif
diff --git a/include/backends/postgresql/scan.hpp b/include/backends/postgresql/scan.hpp
index 943c74e..6dee13f 100644
--- a/include/backends/postgresql/scan.hpp
+++ b/include/backends/postgresql/scan.hpp
@@ -22,10 +22,6 @@
 #include <vector>
 #include <cstdint>
 
-namespace dinlib {
-	struct SettingsDB;;
-} //namespace dinlib
-
 namespace mchlib {
 	struct FileRecordData;
 	struct SetRecordData;
@@ -33,9 +29,11 @@ namespace mchlib {
 	struct TigerHash;
 } //namespace mchlib
 
-namespace din {
-	void write_to_db ( const dinlib::SettingsDB& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature );
-	bool read_from_db ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const dinlib::SettingsDB& parDB, const mchlib::TigerHash& parHash );
-} //namespace din
+namespace dinbpostgres {
+	struct Settings;;
+
+	void write_to_db ( const Settings& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature );
+	bool read_from_db ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const Settings& parDB, const mchlib::TigerHash& parHash );
+} //namespace dinbpostgres
 
 #endif
diff --git a/include/backends/postgresql/settings.hpp b/include/backends/postgresql/settings.hpp
new file mode 100644
index 0000000..5c22c1a
--- /dev/null
+++ b/include/backends/postgresql/settings.hpp
@@ -0,0 +1,34 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef idC895D12FEB324387A37FF631E0C09560
+#define idC895D12FEB324387A37FF631E0C09560
+
+#include <string>
+#include <cstdint>
+
+namespace dinbpostgres {
+	struct Settings {
+		std::string address;
+		std::string username;
+		std::string password;
+		std::string dbname;
+		uint16_t port;
+	};
+} //namespace dinbpostgres
+
+#endif
diff --git a/include/backends/postgresql/tag.hpp b/include/backends/postgresql/tag.hpp
index 5fd2608..8a0af9f 100644
--- a/include/backends/postgresql/tag.hpp
+++ b/include/backends/postgresql/tag.hpp
@@ -22,23 +22,21 @@
 #include <boost/utility/string_ref.hpp>
 #include <cstdint>
 
-namespace dinlib {
-	struct SettingsDB;
-} //namespace dinlib
+namespace dinbpostgres {
+	struct Settings;
 
-namespace din {
 	struct OwnerSetInfo {
 		uint32_t group_id;
 		bool is_valid;
 	};
 
-	void tag_files ( const dinlib::SettingsDB& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
-	void tag_files ( const dinlib::SettingsDB& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
+	void tag_files ( const Settings& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
+	void tag_files ( const Settings& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
 
-	void delete_tags ( const dinlib::SettingsDB& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
-	void delete_tags ( const dinlib::SettingsDB& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
-	void delete_all_tags ( const dinlib::SettingsDB& parDB, const std::vector<uint64_t>& parFiles, OwnerSetInfo parSet );
-	void delete_all_tags ( const dinlib::SettingsDB& parDB, const std::vector<std::string>& parRegexes, OwnerSetInfo parSet );
-} //namespace din
+	void delete_tags ( const Settings& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
+	void delete_tags ( const Settings& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
+	void delete_all_tags ( const Settings& parDB, const std::vector<uint64_t>& parFiles, OwnerSetInfo parSet );
+	void delete_all_tags ( const Settings& parDB, const std::vector<std::string>& parRegexes, OwnerSetInfo parSet );
+} //namespace dinbpostgres
 
 #endif
diff --git a/include/dindexer-common/settings.hpp b/include/dindexer-common/settings.hpp
index e72bb0a..86e7a2b 100644
--- a/include/dindexer-common/settings.hpp
+++ b/include/dindexer-common/settings.hpp
@@ -19,19 +19,11 @@
 #define idDC29E3C667BD4793BA0644AE7DC5BD3F
 
 #include <string>
-#include <cstdint>
+#include "backends/postgresql/settings.hpp"
 
 namespace dinlib {
-	struct SettingsDB {
-		std::string address;
-		std::string username;
-		std::string password;
-		std::string dbname;
-		uint16_t port;
-	};
-
 	struct Settings {
-		SettingsDB db;
+		dinbpostgres::Settings db;
 	};
 
 	bool load_settings ( const std::string& parPath, Settings& parOut, bool parExpand=true );
diff --git a/src/navigate/flatinsertin2dlist.hpp b/include/helpers/flatinsertin2dlist.hpp
similarity index 73%
rename from src/navigate/flatinsertin2dlist.hpp
rename to include/helpers/flatinsertin2dlist.hpp
index b8d2a20..927b47d 100644
--- a/src/navigate/flatinsertin2dlist.hpp
+++ b/include/helpers/flatinsertin2dlist.hpp
@@ -18,13 +18,21 @@
 #ifndef idAA901DA47E234E37B325B3192EF50423
 #define idAA901DA47E234E37B325B3192EF50423
 
+//Use this function to turn a 1D sequence of elements that are logically grouped
+//together by position into a 2D list. For example, if you have an input sequence
+//like {A1, B1, C1, A2, B2, C2, A3, B3, C3} and you want to turn it into
+//{ {A1, B1, C1}, {A2, B2, C2}, {A3, B3, C3} } you can use these functions to
+//achieve that. You need to specify the size of the innermost groups, 3 in the
+//example just given, and push_back() will automatically move to the next
+//sublist every 3 items.
+
 #include <cstddef>
 #include <cassert>
 #include <ciso646>
 #include <stdexcept>
 #include <utility>
 
-namespace din {
+namespace dinhelp {
 	template <typename OuterList, typename InnerList=typename OuterList::value_type, typename InnerVal=typename InnerList::value_type>
 	class FlatInsertIn2DList {
 	public:
@@ -44,8 +52,8 @@ namespace din {
 		const std::size_t m_inner_count;
 		const std::size_t m_outer_count;
 	};
-} //namespace din
+} //namespace dinhelp
 
-#include "flatinsertin2dlist.inl"
+#include "implem/flatinsertin2dlist.inl"
 
 #endif
diff --git a/src/navigate/flatinsertin2dlist.inl b/include/helpers/implem/flatinsertin2dlist.inl
similarity index 98%
rename from src/navigate/flatinsertin2dlist.inl
rename to include/helpers/implem/flatinsertin2dlist.inl
index edb9f09..4778887 100644
--- a/src/navigate/flatinsertin2dlist.inl
+++ b/include/helpers/implem/flatinsertin2dlist.inl
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace din {
+namespace dinhelp {
 	template <typename OuterList, typename InnerList, typename InnerVal>
 	FlatInsertIn2DList<OuterList, InnerList, InnerVal>::FlatInsertIn2DList (list_type* parList, std::size_t parInnerCount, std::size_t parOuterCount) :
 		m_list(parList),
@@ -70,4 +70,4 @@ namespace din {
 			return (m_list->size() - 1) * m_inner_count + m_list[m_list->size() - 1].size();
 		}
 	}
-} //namespace din
+} //namespace dinhelp
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index 00d2afc..77f3a2b 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -5,6 +5,7 @@ add_library(${PROJECT_NAME} STATIC
 	delete.cpp
 	locate.cpp
 	scan.cpp
+	dbsource.cpp
 )
 
 #target_include_directories(${PROJECT_NAME}
diff --git a/src/navigate/dbsource.cpp b/src/backends/postgresql/dbsource.cpp
similarity index 95%
rename from src/navigate/dbsource.cpp
rename to src/backends/postgresql/dbsource.cpp
index 02100f3..5c8af19 100644
--- a/src/navigate/dbsource.cpp
+++ b/src/backends/postgresql/dbsource.cpp
@@ -15,8 +15,8 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dbsource.hpp"
-#include "dindexer-common/settings.hpp"
+#include "backends/postgresql/dbsource.hpp"
+#include "backends/postgresql/settings.hpp"
 #include "pq/connection.hpp"
 #include "helpers/infix_iterator.hpp"
 #include <ciso646>
@@ -25,7 +25,7 @@
 #include <sstream>
 #include <boost/range/algorithm/copy.hpp>
 
-namespace din {
+namespace dinbpostgres {
 	namespace {
 		const uint32_t g_files_query_limit = 500;
 
@@ -62,7 +62,7 @@ namespace din {
 	};
 
 	struct DBSource::LocalData {
-		explicit LocalData ( const dinlib::SettingsDB& parDBSettings ) :
+		explicit LocalData ( const Settings& parDBSettings ) :
 			conn(
 				std::string(parDBSettings.username),
 				std::string(parDBSettings.password),
@@ -76,7 +76,7 @@ namespace din {
 		pq::Connection conn;
 	};
 
-	DBSource::DBSource (const dinlib::SettingsDB& parDBSettings) :
+	DBSource::DBSource (const Settings& parDBSettings) :
 		m_local_data(new LocalData(parDBSettings))
 	{
 		assert(not m_local_data->conn.is_connected());
@@ -180,4 +180,4 @@ namespace din {
 		}
 		return retval;
 	}
-} //namespace din
+} //namespace dinbpostgres
diff --git a/src/backends/postgresql/delete.cpp b/src/backends/postgresql/delete.cpp
index 610fabb..2d28d2b 100644
--- a/src/backends/postgresql/delete.cpp
+++ b/src/backends/postgresql/delete.cpp
@@ -16,8 +16,8 @@
  */
 
 #include "backends/postgresql/delete.hpp"
+#include "backends/postgresql/settings.hpp"
 #include "pq/connection.hpp"
-#include "dindexer-common/settings.hpp"
 #include "helpers/infix_iterator.hpp"
 #include <sstream>
 #include <utility>
@@ -27,7 +27,7 @@
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/lexical_cast.hpp>
 
-namespace din {
+namespace dinbpostgres {
 	namespace {
 		IDDescMap fetch_existing_ids (pq::Connection& parConn, const std::vector<uint32_t>& parIDs) {
 			using boost::lexical_cast;
@@ -50,7 +50,7 @@ namespace din {
 		}
 	} //unnamed namespace
 
-	void delete_group_from_db (const dinlib::SettingsDB& parDB, const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
+	void delete_group_from_db (const Settings& parDB, const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
 		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
 		conn.connect();
 		const auto dele_ids = fetch_existing_ids(conn, parIDs);
@@ -72,4 +72,4 @@ namespace din {
 
 		conn.query(oss.str());
 	}
-} //namespace din
+} //namespace dinbpostgres
diff --git a/src/backends/postgresql/locate.cpp b/src/backends/postgresql/locate.cpp
index eb68e02..48da2b0 100644
--- a/src/backends/postgresql/locate.cpp
+++ b/src/backends/postgresql/locate.cpp
@@ -16,19 +16,20 @@
  */
 
 #include "backends/postgresql/locate.hpp"
+#include "backends/postgresql/settings.hpp"
 #include "pq/connection.hpp"
 #include "dindexer-machinery/tiger.hpp"
 #include <utility>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
-namespace din {
+namespace dinbpostgres {
 	namespace {
 		const int g_max_results = 200;
 
-		pq::Connection make_pq_conn ( const dinlib::SettingsDB& parDB, bool parOpen=true );
+		pq::Connection make_pq_conn ( const Settings& parDB, bool parOpen=true );
 
-		pq::Connection make_pq_conn (const dinlib::SettingsDB& parDB, bool parOpen) {
+		pq::Connection make_pq_conn (const Settings& parDB, bool parOpen) {
 			auto conn = pq::Connection(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
 			if (parOpen) {
 				conn.connect();
@@ -94,20 +95,20 @@ namespace din {
 		}
 	} //unnamed namespace
 
-	std::vector<LocatedItem> locate_in_db (const dinlib::SettingsDB& parDB, const std::string& parSearch, const TagList& parTags) {
+	std::vector<LocatedItem> locate_in_db (const Settings& parDB, const std::string& parSearch, const TagList& parTags) {
 		auto conn = make_pq_conn(parDB);
 
 		const char base_query[] = "SELECT \"path\",\"id\",\"group_id\" FROM \"files\" WHERE \"path\" ~ $1";
 		return locate_in_db(conn, base_query, sizeof(base_query) - 1, "$2", parTags, parSearch);
 	}
 
-	std::vector<LocatedItem> locate_in_db (const dinlib::SettingsDB& parDB, const mchlib::TigerHash& parSearch, const TagList& parTags) {
+	std::vector<LocatedItem> locate_in_db (const Settings& parDB, const mchlib::TigerHash& parSearch, const TagList& parTags) {
 		auto conn = make_pq_conn(parDB);
 		const char base_query[] = "SELECT \"path\",\"id\",\"group_id\" FROM \"files\" WHERE \"hash\"=$1";
 		return locate_in_db(conn, base_query, sizeof(base_query) - 1, "$2", parTags, mchlib::tiger_to_string(parSearch, true));
 	}
 
-	std::vector<LocatedSet> locate_sets_in_db (const dinlib::SettingsDB& parDB, const std::string& parSearch, bool parCaseInsensitive) {
+	std::vector<LocatedSet> locate_sets_in_db (const Settings& parDB, const std::string& parSearch, bool parCaseInsensitive) {
 		auto conn = make_pq_conn(parDB);
 
 		const std::string query = std::string("SELECT \"id\", \"desc\", "
@@ -120,7 +121,7 @@ namespace din {
 		return sets_result_to_vec(std::move(result));
 	}
 
-	std::vector<LocatedSet> locate_sets_in_db (const dinlib::SettingsDB& parDB, const std::string& parSearch, const std::vector<uint32_t>& parSets, bool parCaseInsensitive) {
+	std::vector<LocatedSet> locate_sets_in_db (const Settings& parDB, const std::string& parSearch, const std::vector<uint32_t>& parSets, bool parCaseInsensitive) {
 		if (parSets.empty()) {
 			return locate_sets_in_db(parDB, parSearch, parCaseInsensitive);
 		}
@@ -136,4 +137,4 @@ namespace din {
 		auto result = conn.query(query, parSearch, parCaseInsensitive, parSets);
 		return sets_result_to_vec(std::move(result));
 	}
-} //namespace din
+} //namespace dinbpostgres
diff --git a/src/backends/postgresql/scan.cpp b/src/backends/postgresql/scan.cpp
index 14328f4..e3635f1 100644
--- a/src/backends/postgresql/scan.cpp
+++ b/src/backends/postgresql/scan.cpp
@@ -16,8 +16,8 @@
  */
 
 #include "backends/postgresql/scan.hpp"
+#include "backends/postgresql/settings.hpp"
 #include "pq/connection.hpp"
-#include "dindexer-common/settings.hpp"
 #include "dindexer-machinery/recorddata.hpp"
 #include <string>
 #include <sstream>
@@ -28,11 +28,11 @@
 #include <boost/utility/string_ref.hpp>
 #include <chrono>
 
-namespace din {
+namespace dinbpostgres {
 	namespace {
 	} //unnamed namespace
 
-	bool read_from_db (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const dinlib::SettingsDB& parDB, const mchlib::TigerHash& parHash) {
+	bool read_from_db (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const Settings& parDB, const mchlib::TigerHash& parHash) {
 		using boost::lexical_cast;
 
 		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
@@ -82,7 +82,7 @@ namespace din {
 		return true;
 	}
 
-	void write_to_db (const dinlib::SettingsDB& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature) {
+	void write_to_db (const Settings& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature) {
 		using std::chrono::system_clock;
 		using boost::lexical_cast;
 
@@ -144,4 +144,4 @@ namespace din {
 		}
 		conn.query("COMMIT;");
 	}
-} //namespace din
+} //namespace dinbpostgres
diff --git a/src/backends/postgresql/tag.cpp b/src/backends/postgresql/tag.cpp
index cc46cea..8cee222 100644
--- a/src/backends/postgresql/tag.cpp
+++ b/src/backends/postgresql/tag.cpp
@@ -16,12 +16,13 @@
  */
 
 #include "backends/postgresql/tag.hpp"
+#include "backends/postgresql/settings.hpp"
 #include "pq/connection.hpp"
 #include "dindexer-common/settings.hpp"
 #include <ciso646>
 
-namespace din {
-	void tag_files (const dinlib::SettingsDB& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
+namespace dinbpostgres {
+	void tag_files (const Settings& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
 		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
 		conn.connect();
 
@@ -37,7 +38,7 @@ namespace din {
 		}
 	}
 
-	void tag_files (const dinlib::SettingsDB& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
+	void tag_files (const Settings& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
 		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
 		conn.connect();
 
@@ -71,7 +72,7 @@ namespace din {
 		}
 	}
 
-	void delete_tags (const dinlib::SettingsDB& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
+	void delete_tags (const Settings& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
 		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
 		conn.connect();
 
@@ -97,7 +98,7 @@ namespace din {
 		}
 	}
 
-	void delete_tags (const dinlib::SettingsDB& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
+	void delete_tags (const Settings& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
 		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
 		conn.connect();
 
@@ -123,7 +124,7 @@ namespace din {
 		}
 	}
 
-	void delete_all_tags (const dinlib::SettingsDB& parDB, const std::vector<uint64_t>& parFiles, OwnerSetInfo parSet) {
+	void delete_all_tags (const Settings& parDB, const std::vector<uint64_t>& parFiles, OwnerSetInfo parSet) {
 		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
 		conn.connect();
 
@@ -139,7 +140,7 @@ namespace din {
 		}
 	}
 
-	void delete_all_tags (const dinlib::SettingsDB& parDB, const std::vector<std::string>& parRegexes, OwnerSetInfo parSet) {
+	void delete_all_tags (const Settings& parDB, const std::vector<std::string>& parRegexes, OwnerSetInfo parSet) {
 		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
 		conn.connect();
 
@@ -152,4 +153,4 @@ namespace din {
 			conn.query(query, parRegexes);
 		}
 	}
-} //namespace din
+} //namespace dinbpostgres
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index e37c189..997bca4 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -22,8 +22,8 @@
 
 namespace YAML {
 	template<>
-	struct convert<dinlib::SettingsDB> {
-		static Node encode (const dinlib::SettingsDB& parSettings) {
+	struct convert<dinbpostgres::Settings> {
+		static Node encode (const dinbpostgres::Settings& parSettings) {
 			Node node;
 			node["address"] = parSettings.address;
 			node["username"] = parSettings.username;
@@ -33,7 +33,7 @@ namespace YAML {
 			return node;
 		}
 
-		static bool decode (const Node& parNode, dinlib::SettingsDB& parSettings) {
+		static bool decode (const Node& parNode, dinbpostgres::Settings& parSettings) {
 			if (not parNode.IsMap() or parNode.size() != 5) {
 				return false;
 			}
@@ -60,7 +60,7 @@ namespace dinlib {
 			auto settings = YAML::LoadFile(path);
 
 			if (settings["db_settings"]) {
-				parOut.db = settings["db_settings"].as<dinlib::SettingsDB>();
+				parOut.db = settings["db_settings"].as<dinbpostgres::Settings>();
 				return true;
 			}
 		}
diff --git a/src/delete/main.cpp b/src/delete/main.cpp
index 29a1332..0162093 100644
--- a/src/delete/main.cpp
+++ b/src/delete/main.cpp
@@ -26,7 +26,7 @@
 #include <cstdint>
 
 namespace {
-	bool confirm_delete (const din::IDDescMap& parMap) {
+	bool confirm_delete (const dinbpostgres::IDDescMap& parMap) {
 		for (const auto& itm : parMap) {
 			std::cout << "ID " << itm.first << '\t' << itm.second << '\n';
 		}
@@ -38,7 +38,7 @@ namespace {
 		return (answer.empty() or "y" == answer or "Y" == answer);
 	}
 
-	bool always_delete (const din::IDDescMap&) {
+	bool always_delete (const dinbpostgres::IDDescMap&) {
 		return true;
 	}
 } //unnamed namespace
@@ -77,7 +77,7 @@ int main (int parArgc, char* parArgv[]) {
 
 	const auto ids = vm["groupid"].as<std::vector<uint32_t>>();
 	auto confirm_func = (vm.count("confirm") ? &always_delete : &confirm_delete);
-	din::delete_group_from_db(settings.db, ids, confirm_func);
+	dinbpostgres::delete_group_from_db(settings.db, ids, confirm_func);
 	return 0;
 }
 
diff --git a/src/locate/main.cpp b/src/locate/main.cpp
index a30ae5f..7055432 100644
--- a/src/locate/main.cpp
+++ b/src/locate/main.cpp
@@ -27,7 +27,7 @@
 #include <iterator>
 #include <algorithm>
 
-namespace din {
+namespace dinbpostgres {
 	std::ostream& operator<< (std::ostream& parStream, const LocatedItem& parItem) {
 		parStream << parItem.group_id << '\t' << parItem.id << '\t' << parItem.path;
 		return parStream;
@@ -41,7 +41,7 @@ namespace din {
 			'\t' << parItem.files_count << '\t' << dircount;
 		return parStream;
 	}
-} //namespace din
+} //namespace dinbpostgres
 
 namespace {
 	std::vector<boost::string_ref> extract_tags (const boost::program_options::variables_map& parVM) {
@@ -81,22 +81,22 @@ int main (int parArgc, char* parArgv[]) {
 	}
 
 	if (vm.count("set")) {
-		const auto results = din::locate_sets_in_db(settings.db, vm["substring"].as<std::string>(), not not vm.count("case-insensitive"));
-		std::copy(results.begin(), results.end(), std::ostream_iterator<din::LocatedSet>(std::cout, "\n"));
+		const auto results = dinbpostgres::locate_sets_in_db(settings.db, vm["substring"].as<std::string>(), not not vm.count("case-insensitive"));
+		std::copy(results.begin(), results.end(), std::ostream_iterator<dinbpostgres::LocatedSet>(std::cout, "\n"));
 	}
 	else {
-		std::vector<din::LocatedItem> results;
+		std::vector<dinbpostgres::LocatedItem> results;
 		const std::vector<boost::string_ref> tags = extract_tags(vm);
 
 		if (vm.count("byhash")) {
 			const auto hash = din::hash(vm["substring"].as<std::string>());
-			results = din::locate_in_db(settings.db, hash, tags);
+			results = dinbpostgres::locate_in_db(settings.db, hash, tags);
 		}
 		else {
 			const auto search_regex = g2r::convert(vm["substring"].as<std::string>(), not vm.count("case-insensitive"));
-			results = din::locate_in_db(settings.db, search_regex, tags);
+			results = dinbpostgres::locate_in_db(settings.db, search_regex, tags);
 		}
-		std::copy(results.begin(), results.end(), std::ostream_iterator<din::LocatedItem>(std::cout, "\n"));
+		std::copy(results.begin(), results.end(), std::ostream_iterator<dinbpostgres::LocatedItem>(std::cout, "\n"));
 	}
 	return 0;
 }
diff --git a/src/navigate/CMakeLists.txt b/src/navigate/CMakeLists.txt
index 86c0986..303b539 100644
--- a/src/navigate/CMakeLists.txt
+++ b/src/navigate/CMakeLists.txt
@@ -5,7 +5,6 @@ add_executable(${PROJECT_NAME}
 	commandline.cpp
 	commandprocessor.cpp
 	entrypath.cpp
-	dbsource.cpp
 	linereader.cpp
 	listdircontent.cpp
 )
@@ -17,6 +16,7 @@ target_include_directories(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
+	PRIVATE ${bare_name}-backend-postgresql
 )
 
 target_compile_features(${PROJECT_NAME}
diff --git a/src/navigate/listdircontent.cpp b/src/navigate/listdircontent.cpp
index fef051c..e85cdcf 100644
--- a/src/navigate/listdircontent.cpp
+++ b/src/navigate/listdircontent.cpp
@@ -17,7 +17,7 @@
 
 #include "listdircontent.hpp"
 #include "entrypath.hpp"
-#include "dbsource.hpp"
+#include "backends/postgresql/dbsource.hpp"
 #include "helpers/infix_iterator.hpp"
 #include <cassert>
 #include <utility>
@@ -68,7 +68,7 @@ namespace din {
 		}
 	} //unnamed namespace
 
-	ListDirContent::ListDirContent (DBSource* parDB) :
+	ListDirContent::ListDirContent (dinbpostgres::DBSource* parDB) :
 		m_cache(g_max_cached_lists),
 		m_db(parDB)
 	{
@@ -86,13 +86,13 @@ namespace din {
 		//Requested item is not cached, so we need to query the db now
 		if (parDir.points_to_group()) {
 			auto sets_ids = m_db->sets();
-			auto sets_info = m_db->set_details<SetDetail_ID, SetDetail_Desc, SetDetail_CreeationDate>(sets_ids);
+			auto sets_info = m_db->set_details<dinbpostgres::SetDetail_ID, dinbpostgres::SetDetail_Desc, dinbpostgres::SetDetail_CreeationDate>(sets_ids);
 			m_cache.push_back(std::make_pair(curr_path, db_result_to_vec(sets_info)));
 		}
 		else {
 			auto path_prefix = parDir.file_path();
 			const auto set_id = parDir.group_id();
-			auto files_info = m_db->file_details<FileDetail_Path>(set_id, parDir.level() + 1, path_prefix);
+			auto files_info = m_db->file_details<dinbpostgres::FileDetail_Path>(set_id, parDir.level() + 1, path_prefix);
 			m_cache.push_back(std::make_pair(curr_path, db_result_to_vec(files_info)));
 		}
 		return last_cached_item(curr_path);
diff --git a/src/navigate/listdircontent.hpp b/src/navigate/listdircontent.hpp
index 9a02e40..37be26f 100644
--- a/src/navigate/listdircontent.hpp
+++ b/src/navigate/listdircontent.hpp
@@ -23,15 +23,18 @@
 #include <string>
 #include <vector>
 
+namespace dinbpostgres {
+	class DBSource;
+} //namespace dinbpostgres
+
 namespace din {
 	class EntryPath;
-	class DBSource;
 
 	class ListDirContent {
 		using ListType = std::vector<std::string>;
 		using CachedItemType = std::pair<std::string, ListType>;
 	public:
-		explicit ListDirContent ( DBSource* parDB );
+		explicit ListDirContent ( dinbpostgres::DBSource* parDB );
 		~ListDirContent ( void ) noexcept = default;
 
 		const ListType& ls ( const EntryPath& parDir ) const;
@@ -41,7 +44,7 @@ namespace din {
 		const ListType& last_cached_item ( const std::string& parCurrPath ) const;
 
 		mutable boost::circular_buffer<CachedItemType> m_cache;
-		DBSource* m_db;
+		dinbpostgres::DBSource* m_db;
 	};
 } //namespace din
 
diff --git a/src/navigate/main.cpp b/src/navigate/main.cpp
index 594ba89..f52a0a9 100644
--- a/src/navigate/main.cpp
+++ b/src/navigate/main.cpp
@@ -19,7 +19,7 @@
 #include "commandprocessor.hpp"
 #include "dindexer-common/settings.hpp"
 #include "entrypath.hpp"
-#include "dbsource.hpp"
+#include "backends/postgresql/dbsource.hpp"
 #include "dindexerConfig.h"
 #include "linereader.hpp"
 #include "listdircontent.hpp"
@@ -31,7 +31,7 @@
 #include <boost/range/algorithm/copy.hpp>
 
 namespace {
-	void do_navigation ( din::DBSource& parDB );
+	void do_navigation ( dinbpostgres::DBSource& parDB );
 
 	bool on_exit ( void );
 	void on_pwd ( const din::EntryPath& parDirMan );
@@ -61,7 +61,7 @@ int main (int parArgc, char* parArgv[]) {
 		}
 	}
 
-	din::DBSource db_source(settings.db);
+	dinbpostgres::DBSource db_source(settings.db);
 
 	do_navigation(db_source);
 	return 0;
@@ -81,7 +81,7 @@ namespace {
 		boost::copy(ls_result, std::ostream_iterator<std::string>(std::cout, "\n"));
 	}
 
-	void do_navigation (din::DBSource& parDB) {
+	void do_navigation (dinbpostgres::DBSource& parDB) {
 		const std::string prompt;
 		din::ListDirContent ls(&parDB);
 		din::LineReader lines(&ls);
@@ -92,7 +92,7 @@ namespace {
 		din::EntryPath dir_man;
 		proc.add_command("exit", &on_exit, 0);
 		proc.add_command("cd", std::function<void(const std::string&)>(std::bind(&din::EntryPath::push_piece, &dir_man, std::placeholders::_1)), 1);
-		proc.add_command("disconnect", std::function<void()>(std::bind(&din::DBSource::disconnect, &parDB)), 0);
+		proc.add_command("disconnect", std::function<void()>(std::bind(&dinbpostgres::DBSource::disconnect, &parDB)), 0);
 		proc.add_command("pwd", std::function<void()>(std::bind(&on_pwd, std::ref(dir_man))), 0);
 		proc.add_command("ls", std::function<void()>(std::bind(on_ls, std::ref(ls), std::ref(dir_man))), 0);
 		do {
diff --git a/src/scan/main.cpp b/src/scan/main.cpp
index e44b871..2028f8f 100644
--- a/src/scan/main.cpp
+++ b/src/scan/main.cpp
@@ -41,7 +41,7 @@
 #endif
 
 namespace {
-	bool add_to_db ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, const dinlib::SettingsDB& parDBSettings, bool parForce=false );
+	bool add_to_db ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, const dinbpostgres::Settings& parDBSettings, bool parForce=false );
 #if defined(WITH_PROGRESS_FEEDBACK)
 	void print_progress ( const boost::string_ref parPath, uint64_t parFileBytes, uint64_t parTotalBytes, uint32_t parFileNum, std::size_t& parClearCount );
 #endif
@@ -115,7 +115,7 @@ int main (int parArgc, char* parArgv[]) {
 }
 
 namespace {
-	bool add_to_db (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, const dinlib::SettingsDB& parDBSettings, bool parForce) {
+	bool add_to_db (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, const dinbpostgres::Settings& parDBSettings, bool parForce) {
 		using mchlib::FileRecordData;
 		using mchlib::SetRecordDataFull;
 		using mchlib::SetRecordData;
@@ -124,7 +124,7 @@ namespace {
 			const auto& first_hash = parData.front().hash;
 			FileRecordData itm;
 			SetRecordDataFull set;
-			const bool already_in_db = din::read_from_db(itm, set, parDBSettings, first_hash);
+			const bool already_in_db = dinbpostgres::read_from_db(itm, set, parDBSettings, first_hash);
 			if (already_in_db) {
 				return false;
 			}
@@ -134,7 +134,7 @@ namespace {
 		const auto app_signature = dinlib::dindexer_signature();
 		const auto lib_signature = mchlib::lib_signature();
 		const std::string signature = std::string(app_signature.data(), app_signature.size()) + "/" + std::string(lib_signature.data(), lib_signature.size());
-		din::write_to_db(parDBSettings, parData, set_data, signature);
+		dinbpostgres::write_to_db(parDBSettings, parData, set_data, signature);
 		return true;
 	}
 
diff --git a/src/tag/main.cpp b/src/tag/main.cpp
index fba9d66..a838eed 100644
--- a/src/tag/main.cpp
+++ b/src/tag/main.cpp
@@ -47,8 +47,8 @@ namespace {
 		return retval;
 	}
 
-	din::OwnerSetInfo make_owner_set_info (const boost::program_options::variables_map& parVM) {
-		din::OwnerSetInfo set_info;
+	dinbpostgres::OwnerSetInfo make_owner_set_info (const boost::program_options::variables_map& parVM) {
+		dinbpostgres::OwnerSetInfo set_info;
 		if (parVM.count("set")) {
 			set_info.is_valid = true;
 			set_info.group_id = parVM["set"].as<uint32_t>();
@@ -60,11 +60,11 @@ namespace {
 		return set_info;
 	}
 
-	int tag_files (const dinlib::SettingsDB& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
+	int tag_files (const dinbpostgres::Settings& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
 		using boost::lexical_cast;
 		using boost::string_ref;
 
-		const din::OwnerSetInfo set_info = make_owner_set_info(parVM);
+		const dinbpostgres::OwnerSetInfo set_info = make_owner_set_info(parVM);
 
 		switch (parMode) {
 		case TaggingMode::ID:
@@ -73,14 +73,14 @@ namespace {
 			std::vector<uint64_t> ids;
 			ids.reserve(ids_string.size());
 			std::transform(ids_string.begin(), ids_string.end(), std::back_inserter(ids), &lexical_cast<uint64_t, string_ref>);
-			din::tag_files(parDB, ids, parTags, set_info);
+			dinbpostgres::tag_files(parDB, ids, parTags, set_info);
 			return 0;
 		}
 
 		case TaggingMode::Glob:
 		{
 			const auto regexes(globs_to_regex_list(parVM["globs"].as<std::vector<std::string>>()));
-			din::tag_files(parDB, regexes, parTags, set_info);
+			dinbpostgres::tag_files(parDB, regexes, parTags, set_info);
 			return 0;
 		}
 
@@ -90,7 +90,7 @@ namespace {
 		}
 	}
 
-	int delete_tags (const dinlib::SettingsDB& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
+	int delete_tags (const dinbpostgres::Settings& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
 		using boost::lexical_cast;
 		using boost::string_ref;
 
@@ -104,9 +104,9 @@ namespace {
 			ids.reserve(ids_string.size());
 			std::transform(ids_string.begin(), ids_string.end(), std::back_inserter(ids), &lexical_cast<uint64_t, string_ref>);
 			if (parVM.count("alltags"))
-				din::delete_all_tags(parDB, ids, make_owner_set_info(parVM));
+				dinbpostgres::delete_all_tags(parDB, ids, make_owner_set_info(parVM));
 			else
-				din::delete_tags(parDB, ids, parTags, make_owner_set_info(parVM));
+				dinbpostgres::delete_tags(parDB, ids, parTags, make_owner_set_info(parVM));
 			return 0;
 		}
 
@@ -114,9 +114,9 @@ namespace {
 		{
 			const auto regexes(globs_to_regex_list(parVM["globs"].as<std::vector<std::string>>()));
 			if (parVM.count("alltags"))
-				din::delete_all_tags(parDB, regexes, make_owner_set_info(parVM));
+				dinbpostgres::delete_all_tags(parDB, regexes, make_owner_set_info(parVM));
 			else
-				din::delete_tags(parDB, regexes, parTags, make_owner_set_info(parVM));
+				dinbpostgres::delete_tags(parDB, regexes, parTags, make_owner_set_info(parVM));
 			return 0;
 		}
 

From fb722719b225d1c62b117a1907ac82522c2c8d5c Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 23 May 2016 19:50:12 +0200
Subject: [PATCH 007/170] Move postgresql backend's include files to a new db
 subdir.

Fix build and remove unneeded include in tag.cpp
---
 include/backends/postgresql/{ => db}/dbsource.hpp | 0
 include/backends/postgresql/{ => db}/delete.hpp   | 0
 include/backends/postgresql/{ => db}/locate.hpp   | 0
 include/backends/postgresql/{ => db}/scan.hpp     | 0
 include/backends/postgresql/{ => db}/settings.hpp | 0
 include/backends/postgresql/{ => db}/tag.hpp      | 0
 src/backends/postgresql/CMakeLists.txt            | 5 +++--
 src/backends/postgresql/dbsource.cpp              | 4 ++--
 src/backends/postgresql/delete.cpp                | 4 ++--
 src/backends/postgresql/locate.cpp                | 4 ++--
 src/backends/postgresql/scan.cpp                  | 4 ++--
 src/backends/postgresql/tag.cpp                   | 5 ++---
 12 files changed, 13 insertions(+), 13 deletions(-)
 rename include/backends/postgresql/{ => db}/dbsource.hpp (100%)
 rename include/backends/postgresql/{ => db}/delete.hpp (100%)
 rename include/backends/postgresql/{ => db}/locate.hpp (100%)
 rename include/backends/postgresql/{ => db}/scan.hpp (100%)
 rename include/backends/postgresql/{ => db}/settings.hpp (100%)
 rename include/backends/postgresql/{ => db}/tag.hpp (100%)

diff --git a/include/backends/postgresql/dbsource.hpp b/include/backends/postgresql/db/dbsource.hpp
similarity index 100%
rename from include/backends/postgresql/dbsource.hpp
rename to include/backends/postgresql/db/dbsource.hpp
diff --git a/include/backends/postgresql/delete.hpp b/include/backends/postgresql/db/delete.hpp
similarity index 100%
rename from include/backends/postgresql/delete.hpp
rename to include/backends/postgresql/db/delete.hpp
diff --git a/include/backends/postgresql/locate.hpp b/include/backends/postgresql/db/locate.hpp
similarity index 100%
rename from include/backends/postgresql/locate.hpp
rename to include/backends/postgresql/db/locate.hpp
diff --git a/include/backends/postgresql/scan.hpp b/include/backends/postgresql/db/scan.hpp
similarity index 100%
rename from include/backends/postgresql/scan.hpp
rename to include/backends/postgresql/db/scan.hpp
diff --git a/include/backends/postgresql/settings.hpp b/include/backends/postgresql/db/settings.hpp
similarity index 100%
rename from include/backends/postgresql/settings.hpp
rename to include/backends/postgresql/db/settings.hpp
diff --git a/include/backends/postgresql/tag.hpp b/include/backends/postgresql/db/tag.hpp
similarity index 100%
rename from include/backends/postgresql/tag.hpp
rename to include/backends/postgresql/db/tag.hpp
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index 77f3a2b..396b0e5 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -8,8 +8,9 @@ add_library(${PROJECT_NAME} STATIC
 	dbsource.cpp
 )
 
-#target_include_directories(${PROJECT_NAME}
-#)
+target_include_directories(${PROJECT_NAME}
+	PUBLIC ${CMAKE_SOURCE_DIR}/include/backends/postgresql
+)
 #target_include_directories(${PROJECT_NAME} SYSTEM
 #)
 
diff --git a/src/backends/postgresql/dbsource.cpp b/src/backends/postgresql/dbsource.cpp
index 5c8af19..4d923c1 100644
--- a/src/backends/postgresql/dbsource.cpp
+++ b/src/backends/postgresql/dbsource.cpp
@@ -15,8 +15,8 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "backends/postgresql/dbsource.hpp"
-#include "backends/postgresql/settings.hpp"
+#include "db/dbsource.hpp"
+#include "db/settings.hpp"
 #include "pq/connection.hpp"
 #include "helpers/infix_iterator.hpp"
 #include <ciso646>
diff --git a/src/backends/postgresql/delete.cpp b/src/backends/postgresql/delete.cpp
index 2d28d2b..9691bdc 100644
--- a/src/backends/postgresql/delete.cpp
+++ b/src/backends/postgresql/delete.cpp
@@ -15,8 +15,8 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "backends/postgresql/delete.hpp"
-#include "backends/postgresql/settings.hpp"
+#include "db/delete.hpp"
+#include "db/settings.hpp"
 #include "pq/connection.hpp"
 #include "helpers/infix_iterator.hpp"
 #include <sstream>
diff --git a/src/backends/postgresql/locate.cpp b/src/backends/postgresql/locate.cpp
index 48da2b0..65d377a 100644
--- a/src/backends/postgresql/locate.cpp
+++ b/src/backends/postgresql/locate.cpp
@@ -15,8 +15,8 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "backends/postgresql/locate.hpp"
-#include "backends/postgresql/settings.hpp"
+#include "db/locate.hpp"
+#include "db/settings.hpp"
 #include "pq/connection.hpp"
 #include "dindexer-machinery/tiger.hpp"
 #include <utility>
diff --git a/src/backends/postgresql/scan.cpp b/src/backends/postgresql/scan.cpp
index e3635f1..ad34f5d 100644
--- a/src/backends/postgresql/scan.cpp
+++ b/src/backends/postgresql/scan.cpp
@@ -15,8 +15,8 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "backends/postgresql/scan.hpp"
-#include "backends/postgresql/settings.hpp"
+#include "db/scan.hpp"
+#include "db/settings.hpp"
 #include "pq/connection.hpp"
 #include "dindexer-machinery/recorddata.hpp"
 #include <string>
diff --git a/src/backends/postgresql/tag.cpp b/src/backends/postgresql/tag.cpp
index 8cee222..9993ffc 100644
--- a/src/backends/postgresql/tag.cpp
+++ b/src/backends/postgresql/tag.cpp
@@ -15,10 +15,9 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "backends/postgresql/tag.hpp"
-#include "backends/postgresql/settings.hpp"
+#include "db/tag.hpp"
+#include "db/settings.hpp"
 #include "pq/connection.hpp"
-#include "dindexer-common/settings.hpp"
 #include <ciso646>
 
 namespace dinbpostgres {

From 8f98495049a70c432a37491995d137c4302c4ab4 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 24 May 2016 09:36:38 +0200
Subject: [PATCH 008/170] Make dindexer-common depend on postgre backend and
 fix build

---
 CMakeLists.txt                         | 1 +
 include/dindexer-common/settings.hpp   | 2 +-
 src/backends/postgresql/CMakeLists.txt | 7 ++++---
 src/common/CMakeLists.txt              | 3 +++
 src/delete/CMakeLists.txt              | 1 -
 src/delete/main.cpp                    | 2 +-
 src/locate/CMakeLists.txt              | 1 -
 src/locate/main.cpp                    | 2 +-
 src/navigate/CMakeLists.txt            | 1 -
 src/navigate/listdircontent.cpp        | 2 +-
 src/navigate/main.cpp                  | 2 +-
 src/scan/CMakeLists.txt                | 1 -
 src/scan/main.cpp                      | 2 +-
 src/tag/CMakeLists.txt                 | 1 -
 src/tag/main.cpp                       | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cee3d5..4fd4155 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ if(DINDEXER_NATIVE_RELEASE)
 else()
 	set(march_flag "")
 endif()
+set(DINDEXER_DB_BACKEND "PostgreSQL")
 set(DINDEXER_COPYRIGHT_YEARS "2015,2016")
 set(DINDEXER_ACTIONS_PATH "${CMAKE_CURRENT_BINARY_DIR}/src" CACHE STRING "Actions search path")
 string(REGEX MATCH "[^/].*" ACTIONS_PATH_INSTALL "${DINDEXER_ACTIONS_PATH}")
diff --git a/include/dindexer-common/settings.hpp b/include/dindexer-common/settings.hpp
index 86e7a2b..131ba11 100644
--- a/include/dindexer-common/settings.hpp
+++ b/include/dindexer-common/settings.hpp
@@ -19,7 +19,7 @@
 #define idDC29E3C667BD4793BA0644AE7DC5BD3F
 
 #include <string>
-#include "backends/postgresql/settings.hpp"
+#include "db/settings.hpp"
 
 namespace dinlib {
 	struct Settings {
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index 396b0e5..8238350 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -11,11 +11,12 @@ add_library(${PROJECT_NAME} STATIC
 target_include_directories(${PROJECT_NAME}
 	PUBLIC ${CMAKE_SOURCE_DIR}/include/backends/postgresql
 )
-#target_include_directories(${PROJECT_NAME} SYSTEM
-#)
+target_include_directories(${PROJECT_NAME} SYSTEM
+	PUBLIC ${Boost_INCLUDE_DIRS}
+)
 
 target_link_libraries(${PROJECT_NAME}
-	PRIVATE ${bare_name}-if
+	PRIVATE ${bare_name}-inc
 	PRIVATE ${bare_name}-pq
 )
 
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 316497a..e41e3b5 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -19,10 +19,13 @@ target_include_directories(${PROJECT_NAME} SYSTEM
 	PRIVATE ${Readline_INCLUDE_DIR}
 )
 
+string(TOLOWER "${DINDEXER_DB_BACKEND}" DINDEXER_DB_BACKEND_LOWERCASE)
+
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${YAMLCPP_LIBRARY}
 	PRIVATE ${Readline_LIBRARY}
+	PUBLIC ${bare_name}-backend-${DINDEXER_DB_BACKEND_LOWERCASE}
 )
 
 #install(TARGETS ${PROJECT_NAME}
diff --git a/src/delete/CMakeLists.txt b/src/delete/CMakeLists.txt
index 1563f35..88b71ad 100644
--- a/src/delete/CMakeLists.txt
+++ b/src/delete/CMakeLists.txt
@@ -12,7 +12,6 @@ target_include_directories(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
-	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")
diff --git a/src/delete/main.cpp b/src/delete/main.cpp
index 0162093..cf44f5b 100644
--- a/src/delete/main.cpp
+++ b/src/delete/main.cpp
@@ -18,7 +18,7 @@
 #include "commandline.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexerConfig.h"
-#include "backends/postgresql/delete.hpp"
+#include "db/delete.hpp"
 #include <iostream>
 #include <ciso646>
 #include <ios>
diff --git a/src/locate/CMakeLists.txt b/src/locate/CMakeLists.txt
index cddde1d..3ace773 100644
--- a/src/locate/CMakeLists.txt
+++ b/src/locate/CMakeLists.txt
@@ -16,7 +16,6 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-common
 	PRIVATE ${bare_name}-machinery
 	PRIVATE glob2regex
-	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")
diff --git a/src/locate/main.cpp b/src/locate/main.cpp
index 7055432..83aefb1 100644
--- a/src/locate/main.cpp
+++ b/src/locate/main.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "commandline.hpp"
-#include "backends/postgresql/locate.hpp"
+#include "db/locate.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexer-common/split_tags.hpp"
 #include "dindexerConfig.h"
diff --git a/src/navigate/CMakeLists.txt b/src/navigate/CMakeLists.txt
index 303b539..6e8cf88 100644
--- a/src/navigate/CMakeLists.txt
+++ b/src/navigate/CMakeLists.txt
@@ -16,7 +16,6 @@ target_include_directories(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
-	PRIVATE ${bare_name}-backend-postgresql
 )
 
 target_compile_features(${PROJECT_NAME}
diff --git a/src/navigate/listdircontent.cpp b/src/navigate/listdircontent.cpp
index e85cdcf..4953b23 100644
--- a/src/navigate/listdircontent.cpp
+++ b/src/navigate/listdircontent.cpp
@@ -17,7 +17,7 @@
 
 #include "listdircontent.hpp"
 #include "entrypath.hpp"
-#include "backends/postgresql/dbsource.hpp"
+#include "db/dbsource.hpp"
 #include "helpers/infix_iterator.hpp"
 #include <cassert>
 #include <utility>
diff --git a/src/navigate/main.cpp b/src/navigate/main.cpp
index f52a0a9..65118e0 100644
--- a/src/navigate/main.cpp
+++ b/src/navigate/main.cpp
@@ -19,7 +19,7 @@
 #include "commandprocessor.hpp"
 #include "dindexer-common/settings.hpp"
 #include "entrypath.hpp"
-#include "backends/postgresql/dbsource.hpp"
+#include "db/dbsource.hpp"
 #include "dindexerConfig.h"
 #include "linereader.hpp"
 #include "listdircontent.hpp"
diff --git a/src/scan/CMakeLists.txt b/src/scan/CMakeLists.txt
index b5e4d9e..0ac7189 100644
--- a/src/scan/CMakeLists.txt
+++ b/src/scan/CMakeLists.txt
@@ -15,7 +15,6 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
 	PRIVATE ${bare_name}-machinery
-	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")
diff --git a/src/scan/main.cpp b/src/scan/main.cpp
index 2028f8f..77860f2 100644
--- a/src/scan/main.cpp
+++ b/src/scan/main.cpp
@@ -25,7 +25,7 @@
 #include "dindexer-common/common_info.hpp"
 #include "dindexer-common/settings.hpp"
 #include "commandline.hpp"
-#include "backends/postgresql/scan.hpp"
+#include "db/scan.hpp"
 #include "dindexer-machinery/scantask/dirtree.hpp"
 #include "dindexer-machinery/scantask/mediatype.hpp"
 #include "dindexer-machinery/scantask/hashing.hpp"
diff --git a/src/tag/CMakeLists.txt b/src/tag/CMakeLists.txt
index 3a992c6..89d5ec9 100644
--- a/src/tag/CMakeLists.txt
+++ b/src/tag/CMakeLists.txt
@@ -15,7 +15,6 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
 	PRIVATE glob2regex
-	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")
diff --git a/src/tag/main.cpp b/src/tag/main.cpp
index a838eed..f8fefc3 100644
--- a/src/tag/main.cpp
+++ b/src/tag/main.cpp
@@ -18,7 +18,7 @@
 #include "commandline.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexerConfig.h"
-#include "backends/postgresql/tag.hpp"
+#include "db/tag.hpp"
 #include "dindexer-common/split_tags.hpp"
 #include "glob2regex/glob2regex.hpp"
 #include "enum.h"

From 45fc758915c3802c7c594ab2ea5f52229b15e218 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 24 May 2016 09:37:11 +0200
Subject: [PATCH 009/170] Print db backend name in --builtin view

---
 src/dindexerConfig.h.in  | 2 ++
 src/main/builtin_feats.c | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/dindexerConfig.h.in b/src/dindexerConfig.h.in
index 7d2493c..8f1eae6 100644
--- a/src/dindexerConfig.h.in
+++ b/src/dindexerConfig.h.in
@@ -50,6 +50,8 @@
 #	define WITH_NICE_MEDIA_TYPES
 #endif
 
+#define DB_BACKEND "@DINDEXER_DB_BACKEND@"
+
 #define COPYRIGHT_YEARS_LIST @DINDEXER_COPYRIGHT_YEARS@
 
 #endif
diff --git a/src/main/builtin_feats.c b/src/main/builtin_feats.c
index 9c6e851..0ffba59 100644
--- a/src/main/builtin_feats.c
+++ b/src/main/builtin_feats.c
@@ -52,6 +52,7 @@ void print_builtin_feats() {
 #else
 	printf("WITH_NICE_MEDIA_TYPES = no\n");
 #endif
+	printf("DB_BACKEND = \"%s\"\n", DB_BACKEND);
 }
 
 void print_version() {

From 1fd51f75baa19369fd582e38d744e7723b3808a3 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 24 May 2016 09:42:29 +0200
Subject: [PATCH 010/170] Rename namespace dinbpostgres to dindb.

It's so much better!
---
 include/backends/postgresql/db/dbsource.hpp |  4 ++--
 include/backends/postgresql/db/delete.hpp   |  4 ++--
 include/backends/postgresql/db/locate.hpp   |  4 ++--
 include/backends/postgresql/db/scan.hpp     |  4 ++--
 include/backends/postgresql/db/settings.hpp |  4 ++--
 include/backends/postgresql/db/tag.hpp      |  4 ++--
 include/dindexer-common/settings.hpp        |  2 +-
 src/backends/postgresql/dbsource.cpp        |  4 ++--
 src/backends/postgresql/delete.cpp          |  4 ++--
 src/backends/postgresql/locate.cpp          |  4 ++--
 src/backends/postgresql/scan.cpp            |  4 ++--
 src/backends/postgresql/tag.cpp             |  4 ++--
 src/common/settings.cpp                     |  8 ++++----
 src/delete/main.cpp                         |  6 +++---
 src/locate/main.cpp                         | 16 +++++++--------
 src/navigate/listdircontent.cpp             |  6 +++---
 src/navigate/listdircontent.hpp             |  8 ++++----
 src/navigate/main.cpp                       |  8 ++++----
 src/scan/main.cpp                           |  8 ++++----
 src/tag/main.cpp                            | 22 ++++++++++-----------
 20 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/include/backends/postgresql/db/dbsource.hpp b/include/backends/postgresql/db/dbsource.hpp
index 087435a..d0e5810 100644
--- a/include/backends/postgresql/db/dbsource.hpp
+++ b/include/backends/postgresql/db/dbsource.hpp
@@ -35,7 +35,7 @@ namespace pq {
 	class Connection;
 } //namespace pq
 
-namespace dinbpostgres {
+namespace dindb {
 	using dinhelp::MaxSizedArray;
 
 	struct Settings;
@@ -146,6 +146,6 @@ namespace dinbpostgres {
 		this->query_files_in_dir(columns, parDir, parLevel, parSetID, std::bind(pback_func, &flat_list, std::placeholders::_1));
 		return list;
 	}
-} //namespace dinbpostgres
+} //namespace dindb
 
 #endif
diff --git a/include/backends/postgresql/db/delete.hpp b/include/backends/postgresql/db/delete.hpp
index 85bba77..90d2c6a 100644
--- a/include/backends/postgresql/db/delete.hpp
+++ b/include/backends/postgresql/db/delete.hpp
@@ -24,13 +24,13 @@
 #include <cstdint>
 #include <map>
 
-namespace dinbpostgres {
+namespace dindb {
 	struct Settings;
 
 	using IDDescMap = std::map<uint32_t, std::string>;
 	using ConfirmDeleCallback = std::function<bool(const IDDescMap&)>;
 
 	void delete_group_from_db ( const Settings& parDB, const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf );
-} //namespace dinbpostgres
+} //namespace dindb
 
 #endif
diff --git a/include/backends/postgresql/db/locate.hpp b/include/backends/postgresql/db/locate.hpp
index e982a17..51a595d 100644
--- a/include/backends/postgresql/db/locate.hpp
+++ b/include/backends/postgresql/db/locate.hpp
@@ -27,7 +27,7 @@ namespace mchlib {
 	struct TigerHash;
 } //namespace mchlib
 
-namespace dinbpostgres {
+namespace dindb {
 	struct Settings;
 
 	struct LocatedItem {
@@ -49,6 +49,6 @@ namespace dinbpostgres {
 	std::vector<LocatedItem> locate_in_db ( const Settings& parDB, const mchlib::TigerHash& parSearch, const TagList& parTags );
 	std::vector<LocatedSet> locate_sets_in_db ( const Settings& parDB, const std::string& parSearch, bool parCaseInsensitive );
 	std::vector<LocatedSet> locate_sets_in_db ( const Settings& parDB, const std::string& parSearch, const std::vector<uint32_t>& parSets, bool parCaseInsensitive );
-} //namespace dinbpostgres
+} //namespace dindb
 
 #endif
diff --git a/include/backends/postgresql/db/scan.hpp b/include/backends/postgresql/db/scan.hpp
index 6dee13f..877e1e0 100644
--- a/include/backends/postgresql/db/scan.hpp
+++ b/include/backends/postgresql/db/scan.hpp
@@ -29,11 +29,11 @@ namespace mchlib {
 	struct TigerHash;
 } //namespace mchlib
 
-namespace dinbpostgres {
+namespace dindb {
 	struct Settings;;
 
 	void write_to_db ( const Settings& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature );
 	bool read_from_db ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const Settings& parDB, const mchlib::TigerHash& parHash );
-} //namespace dinbpostgres
+} //namespace dindb
 
 #endif
diff --git a/include/backends/postgresql/db/settings.hpp b/include/backends/postgresql/db/settings.hpp
index 5c22c1a..3f384b2 100644
--- a/include/backends/postgresql/db/settings.hpp
+++ b/include/backends/postgresql/db/settings.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <cstdint>
 
-namespace dinbpostgres {
+namespace dindb {
 	struct Settings {
 		std::string address;
 		std::string username;
@@ -29,6 +29,6 @@ namespace dinbpostgres {
 		std::string dbname;
 		uint16_t port;
 	};
-} //namespace dinbpostgres
+} //namespace dindb
 
 #endif
diff --git a/include/backends/postgresql/db/tag.hpp b/include/backends/postgresql/db/tag.hpp
index 8a0af9f..509f6d3 100644
--- a/include/backends/postgresql/db/tag.hpp
+++ b/include/backends/postgresql/db/tag.hpp
@@ -22,7 +22,7 @@
 #include <boost/utility/string_ref.hpp>
 #include <cstdint>
 
-namespace dinbpostgres {
+namespace dindb {
 	struct Settings;
 
 	struct OwnerSetInfo {
@@ -37,6 +37,6 @@ namespace dinbpostgres {
 	void delete_tags ( const Settings& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
 	void delete_all_tags ( const Settings& parDB, const std::vector<uint64_t>& parFiles, OwnerSetInfo parSet );
 	void delete_all_tags ( const Settings& parDB, const std::vector<std::string>& parRegexes, OwnerSetInfo parSet );
-} //namespace dinbpostgres
+} //namespace dindb
 
 #endif
diff --git a/include/dindexer-common/settings.hpp b/include/dindexer-common/settings.hpp
index 131ba11..0a689bc 100644
--- a/include/dindexer-common/settings.hpp
+++ b/include/dindexer-common/settings.hpp
@@ -23,7 +23,7 @@
 
 namespace dinlib {
 	struct Settings {
-		dinbpostgres::Settings db;
+		dindb::Settings db;
 	};
 
 	bool load_settings ( const std::string& parPath, Settings& parOut, bool parExpand=true );
diff --git a/src/backends/postgresql/dbsource.cpp b/src/backends/postgresql/dbsource.cpp
index 4d923c1..4d518c9 100644
--- a/src/backends/postgresql/dbsource.cpp
+++ b/src/backends/postgresql/dbsource.cpp
@@ -25,7 +25,7 @@
 #include <sstream>
 #include <boost/range/algorithm/copy.hpp>
 
-namespace dinbpostgres {
+namespace dindb {
 	namespace {
 		const uint32_t g_files_query_limit = 500;
 
@@ -180,4 +180,4 @@ namespace dinbpostgres {
 		}
 		return retval;
 	}
-} //namespace dinbpostgres
+} //namespace dindb
diff --git a/src/backends/postgresql/delete.cpp b/src/backends/postgresql/delete.cpp
index 9691bdc..f75c54a 100644
--- a/src/backends/postgresql/delete.cpp
+++ b/src/backends/postgresql/delete.cpp
@@ -27,7 +27,7 @@
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/lexical_cast.hpp>
 
-namespace dinbpostgres {
+namespace dindb {
 	namespace {
 		IDDescMap fetch_existing_ids (pq::Connection& parConn, const std::vector<uint32_t>& parIDs) {
 			using boost::lexical_cast;
@@ -72,4 +72,4 @@ namespace dinbpostgres {
 
 		conn.query(oss.str());
 	}
-} //namespace dinbpostgres
+} //namespace dindb
diff --git a/src/backends/postgresql/locate.cpp b/src/backends/postgresql/locate.cpp
index 65d377a..9018b08 100644
--- a/src/backends/postgresql/locate.cpp
+++ b/src/backends/postgresql/locate.cpp
@@ -23,7 +23,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
-namespace dinbpostgres {
+namespace dindb {
 	namespace {
 		const int g_max_results = 200;
 
@@ -137,4 +137,4 @@ namespace dinbpostgres {
 		auto result = conn.query(query, parSearch, parCaseInsensitive, parSets);
 		return sets_result_to_vec(std::move(result));
 	}
-} //namespace dinbpostgres
+} //namespace dindb
diff --git a/src/backends/postgresql/scan.cpp b/src/backends/postgresql/scan.cpp
index ad34f5d..94fe4a8 100644
--- a/src/backends/postgresql/scan.cpp
+++ b/src/backends/postgresql/scan.cpp
@@ -28,7 +28,7 @@
 #include <boost/utility/string_ref.hpp>
 #include <chrono>
 
-namespace dinbpostgres {
+namespace dindb {
 	namespace {
 	} //unnamed namespace
 
@@ -144,4 +144,4 @@ namespace dinbpostgres {
 		}
 		conn.query("COMMIT;");
 	}
-} //namespace dinbpostgres
+} //namespace dindb
diff --git a/src/backends/postgresql/tag.cpp b/src/backends/postgresql/tag.cpp
index 9993ffc..79426b1 100644
--- a/src/backends/postgresql/tag.cpp
+++ b/src/backends/postgresql/tag.cpp
@@ -20,7 +20,7 @@
 #include "pq/connection.hpp"
 #include <ciso646>
 
-namespace dinbpostgres {
+namespace dindb {
 	void tag_files (const Settings& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
 		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
 		conn.connect();
@@ -152,4 +152,4 @@ namespace dinbpostgres {
 			conn.query(query, parRegexes);
 		}
 	}
-} //namespace dinbpostgres
+} //namespace dindb
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 997bca4..cb50215 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -22,8 +22,8 @@
 
 namespace YAML {
 	template<>
-	struct convert<dinbpostgres::Settings> {
-		static Node encode (const dinbpostgres::Settings& parSettings) {
+	struct convert<dindb::Settings> {
+		static Node encode (const dindb::Settings& parSettings) {
 			Node node;
 			node["address"] = parSettings.address;
 			node["username"] = parSettings.username;
@@ -33,7 +33,7 @@ namespace YAML {
 			return node;
 		}
 
-		static bool decode (const Node& parNode, dinbpostgres::Settings& parSettings) {
+		static bool decode (const Node& parNode, dindb::Settings& parSettings) {
 			if (not parNode.IsMap() or parNode.size() != 5) {
 				return false;
 			}
@@ -60,7 +60,7 @@ namespace dinlib {
 			auto settings = YAML::LoadFile(path);
 
 			if (settings["db_settings"]) {
-				parOut.db = settings["db_settings"].as<dinbpostgres::Settings>();
+				parOut.db = settings["db_settings"].as<dindb::Settings>();
 				return true;
 			}
 		}
diff --git a/src/delete/main.cpp b/src/delete/main.cpp
index cf44f5b..e3e17bf 100644
--- a/src/delete/main.cpp
+++ b/src/delete/main.cpp
@@ -26,7 +26,7 @@
 #include <cstdint>
 
 namespace {
-	bool confirm_delete (const dinbpostgres::IDDescMap& parMap) {
+	bool confirm_delete (const dindb::IDDescMap& parMap) {
 		for (const auto& itm : parMap) {
 			std::cout << "ID " << itm.first << '\t' << itm.second << '\n';
 		}
@@ -38,7 +38,7 @@ namespace {
 		return (answer.empty() or "y" == answer or "Y" == answer);
 	}
 
-	bool always_delete (const dinbpostgres::IDDescMap&) {
+	bool always_delete (const dindb::IDDescMap&) {
 		return true;
 	}
 } //unnamed namespace
@@ -77,7 +77,7 @@ int main (int parArgc, char* parArgv[]) {
 
 	const auto ids = vm["groupid"].as<std::vector<uint32_t>>();
 	auto confirm_func = (vm.count("confirm") ? &always_delete : &confirm_delete);
-	dinbpostgres::delete_group_from_db(settings.db, ids, confirm_func);
+	dindb::delete_group_from_db(settings.db, ids, confirm_func);
 	return 0;
 }
 
diff --git a/src/locate/main.cpp b/src/locate/main.cpp
index 83aefb1..f8474e8 100644
--- a/src/locate/main.cpp
+++ b/src/locate/main.cpp
@@ -27,7 +27,7 @@
 #include <iterator>
 #include <algorithm>
 
-namespace dinbpostgres {
+namespace dindb {
 	std::ostream& operator<< (std::ostream& parStream, const LocatedItem& parItem) {
 		parStream << parItem.group_id << '\t' << parItem.id << '\t' << parItem.path;
 		return parStream;
@@ -41,7 +41,7 @@ namespace dinbpostgres {
 			'\t' << parItem.files_count << '\t' << dircount;
 		return parStream;
 	}
-} //namespace dinbpostgres
+} //namespace dindb
 
 namespace {
 	std::vector<boost::string_ref> extract_tags (const boost::program_options::variables_map& parVM) {
@@ -81,22 +81,22 @@ int main (int parArgc, char* parArgv[]) {
 	}
 
 	if (vm.count("set")) {
-		const auto results = dinbpostgres::locate_sets_in_db(settings.db, vm["substring"].as<std::string>(), not not vm.count("case-insensitive"));
-		std::copy(results.begin(), results.end(), std::ostream_iterator<dinbpostgres::LocatedSet>(std::cout, "\n"));
+		const auto results = dindb::locate_sets_in_db(settings.db, vm["substring"].as<std::string>(), not not vm.count("case-insensitive"));
+		std::copy(results.begin(), results.end(), std::ostream_iterator<dindb::LocatedSet>(std::cout, "\n"));
 	}
 	else {
-		std::vector<dinbpostgres::LocatedItem> results;
+		std::vector<dindb::LocatedItem> results;
 		const std::vector<boost::string_ref> tags = extract_tags(vm);
 
 		if (vm.count("byhash")) {
 			const auto hash = din::hash(vm["substring"].as<std::string>());
-			results = dinbpostgres::locate_in_db(settings.db, hash, tags);
+			results = dindb::locate_in_db(settings.db, hash, tags);
 		}
 		else {
 			const auto search_regex = g2r::convert(vm["substring"].as<std::string>(), not vm.count("case-insensitive"));
-			results = dinbpostgres::locate_in_db(settings.db, search_regex, tags);
+			results = dindb::locate_in_db(settings.db, search_regex, tags);
 		}
-		std::copy(results.begin(), results.end(), std::ostream_iterator<dinbpostgres::LocatedItem>(std::cout, "\n"));
+		std::copy(results.begin(), results.end(), std::ostream_iterator<dindb::LocatedItem>(std::cout, "\n"));
 	}
 	return 0;
 }
diff --git a/src/navigate/listdircontent.cpp b/src/navigate/listdircontent.cpp
index 4953b23..bfda3fe 100644
--- a/src/navigate/listdircontent.cpp
+++ b/src/navigate/listdircontent.cpp
@@ -68,7 +68,7 @@ namespace din {
 		}
 	} //unnamed namespace
 
-	ListDirContent::ListDirContent (dinbpostgres::DBSource* parDB) :
+	ListDirContent::ListDirContent (dindb::DBSource* parDB) :
 		m_cache(g_max_cached_lists),
 		m_db(parDB)
 	{
@@ -86,13 +86,13 @@ namespace din {
 		//Requested item is not cached, so we need to query the db now
 		if (parDir.points_to_group()) {
 			auto sets_ids = m_db->sets();
-			auto sets_info = m_db->set_details<dinbpostgres::SetDetail_ID, dinbpostgres::SetDetail_Desc, dinbpostgres::SetDetail_CreeationDate>(sets_ids);
+			auto sets_info = m_db->set_details<dindb::SetDetail_ID, dindb::SetDetail_Desc, dindb::SetDetail_CreeationDate>(sets_ids);
 			m_cache.push_back(std::make_pair(curr_path, db_result_to_vec(sets_info)));
 		}
 		else {
 			auto path_prefix = parDir.file_path();
 			const auto set_id = parDir.group_id();
-			auto files_info = m_db->file_details<dinbpostgres::FileDetail_Path>(set_id, parDir.level() + 1, path_prefix);
+			auto files_info = m_db->file_details<dindb::FileDetail_Path>(set_id, parDir.level() + 1, path_prefix);
 			m_cache.push_back(std::make_pair(curr_path, db_result_to_vec(files_info)));
 		}
 		return last_cached_item(curr_path);
diff --git a/src/navigate/listdircontent.hpp b/src/navigate/listdircontent.hpp
index 37be26f..a3dfe19 100644
--- a/src/navigate/listdircontent.hpp
+++ b/src/navigate/listdircontent.hpp
@@ -23,9 +23,9 @@
 #include <string>
 #include <vector>
 
-namespace dinbpostgres {
+namespace dindb {
 	class DBSource;
-} //namespace dinbpostgres
+} //namespace dindb
 
 namespace din {
 	class EntryPath;
@@ -34,7 +34,7 @@ namespace din {
 		using ListType = std::vector<std::string>;
 		using CachedItemType = std::pair<std::string, ListType>;
 	public:
-		explicit ListDirContent ( dinbpostgres::DBSource* parDB );
+		explicit ListDirContent ( dindb::DBSource* parDB );
 		~ListDirContent ( void ) noexcept = default;
 
 		const ListType& ls ( const EntryPath& parDir ) const;
@@ -44,7 +44,7 @@ namespace din {
 		const ListType& last_cached_item ( const std::string& parCurrPath ) const;
 
 		mutable boost::circular_buffer<CachedItemType> m_cache;
-		dinbpostgres::DBSource* m_db;
+		dindb::DBSource* m_db;
 	};
 } //namespace din
 
diff --git a/src/navigate/main.cpp b/src/navigate/main.cpp
index 65118e0..db02fed 100644
--- a/src/navigate/main.cpp
+++ b/src/navigate/main.cpp
@@ -31,7 +31,7 @@
 #include <boost/range/algorithm/copy.hpp>
 
 namespace {
-	void do_navigation ( dinbpostgres::DBSource& parDB );
+	void do_navigation ( dindb::DBSource& parDB );
 
 	bool on_exit ( void );
 	void on_pwd ( const din::EntryPath& parDirMan );
@@ -61,7 +61,7 @@ int main (int parArgc, char* parArgv[]) {
 		}
 	}
 
-	dinbpostgres::DBSource db_source(settings.db);
+	dindb::DBSource db_source(settings.db);
 
 	do_navigation(db_source);
 	return 0;
@@ -81,7 +81,7 @@ namespace {
 		boost::copy(ls_result, std::ostream_iterator<std::string>(std::cout, "\n"));
 	}
 
-	void do_navigation (dinbpostgres::DBSource& parDB) {
+	void do_navigation (dindb::DBSource& parDB) {
 		const std::string prompt;
 		din::ListDirContent ls(&parDB);
 		din::LineReader lines(&ls);
@@ -92,7 +92,7 @@ namespace {
 		din::EntryPath dir_man;
 		proc.add_command("exit", &on_exit, 0);
 		proc.add_command("cd", std::function<void(const std::string&)>(std::bind(&din::EntryPath::push_piece, &dir_man, std::placeholders::_1)), 1);
-		proc.add_command("disconnect", std::function<void()>(std::bind(&dinbpostgres::DBSource::disconnect, &parDB)), 0);
+		proc.add_command("disconnect", std::function<void()>(std::bind(&dindb::DBSource::disconnect, &parDB)), 0);
 		proc.add_command("pwd", std::function<void()>(std::bind(&on_pwd, std::ref(dir_man))), 0);
 		proc.add_command("ls", std::function<void()>(std::bind(on_ls, std::ref(ls), std::ref(dir_man))), 0);
 		do {
diff --git a/src/scan/main.cpp b/src/scan/main.cpp
index 77860f2..a948c07 100644
--- a/src/scan/main.cpp
+++ b/src/scan/main.cpp
@@ -41,7 +41,7 @@
 #endif
 
 namespace {
-	bool add_to_db ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, const dinbpostgres::Settings& parDBSettings, bool parForce=false );
+	bool add_to_db ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, const dindb::Settings& parDBSettings, bool parForce=false );
 #if defined(WITH_PROGRESS_FEEDBACK)
 	void print_progress ( const boost::string_ref parPath, uint64_t parFileBytes, uint64_t parTotalBytes, uint32_t parFileNum, std::size_t& parClearCount );
 #endif
@@ -115,7 +115,7 @@ int main (int parArgc, char* parArgv[]) {
 }
 
 namespace {
-	bool add_to_db (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, const dinbpostgres::Settings& parDBSettings, bool parForce) {
+	bool add_to_db (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, const dindb::Settings& parDBSettings, bool parForce) {
 		using mchlib::FileRecordData;
 		using mchlib::SetRecordDataFull;
 		using mchlib::SetRecordData;
@@ -124,7 +124,7 @@ namespace {
 			const auto& first_hash = parData.front().hash;
 			FileRecordData itm;
 			SetRecordDataFull set;
-			const bool already_in_db = dinbpostgres::read_from_db(itm, set, parDBSettings, first_hash);
+			const bool already_in_db = dindb::read_from_db(itm, set, parDBSettings, first_hash);
 			if (already_in_db) {
 				return false;
 			}
@@ -134,7 +134,7 @@ namespace {
 		const auto app_signature = dinlib::dindexer_signature();
 		const auto lib_signature = mchlib::lib_signature();
 		const std::string signature = std::string(app_signature.data(), app_signature.size()) + "/" + std::string(lib_signature.data(), lib_signature.size());
-		dinbpostgres::write_to_db(parDBSettings, parData, set_data, signature);
+		dindb::write_to_db(parDBSettings, parData, set_data, signature);
 		return true;
 	}
 
diff --git a/src/tag/main.cpp b/src/tag/main.cpp
index f8fefc3..66005c0 100644
--- a/src/tag/main.cpp
+++ b/src/tag/main.cpp
@@ -47,8 +47,8 @@ namespace {
 		return retval;
 	}
 
-	dinbpostgres::OwnerSetInfo make_owner_set_info (const boost::program_options::variables_map& parVM) {
-		dinbpostgres::OwnerSetInfo set_info;
+	dindb::OwnerSetInfo make_owner_set_info (const boost::program_options::variables_map& parVM) {
+		dindb::OwnerSetInfo set_info;
 		if (parVM.count("set")) {
 			set_info.is_valid = true;
 			set_info.group_id = parVM["set"].as<uint32_t>();
@@ -60,11 +60,11 @@ namespace {
 		return set_info;
 	}
 
-	int tag_files (const dinbpostgres::Settings& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
+	int tag_files (const dindb::Settings& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
 		using boost::lexical_cast;
 		using boost::string_ref;
 
-		const dinbpostgres::OwnerSetInfo set_info = make_owner_set_info(parVM);
+		const dindb::OwnerSetInfo set_info = make_owner_set_info(parVM);
 
 		switch (parMode) {
 		case TaggingMode::ID:
@@ -73,14 +73,14 @@ namespace {
 			std::vector<uint64_t> ids;
 			ids.reserve(ids_string.size());
 			std::transform(ids_string.begin(), ids_string.end(), std::back_inserter(ids), &lexical_cast<uint64_t, string_ref>);
-			dinbpostgres::tag_files(parDB, ids, parTags, set_info);
+			dindb::tag_files(parDB, ids, parTags, set_info);
 			return 0;
 		}
 
 		case TaggingMode::Glob:
 		{
 			const auto regexes(globs_to_regex_list(parVM["globs"].as<std::vector<std::string>>()));
-			dinbpostgres::tag_files(parDB, regexes, parTags, set_info);
+			dindb::tag_files(parDB, regexes, parTags, set_info);
 			return 0;
 		}
 
@@ -90,7 +90,7 @@ namespace {
 		}
 	}
 
-	int delete_tags (const dinbpostgres::Settings& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
+	int delete_tags (const dindb::Settings& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
 		using boost::lexical_cast;
 		using boost::string_ref;
 
@@ -104,9 +104,9 @@ namespace {
 			ids.reserve(ids_string.size());
 			std::transform(ids_string.begin(), ids_string.end(), std::back_inserter(ids), &lexical_cast<uint64_t, string_ref>);
 			if (parVM.count("alltags"))
-				dinbpostgres::delete_all_tags(parDB, ids, make_owner_set_info(parVM));
+				dindb::delete_all_tags(parDB, ids, make_owner_set_info(parVM));
 			else
-				dinbpostgres::delete_tags(parDB, ids, parTags, make_owner_set_info(parVM));
+				dindb::delete_tags(parDB, ids, parTags, make_owner_set_info(parVM));
 			return 0;
 		}
 
@@ -114,9 +114,9 @@ namespace {
 		{
 			const auto regexes(globs_to_regex_list(parVM["globs"].as<std::vector<std::string>>()));
 			if (parVM.count("alltags"))
-				dinbpostgres::delete_all_tags(parDB, regexes, make_owner_set_info(parVM));
+				dindb::delete_all_tags(parDB, regexes, make_owner_set_info(parVM));
 			else
-				dinbpostgres::delete_tags(parDB, regexes, parTags, make_owner_set_info(parVM));
+				dindb::delete_tags(parDB, regexes, parTags, make_owner_set_info(parVM));
 			return 0;
 		}
 

From 064fc0cf1a37d6d553053ee4f496a304d9244869 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 27 May 2016 20:28:26 +0200
Subject: [PATCH 011/170] Create intermediate backend lib to help loading
 backend plugins.

---
 CMakeLists.txt                                |   2 +-
 include/backends/backend_loader.hpp           |  59 ++++++++++
 include/backends/db_backend.hpp               |  49 ++++++++
 include/backends/exposed_functions.hpp        |  33 ++++++
 src/backends/CMakeLists.txt                   |  28 +++++
 src/backends/backend_loader.cpp               | 107 ++++++++++++++++++
 src/backends/postgresql/CMakeLists.txt        |   1 +
 .../postgresql/backend_postgresql.cpp         | 102 +++++++++++++++++
 .../postgresql/backend_postgresql.hpp         |  49 ++++++++
 src/common/CMakeLists.txt                     |   2 -
 src/main/CMakeLists.txt                       |   1 -
 11 files changed, 429 insertions(+), 4 deletions(-)
 create mode 100644 include/backends/backend_loader.hpp
 create mode 100644 include/backends/db_backend.hpp
 create mode 100644 include/backends/exposed_functions.hpp
 create mode 100644 src/backends/CMakeLists.txt
 create mode 100644 src/backends/backend_loader.cpp
 create mode 100644 src/backends/postgresql/backend_postgresql.cpp
 create mode 100644 src/backends/postgresql/backend_postgresql.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fd4155..75c121f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,7 +129,7 @@ add_subdirectory(src/common)
 add_subdirectory(src/machinery)
 add_subdirectory(lib/pbl)
 add_subdirectory(lib/glob2regex)
-add_subdirectory(src/backends/postgresql)
+add_subdirectory(src/backends)
 
 #Actions
 add_subdirectory(src/main)
diff --git a/include/backends/backend_loader.hpp b/include/backends/backend_loader.hpp
new file mode 100644
index 0000000..70bb592
--- /dev/null
+++ b/include/backends/backend_loader.hpp
@@ -0,0 +1,59 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id756A258A98B24B0DB2529BCEEC5137E2
+#define id756A258A98B24B0DB2529BCEEC5137E2
+
+#include <string>
+#include <memory>
+#include <boost/utility/string_ref.hpp>
+
+namespace YAML {
+	class Node;
+} //namespace YAML
+
+namespace dindb {
+	class Backend;
+
+	using BackendPtr = std::unique_ptr<dindb::Backend, void(*)(dindb::Backend*)>;
+
+	class BackendPlugin {
+	public:
+		BackendPlugin ( void );
+		BackendPlugin ( BackendPlugin&& ) = default;
+		BackendPlugin ( const std::string& parSOPath, const YAML::Node* parConfig );
+		~BackendPlugin ( void ) noexcept;
+
+		const boost::string_ref& name ( void ) const;
+		Backend& backend ( void );
+		const Backend& backend ( void ) const;
+		bool is_loaded ( void ) const;
+
+		BackendPlugin& operator= ( BackendPlugin&& ) = default;
+
+	private:
+		using SoHandle = std::unique_ptr<void, int(*)(void*)>;
+
+		SoHandle m_lib;
+		BackendPtr m_backend;
+		boost::string_ref m_name;
+	};
+
+	std::string backend_name ( const std::string& parSOPath );
+} //namespace dindb
+
+#endif
diff --git a/include/backends/db_backend.hpp b/include/backends/db_backend.hpp
new file mode 100644
index 0000000..cc79b43
--- /dev/null
+++ b/include/backends/db_backend.hpp
@@ -0,0 +1,49 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id7506CA9825454B80856154ACFE8A9DE2
+#define id7506CA9825454B80856154ACFE8A9DE2
+
+#include "backends/backend_loader.hpp"
+#include <cstdint>
+#include <string>
+#include <vector>
+#include <boost/utility/string_ref.hpp>
+
+namespace dindb {
+	using GroupIDType = uint32_t;
+	using FileIDType = uint64_t;
+
+	constexpr const GroupIDType InvalidGroupID = 0;
+	constexpr const FileIDType InvalidFileID = 0;
+
+	class Backend {
+	public:
+		Backend ( void ) = default;
+		virtual ~Backend ( void ) noexcept = default;
+
+		virtual void tag_files ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const = 0;
+		virtual void tag_files ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const = 0;
+		virtual void delete_tags ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const = 0;
+		virtual void delete_tags ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const = 0;
+		virtual void delete_all_tags ( const std::vector<FileIDType>& parFiles, GroupIDType parSet ) const = 0;
+		virtual void delete_all_tags ( const std::vector<std::string>& parRegexes, GroupIDType parSet ) const = 0;
+
+	};
+} //namespace dindb
+
+#endif
diff --git a/include/backends/exposed_functions.hpp b/include/backends/exposed_functions.hpp
new file mode 100644
index 0000000..a1b21e9
--- /dev/null
+++ b/include/backends/exposed_functions.hpp
@@ -0,0 +1,33 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef idA9E47E37E2FA49EE84C2E93FB701C368
+#define idA9E47E37E2FA49EE84C2E93FB701C368
+
+namespace YAML {
+	class Node;
+} //namespace YAML
+
+namespace dindb {
+	class Backend;
+} //namespace dindb
+
+extern "C" dindb::Backend* dindexer_create_backend ( const YAML::Node* parConfig );
+extern "C" void dindexer_destroy_backend ( dindb::Backend* parDele );
+extern "C" const char* dindexer_backend_name ( void );
+
+#endif
diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt
new file mode 100644
index 0000000..eae379f
--- /dev/null
+++ b/src/backends/CMakeLists.txt
@@ -0,0 +1,28 @@
+project(${bare_name}-backend CXX)
+
+add_library(${PROJECT_NAME} STATIC
+	backend_loader.cpp
+)
+
+target_include_directories(${PROJECT_NAME}
+	PUBLIC ${DINDEXER_PUB_INCLUDE_DIR}
+)
+target_include_directories(${PROJECT_NAME} SYSTEM
+	PUBLIC ${YAMLCPP_INCLUDE_DIR}
+)
+
+target_link_libraries(${PROJECT_NAME}
+	PRIVATE ${bare_name}-if
+	PUBLIC ${YAMLCPP_LIBRARY}
+	PUBLIC dl
+)
+
+#install(TARGETS ${PROJECT_NAME}
+#	LIBRARY DESTINATION lib
+#	RUNTIME DESTINATION bin
+#	ARCHIVE DESTINATION lib/static
+#)
+
+add_subdirectory(postgresql)
+
+add_dependencies(${PROJECT_NAME} ${bare_name}-backend-postgresql)
diff --git a/src/backends/backend_loader.cpp b/src/backends/backend_loader.cpp
new file mode 100644
index 0000000..a6eba27
--- /dev/null
+++ b/src/backends/backend_loader.cpp
@@ -0,0 +1,107 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+//See:
+// http://stackoverflow.com/questions/496664/c-dynamic-shared-library-on-linux
+
+#include "backends/backend_loader.hpp"
+#include "backends/exposed_functions.hpp"
+#include <dlfcn.h>
+#include <cassert>
+#include <functional>
+
+namespace dindb {
+	namespace {
+		BackendPtr load_backend (void* parSOHandle, const YAML::Node* parConfig) {
+			typedef decltype(&dindexer_create_backend) CreateBackendFun;
+			typedef decltype(&dindexer_destroy_backend) DeleteBackendFun;
+
+			assert(parSOHandle);
+			assert(parConfig);
+
+			auto create = reinterpret_cast<CreateBackendFun>(dlsym(parSOHandle, "dindexer_create_backend"));
+			auto destroy = reinterpret_cast<DeleteBackendFun>(dlsym(parSOHandle, "dindexer_destroy_backend"));
+
+			return BackendPtr(create(parConfig), destroy);
+		}
+
+		const char* backend_name (void* parSOHandle) {
+			typedef decltype(&dindexer_backend_name) GetNameFun;
+
+			assert(parSOHandle);
+
+			auto get_name = reinterpret_cast<GetNameFun>(dlsym(parSOHandle, "dindexer_backend_name"));
+			return get_name();
+		}
+
+		void nop_destroy (Backend*) {
+		}
+	} //unnamed namespace
+
+	std::string backend_name (const std::string& parSOPath) {
+		assert(not parSOPath.empty());
+		using SoHandle = std::unique_ptr<void, int(*)(void*)>;
+
+		auto handle = SoHandle(dlopen(parSOPath.c_str(), RTLD_LAZY), &dlclose);
+		return backend_name(handle.get());
+	}
+
+	BackendPlugin::BackendPlugin() :
+		m_lib(nullptr, &dlclose),
+		m_backend(nullptr, &nop_destroy),
+		m_name()
+	{
+	}
+
+	BackendPlugin::BackendPlugin (const std::string& parSOPath, const YAML::Node* parConfig) :
+		m_lib(dlopen(parSOPath.c_str(), RTLD_LAZY), &dlclose),
+		m_backend(load_backend(m_lib.get(), parConfig)),
+		m_name(backend_name(m_lib.get()))
+	{
+	}
+
+	BackendPlugin::~BackendPlugin() noexcept {
+	}
+
+	const boost::string_ref& BackendPlugin::name() const {
+		return m_name;
+	}
+
+	Backend& BackendPlugin::backend() {
+		assert(m_lib);
+		assert(m_backend);
+		if (not m_backend) {
+			throw std::bad_function_call();
+		}
+
+		return *m_backend;
+	}
+
+	const Backend& BackendPlugin::backend() const {
+		assert(m_lib);
+		assert(m_backend);
+		if (not m_backend) {
+			throw std::bad_function_call();
+		}
+
+		return *m_backend;
+	}
+
+	bool BackendPlugin::is_loaded() const {
+		return static_cast<bool>(m_backend);
+	}
+} //namespace dindb
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index 8238350..40eb8e3 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -6,6 +6,7 @@ add_library(${PROJECT_NAME} STATIC
 	locate.cpp
 	scan.cpp
 	dbsource.cpp
+	backend_postgresql.cpp
 )
 
 target_include_directories(${PROJECT_NAME}
diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
new file mode 100644
index 0000000..7ccf8cc
--- /dev/null
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -0,0 +1,102 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "backend_postgresql.hpp"
+#include "backends/exposed_functions.hpp"
+#include "pq/connection.hpp"
+#include <ciso646>
+#include <utility>
+#include <cassert>
+#include <yaml-cpp/yaml.h>
+
+namespace YAML {
+	template<>
+	struct convert<dindb::Settings> {
+		static Node encode (const dindb::Settings& parSettings) {
+			Node node;
+			node["address"] = parSettings.address;
+			node["username"] = parSettings.username;
+			node["password"] = parSettings.password;
+			node["port"] = parSettings.port;
+			node["dbname"] = parSettings.dbname;
+			return node;
+		}
+
+		static bool decode (const Node& parNode, dindb::Settings& parSettings) {
+			if (not parNode.IsMap() or parNode.size() != 5) {
+				return false;
+			}
+
+			parSettings.address = parNode["address"].as<std::string>();
+			parSettings.username = parNode["username"].as<std::string>();
+			parSettings.password = parNode["password"].as<std::string>();
+			parSettings.dbname = parNode["dbname"].as<std::string>();
+			parSettings.port = parNode["port"].as<uint16_t>();
+			return true;
+		}
+	};
+} //namespace YAML
+
+namespace dindb {
+	BackendPostgreSql::BackendPostgreSql (std::string&& parUser, std::string&& parPass, std::string&& parDB, std::string&& parAddr, uint16_t parPort) :
+		m_conn(new pq::Connection(std::move(parUser), std::move(parPass), std::move(parDB), std::move(parAddr), parPort))
+	{
+		assert(m_conn);
+		m_conn->connect();
+	}
+
+	BackendPostgreSql::~BackendPostgreSql() noexcept {
+		m_conn->disconnect();
+	}
+
+	void BackendPostgreSql::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) const {
+		if (InvalidGroupID != parSet) {
+			const std::string query =
+				"UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) ORDER BY 1) WHERE \"id\"=ANY($2) AND \"group_id\"=$3;";
+			m_conn->query(query, parTags, parFiles, parSet);
+		}
+		else {
+			const std::string query =
+				"UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) ORDER BY 1) WHERE \"id\"=ANY($2);";
+			m_conn->query(query, parTags, parFiles);
+		}
+	}
+
+	void BackendPostgreSql::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) const {
+	}
+
+	void BackendPostgreSql::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) const {
+	}
+
+	void BackendPostgreSql::delete_tags (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) const {
+	}
+
+	void BackendPostgreSql::delete_all_tags (const std::vector<FileIDType>& parFiles, GroupIDType parSet) const {
+	}
+
+	void BackendPostgreSql::delete_all_tags (const std::vector<std::string>& parRegexes, GroupIDType parSet) const {
+	}
+} //namespace dindb
+
+extern "C" dindb::Backend* create_backend (const YAML::Node*) {
+	return new dindb::BackendPostgreSql("A", "B", "C", "D", 1);
+}
+
+extern "C" void destroy_backend (dindb::Backend* parDele) {
+	if (parDele)
+		delete parDele;
+}
diff --git a/src/backends/postgresql/backend_postgresql.hpp b/src/backends/postgresql/backend_postgresql.hpp
new file mode 100644
index 0000000..bce0e7c
--- /dev/null
+++ b/src/backends/postgresql/backend_postgresql.hpp
@@ -0,0 +1,49 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef idBE5BBAFEC7334F39AC9338F193703341
+#define idBE5BBAFEC7334F39AC9338F193703341
+
+#include "backends/db_backend.hpp"
+#include <string>
+#include <cstdint>
+#include <memory>
+
+namespace pq {
+	class Connection;
+} //namespace pq
+
+namespace dindb {
+	class BackendPostgreSql : public Backend {
+	public:
+		BackendPostgreSql ( BackendPostgreSql&& ) = default;
+		BackendPostgreSql ( std::string&& parUser, std::string&& parPass, std::string&& parDB, std::string&& parAddr, uint16_t parPort );
+		virtual ~BackendPostgreSql ( void ) noexcept;
+
+		virtual void tag_files ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const override;
+		virtual void tag_files ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const override;
+		virtual void delete_tags ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const override;
+		virtual void delete_tags ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const override;
+		virtual void delete_all_tags ( const std::vector<FileIDType>& parFiles, GroupIDType parSet ) const override;
+		virtual void delete_all_tags ( const std::vector<std::string>& parRegexes, GroupIDType parSet ) const override;
+
+	private:
+		std::unique_ptr<pq::Connection> m_conn;
+	};
+} //namespace dindb
+
+#endif
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index e41e3b5..724d45f 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -19,8 +19,6 @@ target_include_directories(${PROJECT_NAME} SYSTEM
 	PRIVATE ${Readline_INCLUDE_DIR}
 )
 
-string(TOLOWER "${DINDEXER_DB_BACKEND}" DINDEXER_DB_BACKEND_LOWERCASE)
-
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${YAMLCPP_LIBRARY}
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 1b16abb..8f0f1d8 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -12,7 +12,6 @@ add_executable(${PROJECT_NAME}
 
 make_timestamp(${bare_name} timestamp.h.in)
 target_include_directories(${PROJECT_NAME}
-	PRIVATE ${CMAKE_SOURCE_DIR}/include
 	PRIVATE ${CMAKE_SOURCE_DIR}/lib/pbl/pbl/src/src
 	PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
 )

From c97a08860feb99e87a1093bbd54aaa4a442f6688 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 27 May 2016 20:29:32 +0200
Subject: [PATCH 012/170] Get rid of the DB_BACKEND build setting.

---
 CMakeLists.txt           | 1 -
 src/dindexerConfig.h.in  | 2 --
 src/main/builtin_feats.c | 1 -
 3 files changed, 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75c121f..8149f6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,6 @@ if(DINDEXER_NATIVE_RELEASE)
 else()
 	set(march_flag "")
 endif()
-set(DINDEXER_DB_BACKEND "PostgreSQL")
 set(DINDEXER_COPYRIGHT_YEARS "2015,2016")
 set(DINDEXER_ACTIONS_PATH "${CMAKE_CURRENT_BINARY_DIR}/src" CACHE STRING "Actions search path")
 string(REGEX MATCH "[^/].*" ACTIONS_PATH_INSTALL "${DINDEXER_ACTIONS_PATH}")
diff --git a/src/dindexerConfig.h.in b/src/dindexerConfig.h.in
index 8f1eae6..7d2493c 100644
--- a/src/dindexerConfig.h.in
+++ b/src/dindexerConfig.h.in
@@ -50,8 +50,6 @@
 #	define WITH_NICE_MEDIA_TYPES
 #endif
 
-#define DB_BACKEND "@DINDEXER_DB_BACKEND@"
-
 #define COPYRIGHT_YEARS_LIST @DINDEXER_COPYRIGHT_YEARS@
 
 #endif
diff --git a/src/main/builtin_feats.c b/src/main/builtin_feats.c
index 0ffba59..9c6e851 100644
--- a/src/main/builtin_feats.c
+++ b/src/main/builtin_feats.c
@@ -52,7 +52,6 @@ void print_builtin_feats() {
 #else
 	printf("WITH_NICE_MEDIA_TYPES = no\n");
 #endif
-	printf("DB_BACKEND = \"%s\"\n", DB_BACKEND);
 }
 
 void print_version() {

From 20b2a8695eefbf743dcd519376d6da8cbb16d442 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 27 May 2016 20:31:07 +0200
Subject: [PATCH 013/170] Load postgresql plugin and use that in tag.

Only partially implemented.
---
 dindexer.yml                                  |  3 +-
 include/dindexer-common/settings.hpp          |  6 ++-
 src/backends/postgresql/CMakeLists.txt        |  4 +-
 .../postgresql/backend_postgresql.cpp         | 38 +++++++++++---
 src/common/CMakeLists.txt                     |  2 +-
 src/common/settings.cpp                       | 50 ++++++++-----------
 src/pq/CMakeLists.txt                         |  3 ++
 src/tag/main.cpp                              | 42 +++++++---------
 8 files changed, 83 insertions(+), 65 deletions(-)

diff --git a/dindexer.yml b/dindexer.yml
index 1d3b7a9..d13cd0d 100644
--- a/dindexer.yml
+++ b/dindexer.yml
@@ -1,6 +1,7 @@
 %YAML 1.2
 ---
-db_settings:
+db_backend_name: postgresql
+db_backend_settings:
     username: your_username
     password: your_password
     dbname: dindexer
diff --git a/include/dindexer-common/settings.hpp b/include/dindexer-common/settings.hpp
index 0a689bc..11f295f 100644
--- a/include/dindexer-common/settings.hpp
+++ b/include/dindexer-common/settings.hpp
@@ -19,11 +19,13 @@
 #define idDC29E3C667BD4793BA0644AE7DC5BD3F
 
 #include <string>
-#include "db/settings.hpp"
+#include "backends/backend_loader.hpp"
+#include "backends/db_backend.hpp"
 
 namespace dinlib {
 	struct Settings {
-		dindb::Settings db;
+		std::string backend_name;
+		dindb::BackendPlugin backend_plugin;
 	};
 
 	bool load_settings ( const std::string& parPath, Settings& parOut, bool parExpand=true );
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index 40eb8e3..cdf8915 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(${bare_name}-backend-postgresql CXX)
 
-add_library(${PROJECT_NAME} STATIC
+add_library(${PROJECT_NAME} SHARED
 	tag.cpp
 	delete.cpp
 	locate.cpp
@@ -10,7 +10,7 @@ add_library(${PROJECT_NAME} STATIC
 )
 
 target_include_directories(${PROJECT_NAME}
-	PUBLIC ${CMAKE_SOURCE_DIR}/include/backends/postgresql
+	PUBLIC ${DINDEXER_PUB_INCLUDE_DIR}/backends/postgresql
 )
 target_include_directories(${PROJECT_NAME} SYSTEM
 	PUBLIC ${Boost_INCLUDE_DIRS}
diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
index 7ccf8cc..cab4487 100644
--- a/src/backends/postgresql/backend_postgresql.cpp
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -23,10 +23,22 @@
 #include <cassert>
 #include <yaml-cpp/yaml.h>
 
+namespace dindb {
+	namespace {
+		struct PostgreConnectionSettings {
+			std::string address;
+			std::string username;
+			std::string password;
+			std::string dbname;
+			uint16_t port;
+		};
+	} //unnamed namespace
+} //namespace dindb
+
 namespace YAML {
 	template<>
-	struct convert<dindb::Settings> {
-		static Node encode (const dindb::Settings& parSettings) {
+	struct convert<dindb::PostgreConnectionSettings> {
+		static Node encode (const dindb::PostgreConnectionSettings& parSettings) {
 			Node node;
 			node["address"] = parSettings.address;
 			node["username"] = parSettings.username;
@@ -36,7 +48,7 @@ namespace YAML {
 			return node;
 		}
 
-		static bool decode (const Node& parNode, dindb::Settings& parSettings) {
+		static bool decode (const Node& parNode, dindb::PostgreConnectionSettings& parSettings) {
 			if (not parNode.IsMap() or parNode.size() != 5) {
 				return false;
 			}
@@ -92,11 +104,25 @@ namespace dindb {
 	}
 } //namespace dindb
 
-extern "C" dindb::Backend* create_backend (const YAML::Node*) {
-	return new dindb::BackendPostgreSql("A", "B", "C", "D", 1);
+extern "C" dindb::Backend* dindexer_create_backend (const YAML::Node* parConfig) {
+	if (not parConfig)
+		return nullptr;
+
+	auto config = parConfig->as<dindb::PostgreConnectionSettings>();
+	return new dindb::BackendPostgreSql(
+		std::move(config.username),
+		std::move(config.password),
+		std::move(config.dbname),
+		std::move(config.address),
+		config.port
+	);
 }
 
-extern "C" void destroy_backend (dindb::Backend* parDele) {
+extern "C" void dindexer_destroy_backend (dindb::Backend* parDele) {
 	if (parDele)
 		delete parDele;
 }
+
+extern "C" const char* dindexer_backend_name() {
+	return "postgresql";
+}
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 724d45f..d8a1ebd 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${YAMLCPP_LIBRARY}
 	PRIVATE ${Readline_LIBRARY}
-	PUBLIC ${bare_name}-backend-${DINDEXER_DB_BACKEND_LOWERCASE}
+	${bare_name}-backend
 )
 
 #install(TARGETS ${PROJECT_NAME}
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index cb50215..811a0f4 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -16,41 +16,15 @@
  */
 
 #include "dindexer-common/settings.hpp"
+#include "dindexerConfig.h"
 #include <yaml-cpp/yaml.h>
 #include <ciso646>
 #include <wordexp.h>
 
-namespace YAML {
-	template<>
-	struct convert<dindb::Settings> {
-		static Node encode (const dindb::Settings& parSettings) {
-			Node node;
-			node["address"] = parSettings.address;
-			node["username"] = parSettings.username;
-			node["password"] = parSettings.password;
-			node["port"] = parSettings.port;
-			node["dbname"] = parSettings.dbname;
-			return node;
-		}
-
-		static bool decode (const Node& parNode, dindb::Settings& parSettings) {
-			if (not parNode.IsMap() or parNode.size() != 5) {
-				return false;
-			}
-
-			parSettings.address = parNode["address"].as<std::string>();
-			parSettings.username = parNode["username"].as<std::string>();
-			parSettings.password = parNode["password"].as<std::string>();
-			parSettings.dbname = parNode["dbname"].as<std::string>();
-			parSettings.port = parNode["port"].as<uint16_t>();
-			return true;
-		}
-	};
-} //namespace YAML
-
 namespace dinlib {
 	namespace {
 		std::string expand ( const char* parString );
+		std::string find_plugin_by_name ( const std::string& parName );
 	} //unnamed namespace
 
 	bool load_settings (const std::string& parPath, dinlib::Settings& parOut, bool parExpand) {
@@ -59,8 +33,14 @@ namespace dinlib {
 		try {
 			auto settings = YAML::LoadFile(path);
 
-			if (settings["db_settings"]) {
-				parOut.db = settings["db_settings"].as<dindb::Settings>();
+			if (not settings["db_backend_name"]) {
+				return false;
+			}
+			parOut.backend_name = settings["db_backend_name"].as<std::string>();
+			if (settings["db_backend_settings"]) {
+				//parOut.db = settings["db_backend_settings"].as<dindb::Settings>();
+				auto settings_node = settings["db_backend_settings"];
+				parOut.backend_plugin = dindb::BackendPlugin(find_plugin_by_name(parOut.backend_name), &settings_node);
 				return true;
 			}
 		}
@@ -83,5 +63,15 @@ namespace dinlib {
 			wordfree(&p);
 			return oss.str();
 		}
+
+		std::string find_plugin_by_name (const std::string& parName) {
+			//assert(false); //not implemented
+			//TODO: write a proper implementation
+			std::string path = ACTIONS_SEARCH_PATH;
+			path += "/backends/postgresql/libdindexer-backend-postgresql.so";
+
+			assert(dindb::backend_name(path) == parName);
+			return path;
+		}
 	} //unnamed namespace
 } //namespace dinlib
diff --git a/src/pq/CMakeLists.txt b/src/pq/CMakeLists.txt
index 543e6e3..6bda657 100644
--- a/src/pq/CMakeLists.txt
+++ b/src/pq/CMakeLists.txt
@@ -1,5 +1,8 @@
 project(${bare_name}-pq CXX)
 
+set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
+set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fPIC")
+
 add_library(${PROJECT_NAME} STATIC
 	connection.cpp
 	databaseexception.cpp
diff --git a/src/tag/main.cpp b/src/tag/main.cpp
index 66005c0..5195640 100644
--- a/src/tag/main.cpp
+++ b/src/tag/main.cpp
@@ -18,7 +18,6 @@
 #include "commandline.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexerConfig.h"
-#include "db/tag.hpp"
 #include "dindexer-common/split_tags.hpp"
 #include "glob2regex/glob2regex.hpp"
 #include "enum.h"
@@ -47,24 +46,18 @@ namespace {
 		return retval;
 	}
 
-	dindb::OwnerSetInfo make_owner_set_info (const boost::program_options::variables_map& parVM) {
-		dindb::OwnerSetInfo set_info;
-		if (parVM.count("set")) {
-			set_info.is_valid = true;
-			set_info.group_id = parVM["set"].as<uint32_t>();
-		}
-		else {
-			set_info.is_valid = false;
-			set_info.group_id = 0;
-		}
-		return set_info;
+	dindb::GroupIDType make_owner_set_info (const boost::program_options::variables_map& parVM) {
+		if (parVM.count("set"))
+			return parVM["set"].as<dindb::GroupIDType>();
+		else
+			return dindb::InvalidGroupID;
 	}
 
-	int tag_files (const dindb::Settings& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
+	int tag_files (dindb::Backend& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
 		using boost::lexical_cast;
 		using boost::string_ref;
 
-		const dindb::OwnerSetInfo set_info = make_owner_set_info(parVM);
+		const auto set_info = make_owner_set_info(parVM);
 
 		switch (parMode) {
 		case TaggingMode::ID:
@@ -73,14 +66,14 @@ namespace {
 			std::vector<uint64_t> ids;
 			ids.reserve(ids_string.size());
 			std::transform(ids_string.begin(), ids_string.end(), std::back_inserter(ids), &lexical_cast<uint64_t, string_ref>);
-			dindb::tag_files(parDB, ids, parTags, set_info);
+			parDB.tag_files(ids, parTags, set_info);
 			return 0;
 		}
 
 		case TaggingMode::Glob:
 		{
 			const auto regexes(globs_to_regex_list(parVM["globs"].as<std::vector<std::string>>()));
-			dindb::tag_files(parDB, regexes, parTags, set_info);
+			parDB.tag_files(regexes, parTags, set_info);
 			return 0;
 		}
 
@@ -90,7 +83,7 @@ namespace {
 		}
 	}
 
-	int delete_tags (const dindb::Settings& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
+	int delete_tags (dindb::Backend& parDB, TaggingMode parMode, const boost::program_options::variables_map& parVM, const std::vector<boost::string_ref>& parTags) {
 		using boost::lexical_cast;
 		using boost::string_ref;
 
@@ -104,9 +97,9 @@ namespace {
 			ids.reserve(ids_string.size());
 			std::transform(ids_string.begin(), ids_string.end(), std::back_inserter(ids), &lexical_cast<uint64_t, string_ref>);
 			if (parVM.count("alltags"))
-				dindb::delete_all_tags(parDB, ids, make_owner_set_info(parVM));
+				parDB.delete_all_tags(ids, make_owner_set_info(parVM));
 			else
-				dindb::delete_tags(parDB, ids, parTags, make_owner_set_info(parVM));
+				parDB.delete_tags(ids, parTags, make_owner_set_info(parVM));
 			return 0;
 		}
 
@@ -114,9 +107,9 @@ namespace {
 		{
 			const auto regexes(globs_to_regex_list(parVM["globs"].as<std::vector<std::string>>()));
 			if (parVM.count("alltags"))
-				dindb::delete_all_tags(parDB, regexes, make_owner_set_info(parVM));
+				parDB.delete_all_tags(regexes, make_owner_set_info(parVM));
 			else
-				dindb::delete_tags(parDB, regexes, parTags, make_owner_set_info(parVM));
+				parDB.delete_tags(regexes, parTags, make_owner_set_info(parVM));
 			return 0;
 		}
 
@@ -160,6 +153,9 @@ int main (int parArgc, char* parArgv[]) {
 			std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ", quitting\n";
 			return 1;
 		}
+		//TODO: throw if plugin loading failed
+		assert(settings.backend_plugin.name() == settings.backend_name);
+		assert(settings.backend_plugin.is_loaded());
 	}
 
 	const auto master_tags_string = vm["tags"].as<std::string>();
@@ -167,7 +163,7 @@ int main (int parArgc, char* parArgv[]) {
 	const auto mode = (glob_mode ? TaggingMode::Glob : TaggingMode::ID);
 
 	if (not vm.count("delete"))
-		return tag_files(settings.db, mode, vm, tags);
+		return tag_files(settings.backend_plugin.backend(), mode, vm, tags);
 	else
-		return delete_tags(settings.db, mode, vm, tags);
+		return delete_tags(settings.backend_plugin.backend(), mode, vm, tags);
 }

From 3927f945ca73481508de46d038b6d29813b56714 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 27 May 2016 21:49:50 +0200
Subject: [PATCH 014/170] Move postgresql header files to the src directory

They are private, and anyways no client needs to include anything at all
from the various backends.
---
 include/backends/postgresql/db/settings.hpp   | 34 -------------------
 src/backends/postgresql/CMakeLists.txt        |  3 --
 .../backends/postgresql}/dbsource.hpp         |  0
 .../db => src/backends/postgresql}/delete.hpp |  0
 .../db => src/backends/postgresql}/locate.hpp |  0
 .../db => src/backends/postgresql}/scan.hpp   |  0
 .../db => src/backends/postgresql}/tag.hpp    |  0
 7 files changed, 37 deletions(-)
 delete mode 100644 include/backends/postgresql/db/settings.hpp
 rename {include/backends/postgresql/db => src/backends/postgresql}/dbsource.hpp (100%)
 rename {include/backends/postgresql/db => src/backends/postgresql}/delete.hpp (100%)
 rename {include/backends/postgresql/db => src/backends/postgresql}/locate.hpp (100%)
 rename {include/backends/postgresql/db => src/backends/postgresql}/scan.hpp (100%)
 rename {include/backends/postgresql/db => src/backends/postgresql}/tag.hpp (100%)

diff --git a/include/backends/postgresql/db/settings.hpp b/include/backends/postgresql/db/settings.hpp
deleted file mode 100644
index 3f384b2..0000000
--- a/include/backends/postgresql/db/settings.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef idC895D12FEB324387A37FF631E0C09560
-#define idC895D12FEB324387A37FF631E0C09560
-
-#include <string>
-#include <cstdint>
-
-namespace dindb {
-	struct Settings {
-		std::string address;
-		std::string username;
-		std::string password;
-		std::string dbname;
-		uint16_t port;
-	};
-} //namespace dindb
-
-#endif
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index cdf8915..bd84007 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -9,9 +9,6 @@ add_library(${PROJECT_NAME} SHARED
 	backend_postgresql.cpp
 )
 
-target_include_directories(${PROJECT_NAME}
-	PUBLIC ${DINDEXER_PUB_INCLUDE_DIR}/backends/postgresql
-)
 target_include_directories(${PROJECT_NAME} SYSTEM
 	PUBLIC ${Boost_INCLUDE_DIRS}
 )
diff --git a/include/backends/postgresql/db/dbsource.hpp b/src/backends/postgresql/dbsource.hpp
similarity index 100%
rename from include/backends/postgresql/db/dbsource.hpp
rename to src/backends/postgresql/dbsource.hpp
diff --git a/include/backends/postgresql/db/delete.hpp b/src/backends/postgresql/delete.hpp
similarity index 100%
rename from include/backends/postgresql/db/delete.hpp
rename to src/backends/postgresql/delete.hpp
diff --git a/include/backends/postgresql/db/locate.hpp b/src/backends/postgresql/locate.hpp
similarity index 100%
rename from include/backends/postgresql/db/locate.hpp
rename to src/backends/postgresql/locate.hpp
diff --git a/include/backends/postgresql/db/scan.hpp b/src/backends/postgresql/scan.hpp
similarity index 100%
rename from include/backends/postgresql/db/scan.hpp
rename to src/backends/postgresql/scan.hpp
diff --git a/include/backends/postgresql/db/tag.hpp b/src/backends/postgresql/tag.hpp
similarity index 100%
rename from include/backends/postgresql/db/tag.hpp
rename to src/backends/postgresql/tag.hpp

From c009c07c9d21e6c47d28d3fa39d6a38f7015bacc Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 27 May 2016 21:50:09 +0200
Subject: [PATCH 015/170] Temporarily disable broken stuff

---
 CMakeLists.txt                         | 10 +++++-----
 src/backends/postgresql/CMakeLists.txt |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8149f6f..a636901 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,11 +132,11 @@ add_subdirectory(src/backends)
 
 #Actions
 add_subdirectory(src/main)
-add_subdirectory(src/scan)
-add_subdirectory(src/delete)
-add_subdirectory(src/query)
-add_subdirectory(src/locate)
-add_subdirectory(src/navigate)
+#add_subdirectory(src/scan)
+#add_subdirectory(src/delete)
+#add_subdirectory(src/query)
+#add_subdirectory(src/locate)
+#add_subdirectory(src/navigate)
 add_subdirectory(src/tag)
 
 #Tests
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index bd84007..6b840e4 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -2,10 +2,10 @@ project(${bare_name}-backend-postgresql CXX)
 
 add_library(${PROJECT_NAME} SHARED
 	tag.cpp
-	delete.cpp
-	locate.cpp
-	scan.cpp
-	dbsource.cpp
+	#delete.cpp
+	#locate.cpp
+	#scan.cpp
+	#dbsource.cpp
 	backend_postgresql.cpp
 )
 

From df2e04a02920fec5c2ba45ed779c44db02643341 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 27 May 2016 21:51:15 +0200
Subject: [PATCH 016/170] Fix tagging.

Tag functions are now fully available through the new plugin.
---
 include/backends/db_backend.hpp               | 12 +--
 .../postgresql/backend_postgresql.cpp         | 29 +++---
 .../postgresql/backend_postgresql.hpp         | 12 +--
 src/backends/postgresql/tag.cpp               | 90 +++++++++----------
 src/backends/postgresql/tag.hpp               | 23 ++---
 5 files changed, 79 insertions(+), 87 deletions(-)

diff --git a/include/backends/db_backend.hpp b/include/backends/db_backend.hpp
index cc79b43..9744ff0 100644
--- a/include/backends/db_backend.hpp
+++ b/include/backends/db_backend.hpp
@@ -36,12 +36,12 @@ namespace dindb {
 		Backend ( void ) = default;
 		virtual ~Backend ( void ) noexcept = default;
 
-		virtual void tag_files ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const = 0;
-		virtual void tag_files ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const = 0;
-		virtual void delete_tags ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const = 0;
-		virtual void delete_tags ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const = 0;
-		virtual void delete_all_tags ( const std::vector<FileIDType>& parFiles, GroupIDType parSet ) const = 0;
-		virtual void delete_all_tags ( const std::vector<std::string>& parRegexes, GroupIDType parSet ) const = 0;
+		virtual void tag_files ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) = 0;
+		virtual void tag_files ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) = 0;
+		virtual void delete_tags ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) = 0;
+		virtual void delete_tags ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) = 0;
+		virtual void delete_all_tags ( const std::vector<FileIDType>& parFiles, GroupIDType parSet ) = 0;
+		virtual void delete_all_tags ( const std::vector<std::string>& parRegexes, GroupIDType parSet ) = 0;
 
 	};
 } //namespace dindb
diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
index cab4487..f51d0b3 100644
--- a/src/backends/postgresql/backend_postgresql.cpp
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -17,6 +17,7 @@
 
 #include "backend_postgresql.hpp"
 #include "backends/exposed_functions.hpp"
+#include "tag.hpp"
 #include "pq/connection.hpp"
 #include <ciso646>
 #include <utility>
@@ -75,32 +76,28 @@ namespace dindb {
 		m_conn->disconnect();
 	}
 
-	void BackendPostgreSql::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) const {
-		if (InvalidGroupID != parSet) {
-			const std::string query =
-				"UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) ORDER BY 1) WHERE \"id\"=ANY($2) AND \"group_id\"=$3;";
-			m_conn->query(query, parTags, parFiles, parSet);
-		}
-		else {
-			const std::string query =
-				"UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) ORDER BY 1) WHERE \"id\"=ANY($2);";
-			m_conn->query(query, parTags, parFiles);
-		}
+	void BackendPostgreSql::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		dindb::tag_files(*m_conn, parFiles, parTags, parSet);
 	}
 
-	void BackendPostgreSql::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) const {
+	void BackendPostgreSql::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		dindb::tag_files(*m_conn, parRegexes, parTags, parSet);
 	}
 
-	void BackendPostgreSql::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) const {
+	void BackendPostgreSql::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		dindb::delete_tags(*m_conn, parFiles, parTags, parSet);
 	}
 
-	void BackendPostgreSql::delete_tags (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) const {
+	void BackendPostgreSql::delete_tags (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		dindb::delete_tags(*m_conn, parRegexes, parTags, parSet);
 	}
 
-	void BackendPostgreSql::delete_all_tags (const std::vector<FileIDType>& parFiles, GroupIDType parSet) const {
+	void BackendPostgreSql::delete_all_tags (const std::vector<FileIDType>& parFiles, GroupIDType parSet) {
+		dindb::delete_all_tags(*m_conn, parFiles, parSet);
 	}
 
-	void BackendPostgreSql::delete_all_tags (const std::vector<std::string>& parRegexes, GroupIDType parSet) const {
+	void BackendPostgreSql::delete_all_tags (const std::vector<std::string>& parRegexes, GroupIDType parSet) {
+		dindb::delete_all_tags(*m_conn, parRegexes, parSet);
 	}
 } //namespace dindb
 
diff --git a/src/backends/postgresql/backend_postgresql.hpp b/src/backends/postgresql/backend_postgresql.hpp
index bce0e7c..bc87c4a 100644
--- a/src/backends/postgresql/backend_postgresql.hpp
+++ b/src/backends/postgresql/backend_postgresql.hpp
@@ -34,12 +34,12 @@ namespace dindb {
 		BackendPostgreSql ( std::string&& parUser, std::string&& parPass, std::string&& parDB, std::string&& parAddr, uint16_t parPort );
 		virtual ~BackendPostgreSql ( void ) noexcept;
 
-		virtual void tag_files ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const override;
-		virtual void tag_files ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const override;
-		virtual void delete_tags ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const override;
-		virtual void delete_tags ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) const override;
-		virtual void delete_all_tags ( const std::vector<FileIDType>& parFiles, GroupIDType parSet ) const override;
-		virtual void delete_all_tags ( const std::vector<std::string>& parRegexes, GroupIDType parSet ) const override;
+		virtual void tag_files ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
+		virtual void tag_files ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
+		virtual void delete_tags ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
+		virtual void delete_tags ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
+		virtual void delete_all_tags ( const std::vector<FileIDType>& parFiles, GroupIDType parSet ) override;
+		virtual void delete_all_tags ( const std::vector<std::string>& parRegexes, GroupIDType parSet ) override;
 
 	private:
 		std::unique_ptr<pq::Connection> m_conn;
diff --git a/src/backends/postgresql/tag.cpp b/src/backends/postgresql/tag.cpp
index 79426b1..7f0e999 100644
--- a/src/backends/postgresql/tag.cpp
+++ b/src/backends/postgresql/tag.cpp
@@ -15,141 +15,135 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "db/tag.hpp"
-#include "db/settings.hpp"
+#include "tag.hpp"
 #include "pq/connection.hpp"
 #include <ciso646>
+#include <cassert>
 
 namespace dindb {
-	void tag_files (const Settings& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
-		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
-		conn.connect();
+	void tag_files (pq::Connection& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		assert(parDB.is_connected());
 
-		if (parSet.is_valid) {
+		if (InvalidGroupID != parSet) {
 			const std::string query =
 				"UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) ORDER BY 1) WHERE \"id\"=ANY($2) AND \"group_id\"=$3;";
-			conn.query(query, parTags, parFiles, parSet.group_id);
+			parDB.query(query, parTags, parFiles, parSet);
 		}
 		else {
 			const std::string query =
 				"UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) ORDER BY 1) WHERE \"id\"=ANY($2);";
-			conn.query(query, parTags, parFiles);
+			parDB.query(query, parTags, parFiles);
 		}
 	}
 
-	void tag_files (const Settings& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
-		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
-		conn.connect();
+	void tag_files (pq::Connection& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		assert(parDB.is_connected());
 
-		if (parSet.is_valid) {
+		if (InvalidGroupID != parSet) {
 			if (parRegexes.size() == 1) {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) ORDER BY 1) WHERE \"group_id\"=$2 AND \"path\" ~ $3;";
-				conn.query(query, parTags, parSet.group_id, parRegexes.front());
+				parDB.query(query, parTags, parSet, parRegexes.front());
 			}
 			else if (parRegexes.size() > 1) {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) ORDER BY 1) WHERE \"group_id\"=$2 AND \"path\" ~ ANY($3);";
-				conn.query(query, parTags, parSet.group_id, parRegexes);
+				parDB.query(query, parTags, parSet, parRegexes);
 			}
 			else if (parRegexes.size() == 0) {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) WHERE \"group_id\"=$2 ORDER BY 1);";
-				conn.query(query, parTags, parSet.group_id);
+				parDB.query(query, parTags, parSet);
 			}
 		}
 		else {
 			if (parRegexes.size() == 1) {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) ORDER BY 1) WHERE \"path\" ~ $2;";
-				conn.query(query, parTags, parRegexes.front());
+				parDB.query(query, parTags, parRegexes.front());
 			}
 			else if (parRegexes.size() > 1) {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) ORDER BY 1) WHERE \"path\" ~ ANY($2);";
-				conn.query(query, parTags, parRegexes);
+				parDB.query(query, parTags, parRegexes);
 			}
 			else if (parRegexes.size() == 0) {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY(SELECT DISTINCT UNNEST(\"tags\" || $1) ORDER BY 1);";
-				conn.query(query, parTags);
+				parDB.query(query, parTags);
 			}
 		}
 	}
 
-	void delete_tags (const Settings& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
-		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
-		conn.connect();
+	void delete_tags (pq::Connection& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		assert(parDB.is_connected());
 
 		if (parTags.size() == 1) {
-			if (parSet.is_valid) {
+			if (InvalidGroupID != parSet) {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY_REMOVE(tags, $1) WHERE \"id\" = ANY($2) AND \"group_id\" = $3;";
-				conn.query(query, parTags.front(), parFiles, parSet.group_id);
+				parDB.query(query, parTags.front(), parFiles, parSet);
 			}
 			else {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY_REMOVE(tags, $1) WHERE \"id\" = ANY($2);";
-				conn.query(query, parTags.front(), parFiles);
+				parDB.query(query, parTags.front(), parFiles);
 			}
 		}
 		else {
-			if (parSet.is_valid) {
+			if (InvalidGroupID != parSet) {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY(SELECT UNNEST(\"tags\") EXCEPT SELECT UNNEST($1)) WHERE \"id\" = ANY($2) AND \"group_id\" = $3;";
-				conn.query(query, parTags, parFiles, parSet.group_id);
+				parDB.query(query, parTags, parFiles, parSet);
 			}
 			else {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY(SELECT UNNEST(\"tags\") EXCEPT SELECT UNNEST($1)) WHERE \"id\" = ANY($2);";
-				conn.query(query, parTags, parFiles);
+				parDB.query(query, parTags, parFiles);
 			}
 		}
 	}
 
-	void delete_tags (const Settings& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet) {
-		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
-		conn.connect();
+	void delete_tags (pq::Connection& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		assert(parDB.is_connected());
 
 		if (parTags.size() == 1) {
-			if (parSet.is_valid) {
+			if (InvalidGroupID != parSet) {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY_REMOVE(tags, $1) WHERE  \"group_id\" = $3 AND \"path\" ~ ANY($3);";
-				conn.query(query, parTags.front(), parSet.group_id, parRegexes);
+				parDB.query(query, parTags.front(), parSet, parRegexes);
 			}
 			else {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY_REMOVE(tags, $1) WHERE \"path\" ~ ANY($2);";
-				conn.query(query, parTags.front(), parRegexes);
+				parDB.query(query, parTags.front(), parRegexes);
 			}
 		}
 		else {
-			if (parSet.is_valid) {
+			if (InvalidGroupID != parSet) {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY(SELECT UNNEST(\"tags\") EXCEPT SELECT UNNEST($1)) WHERE \"group_id\" = $2 AND \"path\" ~ ANY($3);";
-				conn.query(query, parTags, parSet.group_id, parRegexes);
+				parDB.query(query, parTags, parSet, parRegexes);
 			}
 			else {
 				const std::string query = "UPDATE \"files\" SET \"tags\" = ARRAY(SELECT UNNEST(\"tags\") EXCEPT SELECT UNNEST($1)) WHERE \"path\" = ANY($2);";
-				conn.query(query, parTags, parRegexes);
+				parDB.query(query, parTags, parRegexes);
 			}
 		}
 	}
 
-	void delete_all_tags (const Settings& parDB, const std::vector<uint64_t>& parFiles, OwnerSetInfo parSet) {
-		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
-		conn.connect();
+	void delete_all_tags (pq::Connection& parDB, const std::vector<uint64_t>& parFiles, GroupIDType parSet) {
+		assert(parDB.is_connected());
 
-		if (parSet.is_valid) {
+		if (InvalidGroupID != parSet) {
 			const std::string query =
 				"UPDATE \"files\" SET \"tags\" = '{}' WHERE \"id\"=ANY($1) AND \"group_id\"=$2;";
-			conn.query(query, parFiles, parSet.group_id);
+			parDB.query(query, parFiles, parSet);
 		}
 		else {
 			const std::string query =
 				"UPDATE \"files\" SET \"tags\" = '{}' WHERE \"id\"=ANY($1);";
-			conn.query(query, parFiles);
+			parDB.query(query, parFiles);
 		}
 	}
 
-	void delete_all_tags (const Settings& parDB, const std::vector<std::string>& parRegexes, OwnerSetInfo parSet) {
-		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
-		conn.connect();
+	void delete_all_tags (pq::Connection& parDB, const std::vector<std::string>& parRegexes, GroupIDType parSet) {
+		assert(parDB.is_connected());
 
-		if (parSet.is_valid) {
+		if (InvalidGroupID != parSet) {
 			const std::string query = "UPDATE \"files\" SET \"tags\" = '{}' WHERE \"group_id\"=$1 AND \"path\" ~ ANY($2);";
-			conn.query(query, parSet.group_id, parRegexes);
+			parDB.query(query, parSet, parRegexes);
 		}
 		else {
 			const std::string query = "UPDATE \"files\" SET \"tags\" = '{}' WHERE \"path\" ~ ANY($2);";
-			conn.query(query, parRegexes);
+			parDB.query(query, parRegexes);
 		}
 	}
 } //namespace dindb
diff --git a/src/backends/postgresql/tag.hpp b/src/backends/postgresql/tag.hpp
index 509f6d3..ed5b7e4 100644
--- a/src/backends/postgresql/tag.hpp
+++ b/src/backends/postgresql/tag.hpp
@@ -18,25 +18,26 @@
 #ifndef idE1E1650A8CAA4949BD6D4D58BF2599F5
 #define idE1E1650A8CAA4949BD6D4D58BF2599F5
 
+#include "backends/db_backend.hpp"
 #include <vector>
 #include <boost/utility/string_ref.hpp>
 #include <cstdint>
+#include <pq/connection.hpp>
+
+namespace pq {
+	class Connection;
+} //namespace pq
 
 namespace dindb {
 	struct Settings;
 
-	struct OwnerSetInfo {
-		uint32_t group_id;
-		bool is_valid;
-	};
+	void tag_files ( pq::Connection& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet );
+	void tag_files ( pq::Connection& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet );
 
-	void tag_files ( const Settings& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
-	void tag_files ( const Settings& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
-
-	void delete_tags ( const Settings& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
-	void delete_tags ( const Settings& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, OwnerSetInfo parSet );
-	void delete_all_tags ( const Settings& parDB, const std::vector<uint64_t>& parFiles, OwnerSetInfo parSet );
-	void delete_all_tags ( const Settings& parDB, const std::vector<std::string>& parRegexes, OwnerSetInfo parSet );
+	void delete_tags ( pq::Connection& parDB, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet );
+	void delete_tags ( pq::Connection& parDB, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet );
+	void delete_all_tags ( pq::Connection& parDB, const std::vector<uint64_t>& parFiles, GroupIDType parSet );
+	void delete_all_tags ( pq::Connection& parDB, const std::vector<std::string>& parRegexes, GroupIDType parSet );
 } //namespace dindb
 
 #endif

From 8f51f82abc5bf5b16f01bd34fd110f988bda1471 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 31 May 2016 10:30:16 +0200
Subject: [PATCH 017/170] Re-enable delete subcommand

---
 CMakeLists.txt                                 |  2 +-
 include/backends/db_backend.hpp                |  5 +++++
 src/backends/postgresql/CMakeLists.txt         |  2 +-
 src/backends/postgresql/backend_postgresql.cpp |  5 +++++
 src/backends/postgresql/backend_postgresql.hpp |  2 ++
 src/backends/postgresql/delete.cpp             | 14 +++++++-------
 src/backends/postgresql/delete.hpp             |  9 ++++++---
 src/delete/main.cpp                            |  6 ++++--
 8 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a636901..d2711e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,7 @@ add_subdirectory(src/backends)
 #Actions
 add_subdirectory(src/main)
 #add_subdirectory(src/scan)
-#add_subdirectory(src/delete)
+add_subdirectory(src/delete)
 #add_subdirectory(src/query)
 #add_subdirectory(src/locate)
 #add_subdirectory(src/navigate)
diff --git a/include/backends/db_backend.hpp b/include/backends/db_backend.hpp
index 9744ff0..aadb962 100644
--- a/include/backends/db_backend.hpp
+++ b/include/backends/db_backend.hpp
@@ -23,10 +23,14 @@
 #include <string>
 #include <vector>
 #include <boost/utility/string_ref.hpp>
+#include <map>
+#include <functional>
 
 namespace dindb {
 	using GroupIDType = uint32_t;
 	using FileIDType = uint64_t;
+	using IDDescMap = std::map<uint32_t, std::string>;
+	using ConfirmDeleCallback = std::function<bool(const IDDescMap&)>;
 
 	constexpr const GroupIDType InvalidGroupID = 0;
 	constexpr const FileIDType InvalidFileID = 0;
@@ -43,6 +47,7 @@ namespace dindb {
 		virtual void delete_all_tags ( const std::vector<FileIDType>& parFiles, GroupIDType parSet ) = 0;
 		virtual void delete_all_tags ( const std::vector<std::string>& parRegexes, GroupIDType parSet ) = 0;
 
+		virtual void delete_group ( const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf ) = 0;
 	};
 } //namespace dindb
 
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index 6b840e4..8196219 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -2,7 +2,7 @@ project(${bare_name}-backend-postgresql CXX)
 
 add_library(${PROJECT_NAME} SHARED
 	tag.cpp
-	#delete.cpp
+	delete.cpp
 	#locate.cpp
 	#scan.cpp
 	#dbsource.cpp
diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
index f51d0b3..7de7b4a 100644
--- a/src/backends/postgresql/backend_postgresql.cpp
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -18,6 +18,7 @@
 #include "backend_postgresql.hpp"
 #include "backends/exposed_functions.hpp"
 #include "tag.hpp"
+#include "delete.hpp"
 #include "pq/connection.hpp"
 #include <ciso646>
 #include <utility>
@@ -99,6 +100,10 @@ namespace dindb {
 	void BackendPostgreSql::delete_all_tags (const std::vector<std::string>& parRegexes, GroupIDType parSet) {
 		dindb::delete_all_tags(*m_conn, parRegexes, parSet);
 	}
+
+	void BackendPostgreSql::delete_group (const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
+		dindb::delete_group_from_db(*m_conn, parIDs, parConf);
+	}
 } //namespace dindb
 
 extern "C" dindb::Backend* dindexer_create_backend (const YAML::Node* parConfig) {
diff --git a/src/backends/postgresql/backend_postgresql.hpp b/src/backends/postgresql/backend_postgresql.hpp
index bc87c4a..15cb0e4 100644
--- a/src/backends/postgresql/backend_postgresql.hpp
+++ b/src/backends/postgresql/backend_postgresql.hpp
@@ -41,6 +41,8 @@ namespace dindb {
 		virtual void delete_all_tags ( const std::vector<FileIDType>& parFiles, GroupIDType parSet ) override;
 		virtual void delete_all_tags ( const std::vector<std::string>& parRegexes, GroupIDType parSet ) override;
 
+		virtual void delete_group ( const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf ) override;
+
 	private:
 		std::unique_ptr<pq::Connection> m_conn;
 	};
diff --git a/src/backends/postgresql/delete.cpp b/src/backends/postgresql/delete.cpp
index f75c54a..a87fda4 100644
--- a/src/backends/postgresql/delete.cpp
+++ b/src/backends/postgresql/delete.cpp
@@ -15,8 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "db/delete.hpp"
-#include "db/settings.hpp"
+#include "delete.hpp"
 #include "pq/connection.hpp"
 #include "helpers/infix_iterator.hpp"
 #include <sstream>
@@ -26,6 +25,7 @@
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/lexical_cast.hpp>
+#include <cassert>
 
 namespace dindb {
 	namespace {
@@ -50,10 +50,10 @@ namespace dindb {
 		}
 	} //unnamed namespace
 
-	void delete_group_from_db (const Settings& parDB, const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
-		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
-		conn.connect();
-		const auto dele_ids = fetch_existing_ids(conn, parIDs);
+	void delete_group_from_db (pq::Connection& parDB, const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
+		assert(parDB.is_connected());
+
+		const auto dele_ids = fetch_existing_ids(parDB, parIDs);
 		if (dele_ids.empty()) {
 			return;
 		}
@@ -70,6 +70,6 @@ namespace dindb {
 		boost::copy(dele_ids | boost::adaptors::map_keys, infix_ostream_iterator<uint32_t>(oss, " OR \"id\"="));
 		oss << ";\nCOMMIT;";
 
-		conn.query(oss.str());
+		parDB.query(oss.str());
 	}
 } //namespace dindb
diff --git a/src/backends/postgresql/delete.hpp b/src/backends/postgresql/delete.hpp
index 90d2c6a..341cc47 100644
--- a/src/backends/postgresql/delete.hpp
+++ b/src/backends/postgresql/delete.hpp
@@ -18,19 +18,22 @@
 #ifndef idB070B86E0E4047B1AF4144DEF2759F3C
 #define idB070B86E0E4047B1AF4144DEF2759F3C
 
+#include "backends/db_backend.hpp"
 #include <functional>
 #include <vector>
 #include <string>
 #include <cstdint>
 #include <map>
 
-namespace dindb {
-	struct Settings;
+namespace pq {
+	class Connection;
+} //namespace pq
 
+namespace dindb {
 	using IDDescMap = std::map<uint32_t, std::string>;
 	using ConfirmDeleCallback = std::function<bool(const IDDescMap&)>;
 
-	void delete_group_from_db ( const Settings& parDB, const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf );
+	void delete_group_from_db ( pq::Connection& parDB, const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf );
 } //namespace dindb
 
 #endif
diff --git a/src/delete/main.cpp b/src/delete/main.cpp
index e3e17bf..0c42fb2 100644
--- a/src/delete/main.cpp
+++ b/src/delete/main.cpp
@@ -18,7 +18,6 @@
 #include "commandline.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexerConfig.h"
-#include "db/delete.hpp"
 #include <iostream>
 #include <ciso646>
 #include <ios>
@@ -69,6 +68,9 @@ int main (int parArgc, char* parArgv[]) {
 			return 1;
 		}
 	}
+	//TODO: throw if plugin loading failed
+	assert(settings.backend_plugin.name() == settings.backend_name);
+	assert(settings.backend_plugin.is_loaded());
 
 	if (not vm.count("groupid")) {
 		std::cerr << "No IDs specified\n";
@@ -77,7 +79,7 @@ int main (int parArgc, char* parArgv[]) {
 
 	const auto ids = vm["groupid"].as<std::vector<uint32_t>>();
 	auto confirm_func = (vm.count("confirm") ? &always_delete : &confirm_delete);
-	dindb::delete_group_from_db(settings.db, ids, confirm_func);
+	settings.backend_plugin.backend().delete_group(ids, confirm_func);
 	return 0;
 }
 

From 3608d7b76c39d903d080c4c4aa04a985c0399cd4 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 31 May 2016 20:03:31 +0200
Subject: [PATCH 018/170] Re-enable scan in the postgre plugin.

This also adds a public dependency to machinery in the header-only
backend project. This is because the backend does need functionality
from machinery, such as FileRecordData and TigerHash.
---
 CMakeLists.txt                                |  2 +-
 include/backends/db_backend.hpp               |  4 +++
 src/backends/CMakeLists.txt                   |  5 ++--
 src/backends/postgresql/CMakeLists.txt        |  2 +-
 .../postgresql/backend_postgresql.cpp         |  9 ++++++
 .../postgresql/backend_postgresql.hpp         |  3 ++
 src/backends/postgresql/scan.cpp              | 28 +++++++++----------
 src/backends/postgresql/scan.hpp              |  8 ++++--
 src/scan/main.cpp                             | 14 ++++++----
 9 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2711e8..575583d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,7 +132,7 @@ add_subdirectory(src/backends)
 
 #Actions
 add_subdirectory(src/main)
-#add_subdirectory(src/scan)
+add_subdirectory(src/scan)
 add_subdirectory(src/delete)
 #add_subdirectory(src/query)
 #add_subdirectory(src/locate)
diff --git a/include/backends/db_backend.hpp b/include/backends/db_backend.hpp
index aadb962..c2856de 100644
--- a/include/backends/db_backend.hpp
+++ b/include/backends/db_backend.hpp
@@ -19,6 +19,7 @@
 #define id7506CA9825454B80856154ACFE8A9DE2
 
 #include "backends/backend_loader.hpp"
+#include "dindexer-machinery/recorddata.hpp"
 #include <cstdint>
 #include <string>
 #include <vector>
@@ -48,6 +49,9 @@ namespace dindb {
 		virtual void delete_all_tags ( const std::vector<std::string>& parRegexes, GroupIDType parSet ) = 0;
 
 		virtual void delete_group ( const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf ) = 0;
+
+		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature ) = 0;
+		virtual bool search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash ) = 0;
 	};
 } //namespace dindb
 
diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt
index eae379f..0ac6613 100644
--- a/src/backends/CMakeLists.txt
+++ b/src/backends/CMakeLists.txt
@@ -13,8 +13,9 @@ target_include_directories(${PROJECT_NAME} SYSTEM
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
-	PUBLIC ${YAMLCPP_LIBRARY}
-	PUBLIC dl
+	INTERFACE ${YAMLCPP_LIBRARY}
+	INTERFACE dl
+	INTERFACE ${bare_name}-machinery
 )
 
 #install(TARGETS ${PROJECT_NAME}
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index 8196219..bb3041c 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -4,7 +4,7 @@ add_library(${PROJECT_NAME} SHARED
 	tag.cpp
 	delete.cpp
 	#locate.cpp
-	#scan.cpp
+	scan.cpp
 	#dbsource.cpp
 	backend_postgresql.cpp
 )
diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
index 7de7b4a..fbabb9c 100644
--- a/src/backends/postgresql/backend_postgresql.cpp
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -19,6 +19,7 @@
 #include "backends/exposed_functions.hpp"
 #include "tag.hpp"
 #include "delete.hpp"
+#include "scan.hpp"
 #include "pq/connection.hpp"
 #include <ciso646>
 #include <utility>
@@ -104,6 +105,14 @@ namespace dindb {
 	void BackendPostgreSql::delete_group (const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
 		dindb::delete_group_from_db(*m_conn, parIDs, parConf);
 	}
+
+	void BackendPostgreSql::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature) {
+		dindb::write_to_db(*m_conn, parData, parSetData, parSignature);
+	}
+
+	bool BackendPostgreSql::search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) {
+		return dindb::read_from_db(parItem, parSet, *m_conn, parHash);
+	}
 } //namespace dindb
 
 extern "C" dindb::Backend* dindexer_create_backend (const YAML::Node* parConfig) {
diff --git a/src/backends/postgresql/backend_postgresql.hpp b/src/backends/postgresql/backend_postgresql.hpp
index 15cb0e4..1160ef1 100644
--- a/src/backends/postgresql/backend_postgresql.hpp
+++ b/src/backends/postgresql/backend_postgresql.hpp
@@ -43,6 +43,9 @@ namespace dindb {
 
 		virtual void delete_group ( const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf ) override;
 
+		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature );
+		virtual bool search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash );
+
 	private:
 		std::unique_ptr<pq::Connection> m_conn;
 	};
diff --git a/src/backends/postgresql/scan.cpp b/src/backends/postgresql/scan.cpp
index 94fe4a8..fd533ed 100644
--- a/src/backends/postgresql/scan.cpp
+++ b/src/backends/postgresql/scan.cpp
@@ -15,8 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "db/scan.hpp"
-#include "db/settings.hpp"
+#include "scan.hpp"
 #include "pq/connection.hpp"
 #include "dindexer-machinery/recorddata.hpp"
 #include <string>
@@ -27,20 +26,20 @@
 #include <memory>
 #include <boost/utility/string_ref.hpp>
 #include <chrono>
+#include <cassert>
 
 namespace dindb {
 	namespace {
 	} //unnamed namespace
 
-	bool read_from_db (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const Settings& parDB, const mchlib::TigerHash& parHash) {
+	bool read_from_db (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, pq::Connection& parDB, const mchlib::TigerHash& parHash) {
 		using boost::lexical_cast;
 
-		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
-		conn.connect();
+		assert(parDB.is_connected());
 
 		uint32_t group_id;
 		{
-			auto resultset = conn.query(
+			auto resultset = parDB.query(
 				"SELECT path,level,group_id,is_directory,is_symlink,size FROM files WHERE hash=$1 LIMIT 1;",
 				tiger_to_string(parHash, true)
 			);
@@ -64,7 +63,7 @@ namespace dindb {
 		}
 
 		{
-			auto resultset = conn.query(
+			auto resultset = parDB.query(
 				"SELECT \"desc\",\"type\",\"disk_number\" FROM sets WHERE \"id\"=$1;",
 				group_id
 			);
@@ -82,21 +81,20 @@ namespace dindb {
 		return true;
 	}
 
-	void write_to_db (const Settings& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature) {
+	void write_to_db (pq::Connection& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature) {
 		using std::chrono::system_clock;
 		using boost::lexical_cast;
 
+		assert(parDB.is_connected());
+
 		if (parData.empty()) {
 			return;
 		}
 
-		pq::Connection conn(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
-		conn.connect();
-
-		conn.query("BEGIN;");
+		parDB.query("BEGIN;");
 		uint32_t new_group_id;
 		{
-			auto id_res = conn.query("INSERT INTO \"sets\" "
+			auto id_res = parDB.query("INSERT INTO \"sets\" "
 				"(\"desc\",\"type\",\"app_name\""
 				",\"content_type\") "
 				"VALUES ($1, $2, $3, $4) RETURNING \"id\";",
@@ -126,7 +124,7 @@ namespace dindb {
 
 			const auto& itm = parData[z];
 			assert(itm.path().data());
-			conn.query(query,
+			parDB.query(query,
 				(itm.path().empty() ? empty_path_string : itm.path()),
 				tiger_to_string(itm.hash),
 				itm.level,
@@ -142,6 +140,6 @@ namespace dindb {
 				itm.mime_charset()
 			);
 		}
-		conn.query("COMMIT;");
+		parDB.query("COMMIT;");
 	}
 } //namespace dindb
diff --git a/src/backends/postgresql/scan.hpp b/src/backends/postgresql/scan.hpp
index 877e1e0..72521d7 100644
--- a/src/backends/postgresql/scan.hpp
+++ b/src/backends/postgresql/scan.hpp
@@ -29,11 +29,15 @@ namespace mchlib {
 	struct TigerHash;
 } //namespace mchlib
 
+namespace pq {
+	class Connection;
+} //namespace pq
+
 namespace dindb {
 	struct Settings;;
 
-	void write_to_db ( const Settings& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature );
-	bool read_from_db ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const Settings& parDB, const mchlib::TigerHash& parHash );
+	void write_to_db ( pq::Connection& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature );
+	bool read_from_db ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, pq::Connection& parDB, const mchlib::TigerHash& parHash );
 } //namespace dindb
 
 #endif
diff --git a/src/scan/main.cpp b/src/scan/main.cpp
index a948c07..d739066 100644
--- a/src/scan/main.cpp
+++ b/src/scan/main.cpp
@@ -25,7 +25,6 @@
 #include "dindexer-common/common_info.hpp"
 #include "dindexer-common/settings.hpp"
 #include "commandline.hpp"
-#include "db/scan.hpp"
 #include "dindexer-machinery/scantask/dirtree.hpp"
 #include "dindexer-machinery/scantask/mediatype.hpp"
 #include "dindexer-machinery/scantask/hashing.hpp"
@@ -41,7 +40,7 @@
 #endif
 
 namespace {
-	bool add_to_db ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, const dindb::Settings& parDBSettings, bool parForce=false );
+	bool add_to_db ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, dindb::Backend& parDB, bool parForce=false );
 #if defined(WITH_PROGRESS_FEEDBACK)
 	void print_progress ( const boost::string_ref parPath, uint64_t parFileBytes, uint64_t parTotalBytes, uint32_t parFileNum, std::size_t& parClearCount );
 #endif
@@ -81,6 +80,9 @@ int main (int parArgc, char* parArgv[]) {
 			return 1;
 		}
 	}
+	//TODO: throw if plugin loading failed
+	assert(settings.backend_plugin.name() == settings.backend_name);
+	assert(settings.backend_plugin.is_loaded());
 
 	bool ignore_read_errors = (vm.count("ignore-errors") > 0);
 	const std::string search_path(vm["search-path"].as<std::string>());
@@ -104,7 +106,7 @@ int main (int parArgc, char* parArgv[]) {
 	);
 #endif
 
-	const bool added_to_db = add_to_db(filerecdata->get_or_create(), setrecdata->get_or_create(), settings.db);
+	const bool added_to_db = add_to_db(filerecdata->get_or_create(), setrecdata->get_or_create(), settings.backend_plugin.backend());
 #if defined(WITH_PROGRESS_FEEDBACK)
 		std::cout << '\n';
 #endif
@@ -115,7 +117,7 @@ int main (int parArgc, char* parArgv[]) {
 }
 
 namespace {
-	bool add_to_db (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, const dindb::Settings& parDBSettings, bool parForce) {
+	bool add_to_db (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, dindb::Backend& parDB, bool parForce) {
 		using mchlib::FileRecordData;
 		using mchlib::SetRecordDataFull;
 		using mchlib::SetRecordData;
@@ -124,7 +126,7 @@ namespace {
 			const auto& first_hash = parData.front().hash;
 			FileRecordData itm;
 			SetRecordDataFull set;
-			const bool already_in_db = dindb::read_from_db(itm, set, parDBSettings, first_hash);
+			const bool already_in_db = parDB.search_file_by_hash(itm, set, first_hash);
 			if (already_in_db) {
 				return false;
 			}
@@ -134,7 +136,7 @@ namespace {
 		const auto app_signature = dinlib::dindexer_signature();
 		const auto lib_signature = mchlib::lib_signature();
 		const std::string signature = std::string(app_signature.data(), app_signature.size()) + "/" + std::string(lib_signature.data(), lib_signature.size());
-		dindb::write_to_db(parDBSettings, parData, set_data, signature);
+		parDB.write_files(parData, set_data, signature);
 		return true;
 	}
 

From 470738fc1b6bb2a4e8659cd7b51d1df597edfb6d Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 1 Jun 2016 10:08:56 +0200
Subject: [PATCH 019/170] Fix typo - correct type is 16 bit int, not 64

---
 include/dindexer-machinery/recorddata.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/dindexer-machinery/recorddata.hpp b/include/dindexer-machinery/recorddata.hpp
index 54b1a77..3afc127 100644
--- a/include/dindexer-machinery/recorddata.hpp
+++ b/include/dindexer-machinery/recorddata.hpp
@@ -34,7 +34,7 @@ namespace mchlib {
 		typedef boost::flyweight<std::string, boost::flyweights::no_locking, MimeStringTag> mime_string;
 
 		FileRecordData ( void ) = default;
-		FileRecordData ( const char* parPath, std::time_t parATime, std::time_t parMTime, uint64_t parLevel, bool parIsDir, bool parIsSymLink ) :
+		FileRecordData ( const char* parPath, std::time_t parATime, std::time_t parMTime, uint16_t parLevel, bool parIsDir, bool parIsSymLink ) :
 			hash {},
 			abs_path(parPath),
 			mime_full(),

From 780cd9b0cad7bce773894d640b3aed5e36a84c5b Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 1 Jun 2016 10:27:09 +0200
Subject: [PATCH 020/170] Re-enable locate in the postgre plugin.

---
 CMakeLists.txt                                |  2 +-
 include/backends/db_backend.hpp               | 27 ++++++++++++-
 src/backends/postgresql/CMakeLists.txt        |  2 +-
 .../postgresql/backend_postgresql.cpp         | 17 ++++++++
 .../postgresql/backend_postgresql.hpp         |  5 +++
 src/backends/postgresql/locate.cpp            | 39 +++++++------------
 src/backends/postgresql/locate.hpp            | 33 ++++------------
 src/locate/main.cpp                           | 11 ++++--
 8 files changed, 80 insertions(+), 56 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 575583d..c4b7e0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,7 +135,7 @@ add_subdirectory(src/main)
 add_subdirectory(src/scan)
 add_subdirectory(src/delete)
 #add_subdirectory(src/query)
-#add_subdirectory(src/locate)
+add_subdirectory(src/locate)
 #add_subdirectory(src/navigate)
 add_subdirectory(src/tag)
 
diff --git a/include/backends/db_backend.hpp b/include/backends/db_backend.hpp
index c2856de..c3e1527 100644
--- a/include/backends/db_backend.hpp
+++ b/include/backends/db_backend.hpp
@@ -19,7 +19,6 @@
 #define id7506CA9825454B80856154ACFE8A9DE2
 
 #include "backends/backend_loader.hpp"
-#include "dindexer-machinery/recorddata.hpp"
 #include <cstdint>
 #include <string>
 #include <vector>
@@ -27,15 +26,36 @@
 #include <map>
 #include <functional>
 
+namespace mchlib {
+	struct TigerHash;
+	struct FileRecordData;
+	struct SetRecordData;
+	struct SetRecordDataFull;
+} //namespace mchlib
+
 namespace dindb {
 	using GroupIDType = uint32_t;
 	using FileIDType = uint64_t;
 	using IDDescMap = std::map<uint32_t, std::string>;
 	using ConfirmDeleCallback = std::function<bool(const IDDescMap&)>;
+	using TagList = std::vector<boost::string_ref>;
 
 	constexpr const GroupIDType InvalidGroupID = 0;
 	constexpr const FileIDType InvalidFileID = 0;
 
+	struct LocatedItem {
+		std::string path;
+		FileIDType id;
+		GroupIDType group_id;
+	};
+
+	struct LocatedSet {
+		std::string desc;
+		GroupIDType id;
+		uint32_t files_count;
+		uint32_t dir_count;
+	};
+
 	class Backend {
 	public:
 		Backend ( void ) = default;
@@ -52,6 +72,11 @@ namespace dindb {
 
 		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature ) = 0;
 		virtual bool search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash ) = 0;
+
+		virtual std::vector<LocatedItem> locate_in_db ( const std::string& parSearch, const TagList& parTags ) = 0;
+		virtual std::vector<LocatedItem> locate_in_db ( const mchlib::TigerHash& parSearch, const TagList& parTags ) = 0;
+		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, bool parCaseInsensitive ) = 0;
+		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive ) = 0;
 	};
 } //namespace dindb
 
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index bb3041c..c605c77 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -3,7 +3,7 @@ project(${bare_name}-backend-postgresql CXX)
 add_library(${PROJECT_NAME} SHARED
 	tag.cpp
 	delete.cpp
-	#locate.cpp
+	locate.cpp
 	scan.cpp
 	#dbsource.cpp
 	backend_postgresql.cpp
diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
index fbabb9c..f530d01 100644
--- a/src/backends/postgresql/backend_postgresql.cpp
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -20,6 +20,7 @@
 #include "tag.hpp"
 #include "delete.hpp"
 #include "scan.hpp"
+#include "locate.hpp"
 #include "pq/connection.hpp"
 #include <ciso646>
 #include <utility>
@@ -113,6 +114,22 @@ namespace dindb {
 	bool BackendPostgreSql::search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) {
 		return dindb::read_from_db(parItem, parSet, *m_conn, parHash);
 	}
+
+	std::vector<LocatedItem> BackendPostgreSql::locate_in_db (const std::string& parSearch, const TagList& parTags) {
+		return dindb::locate_in_db(*m_conn, parSearch, parTags);
+	}
+
+	std::vector<LocatedItem> BackendPostgreSql::locate_in_db (const mchlib::TigerHash& parSearch, const TagList& parTags) {
+		return dindb::locate_in_db(*m_conn, parSearch, parTags);
+	}
+
+	std::vector<LocatedSet> BackendPostgreSql::locate_sets_in_db (const std::string& parSearch, bool parCaseInsensitive) {
+		return dindb::locate_sets_in_db(*m_conn, parSearch, parCaseInsensitive);
+	}
+
+	std::vector<LocatedSet> BackendPostgreSql::locate_sets_in_db (const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive) {
+		return dindb::locate_sets_in_db(*m_conn, parSearch, parSets, parCaseInsensitive);
+	}
 } //namespace dindb
 
 extern "C" dindb::Backend* dindexer_create_backend (const YAML::Node* parConfig) {
diff --git a/src/backends/postgresql/backend_postgresql.hpp b/src/backends/postgresql/backend_postgresql.hpp
index 1160ef1..ab6bb8a 100644
--- a/src/backends/postgresql/backend_postgresql.hpp
+++ b/src/backends/postgresql/backend_postgresql.hpp
@@ -46,6 +46,11 @@ namespace dindb {
 		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature );
 		virtual bool search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash );
 
+		virtual std::vector<LocatedItem> locate_in_db ( const std::string& parSearch, const TagList& parTags );
+		virtual std::vector<LocatedItem> locate_in_db ( const mchlib::TigerHash& parSearch, const TagList& parTags );
+		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, bool parCaseInsensitive );
+		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive );
+
 	private:
 		std::unique_ptr<pq::Connection> m_conn;
 	};
diff --git a/src/backends/postgresql/locate.cpp b/src/backends/postgresql/locate.cpp
index 9018b08..82d26ed 100644
--- a/src/backends/postgresql/locate.cpp
+++ b/src/backends/postgresql/locate.cpp
@@ -15,28 +15,19 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "db/locate.hpp"
-#include "db/settings.hpp"
+#include "locate.hpp"
+#include "dindexer-machinery/recorddata.hpp"
 #include "pq/connection.hpp"
 #include "dindexer-machinery/tiger.hpp"
 #include <utility>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
+#include <cassert>
 
 namespace dindb {
 	namespace {
 		const int g_max_results = 200;
 
-		pq::Connection make_pq_conn ( const Settings& parDB, bool parOpen=true );
-
-		pq::Connection make_pq_conn (const Settings& parDB, bool parOpen) {
-			auto conn = pq::Connection(std::string(parDB.username), std::string(parDB.password), std::string(parDB.dbname), std::string(parDB.address), parDB.port);
-			if (parOpen) {
-				conn.connect();
-			}
-			return conn;
-		}
-
 		std::vector<LocatedSet> sets_result_to_vec (pq::ResultSet&& parResult) {
 			using boost::lexical_cast;
 
@@ -95,21 +86,21 @@ namespace dindb {
 		}
 	} //unnamed namespace
 
-	std::vector<LocatedItem> locate_in_db (const Settings& parDB, const std::string& parSearch, const TagList& parTags) {
-		auto conn = make_pq_conn(parDB);
+	std::vector<LocatedItem> locate_in_db (pq::Connection& parDB, const std::string& parSearch, const TagList& parTags) {
+		assert(parDB.is_connected());
 
 		const char base_query[] = "SELECT \"path\",\"id\",\"group_id\" FROM \"files\" WHERE \"path\" ~ $1";
-		return locate_in_db(conn, base_query, sizeof(base_query) - 1, "$2", parTags, parSearch);
+		return locate_in_db(parDB, base_query, sizeof(base_query) - 1, "$2", parTags, parSearch);
 	}
 
-	std::vector<LocatedItem> locate_in_db (const Settings& parDB, const mchlib::TigerHash& parSearch, const TagList& parTags) {
-		auto conn = make_pq_conn(parDB);
+	std::vector<LocatedItem> locate_in_db (pq::Connection& parDB, const mchlib::TigerHash& parSearch, const TagList& parTags) {
+		assert(parDB.is_connected());
 		const char base_query[] = "SELECT \"path\",\"id\",\"group_id\" FROM \"files\" WHERE \"hash\"=$1";
-		return locate_in_db(conn, base_query, sizeof(base_query) - 1, "$2", parTags, mchlib::tiger_to_string(parSearch, true));
+		return locate_in_db(parDB, base_query, sizeof(base_query) - 1, "$2", parTags, mchlib::tiger_to_string(parSearch, true));
 	}
 
-	std::vector<LocatedSet> locate_sets_in_db (const Settings& parDB, const std::string& parSearch, bool parCaseInsensitive) {
-		auto conn = make_pq_conn(parDB);
+	std::vector<LocatedSet> locate_sets_in_db (pq::Connection& parDB, const std::string& parSearch, bool parCaseInsensitive) {
+		assert(parDB.is_connected());
 
 		const std::string query = std::string("SELECT \"id\", \"desc\", "
 			"(SELECT COUNT(*) FROM \"files\" WHERE \"group_id\"=\"sets\".\"id\" AND NOT \"is_directory\") as \"file_count\", "
@@ -117,16 +108,16 @@ namespace dindb {
 			"FROM \"sets\" WHERE str_match_partial(\"desc\", $1, $2) LIMIT "
 		) + std::to_string(g_max_results) + ";";
 
-		auto result = conn.query(query, parSearch, parCaseInsensitive);
+		auto result = parDB.query(query, parSearch, parCaseInsensitive);
 		return sets_result_to_vec(std::move(result));
 	}
 
-	std::vector<LocatedSet> locate_sets_in_db (const Settings& parDB, const std::string& parSearch, const std::vector<uint32_t>& parSets, bool parCaseInsensitive) {
+	std::vector<LocatedSet> locate_sets_in_db (pq::Connection& parDB, const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive) {
 		if (parSets.empty()) {
 			return locate_sets_in_db(parDB, parSearch, parCaseInsensitive);
 		}
 
-		auto conn = make_pq_conn(parDB);
+		assert(parDB.is_connected());
 
 		const std::string query = std::string("SELECT \"id\", \"desc\", "
 			"(SELECT COUNT(*) FROM \"files\" WHERE \"group_id\"=\"sets\".\"id\" AND NOT \"is_directory\") as \"file_count\", "
@@ -134,7 +125,7 @@ namespace dindb {
 			"FROM \"sets\" WHERE \"id\" = ANY($1) AND str_match_partial(\"desc\", $3, $2) LIMIT "
 		) + std::to_string(g_max_results) + ";";
 
-		auto result = conn.query(query, parSearch, parCaseInsensitive, parSets);
+		auto result = parDB.query(query, parSearch, parCaseInsensitive, parSets);
 		return sets_result_to_vec(std::move(result));
 	}
 } //namespace dindb
diff --git a/src/backends/postgresql/locate.hpp b/src/backends/postgresql/locate.hpp
index 51a595d..fd58ed1 100644
--- a/src/backends/postgresql/locate.hpp
+++ b/src/backends/postgresql/locate.hpp
@@ -21,34 +21,17 @@
 #include <vector>
 #include <string>
 #include <cstdint>
-#include <boost/utility/string_ref.hpp>
+#include "backends/db_backend.hpp"
 
-namespace mchlib {
-	struct TigerHash;
-} //namespace mchlib
+namespace pq {
+	class Connection;
+} //namespace pq
 
 namespace dindb {
-	struct Settings;
-
-	struct LocatedItem {
-		std::string path;
-		uint64_t id;
-		uint32_t group_id;
-	};
-
-	struct LocatedSet {
-		std::string desc;
-		uint32_t id;
-		uint32_t files_count;
-		uint32_t dir_count;
-	};
-
-	using TagList = std::vector<boost::string_ref>;
-
-	std::vector<LocatedItem> locate_in_db ( const Settings& parDB, const std::string& parSearch, const TagList& parTags );
-	std::vector<LocatedItem> locate_in_db ( const Settings& parDB, const mchlib::TigerHash& parSearch, const TagList& parTags );
-	std::vector<LocatedSet> locate_sets_in_db ( const Settings& parDB, const std::string& parSearch, bool parCaseInsensitive );
-	std::vector<LocatedSet> locate_sets_in_db ( const Settings& parDB, const std::string& parSearch, const std::vector<uint32_t>& parSets, bool parCaseInsensitive );
+	std::vector<LocatedItem> locate_in_db ( pq::Connection& parDB, const std::string& parSearch, const TagList& parTags );
+	std::vector<LocatedItem> locate_in_db ( pq::Connection& parDB, const mchlib::TigerHash& parSearch, const TagList& parTags );
+	std::vector<LocatedSet> locate_sets_in_db ( pq::Connection& parDB, const std::string& parSearch, bool parCaseInsensitive );
+	std::vector<LocatedSet> locate_sets_in_db ( pq::Connection& parDB, const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive );
 } //namespace dindb
 
 #endif
diff --git a/src/locate/main.cpp b/src/locate/main.cpp
index f8474e8..34edb87 100644
--- a/src/locate/main.cpp
+++ b/src/locate/main.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "commandline.hpp"
-#include "db/locate.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexer-common/split_tags.hpp"
 #include "dindexerConfig.h"
@@ -79,9 +78,13 @@ int main (int parArgc, char* parArgv[]) {
 			return 1;
 		}
 	}
+	//TODO: throw if plugin loading failed
+	assert(settings.backend_plugin.name() == settings.backend_name);
+	assert(settings.backend_plugin.is_loaded());
 
+	auto& db = settings.backend_plugin.backend();
 	if (vm.count("set")) {
-		const auto results = dindb::locate_sets_in_db(settings.db, vm["substring"].as<std::string>(), not not vm.count("case-insensitive"));
+		const auto results = db.locate_sets_in_db(vm["substring"].as<std::string>(), not not vm.count("case-insensitive"));
 		std::copy(results.begin(), results.end(), std::ostream_iterator<dindb::LocatedSet>(std::cout, "\n"));
 	}
 	else {
@@ -90,11 +93,11 @@ int main (int parArgc, char* parArgv[]) {
 
 		if (vm.count("byhash")) {
 			const auto hash = din::hash(vm["substring"].as<std::string>());
-			results = dindb::locate_in_db(settings.db, hash, tags);
+			results = db.locate_in_db(hash, tags);
 		}
 		else {
 			const auto search_regex = g2r::convert(vm["substring"].as<std::string>(), not vm.count("case-insensitive"));
-			results = dindb::locate_in_db(settings.db, search_regex, tags);
+			results = db.locate_in_db(search_regex, tags);
 		}
 		std::copy(results.begin(), results.end(), std::ostream_iterator<dindb::LocatedItem>(std::cout, "\n"));
 	}

From dfe36552967229d83040cdfbe37a9bc59a649518 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 2 Jun 2016 09:35:33 +0200
Subject: [PATCH 021/170] Re-enable navigate in the postgre plugin.

---
 CMakeLists.txt                                |   2 +-
 include/backends/db_backend.hpp               |   9 +
 src/backends/postgresql/CMakeLists.txt        |   2 +-
 .../postgresql/backend_postgresql.cpp         |  25 +++
 .../postgresql/backend_postgresql.hpp         |   8 +
 src/backends/postgresql/dbsource.cpp          | 183 ------------------
 src/backends/postgresql/navigate.cpp          | 152 +++++++++++++++
 .../postgresql/{dbsource.hpp => navigate.hpp} |  63 +++---
 src/navigate/listdircontent.cpp               |  12 +-
 src/navigate/listdircontent.hpp               |   6 +-
 src/navigate/main.cpp                         |  14 +-
 11 files changed, 238 insertions(+), 238 deletions(-)
 delete mode 100644 src/backends/postgresql/dbsource.cpp
 create mode 100644 src/backends/postgresql/navigate.cpp
 rename src/backends/postgresql/{dbsource.hpp => navigate.hpp} (68%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4b7e0f..b0d7662 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ add_subdirectory(src/scan)
 add_subdirectory(src/delete)
 #add_subdirectory(src/query)
 add_subdirectory(src/locate)
-#add_subdirectory(src/navigate)
+add_subdirectory(src/navigate)
 add_subdirectory(src/tag)
 
 #Tests
diff --git a/include/backends/db_backend.hpp b/include/backends/db_backend.hpp
index c3e1527..07aec9c 100644
--- a/include/backends/db_backend.hpp
+++ b/include/backends/db_backend.hpp
@@ -19,6 +19,7 @@
 #define id7506CA9825454B80856154ACFE8A9DE2
 
 #include "backends/backend_loader.hpp"
+#include "helpers/MaxSizedArray.hpp"
 #include <cstdint>
 #include <string>
 #include <vector>
@@ -61,6 +62,9 @@ namespace dindb {
 		Backend ( void ) = default;
 		virtual ~Backend ( void ) noexcept = default;
 
+		virtual void connect ( void ) = 0;
+		virtual void disconnect ( void ) = 0;
+
 		virtual void tag_files ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) = 0;
 		virtual void tag_files ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) = 0;
 		virtual void delete_tags ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) = 0;
@@ -77,6 +81,11 @@ namespace dindb {
 		virtual std::vector<LocatedItem> locate_in_db ( const mchlib::TigerHash& parSearch, const TagList& parTags ) = 0;
 		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, bool parCaseInsensitive ) = 0;
 		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive ) = 0;
+
+		virtual std::vector<GroupIDType> find_all_sets ( void ) = 0;
+		virtual std::vector<dinhelp::MaxSizedArray<std::string, 3>> find_set_details ( const std::vector<GroupIDType>& parSets ) = 0;
+		virtual std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) = 0;
+		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath ) = 0;
 	};
 } //namespace dindb
 
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index c605c77..89b8680 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -5,7 +5,7 @@ add_library(${PROJECT_NAME} SHARED
 	delete.cpp
 	locate.cpp
 	scan.cpp
-	#dbsource.cpp
+	navigate.cpp
 	backend_postgresql.cpp
 )
 
diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
index f530d01..95e6332 100644
--- a/src/backends/postgresql/backend_postgresql.cpp
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -21,6 +21,7 @@
 #include "delete.hpp"
 #include "scan.hpp"
 #include "locate.hpp"
+#include "navigate.hpp"
 #include "pq/connection.hpp"
 #include <ciso646>
 #include <utility>
@@ -79,6 +80,14 @@ namespace dindb {
 		m_conn->disconnect();
 	}
 
+	void BackendPostgreSql::connect() {
+		m_conn->connect();
+	}
+
+	void BackendPostgreSql::disconnect() {
+		m_conn->disconnect();
+	}
+
 	void BackendPostgreSql::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 		dindb::tag_files(*m_conn, parFiles, parTags, parSet);
 	}
@@ -130,6 +139,22 @@ namespace dindb {
 	std::vector<LocatedSet> BackendPostgreSql::locate_sets_in_db (const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive) {
 		return dindb::locate_sets_in_db(*m_conn, parSearch, parSets, parCaseInsensitive);
 	}
+
+	std::vector<GroupIDType> BackendPostgreSql::find_all_sets() {
+		return dindb::find_all_sets(*m_conn);
+	}
+
+	std::vector<dinhelp::MaxSizedArray<std::string, 3>> BackendPostgreSql::find_set_details (const std::vector<GroupIDType>& parSets) {
+		return dindb::find_set_details<dindb::SetDetail_ID, dindb::SetDetail_Desc, dindb::SetDetail_CreeationDate>(*m_conn, parSets);
+	}
+
+	std::vector<dinhelp::MaxSizedArray<std::string, 1>> BackendPostgreSql::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
+		return dindb::find_file_details<dindb::FileDetail_Path>(*m_conn, parSetID, parLevel, parDir);
+	}
+
+	std::vector<std::string> BackendPostgreSql::find_paths_starting_by (GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) {
+		return dindb::find_paths_starting_by(*m_conn, parGroupID, parLevel, parPath);
+	}
 } //namespace dindb
 
 extern "C" dindb::Backend* dindexer_create_backend (const YAML::Node* parConfig) {
diff --git a/src/backends/postgresql/backend_postgresql.hpp b/src/backends/postgresql/backend_postgresql.hpp
index ab6bb8a..7a5468b 100644
--- a/src/backends/postgresql/backend_postgresql.hpp
+++ b/src/backends/postgresql/backend_postgresql.hpp
@@ -34,6 +34,9 @@ namespace dindb {
 		BackendPostgreSql ( std::string&& parUser, std::string&& parPass, std::string&& parDB, std::string&& parAddr, uint16_t parPort );
 		virtual ~BackendPostgreSql ( void ) noexcept;
 
+		virtual void connect ( void );
+		virtual void disconnect ( void );
+
 		virtual void tag_files ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
 		virtual void tag_files ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
 		virtual void delete_tags ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
@@ -51,6 +54,11 @@ namespace dindb {
 		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, bool parCaseInsensitive );
 		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive );
 
+		virtual std::vector<GroupIDType> find_all_sets ( void );
+		virtual std::vector<dinhelp::MaxSizedArray<std::string, 3>> find_set_details ( const std::vector<GroupIDType>& parSets );
+		virtual std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir );
+		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath );
+
 	private:
 		std::unique_ptr<pq::Connection> m_conn;
 	};
diff --git a/src/backends/postgresql/dbsource.cpp b/src/backends/postgresql/dbsource.cpp
deleted file mode 100644
index 4d518c9..0000000
--- a/src/backends/postgresql/dbsource.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "db/dbsource.hpp"
-#include "db/settings.hpp"
-#include "pq/connection.hpp"
-#include "helpers/infix_iterator.hpp"
-#include <ciso646>
-#include <utility>
-#include <boost/lexical_cast.hpp>
-#include <sstream>
-#include <boost/range/algorithm/copy.hpp>
-
-namespace dindb {
-	namespace {
-		const uint32_t g_files_query_limit = 500;
-
-		std::ostream& operator<< (std::ostream& parOut, const std::vector<std::string>& parCols) {
-			parOut << '"';
-			boost::copy(parCols, infix_ostream_iterator<std::string>(parOut, "\", \""));
-			parOut << '"';
-			return parOut;
-		}
-	} //unnamed namespace
-
-	const DBSource::SetDetailsMap DBSource::m_set_details_map {
-		{SetDetail_Desc, "desc"},
-		{SetDetail_Type, "type"},
-		{SetDetail_CreeationDate, "creation"},
-		{SetDetail_AppName, "app_name"},
-		{SetDetail_ID, "id"}
-	};
-	const DBSource::FileDetailsMap DBSource::m_file_details_map {
-		{FileDetail_ID, "id"},
-		{FileDetail_Path, "path"},
-		{FileDetail_Level, "level"},
-		{FileDetail_GroupID, "group_id"},
-		{FileDetail_IsDir, "is_directory"},
-		{FileDetail_IsSymLink, "is_symlink"},
-		{FileDetail_Size, "size"},
-		{FileDetail_Hash, "hash"},
-		{FileDetail_IsHashValid, "is_hash_valid"},
-		{FileDetail_ATime, "access_time"},
-		{FileDetail_MTime, "modify_time"},
-		{FileDetail_Unreadable, "unreadable"},
-		{FileDetail_MimeType, "mimetype"},
-		{FileDetail_Charset, "charset"}
-	};
-
-	struct DBSource::LocalData {
-		explicit LocalData ( const Settings& parDBSettings ) :
-			conn(
-				std::string(parDBSettings.username),
-				std::string(parDBSettings.password),
-				std::string(parDBSettings.dbname),
-				std::string(parDBSettings.address),
-				parDBSettings.port
-			)
-		{
-		}
-
-		pq::Connection conn;
-	};
-
-	DBSource::DBSource (const Settings& parDBSettings) :
-		m_local_data(new LocalData(parDBSettings))
-	{
-		assert(not m_local_data->conn.is_connected());
-	}
-
-	DBSource::~DBSource() noexcept {
-	}
-
-	void DBSource::disconnect() {
-		if (m_local_data->conn.is_connected()) {
-			m_local_data->conn.disconnect();
-		}
-	}
-
-	pq::Connection& DBSource::get_conn() {
-		if (not m_local_data->conn.is_connected()) {
-			m_local_data->conn.connect();
-		}
-		return m_local_data->conn;
-	}
-
-	std::vector<uint32_t> DBSource::sets() {
-		using boost::lexical_cast;
-
-		auto& conn = get_conn();
-		const std::string query = "SELECT \"id\" FROM \"sets\";";
-		auto res = conn.query(query);
-		std::vector<uint32_t> retval;
-
-		retval.reserve(res.size());
-		for (const auto& row : res) {
-			retval.push_back(lexical_cast<uint32_t>(row[0]));
-		}
-		return retval;
-	}
-
-	void DBSource::query_no_conditions (const ColumnList& parCols, boost::string_ref parTable, const std::vector<uint32_t>& parIDs, std::function<void(std::string&&)> parCallback) {
-		std::ostringstream oss;
-		oss << "SELECT " << parCols << ' ' <<
-			"FROM \"" << parTable << "\" " <<
-			"WHERE \"id\"=ANY($1) " <<
-			"ORDER BY \"desc\" ASC " <<
-			"LIMIT " << g_files_query_limit << ';';
-
-		auto& conn = get_conn();
-		auto result = conn.query(oss.str(), parIDs);
-		for (auto row : result) {
-			for (auto val : row) {
-				parCallback(std::move(val));
-			}
-		}
-	}
-
-	void DBSource::query_files_in_dir (const ColumnList& parCols, boost::string_ref parDir, uint16_t parLevel, uint32_t parGroupID, QueryCallback parCallback) {
-		std::ostringstream oss;
-		oss << "SELECT " << parCols << ' ' <<
-			"FROM \"files\" WHERE " <<
-			"\"level\"=$1 " <<
-			"AND \"group_id\"=$2 " <<
-			"AND str_begins_with(\"path\", COALESCE($3, '')) " <<
-			"ORDER BY \"is_directory\" DESC, \"path\" ASC " <<
-			"LIMIT " << g_files_query_limit << ';';
-
-		auto& conn = get_conn();
-		auto result = conn.query(
-			oss.str(),
-			parLevel,
-			parGroupID,
-			parDir
-		);
-		for (auto row : result) {
-			for (auto val : row) {
-				parCallback(std::move(val));
-			}
-		}
-	}
-
-	std::vector<std::string> DBSource::paths_starting_by (uint32_t parGroupID, uint16_t parLevel, boost::string_ref parPath) {
-		std::ostringstream oss;
-		oss << "SELECT \"path\" ||\n" <<
-			"(SELECT CASE \"is_directory\"\n" <<
-			"WHEN TRUE THEN '/'\n" <<
-			"ELSE ''\n" <<
-			"END) as path FROM \"files\" WHERE \"group_id\"=$1 AND " <<
-			"\"level\"=$2 AND str_begins_with(\"path\", COALESCE($3, '')) " <<
-			"ORDER BY \"is_directory\" DESC, \"path\" ASC LIMIT " <<
-			g_files_query_limit << ';';
-
-		auto& conn = get_conn();
-		auto result = conn.query(
-			oss.str(),
-			parGroupID,
-			parLevel,
-			parPath
-		);
-		std::vector<std::string> retval;
-		retval.reserve(retval.size());
-		for (auto row : result) {
-			assert(not row.empty());
-			retval.push_back(row[0]);
-		}
-		return retval;
-	}
-} //namespace dindb
diff --git a/src/backends/postgresql/navigate.cpp b/src/backends/postgresql/navigate.cpp
new file mode 100644
index 0000000..9b23e42
--- /dev/null
+++ b/src/backends/postgresql/navigate.cpp
@@ -0,0 +1,152 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "navigate.hpp"
+#include "pq/connection.hpp"
+#include "helpers/infix_iterator.hpp"
+#include <ciso646>
+#include <utility>
+#include <boost/lexical_cast.hpp>
+#include <sstream>
+#include <boost/range/algorithm/copy.hpp>
+#include <cassert>
+
+namespace dindb {
+	namespace {
+		const uint32_t g_files_query_limit = 500;
+
+		std::ostream& operator<< (std::ostream& parOut, const std::vector<std::string>& parCols) {
+			parOut << '"';
+			boost::copy(parCols, infix_ostream_iterator<std::string>(parOut, "\", \""));
+			parOut << '"';
+			return parOut;
+		}
+	} //unnamed namespace
+
+	namespace implem {
+		const SetDetailsMap g_set_details_map {
+			{SetDetail_Desc, "desc"},
+			{SetDetail_Type, "type"},
+			{SetDetail_CreeationDate, "creation"},
+			{SetDetail_AppName, "app_name"},
+			{SetDetail_ID, "id"}
+		};
+		const FileDetailsMap g_file_details_map {
+			{FileDetail_ID, "id"},
+			{FileDetail_Path, "path"},
+			{FileDetail_Level, "level"},
+			{FileDetail_GroupID, "group_id"},
+			{FileDetail_IsDir, "is_directory"},
+			{FileDetail_IsSymLink, "is_symlink"},
+			{FileDetail_Size, "size"},
+			{FileDetail_Hash, "hash"},
+			{FileDetail_IsHashValid, "is_hash_valid"},
+			{FileDetail_ATime, "access_time"},
+			{FileDetail_MTime, "modify_time"},
+			{FileDetail_Unreadable, "unreadable"},
+			{FileDetail_MimeType, "mimetype"},
+			{FileDetail_Charset, "charset"}
+		};
+
+		void query_no_conditions (pq::Connection& parDB, const ColumnList& parCols, boost::string_ref parTable, const std::vector<GroupIDType>& parIDs, std::function<void(std::string&&)> parCallback) {
+			assert(parDB.is_connected());
+
+			std::ostringstream oss;
+			oss << "SELECT " << parCols << ' ' <<
+				"FROM \"" << parTable << "\" " <<
+				"WHERE \"id\"=ANY($1) " <<
+				"ORDER BY \"desc\" ASC " <<
+				"LIMIT " << g_files_query_limit << ';';
+
+			auto result = parDB.query(oss.str(), parIDs);
+			for (auto row : result) {
+				for (auto val : row) {
+					parCallback(std::move(val));
+				}
+			}
+		}
+
+		void query_files_in_dir (pq::Connection& parDB, const ColumnList& parCols, boost::string_ref parDir, uint16_t parLevel, GroupIDType parGroupID, QueryCallback parCallback) {
+			assert(parDB.is_connected());
+
+			std::ostringstream oss;
+			oss << "SELECT " << parCols << ' ' <<
+				"FROM \"files\" WHERE " <<
+				"\"level\"=$1 " <<
+				"AND \"group_id\"=$2 " <<
+				"AND str_begins_with(\"path\", COALESCE($3, '')) " <<
+				"ORDER BY \"is_directory\" DESC, \"path\" ASC " <<
+				"LIMIT " << g_files_query_limit << ';';
+
+			auto result = parDB.query(
+				oss.str(),
+				parLevel,
+				parGroupID,
+				parDir
+			);
+			for (auto row : result) {
+				for (auto val : row) {
+					parCallback(std::move(val));
+				}
+			}
+		}
+	} //namespace implem
+
+	std::vector<GroupIDType> find_all_sets (pq::Connection& parDB) {
+		using boost::lexical_cast;
+
+		assert(parDB.is_connected());
+
+		const std::string query = "SELECT \"id\" FROM \"sets\";";
+		auto res = parDB.query(query);
+		std::vector<GroupIDType> retval;
+
+		retval.reserve(res.size());
+		for (const auto& row : res) {
+			retval.push_back(lexical_cast<GroupIDType>(row[0]));
+		}
+		return retval;
+	}
+
+	std::vector<std::string> find_paths_starting_by (pq::Connection& parDB, GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) {
+		assert(parDB.is_connected());
+
+		std::ostringstream oss;
+		oss << "SELECT \"path\" ||\n" <<
+			"(SELECT CASE \"is_directory\"\n" <<
+			"WHEN TRUE THEN '/'\n" <<
+			"ELSE ''\n" <<
+			"END) as path FROM \"files\" WHERE \"group_id\"=$1 AND " <<
+			"\"level\"=$2 AND str_begins_with(\"path\", COALESCE($3, '')) " <<
+			"ORDER BY \"is_directory\" DESC, \"path\" ASC LIMIT " <<
+			g_files_query_limit << ';';
+
+		auto result = parDB.query(
+			oss.str(),
+			parGroupID,
+			parLevel,
+			parPath
+		);
+		std::vector<std::string> retval;
+		retval.reserve(retval.size());
+		for (auto row : result) {
+			assert(not row.empty());
+			retval.push_back(row[0]);
+		}
+		return retval;
+	}
+} //namespace dindb
diff --git a/src/backends/postgresql/dbsource.hpp b/src/backends/postgresql/navigate.hpp
similarity index 68%
rename from src/backends/postgresql/dbsource.hpp
rename to src/backends/postgresql/navigate.hpp
index d0e5810..d52ecd7 100644
--- a/src/backends/postgresql/dbsource.hpp
+++ b/src/backends/postgresql/navigate.hpp
@@ -21,6 +21,7 @@
 #include "dindexer-machinery/recorddata.hpp"
 #include "helpers/flatinsertin2dlist.hpp"
 #include "helpers/MaxSizedArray.hpp"
+#include "backends/db_backend.hpp"
 #include <memory>
 #include <cstdint>
 #include <vector>
@@ -38,8 +39,6 @@ namespace pq {
 namespace dindb {
 	using dinhelp::MaxSizedArray;
 
-	struct Settings;
-
 	enum SetDetails {
 		SetDetail_Desc = 0x01,
 		SetDetail_Type = 0x02,
@@ -65,40 +64,25 @@ namespace dindb {
 		FileDetail_Charset = 0x2000
 	};
 
-	class DBSource {
-	public:
-		explicit DBSource ( const Settings& parDBSettings );
-		~DBSource ( void ) noexcept;
+	std::vector<GroupIDType> find_all_sets ( pq::Connection& parDB );
 
-		void disconnect ( void );
-		std::vector<uint32_t> sets ( void );
+	template <SetDetails... D>
+	auto find_set_details ( pq::Connection& parDB, const std::vector<GroupIDType>& parIDs ) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>>;
 
-		template <SetDetails... D>
-		auto set_details ( const std::vector<uint32_t>& parIDs ) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>>;
+	template <FileDetails... D>
+	auto find_file_details ( pq::Connection& parDB, GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>>;
 
-		template <FileDetails... D>
-		auto file_details ( uint32_t parSetID, uint16_t parLevel, boost::string_ref parDir ) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>>;
-
-		std::vector<std::string> paths_starting_by ( uint32_t parGroupID, uint16_t parLevel, boost::string_ref parPath );
-
-	private:
-		struct LocalData;
-		typedef std::map<SetDetails, std::string> SetDetailsMap;
-		typedef std::map<FileDetails, std::string> FileDetailsMap;
-		typedef std::vector<std::string> ColumnList;
-		typedef std::function<void(std::string&&)> QueryCallback;
-
-		pq::Connection& get_conn ( void );
-		void query_no_conditions ( const ColumnList& parCols, boost::string_ref parTable, const std::vector<uint32_t>& parIDs, QueryCallback parCallback );
-		void query_files_in_dir ( const ColumnList& parCols, boost::string_ref parDir, uint16_t parLevel, uint32_t parGroupID, QueryCallback parCallback );
-
-		static const SetDetailsMap m_set_details_map;
-		static const FileDetailsMap m_file_details_map;
-
-		std::unique_ptr<LocalData> m_local_data;
-	};
+	std::vector<std::string> find_paths_starting_by ( pq::Connection& parDB, GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath );
 
 	namespace implem {
+		typedef std::vector<std::string> ColumnList;
+		typedef std::function<void(std::string&&)> QueryCallback;
+		typedef std::map<SetDetails, std::string> SetDetailsMap;
+		typedef std::map<FileDetails, std::string> FileDetailsMap;
+
+		extern const SetDetailsMap g_set_details_map;
+		extern const FileDetailsMap g_file_details_map;
+
 		template <class M, M... Details>
 		inline
 		std::vector<std::string> make_columns_vec (const std::map<M, std::string>& parDic) {
@@ -115,35 +99,40 @@ namespace dindb {
 			}
 			return columns;
 		}
+
+		void query_no_conditions ( pq::Connection& parDB, const ColumnList& parCols, boost::string_ref parTable, const std::vector<GroupIDType>& parIDs, QueryCallback parCallback );
+		void query_files_in_dir ( pq::Connection& parDB, const ColumnList& parCols, boost::string_ref parDir, uint16_t parLevel, GroupIDType parGroupID, QueryCallback parCallback );
 	} //namespace implem
 
 	template <SetDetails... D>
-	auto DBSource::set_details (const std::vector<uint32_t>& parIDs) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>> {
+	inline
+	auto find_set_details (pq::Connection& parDB, const std::vector<GroupIDType>& parIDs) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>> {
 		using dinhelp::FlatInsertIn2DList;
 		typedef std::vector<MaxSizedArray<std::string, sizeof...(D)>> ReturnType;
 		typedef void(FlatInsertIn2DList<ReturnType>::*FlatPushBackFunc)(std::string&&);
 
-		const auto columns = implem::make_columns_vec<SetDetails, D...>(m_set_details_map);
+		const auto columns = implem::make_columns_vec<SetDetails, D...>(implem::g_set_details_map);
 
 		ReturnType list;
 		FlatInsertIn2DList<ReturnType> flat_list(&list, sizeof...(D));
 		FlatPushBackFunc pback_func = &FlatInsertIn2DList<ReturnType>::push_back;
-		this->query_no_conditions(columns, "sets", parIDs, std::bind(pback_func, &flat_list, std::placeholders::_1));
+		implem::query_no_conditions(parDB, columns, "sets", parIDs, std::bind(pback_func, &flat_list, std::placeholders::_1));
 		return list;
 	}
 
 	template <FileDetails... D>
-	auto DBSource::file_details (uint32_t parSetID, uint16_t parLevel, boost::string_ref parDir) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>> {
+	inline
+	auto find_file_details (pq::Connection& parDB, GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>> {
 		using dinhelp::FlatInsertIn2DList;
 		typedef std::vector<MaxSizedArray<std::string, sizeof...(D)>> ReturnType;
 		typedef void(FlatInsertIn2DList<ReturnType>::*FlatPushBackFunc)(std::string&&);
 
-		const auto columns = implem::make_columns_vec<FileDetails, D...>(m_file_details_map);
+		const auto columns = implem::make_columns_vec<FileDetails, D...>(implem::g_file_details_map);
 
 		ReturnType list;
 		FlatInsertIn2DList<ReturnType> flat_list(&list, sizeof...(D));
 		FlatPushBackFunc pback_func = &FlatInsertIn2DList<ReturnType>::push_back;
-		this->query_files_in_dir(columns, parDir, parLevel, parSetID, std::bind(pback_func, &flat_list, std::placeholders::_1));
+		implem::query_files_in_dir(parDB, columns, parDir, parLevel, parSetID, std::bind(pback_func, &flat_list, std::placeholders::_1));
 		return list;
 	}
 } //namespace dindb
diff --git a/src/navigate/listdircontent.cpp b/src/navigate/listdircontent.cpp
index bfda3fe..d7be0ac 100644
--- a/src/navigate/listdircontent.cpp
+++ b/src/navigate/listdircontent.cpp
@@ -17,7 +17,7 @@
 
 #include "listdircontent.hpp"
 #include "entrypath.hpp"
-#include "db/dbsource.hpp"
+#include "backends/db_backend.hpp"
 #include "helpers/infix_iterator.hpp"
 #include <cassert>
 #include <utility>
@@ -68,7 +68,7 @@ namespace din {
 		}
 	} //unnamed namespace
 
-	ListDirContent::ListDirContent (dindb::DBSource* parDB) :
+	ListDirContent::ListDirContent (dindb::Backend* parDB) :
 		m_cache(g_max_cached_lists),
 		m_db(parDB)
 	{
@@ -85,14 +85,14 @@ namespace din {
 
 		//Requested item is not cached, so we need to query the db now
 		if (parDir.points_to_group()) {
-			auto sets_ids = m_db->sets();
-			auto sets_info = m_db->set_details<dindb::SetDetail_ID, dindb::SetDetail_Desc, dindb::SetDetail_CreeationDate>(sets_ids);
+			auto sets_ids = m_db->find_all_sets();
+			auto sets_info = m_db->find_set_details(sets_ids);
 			m_cache.push_back(std::make_pair(curr_path, db_result_to_vec(sets_info)));
 		}
 		else {
 			auto path_prefix = parDir.file_path();
 			const auto set_id = parDir.group_id();
-			auto files_info = m_db->file_details<dindb::FileDetail_Path>(set_id, parDir.level() + 1, path_prefix);
+			auto files_info = m_db->find_file_details(set_id, parDir.level() + 1, path_prefix);
 			m_cache.push_back(std::make_pair(curr_path, db_result_to_vec(files_info)));
 		}
 		return last_cached_item(curr_path);
@@ -115,7 +115,7 @@ namespace din {
 		else {
 			const auto set_id = parDir.group_id();
 			const auto path_prefix = parDir.file_path();
-			auto file_list = m_db->paths_starting_by(set_id, parDir.level(), path_prefix);
+			auto file_list = m_db->find_paths_starting_by(set_id, parDir.level(), path_prefix);
 			for (auto& file_item : file_list) {
 				file_item = EntryPath(file_item)[return_level];
 			}
diff --git a/src/navigate/listdircontent.hpp b/src/navigate/listdircontent.hpp
index a3dfe19..ad20f27 100644
--- a/src/navigate/listdircontent.hpp
+++ b/src/navigate/listdircontent.hpp
@@ -24,7 +24,7 @@
 #include <vector>
 
 namespace dindb {
-	class DBSource;
+	class Backend;
 } //namespace dindb
 
 namespace din {
@@ -34,7 +34,7 @@ namespace din {
 		using ListType = std::vector<std::string>;
 		using CachedItemType = std::pair<std::string, ListType>;
 	public:
-		explicit ListDirContent ( dindb::DBSource* parDB );
+		explicit ListDirContent ( dindb::Backend* parDB );
 		~ListDirContent ( void ) noexcept = default;
 
 		const ListType& ls ( const EntryPath& parDir ) const;
@@ -44,7 +44,7 @@ namespace din {
 		const ListType& last_cached_item ( const std::string& parCurrPath ) const;
 
 		mutable boost::circular_buffer<CachedItemType> m_cache;
-		dindb::DBSource* m_db;
+		dindb::Backend* m_db;
 	};
 } //namespace din
 
diff --git a/src/navigate/main.cpp b/src/navigate/main.cpp
index db02fed..fdcb835 100644
--- a/src/navigate/main.cpp
+++ b/src/navigate/main.cpp
@@ -19,7 +19,6 @@
 #include "commandprocessor.hpp"
 #include "dindexer-common/settings.hpp"
 #include "entrypath.hpp"
-#include "db/dbsource.hpp"
 #include "dindexerConfig.h"
 #include "linereader.hpp"
 #include "listdircontent.hpp"
@@ -31,7 +30,7 @@
 #include <boost/range/algorithm/copy.hpp>
 
 namespace {
-	void do_navigation ( dindb::DBSource& parDB );
+	void do_navigation ( dindb::Backend& parDB );
 
 	bool on_exit ( void );
 	void on_pwd ( const din::EntryPath& parDirMan );
@@ -60,10 +59,11 @@ int main (int parArgc, char* parArgv[]) {
 			return 1;
 		}
 	}
+	//TODO: throw if plugin loading failed
+	assert(settings.backend_plugin.name() == settings.backend_name);
+	assert(settings.backend_plugin.is_loaded());
 
-	dindb::DBSource db_source(settings.db);
-
-	do_navigation(db_source);
+	do_navigation(settings.backend_plugin.backend());
 	return 0;
 }
 
@@ -81,7 +81,7 @@ namespace {
 		boost::copy(ls_result, std::ostream_iterator<std::string>(std::cout, "\n"));
 	}
 
-	void do_navigation (dindb::DBSource& parDB) {
+	void do_navigation (dindb::Backend& parDB) {
 		const std::string prompt;
 		din::ListDirContent ls(&parDB);
 		din::LineReader lines(&ls);
@@ -92,7 +92,7 @@ namespace {
 		din::EntryPath dir_man;
 		proc.add_command("exit", &on_exit, 0);
 		proc.add_command("cd", std::function<void(const std::string&)>(std::bind(&din::EntryPath::push_piece, &dir_man, std::placeholders::_1)), 1);
-		proc.add_command("disconnect", std::function<void()>(std::bind(&dindb::DBSource::disconnect, &parDB)), 0);
+		proc.add_command("disconnect", std::function<void()>(std::bind(&dindb::Backend::disconnect, std::ref(parDB))), 0);
 		proc.add_command("pwd", std::function<void()>(std::bind(&on_pwd, std::ref(dir_man))), 0);
 		proc.add_command("ls", std::function<void()>(std::bind(on_ls, std::ref(ls), std::ref(dir_man))), 0);
 		do {

From 0cb91fb9cae0aa7996feb3307781c05c099b38f5 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 2 Jun 2016 09:42:32 +0200
Subject: [PATCH 022/170] Put LIMIT number into a common header.

---
 src/backends/postgresql/locate.cpp            |  3 ++-
 src/backends/postgresql/navigate.cpp          |  3 ++-
 src/backends/postgresql/query_count_limit.hpp | 25 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 src/backends/postgresql/query_count_limit.hpp

diff --git a/src/backends/postgresql/locate.cpp b/src/backends/postgresql/locate.cpp
index 82d26ed..259f5c7 100644
--- a/src/backends/postgresql/locate.cpp
+++ b/src/backends/postgresql/locate.cpp
@@ -18,6 +18,7 @@
 #include "locate.hpp"
 #include "dindexer-machinery/recorddata.hpp"
 #include "pq/connection.hpp"
+#include "query_count_limit.hpp"
 #include "dindexer-machinery/tiger.hpp"
 #include <utility>
 #include <boost/algorithm/string.hpp>
@@ -26,7 +27,7 @@
 
 namespace dindb {
 	namespace {
-		const int g_max_results = 200;
+		const int g_max_results = g_query_count_limit;
 
 		std::vector<LocatedSet> sets_result_to_vec (pq::ResultSet&& parResult) {
 			using boost::lexical_cast;
diff --git a/src/backends/postgresql/navigate.cpp b/src/backends/postgresql/navigate.cpp
index 9b23e42..43af1f2 100644
--- a/src/backends/postgresql/navigate.cpp
+++ b/src/backends/postgresql/navigate.cpp
@@ -18,6 +18,7 @@
 #include "navigate.hpp"
 #include "pq/connection.hpp"
 #include "helpers/infix_iterator.hpp"
+#include "query_count_limit.hpp"
 #include <ciso646>
 #include <utility>
 #include <boost/lexical_cast.hpp>
@@ -27,7 +28,7 @@
 
 namespace dindb {
 	namespace {
-		const uint32_t g_files_query_limit = 500;
+		const uint32_t g_files_query_limit = g_query_count_limit;
 
 		std::ostream& operator<< (std::ostream& parOut, const std::vector<std::string>& parCols) {
 			parOut << '"';
diff --git a/src/backends/postgresql/query_count_limit.hpp b/src/backends/postgresql/query_count_limit.hpp
new file mode 100644
index 0000000..193fa91
--- /dev/null
+++ b/src/backends/postgresql/query_count_limit.hpp
@@ -0,0 +1,25 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id367C9335A3444BC0846EF4E2A27AB9A9
+#define id367C9335A3444BC0846EF4E2A27AB9A9
+
+namespace dindb {
+	constexpr const uint32_t g_query_count_limit = 500;
+};
+
+#endif

From e2275ce5dbc3d1558185fc6b3f2d6bde7a01d49b Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 2 Jun 2016 10:01:19 +0200
Subject: [PATCH 023/170] Add a backend interface version number for eventual
 future changes.

Note that the interface is still a work in progress and might change
while still keeping the same interface version. This is going to be true
until the first stable release of this project (non beta).
---
 include/backends/backend_loader.hpp           |  3 +++
 include/backends/backend_version.hpp          | 25 +++++++++++++++++++
 include/backends/exposed_functions.hpp        |  1 +
 src/backends/backend_loader.cpp               | 23 ++++++++++++++++-
 .../postgresql/backend_postgresql.cpp         |  5 ++++
 5 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 include/backends/backend_version.hpp

diff --git a/include/backends/backend_loader.hpp b/include/backends/backend_loader.hpp
index 70bb592..7795d0c 100644
--- a/include/backends/backend_loader.hpp
+++ b/include/backends/backend_loader.hpp
@@ -42,6 +42,8 @@ namespace dindb {
 		Backend& backend ( void );
 		const Backend& backend ( void ) const;
 		bool is_loaded ( void ) const;
+		int backend_interface_version ( void ) const;
+		int max_supported_interface_version ( void ) const;
 
 		BackendPlugin& operator= ( BackendPlugin&& ) = default;
 
@@ -51,6 +53,7 @@ namespace dindb {
 		SoHandle m_lib;
 		BackendPtr m_backend;
 		boost::string_ref m_name;
+		int m_iface_ver;
 	};
 
 	std::string backend_name ( const std::string& parSOPath );
diff --git a/include/backends/backend_version.hpp b/include/backends/backend_version.hpp
new file mode 100644
index 0000000..8b31e82
--- /dev/null
+++ b/include/backends/backend_version.hpp
@@ -0,0 +1,25 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef idAA27B58429DB41C2AF53204CC5010E94
+#define idAA27B58429DB41C2AF53204CC5010E94
+
+namespace dindb {
+	constexpr const int g_current_iface_version = 1;
+} //namespace dindb
+
+#endif
diff --git a/include/backends/exposed_functions.hpp b/include/backends/exposed_functions.hpp
index a1b21e9..ef174d3 100644
--- a/include/backends/exposed_functions.hpp
+++ b/include/backends/exposed_functions.hpp
@@ -29,5 +29,6 @@ namespace dindb {
 extern "C" dindb::Backend* dindexer_create_backend ( const YAML::Node* parConfig );
 extern "C" void dindexer_destroy_backend ( dindb::Backend* parDele );
 extern "C" const char* dindexer_backend_name ( void );
+extern "C" int dindexer_backend_iface_version ( void );
 
 #endif
diff --git a/src/backends/backend_loader.cpp b/src/backends/backend_loader.cpp
index a6eba27..3aa8547 100644
--- a/src/backends/backend_loader.cpp
+++ b/src/backends/backend_loader.cpp
@@ -20,6 +20,7 @@
 
 #include "backends/backend_loader.hpp"
 #include "backends/exposed_functions.hpp"
+#include "backends/backend_version.hpp"
 #include <dlfcn.h>
 #include <cassert>
 #include <functional>
@@ -50,6 +51,13 @@ namespace dindb {
 
 		void nop_destroy (Backend*) {
 		}
+
+		int backend_iface_version (void* parSOHandle) {
+			typedef decltype(&dindexer_backend_iface_version) GetVersionFun;
+
+			auto get_version = reinterpret_cast<GetVersionFun>(dlsym(parSOHandle, "dindexer_backend_iface_version"));
+			return get_version();
+		}
 	} //unnamed namespace
 
 	std::string backend_name (const std::string& parSOPath) {
@@ -70,8 +78,13 @@ namespace dindb {
 	BackendPlugin::BackendPlugin (const std::string& parSOPath, const YAML::Node* parConfig) :
 		m_lib(dlopen(parSOPath.c_str(), RTLD_LAZY), &dlclose),
 		m_backend(load_backend(m_lib.get(), parConfig)),
-		m_name(backend_name(m_lib.get()))
+		m_name(backend_name(m_lib.get())),
+		m_iface_ver(backend_iface_version(m_lib.get()))
 	{
+		if (g_current_iface_version != m_iface_ver) {
+			m_backend.reset();
+			m_lib.reset();
+		}
 	}
 
 	BackendPlugin::~BackendPlugin() noexcept {
@@ -104,4 +117,12 @@ namespace dindb {
 	bool BackendPlugin::is_loaded() const {
 		return static_cast<bool>(m_backend);
 	}
+
+	int BackendPlugin::backend_interface_version() const {
+		return m_iface_ver;
+	}
+
+	int BackendPlugin::max_supported_interface_version() const {
+		return g_current_iface_version;
+	}
 } //namespace dindb
diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
index 95e6332..68577ec 100644
--- a/src/backends/postgresql/backend_postgresql.cpp
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -17,6 +17,7 @@
 
 #include "backend_postgresql.hpp"
 #include "backends/exposed_functions.hpp"
+#include "backends/backend_version.hpp"
 #include "tag.hpp"
 #include "delete.hpp"
 #include "scan.hpp"
@@ -179,3 +180,7 @@ extern "C" void dindexer_destroy_backend (dindb::Backend* parDele) {
 extern "C" const char* dindexer_backend_name() {
 	return "postgresql";
 }
+
+extern "C" int dindexer_backend_iface_version() {
+	return dindb::g_current_iface_version;
+}

From 4aceccbf4d5db0bd6d56462e43c31087b858bb6b Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 2 Jun 2016 18:29:37 +0200
Subject: [PATCH 024/170] New Diaspora post

---
 docs/posts/04_whats_cooking.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 docs/posts/04_whats_cooking.md

diff --git a/docs/posts/04_whats_cooking.md b/docs/posts/04_whats_cooking.md
new file mode 100644
index 0000000..2a084d8
--- /dev/null
+++ b/docs/posts/04_whats_cooking.md
@@ -0,0 +1,11 @@
+### What's cooking? ###
+
+It's been roughly a month since I released version 0.1.5b and most of the activity has been on the [dev branch](https://bitbucket.org/King_DuckZ/dindexer/branch/dev) since then. It's still a bit too early to make a new release, but if you want to get a peek at the new features this is the right moment as commit e2275ce should give you a working version of #dindexer.
+
+Most notably, you will have a `tag` command, that will allow you to tag files. You should also be able to list files by tag, using the `dindexer locate --tags <my_tags>` command.
+
+The less evident change (although that's what took up most of my time) is the separation of the PostgreSQL code from the CL client. You have been asking for Sqlite support, I heard you and I'm getting everything ready so that an Sqlite plugin can be implemented! Currently, PostgreSQL is still the only backend you can choose, so please be patient... or even better, step in and contribute to dindexer! :)
+
+[bitbucket.org/King_DuckZ/dindexer](https://bitbucket.org/King_DuckZ/dindexer)
+
+\#dindexer #linux #opensource #cpp #sqlite

From 7de71943ad6c5cc9b41aca61bd6b1edfa00d3547 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 2 Jun 2016 18:38:40 +0200
Subject: [PATCH 025/170] Name backend settings section in yml using the
 backend name itself.

---
 dindexer.yml            |  4 ++--
 src/common/settings.cpp | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dindexer.yml b/dindexer.yml
index d13cd0d..38242d4 100644
--- a/dindexer.yml
+++ b/dindexer.yml
@@ -1,7 +1,7 @@
 %YAML 1.2
 ---
-db_backend_name: postgresql
-db_backend_settings:
+backend_name: postgresql
+postgresql_settings:
     username: your_username
     password: your_password
     dbname: dindexer
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 811a0f4..fa65122 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -33,13 +33,13 @@ namespace dinlib {
 		try {
 			auto settings = YAML::LoadFile(path);
 
-			if (not settings["db_backend_name"]) {
+			if (not settings["backend_name"]) {
 				return false;
 			}
-			parOut.backend_name = settings["db_backend_name"].as<std::string>();
-			if (settings["db_backend_settings"]) {
-				//parOut.db = settings["db_backend_settings"].as<dindb::Settings>();
-				auto settings_node = settings["db_backend_settings"];
+			parOut.backend_name = settings["backend_name"].as<std::string>();
+			const std::string backend_settings_section = parOut.backend_name + "_settings";
+			if (settings[backend_settings_section]) {
+				auto settings_node = settings[backend_settings_section];
 				parOut.backend_plugin = dindb::BackendPlugin(find_plugin_by_name(parOut.backend_name), &settings_node);
 				return true;
 			}

From 61b0b586cf77a211ffbcb2fe4dd59bb6b0e4f876 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 2 Jun 2016 21:16:19 +0200
Subject: [PATCH 026/170] Clean up code to handle failed attempts at loading
 backend plugins.

---
 include/dindexer-common/settings.hpp |  2 +-
 src/common/settings.cpp              | 55 +++++++++++++++++++---------
 src/delete/main.cpp                  | 16 ++++----
 src/locate/main.cpp                  | 16 ++++----
 src/navigate/main.cpp                | 17 ++++-----
 src/scan/main.cpp                    | 15 ++++----
 src/tag/main.cpp                     | 16 ++++----
 7 files changed, 74 insertions(+), 63 deletions(-)

diff --git a/include/dindexer-common/settings.hpp b/include/dindexer-common/settings.hpp
index 11f295f..d115c9a 100644
--- a/include/dindexer-common/settings.hpp
+++ b/include/dindexer-common/settings.hpp
@@ -28,7 +28,7 @@ namespace dinlib {
 		dindb::BackendPlugin backend_plugin;
 	};
 
-	bool load_settings ( const std::string& parPath, Settings& parOut, bool parExpand=true );
+	void load_settings ( const std::string& parPath, Settings& parOut, bool parExpand=true );
 } //namespace dinlib
 
 #endif
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index fa65122..23eeb7d 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -20,35 +20,32 @@
 #include <yaml-cpp/yaml.h>
 #include <ciso646>
 #include <wordexp.h>
+#include <stdexcept>
+#include <sstream>
 
 namespace dinlib {
 	namespace {
 		std::string expand ( const char* parString );
 		std::string find_plugin_by_name ( const std::string& parName );
+		void throw_if_plugin_failed ( const dindb::BackendPlugin& parPlugin, const std::string& parPluginPath, const std::string& parIntendedName );
 	} //unnamed namespace
 
-	bool load_settings (const std::string& parPath, dinlib::Settings& parOut, bool parExpand) {
+	void load_settings (const std::string& parPath, dinlib::Settings& parOut, bool parExpand) {
 		const std::string path = (parExpand ? expand(parPath.c_str()) : parPath);
 
-		try {
-			auto settings = YAML::LoadFile(path);
+		auto settings = YAML::LoadFile(path);
 
-			if (not settings["backend_name"]) {
-				return false;
-			}
-			parOut.backend_name = settings["backend_name"].as<std::string>();
-			const std::string backend_settings_section = parOut.backend_name + "_settings";
-			if (settings[backend_settings_section]) {
-				auto settings_node = settings[backend_settings_section];
-				parOut.backend_plugin = dindb::BackendPlugin(find_plugin_by_name(parOut.backend_name), &settings_node);
-				return true;
-			}
+		if (not settings["backend_name"]) {
+			throw std::runtime_error("No backend_name given in the config file");
 		}
-		catch (const std::exception&) {
-			return false;
+		parOut.backend_name = settings["backend_name"].as<std::string>();
+		const std::string backend_settings_section = parOut.backend_name + "_settings";
+		if (settings[backend_settings_section]) {
+			auto settings_node = settings[backend_settings_section];
+			const std::string plugin_path = find_plugin_by_name(parOut.backend_name);
+			parOut.backend_plugin = dindb::BackendPlugin(plugin_path, &settings_node);
+			throw_if_plugin_failed(parOut.backend_plugin, plugin_path, parOut.backend_name);
 		}
-
-		return false;
 	}
 
 	namespace {
@@ -73,5 +70,29 @@ namespace dinlib {
 			assert(dindb::backend_name(path) == parName);
 			return path;
 		}
+
+		void throw_if_plugin_failed (const dindb::BackendPlugin& parPlugin, const std::string& parPluginPath, const std::string& parIntendedName) {
+			if (not parPlugin.is_loaded()) {
+				std::ostringstream oss;
+				oss << "Unable to load plugin \"" << parIntendedName <<
+					"\" found at path \"" << parPluginPath << '"';
+				throw std::runtime_error(oss.str());
+			}
+			if (parPlugin.name() != parIntendedName) {
+				std::ostringstream oss;
+				oss << "Plugin \"" << parIntendedName << "\" not found." <<
+					" Plugin at path \"" << parPluginPath << "\" reports \"" <<
+					parPlugin.name() << "\" as its name";
+				throw std::runtime_error(oss.str());
+			}
+			if (parPlugin.max_supported_interface_version() < parPlugin.backend_interface_version()) {
+				std::ostringstream oss;
+				oss << "Plugin \"" << parPlugin.name() << "\" at path \"" <<
+					parPluginPath << "\" uses interface version " << parPlugin.backend_interface_version() <<
+					" but the maximum supported interface version is " <<
+					parPlugin.max_supported_interface_version();
+				throw std::runtime_error(oss.str());
+			}
+		}
 	} //unnamed namespace
 } //namespace dinlib
diff --git a/src/delete/main.cpp b/src/delete/main.cpp
index 0c42fb2..1e458ab 100644
--- a/src/delete/main.cpp
+++ b/src/delete/main.cpp
@@ -61,16 +61,14 @@ int main (int parArgc, char* parArgv[]) {
 	}
 
 	dinlib::Settings settings;
-	{
-		const bool loaded = dinlib::load_settings(CONFIG_FILE_PATH, settings);
-		if (not loaded) {
-			std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ", quitting\n";
-			return 1;
-		}
+	try {
+		dinlib::load_settings(CONFIG_FILE_PATH, settings);
+	}
+	catch (const std::runtime_error& err) {
+		std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ":\n";
+		std::cerr << err.what() << '\n';
+		return 1;
 	}
-	//TODO: throw if plugin loading failed
-	assert(settings.backend_plugin.name() == settings.backend_name);
-	assert(settings.backend_plugin.is_loaded());
 
 	if (not vm.count("groupid")) {
 		std::cerr << "No IDs specified\n";
diff --git a/src/locate/main.cpp b/src/locate/main.cpp
index 34edb87..860a7a5 100644
--- a/src/locate/main.cpp
+++ b/src/locate/main.cpp
@@ -71,16 +71,14 @@ int main (int parArgc, char* parArgv[]) {
 	}
 
 	dinlib::Settings settings;
-	{
-		const bool loaded = dinlib::load_settings(CONFIG_FILE_PATH, settings);
-		if (not loaded) {
-			std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ", quitting\n";
-			return 1;
-		}
+	try {
+		dinlib::load_settings(CONFIG_FILE_PATH, settings);
+	}
+	catch (const std::runtime_error& err) {
+		std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ":\n";
+		std::cerr << err.what() << '\n';
+		return 1;
 	}
-	//TODO: throw if plugin loading failed
-	assert(settings.backend_plugin.name() == settings.backend_name);
-	assert(settings.backend_plugin.is_loaded());
 
 	auto& db = settings.backend_plugin.backend();
 	if (vm.count("set")) {
diff --git a/src/navigate/main.cpp b/src/navigate/main.cpp
index fdcb835..c0436d5 100644
--- a/src/navigate/main.cpp
+++ b/src/navigate/main.cpp
@@ -26,7 +26,6 @@
 #include <ciso646>
 #include <string>
 #include <vector>
-#include <cassert>
 #include <boost/range/algorithm/copy.hpp>
 
 namespace {
@@ -52,16 +51,14 @@ int main (int parArgc, char* parArgv[]) {
 	}
 
 	dinlib::Settings settings;
-	{
-		const bool loaded = dinlib::load_settings(CONFIG_FILE_PATH, settings);
-		if (not loaded) {
-			std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ", quitting\n";
-			return 1;
-		}
+	try {
+		dinlib::load_settings(CONFIG_FILE_PATH, settings);
+	}
+	catch (const std::runtime_error& err) {
+		std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ":\n";
+		std::cerr << err.what() << '\n';
+		return 1;
 	}
-	//TODO: throw if plugin loading failed
-	assert(settings.backend_plugin.name() == settings.backend_name);
-	assert(settings.backend_plugin.is_loaded());
 
 	do_navigation(settings.backend_plugin.backend());
 	return 0;
diff --git a/src/scan/main.cpp b/src/scan/main.cpp
index d739066..e500e02 100644
--- a/src/scan/main.cpp
+++ b/src/scan/main.cpp
@@ -73,16 +73,15 @@ int main (int parArgc, char* parArgv[]) {
 #endif
 
 	dinlib::Settings settings;
-	{
-		const bool loaded = dinlib::load_settings(CONFIG_FILE_PATH, settings);
-		if (not loaded) {
-			std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ", quitting\n";
-			return 1;
+	try {
+		if (din::parse_commandline(parArgc, parArgv, vm)) {
+			return 0;
 		}
 	}
-	//TODO: throw if plugin loading failed
-	assert(settings.backend_plugin.name() == settings.backend_name);
-	assert(settings.backend_plugin.is_loaded());
+	catch (const std::invalid_argument& err) {
+		std::cerr << err.what() << "\nUse --help for help" << std::endl;
+		return 2;
+	}
 
 	bool ignore_read_errors = (vm.count("ignore-errors") > 0);
 	const std::string search_path(vm["search-path"].as<std::string>());
diff --git a/src/tag/main.cpp b/src/tag/main.cpp
index 5195640..454bc43 100644
--- a/src/tag/main.cpp
+++ b/src/tag/main.cpp
@@ -147,15 +147,13 @@ int main (int parArgc, char* parArgv[]) {
 	assert(id_mode xor glob_mode);
 
 	dinlib::Settings settings;
-	{
-		const bool loaded = dinlib::load_settings(CONFIG_FILE_PATH, settings);
-		if (not loaded) {
-			std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ", quitting\n";
-			return 1;
-		}
-		//TODO: throw if plugin loading failed
-		assert(settings.backend_plugin.name() == settings.backend_name);
-		assert(settings.backend_plugin.is_loaded());
+	try {
+		dinlib::load_settings(CONFIG_FILE_PATH, settings);
+	}
+	catch (const std::runtime_error& err) {
+		std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ":\n";
+		std::cerr << err.what() << '\n';
+		return 1;
 	}
 
 	const auto master_tags_string = vm["tags"].as<std::string>();

From 29c98c0154e8737f9e3c3d1d2f35369ec25a05ca Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 2 Jun 2016 22:49:49 +0100
Subject: [PATCH 027/170] Add module to find Redis C library

---
 cmake/Modules/Findhiredis.cmake | 55 +++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 cmake/Modules/Findhiredis.cmake

diff --git a/cmake/Modules/Findhiredis.cmake b/cmake/Modules/Findhiredis.cmake
new file mode 100644
index 0000000..c8d0336
--- /dev/null
+++ b/cmake/Modules/Findhiredis.cmake
@@ -0,0 +1,55 @@
+#Find libhiredis
+#
+#	HIREDIS_INCLUDE_DIRS		-	where to find hiredis/hiredis.h
+#	HIREDIS_LIBRARIES		-	list of libraries when using libhiredis
+#	HIREDIS_FOUND			-	true if libhiredis found
+#	HIREDIS_VERSION_STRING		-	the version of the libhiredis found
+#
+
+find_path(HIREDIS_INCLUDE_DIR NAMES hiredis/hiredis.h)
+
+find_library(HIREDIS_LIBRARY NAMES
+	hiredis
+)
+
+if(HIREDIS_INCLUDE_DIR)
+	if(EXISTS "${HIREDIS_INCLUDE_DIR}/hiredis/hiredis.h")
+		set(hiredis_ver_tmp_major 0)
+		set(hiredis_ver_tmp_minor 0)
+		set(hiredis_ver_tmp_patch 0)
+		file(STRINGS "${HIREDIS_INCLUDE_DIR}/hiredis/hiredis.h" hiredis_version_nums REGEX "^#define[\t ]+HIREDIS_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+")
+		foreach(hiredis_version_def IN LISTS hiredis_version_nums)
+			if ("${hiredis_version_def}" MATCHES "HIREDIS_MAJOR")
+				string(REGEX REPLACE "^#define[\t ]+HIREDIS_MAJOR[\t ]+([0-9]+).*" "\\1" hiredis_ver_tmp_major "${hiredis_version_def}")
+			elseif ("${hiredis_version_def}" MATCHES "HIREDIS_MINOR")
+				string(REGEX REPLACE "^#define[\t ]+HIREDIS_MINOR[\t ]+([0-9]+).*" "\\1" hiredis_ver_tmp_minor "${hiredis_version_def}")
+			elseif ("${hiredis_version_def}" MATCHES "HIREDIS_PATCH")
+				string(REGEX REPLACE "^#define[\t ]+HIREDIS_PATCH[\t ]+([0-9]+).*" "\\1" hiredis_ver_tmp_patch "${hiredis_version_def}")
+			endif()
+		endforeach()
+
+		unset(hiredis_version_nums)
+		unset(hiredis_version_def)
+		set(HIREDIS_VERSION_STRING "${hiredis_ver_tmp_major}.${hiredis_ver_tmp_minor}.${hiredis_ver_tmp_patch}")
+		unset(hiredis_ver_tmp_major)
+		unset(hiredis_ver_tmp_minor)
+		unset(hiredis_ver_tmp_patch)
+	endif()
+endif()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(hiredis
+	REQUIRED_VARS HIREDIS_LIBRARY HIREDIS_INCLUDE_DIR
+	VERSION_VAR HIREDIS_VERSION_STRING
+)
+
+if(HIREDIS_FOUND)
+	set(HIREDIS_LIBRARIES ${HIREDIS_LIBRARY})
+	set(HIREDIS_INCLUDE_DIRS ${HIREDIS_INCLUDE_DIR})
+endif()
+
+mark_as_advanced(
+    HIREDIS_ROOT_DIR
+    HIREDIS_INCLUDE_DIR
+    HIREDIS_LIBRARY
+)

From 742d024bfb76c7de7a232dceb58d12d409134d24 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 3 Jun 2016 20:26:54 +0200
Subject: [PATCH 028/170] Implement label and uuid retrieval for the disk being
 scanned.

---
 CMakeLists.txt             |  2 +-
 src/machinery/discinfo.cpp | 52 ++++++++++++++++++++++++++++++++++++++
 src/machinery/discinfo.hpp |  4 +++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0d7662..b3f19f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ if ("${DINDEXER_CONFIG_FILE}" STREQUAL "")
 endif()
 message(STATUS "Config file set to \"${DINDEXER_CONFIG_FILE}\"")
 
-find_package(Boost 1.53.0 REQUIRED COMPONENTS program_options)
+find_package(Boost 1.53.0 REQUIRED COMPONENTS program_options filesystem)
 find_package(PostgreSQL 8.3 REQUIRED)
 find_package(YamlCpp 0.5.1 REQUIRED)
 import_libpqtypes_project("${PostgreSQL_INCLUDE_DIRS}" "-O3 ${march_flag}")
diff --git a/src/machinery/discinfo.cpp b/src/machinery/discinfo.cpp
index 3993c30..521da49 100644
--- a/src/machinery/discinfo.cpp
+++ b/src/machinery/discinfo.cpp
@@ -35,6 +35,10 @@
 #	include <iostream>
 #endif
 #include <cstdint>
+#include <boost/filesystem.hpp>
+#include <boost/range/iterator_range_core.hpp>
+
+namespace fs = boost::filesystem;
 
 namespace mchlib {
 	namespace {
@@ -167,6 +171,41 @@ namespace mchlib {
 			return static_cast<LinuxDeviceTypes>(retval);
 		}
 #endif
+
+		std::string find_with_same_inode (const std::string& parWhat, const char* parWhere) {
+			using boost::make_iterator_range;
+
+			struct stat st;
+			if (stat(parWhat.c_str(), &st))
+				return std::string();
+
+			const auto& inode = st.st_ino;
+
+			fs::path p(parWhere);
+			if (not fs::exists(p) or not fs::is_directory(p)) {
+				throw std::runtime_error(
+					std::string("Search path \"") + p.string() +
+					"\" doesn't exist");
+			}
+
+			for (const fs::directory_entry& itm : make_iterator_range(fs::directory_iterator(p), fs::directory_iterator())) {
+				struct stat curr_st;
+				if (stat(itm.path().c_str(), &curr_st) and inode == curr_st.st_ino)
+					return fs::basename(itm);
+			}
+
+			return std::string();
+		}
+
+		//Get disc label by doing the equivalent of:
+		//find -L /dev/disk/by-label -inum $(stat -c %i /dev/sda1) -print
+		std::string retrieve_label (const std::string& parMountpoint) {
+			return find_with_same_inode(parMountpoint, "/dev/disk/by-label");
+		}
+
+		std::string retrieve_uuid (const std::string& parMountpoint) {
+			return find_with_same_inode(parMountpoint, "/dev/disk/by-uuid");
+		}
 	} //unnamed namespace
 
 	DiscInfo::DiscInfo (std::string&& parPath) :
@@ -187,6 +226,11 @@ namespace mchlib {
 			}
 			input_path.pop_right();
 		} while(input_path.atom_count() > 0);
+
+		if (mountpoint_found()) {
+			m_label = retrieve_label(mountpoint());
+			m_uuid = retrieve_uuid(mountpoint());
+		}
 	}
 
 	bool DiscInfo::mountpoint_found() const {
@@ -329,4 +373,12 @@ namespace mchlib {
 		};
 	}
 #endif
+
+	const std::string& DiscInfo::label() const {
+		return m_label;
+	}
+
+	const std::string& DiscInfo::filesystem_uuid() const {
+		return m_uuid;
+	}
 } //namespace mchlib
diff --git a/src/machinery/discinfo.hpp b/src/machinery/discinfo.hpp
index b4b4e25..0093d1f 100644
--- a/src/machinery/discinfo.hpp
+++ b/src/machinery/discinfo.hpp
@@ -52,11 +52,15 @@ namespace mchlib {
 		OpticalTypes optical_type ( void ) const;
 		DriveTypes drive_type ( void ) const;
 #endif
+		const std::string& label ( void ) const;
+		const std::string& filesystem_uuid ( void ) const;
 
 	private:
 		const std::string m_initial_path;
 		std::string m_mountpoint;
 		std::string m_device;
+		std::string m_label;
+		std::string m_uuid;
 	};
 } //namespace mchlib
 

From 5e1dfe37499865010ca1c6b8e03a392dd029e172 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 3 Jun 2016 20:27:07 +0200
Subject: [PATCH 029/170] Warning fix in clang.

---
 .../postgresql/backend_postgresql.hpp         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/backends/postgresql/backend_postgresql.hpp b/src/backends/postgresql/backend_postgresql.hpp
index 7a5468b..103c532 100644
--- a/src/backends/postgresql/backend_postgresql.hpp
+++ b/src/backends/postgresql/backend_postgresql.hpp
@@ -34,8 +34,8 @@ namespace dindb {
 		BackendPostgreSql ( std::string&& parUser, std::string&& parPass, std::string&& parDB, std::string&& parAddr, uint16_t parPort );
 		virtual ~BackendPostgreSql ( void ) noexcept;
 
-		virtual void connect ( void );
-		virtual void disconnect ( void );
+		virtual void connect ( void ) override;
+		virtual void disconnect ( void ) override;
 
 		virtual void tag_files ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
 		virtual void tag_files ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
@@ -46,18 +46,18 @@ namespace dindb {
 
 		virtual void delete_group ( const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf ) override;
 
-		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature );
-		virtual bool search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash );
+		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature ) override;
+		virtual bool search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash ) override;
 
-		virtual std::vector<LocatedItem> locate_in_db ( const std::string& parSearch, const TagList& parTags );
-		virtual std::vector<LocatedItem> locate_in_db ( const mchlib::TigerHash& parSearch, const TagList& parTags );
-		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, bool parCaseInsensitive );
-		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive );
+		virtual std::vector<LocatedItem> locate_in_db ( const std::string& parSearch, const TagList& parTags ) override;
+		virtual std::vector<LocatedItem> locate_in_db ( const mchlib::TigerHash& parSearch, const TagList& parTags ) override;
+		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, bool parCaseInsensitive ) override;
+		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive ) override;
 
-		virtual std::vector<GroupIDType> find_all_sets ( void );
-		virtual std::vector<dinhelp::MaxSizedArray<std::string, 3>> find_set_details ( const std::vector<GroupIDType>& parSets );
-		virtual std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir );
-		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath );
+		virtual std::vector<GroupIDType> find_all_sets ( void ) override;
+		virtual std::vector<dinhelp::MaxSizedArray<std::string, 3>> find_set_details ( const std::vector<GroupIDType>& parSets ) override;
+		virtual std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) override;
+		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath ) override;
 
 	private:
 		std::unique_ptr<pq::Connection> m_conn;

From f0e67f1c97912ebdfd698131b1a0990f9631ac93 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 3 Jun 2016 21:50:45 +0200
Subject: [PATCH 030/170] Fix wrong block of code

Backend plugin was not being initialized due to some copy paste error.
---
 src/scan/main.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/scan/main.cpp b/src/scan/main.cpp
index e500e02..e6e8e3f 100644
--- a/src/scan/main.cpp
+++ b/src/scan/main.cpp
@@ -74,13 +74,12 @@ int main (int parArgc, char* parArgv[]) {
 
 	dinlib::Settings settings;
 	try {
-		if (din::parse_commandline(parArgc, parArgv, vm)) {
-			return 0;
-		}
+		dinlib::load_settings(CONFIG_FILE_PATH, settings);
 	}
-	catch (const std::invalid_argument& err) {
-		std::cerr << err.what() << "\nUse --help for help" << std::endl;
-		return 2;
+	catch (const std::runtime_error& err) {
+		std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ":\n";
+		std::cerr << err.what() << '\n';
+		return 1;
 	}
 
 	bool ignore_read_errors = (vm.count("ignore-errors") > 0);

From 55a61526dced8ce3df7dd94b42de90ea2619a547 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sat, 4 Jun 2016 01:02:37 +0200
Subject: [PATCH 031/170] Fix DiscInfo and make it find label and uuid
 correctly.

It's not the mountpoint's inode that I needed, but that of the dev!
---
 src/machinery/discinfo.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/machinery/discinfo.cpp b/src/machinery/discinfo.cpp
index 521da49..ee96b6d 100644
--- a/src/machinery/discinfo.cpp
+++ b/src/machinery/discinfo.cpp
@@ -190,7 +190,7 @@ namespace mchlib {
 
 			for (const fs::directory_entry& itm : make_iterator_range(fs::directory_iterator(p), fs::directory_iterator())) {
 				struct stat curr_st;
-				if (stat(itm.path().c_str(), &curr_st) and inode == curr_st.st_ino)
+				if (not stat(itm.path().c_str(), &curr_st) and inode == curr_st.st_ino)
 					return fs::basename(itm);
 			}
 
@@ -199,12 +199,12 @@ namespace mchlib {
 
 		//Get disc label by doing the equivalent of:
 		//find -L /dev/disk/by-label -inum $(stat -c %i /dev/sda1) -print
-		std::string retrieve_label (const std::string& parMountpoint) {
-			return find_with_same_inode(parMountpoint, "/dev/disk/by-label");
+		std::string retrieve_label (const std::string& parDev) {
+			return find_with_same_inode(parDev, "/dev/disk/by-label");
 		}
 
-		std::string retrieve_uuid (const std::string& parMountpoint) {
-			return find_with_same_inode(parMountpoint, "/dev/disk/by-uuid");
+		std::string retrieve_uuid (const std::string& parDev) {
+			return find_with_same_inode(parDev, "/dev/disk/by-uuid");
 		}
 	} //unnamed namespace
 
@@ -228,8 +228,8 @@ namespace mchlib {
 		} while(input_path.atom_count() > 0);
 
 		if (mountpoint_found()) {
-			m_label = retrieve_label(mountpoint());
-			m_uuid = retrieve_uuid(mountpoint());
+			m_label = retrieve_label(m_device);
+			m_uuid = retrieve_uuid(m_device);
 		}
 	}
 

From 7117ff7be266f934e97a5430b4a6023c65b3af10 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sat, 4 Jun 2016 01:03:20 +0200
Subject: [PATCH 032/170] Save and read label and uuid to the database

---
 dindexer.sql.in                                |  6 ++++--
 include/backends/db_backend.hpp                |  4 ++--
 include/dindexer-machinery/recorddata.hpp      |  2 ++
 src/backends/postgresql/backend_postgresql.cpp | 11 ++++++++---
 src/backends/postgresql/backend_postgresql.hpp |  4 ++--
 src/backends/postgresql/navigate.cpp           |  4 +++-
 src/backends/postgresql/navigate.hpp           |  4 +++-
 src/backends/postgresql/scan.cpp               | 14 +++++++++-----
 src/backends/postgresql/scan.hpp               |  2 +-
 src/machinery/scantask/mediatype.cpp           |  7 +++++++
 src/scan/main.cpp                              |  4 +---
 11 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/dindexer.sql.in b/dindexer.sql.in
index a5a905a..355ba9d 100644
--- a/dindexer.sql.in
+++ b/dindexer.sql.in
@@ -5,7 +5,7 @@
 -- Dumped from database version 9.5.2
 -- Dumped by pg_dump version 9.5.2
 
--- Started on 2016-05-18 00:47:01 CEST
+-- Started on 2016-06-03 20:30:32 CEST
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -160,6 +160,8 @@ CREATE TABLE sets (
     creation timestamp with time zone DEFAULT now() NOT NULL,
     app_name character varying NOT NULL,
     content_type character(1) DEFAULT 'G'::bpchar NOT NULL,
+    disk_label text NOT NULL,
+    fs_uuid text NOT NULL,
     CONSTRAINT chk_sets_type CHECK (((type = 'C'::bpchar) OR (type = 'D'::bpchar) OR (type = 'V'::bpchar) OR (type = 'B'::bpchar) OR (type = 'F'::bpchar) OR (type = 'H'::bpchar) OR (type = 'Z'::bpchar) OR (type = 'O'::bpchar)))
 );
 
@@ -309,7 +311,7 @@ GRANT ALL ON SCHEMA public TO postgres;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
--- Completed on 2016-05-18 00:47:01 CEST
+-- Completed on 2016-06-03 20:30:33 CEST
 
 --
 -- PostgreSQL database dump complete
diff --git a/include/backends/db_backend.hpp b/include/backends/db_backend.hpp
index 07aec9c..a87596d 100644
--- a/include/backends/db_backend.hpp
+++ b/include/backends/db_backend.hpp
@@ -74,7 +74,7 @@ namespace dindb {
 
 		virtual void delete_group ( const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf ) = 0;
 
-		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature ) = 0;
+		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature ) = 0;
 		virtual bool search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash ) = 0;
 
 		virtual std::vector<LocatedItem> locate_in_db ( const std::string& parSearch, const TagList& parTags ) = 0;
@@ -83,7 +83,7 @@ namespace dindb {
 		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive ) = 0;
 
 		virtual std::vector<GroupIDType> find_all_sets ( void ) = 0;
-		virtual std::vector<dinhelp::MaxSizedArray<std::string, 3>> find_set_details ( const std::vector<GroupIDType>& parSets ) = 0;
+		virtual std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details ( const std::vector<GroupIDType>& parSets ) = 0;
 		virtual std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) = 0;
 		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath ) = 0;
 	};
diff --git a/include/dindexer-machinery/recorddata.hpp b/include/dindexer-machinery/recorddata.hpp
index 3afc127..29bb653 100644
--- a/include/dindexer-machinery/recorddata.hpp
+++ b/include/dindexer-machinery/recorddata.hpp
@@ -138,6 +138,8 @@ namespace mchlib {
 
 	struct SetRecordDataFull : public SetRecordData {
 		std::string name;
+		std::string disk_label;
+		std::string fs_uuid;
 		uint32_t disk_number;
 	};
 
diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
index 68577ec..933a9ce 100644
--- a/src/backends/postgresql/backend_postgresql.cpp
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -117,7 +117,7 @@ namespace dindb {
 		dindb::delete_group_from_db(*m_conn, parIDs, parConf);
 	}
 
-	void BackendPostgreSql::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature) {
+	void BackendPostgreSql::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
 		dindb::write_to_db(*m_conn, parData, parSetData, parSignature);
 	}
 
@@ -145,8 +145,13 @@ namespace dindb {
 		return dindb::find_all_sets(*m_conn);
 	}
 
-	std::vector<dinhelp::MaxSizedArray<std::string, 3>> BackendPostgreSql::find_set_details (const std::vector<GroupIDType>& parSets) {
-		return dindb::find_set_details<dindb::SetDetail_ID, dindb::SetDetail_Desc, dindb::SetDetail_CreeationDate>(*m_conn, parSets);
+	std::vector<dinhelp::MaxSizedArray<std::string, 4>> BackendPostgreSql::find_set_details (const std::vector<GroupIDType>& parSets) {
+		return dindb::find_set_details<
+			dindb::SetDetail_ID,
+			dindb::SetDetail_Desc,
+			dindb::SetDetail_CreeationDate,
+			dindb::SetDetail_DiskLabel
+		>(*m_conn, parSets);
 	}
 
 	std::vector<dinhelp::MaxSizedArray<std::string, 1>> BackendPostgreSql::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
diff --git a/src/backends/postgresql/backend_postgresql.hpp b/src/backends/postgresql/backend_postgresql.hpp
index 103c532..3b0b872 100644
--- a/src/backends/postgresql/backend_postgresql.hpp
+++ b/src/backends/postgresql/backend_postgresql.hpp
@@ -46,7 +46,7 @@ namespace dindb {
 
 		virtual void delete_group ( const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf ) override;
 
-		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature ) override;
+		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature ) override;
 		virtual bool search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash ) override;
 
 		virtual std::vector<LocatedItem> locate_in_db ( const std::string& parSearch, const TagList& parTags ) override;
@@ -55,7 +55,7 @@ namespace dindb {
 		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive ) override;
 
 		virtual std::vector<GroupIDType> find_all_sets ( void ) override;
-		virtual std::vector<dinhelp::MaxSizedArray<std::string, 3>> find_set_details ( const std::vector<GroupIDType>& parSets ) override;
+		virtual std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details ( const std::vector<GroupIDType>& parSets ) override;
 		virtual std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) override;
 		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath ) override;
 
diff --git a/src/backends/postgresql/navigate.cpp b/src/backends/postgresql/navigate.cpp
index 43af1f2..ae06f75 100644
--- a/src/backends/postgresql/navigate.cpp
+++ b/src/backends/postgresql/navigate.cpp
@@ -44,7 +44,9 @@ namespace dindb {
 			{SetDetail_Type, "type"},
 			{SetDetail_CreeationDate, "creation"},
 			{SetDetail_AppName, "app_name"},
-			{SetDetail_ID, "id"}
+			{SetDetail_ID, "id"},
+			{SetDetail_DiskLabel, "disk_label"},
+			{SetDetail_FSUuid, "fs_uuid"}
 		};
 		const FileDetailsMap g_file_details_map {
 			{FileDetail_ID, "id"},
diff --git a/src/backends/postgresql/navigate.hpp b/src/backends/postgresql/navigate.hpp
index d52ecd7..cc732ba 100644
--- a/src/backends/postgresql/navigate.hpp
+++ b/src/backends/postgresql/navigate.hpp
@@ -44,7 +44,9 @@ namespace dindb {
 		SetDetail_Type = 0x02,
 		SetDetail_CreeationDate = 0x04,
 		SetDetail_AppName = 0x08,
-		SetDetail_ID = 0x10
+		SetDetail_ID = 0x10,
+		SetDetail_DiskLabel = 0x20,
+		SetDetail_FSUuid = 0x40
 	};
 
 	enum FileDetails {
diff --git a/src/backends/postgresql/scan.cpp b/src/backends/postgresql/scan.cpp
index fd533ed..ca5e09b 100644
--- a/src/backends/postgresql/scan.cpp
+++ b/src/backends/postgresql/scan.cpp
@@ -64,7 +64,7 @@ namespace dindb {
 
 		{
 			auto resultset = parDB.query(
-				"SELECT \"desc\",\"type\",\"disk_number\" FROM sets WHERE \"id\"=$1;",
+				"SELECT \"desc\",\"type\",\"disk_number\",\"fs_uuid\",\"disk_label\" FROM sets WHERE \"id\"=$1;",
 				group_id
 			);
 			if (resultset.empty()) {
@@ -77,11 +77,13 @@ namespace dindb {
 			parSet.type = lexical_cast<char>(row["type"]);
 			parSet.name = row["desc"];
 			parSet.disk_number = lexical_cast<uint32_t>(row["disk_number"]);
+			parSet.fs_uuid = row["fs_uuid"];
+			parSet.disk_label = row["disk_label"];
 		}
 		return true;
 	}
 
-	void write_to_db (pq::Connection& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature) {
+	void write_to_db (pq::Connection& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
 		using std::chrono::system_clock;
 		using boost::lexical_cast;
 
@@ -96,12 +98,14 @@ namespace dindb {
 		{
 			auto id_res = parDB.query("INSERT INTO \"sets\" "
 				"(\"desc\",\"type\",\"app_name\""
-				",\"content_type\") "
-				"VALUES ($1, $2, $3, $4) RETURNING \"id\";",
+				",\"content_type\",\"fs_uuid\",\"disk_label\") "
+				"VALUES ($1, $2, $3, $4, $5, $6) RETURNING \"id\";",
 				parSetData.name,
 				boost::string_ref(&parSetData.type, 1),
 				parSignature,
-				boost::string_ref(&parSetData.content_type, 1)
+				boost::string_ref(&parSetData.content_type, 1),
+			    parSetData.fs_uuid,
+			    parSetData.disk_label
 			);
 			assert(id_res.size() == 1);
 			assert(id_res[0].size() == 1);
diff --git a/src/backends/postgresql/scan.hpp b/src/backends/postgresql/scan.hpp
index 72521d7..b8f7482 100644
--- a/src/backends/postgresql/scan.hpp
+++ b/src/backends/postgresql/scan.hpp
@@ -36,7 +36,7 @@ namespace pq {
 namespace dindb {
 	struct Settings;;
 
-	void write_to_db ( pq::Connection& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordData& parSetData, const std::string& parSignature );
+	void write_to_db ( pq::Connection& parDB, const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature );
 	bool read_from_db ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, pq::Connection& parDB, const mchlib::TigerHash& parHash );
 } //namespace dindb
 
diff --git a/src/machinery/scantask/mediatype.cpp b/src/machinery/scantask/mediatype.cpp
index 1374c3f..ddd244a 100644
--- a/src/machinery/scantask/mediatype.cpp
+++ b/src/machinery/scantask/mediatype.cpp
@@ -21,6 +21,7 @@
 #	include "dindexer-machinery/mediatype.hpp"
 #endif
 #include "dindexer-machinery/recorddata.hpp"
+#include "discinfo.hpp"
 #include <utility>
 
 namespace mchlib {
@@ -57,6 +58,12 @@ namespace mchlib {
 #else
 			data.type = media_type_to_char(m_default);
 #endif
+
+			{
+				DiscInfo info((std::string(m_search_path)));
+				data.disk_label = info.label();
+				data.fs_uuid = info.filesystem_uuid();
+			}
 		}
 	} //namespace scantask
 } //namespace mchlib
diff --git a/src/scan/main.cpp b/src/scan/main.cpp
index e6e8e3f..207feec 100644
--- a/src/scan/main.cpp
+++ b/src/scan/main.cpp
@@ -118,7 +118,6 @@ namespace {
 	bool add_to_db (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSet, dindb::Backend& parDB, bool parForce) {
 		using mchlib::FileRecordData;
 		using mchlib::SetRecordDataFull;
-		using mchlib::SetRecordData;
 
 		if (not parForce) {
 			const auto& first_hash = parData.front().hash;
@@ -130,11 +129,10 @@ namespace {
 			}
 		}
 
-		const SetRecordData& set_data {parSet.name, parSet.type, parSet.content_type };
 		const auto app_signature = dinlib::dindexer_signature();
 		const auto lib_signature = mchlib::lib_signature();
 		const std::string signature = std::string(app_signature.data(), app_signature.size()) + "/" + std::string(lib_signature.data(), lib_signature.size());
-		parDB.write_files(parData, set_data, signature);
+		parDB.write_files(parData, parSet, signature);
 		return true;
 	}
 

From 2057c797cb4f4e2bfc3d83d422405b6ed9f24cd5 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sat, 4 Jun 2016 01:13:26 +0200
Subject: [PATCH 033/170] SetRecordData is not really needed anymore so get rid
 of it

Always use SetRecordDataFull now.
---
 include/backends/db_backend.hpp           |  1 -
 include/dindexer-machinery/recorddata.hpp | 10 +++-------
 src/backends/postgresql/scan.hpp          |  1 -
 src/machinery/scantask/setbasic.cpp       |  2 --
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/include/backends/db_backend.hpp b/include/backends/db_backend.hpp
index a87596d..b195f78 100644
--- a/include/backends/db_backend.hpp
+++ b/include/backends/db_backend.hpp
@@ -30,7 +30,6 @@
 namespace mchlib {
 	struct TigerHash;
 	struct FileRecordData;
-	struct SetRecordData;
 	struct SetRecordDataFull;
 } //namespace mchlib
 
diff --git a/include/dindexer-machinery/recorddata.hpp b/include/dindexer-machinery/recorddata.hpp
index 29bb653..8ecf5ce 100644
--- a/include/dindexer-machinery/recorddata.hpp
+++ b/include/dindexer-machinery/recorddata.hpp
@@ -130,17 +130,13 @@ namespace mchlib {
 		bool hash_valid;
 	};
 
-	struct SetRecordData {
-		boost::string_ref name;
-		char type;
-		char content_type;
-	};
-
-	struct SetRecordDataFull : public SetRecordData {
+	struct SetRecordDataFull {
 		std::string name;
 		std::string disk_label;
 		std::string fs_uuid;
 		uint32_t disk_number;
+		char type;
+		char content_type;
 	};
 
 #if !defined(NDEBUG)
diff --git a/src/backends/postgresql/scan.hpp b/src/backends/postgresql/scan.hpp
index b8f7482..b270c1a 100644
--- a/src/backends/postgresql/scan.hpp
+++ b/src/backends/postgresql/scan.hpp
@@ -24,7 +24,6 @@
 
 namespace mchlib {
 	struct FileRecordData;
-	struct SetRecordData;
 	struct SetRecordDataFull;
 	struct TigerHash;
 } //namespace mchlib
diff --git a/src/machinery/scantask/setbasic.cpp b/src/machinery/scantask/setbasic.cpp
index 0538aed..f9f4e29 100644
--- a/src/machinery/scantask/setbasic.cpp
+++ b/src/machinery/scantask/setbasic.cpp
@@ -29,13 +29,11 @@ namespace mchlib {
 		}
 
 		void SetBasic::on_data_destroy (SetRecordDataFull& parData) {
-			static_cast<SetRecordData&>(parData).name.clear();
 			parData.name.clear();
 		}
 
 		void SetBasic::on_data_create (SetRecordDataFull& parData) {
 			parData.name = m_set_name;
-			static_cast<SetRecordData&>(parData).name = parData.name;
 		}
 	} //namespace scantask
 } //namespace mchlib

From d5cf8e21b220495aec3323270d51e9a42d3edd8d Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sat, 4 Jun 2016 01:13:47 +0200
Subject: [PATCH 034/170] Add cleaning of the new uuid and label properties

---
 src/machinery/scantask/setbasic.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/machinery/scantask/setbasic.cpp b/src/machinery/scantask/setbasic.cpp
index f9f4e29..53a5f97 100644
--- a/src/machinery/scantask/setbasic.cpp
+++ b/src/machinery/scantask/setbasic.cpp
@@ -30,10 +30,14 @@ namespace mchlib {
 
 		void SetBasic::on_data_destroy (SetRecordDataFull& parData) {
 			parData.name.clear();
+			parData.fs_uuid.clear();
+			parData.disk_label.clear();
 		}
 
 		void SetBasic::on_data_create (SetRecordDataFull& parData) {
 			parData.name = m_set_name;
+			parData.fs_uuid.clear();
+			parData.disk_label.clear();
 		}
 	} //namespace scantask
 } //namespace mchlib

From a1490c30968118b4c69f6837966b3986a47177fe Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 6 Jun 2016 19:52:42 +0200
Subject: [PATCH 035/170] Make split_tags a bit more generic so I can reuse it

I need it in an upcoming commit where I want to split on ':'
---
 include/dindexer-common/split_tags.hpp | 1 +
 src/common/split_tags.cpp              | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/dindexer-common/split_tags.hpp b/include/dindexer-common/split_tags.hpp
index 149cc25..3005751 100644
--- a/include/dindexer-common/split_tags.hpp
+++ b/include/dindexer-common/split_tags.hpp
@@ -24,6 +24,7 @@
 #include "helpers/compatibility.h"
 
 namespace dinlib {
+	std::vector<boost::string_ref> split_and_trim ( const std::string& parList, char parSeparator ) a_pure;
 	std::vector<boost::string_ref> split_tags ( const std::string& parCommaSeparatedList ) a_pure;
 } //namespace dinlib
 
diff --git a/src/common/split_tags.cpp b/src/common/split_tags.cpp
index 4ba7275..931a8d5 100644
--- a/src/common/split_tags.cpp
+++ b/src/common/split_tags.cpp
@@ -26,6 +26,10 @@
 
 namespace dinlib {
 	std::vector<boost::string_ref> split_tags (const std::string& parCommaSeparatedList) {
+		return split_and_trim(parCommaSeparatedList, ',');
+	}
+
+	std::vector<boost::string_ref> split_and_trim (const std::string& parList, char parSeparator) {
 		using OutRange = boost::iterator_range<std::string::const_iterator>;
 		using boost::token_finder;
 		using boost::adaptors::transformed;
@@ -42,7 +46,7 @@ namespace dinlib {
 		//http://www.boost.org/doc/libs/1_60_0/doc/html/boost/algorithm/token_finder.html
 		//https://stackoverflow.com/questions/20781090/difference-between-boostsplit-vs-boostiter-split
 		return boost::copy_range<std::vector<string_ref>>(
-			iter_split(out_range, parCommaSeparatedList, token_finder([](char c){return ','==c;})) |
+			iter_split(out_range, parList, token_finder([parSeparator](char c){return parSeparator==c;})) |
 				transformed([](const OutRange& r){return trim_copy(r);}) |
 				transformed([](const OutRange& r){return string_ref(&*r.begin(), r.size());}) |
 				filtered([](const string_ref& r){return not r.empty();})

From 624bba121f746c3a6fb7ae343a001cf4bda68efc Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 6 Jun 2016 19:54:20 +0200
Subject: [PATCH 036/170] Remove hardcoded path to postgresql backend and make
 the search dynamic

---
 CMakeLists.txt                  |  2 +-
 src/backends/backend_loader.cpp | 23 ++++++++++++++++---
 src/common/settings.cpp         | 39 +++++++++++++++++++++++----------
 3 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3f19f6..f0dd066 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ if ("${DINDEXER_CONFIG_FILE}" STREQUAL "")
 endif()
 message(STATUS "Config file set to \"${DINDEXER_CONFIG_FILE}\"")
 
-find_package(Boost 1.53.0 REQUIRED COMPONENTS program_options filesystem)
+find_package(Boost 1.53.0 REQUIRED COMPONENTS program_options filesystem system)
 find_package(PostgreSQL 8.3 REQUIRED)
 find_package(YamlCpp 0.5.1 REQUIRED)
 import_libpqtypes_project("${PostgreSQL_INCLUDE_DIRS}" "-O3 ${march_flag}")
diff --git a/src/backends/backend_loader.cpp b/src/backends/backend_loader.cpp
index 3aa8547..05b5909 100644
--- a/src/backends/backend_loader.cpp
+++ b/src/backends/backend_loader.cpp
@@ -24,6 +24,7 @@
 #include <dlfcn.h>
 #include <cassert>
 #include <functional>
+#include <sstream>
 
 namespace dindb {
 	namespace {
@@ -34,9 +35,22 @@ namespace dindb {
 			assert(parSOHandle);
 			assert(parConfig);
 
-			auto create = reinterpret_cast<CreateBackendFun>(dlsym(parSOHandle, "dindexer_create_backend"));
-			auto destroy = reinterpret_cast<DeleteBackendFun>(dlsym(parSOHandle, "dindexer_destroy_backend"));
+			const char* const fun_name_create = "dindexer_create_backend";
+			const char* const fun_name_destroy = "dindexer_destroy_backend";
 
+			auto create = reinterpret_cast<CreateBackendFun>(dlsym(parSOHandle, fun_name_create));
+			auto destroy = reinterpret_cast<DeleteBackendFun>(dlsym(parSOHandle, fun_name_destroy));
+
+			if (not create) {
+				std::ostringstream oss;
+				oss << "Unable to find function " << fun_name_create;
+				throw std::runtime_error(oss.str());
+			}
+			if (not destroy) {
+				std::ostringstream oss;
+				oss << "Unable to find function " << fun_name_destroy;
+				throw std::runtime_error(oss.str());
+			}
 			return BackendPtr(create(parConfig), destroy);
 		}
 
@@ -65,7 +79,10 @@ namespace dindb {
 		using SoHandle = std::unique_ptr<void, int(*)(void*)>;
 
 		auto handle = SoHandle(dlopen(parSOPath.c_str(), RTLD_LAZY), &dlclose);
-		return backend_name(handle.get());
+		if (handle)
+			return backend_name(handle.get());
+		else
+			return std::string();
 	}
 
 	BackendPlugin::BackendPlugin() :
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 23eeb7d..cf68d48 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -16,33 +16,40 @@
  */
 
 #include "dindexer-common/settings.hpp"
+#include "dindexer-common/split_tags.hpp"
 #include "dindexerConfig.h"
 #include <yaml-cpp/yaml.h>
 #include <ciso646>
 #include <wordexp.h>
 #include <stdexcept>
 #include <sstream>
+#include <boost/filesystem.hpp>
+#include <boost/range/iterator_range_core.hpp>
 
 namespace dinlib {
 	namespace {
 		std::string expand ( const char* parString );
-		std::string find_plugin_by_name ( const std::string& parName );
+		std::string find_plugin_by_name ( const std::vector<boost::string_ref>& parSearchPaths, const std::string& parName );
 		void throw_if_plugin_failed ( const dindb::BackendPlugin& parPlugin, const std::string& parPluginPath, const std::string& parIntendedName );
 	} //unnamed namespace
 
 	void load_settings (const std::string& parPath, dinlib::Settings& parOut, bool parExpand) {
 		const std::string path = (parExpand ? expand(parPath.c_str()) : parPath);
+		std::string search_paths(ACTIONS_SEARCH_PATH);
 
 		auto settings = YAML::LoadFile(path);
 
-		if (not settings["backend_name"]) {
+		if (not settings["backend_name"])
 			throw std::runtime_error("No backend_name given in the config file");
-		}
+		if (settings["backend_paths"])
+			search_paths += ":" + settings["backend_paths"].as<std::string>();
 		parOut.backend_name = settings["backend_name"].as<std::string>();
 		const std::string backend_settings_section = parOut.backend_name + "_settings";
 		if (settings[backend_settings_section]) {
 			auto settings_node = settings[backend_settings_section];
-			const std::string plugin_path = find_plugin_by_name(parOut.backend_name);
+			const std::string plugin_path = find_plugin_by_name(split_and_trim(search_paths, ':'), parOut.backend_name);
+			if (plugin_path.empty())
+				throw std::runtime_error(std::string("Unable to find any suitable plugin with the specified name \"") + parOut.backend_name + "\"");
 			parOut.backend_plugin = dindb::BackendPlugin(plugin_path, &settings_node);
 			throw_if_plugin_failed(parOut.backend_plugin, plugin_path, parOut.backend_name);
 		}
@@ -61,14 +68,24 @@ namespace dinlib {
 			return oss.str();
 		}
 
-		std::string find_plugin_by_name (const std::string& parName) {
-			//assert(false); //not implemented
-			//TODO: write a proper implementation
-			std::string path = ACTIONS_SEARCH_PATH;
-			path += "/backends/postgresql/libdindexer-backend-postgresql.so";
+		std::string find_plugin_by_name (const std::vector<boost::string_ref>& parSearchPaths, const std::string& parName) {
+			using boost::filesystem::path;
+			using boost::filesystem::is_directory;
+			using boost::filesystem::directory_iterator;
+			using boost::filesystem::directory_entry;
+			using boost::make_iterator_range;
 
-			assert(dindb::backend_name(path) == parName);
-			return path;
+			for (auto search_path : parSearchPaths) {
+				const std::string search_path_cpy(search_path.begin(), search_path.end());
+				path curr_path(search_path_cpy);
+				auto listing = make_iterator_range(directory_iterator(curr_path), directory_iterator());
+				for (const directory_entry& entry : listing) {
+					auto current_full_path = entry.path().string();
+					if (not is_directory(entry) and dindb::backend_name(current_full_path) == parName)
+						return current_full_path;
+				}
+			}
+			return std::string();
 		}
 
 		void throw_if_plugin_failed (const dindb::BackendPlugin& parPlugin, const std::string& parPluginPath, const std::string& parIntendedName) {

From 3fe962a8e515fb3fc96b3c10b8f9810557868c34 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 6 Jun 2016 20:24:05 +0200
Subject: [PATCH 037/170] Make symlink to postgresql backend

This is helpful so when running dindexer in a dev environment you don't
need to list all the possible paths to every backend. Symlinks to all
backends will all be in the same place.
---
 dindexer.yml                           |  1 +
 src/backends/CMakeLists.txt            | 10 +++++++++-
 src/backends/postgresql/CMakeLists.txt |  1 +
 src/common/settings.cpp                |  2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dindexer.yml b/dindexer.yml
index 38242d4..0f1330f 100644
--- a/dindexer.yml
+++ b/dindexer.yml
@@ -7,3 +7,4 @@ postgresql_settings:
     dbname: dindexer
     port: 5432
     address: 200.100.200.100
+backend_paths: path to your build_dir/src/backend
diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt
index 0ac6613..302b2e8 100644
--- a/src/backends/CMakeLists.txt
+++ b/src/backends/CMakeLists.txt
@@ -1,5 +1,14 @@
 project(${bare_name}-backend CXX)
 
+set(BACKEND_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+function(ln_backend backend_name)
+	add_custom_command(TARGET "${backend_name}" POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:${backend_name}> ${BACKEND_BINARY_DIR}/$<TARGET_FILE_NAME:${backend_name}>
+		DEPENDS ${BACKEND_BINARY_DIR}/$<TARGET_FILE_NAME:${backend_name}>
+		COMMENT "Creating symlink to ${backend_name}"
+	)
+endfunction()
+
 add_library(${PROJECT_NAME} STATIC
 	backend_loader.cpp
 )
@@ -25,5 +34,4 @@ target_link_libraries(${PROJECT_NAME}
 #)
 
 add_subdirectory(postgresql)
-
 add_dependencies(${PROJECT_NAME} ${bare_name}-backend-postgresql)
diff --git a/src/backends/postgresql/CMakeLists.txt b/src/backends/postgresql/CMakeLists.txt
index 89b8680..486d5b0 100644
--- a/src/backends/postgresql/CMakeLists.txt
+++ b/src/backends/postgresql/CMakeLists.txt
@@ -23,3 +23,4 @@ install(TARGETS ${PROJECT_NAME}
 	RUNTIME DESTINATION bin
 	ARCHIVE DESTINATION lib/static
 )
+ln_backend(${PROJECT_NAME})
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index cf68d48..95b6b45 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -35,7 +35,7 @@ namespace dinlib {
 
 	void load_settings (const std::string& parPath, dinlib::Settings& parOut, bool parExpand) {
 		const std::string path = (parExpand ? expand(parPath.c_str()) : parPath);
-		std::string search_paths(ACTIONS_SEARCH_PATH);
+		std::string search_paths;
 
 		auto settings = YAML::LoadFile(path);
 

From 0ab66fa1f14f402afa29f0229b9ae43f283367e8 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 7 Jun 2016 22:45:30 +0100
Subject: [PATCH 038/170] Stub implementation of a Redis backend.

---
 CMakeLists.txt                       |   2 -
 src/backends/CMakeLists.txt          |   2 +
 src/backends/redis/CMakeLists.txt    |  24 ++++
 src/backends/redis/backend_redis.cpp | 158 +++++++++++++++++++++++++++
 src/backends/redis/backend_redis.hpp |  71 ++++++++++++
 src/pq/CMakeLists.txt                |   2 +
 6 files changed, 257 insertions(+), 2 deletions(-)
 create mode 100644 src/backends/redis/CMakeLists.txt
 create mode 100644 src/backends/redis/backend_redis.cpp
 create mode 100644 src/backends/redis/backend_redis.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3f19f6..3a69bc0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,6 @@ configure_file(
 
 target_include_directories(${PROJECT_NAME} SYSTEM
 	INTERFACE ${Boost_INCLUDE_DIRS}
-	INTERFACE ${PostgreSQL_INCLUDE_DIRS}
 )
 
 target_compile_features(${PROJECT_NAME}
@@ -147,7 +146,6 @@ if (BUILD_TESTING)
 endif()
 
 target_link_libraries(${PROJECT_NAME}
-	INTERFACE ${PostgreSQL_LIBRARIES}
 	INTERFACE ${Boost_LIBRARIES}
 	INTERFACE ${bare_name}-pq
 	INTERFACE ${bare_name}-inc
diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt
index 0ac6613..60e0a31 100644
--- a/src/backends/CMakeLists.txt
+++ b/src/backends/CMakeLists.txt
@@ -25,5 +25,7 @@ target_link_libraries(${PROJECT_NAME}
 #)
 
 add_subdirectory(postgresql)
+add_subdirectory(redis)
 
 add_dependencies(${PROJECT_NAME} ${bare_name}-backend-postgresql)
+add_dependencies(${PROJECT_NAME} ${bare_name}-backend-redis)
diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
new file mode 100644
index 0000000..8535712
--- /dev/null
+++ b/src/backends/redis/CMakeLists.txt
@@ -0,0 +1,24 @@
+project(${bare_name}-backend-redis CXX)
+
+find_package(hiredis 0.11.0 REQUIRED)
+
+add_library(${PROJECT_NAME} SHARED
+	backend_redis.cpp
+)
+
+target_include_directories(${PROJECT_NAME} SYSTEM
+	PUBLIC ${Boost_INCLUDE_DIRS}
+	PRIVATE ${HIREDIS_INCLUDE_DIRS}
+)
+
+target_link_libraries(${PROJECT_NAME}
+	PRIVATE ${bare_name}-inc
+	PRIVATE ${bare_name}-pq
+	PRIVATE ${HIREDIS_LIBRARIES}
+)
+
+install(TARGETS ${PROJECT_NAME}
+	LIBRARY DESTINATION lib
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib/static
+)
\ No newline at end of file
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
new file mode 100644
index 0000000..8ddfb66
--- /dev/null
+++ b/src/backends/redis/backend_redis.cpp
@@ -0,0 +1,158 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "backend_redis.hpp"
+#include "dindexer-machinery/recorddata.hpp"
+#include <utility>
+#include <hiredis/hiredis.h>
+#include <ciso646>
+#include <stdexcept>
+#include <sstream>
+#include <algorithm>
+#include <cassert>
+
+namespace dindb {
+	namespace {
+        using RedisReply = std::unique_ptr<redisReply, void(*)(void*)>;
+	} //unnamed namespace
+
+    BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort,
+                               bool parConnect) :
+            m_conn(nullptr, &redisFree),
+            m_address(std::move(parAddress)),
+            m_port(parPort) {
+        if (parConnect)
+            this->connect();
+    }
+
+    BackendRedis::~BackendRedis() noexcept {
+    }
+
+    void BackendRedis::connect() {
+        if (not m_conn) {
+			struct timeval timeout = {5, 500000}; //5.5 seconds?
+			RedisConnection conn(
+				redisConnectWithTimeout(m_address.c_str(), m_port, timeout),
+				&redisFree
+			);
+			if (not conn) {
+				std::ostringstream oss;
+				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port;
+				throw std::runtime_error(oss.str());
+			}
+			if (conn->err) {
+				std::ostringstream oss;
+				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port <<
+					": " << conn->errstr;
+				throw std::runtime_error(oss.str());
+			}
+			std::swap(conn, m_conn);
+		}
+    }
+
+    void BackendRedis::disconnect() {
+        m_conn.reset();
+    }
+
+    void BackendRedis::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+    }
+
+    void BackendRedis::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+    }
+
+    void BackendRedis::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+    }
+
+    void BackendRedis::delete_tags (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	}
+
+    void BackendRedis::delete_all_tags (const std::vector<FileIDType>& parFiles, GroupIDType parSet) {
+	}
+
+    void BackendRedis::delete_all_tags (const std::vector<std::string>& parRegexes, GroupIDType parSet) {
+	}
+
+    void BackendRedis::delete_group (const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
+	}
+
+    void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
+		assert(is_connected());
+		std::string key;
+		{
+			std::ostringstream key_oss;
+			RedisReply incr_reply(static_cast<redisReply*>(redisCommand(m_conn.get(), "incr set_counter")), &freeReplyObject);
+			key_oss << "sets:" << incr_reply->integer;
+			key = key_oss.str();
+		}
+
+		RedisReply insert_reply(
+			static_cast<redisReply*>(redisCommand(
+				m_conn.get(),
+				"hmset %b name %b disk_label %b fs_uuid %b",
+				key.data(),
+				key.size(),
+				parSetData.name.data(),
+				parSetData.name.size(),
+				parSetData.disk_label.data(),
+				parSetData.disk_label.size(),
+				parSetData.fs_uuid.data(),
+				parSetData.fs_uuid.size()
+			)),
+			&freeReplyObject
+		);
+	}
+
+    bool BackendRedis::search_file_by_hash (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) {
+		return false;
+	}
+
+    std::vector<LocatedItem> BackendRedis::locate_in_db (const std::string& parSearch, const TagList& parTags) {
+		return std::vector<LocatedItem>();
+	}
+
+    std::vector<LocatedItem> BackendRedis::locate_in_db (const mchlib::TigerHash& parSearch, const TagList& parTags) {
+		return std::vector<LocatedItem>();
+	}
+
+    std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSearch, bool parCaseInsensitive) {
+		return std::vector<LocatedSet>();
+	}
+
+    std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive) {
+		return std::vector<LocatedSet>();
+	}
+
+    std::vector<GroupIDType> BackendRedis::find_all_sets() {
+		return std::vector<GroupIDType>();
+	}
+
+    std::vector<dinhelp::MaxSizedArray<std::string, 4>> BackendRedis::find_set_details (const std::vector<GroupIDType>& parSets) {
+		return std::vector<dinhelp::MaxSizedArray<std::string, 4>>();
+	}
+
+    std::vector<dinhelp::MaxSizedArray<std::string, 1>> BackendRedis::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
+		return std::vector<dinhelp::MaxSizedArray<std::string, 1>>();
+	}
+
+    std::vector<std::string> BackendRedis::find_paths_starting_by (GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) {
+		return std::vector<std::string>();
+	}
+
+	bool BackendRedis::is_connected() const {
+		return m_conn and not m_conn->err;
+	}
+} //namespace dindb
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
new file mode 100644
index 0000000..3ab92a0
--- /dev/null
+++ b/src/backends/redis/backend_redis.hpp
@@ -0,0 +1,71 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef idB2F92EE07A004D5293FD0657EEE8F75B
+#define idB2F92EE07A004D5293FD0657EEE8F75B
+
+#include "backends/db_backend.hpp"
+#include <memory>
+#include <string>
+#include <cstdint>
+
+struct redisContext;
+
+namespace dindb {
+	class BackendRedis : public Backend {
+	public:
+		BackendRedis ( BackendRedis&& ) = default;
+		BackendRedis ( std::string&& parAddress, uint16_t parPort, bool parConnect );
+		virtual ~BackendRedis ( void ) noexcept;
+
+		virtual void connect ( void ) override;
+		virtual void disconnect ( void ) override;
+
+		virtual void tag_files ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
+		virtual void tag_files ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
+		virtual void delete_tags ( const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
+		virtual void delete_tags ( const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet ) override;
+		virtual void delete_all_tags ( const std::vector<FileIDType>& parFiles, GroupIDType parSet ) override;
+		virtual void delete_all_tags ( const std::vector<std::string>& parRegexes, GroupIDType parSet ) override;
+
+		virtual void delete_group ( const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf ) override;
+
+		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature ) override;
+		virtual bool search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash ) override;
+
+		virtual std::vector<LocatedItem> locate_in_db ( const std::string& parSearch, const TagList& parTags ) override;
+		virtual std::vector<LocatedItem> locate_in_db ( const mchlib::TigerHash& parSearch, const TagList& parTags ) override;
+		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, bool parCaseInsensitive ) override;
+		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive ) override;
+
+		virtual std::vector<GroupIDType> find_all_sets ( void ) override;
+		virtual std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details ( const std::vector<GroupIDType>& parSets ) override;
+		virtual std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) override;
+		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath ) override;
+
+	private:
+		using RedisConnection = std::unique_ptr<redisContext, void(*)(redisContext*)>;
+
+		bool is_connected ( void ) const;
+
+		RedisConnection m_conn;
+		std::string m_address;
+		uint16_t m_port;
+	};
+} //namespace dindb
+
+#endif
diff --git a/src/pq/CMakeLists.txt b/src/pq/CMakeLists.txt
index 6bda657..d164d80 100644
--- a/src/pq/CMakeLists.txt
+++ b/src/pq/CMakeLists.txt
@@ -12,10 +12,12 @@ add_library(${PROJECT_NAME} STATIC
 
 target_include_directories(${PROJECT_NAME}
 	PRIVATE ${libpqtypes_INCLUDE_DIRS}
+	PRIVATE ${PostgreSQL_INCLUDE_DIRS}
 )
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE pqtypes
+	PRIVATE ${PostgreSQL_LIBRARIES}
 )
 
 target_compile_features(${PROJECT_NAME}

From db23dcea3ff441f67504efdbb9a4744971166577 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 7 Jun 2016 23:13:24 +0100
Subject: [PATCH 039/170] Add missing implementation and fix crashes in redis
 backend.

With this you can insert a new set (set only, no files) with dindexer-scan.
---
 src/backends/redis/CMakeLists.txt    |  3 +-
 src/backends/redis/backend_redis.cpp | 59 +++++++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 8535712..634774d 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -21,4 +21,5 @@ install(TARGETS ${PROJECT_NAME}
 	LIBRARY DESTINATION lib
 	RUNTIME DESTINATION bin
 	ARCHIVE DESTINATION lib/static
-)
\ No newline at end of file
+)
+ln_backend(${PROJECT_NAME})
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 8ddfb66..7c9ccc6 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -17,6 +17,8 @@
 
 #include "backend_redis.hpp"
 #include "dindexer-machinery/recorddata.hpp"
+#include "backends/exposed_functions.hpp"
+#include "backends/backend_version.hpp"
 #include <utility>
 #include <hiredis/hiredis.h>
 #include <ciso646>
@@ -24,12 +26,42 @@
 #include <sstream>
 #include <algorithm>
 #include <cassert>
+#include <yaml-cpp/yaml.h>
 
 namespace dindb {
 	namespace {
         using RedisReply = std::unique_ptr<redisReply, void(*)(void*)>;
-	} //unnamed namespace
 
+		struct RedisConnectionSettings {
+			std::string address;
+			uint16_t port;
+		};
+	} //unnamed namespace
+} //namespace dindb
+
+namespace YAML {
+	template<>
+	struct convert<dindb::RedisConnectionSettings> {
+		static Node encode (const dindb::RedisConnectionSettings& parSettings) {
+			Node node;
+			node["address"] = parSettings.address;
+			node["port"] = parSettings.port;
+			return node;
+		}
+
+		static bool decode (const Node& parNode, dindb::RedisConnectionSettings& parSettings) {
+			if (not parNode.IsMap() or parNode.size() != 2) {
+				return false;
+			}
+
+			parSettings.address = parNode["address"].as<std::string>();
+			parSettings.port = parNode["port"].as<uint16_t>();
+			return true;
+		}
+	};
+} //namespace YAML
+
+namespace dindb {
     BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort,
                                bool parConnect) :
             m_conn(nullptr, &redisFree),
@@ -156,3 +188,28 @@ namespace dindb {
 		return m_conn and not m_conn->err;
 	}
 } //namespace dindb
+
+extern "C" dindb::Backend* dindexer_create_backend (const YAML::Node* parConfig) {
+	if (not parConfig)
+		return nullptr;
+
+	auto config = parConfig->as<dindb::RedisConnectionSettings>();
+	return new dindb::BackendRedis(
+		std::move(config.address),
+		config.port,
+		true
+	);
+}
+
+extern "C" void dindexer_destroy_backend (dindb::Backend* parDele) {
+	if (parDele)
+		delete parDele;
+}
+
+extern "C" const char* dindexer_backend_name() {
+	return "redis";
+}
+
+extern "C" int dindexer_backend_iface_version() {
+	return dindb::g_current_iface_version;
+}

From f7a7015c651c9e4bbb556b6d8dd76e20c4c4d505 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 9 Jun 2016 19:24:08 +0200
Subject: [PATCH 040/170] Start putting Redis stuff in a wrapper class.

Nonworking, but the project builds.
---
 src/backends/redis/CMakeLists.txt    |   1 +
 src/backends/redis/backend_redis.cpp |  71 ++----------------
 src/backends/redis/backend_redis.hpp |  12 +--
 src/backends/redis/command.cpp       | 105 +++++++++++++++++++++++++++
 src/backends/redis/command.hpp       |  73 +++++++++++++++++++
 5 files changed, 188 insertions(+), 74 deletions(-)
 create mode 100644 src/backends/redis/command.cpp
 create mode 100644 src/backends/redis/command.hpp

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 634774d..8a614df 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -4,6 +4,7 @@ find_package(hiredis 0.11.0 REQUIRED)
 
 add_library(${PROJECT_NAME} SHARED
 	backend_redis.cpp
+	command.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 7c9ccc6..ec02fe0 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -20,18 +20,10 @@
 #include "backends/exposed_functions.hpp"
 #include "backends/backend_version.hpp"
 #include <utility>
-#include <hiredis/hiredis.h>
-#include <ciso646>
-#include <stdexcept>
-#include <sstream>
-#include <algorithm>
-#include <cassert>
 #include <yaml-cpp/yaml.h>
 
 namespace dindb {
 	namespace {
-        using RedisReply = std::unique_ptr<redisReply, void(*)(void*)>;
-
 		struct RedisConnectionSettings {
 			std::string address;
 			uint16_t port;
@@ -62,42 +54,20 @@ namespace YAML {
 } //namespace YAML
 
 namespace dindb {
-    BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort,
-                               bool parConnect) :
-            m_conn(nullptr, &redisFree),
-            m_address(std::move(parAddress)),
-            m_port(parPort) {
-        if (parConnect)
-            this->connect();
+    BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort, bool parConnect) :
+		m_redis(std::move(parAddress), parPort, parConnect)
+	{
     }
 
     BackendRedis::~BackendRedis() noexcept {
     }
 
     void BackendRedis::connect() {
-        if (not m_conn) {
-			struct timeval timeout = {5, 500000}; //5.5 seconds?
-			RedisConnection conn(
-				redisConnectWithTimeout(m_address.c_str(), m_port, timeout),
-				&redisFree
-			);
-			if (not conn) {
-				std::ostringstream oss;
-				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port;
-				throw std::runtime_error(oss.str());
-			}
-			if (conn->err) {
-				std::ostringstream oss;
-				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port <<
-					": " << conn->errstr;
-				throw std::runtime_error(oss.str());
-			}
-			std::swap(conn, m_conn);
-		}
-    }
+		m_redis.connect();
+	}
 
     void BackendRedis::disconnect() {
-        m_conn.reset();
+        m_redis.disconnect();
     }
 
     void BackendRedis::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
@@ -122,30 +92,7 @@ namespace dindb {
 	}
 
     void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
-		assert(is_connected());
-		std::string key;
-		{
-			std::ostringstream key_oss;
-			RedisReply incr_reply(static_cast<redisReply*>(redisCommand(m_conn.get(), "incr set_counter")), &freeReplyObject);
-			key_oss << "sets:" << incr_reply->integer;
-			key = key_oss.str();
-		}
-
-		RedisReply insert_reply(
-			static_cast<redisReply*>(redisCommand(
-				m_conn.get(),
-				"hmset %b name %b disk_label %b fs_uuid %b",
-				key.data(),
-				key.size(),
-				parSetData.name.data(),
-				parSetData.name.size(),
-				parSetData.disk_label.data(),
-				parSetData.disk_label.size(),
-				parSetData.fs_uuid.data(),
-				parSetData.fs_uuid.size()
-			)),
-			&freeReplyObject
-		);
+		//TODO: run command
 	}
 
     bool BackendRedis::search_file_by_hash (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) {
@@ -183,10 +130,6 @@ namespace dindb {
     std::vector<std::string> BackendRedis::find_paths_starting_by (GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) {
 		return std::vector<std::string>();
 	}
-
-	bool BackendRedis::is_connected() const {
-		return m_conn and not m_conn->err;
-	}
 } //namespace dindb
 
 extern "C" dindb::Backend* dindexer_create_backend (const YAML::Node* parConfig) {
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index 3ab92a0..1e32ba9 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -19,12 +19,10 @@
 #define idB2F92EE07A004D5293FD0657EEE8F75B
 
 #include "backends/db_backend.hpp"
-#include <memory>
+#include "command.hpp"
 #include <string>
 #include <cstdint>
 
-struct redisContext;
-
 namespace dindb {
 	class BackendRedis : public Backend {
 	public:
@@ -58,13 +56,7 @@ namespace dindb {
 		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath ) override;
 
 	private:
-		using RedisConnection = std::unique_ptr<redisContext, void(*)(redisContext*)>;
-
-		bool is_connected ( void ) const;
-
-		RedisConnection m_conn;
-		std::string m_address;
-		uint16_t m_port;
+		redis::Command m_redis;
 	};
 } //namespace dindb
 
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
new file mode 100644
index 0000000..5b53b64
--- /dev/null
+++ b/src/backends/redis/command.cpp
@@ -0,0 +1,105 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "command.hpp"
+#include <hiredis/hiredis.h>
+#include <ciso646>
+#include <cassert>
+#include <sstream>
+#include <algorithm>
+#include <stdexcept>
+
+namespace redis {
+	namespace {
+        using RedisReply = std::unique_ptr<redisReply, void(*)(void*)>;
+	} //unnamed namespace
+
+	Command::Command (std::string&& parAddress, uint16_t parPort, bool parConnect) :
+		m_conn(nullptr, &redisFree),
+		m_address(std::move(parAddress)),
+		m_port(parPort)
+	{
+        if (parConnect)
+            this->connect();
+	}
+
+	Command::~Command() noexcept {
+	}
+
+    void Command::connect() {
+        if (not m_conn) {
+			struct timeval timeout = {5, 500000}; //5.5 seconds?
+			RedisConnection conn(
+				redisConnectWithTimeout(m_address.c_str(), m_port, timeout),
+				&redisFree
+			);
+			if (not conn) {
+				std::ostringstream oss;
+				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port;
+				throw std::runtime_error(oss.str());
+			}
+			if (conn->err) {
+				std::ostringstream oss;
+				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port <<
+					": " << conn->errstr;
+				throw std::runtime_error(oss.str());
+			}
+			std::swap(conn, m_conn);
+		}
+    }
+
+	void Command::disconnect() {
+		m_conn.reset();
+	}
+
+	void Command::run (const char* parCommand, int parArgc, const char** parArgv, std::size_t* parLengths) {
+		assert(is_connected());
+
+		RedisReply reply(
+			static_cast<redisReply*>(redisCommandArgv(m_conn.get(), parArgc, parArgv, parLengths)),
+			&freeReplyObject
+		);
+
+		//std::string key;
+		//{
+		//	std::ostringstream key_oss;
+		//	RedisReply incr_reply(static_cast<redisReply*>(redisCommand(m_conn.get(), "incr set_counter")), &freeReplyObject);
+		//	key_oss << "sets:" << incr_reply->integer;
+		//	key = key_oss.str();
+		//}
+
+		//RedisReply insert_reply(
+		//	static_cast<redisReply*>(redisCommand(
+		//		m_conn.get(),
+		//		"hmset %b name %b disk_label %b fs_uuid %b",
+		//		key.data(),
+		//		key.size(),
+		//		parSetData.name.data(),
+		//		parSetData.name.size(),
+		//		parSetData.disk_label.data(),
+		//		parSetData.disk_label.size(),
+		//		parSetData.fs_uuid.data(),
+		//		parSetData.fs_uuid.size()
+		//	)),
+		//	&freeReplyObject
+		//);
+	}
+
+	bool Command::is_connected() const {
+		return m_conn and not m_conn->err;
+	}
+} //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
new file mode 100644
index 0000000..fe327ed
--- /dev/null
+++ b/src/backends/redis/command.hpp
@@ -0,0 +1,73 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef idD83EEBFC927840C6B9F32D61A1D1E582
+#define idD83EEBFC927840C6B9F32D61A1D1E582
+
+#include <array>
+#include <memory>
+#include <string>
+#include <cstdint>
+#include <cstddef>
+#include <cassert>
+
+struct redisContext;
+
+namespace redis {
+	class Command {
+	public:
+		Command ( std::string&& parAddress, uint16_t parPort, bool parConnect );
+		~Command ( void ) noexcept;
+
+		void connect ( void );
+		void disconnect ( void );
+
+		bool is_connected ( void ) const;
+
+		template <typename... Args>
+		void run ( const char* parCommand, Args&&... parArgs );
+
+	private:
+		using RedisConnection = std::unique_ptr<redisContext, void(*)(redisContext*)>;
+
+		void run ( const char* parCommand, int parArgc, const char** parArgv, std::size_t* parLengths );
+
+		RedisConnection m_conn;
+		std::string m_address;
+		uint16_t m_port;
+	};
+
+	template <typename... Args>
+	void Command::run (const char* parCommand, Args&&... parArgs) {
+		constexpr const std::size_t arg_count = sizeof...(Args);
+		using CharPointerArray = std::array<const char*, arg_count>;
+		using LengthArray = std::array<std::size_t, arg_count>;
+
+		CharPointerArray arguments;
+		LengthArray lengths;
+		assert(false); //TODO write implementation
+
+		this->run(
+			parCommand,
+			static_cast<int>(arg_count),
+			arguments.data(),
+			lengths.data()
+		);
+	}
+} //namespace redis
+
+#endif

From 49a8e81feda43a1641a9167d53d5e3182d79ed31 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 9 Jun 2016 22:20:22 +0200
Subject: [PATCH 041/170] Restore adding sets into Redis using the new run()
 method.

Partial implementation - not for use in real world cases.
---
 src/backends/redis/arg_to_bin_safe.hpp | 70 ++++++++++++++++++++++++++
 src/backends/redis/backend_redis.cpp   |  8 ++-
 src/backends/redis/command.cpp         | 40 ++++++++++++++-
 src/backends/redis/command.hpp         | 46 ++++++++++++++---
 4 files changed, 156 insertions(+), 8 deletions(-)
 create mode 100644 src/backends/redis/arg_to_bin_safe.hpp

diff --git a/src/backends/redis/arg_to_bin_safe.hpp b/src/backends/redis/arg_to_bin_safe.hpp
new file mode 100644
index 0000000..360e4dd
--- /dev/null
+++ b/src/backends/redis/arg_to_bin_safe.hpp
@@ -0,0 +1,70 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id9348909738B047B7B6912D73CB519039
+#define id9348909738B047B7B6912D73CB519039
+
+#include "helpers/compatibility.h"
+#include <cstddef>
+#include <boost/utility/string_ref.hpp>
+#include <string>
+
+namespace redis {
+	namespace implem {
+		template <typename T>
+		const char* arg_to_bin_safe_char ( const T& parArg );
+
+		template <typename T>
+		std::size_t arg_to_bin_safe_length ( const T& parArg ) a_pure;
+
+		template <typename T>
+		struct MakeCharInfo;
+
+		template<>
+		struct MakeCharInfo<std::string> {
+			MakeCharInfo ( const std::string& parData ) : m_string(parData) {}
+			const char* data ( void ) const { return m_string.data(); }
+			std::size_t size ( void ) const { return m_string.size(); }
+
+		private:
+			const std::string& m_string;
+		};
+
+		template<>
+		struct MakeCharInfo<boost::string_ref> {
+			MakeCharInfo ( const boost::string_ref& parData ) : m_data(parData.data()), m_size(parData.size()) {}
+			const char* data ( void ) const { return m_data; }
+			std::size_t size ( void ) const { return m_size; }
+
+		private:
+			const char* const m_data;
+			const std::size_t m_size;
+		};
+
+		template <typename T>
+		inline const char* arg_to_bin_safe_char (const T& parArg) {
+			return MakeCharInfo<T>(parArg).data();
+		}
+
+		template <typename T>
+		inline std::size_t arg_to_bin_safe_length (const T& parArg) {
+			return MakeCharInfo<T>(parArg).size();
+		}
+	} //namespace implem
+} //namespace redis
+
+#endif
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index ec02fe0..9b88ef2 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -19,8 +19,10 @@
 #include "dindexer-machinery/recorddata.hpp"
 #include "backends/exposed_functions.hpp"
 #include "backends/backend_version.hpp"
+#include "dindexerConfig.h"
 #include <utility>
 #include <yaml-cpp/yaml.h>
+#include <boost/lexical_cast.hpp>
 
 namespace dindb {
 	namespace {
@@ -92,7 +94,11 @@ namespace dindb {
 	}
 
     void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
-		//TODO: run command
+		using boost::lexical_cast;
+
+		auto incr_reply = m_redis.run("HINCRBY " PROGRAM_NAME ":indices set 1");
+		const std::string set_key = PROGRAM_NAME ":set:" + lexical_cast<std::string>(redis::get_integer(incr_reply));
+		auto insert_set_reply = m_redis.run("HMSET %b name %b disk_label %b fs_uuid %b", set_key, parSetData.name, parSetData.disk_label, parSetData.fs_uuid);
 	}
 
     bool BackendRedis::search_file_by_hash (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) {
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 5b53b64..72d5ebd 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -22,12 +22,45 @@
 #include <sstream>
 #include <algorithm>
 #include <stdexcept>
+#include <boost/iterator/transform_iterator.hpp>
+#include <boost/variant/get.hpp>
 
 namespace redis {
 	namespace {
         using RedisReply = std::unique_ptr<redisReply, void(*)(void*)>;
+
+		RedisReplyType make_redis_reply_type (redisReply* parReply) {
+			using boost::transform_iterator;
+			using PtrToReplyIterator = transform_iterator<RedisReplyType(*)(redisReply*), redisReply**>;
+
+			switch (parReply->type) {
+			case REDIS_REPLY_INTEGER:
+				return parReply->integer;
+			case REDIS_REPLY_STRING:
+				return std::string(parReply->str, parReply->len);
+			case REDIS_REPLY_ARRAY:
+				return std::vector<RedisReplyType>(
+					PtrToReplyIterator(parReply->element, &make_redis_reply_type),
+					PtrToReplyIterator(parReply->element + parReply->elements, &make_redis_reply_type)
+				);
+			default:
+				return RedisReplyType();
+			};
+		}
 	} //unnamed namespace
 
+	long long get_integer (const RedisReplyType& parReply) {
+		return boost::get<long long>(parReply);
+	}
+
+	std::string get_string (const RedisReplyType& parReply) {
+		return boost::get<std::string>(parReply);
+	}
+
+	std::vector<RedisReplyType> get_array (const RedisReplyType& parReply) {
+		return boost::get<std::vector<RedisReplyType>>(parReply);
+	}
+
 	Command::Command (std::string&& parAddress, uint16_t parPort, bool parConnect) :
 		m_conn(nullptr, &redisFree),
 		m_address(std::move(parAddress)),
@@ -66,7 +99,10 @@ namespace redis {
 		m_conn.reset();
 	}
 
-	void Command::run (const char* parCommand, int parArgc, const char** parArgv, std::size_t* parLengths) {
+	RedisReplyType Command::run_pvt (const char* parCommand, int parArgc, const char** parArgv, std::size_t* parLengths) {
+		assert(parCommand);
+		assert(parArgv);
+		assert(parLengths); //This /could/ be null, but I don't see why it should
 		assert(is_connected());
 
 		RedisReply reply(
@@ -74,6 +110,8 @@ namespace redis {
 			&freeReplyObject
 		);
 
+		return make_redis_reply_type(reply.get());
+
 		//std::string key;
 		//{
 		//	std::ostringstream key_oss;
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index fe327ed..dfdcc5b 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -18,16 +18,46 @@
 #ifndef idD83EEBFC927840C6B9F32D61A1D1E582
 #define idD83EEBFC927840C6B9F32D61A1D1E582
 
+#include "arg_to_bin_safe.hpp"
 #include <array>
 #include <memory>
 #include <string>
 #include <cstdint>
 #include <cstddef>
 #include <cassert>
+#include <boost/variant/variant.hpp>
+#include <boost/variant/recursive_wrapper.hpp>
+#include <vector>
+#include <utility>
 
 struct redisContext;
 
 namespace redis {
+	class RedisReplyType;
+
+	namespace implem {
+		using RedisVariantType = boost::variant<
+			long long,
+			std::string,
+			boost::recursive_wrapper<std::vector<RedisReplyType>>
+		>;
+		enum RedisVariantTypes {
+			RedisVariantType_Integer = 0,
+			RedisVariantType_String,
+			RedisVariantType_Array
+		};
+	} //namespace implem
+
+	struct RedisReplyType : implem::RedisVariantType {
+		using base_class = implem::RedisVariantType;
+
+		RedisReplyType ( void ) = default;
+		RedisReplyType ( long long parVal ) : base_class(parVal) {}
+		RedisReplyType ( std::string&& parVal ) : base_class(std::move(parVal)) {}
+		RedisReplyType ( std::vector<RedisReplyType>&& parVal ) : base_class(std::move(parVal)) {}
+		~RedisReplyType ( void ) noexcept = default;
+	};
+
 	class Command {
 	public:
 		Command ( std::string&& parAddress, uint16_t parPort, bool parConnect );
@@ -39,12 +69,12 @@ namespace redis {
 		bool is_connected ( void ) const;
 
 		template <typename... Args>
-		void run ( const char* parCommand, Args&&... parArgs );
+		RedisReplyType run ( const char* parCommand, Args&&... parArgs );
 
 	private:
 		using RedisConnection = std::unique_ptr<redisContext, void(*)(redisContext*)>;
 
-		void run ( const char* parCommand, int parArgc, const char** parArgv, std::size_t* parLengths );
+		RedisReplyType run_pvt ( const char* parCommand, int parArgc, const char** parArgv, std::size_t* parLengths );
 
 		RedisConnection m_conn;
 		std::string m_address;
@@ -52,7 +82,7 @@ namespace redis {
 	};
 
 	template <typename... Args>
-	void Command::run (const char* parCommand, Args&&... parArgs) {
+	RedisReplyType Command::run (const char* parCommand, Args&&... parArgs) {
 		constexpr const std::size_t arg_count = sizeof...(Args);
 		using CharPointerArray = std::array<const char*, arg_count>;
 		using LengthArray = std::array<std::size_t, arg_count>;
@@ -61,13 +91,17 @@ namespace redis {
 		LengthArray lengths;
 		assert(false); //TODO write implementation
 
-		this->run(
+		return this->run_pvt(
 			parCommand,
 			static_cast<int>(arg_count),
-			arguments.data(),
-			lengths.data()
+			CharPointerArray{ implem::arg_to_bin_safe_char(std::forward<Args>(parArgs))... }.data(),
+			LengthArray{ implem::arg_to_bin_safe_length(std::forward<Args>(parArgs))... }.data()
 		);
 	}
+
+	long long get_integer ( const RedisReplyType& parReply );
+	std::string get_string ( const RedisReplyType& parReply );
+	std::vector<RedisReplyType> get_array ( const RedisReplyType& parReply );
 } //namespace redis
 
 #endif

From 8bdb1f237fb17a043d442a970af53f698eed38e0 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 9 Jun 2016 22:55:38 +0200
Subject: [PATCH 042/170] Replace spaces with tabs

---
 src/backends/postgresql/scan.cpp     |  4 +-
 src/backends/redis/backend_redis.cpp | 64 ++++++++++++++--------------
 src/backends/redis/command.cpp       | 12 +++---
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/backends/postgresql/scan.cpp b/src/backends/postgresql/scan.cpp
index ca5e09b..881c52d 100644
--- a/src/backends/postgresql/scan.cpp
+++ b/src/backends/postgresql/scan.cpp
@@ -104,8 +104,8 @@ namespace dindb {
 				boost::string_ref(&parSetData.type, 1),
 				parSignature,
 				boost::string_ref(&parSetData.content_type, 1),
-			    parSetData.fs_uuid,
-			    parSetData.disk_label
+				parSetData.fs_uuid,
+				parSetData.disk_label
 			);
 			assert(id_res.size() == 1);
 			assert(id_res[0].size() == 1);
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 9b88ef2..1cf5e32 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -56,44 +56,44 @@ namespace YAML {
 } //namespace YAML
 
 namespace dindb {
-    BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort, bool parConnect) :
+	BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort, bool parConnect) :
 		m_redis(std::move(parAddress), parPort, parConnect)
 	{
-    }
+	}
 
-    BackendRedis::~BackendRedis() noexcept {
-    }
+	BackendRedis::~BackendRedis() noexcept {
+	}
 
-    void BackendRedis::connect() {
+	void BackendRedis::connect() {
 		m_redis.connect();
 	}
 
-    void BackendRedis::disconnect() {
-        m_redis.disconnect();
-    }
-
-    void BackendRedis::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-    }
-
-    void BackendRedis::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-    }
-
-    void BackendRedis::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-    }
-
-    void BackendRedis::delete_tags (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	void BackendRedis::disconnect() {
+		m_redis.disconnect();
 	}
 
-    void BackendRedis::delete_all_tags (const std::vector<FileIDType>& parFiles, GroupIDType parSet) {
+	void BackendRedis::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 	}
 
-    void BackendRedis::delete_all_tags (const std::vector<std::string>& parRegexes, GroupIDType parSet) {
+	void BackendRedis::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 	}
 
-    void BackendRedis::delete_group (const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
+	void BackendRedis::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 	}
 
-    void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
+	void BackendRedis::delete_tags (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	}
+
+	void BackendRedis::delete_all_tags (const std::vector<FileIDType>& parFiles, GroupIDType parSet) {
+	}
+
+	void BackendRedis::delete_all_tags (const std::vector<std::string>& parRegexes, GroupIDType parSet) {
+	}
+
+	void BackendRedis::delete_group (const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
+	}
+
+	void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
 		using boost::lexical_cast;
 
 		auto incr_reply = m_redis.run("HINCRBY " PROGRAM_NAME ":indices set 1");
@@ -101,39 +101,39 @@ namespace dindb {
 		auto insert_set_reply = m_redis.run("HMSET %b name %b disk_label %b fs_uuid %b", set_key, parSetData.name, parSetData.disk_label, parSetData.fs_uuid);
 	}
 
-    bool BackendRedis::search_file_by_hash (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) {
+	bool BackendRedis::search_file_by_hash (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) {
 		return false;
 	}
 
-    std::vector<LocatedItem> BackendRedis::locate_in_db (const std::string& parSearch, const TagList& parTags) {
+	std::vector<LocatedItem> BackendRedis::locate_in_db (const std::string& parSearch, const TagList& parTags) {
 		return std::vector<LocatedItem>();
 	}
 
-    std::vector<LocatedItem> BackendRedis::locate_in_db (const mchlib::TigerHash& parSearch, const TagList& parTags) {
+	std::vector<LocatedItem> BackendRedis::locate_in_db (const mchlib::TigerHash& parSearch, const TagList& parTags) {
 		return std::vector<LocatedItem>();
 	}
 
-    std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSearch, bool parCaseInsensitive) {
+	std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSearch, bool parCaseInsensitive) {
 		return std::vector<LocatedSet>();
 	}
 
-    std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive) {
+	std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive) {
 		return std::vector<LocatedSet>();
 	}
 
-    std::vector<GroupIDType> BackendRedis::find_all_sets() {
+	std::vector<GroupIDType> BackendRedis::find_all_sets() {
 		return std::vector<GroupIDType>();
 	}
 
-    std::vector<dinhelp::MaxSizedArray<std::string, 4>> BackendRedis::find_set_details (const std::vector<GroupIDType>& parSets) {
+	std::vector<dinhelp::MaxSizedArray<std::string, 4>> BackendRedis::find_set_details (const std::vector<GroupIDType>& parSets) {
 		return std::vector<dinhelp::MaxSizedArray<std::string, 4>>();
 	}
 
-    std::vector<dinhelp::MaxSizedArray<std::string, 1>> BackendRedis::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
+	std::vector<dinhelp::MaxSizedArray<std::string, 1>> BackendRedis::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
 		return std::vector<dinhelp::MaxSizedArray<std::string, 1>>();
 	}
 
-    std::vector<std::string> BackendRedis::find_paths_starting_by (GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) {
+	std::vector<std::string> BackendRedis::find_paths_starting_by (GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) {
 		return std::vector<std::string>();
 	}
 } //namespace dindb
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 72d5ebd..f2b9e82 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -27,7 +27,7 @@
 
 namespace redis {
 	namespace {
-        using RedisReply = std::unique_ptr<redisReply, void(*)(void*)>;
+		using RedisReply = std::unique_ptr<redisReply, void(*)(void*)>;
 
 		RedisReplyType make_redis_reply_type (redisReply* parReply) {
 			using boost::transform_iterator;
@@ -66,15 +66,15 @@ namespace redis {
 		m_address(std::move(parAddress)),
 		m_port(parPort)
 	{
-        if (parConnect)
-            this->connect();
+		if (parConnect)
+			this->connect();
 	}
 
 	Command::~Command() noexcept {
 	}
 
-    void Command::connect() {
-        if (not m_conn) {
+	void Command::connect() {
+		if (not m_conn) {
 			struct timeval timeout = {5, 500000}; //5.5 seconds?
 			RedisConnection conn(
 				redisConnectWithTimeout(m_address.c_str(), m_port, timeout),
@@ -93,7 +93,7 @@ namespace redis {
 			}
 			std::swap(conn, m_conn);
 		}
-    }
+	}
 
 	void Command::disconnect() {
 		m_conn.reset();

From 04b667485e5fc38b372432cbe029c795f9edec89 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 10 Jun 2016 09:55:37 +0200
Subject: [PATCH 043/170] Add optional database selection parameter in yml
 file.

---
 src/backends/redis/backend_redis.cpp | 18 ++++++++++++++++--
 src/backends/redis/backend_redis.hpp |  3 ++-
 src/backends/redis/command.cpp       |  4 +---
 src/backends/redis/command.hpp       |  2 +-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 1cf5e32..1c28f15 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -29,6 +29,7 @@ namespace dindb {
 		struct RedisConnectionSettings {
 			std::string address;
 			uint16_t port;
+			uint16_t database;
 		};
 	} //unnamed namespace
 } //namespace dindb
@@ -40,6 +41,7 @@ namespace YAML {
 			Node node;
 			node["address"] = parSettings.address;
 			node["port"] = parSettings.port;
+			node["database"] = parSettings.database;
 			return node;
 		}
 
@@ -50,22 +52,33 @@ namespace YAML {
 
 			parSettings.address = parNode["address"].as<std::string>();
 			parSettings.port = parNode["port"].as<uint16_t>();
+			if (parNode["database"])
+				parSettings.database = parNode["database"].as<uint16_t>();
 			return true;
 		}
 	};
 } //namespace YAML
 
 namespace dindb {
-	BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort, bool parConnect) :
-		m_redis(std::move(parAddress), parPort, parConnect)
+	BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort, uint16_t parDatabase, bool parConnect) :
+		m_redis(std::move(parAddress), parPort),
+		m_database(parDatabase)
 	{
+		if (parConnect)
+			this->connect();
 	}
 
 	BackendRedis::~BackendRedis() noexcept {
 	}
 
 	void BackendRedis::connect() {
+		using boost::lexical_cast;
+
 		m_redis.connect();
+		if (m_redis.is_connected() and m_database > 0) {
+			const std::string command = "SELECT " + lexical_cast<std::string>(m_database);
+			m_redis.run(command.c_str());
+		}
 	}
 
 	void BackendRedis::disconnect() {
@@ -146,6 +159,7 @@ extern "C" dindb::Backend* dindexer_create_backend (const YAML::Node* parConfig)
 	return new dindb::BackendRedis(
 		std::move(config.address),
 		config.port,
+		config.database,
 		true
 	);
 }
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index 1e32ba9..2958694 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -27,7 +27,7 @@ namespace dindb {
 	class BackendRedis : public Backend {
 	public:
 		BackendRedis ( BackendRedis&& ) = default;
-		BackendRedis ( std::string&& parAddress, uint16_t parPort, bool parConnect );
+		BackendRedis ( std::string&& parAddress, uint16_t parPort, uint16_t parDatabase, bool parConnect );
 		virtual ~BackendRedis ( void ) noexcept;
 
 		virtual void connect ( void ) override;
@@ -57,6 +57,7 @@ namespace dindb {
 
 	private:
 		redis::Command m_redis;
+		uint16_t m_database;
 	};
 } //namespace dindb
 
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index f2b9e82..f3efb90 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -61,13 +61,11 @@ namespace redis {
 		return boost::get<std::vector<RedisReplyType>>(parReply);
 	}
 
-	Command::Command (std::string&& parAddress, uint16_t parPort, bool parConnect) :
+	Command::Command (std::string&& parAddress, uint16_t parPort) :
 		m_conn(nullptr, &redisFree),
 		m_address(std::move(parAddress)),
 		m_port(parPort)
 	{
-		if (parConnect)
-			this->connect();
 	}
 
 	Command::~Command() noexcept {
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index dfdcc5b..025780d 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -60,7 +60,7 @@ namespace redis {
 
 	class Command {
 	public:
-		Command ( std::string&& parAddress, uint16_t parPort, bool parConnect );
+		Command ( std::string&& parAddress, uint16_t parPort );
 		~Command ( void ) noexcept;
 
 		void connect ( void );

From c1e79c435b4ab74ea14c001f28fdcaba56f62275 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 10 Jun 2016 20:33:11 +0200
Subject: [PATCH 044/170] New ScanIterator class.

Not yet tested and only supporting the SCAN command for now, more to
come.
Also includes some refactoring that was needed to make everything work.
---
 include/helpers/has_method.hpp       | 54 +++++++++++++++
 src/backends/redis/CMakeLists.txt    |  2 +
 src/backends/redis/backend_redis.cpp |  3 +
 src/backends/redis/command.cpp       | 17 ++---
 src/backends/redis/command.hpp       | 44 +++----------
 src/backends/redis/reply.cpp         | 52 +++++++++++++++
 src/backends/redis/reply.hpp         | 60 +++++++++++++++++
 src/backends/redis/scan_iterator.cpp | 46 +++++++++++++
 src/backends/redis/scan_iterator.hpp | 95 +++++++++++++++++++++++++++
 src/backends/redis/scan_iterator.inl | 98 ++++++++++++++++++++++++++++
 10 files changed, 423 insertions(+), 48 deletions(-)
 create mode 100644 include/helpers/has_method.hpp
 create mode 100644 src/backends/redis/reply.cpp
 create mode 100644 src/backends/redis/reply.hpp
 create mode 100644 src/backends/redis/scan_iterator.cpp
 create mode 100644 src/backends/redis/scan_iterator.hpp
 create mode 100644 src/backends/redis/scan_iterator.inl

diff --git a/include/helpers/has_method.hpp b/include/helpers/has_method.hpp
new file mode 100644
index 0000000..d641771
--- /dev/null
+++ b/include/helpers/has_method.hpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 Michele "King_DuckZ" Santullo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef idFBC29C5127784D35BE62F7BAC16E3687
+#define idFBC29C5127784D35BE62F7BAC16E3687
+
+#define define_has_method(method_name,pretty_name) \
+	template <typename T> \
+	struct Has ## pretty_name ## Method { \
+	private: \
+		struct TrueType { int a[2]; }; \
+		typedef int FalseType; \
+		template <typename C> static TrueType has_method ( decltype(&C::method_name) ); \
+		template <typename C> static FalseType has_method ( ... ); \
+	public: \
+		enum { value = sizeof(has_method<T>(0)) == sizeof(TrueType) }; \
+	}
+#define define_has_typedef(typedef_name,pretty_name) \
+	template <typename T> \
+	struct Has ## pretty_name ## Typedef { \
+	private: \
+		struct TrueType { int a[2]; }; \
+		typedef int FalseType; \
+		template <typename C> static TrueType has_typedef ( const typename C::typedef_name* ); \
+		template <typename C> static FalseType has_typedef ( ... ); \
+	public: \
+		enum { value = sizeof(has_typedef<T>(nullptr)) == sizeof(TrueType) }; \
+	}
+#define define_has_enum(enum_name,pretty_name) \
+	template <typename T> \
+	struct Has ## pretty_name ## Enum { \
+	private: \
+		struct TrueType { int a[2]; }; \
+		typedef int FalseType; \
+		template <typename C> static TrueType has_enum ( decltype(C::enum_name)* ); \
+		template <typename C> static FalseType has_enum ( ... ); \
+	public:\
+		enum { value = sizeof(has_enum<T>(nullptr)) == sizeof(TrueType) }; \
+	}
+
+#endif
diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 8a614df..6683d00 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -5,6 +5,8 @@ find_package(hiredis 0.11.0 REQUIRED)
 add_library(${PROJECT_NAME} SHARED
 	backend_redis.cpp
 	command.cpp
+	scan_iterator.cpp
+	reply.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 1c28f15..00adefe 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -89,6 +89,9 @@ namespace dindb {
 	}
 
 	void BackendRedis::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		for (const auto& file_path : m_redis.scan()) {
+			std::cout << file_path << '\n';
+		}
 	}
 
 	void BackendRedis::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index f3efb90..f2de461 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -23,7 +23,6 @@
 #include <algorithm>
 #include <stdexcept>
 #include <boost/iterator/transform_iterator.hpp>
-#include <boost/variant/get.hpp>
 
 namespace redis {
 	namespace {
@@ -49,18 +48,6 @@ namespace redis {
 		}
 	} //unnamed namespace
 
-	long long get_integer (const RedisReplyType& parReply) {
-		return boost::get<long long>(parReply);
-	}
-
-	std::string get_string (const RedisReplyType& parReply) {
-		return boost::get<std::string>(parReply);
-	}
-
-	std::vector<RedisReplyType> get_array (const RedisReplyType& parReply) {
-		return boost::get<std::vector<RedisReplyType>>(parReply);
-	}
-
 	Command::Command (std::string&& parAddress, uint16_t parPort) :
 		m_conn(nullptr, &redisFree),
 		m_address(std::move(parAddress)),
@@ -138,4 +125,8 @@ namespace redis {
 	bool Command::is_connected() const {
 		return m_conn and not m_conn->err;
 	}
+
+	auto Command::scan() -> scan_range {
+		return scan_range(scan_iterator(this, false), scan_iterator(this, true));
+	}
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 025780d..0dbb3aa 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -19,47 +19,26 @@
 #define idD83EEBFC927840C6B9F32D61A1D1E582
 
 #include "arg_to_bin_safe.hpp"
+#include "scan_iterator.hpp"
+#include "reply.hpp"
 #include <array>
 #include <memory>
 #include <string>
 #include <cstdint>
 #include <cstddef>
 #include <cassert>
-#include <boost/variant/variant.hpp>
-#include <boost/variant/recursive_wrapper.hpp>
 #include <vector>
 #include <utility>
+#include <boost/range/iterator_range_core.hpp>
 
 struct redisContext;
 
 namespace redis {
-	class RedisReplyType;
-
-	namespace implem {
-		using RedisVariantType = boost::variant<
-			long long,
-			std::string,
-			boost::recursive_wrapper<std::vector<RedisReplyType>>
-		>;
-		enum RedisVariantTypes {
-			RedisVariantType_Integer = 0,
-			RedisVariantType_String,
-			RedisVariantType_Array
-		};
-	} //namespace implem
-
-	struct RedisReplyType : implem::RedisVariantType {
-		using base_class = implem::RedisVariantType;
-
-		RedisReplyType ( void ) = default;
-		RedisReplyType ( long long parVal ) : base_class(parVal) {}
-		RedisReplyType ( std::string&& parVal ) : base_class(std::move(parVal)) {}
-		RedisReplyType ( std::vector<RedisReplyType>&& parVal ) : base_class(std::move(parVal)) {}
-		~RedisReplyType ( void ) noexcept = default;
-	};
-
 	class Command {
 	public:
+		typedef ScanIterator<std::string, ScanSingleValues<std::string>> scan_iterator;
+		typedef boost::iterator_range<scan_iterator> scan_range;
+
 		Command ( std::string&& parAddress, uint16_t parPort );
 		~Command ( void ) noexcept;
 
@@ -71,6 +50,9 @@ namespace redis {
 		template <typename... Args>
 		RedisReplyType run ( const char* parCommand, Args&&... parArgs );
 
+		//Single Redis command wrappers
+		scan_range scan ( void );
+
 	private:
 		using RedisConnection = std::unique_ptr<redisContext, void(*)(redisContext*)>;
 
@@ -87,10 +69,6 @@ namespace redis {
 		using CharPointerArray = std::array<const char*, arg_count>;
 		using LengthArray = std::array<std::size_t, arg_count>;
 
-		CharPointerArray arguments;
-		LengthArray lengths;
-		assert(false); //TODO write implementation
-
 		return this->run_pvt(
 			parCommand,
 			static_cast<int>(arg_count),
@@ -98,10 +76,6 @@ namespace redis {
 			LengthArray{ implem::arg_to_bin_safe_length(std::forward<Args>(parArgs))... }.data()
 		);
 	}
-
-	long long get_integer ( const RedisReplyType& parReply );
-	std::string get_string ( const RedisReplyType& parReply );
-	std::vector<RedisReplyType> get_array ( const RedisReplyType& parReply );
 } //namespace redis
 
 #endif
diff --git a/src/backends/redis/reply.cpp b/src/backends/redis/reply.cpp
new file mode 100644
index 0000000..6020d71
--- /dev/null
+++ b/src/backends/redis/reply.cpp
@@ -0,0 +1,52 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "reply.hpp"
+#include <boost/variant/get.hpp>
+
+namespace redis {
+	const long long& get_integer (const RedisReplyType& parReply) {
+		return boost::get<long long>(parReply);
+	}
+
+	const std::string& get_string (const RedisReplyType& parReply) {
+		return boost::get<std::string>(parReply);
+	}
+
+	const std::vector<RedisReplyType>& get_array (const RedisReplyType& parReply) {
+		return boost::get<std::vector<RedisReplyType>>(parReply);
+	}
+
+	template <>
+	const std::string& get<std::string> (const RedisReplyType& parReply) {
+		return get_string(parReply);
+	}
+
+	template <>
+	const std::vector<RedisReplyType>& get<std::vector<RedisReplyType>> (const RedisReplyType& parReply) {
+		return get_array(parReply);
+	}
+
+	template <>
+	const long long& get<long long> (const RedisReplyType& parReply) {
+		return get_integer(parReply);
+	}
+
+	template const std::string& get<std::string> ( const RedisReplyType& parReply );
+	template const std::vector<RedisReplyType>& get<std::vector<RedisReplyType>> ( const RedisReplyType& parReply );
+	template const long long& get<long long> ( const RedisReplyType& parReply );
+} //namespace redis
diff --git a/src/backends/redis/reply.hpp b/src/backends/redis/reply.hpp
new file mode 100644
index 0000000..eb9469f
--- /dev/null
+++ b/src/backends/redis/reply.hpp
@@ -0,0 +1,60 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id93FA96E3071745D9A1E45D4D29B9F7D0
+#define id93FA96E3071745D9A1E45D4D29B9F7D0
+
+#include <boost/variant/variant.hpp>
+#include <boost/variant/recursive_wrapper.hpp>
+#include <string>
+
+namespace redis {
+	class RedisReplyType;
+
+	namespace implem {
+		using RedisVariantType = boost::variant<
+			long long,
+			std::string,
+			boost::recursive_wrapper<std::vector<RedisReplyType>>
+		>;
+		enum RedisVariantTypes {
+			RedisVariantType_Integer = 0,
+			RedisVariantType_String,
+			RedisVariantType_Array,
+			RedisVariantType_Bool
+		};
+	} //namespace implem
+
+	struct RedisReplyType : implem::RedisVariantType {
+		using base_class = implem::RedisVariantType;
+
+		RedisReplyType ( void ) = default;
+		RedisReplyType ( long long parVal ) : base_class(parVal) {}
+		RedisReplyType ( std::string&& parVal ) : base_class(std::move(parVal)) {}
+		RedisReplyType ( std::vector<RedisReplyType>&& parVal ) : base_class(std::move(parVal)) {}
+		~RedisReplyType ( void ) noexcept = default;
+	};
+
+	const long long& get_integer ( const RedisReplyType& parReply );
+	const std::string& get_string ( const RedisReplyType& parReply );
+	const std::vector<RedisReplyType>& get_array ( const RedisReplyType& parReply );
+
+	template <typename T>
+	const T& get ( const RedisReplyType& parReply );
+} //namespace redis
+
+#endif
diff --git a/src/backends/redis/scan_iterator.cpp b/src/backends/redis/scan_iterator.cpp
new file mode 100644
index 0000000..00736a5
--- /dev/null
+++ b/src/backends/redis/scan_iterator.cpp
@@ -0,0 +1,46 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "scan_iterator.hpp"
+#include "command.hpp"
+#include <cassert>
+#include <ciso646>
+#include <boost/lexical_cast.hpp>
+#include <string>
+
+namespace redis {
+	namespace implem {
+		ScanIteratorBaseClass::ScanIteratorBaseClass (Command* parCommand) :
+			m_command(parCommand)
+		{
+			assert(m_command);
+			assert(m_command->is_connected());
+		}
+
+		bool ScanIteratorBaseClass::is_connected() const {
+			return m_command and m_command->is_connected();
+		}
+
+		RedisReplyType ScanIteratorBaseClass::run (const char* parCommand, long long parScanContext) {
+			return m_command->run(parCommand, boost::lexical_cast<std::string>(parScanContext));
+		}
+
+		RedisReplyType ScanIteratorBaseClass::run (const char* parCommand, const std::string& parParameter, long long parScanContext) {
+			return m_command->run(parCommand, parParameter, boost::lexical_cast<std::string>(parScanContext));
+		}
+	} //namespace implem
+} //namespace redis
diff --git a/src/backends/redis/scan_iterator.hpp b/src/backends/redis/scan_iterator.hpp
new file mode 100644
index 0000000..98bcb52
--- /dev/null
+++ b/src/backends/redis/scan_iterator.hpp
@@ -0,0 +1,95 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id774125B851514A26BD7C2AD1D804D732
+#define id774125B851514A26BD7C2AD1D804D732
+
+#include "reply.hpp"
+#include "helpers/has_method.hpp"
+#include <boost/iterator/iterator_facade.hpp>
+#include <type_traits>
+#include <vector>
+#include <cstddef>
+
+namespace redis {
+	template <typename V, typename ValueFetch>
+	class ScanIterator;
+
+	class Command;
+
+	namespace implem {
+		template <typename V, typename ValueFetch>
+		using ScanIteratorBaseIterator = boost::iterator_facade<ScanIterator<V, ValueFetch>, const V, boost::forward_traversal_tag>;
+
+		class ScanIteratorBaseClass {
+		protected:
+			explicit ScanIteratorBaseClass ( Command* parCommand );
+			~ScanIteratorBaseClass ( void ) noexcept = default;
+
+			bool is_connected ( void ) const;
+			RedisReplyType run ( const char* parCommand, long long parScanContext );
+			RedisReplyType run ( const char* parCommand, const std::string& parParameter, long long parScanContext );
+
+			bool is_equal ( const ScanIteratorBaseClass& parOther ) const { return m_command == parOther.m_command; }
+
+		private:
+			Command* m_command;
+		};
+	} //namespace implem
+
+	template <typename V, typename ValueFetch>
+	class ScanIterator : private implem::ScanIteratorBaseClass, public implem::ScanIteratorBaseIterator<V, ValueFetch> {
+		friend class boost::iterator_core_access;
+		typedef implem::ScanIteratorBaseIterator<V, ValueFetch> base_iterator;
+	public:
+		typedef typename base_iterator::difference_type difference_type;
+		typedef typename base_iterator::value_type value_type;
+		typedef typename base_iterator::pointer pointer;
+		typedef typename base_iterator::reference reference;
+		typedef typename base_iterator::iterator_category iterator_category;
+
+		ScanIterator ( Command* parCommand, bool parEnd );
+
+	private:
+		define_has_method(scan_target, ScanTarget);
+
+		template <typename T>
+		RedisReplyType forward_scan_command ( typename std::enable_if<HasScanTargetMethod<T>::value, int>::type parDummy );
+		template <typename T>
+		RedisReplyType forward_scan_command ( typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type parDummy );
+
+		void increment ( void );
+		bool equal ( const ScanIterator& parOther ) const;
+		const V& dereference ( void ) const;
+
+		std::vector<RedisReplyType> m_reply;
+		long long m_scan_context;
+		std::size_t m_curr_index;
+	};
+
+	template <typename T>
+	struct ScanSingleValues {
+		static constexpr const char* command ( void ) { return "SCAN"; }
+		static constexpr const std::size_t step = 1;
+
+		static const T& make_value ( const RedisReplyType* parItem );
+	};
+} //namespace redis
+
+#include "scan_iterator.inl"
+
+#endif
diff --git a/src/backends/redis/scan_iterator.inl b/src/backends/redis/scan_iterator.inl
new file mode 100644
index 0000000..ea7f7f3
--- /dev/null
+++ b/src/backends/redis/scan_iterator.inl
@@ -0,0 +1,98 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "command.hpp"
+#include <cassert>
+#include <ciso646>
+
+namespace redis {
+	namespace implem {
+	} //namespace implem
+
+	template <typename V, typename ValueFetch>
+	ScanIterator<V, ValueFetch>::ScanIterator (Command* parCommand, bool parEnd) :
+		implem::ScanIteratorBaseClass(parCommand),
+		m_reply(),
+		m_scan_context(0),
+		m_curr_index(0)
+	{
+		if (not parEnd)
+			this->increment();
+	}
+
+	template <typename V, typename ValueFetch>
+	void ScanIterator<V, ValueFetch>::increment() {
+		static_assert(ValueFetch::step > 0, "Can't have an increase step of 0");
+		if (m_curr_index + ValueFetch::step < m_reply.size()) {
+			m_curr_index += ValueFetch::step;
+		}
+		else {
+			std::vector<RedisReplyType> array_reply;
+			long long new_context;
+
+			do {
+				auto whole_reply = this->forward_scan_command<ValueFetch>(0);
+
+				array_reply = get_array(whole_reply);
+				assert(2 == array_reply.size());
+				assert(array_reply.size() % ValueFetch::step == 0);
+				new_context = get_integer(array_reply[0]);
+			} while (new_context and array_reply.empty());
+
+			m_reply = get_array(array_reply[1]);
+			m_scan_context = new_context;
+			m_curr_index = 0;
+		}
+	}
+
+	template <typename V, typename ValueFetch>
+	bool ScanIterator<V, ValueFetch>::equal (const ScanIterator& parOther) const {
+		return
+			(&parOther == this) or
+			(
+				implem::ScanIteratorBaseClass::is_equal(parOther) and
+				(m_scan_context == parOther.m_scan_context)
+			);
+	}
+
+	template <typename V, typename ValueFetch>
+	const V& ScanIterator<V, ValueFetch>::dereference() const {
+		assert(m_scan_context);
+		assert(not m_reply.empty());
+		assert(m_curr_index < m_reply.size());
+
+		return ValueFetch::make_value(m_reply.data() + m_curr_index);
+	}
+
+	template <typename V, typename ValueFetch>
+	template <typename T>
+	RedisReplyType ScanIterator<V, ValueFetch>::forward_scan_command (typename std::enable_if<HasScanTargetMethod<T>::value, int>::type) {
+		return implem::ScanIteratorBaseClass::run(T::command(), T::scan_target(), m_scan_context);
+	}
+
+	template <typename V, typename ValueFetch>
+	template <typename T>
+	RedisReplyType ScanIterator<V, ValueFetch>::forward_scan_command (typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type) {
+		return implem::ScanIteratorBaseClass::run(T::command(), m_scan_context);
+	}
+
+	template <typename T>
+	const T& ScanSingleValues<T>::make_value (const RedisReplyType* parItem) {
+		assert(parItem);
+		return get<T>(*parItem);
+	}
+} //namespace redis

From e0a82cce2dbec1304c363497c1aa06c881b35eb7 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 13 Jun 2016 10:57:42 +0100
Subject: [PATCH 045/170] Fix SCAN iteration.

---
 src/backends/redis/backend_redis.cpp |  4 +++-
 src/backends/redis/command.cpp       |  4 ++--
 src/backends/redis/command.hpp       | 12 +++++++-----
 src/backends/redis/reply.cpp         | 16 ++++++++++++++++
 src/backends/redis/reply.hpp         |  1 +
 src/backends/redis/scan_iterator.hpp |  1 +
 src/backends/redis/scan_iterator.inl | 28 ++++++++++++++++++++++++----
 7 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 00adefe..ffdd57c 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -54,6 +54,8 @@ namespace YAML {
 			parSettings.port = parNode["port"].as<uint16_t>();
 			if (parNode["database"])
 				parSettings.database = parNode["database"].as<uint16_t>();
+			else
+				parSettings.database = 0;
 			return true;
 		}
 	};
@@ -90,7 +92,7 @@ namespace dindb {
 
 	void BackendRedis::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 		for (const auto& file_path : m_redis.scan()) {
-			std::cout << file_path << '\n';
+			//std::cout << file_path << '\n';
 		}
 	}
 
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index f2de461..d4a58d0 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -84,8 +84,8 @@ namespace redis {
 		m_conn.reset();
 	}
 
-	RedisReplyType Command::run_pvt (const char* parCommand, int parArgc, const char** parArgv, std::size_t* parLengths) {
-		assert(parCommand);
+	RedisReplyType Command::run_pvt (int parArgc, const char** parArgv, std::size_t* parLengths) {
+		assert(parArgc >= 1);
 		assert(parArgv);
 		assert(parLengths); //This /could/ be null, but I don't see why it should
 		assert(is_connected());
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 0dbb3aa..9b6e3e4 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -56,7 +56,7 @@ namespace redis {
 	private:
 		using RedisConnection = std::unique_ptr<redisContext, void(*)(redisContext*)>;
 
-		RedisReplyType run_pvt ( const char* parCommand, int parArgc, const char** parArgv, std::size_t* parLengths );
+		RedisReplyType run_pvt ( int parArgc, const char** parArgv, std::size_t* parLengths );
 
 		RedisConnection m_conn;
 		std::string m_address;
@@ -65,15 +65,17 @@ namespace redis {
 
 	template <typename... Args>
 	RedisReplyType Command::run (const char* parCommand, Args&&... parArgs) {
-		constexpr const std::size_t arg_count = sizeof...(Args);
+		constexpr const std::size_t arg_count = sizeof...(Args) + 1;
 		using CharPointerArray = std::array<const char*, arg_count>;
 		using LengthArray = std::array<std::size_t, arg_count>;
+		using implem::arg_to_bin_safe_char;
+		using implem::arg_to_bin_safe_length;
+		using boost::string_ref;
 
 		return this->run_pvt(
-			parCommand,
 			static_cast<int>(arg_count),
-			CharPointerArray{ implem::arg_to_bin_safe_char(std::forward<Args>(parArgs))... }.data(),
-			LengthArray{ implem::arg_to_bin_safe_length(std::forward<Args>(parArgs))... }.data()
+			CharPointerArray{ arg_to_bin_safe_char(string_ref(parCommand)), arg_to_bin_safe_char(std::forward<Args>(parArgs))... }.data(),
+			LengthArray{ arg_to_bin_safe_length(string_ref(parCommand)), arg_to_bin_safe_length(std::forward<Args>(parArgs))... }.data()
 		);
 	}
 } //namespace redis
diff --git a/src/backends/redis/reply.cpp b/src/backends/redis/reply.cpp
index 6020d71..34789ef 100644
--- a/src/backends/redis/reply.cpp
+++ b/src/backends/redis/reply.cpp
@@ -17,6 +17,7 @@
 
 #include "reply.hpp"
 #include <boost/variant/get.hpp>
+#include <boost/lexical_cast.hpp>
 
 namespace redis {
 	const long long& get_integer (const RedisReplyType& parReply) {
@@ -27,6 +28,21 @@ namespace redis {
 		return boost::get<std::string>(parReply);
 	}
 
+	long long get_integer_autoconv_if_str (const RedisReplyType &parReply) {
+		using boost::lexical_cast;
+
+		const auto type = parReply.which();
+		switch (type) {
+		case implem::RedisVariantType_Integer:
+			return get_integer(parReply);
+		case implem::RedisVariantType_String:
+			return lexical_cast<long long>(get_string(parReply));
+		default:
+			assert(false);
+			return 0;
+		}
+	}
+
 	const std::vector<RedisReplyType>& get_array (const RedisReplyType& parReply) {
 		return boost::get<std::vector<RedisReplyType>>(parReply);
 	}
diff --git a/src/backends/redis/reply.hpp b/src/backends/redis/reply.hpp
index eb9469f..db2ccf8 100644
--- a/src/backends/redis/reply.hpp
+++ b/src/backends/redis/reply.hpp
@@ -50,6 +50,7 @@ namespace redis {
 	};
 
 	const long long& get_integer ( const RedisReplyType& parReply );
+	long long get_integer_autoconv_if_str ( const RedisReplyType& parReply );
 	const std::string& get_string ( const RedisReplyType& parReply );
 	const std::vector<RedisReplyType>& get_array ( const RedisReplyType& parReply );
 
diff --git a/src/backends/redis/scan_iterator.hpp b/src/backends/redis/scan_iterator.hpp
index 98bcb52..ee0946a 100644
--- a/src/backends/redis/scan_iterator.hpp
+++ b/src/backends/redis/scan_iterator.hpp
@@ -71,6 +71,7 @@ namespace redis {
 		RedisReplyType forward_scan_command ( typename std::enable_if<HasScanTargetMethod<T>::value, int>::type parDummy );
 		template <typename T>
 		RedisReplyType forward_scan_command ( typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type parDummy );
+		bool is_end ( void ) const;
 
 		void increment ( void );
 		bool equal ( const ScanIterator& parOther ) const;
diff --git a/src/backends/redis/scan_iterator.inl b/src/backends/redis/scan_iterator.inl
index ea7f7f3..51b7466 100644
--- a/src/backends/redis/scan_iterator.inl
+++ b/src/backends/redis/scan_iterator.inl
@@ -30,16 +30,33 @@ namespace redis {
 		m_scan_context(0),
 		m_curr_index(0)
 	{
-		if (not parEnd)
+		if (not parEnd) {
+			m_curr_index = 1; //Some arbitrary value so is_end()==false
+			assert(not is_end());
 			this->increment();
+		}
+		else {
+			assert(is_end());
+		}
+	}
+
+	template <typename V, typename ValueFetch>
+	bool ScanIterator<V, ValueFetch>::is_end() const {
+		return not m_curr_index and m_reply.empty() and not m_scan_context;
 	}
 
 	template <typename V, typename ValueFetch>
 	void ScanIterator<V, ValueFetch>::increment() {
+		assert(not is_end());
 		static_assert(ValueFetch::step > 0, "Can't have an increase step of 0");
+
 		if (m_curr_index + ValueFetch::step < m_reply.size()) {
 			m_curr_index += ValueFetch::step;
 		}
+		else if (m_curr_index + ValueFetch::step == m_reply.size() and not m_scan_context)	{
+			m_reply.clear();
+			m_curr_index = 0;
+		}
 		else {
 			std::vector<RedisReplyType> array_reply;
 			long long new_context;
@@ -50,7 +67,7 @@ namespace redis {
 				array_reply = get_array(whole_reply);
 				assert(2 == array_reply.size());
 				assert(array_reply.size() % ValueFetch::step == 0);
-				new_context = get_integer(array_reply[0]);
+				new_context = get_integer_autoconv_if_str(array_reply[0]);
 			} while (new_context and array_reply.empty());
 
 			m_reply = get_array(array_reply[1]);
@@ -63,15 +80,18 @@ namespace redis {
 	bool ScanIterator<V, ValueFetch>::equal (const ScanIterator& parOther) const {
 		return
 			(&parOther == this) or
+			(is_end() and parOther.is_end()) or
 			(
+				not (is_end() or parOther.is_end()) and
 				implem::ScanIteratorBaseClass::is_equal(parOther) and
-				(m_scan_context == parOther.m_scan_context)
+				(m_scan_context == parOther.m_scan_context) and
+				(m_curr_index == parOther.m_curr_index) and
+				(m_reply.size() == parOther.m_reply.size())
 			);
 	}
 
 	template <typename V, typename ValueFetch>
 	const V& ScanIterator<V, ValueFetch>::dereference() const {
-		assert(m_scan_context);
 		assert(not m_reply.empty());
 		assert(m_curr_index < m_reply.size());
 

From c7eeddabf1b28116f8fbf5ade1a3b46527b6a0d1 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 13 Jun 2016 15:14:10 +0100
Subject: [PATCH 046/170] Implement HSCAN Redis command.

---
 src/backends/redis/command.cpp       |  4 +++
 src/backends/redis/command.hpp       |  4 +++
 src/backends/redis/scan_iterator.cpp |  2 +-
 src/backends/redis/scan_iterator.hpp | 29 +++++++++++++---
 src/backends/redis/scan_iterator.inl | 52 +++++++++++++++++++++++++---
 5 files changed, 80 insertions(+), 11 deletions(-)

diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index d4a58d0..171d9c7 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -129,4 +129,8 @@ namespace redis {
 	auto Command::scan() -> scan_range {
 		return scan_range(scan_iterator(this, false), scan_iterator(this, true));
 	}
+
+	auto Command::hscan (boost::string_ref parKey) -> hscan_range {
+		return hscan_range(hscan_iterator(this, parKey, false), hscan_iterator(this, parKey, true));
+	}
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 9b6e3e4..ca22514 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -30,6 +30,7 @@
 #include <vector>
 #include <utility>
 #include <boost/range/iterator_range_core.hpp>
+#include <boost/utility/string_ref.hpp>
 
 struct redisContext;
 
@@ -38,6 +39,8 @@ namespace redis {
 	public:
 		typedef ScanIterator<std::string, ScanSingleValues<std::string>> scan_iterator;
 		typedef boost::iterator_range<scan_iterator> scan_range;
+		typedef ScanIterator<std::pair<std::string, std::string>, ScanPairs<std::pair<std::string, std::string>>> hscan_iterator;
+		typedef boost::iterator_range<hscan_iterator> hscan_range;
 
 		Command ( std::string&& parAddress, uint16_t parPort );
 		~Command ( void ) noexcept;
@@ -52,6 +55,7 @@ namespace redis {
 
 		//Single Redis command wrappers
 		scan_range scan ( void );
+		hscan_range hscan ( boost::string_ref parKey );
 
 	private:
 		using RedisConnection = std::unique_ptr<redisContext, void(*)(redisContext*)>;
diff --git a/src/backends/redis/scan_iterator.cpp b/src/backends/redis/scan_iterator.cpp
index 00736a5..f8dbeaa 100644
--- a/src/backends/redis/scan_iterator.cpp
+++ b/src/backends/redis/scan_iterator.cpp
@@ -39,7 +39,7 @@ namespace redis {
 			return m_command->run(parCommand, boost::lexical_cast<std::string>(parScanContext));
 		}
 
-		RedisReplyType ScanIteratorBaseClass::run (const char* parCommand, const std::string& parParameter, long long parScanContext) {
+		RedisReplyType ScanIteratorBaseClass::run (const char* parCommand, const boost::string_ref& parParameter, long long parScanContext) {
 			return m_command->run(parCommand, parParameter, boost::lexical_cast<std::string>(parScanContext));
 		}
 	} //namespace implem
diff --git a/src/backends/redis/scan_iterator.hpp b/src/backends/redis/scan_iterator.hpp
index ee0946a..e98dbcc 100644
--- a/src/backends/redis/scan_iterator.hpp
+++ b/src/backends/redis/scan_iterator.hpp
@@ -24,6 +24,7 @@
 #include <type_traits>
 #include <vector>
 #include <cstddef>
+#include <boost/utility/string_ref.hpp>
 
 namespace redis {
 	template <typename V, typename ValueFetch>
@@ -42,7 +43,7 @@ namespace redis {
 
 			bool is_connected ( void ) const;
 			RedisReplyType run ( const char* parCommand, long long parScanContext );
-			RedisReplyType run ( const char* parCommand, const std::string& parParameter, long long parScanContext );
+			RedisReplyType run ( const char* parCommand, const boost::string_ref& parParameter, long long parScanContext );
 
 			bool is_equal ( const ScanIteratorBaseClass& parOther ) const { return m_command == parOther.m_command; }
 
@@ -52,9 +53,10 @@ namespace redis {
 	} //namespace implem
 
 	template <typename V, typename ValueFetch>
-	class ScanIterator : private implem::ScanIteratorBaseClass, public implem::ScanIteratorBaseIterator<V, ValueFetch> {
+	class ScanIterator : private implem::ScanIteratorBaseClass, public implem::ScanIteratorBaseIterator<V, ValueFetch>, private ValueFetch {
 		friend class boost::iterator_core_access;
 		typedef implem::ScanIteratorBaseIterator<V, ValueFetch> base_iterator;
+		define_has_method(scan_target, ScanTarget);
 	public:
 		typedef typename base_iterator::difference_type difference_type;
 		typedef typename base_iterator::value_type value_type;
@@ -62,11 +64,12 @@ namespace redis {
 		typedef typename base_iterator::reference reference;
 		typedef typename base_iterator::iterator_category iterator_category;
 
+		template <typename Dummy=ValueFetch, typename=typename std::enable_if<not HasScanTargetMethod<Dummy>::value>::type>
 		ScanIterator ( Command* parCommand, bool parEnd );
+		template <typename Dummy=ValueFetch, typename=typename std::enable_if<HasScanTargetMethod<Dummy>::value>::type>
+		ScanIterator ( Command* parCommand, boost::string_ref parKey, bool parEnd );
 
 	private:
-		define_has_method(scan_target, ScanTarget);
-
 		template <typename T>
 		RedisReplyType forward_scan_command ( typename std::enable_if<HasScanTargetMethod<T>::value, int>::type parDummy );
 		template <typename T>
@@ -77,7 +80,7 @@ namespace redis {
 		bool equal ( const ScanIterator& parOther ) const;
 		const V& dereference ( void ) const;
 
-		std::vector<RedisReplyType> m_reply;
+		std::vector<value_type> m_reply;
 		long long m_scan_context;
 		std::size_t m_curr_index;
 	};
@@ -89,6 +92,22 @@ namespace redis {
 
 		static const T& make_value ( const RedisReplyType* parItem );
 	};
+
+	template <typename P, typename A=decltype(P().first), typename B=decltype(P().second)>
+	struct ScanPairs {
+		typedef P PairType;
+
+		explicit ScanPairs ( boost::string_ref parScanTarget ) : m_scan_target(parScanTarget) {}
+
+		static constexpr const char* command ( void ) { return "HSCAN"; }
+		static constexpr const std::size_t step = 2;
+
+		static PairType make_value ( const RedisReplyType* parItem );
+		boost::string_ref scan_target ( void );
+
+	private:
+		boost::string_ref m_scan_target;
+	};
 } //namespace redis
 
 #include "scan_iterator.inl"
diff --git a/src/backends/redis/scan_iterator.inl b/src/backends/redis/scan_iterator.inl
index 51b7466..3427948 100644
--- a/src/backends/redis/scan_iterator.inl
+++ b/src/backends/redis/scan_iterator.inl
@@ -24,8 +24,31 @@ namespace redis {
 	} //namespace implem
 
 	template <typename V, typename ValueFetch>
+	template <typename Dummy, typename>
 	ScanIterator<V, ValueFetch>::ScanIterator (Command* parCommand, bool parEnd) :
 		implem::ScanIteratorBaseClass(parCommand),
+		implem::ScanIteratorBaseIterator<V, ValueFetch>(),
+		ValueFetch(),
+		m_reply(),
+		m_scan_context(0),
+		m_curr_index(0)
+	{
+		if (not parEnd) {
+			m_curr_index = 1; //Some arbitrary value so is_end()==false
+			assert(not is_end());
+			this->increment();
+		}
+		else {
+			assert(is_end());
+		}
+	}
+
+	template <typename V, typename ValueFetch>
+	template <typename Dummy, typename>
+	ScanIterator<V, ValueFetch>::ScanIterator (Command* parCommand, boost::string_ref parKey, bool parEnd) :
+		implem::ScanIteratorBaseClass(parCommand),
+		implem::ScanIteratorBaseIterator<V, ValueFetch>(),
+		ValueFetch(parKey),
 		m_reply(),
 		m_scan_context(0),
 		m_curr_index(0)
@@ -50,10 +73,10 @@ namespace redis {
 		assert(not is_end());
 		static_assert(ValueFetch::step > 0, "Can't have an increase step of 0");
 
-		if (m_curr_index + ValueFetch::step < m_reply.size()) {
-			m_curr_index += ValueFetch::step;
+		if (m_curr_index + 1 < m_reply.size()) {
+			++m_curr_index;
 		}
-		else if (m_curr_index + ValueFetch::step == m_reply.size() and not m_scan_context)	{
+		else if (m_curr_index + 1 == m_reply.size() and not m_scan_context)	{
 			m_reply.clear();
 			m_curr_index = 0;
 		}
@@ -70,7 +93,15 @@ namespace redis {
 				new_context = get_integer_autoconv_if_str(array_reply[0]);
 			} while (new_context and array_reply.empty());
 
-			m_reply = get_array(array_reply[1]);
+			const auto variant_array = get_array(array_reply[1]);
+			assert(variant_array.size() % ValueFetch::step == 0);
+			const std::size_t expected_reply_count = variant_array.size() / ValueFetch::step;
+			m_reply.clear();
+			m_reply.reserve(expected_reply_count);
+			for (std::size_t z = 0; z < variant_array.size(); z += ValueFetch::step) {
+				m_reply.push_back(ValueFetch::make_value(variant_array.data() + z));
+			}
+			assert(expected_reply_count == m_reply.size());
 			m_scan_context = new_context;
 			m_curr_index = 0;
 		}
@@ -95,7 +126,7 @@ namespace redis {
 		assert(not m_reply.empty());
 		assert(m_curr_index < m_reply.size());
 
-		return ValueFetch::make_value(m_reply.data() + m_curr_index);
+		return m_reply[m_curr_index];
 	}
 
 	template <typename V, typename ValueFetch>
@@ -115,4 +146,15 @@ namespace redis {
 		assert(parItem);
 		return get<T>(*parItem);
 	}
+
+	template <typename P, typename A, typename B>
+	P ScanPairs<P, A, B>::make_value (const RedisReplyType* parItem) {
+		assert(parItem);
+		return PairType(get<A>(parItem[0]), get<B>(parItem[1]));
+	}
+
+	template <typename P, typename A, typename B>
+	boost::string_ref ScanPairs<P, A, B>::scan_target() {
+		return m_scan_target;
+	}
 } //namespace redis

From 731582d8fe613f823f9f8523f14cfe17463f9ae4 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 13 Jun 2016 15:24:26 +0100
Subject: [PATCH 047/170] Move V into ValueFetch.

No need to explicitly specify the dereferenced type directly to
the scan iterator anymore.
---
 src/backends/redis/command.hpp       |  4 +--
 src/backends/redis/scan_iterator.hpp | 20 +++++++------
 src/backends/redis/scan_iterator.inl | 42 ++++++++++++++--------------
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index ca22514..d4e1ce6 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -37,9 +37,9 @@ struct redisContext;
 namespace redis {
 	class Command {
 	public:
-		typedef ScanIterator<std::string, ScanSingleValues<std::string>> scan_iterator;
+		typedef ScanIterator<ScanSingleValues<std::string>> scan_iterator;
 		typedef boost::iterator_range<scan_iterator> scan_range;
-		typedef ScanIterator<std::pair<std::string, std::string>, ScanPairs<std::pair<std::string, std::string>>> hscan_iterator;
+		typedef ScanIterator<ScanPairs<std::pair<std::string, std::string>>> hscan_iterator;
 		typedef boost::iterator_range<hscan_iterator> hscan_range;
 
 		Command ( std::string&& parAddress, uint16_t parPort );
diff --git a/src/backends/redis/scan_iterator.hpp b/src/backends/redis/scan_iterator.hpp
index e98dbcc..3c24139 100644
--- a/src/backends/redis/scan_iterator.hpp
+++ b/src/backends/redis/scan_iterator.hpp
@@ -27,14 +27,14 @@
 #include <boost/utility/string_ref.hpp>
 
 namespace redis {
-	template <typename V, typename ValueFetch>
+	template <typename ValueFetch>
 	class ScanIterator;
 
 	class Command;
 
 	namespace implem {
-		template <typename V, typename ValueFetch>
-		using ScanIteratorBaseIterator = boost::iterator_facade<ScanIterator<V, ValueFetch>, const V, boost::forward_traversal_tag>;
+		template <typename ValueFetch>
+		using ScanIteratorBaseIterator = boost::iterator_facade<ScanIterator<ValueFetch>, const typename ValueFetch::value_type, boost::forward_traversal_tag>;
 
 		class ScanIteratorBaseClass {
 		protected:
@@ -52,10 +52,10 @@ namespace redis {
 		};
 	} //namespace implem
 
-	template <typename V, typename ValueFetch>
-	class ScanIterator : private implem::ScanIteratorBaseClass, public implem::ScanIteratorBaseIterator<V, ValueFetch>, private ValueFetch {
+	template <typename ValueFetch>
+	class ScanIterator : private implem::ScanIteratorBaseClass, public implem::ScanIteratorBaseIterator<ValueFetch>, private ValueFetch {
 		friend class boost::iterator_core_access;
-		typedef implem::ScanIteratorBaseIterator<V, ValueFetch> base_iterator;
+		typedef implem::ScanIteratorBaseIterator<ValueFetch> base_iterator;
 		define_has_method(scan_target, ScanTarget);
 	public:
 		typedef typename base_iterator::difference_type difference_type;
@@ -78,7 +78,7 @@ namespace redis {
 
 		void increment ( void );
 		bool equal ( const ScanIterator& parOther ) const;
-		const V& dereference ( void ) const;
+		const value_type& dereference ( void ) const;
 
 		std::vector<value_type> m_reply;
 		long long m_scan_context;
@@ -87,6 +87,8 @@ namespace redis {
 
 	template <typename T>
 	struct ScanSingleValues {
+		typedef T value_type;
+
 		static constexpr const char* command ( void ) { return "SCAN"; }
 		static constexpr const std::size_t step = 1;
 
@@ -95,14 +97,14 @@ namespace redis {
 
 	template <typename P, typename A=decltype(P().first), typename B=decltype(P().second)>
 	struct ScanPairs {
-		typedef P PairType;
+		typedef P value_type;
 
 		explicit ScanPairs ( boost::string_ref parScanTarget ) : m_scan_target(parScanTarget) {}
 
 		static constexpr const char* command ( void ) { return "HSCAN"; }
 		static constexpr const std::size_t step = 2;
 
-		static PairType make_value ( const RedisReplyType* parItem );
+		static value_type make_value ( const RedisReplyType* parItem );
 		boost::string_ref scan_target ( void );
 
 	private:
diff --git a/src/backends/redis/scan_iterator.inl b/src/backends/redis/scan_iterator.inl
index 3427948..fa75eff 100644
--- a/src/backends/redis/scan_iterator.inl
+++ b/src/backends/redis/scan_iterator.inl
@@ -23,11 +23,11 @@ namespace redis {
 	namespace implem {
 	} //namespace implem
 
-	template <typename V, typename ValueFetch>
+	template <typename ValueFetch>
 	template <typename Dummy, typename>
-	ScanIterator<V, ValueFetch>::ScanIterator (Command* parCommand, bool parEnd) :
+	ScanIterator<ValueFetch>::ScanIterator (Command* parCommand, bool parEnd) :
 		implem::ScanIteratorBaseClass(parCommand),
-		implem::ScanIteratorBaseIterator<V, ValueFetch>(),
+		implem::ScanIteratorBaseIterator<ValueFetch>(),
 		ValueFetch(),
 		m_reply(),
 		m_scan_context(0),
@@ -43,11 +43,11 @@ namespace redis {
 		}
 	}
 
-	template <typename V, typename ValueFetch>
+	template <typename ValueFetch>
 	template <typename Dummy, typename>
-	ScanIterator<V, ValueFetch>::ScanIterator (Command* parCommand, boost::string_ref parKey, bool parEnd) :
+	ScanIterator<ValueFetch>::ScanIterator (Command* parCommand, boost::string_ref parKey, bool parEnd) :
 		implem::ScanIteratorBaseClass(parCommand),
-		implem::ScanIteratorBaseIterator<V, ValueFetch>(),
+		implem::ScanIteratorBaseIterator<ValueFetch>(),
 		ValueFetch(parKey),
 		m_reply(),
 		m_scan_context(0),
@@ -63,13 +63,13 @@ namespace redis {
 		}
 	}
 
-	template <typename V, typename ValueFetch>
-	bool ScanIterator<V, ValueFetch>::is_end() const {
+	template <typename ValueFetch>
+	bool ScanIterator<ValueFetch>::is_end() const {
 		return not m_curr_index and m_reply.empty() and not m_scan_context;
 	}
 
-	template <typename V, typename ValueFetch>
-	void ScanIterator<V, ValueFetch>::increment() {
+	template <typename ValueFetch>
+	void ScanIterator<ValueFetch>::increment() {
 		assert(not is_end());
 		static_assert(ValueFetch::step > 0, "Can't have an increase step of 0");
 
@@ -107,8 +107,8 @@ namespace redis {
 		}
 	}
 
-	template <typename V, typename ValueFetch>
-	bool ScanIterator<V, ValueFetch>::equal (const ScanIterator& parOther) const {
+	template <typename ValueFetch>
+	bool ScanIterator<ValueFetch>::equal (const ScanIterator& parOther) const {
 		return
 			(&parOther == this) or
 			(is_end() and parOther.is_end()) or
@@ -121,36 +121,36 @@ namespace redis {
 			);
 	}
 
-	template <typename V, typename ValueFetch>
-	const V& ScanIterator<V, ValueFetch>::dereference() const {
+	template <typename ValueFetch>
+	auto ScanIterator<ValueFetch>::dereference() const -> const value_type& {
 		assert(not m_reply.empty());
 		assert(m_curr_index < m_reply.size());
 
 		return m_reply[m_curr_index];
 	}
 
-	template <typename V, typename ValueFetch>
+	template <typename ValueFetch>
 	template <typename T>
-	RedisReplyType ScanIterator<V, ValueFetch>::forward_scan_command (typename std::enable_if<HasScanTargetMethod<T>::value, int>::type) {
+	RedisReplyType ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<HasScanTargetMethod<T>::value, int>::type) {
 		return implem::ScanIteratorBaseClass::run(T::command(), T::scan_target(), m_scan_context);
 	}
 
-	template <typename V, typename ValueFetch>
+	template <typename ValueFetch>
 	template <typename T>
-	RedisReplyType ScanIterator<V, ValueFetch>::forward_scan_command (typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type) {
+	RedisReplyType ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type) {
 		return implem::ScanIteratorBaseClass::run(T::command(), m_scan_context);
 	}
 
 	template <typename T>
-	const T& ScanSingleValues<T>::make_value (const RedisReplyType* parItem) {
+	auto ScanSingleValues<T>::make_value (const RedisReplyType* parItem) -> const value_type& {
 		assert(parItem);
 		return get<T>(*parItem);
 	}
 
 	template <typename P, typename A, typename B>
-	P ScanPairs<P, A, B>::make_value (const RedisReplyType* parItem) {
+	auto ScanPairs<P, A, B>::make_value (const RedisReplyType* parItem) -> value_type {
 		assert(parItem);
-		return PairType(get<A>(parItem[0]), get<B>(parItem[1]));
+		return value_type(get<A>(parItem[0]), get<B>(parItem[1]));
 	}
 
 	template <typename P, typename A, typename B>

From 9949c273a1a7b9fc884122b83c56faed030d3259 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 13 Jun 2016 15:38:18 +0100
Subject: [PATCH 048/170] Implement SSCAN Redis command.

---
 src/backends/redis/command.cpp       |  4 ++++
 src/backends/redis/command.hpp       |  3 +++
 src/backends/redis/scan_iterator.hpp | 18 +++++++++++++++++-
 src/backends/redis/scan_iterator.inl | 11 ++++++-----
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 171d9c7..7445b61 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -133,4 +133,8 @@ namespace redis {
 	auto Command::hscan (boost::string_ref parKey) -> hscan_range {
 		return hscan_range(hscan_iterator(this, parKey, false), hscan_iterator(this, parKey, true));
 	}
+
+	auto Command::sscan (boost::string_ref parKey) -> sscan_range {
+		return sscan_range(sscan_iterator(this, parKey, false), sscan_iterator(this, parKey, true));
+	}
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index d4e1ce6..1b3e840 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -41,6 +41,8 @@ namespace redis {
 		typedef boost::iterator_range<scan_iterator> scan_range;
 		typedef ScanIterator<ScanPairs<std::pair<std::string, std::string>>> hscan_iterator;
 		typedef boost::iterator_range<hscan_iterator> hscan_range;
+		typedef ScanIterator<ScanSingleValuesInKey<std::string>> sscan_iterator;
+		typedef boost::iterator_range<sscan_iterator> sscan_range;
 
 		Command ( std::string&& parAddress, uint16_t parPort );
 		~Command ( void ) noexcept;
@@ -56,6 +58,7 @@ namespace redis {
 		//Single Redis command wrappers
 		scan_range scan ( void );
 		hscan_range hscan ( boost::string_ref parKey );
+		sscan_range sscan ( boost::string_ref parKey );
 
 	private:
 		using RedisConnection = std::unique_ptr<redisContext, void(*)(redisContext*)>;
diff --git a/src/backends/redis/scan_iterator.hpp b/src/backends/redis/scan_iterator.hpp
index 3c24139..f0f5231 100644
--- a/src/backends/redis/scan_iterator.hpp
+++ b/src/backends/redis/scan_iterator.hpp
@@ -95,6 +95,22 @@ namespace redis {
 		static const T& make_value ( const RedisReplyType* parItem );
 	};
 
+	template <typename T>
+	struct ScanSingleValuesInKey {
+		typedef T value_type;
+
+		explicit ScanSingleValuesInKey ( boost::string_ref parScanTarget ) : m_scan_target(parScanTarget) {}
+
+		static constexpr const char* command ( void ) { return "SSCAN"; }
+		static constexpr const std::size_t step = 1;
+
+		static const T& make_value ( const RedisReplyType* parItem );
+		boost::string_ref scan_target ( void ) const { return m_scan_target; }
+
+	private:
+		boost::string_ref m_scan_target;
+	};
+
 	template <typename P, typename A=decltype(P().first), typename B=decltype(P().second)>
 	struct ScanPairs {
 		typedef P value_type;
@@ -105,7 +121,7 @@ namespace redis {
 		static constexpr const std::size_t step = 2;
 
 		static value_type make_value ( const RedisReplyType* parItem );
-		boost::string_ref scan_target ( void );
+		boost::string_ref scan_target ( void ) const { return m_scan_target; }
 
 	private:
 		boost::string_ref m_scan_target;
diff --git a/src/backends/redis/scan_iterator.inl b/src/backends/redis/scan_iterator.inl
index fa75eff..5ef01c8 100644
--- a/src/backends/redis/scan_iterator.inl
+++ b/src/backends/redis/scan_iterator.inl
@@ -147,14 +147,15 @@ namespace redis {
 		return get<T>(*parItem);
 	}
 
+	template <typename T>
+	auto ScanSingleValuesInKey<T>::make_value (const RedisReplyType* parItem) -> const value_type& {
+		assert(parItem);
+		return get<T>(*parItem);
+	}
+
 	template <typename P, typename A, typename B>
 	auto ScanPairs<P, A, B>::make_value (const RedisReplyType* parItem) -> value_type {
 		assert(parItem);
 		return value_type(get<A>(parItem[0]), get<B>(parItem[1]));
 	}
-
-	template <typename P, typename A, typename B>
-	boost::string_ref ScanPairs<P, A, B>::scan_target() {
-		return m_scan_target;
-	}
 } //namespace redis

From 78eee0e16f48a87a382793441328ffaed9e6ee6a Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 13 Jun 2016 16:20:31 +0100
Subject: [PATCH 049/170] Make the scan command in ScanPairs a template
 parameter.

---
 src/backends/redis/CMakeLists.txt    |  1 +
 src/backends/redis/command.hpp       |  2 +-
 src/backends/redis/scan_iterator.hpp | 10 ++++++++--
 src/backends/redis/scan_iterator.inl |  4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 6683d00..f268708 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -12,6 +12,7 @@ add_library(${PROJECT_NAME} SHARED
 target_include_directories(${PROJECT_NAME} SYSTEM
 	PUBLIC ${Boost_INCLUDE_DIRS}
 	PRIVATE ${HIREDIS_INCLUDE_DIRS}
+	PRIVATE ${CMAKE_SOURCE_DIR}/lib/better-enums
 )
 
 target_link_libraries(${PROJECT_NAME}
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 1b3e840..51bedd1 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -39,7 +39,7 @@ namespace redis {
 	public:
 		typedef ScanIterator<ScanSingleValues<std::string>> scan_iterator;
 		typedef boost::iterator_range<scan_iterator> scan_range;
-		typedef ScanIterator<ScanPairs<std::pair<std::string, std::string>>> hscan_iterator;
+		typedef ScanIterator<ScanPairs<std::pair<std::string, std::string>, ScanCommands::HSCAN>> hscan_iterator;
 		typedef boost::iterator_range<hscan_iterator> hscan_range;
 		typedef ScanIterator<ScanSingleValuesInKey<std::string>> sscan_iterator;
 		typedef boost::iterator_range<sscan_iterator> sscan_range;
diff --git a/src/backends/redis/scan_iterator.hpp b/src/backends/redis/scan_iterator.hpp
index f0f5231..0042b1e 100644
--- a/src/backends/redis/scan_iterator.hpp
+++ b/src/backends/redis/scan_iterator.hpp
@@ -20,6 +20,7 @@
 
 #include "reply.hpp"
 #include "helpers/has_method.hpp"
+#include "enum.h"
 #include <boost/iterator/iterator_facade.hpp>
 #include <type_traits>
 #include <vector>
@@ -52,6 +53,10 @@ namespace redis {
 		};
 	} //namespace implem
 
+	BETTER_ENUM(ScanCommands, char,
+		SCAN, SSCAN, ZSCAN, HSCAN
+	);
+
 	template <typename ValueFetch>
 	class ScanIterator : private implem::ScanIteratorBaseClass, public implem::ScanIteratorBaseIterator<ValueFetch>, private ValueFetch {
 		friend class boost::iterator_core_access;
@@ -111,13 +116,14 @@ namespace redis {
 		boost::string_ref m_scan_target;
 	};
 
-	template <typename P, typename A=decltype(P().first), typename B=decltype(P().second)>
+	template <typename P, char Command, typename A=decltype(P().first), typename B=decltype(P().second)>
 	struct ScanPairs {
+		static_assert(Command == ScanCommands::HSCAN or Command == ScanCommands::ZSCAN, "Invalid scan command chosen");
 		typedef P value_type;
 
 		explicit ScanPairs ( boost::string_ref parScanTarget ) : m_scan_target(parScanTarget) {}
 
-		static constexpr const char* command ( void ) { return "HSCAN"; }
+		static constexpr const char* command ( void ) { return ScanCommands::_from_integral(Command)._to_string(); }
 		static constexpr const std::size_t step = 2;
 
 		static value_type make_value ( const RedisReplyType* parItem );
diff --git a/src/backends/redis/scan_iterator.inl b/src/backends/redis/scan_iterator.inl
index 5ef01c8..16dae8c 100644
--- a/src/backends/redis/scan_iterator.inl
+++ b/src/backends/redis/scan_iterator.inl
@@ -153,8 +153,8 @@ namespace redis {
 		return get<T>(*parItem);
 	}
 
-	template <typename P, typename A, typename B>
-	auto ScanPairs<P, A, B>::make_value (const RedisReplyType* parItem) -> value_type {
+	template <typename P, char Command, typename A, typename B>
+	auto ScanPairs<P, Command, A, B>::make_value (const RedisReplyType* parItem) -> value_type {
 		assert(parItem);
 		return value_type(get<A>(parItem[0]), get<B>(parItem[1]));
 	}

From 533b5717718aa9f0853e124e4d3ab037477e962d Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 13 Jun 2016 16:20:54 +0100
Subject: [PATCH 050/170] Implement ZSCAN Redis command.

---
 src/backends/redis/command.cpp | 4 ++++
 src/backends/redis/command.hpp | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 7445b61..b8e49d4 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -137,4 +137,8 @@ namespace redis {
 	auto Command::sscan (boost::string_ref parKey) -> sscan_range {
 		return sscan_range(sscan_iterator(this, parKey, false), sscan_iterator(this, parKey, true));
 	}
+
+	auto Command::zscan (boost::string_ref parKey) -> zscan_range {
+		return zscan_range(zscan_iterator(this, parKey, false), zscan_iterator(this, parKey, true));
+	}
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 51bedd1..c839cb1 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -43,6 +43,8 @@ namespace redis {
 		typedef boost::iterator_range<hscan_iterator> hscan_range;
 		typedef ScanIterator<ScanSingleValuesInKey<std::string>> sscan_iterator;
 		typedef boost::iterator_range<sscan_iterator> sscan_range;
+		typedef ScanIterator<ScanPairs<std::pair<std::string, std::string>, ScanCommands::ZSCAN>> zscan_iterator;
+		typedef boost::iterator_range<zscan_iterator> zscan_range;
 
 		Command ( std::string&& parAddress, uint16_t parPort );
 		~Command ( void ) noexcept;
@@ -59,6 +61,7 @@ namespace redis {
 		scan_range scan ( void );
 		hscan_range hscan ( boost::string_ref parKey );
 		sscan_range sscan ( boost::string_ref parKey );
+		zscan_range zscan ( boost::string_ref parKey );
 
 	private:
 		using RedisConnection = std::unique_ptr<redisContext, void(*)(redisContext*)>;

From 316f8f585be305da7b06f2668d700eb868242dbf Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 13 Jun 2016 17:00:12 +0100
Subject: [PATCH 051/170] Rename RedisReplyType to just Reply.

---
 src/backends/redis/command.cpp       | 10 +++++-----
 src/backends/redis/command.hpp       |  6 +++---
 src/backends/redis/reply.cpp         | 22 +++++++++++-----------
 src/backends/redis/reply.hpp         | 26 +++++++++++++-------------
 src/backends/redis/scan_iterator.cpp |  4 ++--
 src/backends/redis/scan_iterator.hpp | 14 +++++++-------
 src/backends/redis/scan_iterator.inl | 12 ++++++------
 7 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index b8e49d4..0007aec 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -28,9 +28,9 @@ namespace redis {
 	namespace {
 		using RedisReply = std::unique_ptr<redisReply, void(*)(void*)>;
 
-		RedisReplyType make_redis_reply_type (redisReply* parReply) {
+		Reply make_redis_reply_type (redisReply* parReply) {
 			using boost::transform_iterator;
-			using PtrToReplyIterator = transform_iterator<RedisReplyType(*)(redisReply*), redisReply**>;
+			using PtrToReplyIterator = transform_iterator<Reply(*)(redisReply*), redisReply**>;
 
 			switch (parReply->type) {
 			case REDIS_REPLY_INTEGER:
@@ -38,12 +38,12 @@ namespace redis {
 			case REDIS_REPLY_STRING:
 				return std::string(parReply->str, parReply->len);
 			case REDIS_REPLY_ARRAY:
-				return std::vector<RedisReplyType>(
+				return std::vector<Reply>(
 					PtrToReplyIterator(parReply->element, &make_redis_reply_type),
 					PtrToReplyIterator(parReply->element + parReply->elements, &make_redis_reply_type)
 				);
 			default:
-				return RedisReplyType();
+				return Reply();
 			};
 		}
 	} //unnamed namespace
@@ -84,7 +84,7 @@ namespace redis {
 		m_conn.reset();
 	}
 
-	RedisReplyType Command::run_pvt (int parArgc, const char** parArgv, std::size_t* parLengths) {
+	Reply Command::run_pvt (int parArgc, const char** parArgv, std::size_t* parLengths) {
 		assert(parArgc >= 1);
 		assert(parArgv);
 		assert(parLengths); //This /could/ be null, but I don't see why it should
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index c839cb1..4626e9b 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -55,7 +55,7 @@ namespace redis {
 		bool is_connected ( void ) const;
 
 		template <typename... Args>
-		RedisReplyType run ( const char* parCommand, Args&&... parArgs );
+		Reply run ( const char* parCommand, Args&&... parArgs );
 
 		//Single Redis command wrappers
 		scan_range scan ( void );
@@ -66,7 +66,7 @@ namespace redis {
 	private:
 		using RedisConnection = std::unique_ptr<redisContext, void(*)(redisContext*)>;
 
-		RedisReplyType run_pvt ( int parArgc, const char** parArgv, std::size_t* parLengths );
+		Reply run_pvt ( int parArgc, const char** parArgv, std::size_t* parLengths );
 
 		RedisConnection m_conn;
 		std::string m_address;
@@ -74,7 +74,7 @@ namespace redis {
 	};
 
 	template <typename... Args>
-	RedisReplyType Command::run (const char* parCommand, Args&&... parArgs) {
+	Reply Command::run (const char* parCommand, Args&&... parArgs) {
 		constexpr const std::size_t arg_count = sizeof...(Args) + 1;
 		using CharPointerArray = std::array<const char*, arg_count>;
 		using LengthArray = std::array<std::size_t, arg_count>;
diff --git a/src/backends/redis/reply.cpp b/src/backends/redis/reply.cpp
index 34789ef..1474584 100644
--- a/src/backends/redis/reply.cpp
+++ b/src/backends/redis/reply.cpp
@@ -20,15 +20,15 @@
 #include <boost/lexical_cast.hpp>
 
 namespace redis {
-	const long long& get_integer (const RedisReplyType& parReply) {
+	const long long& get_integer (const Reply& parReply) {
 		return boost::get<long long>(parReply);
 	}
 
-	const std::string& get_string (const RedisReplyType& parReply) {
+	const std::string& get_string (const Reply& parReply) {
 		return boost::get<std::string>(parReply);
 	}
 
-	long long get_integer_autoconv_if_str (const RedisReplyType &parReply) {
+	long long get_integer_autoconv_if_str (const Reply &parReply) {
 		using boost::lexical_cast;
 
 		const auto type = parReply.which();
@@ -43,26 +43,26 @@ namespace redis {
 		}
 	}
 
-	const std::vector<RedisReplyType>& get_array (const RedisReplyType& parReply) {
-		return boost::get<std::vector<RedisReplyType>>(parReply);
+	const std::vector<Reply>& get_array (const Reply& parReply) {
+		return boost::get<std::vector<Reply>>(parReply);
 	}
 
 	template <>
-	const std::string& get<std::string> (const RedisReplyType& parReply) {
+	const std::string& get<std::string> (const Reply& parReply) {
 		return get_string(parReply);
 	}
 
 	template <>
-	const std::vector<RedisReplyType>& get<std::vector<RedisReplyType>> (const RedisReplyType& parReply) {
+	const std::vector<Reply>& get<std::vector<Reply>> (const Reply& parReply) {
 		return get_array(parReply);
 	}
 
 	template <>
-	const long long& get<long long> (const RedisReplyType& parReply) {
+	const long long& get<long long> (const Reply& parReply) {
 		return get_integer(parReply);
 	}
 
-	template const std::string& get<std::string> ( const RedisReplyType& parReply );
-	template const std::vector<RedisReplyType>& get<std::vector<RedisReplyType>> ( const RedisReplyType& parReply );
-	template const long long& get<long long> ( const RedisReplyType& parReply );
+	template const std::string& get<std::string> ( const Reply& parReply );
+	template const std::vector<Reply>& get<std::vector<Reply>> ( const Reply& parReply );
+	template const long long& get<long long> ( const Reply& parReply );
 } //namespace redis
diff --git a/src/backends/redis/reply.hpp b/src/backends/redis/reply.hpp
index db2ccf8..39d42cb 100644
--- a/src/backends/redis/reply.hpp
+++ b/src/backends/redis/reply.hpp
@@ -23,13 +23,13 @@
 #include <string>
 
 namespace redis {
-	class RedisReplyType;
+	class Reply;
 
 	namespace implem {
 		using RedisVariantType = boost::variant<
 			long long,
 			std::string,
-			boost::recursive_wrapper<std::vector<RedisReplyType>>
+			boost::recursive_wrapper<std::vector<Reply>>
 		>;
 		enum RedisVariantTypes {
 			RedisVariantType_Integer = 0,
@@ -39,23 +39,23 @@ namespace redis {
 		};
 	} //namespace implem
 
-	struct RedisReplyType : implem::RedisVariantType {
+	struct Reply : implem::RedisVariantType {
 		using base_class = implem::RedisVariantType;
 
-		RedisReplyType ( void ) = default;
-		RedisReplyType ( long long parVal ) : base_class(parVal) {}
-		RedisReplyType ( std::string&& parVal ) : base_class(std::move(parVal)) {}
-		RedisReplyType ( std::vector<RedisReplyType>&& parVal ) : base_class(std::move(parVal)) {}
-		~RedisReplyType ( void ) noexcept = default;
+		Reply ( void ) = default;
+		Reply ( long long parVal ) : base_class(parVal) {}
+		Reply ( std::string&& parVal ) : base_class(std::move(parVal)) {}
+		Reply ( std::vector<Reply>&& parVal ) : base_class(std::move(parVal)) {}
+		~Reply ( void ) noexcept = default;
 	};
 
-	const long long& get_integer ( const RedisReplyType& parReply );
-	long long get_integer_autoconv_if_str ( const RedisReplyType& parReply );
-	const std::string& get_string ( const RedisReplyType& parReply );
-	const std::vector<RedisReplyType>& get_array ( const RedisReplyType& parReply );
+	const long long& get_integer ( const Reply& parReply );
+	long long get_integer_autoconv_if_str ( const Reply& parReply );
+	const std::string& get_string ( const Reply& parReply );
+	const std::vector<Reply>& get_array ( const Reply& parReply );
 
 	template <typename T>
-	const T& get ( const RedisReplyType& parReply );
+	const T& get ( const Reply& parReply );
 } //namespace redis
 
 #endif
diff --git a/src/backends/redis/scan_iterator.cpp b/src/backends/redis/scan_iterator.cpp
index f8dbeaa..8307930 100644
--- a/src/backends/redis/scan_iterator.cpp
+++ b/src/backends/redis/scan_iterator.cpp
@@ -35,11 +35,11 @@ namespace redis {
 			return m_command and m_command->is_connected();
 		}
 
-		RedisReplyType ScanIteratorBaseClass::run (const char* parCommand, long long parScanContext) {
+		Reply ScanIteratorBaseClass::run (const char* parCommand, long long parScanContext) {
 			return m_command->run(parCommand, boost::lexical_cast<std::string>(parScanContext));
 		}
 
-		RedisReplyType ScanIteratorBaseClass::run (const char* parCommand, const boost::string_ref& parParameter, long long parScanContext) {
+		Reply ScanIteratorBaseClass::run (const char* parCommand, const boost::string_ref& parParameter, long long parScanContext) {
 			return m_command->run(parCommand, parParameter, boost::lexical_cast<std::string>(parScanContext));
 		}
 	} //namespace implem
diff --git a/src/backends/redis/scan_iterator.hpp b/src/backends/redis/scan_iterator.hpp
index 0042b1e..bde4d0a 100644
--- a/src/backends/redis/scan_iterator.hpp
+++ b/src/backends/redis/scan_iterator.hpp
@@ -43,8 +43,8 @@ namespace redis {
 			~ScanIteratorBaseClass ( void ) noexcept = default;
 
 			bool is_connected ( void ) const;
-			RedisReplyType run ( const char* parCommand, long long parScanContext );
-			RedisReplyType run ( const char* parCommand, const boost::string_ref& parParameter, long long parScanContext );
+			Reply run ( const char* parCommand, long long parScanContext );
+			Reply run ( const char* parCommand, const boost::string_ref& parParameter, long long parScanContext );
 
 			bool is_equal ( const ScanIteratorBaseClass& parOther ) const { return m_command == parOther.m_command; }
 
@@ -76,9 +76,9 @@ namespace redis {
 
 	private:
 		template <typename T>
-		RedisReplyType forward_scan_command ( typename std::enable_if<HasScanTargetMethod<T>::value, int>::type parDummy );
+		Reply forward_scan_command ( typename std::enable_if<HasScanTargetMethod<T>::value, int>::type parDummy );
 		template <typename T>
-		RedisReplyType forward_scan_command ( typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type parDummy );
+		Reply forward_scan_command ( typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type parDummy );
 		bool is_end ( void ) const;
 
 		void increment ( void );
@@ -97,7 +97,7 @@ namespace redis {
 		static constexpr const char* command ( void ) { return "SCAN"; }
 		static constexpr const std::size_t step = 1;
 
-		static const T& make_value ( const RedisReplyType* parItem );
+		static const T& make_value ( const Reply* parItem );
 	};
 
 	template <typename T>
@@ -109,7 +109,7 @@ namespace redis {
 		static constexpr const char* command ( void ) { return "SSCAN"; }
 		static constexpr const std::size_t step = 1;
 
-		static const T& make_value ( const RedisReplyType* parItem );
+		static const T& make_value ( const Reply* parItem );
 		boost::string_ref scan_target ( void ) const { return m_scan_target; }
 
 	private:
@@ -126,7 +126,7 @@ namespace redis {
 		static constexpr const char* command ( void ) { return ScanCommands::_from_integral(Command)._to_string(); }
 		static constexpr const std::size_t step = 2;
 
-		static value_type make_value ( const RedisReplyType* parItem );
+		static value_type make_value ( const Reply* parItem );
 		boost::string_ref scan_target ( void ) const { return m_scan_target; }
 
 	private:
diff --git a/src/backends/redis/scan_iterator.inl b/src/backends/redis/scan_iterator.inl
index 16dae8c..441a857 100644
--- a/src/backends/redis/scan_iterator.inl
+++ b/src/backends/redis/scan_iterator.inl
@@ -81,7 +81,7 @@ namespace redis {
 			m_curr_index = 0;
 		}
 		else {
-			std::vector<RedisReplyType> array_reply;
+			std::vector<Reply> array_reply;
 			long long new_context;
 
 			do {
@@ -131,30 +131,30 @@ namespace redis {
 
 	template <typename ValueFetch>
 	template <typename T>
-	RedisReplyType ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<HasScanTargetMethod<T>::value, int>::type) {
+	Reply ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<HasScanTargetMethod<T>::value, int>::type) {
 		return implem::ScanIteratorBaseClass::run(T::command(), T::scan_target(), m_scan_context);
 	}
 
 	template <typename ValueFetch>
 	template <typename T>
-	RedisReplyType ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type) {
+	Reply ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type) {
 		return implem::ScanIteratorBaseClass::run(T::command(), m_scan_context);
 	}
 
 	template <typename T>
-	auto ScanSingleValues<T>::make_value (const RedisReplyType* parItem) -> const value_type& {
+	auto ScanSingleValues<T>::make_value (const Reply* parItem) -> const value_type& {
 		assert(parItem);
 		return get<T>(*parItem);
 	}
 
 	template <typename T>
-	auto ScanSingleValuesInKey<T>::make_value (const RedisReplyType* parItem) -> const value_type& {
+	auto ScanSingleValuesInKey<T>::make_value (const Reply* parItem) -> const value_type& {
 		assert(parItem);
 		return get<T>(*parItem);
 	}
 
 	template <typename P, char Command, typename A, typename B>
-	auto ScanPairs<P, Command, A, B>::make_value (const RedisReplyType* parItem) -> value_type {
+	auto ScanPairs<P, Command, A, B>::make_value (const Reply* parItem) -> value_type {
 		assert(parItem);
 		return value_type(get<A>(parItem[0]), get<B>(parItem[1]));
 	}

From 93e328d77f23604bfd2e88850f99c6a0fceaf19a Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 13 Jun 2016 17:27:52 +0100
Subject: [PATCH 052/170] Remove unnecessary usage of recursive_wrapper.

---
 src/backends/redis/reply.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/reply.hpp b/src/backends/redis/reply.hpp
index 39d42cb..4d60022 100644
--- a/src/backends/redis/reply.hpp
+++ b/src/backends/redis/reply.hpp
@@ -19,8 +19,8 @@
 #define id93FA96E3071745D9A1E45D4D29B9F7D0
 
 #include <boost/variant/variant.hpp>
-#include <boost/variant/recursive_wrapper.hpp>
 #include <string>
+#include <vector>
 
 namespace redis {
 	class Reply;
@@ -29,7 +29,7 @@ namespace redis {
 		using RedisVariantType = boost::variant<
 			long long,
 			std::string,
-			boost::recursive_wrapper<std::vector<Reply>>
+			std::vector<Reply>
 		>;
 		enum RedisVariantTypes {
 			RedisVariantType_Integer = 0,

From 9a69b8de10cc47385331e2c0fdd2de59cae6b1d2 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 13 Jun 2016 17:33:25 +0100
Subject: [PATCH 053/170] Throw if Redis reply contains any error messages.

---
 src/backends/redis/command.cpp | 7 +++++++
 src/backends/redis/command.hpp | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 0007aec..a2d6d37 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -42,6 +42,8 @@ namespace redis {
 					PtrToReplyIterator(parReply->element, &make_redis_reply_type),
 					PtrToReplyIterator(parReply->element + parReply->elements, &make_redis_reply_type)
 				);
+			case REDIS_REPLY_ERROR:
+				throw RedisError(parReply->str, parReply->len);
 			default:
 				return Reply();
 			};
@@ -141,4 +143,9 @@ namespace redis {
 	auto Command::zscan (boost::string_ref parKey) -> zscan_range {
 		return zscan_range(zscan_iterator(this, parKey, false), zscan_iterator(this, parKey, true));
 	}
+
+	RedisError::RedisError (const char* parMessage, std::size_t parLength) :
+		std::runtime_error(std::string(parMessage, parLength))
+	{
+	}
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 4626e9b..4524f3d 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -31,6 +31,7 @@
 #include <utility>
 #include <boost/range/iterator_range_core.hpp>
 #include <boost/utility/string_ref.hpp>
+#include <stdexcept>
 
 struct redisContext;
 
@@ -88,6 +89,11 @@ namespace redis {
 			LengthArray{ arg_to_bin_safe_length(string_ref(parCommand)), arg_to_bin_safe_length(std::forward<Args>(parArgs))... }.data()
 		);
 	}
+
+	class RedisError : public std::runtime_error {
+	public:
+		RedisError ( const char* parMessage, std::size_t parLength );
+	};
 } //namespace redis
 
 #endif

From efd71181897b4937ebf11735eb23c430ee9e50b9 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 14 Jun 2016 09:10:45 +0100
Subject: [PATCH 054/170] Add support for single chars to the run() method.

---
 src/backends/redis/arg_to_bin_safe.hpp | 10 ++++++++
 src/backends/redis/backend_redis.cpp   | 35 +++++++++++++++++++++-----
 src/backends/redis/command.hpp         |  3 ++-
 src/backends/redis/reply.hpp           |  2 +-
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/backends/redis/arg_to_bin_safe.hpp b/src/backends/redis/arg_to_bin_safe.hpp
index 360e4dd..47e5f42 100644
--- a/src/backends/redis/arg_to_bin_safe.hpp
+++ b/src/backends/redis/arg_to_bin_safe.hpp
@@ -55,6 +55,16 @@ namespace redis {
 			const std::size_t m_size;
 		};
 
+		template<>
+		struct MakeCharInfo<char> {
+			MakeCharInfo ( char parData ) : m_data(parData) {}
+			const char* data ( void ) const { return &m_data; }
+			std::size_t size ( void ) const { return 1; }
+
+		private:
+			const char m_data;
+		};
+
 		template <typename T>
 		inline const char* arg_to_bin_safe_char (const T& parArg) {
 			return MakeCharInfo<T>(parArg).data();
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index ffdd57c..cf50df3 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -91,9 +91,6 @@ namespace dindb {
 	}
 
 	void BackendRedis::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		for (const auto& file_path : m_redis.scan()) {
-			//std::cout << file_path << '\n';
-		}
 	}
 
 	void BackendRedis::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
@@ -114,9 +111,35 @@ namespace dindb {
 	void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
 		using boost::lexical_cast;
 
-		auto incr_reply = m_redis.run("HINCRBY " PROGRAM_NAME ":indices set 1");
-		const std::string set_key = PROGRAM_NAME ":set:" + lexical_cast<std::string>(redis::get_integer(incr_reply));
-		auto insert_set_reply = m_redis.run("HMSET %b name %b disk_label %b fs_uuid %b", set_key, parSetData.name, parSetData.disk_label, parSetData.fs_uuid);
+		redis::Reply set_id_reply = m_redis.run("HINCRBY " PROGRAM_NAME ":indices set 1");
+		const std::string set_key = PROGRAM_NAME ":set:" + lexical_cast<std::string>(redis::get_integer(set_id_reply));
+		redis::Reply insert_set_reply = m_redis.run(
+			"HMSET %b name %b disk_label %b fs_uuid %b type %b content_type %b",
+			set_key,
+			parSetData.name,
+			parSetData.disk_label,
+			parSetData.fs_uuid,
+			parSetData.type,
+			parSetData.content_type
+		);
+
+		for (const auto& file_data : parData) {
+			redis::Reply file_id_reply = m_redis.run("HINCRBY " PROGRAM_NAME ":indices files 1");
+			const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(redis::get_integer(file_id_reply));
+			redis::Reply insert_file_reply = m_redis.run(
+				"HMSET %b hash %b path %b size %b level %b mime_type %b mime_charset %b is_directory %b is_symlink %b is_unreadable %b hash_valid %b",
+				file_key,
+				tiger_to_string(file_data.hash),
+				lexical_cast<std::string>(file_data.size),
+				lexical_cast<std::string>(file_data.level),
+				file_data.mime_type(),
+				file_data.mime_charset(),
+				(file_data.is_directory ? '1' : '0'),
+				(file_data.is_symlink ? '1' : '0'),
+				(file_data.unreadable ? '1' : '0'),
+				(file_data.hash_valid ? '1' : '0')
+			);
+		}
 	}
 
 	bool BackendRedis::search_file_by_hash (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) {
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 4524f3d..b3b00a0 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -81,11 +81,12 @@ namespace redis {
 		using LengthArray = std::array<std::size_t, arg_count>;
 		using implem::arg_to_bin_safe_char;
 		using implem::arg_to_bin_safe_length;
+		using implem::MakeCharInfo;
 		using boost::string_ref;
 
 		return this->run_pvt(
 			static_cast<int>(arg_count),
-			CharPointerArray{ arg_to_bin_safe_char(string_ref(parCommand)), arg_to_bin_safe_char(std::forward<Args>(parArgs))... }.data(),
+			CharPointerArray{ (arg_to_bin_safe_char(string_ref(parCommand))), MakeCharInfo<typename std::remove_const<typename std::remove_reference<Args>::type>::type>(std::forward<Args>(parArgs)).data()... }.data(),
 			LengthArray{ arg_to_bin_safe_length(string_ref(parCommand)), arg_to_bin_safe_length(std::forward<Args>(parArgs))... }.data()
 		);
 	}
diff --git a/src/backends/redis/reply.hpp b/src/backends/redis/reply.hpp
index 4d60022..24332d6 100644
--- a/src/backends/redis/reply.hpp
+++ b/src/backends/redis/reply.hpp
@@ -23,7 +23,7 @@
 #include <vector>
 
 namespace redis {
-	class Reply;
+	struct Reply;
 
 	namespace implem {
 		using RedisVariantType = boost::variant<

From ba8e8b9f7bff3b7afb071a867a1166507322e626 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 14 Jun 2016 09:11:07 +0100
Subject: [PATCH 055/170] Add support for char[N] to the run() method.

---
 src/backends/redis/arg_to_bin_safe.hpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/backends/redis/arg_to_bin_safe.hpp b/src/backends/redis/arg_to_bin_safe.hpp
index 47e5f42..41ab8d2 100644
--- a/src/backends/redis/arg_to_bin_safe.hpp
+++ b/src/backends/redis/arg_to_bin_safe.hpp
@@ -65,6 +65,17 @@ namespace redis {
 			const char m_data;
 		};
 
+		template <std::size_t N>
+		struct MakeCharInfo<char[N]> {
+			static_assert(N > 0, "Given input should have at least one character as it's assumed to be a null-terminated string");
+			MakeCharInfo ( const char (&parData)[N] ) : m_data(parData, N - 1) {}
+			const char* data ( void ) const { return m_data.data(); }
+			std::size_t size ( void ) const { return m_data.size(); }
+
+		private:
+			boost::string_ref m_data;
+		};
+
 		template <typename T>
 		inline const char* arg_to_bin_safe_char (const T& parArg) {
 			return MakeCharInfo<T>(parArg).data();

From ab43215f4941e0b4d77e00ea4175c3fc9f2a2cf2 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 14 Jun 2016 09:12:32 +0100
Subject: [PATCH 056/170] Use the right syntax for Redis command.

With this commit, scan subcommand can save all it needs into Redis.
---
 src/backends/redis/backend_redis.cpp | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index cf50df3..7e3ff5d 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -110,33 +110,50 @@ namespace dindb {
 
 	void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
 		using boost::lexical_cast;
+		using boost::string_ref;
 
-		redis::Reply set_id_reply = m_redis.run("HINCRBY " PROGRAM_NAME ":indices set 1");
+		redis::Reply set_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "set", "1");
 		const std::string set_key = PROGRAM_NAME ":set:" + lexical_cast<std::string>(redis::get_integer(set_id_reply));
 		redis::Reply insert_set_reply = m_redis.run(
-			"HMSET %b name %b disk_label %b fs_uuid %b type %b content_type %b",
+			"HMSET",
 			set_key,
+			"name",
 			parSetData.name,
+			"disk_label",
 			parSetData.disk_label,
+			"fs_uuid",
 			parSetData.fs_uuid,
+			"type",
 			parSetData.type,
+			"content_type",
 			parSetData.content_type
 		);
 
 		for (const auto& file_data : parData) {
-			redis::Reply file_id_reply = m_redis.run("HINCRBY " PROGRAM_NAME ":indices files 1");
+			redis::Reply file_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "files", "1");
 			const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(redis::get_integer(file_id_reply));
 			redis::Reply insert_file_reply = m_redis.run(
-				"HMSET %b hash %b path %b size %b level %b mime_type %b mime_charset %b is_directory %b is_symlink %b is_unreadable %b hash_valid %b",
+				"HMSET",
 				file_key,
+				"hash",
 				tiger_to_string(file_data.hash),
+				"path",
+				file_data.path(),
+				"size",
 				lexical_cast<std::string>(file_data.size),
+				"level",
 				lexical_cast<std::string>(file_data.level),
+				"mime_type",
 				file_data.mime_type(),
+				"mime_charset",
 				file_data.mime_charset(),
+				"is_directory",
 				(file_data.is_directory ? '1' : '0'),
+				"is_symlink",
 				(file_data.is_symlink ? '1' : '0'),
+				"unreadable",
 				(file_data.unreadable ? '1' : '0'),
+				"hash_valid",
 				(file_data.hash_valid ? '1' : '0')
 			);
 		}

From 9ef9b05014fe15e6971069c4343e7b6bcf30777c Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 14 Jun 2016 09:37:57 +0100
Subject: [PATCH 057/170] Move variant types enum out of implem namespace.

Also assert that you can get the type you are trying to get before
actually trying.
---
 src/backends/redis/reply.cpp |  7 +++++--
 src/backends/redis/reply.hpp | 12 ++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/backends/redis/reply.cpp b/src/backends/redis/reply.cpp
index 1474584..9751f11 100644
--- a/src/backends/redis/reply.cpp
+++ b/src/backends/redis/reply.cpp
@@ -21,10 +21,12 @@
 
 namespace redis {
 	const long long& get_integer (const Reply& parReply) {
+		assert(RedisVariantType_Integer == parReply.which());
 		return boost::get<long long>(parReply);
 	}
 
 	const std::string& get_string (const Reply& parReply) {
+		assert(RedisVariantType_String == parReply.which());
 		return boost::get<std::string>(parReply);
 	}
 
@@ -33,9 +35,9 @@ namespace redis {
 
 		const auto type = parReply.which();
 		switch (type) {
-		case implem::RedisVariantType_Integer:
+		case RedisVariantType_Integer:
 			return get_integer(parReply);
-		case implem::RedisVariantType_String:
+		case RedisVariantType_String:
 			return lexical_cast<long long>(get_string(parReply));
 		default:
 			assert(false);
@@ -44,6 +46,7 @@ namespace redis {
 	}
 
 	const std::vector<Reply>& get_array (const Reply& parReply) {
+		assert(RedisVariantType_Array == parReply.which());
 		return boost::get<std::vector<Reply>>(parReply);
 	}
 
diff --git a/src/backends/redis/reply.hpp b/src/backends/redis/reply.hpp
index 24332d6..6ed6820 100644
--- a/src/backends/redis/reply.hpp
+++ b/src/backends/redis/reply.hpp
@@ -31,13 +31,13 @@ namespace redis {
 			std::string,
 			std::vector<Reply>
 		>;
-		enum RedisVariantTypes {
-			RedisVariantType_Integer = 0,
-			RedisVariantType_String,
-			RedisVariantType_Array,
-			RedisVariantType_Bool
-		};
 	} //namespace implem
+	enum RedisVariantTypes {
+		RedisVariantType_Integer = 0,
+		RedisVariantType_String,
+		RedisVariantType_Array,
+		RedisVariantType_Bool
+	};
 
 	struct Reply : implem::RedisVariantType {
 		using base_class = implem::RedisVariantType;

From 549ab7b16ab20b2e1b767147ea861ffb276f4155 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 14 Jun 2016 10:39:42 +0100
Subject: [PATCH 058/170] Write implementation for search_file_by_hash().

Note that the postgresql backend does something like
"select blah... where hash=$1 limit 1", so it only returns one match.
The SRANDMEMBER used in this implementation also returns one match,
but it's not deterministic I suppose.
---
 src/backends/redis/backend_redis.cpp | 130 ++++++++++++++++++++-------
 src/backends/redis/reply.hpp         |   3 +-
 2 files changed, 100 insertions(+), 33 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 7e3ff5d..d2d4679 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -23,6 +23,8 @@
 #include <utility>
 #include <yaml-cpp/yaml.h>
 #include <boost/lexical_cast.hpp>
+#include <array>
+#include <cstdint>
 
 namespace dindb {
 	namespace {
@@ -31,6 +33,66 @@ namespace dindb {
 			uint16_t port;
 			uint16_t database;
 		};
+
+		std::pair<std::string, mchlib::FileRecordData> pair_list_to_file_record (const redis::Command::hscan_range& parRange, const mchlib::TigerHash& parHash) {
+			using boost::lexical_cast;
+
+			mchlib::FileRecordData retval;
+			retval.hash = parHash;
+			std::array<std::string, 2> mime;
+			std::string group_key;
+
+			for (const auto itm : parRange) {
+				if (itm.first == "path")
+					retval.abs_path = itm.second;
+				else if (itm.first == "hash")
+					assert(tiger_to_string(parHash) == itm.second);
+				else if (itm.first == "size")
+					retval.size = lexical_cast<decltype(retval.size)>(
+							itm.second);
+				else if (itm.first == "level")
+					retval.level = lexical_cast<decltype(retval.level)>(
+							itm.second);
+				else if (itm.first == "mime_type")
+					mime[0] = itm.second;
+				else if (itm.first == "mime_charset")
+					mime[1] = itm.second;
+				else if (itm.first == "is_directory")
+					retval.is_directory = (itm.second[0] == '0' ? false : true);
+				else if (itm.first == "is_symlink")
+					retval.is_symlink = (itm.second[0] == '0' ? false : true);
+				else if (itm.first == "unreadable")
+					retval.unreadable = (itm.second[0] == '0' ? false : true);
+				else if (itm.first == "hash_valid")
+					retval.hash_valid = (itm.second[0] == '0' ? false : true);
+				else if (itm.first == "group_id")
+					group_key = itm.second;
+			}
+			retval.mime_full = mime[0] + mime[1];
+			retval.mime_type_offset = 0;
+			retval.mime_type_length = retval.mime_charset_offset = static_cast<uint16_t>(mime[0].size());
+			retval.mime_charset_length = static_cast<uint16_t>(mime[1].size());
+			return std::make_pair(group_key, std::move(retval));
+		}
+
+		mchlib::SetRecordDataFull pair_list_to_set_record (const redis::Command::hscan_range& parRange) {
+			using boost::lexical_cast;
+
+			mchlib::SetRecordDataFull retval;
+			for (const auto& itm : parRange) {
+				if (itm.first == "name")
+					retval.name = itm.second;
+				else if (itm.first == "disk_label")
+					retval.disk_label = itm.second;
+				else if (itm.first == "fs_uuid")
+					retval.fs_uuid = itm.second;
+				else if (itm.first == "type")
+					retval.type = lexical_cast<char>(itm.second[0]);
+				else if (itm.first == "content_type")
+					retval.content_type = lexical_cast<char>(itm.second[0]);
+			}
+			return retval;
+		}
 	} //unnamed namespace
 } //namespace dindb
 
@@ -117,50 +179,56 @@ namespace dindb {
 		redis::Reply insert_set_reply = m_redis.run(
 			"HMSET",
 			set_key,
-			"name",
-			parSetData.name,
-			"disk_label",
-			parSetData.disk_label,
-			"fs_uuid",
-			parSetData.fs_uuid,
-			"type",
-			parSetData.type,
-			"content_type",
-			parSetData.content_type
+			"name", parSetData.name,
+			"disk_label", parSetData.disk_label,
+			"fs_uuid", parSetData.fs_uuid,
+			"type", parSetData.type,
+			"content_type", parSetData.content_type
 		);
 
 		for (const auto& file_data : parData) {
 			redis::Reply file_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "files", "1");
 			const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(redis::get_integer(file_id_reply));
+			const std::string hash = tiger_to_string(file_data.hash);
 			redis::Reply insert_file_reply = m_redis.run(
 				"HMSET",
 				file_key,
-				"hash",
-				tiger_to_string(file_data.hash),
-				"path",
-				file_data.path(),
-				"size",
-				lexical_cast<std::string>(file_data.size),
-				"level",
-				lexical_cast<std::string>(file_data.level),
-				"mime_type",
-				file_data.mime_type(),
-				"mime_charset",
-				file_data.mime_charset(),
-				"is_directory",
-				(file_data.is_directory ? '1' : '0'),
-				"is_symlink",
-				(file_data.is_symlink ? '1' : '0'),
-				"unreadable",
-				(file_data.unreadable ? '1' : '0'),
-				"hash_valid",
-				(file_data.hash_valid ? '1' : '0')
+				"hash", hash,
+				"path", file_data.path(),
+				"size", lexical_cast<std::string>(file_data.size),
+				"level", lexical_cast<std::string>(file_data.level),
+				"mime_type", file_data.mime_type(),
+				"mime_charset", file_data.mime_charset(),
+				"is_directory", (file_data.is_directory ? '1' : '0'),
+				"is_symlink", (file_data.is_symlink ? '1' : '0'),
+				"unreadable", (file_data.unreadable ? '1' : '0'),
+				"hash_valid", (file_data.hash_valid ? '1' : '0'),
+				"group_id", set_key
+			);
+
+			redis::Reply insert_hash_reply = m_redis.run(
+				"SADD",
+				"hash:" + hash,
+				file_key
 			);
 		}
 	}
 
 	bool BackendRedis::search_file_by_hash (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) {
-		return false;
+		const std::string hash_key = "hash:" + tiger_to_string(parHash);
+		redis::Reply hash_reply = m_redis.run("SRANDMEMBER", hash_key);
+		if (redis::RedisVariantType_Integer == hash_reply.which() and not redis::get_integer(hash_reply)) {
+			return false;
+		}
+		else {
+			const auto result_id = redis::get_string(hash_reply);
+			auto set_key_and_file_item = pair_list_to_file_record(m_redis.hscan(result_id), parHash);
+			parItem = std::move(set_key_and_file_item.second);
+			const std::string group_key = std::move(set_key_and_file_item.first);
+
+			auto set_item = pair_list_to_set_record(m_redis.hscan(group_key));
+			return true;
+		}
 	}
 
 	std::vector<LocatedItem> BackendRedis::locate_in_db (const std::string& parSearch, const TagList& parTags) {
diff --git a/src/backends/redis/reply.hpp b/src/backends/redis/reply.hpp
index 6ed6820..a1a6606 100644
--- a/src/backends/redis/reply.hpp
+++ b/src/backends/redis/reply.hpp
@@ -35,8 +35,7 @@ namespace redis {
 	enum RedisVariantTypes {
 		RedisVariantType_Integer = 0,
 		RedisVariantType_String,
-		RedisVariantType_Array,
-		RedisVariantType_Bool
+		RedisVariantType_Array
 	};
 
 	struct Reply : implem::RedisVariantType {

From a5d5ee5af58f3eb2bd6f551bfc83cbd0a909f4a5 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 14 Jun 2016 10:41:38 +0100
Subject: [PATCH 059/170] Also return content_type.

---
 src/backends/postgresql/scan.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backends/postgresql/scan.cpp b/src/backends/postgresql/scan.cpp
index 881c52d..b1149de 100644
--- a/src/backends/postgresql/scan.cpp
+++ b/src/backends/postgresql/scan.cpp
@@ -64,7 +64,7 @@ namespace dindb {
 
 		{
 			auto resultset = parDB.query(
-				"SELECT \"desc\",\"type\",\"disk_number\",\"fs_uuid\",\"disk_label\" FROM sets WHERE \"id\"=$1;",
+				"SELECT \"desc\",\"type\",\"disk_number\",\"fs_uuid\",\"disk_label\",\"content_type\" FROM sets WHERE \"id\"=$1;",
 				group_id
 			);
 			if (resultset.empty()) {
@@ -79,6 +79,7 @@ namespace dindb {
 			parSet.disk_number = lexical_cast<uint32_t>(row["disk_number"]);
 			parSet.fs_uuid = row["fs_uuid"];
 			parSet.disk_label = row["disk_label"];
+			parSet.content_type = lexical_cast<char>(row["content_type"]);
 		}
 		return true;
 	}

From 2a696aa62a71edfd15a0de319efbb09be4a603dd Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 14 Jun 2016 11:03:31 +0100
Subject: [PATCH 060/170] Allow users to selectively build backends.

Pass -DDINDEXER_ENABLED_BACKENDS="list,of,backends" to cmake to tell
which backends you want to be built. Currently available backends are
postgresql and redis. Default is postgresql.
Allowed strings in the comma separated list above are the names of the
directories in src/backends.
---
 src/backends/CMakeLists.txt | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt
index f091a99..2b73dc9 100644
--- a/src/backends/CMakeLists.txt
+++ b/src/backends/CMakeLists.txt
@@ -1,6 +1,8 @@
 project(${bare_name}-backend CXX)
 
 set(BACKEND_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+set(DINDEXER_ENABLED_BACKENDS "postgresql" CACHE STRING "Comma separated list of enabled backends. See directories in backends source directory for a list of known backends.")
+
 function(ln_backend backend_name)
 	add_custom_command(TARGET "${backend_name}" POST_BUILD
 		COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:${backend_name}> ${BACKEND_BINARY_DIR}/$<TARGET_FILE_NAME:${backend_name}>
@@ -27,13 +29,9 @@ target_link_libraries(${PROJECT_NAME}
 	INTERFACE ${bare_name}-machinery
 )
 
-#install(TARGETS ${PROJECT_NAME}
-#	LIBRARY DESTINATION lib
-#	RUNTIME DESTINATION bin
-#	ARCHIVE DESTINATION lib/static
-#)
-
-add_subdirectory(postgresql)
-add_subdirectory(redis)
-add_dependencies(${PROJECT_NAME} ${bare_name}-backend-postgresql)
-add_dependencies(${PROJECT_NAME} ${bare_name}-backend-redis)
+string(REPLACE "," ";" backend_list "${DINDEXER_ENABLED_BACKENDS}")
+foreach(backend ${backend_list})
+	add_subdirectory(${backend})
+	add_dependencies(${PROJECT_NAME} ${bare_name}-backend-${backend})
+endforeach()
+unset(backend)

From 423effa6cbe3559f2f7734b1842732b98d23e169 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 14 Jun 2016 19:10:10 +0100
Subject: [PATCH 061/170] Set client name in Redis to dindexer_v0.1.5

---
 src/backends/redis/backend_redis.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index d2d4679..8c5d484 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -20,6 +20,7 @@
 #include "backends/exposed_functions.hpp"
 #include "backends/backend_version.hpp"
 #include "dindexerConfig.h"
+#include "helpers/stringize.h"
 #include <utility>
 #include <yaml-cpp/yaml.h>
 #include <boost/lexical_cast.hpp>
@@ -140,8 +141,8 @@ namespace dindb {
 
 		m_redis.connect();
 		if (m_redis.is_connected() and m_database > 0) {
-			const std::string command = "SELECT " + lexical_cast<std::string>(m_database);
-			m_redis.run(command.c_str());
+			m_redis.run("SELECT", lexical_cast<std::string>(m_database));
+			m_redis.run("CLIENT", "SETNAME", PROGRAM_NAME "_v" STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_PATCH));
 		}
 	}
 

From 874783e8da4f905a0ae277865ae7dc763ba30c9a Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 14 Jun 2016 19:11:13 +0100
Subject: [PATCH 062/170] Add support for the MATCH and COUNT options for the
 SCAN commands.

---
 src/backends/redis/scan_iterator.cpp | 26 +++++++++++++++++++++-----
 src/backends/redis/scan_iterator.hpp | 13 +++++++++----
 src/backends/redis/scan_iterator.inl | 12 ++++++------
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/backends/redis/scan_iterator.cpp b/src/backends/redis/scan_iterator.cpp
index 8307930..4f9d67e 100644
--- a/src/backends/redis/scan_iterator.cpp
+++ b/src/backends/redis/scan_iterator.cpp
@@ -25,7 +25,13 @@
 namespace redis {
 	namespace implem {
 		ScanIteratorBaseClass::ScanIteratorBaseClass (Command* parCommand) :
-			m_command(parCommand)
+			ScanIteratorBaseClass(parCommand, boost::string_ref())
+		{
+		}
+
+		ScanIteratorBaseClass::ScanIteratorBaseClass (Command* parCommand, boost::string_ref parMatchPattern) :
+			m_command(parCommand),
+			m_match_pattern(parMatchPattern)
 		{
 			assert(m_command);
 			assert(m_command->is_connected());
@@ -35,12 +41,22 @@ namespace redis {
 			return m_command and m_command->is_connected();
 		}
 
-		Reply ScanIteratorBaseClass::run (const char* parCommand, long long parScanContext) {
-			return m_command->run(parCommand, boost::lexical_cast<std::string>(parScanContext));
+		Reply ScanIteratorBaseClass::run (const char* parCommand, long long parScanContext, std::size_t parCount) {
+			const auto scan_context = boost::lexical_cast<std::string>(parScanContext);
+			const auto count_hint = boost::lexical_cast<std::string>(parCount);
+			if (m_match_pattern.empty())
+				return m_command->run(parCommand, scan_context, "COUNT", count_hint);
+			else
+				return m_command->run(parCommand, scan_context, "MATCH", m_match_pattern, "COUNT", count_hint);
 		}
 
-		Reply ScanIteratorBaseClass::run (const char* parCommand, const boost::string_ref& parParameter, long long parScanContext) {
-			return m_command->run(parCommand, parParameter, boost::lexical_cast<std::string>(parScanContext));
+		Reply ScanIteratorBaseClass::run (const char* parCommand, const boost::string_ref& parParameter, long long parScanContext, std::size_t parCount) {
+			const auto scan_context = boost::lexical_cast<std::string>(parScanContext);
+			const auto count_hint = boost::lexical_cast<std::string>(parCount);
+			if (m_match_pattern.empty())
+				return m_command->run(parCommand, parParameter, scan_context, "COUNT", count_hint);
+			else
+				return m_command->run(parCommand, parParameter, scan_context, "MATCH", m_match_pattern, "COUNT", count_hint);
 		}
 	} //namespace implem
 } //namespace redis
diff --git a/src/backends/redis/scan_iterator.hpp b/src/backends/redis/scan_iterator.hpp
index bde4d0a..b6f1a0c 100644
--- a/src/backends/redis/scan_iterator.hpp
+++ b/src/backends/redis/scan_iterator.hpp
@@ -40,16 +40,18 @@ namespace redis {
 		class ScanIteratorBaseClass {
 		protected:
 			explicit ScanIteratorBaseClass ( Command* parCommand );
+			ScanIteratorBaseClass ( Command* parCommand, boost::string_ref parMatchPattern );
 			~ScanIteratorBaseClass ( void ) noexcept = default;
 
 			bool is_connected ( void ) const;
-			Reply run ( const char* parCommand, long long parScanContext );
-			Reply run ( const char* parCommand, const boost::string_ref& parParameter, long long parScanContext );
+			Reply run ( const char* parCommand, long long parScanContext, std::size_t parCount );
+			Reply run ( const char* parCommand, const boost::string_ref& parParameter, long long parScanContext, std::size_t parCount );
 
 			bool is_equal ( const ScanIteratorBaseClass& parOther ) const { return m_command == parOther.m_command; }
 
 		private:
 			Command* m_command;
+			boost::string_ref m_match_pattern;
 		};
 	} //namespace implem
 
@@ -70,9 +72,9 @@ namespace redis {
 		typedef typename base_iterator::iterator_category iterator_category;
 
 		template <typename Dummy=ValueFetch, typename=typename std::enable_if<not HasScanTargetMethod<Dummy>::value>::type>
-		ScanIterator ( Command* parCommand, bool parEnd );
+		ScanIterator ( Command* parCommand, bool parEnd, boost::string_ref parMatchPattern=boost::string_ref() );
 		template <typename Dummy=ValueFetch, typename=typename std::enable_if<HasScanTargetMethod<Dummy>::value>::type>
-		ScanIterator ( Command* parCommand, boost::string_ref parKey, bool parEnd );
+		ScanIterator ( Command* parCommand, boost::string_ref parKey, bool parEnd, boost::string_ref parMatchPattern=boost::string_ref() );
 
 	private:
 		template <typename T>
@@ -96,6 +98,7 @@ namespace redis {
 
 		static constexpr const char* command ( void ) { return "SCAN"; }
 		static constexpr const std::size_t step = 1;
+		static constexpr const std::size_t work_count = 10;
 
 		static const T& make_value ( const Reply* parItem );
 	};
@@ -108,6 +111,7 @@ namespace redis {
 
 		static constexpr const char* command ( void ) { return "SSCAN"; }
 		static constexpr const std::size_t step = 1;
+		static constexpr const std::size_t work_count = 10;
 
 		static const T& make_value ( const Reply* parItem );
 		boost::string_ref scan_target ( void ) const { return m_scan_target; }
@@ -125,6 +129,7 @@ namespace redis {
 
 		static constexpr const char* command ( void ) { return ScanCommands::_from_integral(Command)._to_string(); }
 		static constexpr const std::size_t step = 2;
+		static constexpr const std::size_t work_count = 10;
 
 		static value_type make_value ( const Reply* parItem );
 		boost::string_ref scan_target ( void ) const { return m_scan_target; }
diff --git a/src/backends/redis/scan_iterator.inl b/src/backends/redis/scan_iterator.inl
index 441a857..1e7a443 100644
--- a/src/backends/redis/scan_iterator.inl
+++ b/src/backends/redis/scan_iterator.inl
@@ -25,8 +25,8 @@ namespace redis {
 
 	template <typename ValueFetch>
 	template <typename Dummy, typename>
-	ScanIterator<ValueFetch>::ScanIterator (Command* parCommand, bool parEnd) :
-		implem::ScanIteratorBaseClass(parCommand),
+	ScanIterator<ValueFetch>::ScanIterator (Command* parCommand, bool parEnd, boost::string_ref parMatchPattern) :
+		implem::ScanIteratorBaseClass(parCommand, parMatchPattern),
 		implem::ScanIteratorBaseIterator<ValueFetch>(),
 		ValueFetch(),
 		m_reply(),
@@ -45,8 +45,8 @@ namespace redis {
 
 	template <typename ValueFetch>
 	template <typename Dummy, typename>
-	ScanIterator<ValueFetch>::ScanIterator (Command* parCommand, boost::string_ref parKey, bool parEnd) :
-		implem::ScanIteratorBaseClass(parCommand),
+	ScanIterator<ValueFetch>::ScanIterator (Command* parCommand, boost::string_ref parKey, bool parEnd, boost::string_ref parMatchPattern) :
+		implem::ScanIteratorBaseClass(parCommand, parMatchPattern),
 		implem::ScanIteratorBaseIterator<ValueFetch>(),
 		ValueFetch(parKey),
 		m_reply(),
@@ -132,13 +132,13 @@ namespace redis {
 	template <typename ValueFetch>
 	template <typename T>
 	Reply ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<HasScanTargetMethod<T>::value, int>::type) {
-		return implem::ScanIteratorBaseClass::run(T::command(), T::scan_target(), m_scan_context);
+		return implem::ScanIteratorBaseClass::run(T::command(), T::scan_target(), m_scan_context, T::work_count);
 	}
 
 	template <typename ValueFetch>
 	template <typename T>
 	Reply ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type) {
-		return implem::ScanIteratorBaseClass::run(T::command(), m_scan_context);
+		return implem::ScanIteratorBaseClass::run(T::command(), m_scan_context, T::work_count);
 	}
 
 	template <typename T>

From 9491f2eb47707e600d8bab5986672b3a33d55259 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 15 Jun 2016 14:53:07 +0100
Subject: [PATCH 063/170] Move sequence_bt and string_bt into helpers.

They are useful in the Redis backend and in helpers itself.
People wanting to use pq alone from this project will have to cope and
search for all the needed files.
---
 include/{pq/implem => helpers}/sequence_bt.hpp | 4 ++--
 include/{pq/implem => helpers}/string_bt.hpp   | 6 +++---
 include/pq/implem/pq_type_helpers.hpp          | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename include/{pq/implem => helpers}/sequence_bt.hpp (97%)
 rename include/{pq/implem => helpers}/string_bt.hpp (97%)

diff --git a/include/pq/implem/sequence_bt.hpp b/include/helpers/sequence_bt.hpp
similarity index 97%
rename from include/pq/implem/sequence_bt.hpp
rename to include/helpers/sequence_bt.hpp
index 80bb7df..b79e126 100644
--- a/include/pq/implem/sequence_bt.hpp
+++ b/include/helpers/sequence_bt.hpp
@@ -20,7 +20,7 @@
 
 #include <cstddef>
 
-namespace pq {
+namespace dinhelp {
 	namespace bt {
 		template <std::size_t... I>
 		struct index_seq {
@@ -43,6 +43,6 @@ namespace pq {
 		template <std::size_t MIN, std::size_t MAX>
 		using index_range = typename implem::range_builder<MIN, MAX>::type;
 	} //namespace bt
-} //namespace pq
+} //namespace dinhelp
 
 #endif
diff --git a/include/pq/implem/string_bt.hpp b/include/helpers/string_bt.hpp
similarity index 97%
rename from include/pq/implem/string_bt.hpp
rename to include/helpers/string_bt.hpp
index dc1dbde..820ad81 100644
--- a/include/pq/implem/string_bt.hpp
+++ b/include/helpers/string_bt.hpp
@@ -18,12 +18,12 @@
 #ifndef id170B0E6C34D14EBA9B92A35977BDBFB3
 #define id170B0E6C34D14EBA9B92A35977BDBFB3
 
-#include "pq/implem/sequence_bt.hpp"
+#include "sequence_bt.hpp"
 #include <cstddef>
 #include <iostream>
 #include <stdexcept>
 
-namespace pq {
+namespace dinhelp {
 	namespace bt {
 		template <std::size_t S>
 		class string;
@@ -107,6 +107,6 @@ namespace pq {
 			return string<S>(parData);
 		}
 	} //namespace bt
-} //namespace pq
+} //namespace dinhelp
 
 #endif
diff --git a/include/pq/implem/pq_type_helpers.hpp b/include/pq/implem/pq_type_helpers.hpp
index 92023be..2ebf303 100644
--- a/include/pq/implem/pq_type_helpers.hpp
+++ b/include/pq/implem/pq_type_helpers.hpp
@@ -18,7 +18,7 @@
 #ifndef idEC73C3E4D64D44ABA0DB7D41FA8A7EB7
 #define idEC73C3E4D64D44ABA0DB7D41FA8A7EB7
 
-#include "pq/implem/string_bt.hpp"
+#include "helpers/string_bt.hpp"
 #include <chrono>
 #include <type_traits>
 #include <boost/utility/string_ref.hpp>
@@ -30,6 +30,8 @@ struct pg_param;
 typedef pg_param PGparam;
 
 namespace pq {
+	namespace bt = dinhelp::bt;
+
 	class Connection;
 
 	namespace implem {

From 7db82f83d96ffb51a6fb0c586245acffc2ac2584 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 15 Jun 2016 14:54:24 +0100
Subject: [PATCH 064/170] Add custom lexical_cast function that can handle hex
 values and string_ref.

Negative values are not supported.
---
 include/helpers/casts.hpp | 181 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 181 insertions(+)
 create mode 100644 include/helpers/casts.hpp

diff --git a/include/helpers/casts.hpp b/include/helpers/casts.hpp
new file mode 100644
index 0000000..1055933
--- /dev/null
+++ b/include/helpers/casts.hpp
@@ -0,0 +1,181 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id942A6B5AB2AF443C82D4321775BFC9E8
+#define id942A6B5AB2AF443C82D4321775BFC9E8
+
+#include "compatibility.h"
+#include "helpers/sequence_bt.hpp"
+#include <type_traits>
+#include <utility>
+#include <limits>
+#include <math.h>
+#include <array>
+#include <cstdint>
+#include <algorithm>
+#include <string>
+#include <ciso646>
+#include <climits>
+#include <boost/range/adaptor/reversed.hpp>
+
+namespace dinhelp {
+	namespace customize {
+		template<typename T>
+		struct index_array_to_string;
+
+		template<typename C, typename T>
+		struct char_to_int;
+	} //namespace customize
+
+	namespace implem {
+		template <typename T>
+		inline constexpr std::size_t max_digits() {
+			return static_cast<std::size_t>(::log(std::numeric_limits<T>::max()));
+		}
+
+		template <std::size_t Base, std::size_t Val>
+		struct power {
+			enum { value = Base * power<Base, Val - 1>::value };
+		};
+		template <std::size_t Base>
+		struct power<Base, 0> {
+			enum { value = 1 };
+		};
+
+		constexpr std::size_t count_digits_10_compiletime (std::size_t parNum) {
+			return (parNum == 0 ? 0 : static_cast<std::size_t>(::log10(parNum))) + 1;
+		}
+
+		template <std::size_t N>
+		struct maxdigits {
+			enum { value = count_digits_10_compiletime(static_cast<std::size_t>(::pow(2.0, static_cast<double>(N)))) };
+		};
+
+		template <template <typename> class Tag, typename T, typename F>
+		inline std::array<uint8_t, max_digits<T>()> int_to_string (const F& parFrom) {
+			using ArrayRetType = std::array<uint8_t, max_digits<T>()>;
+
+			ArrayRetType retval;
+			F div = 1;
+			for (std::size_t z = 0; z < Tag<F>::count_digits(parFrom); ++z) {
+				retval[Tag<F>::count_digits(parFrom) - z - 1] = static_cast<uint8_t>((parFrom / div) % Tag<F>::base);
+				div *= Tag<F>::base;
+			}
+			std::fill(retval.begin() + Tag<F>::count_digits(parFrom), retval.end(), 0xff);
+			return retval;
+		};
+
+		template <template <typename> class Tag, typename T, typename F>
+		inline T string_to_int (const F& parFrom) {
+			T retval(0);
+			T mul(1);
+			for (auto chara : boost::adaptors::reverse(parFrom)) {
+				retval += dinhelp::customize::char_to_int<decltype(chara), T>::make(chara) * mul;
+				mul *= Tag<T>::base;
+			}
+			return retval;
+		};
+	} //namespace implem
+
+	namespace tags {
+		template <typename T>
+		struct dec {
+			enum { base = 10 };
+
+			template <T... Powers, std::size_t... Digits>
+			static std::size_t count_digits (
+				T parValue,
+				dinhelp::bt::index_seq<Powers...> = dinhelp::bt::index_range<0, dinhelp::implem::max_digits<T>()>(),
+				dinhelp::bt::index_seq<Digits...> = dinhelp::bt::index_range<0, CHAR_BIT * sizeof(T)>()
+			) a_pure;
+		};
+
+		template <typename T>
+		struct hex {
+			enum { base = 16 };
+
+			static std::size_t count_digits ( T parValue ) a_pure;
+		};
+
+		//See: http://stackoverflow.com/questions/9721042/count-number-of-digits-which-method-is-most-efficient#9721113
+		template <typename T>
+		template <T... Powers, std::size_t... Digits>
+		std::size_t dec<T>::count_digits (T parValue, dinhelp::bt::index_seq<Powers...>, dinhelp::bt::index_seq<Digits...>) {
+			static T powers[] = { 0, dinhelp::implem::power<10, Powers + 1>::value... };
+			static std::size_t maxdigits[] = { dinhelp::implem::maxdigits<Digits>::value... };
+			const auto bits = sizeof(parValue) * CHAR_BIT - __builtin_clz(parValue);
+			return (parValue < powers[maxdigits[bits] - 1] ? maxdigits[bits] - 1 : maxdigits[bits]);
+		}
+
+		template <typename T>
+		std::size_t hex<T>::count_digits (T parValue) {
+			return std::max(((sizeof(parValue) * CHAR_BIT - __builtin_clz(parValue)) + (CHAR_BIT / 2 - 1)) / (CHAR_BIT / 2), 1);
+		}
+	} //namespace tags
+
+	namespace implem {
+		template <template <typename> class Tag>
+		struct lexical_cast {
+			template <typename T, typename F>
+			static T convert ( const typename std::enable_if<std::is_integral<F>::value, F>::type& parFrom ) {
+				const auto indices = int_to_string<Tag, T, F>(parFrom);
+				return dinhelp::customize::index_array_to_string<T>::make(indices);
+			}
+
+			template <typename T, typename F>
+			static typename std::enable_if<std::is_integral<T>::value, T>::type convert ( const F& parFrom ) {
+				return string_to_int<Tag, T, F>(parFrom);
+			}
+		};
+	} //namespace implem
+
+	template <typename T, template <typename> class Tag=tags::dec, typename F=void>
+	inline T lexical_cast (const F& parFrom) {
+		return dinhelp::implem::lexical_cast<Tag>::template convert<T, F>(parFrom);
+	}
+
+	namespace customize {
+		template<>
+		struct index_array_to_string<std::string> {
+			template<std::size_t N>
+			static std::string make (const std::array<uint8_t, N> &parIndices) {
+				static const char symbols[] = {'0', '1', '2', '3', '4', '5',
+											   '6', '7', '8', '9', 'A', 'B',
+											   'C', 'D', 'E', 'F'};
+				std::string retval(N, ' ');
+				for (std::size_t z = 0; z < N; ++z) {
+					retval[z] = symbols[parIndices[z]];
+				}
+				return retval;
+			}
+		};
+
+		template<typename T>
+		struct char_to_int<char, T> {
+			static T make (char parChar) {
+				if (parChar >= '0' and parChar <= '9')
+					return parChar - '0';
+				else if (parChar >= 'a' and parChar <= 'f')
+					return 10 + parChar - 'a';
+				else if (parChar >= 'A' and parChar <= 'F')
+					return 10 + parChar - 'A';
+				return 0;
+			}
+		};
+	} //namespace customize
+} //namespace dinhelp
+#endif

From 4b30fabbe4cd9642baea899b368bccee5a27348a Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 15 Jun 2016 14:57:52 +0100
Subject: [PATCH 065/170] New string_to_tiger function.

Comes with unit test that indirectly also tests the
previously added lexical_cast.
---
 include/dindexer-machinery/tiger.hpp |  4 ++
 src/machinery/tiger.cpp              | 16 +++++++
 test/unit/CMakeLists.txt             |  1 +
 test/unit/test_tiger_string_conv.cpp | 63 ++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 test/unit/test_tiger_string_conv.cpp

diff --git a/include/dindexer-machinery/tiger.hpp b/include/dindexer-machinery/tiger.hpp
index 8d74daf..b8d540e 100644
--- a/include/dindexer-machinery/tiger.hpp
+++ b/include/dindexer-machinery/tiger.hpp
@@ -21,6 +21,7 @@
 #include <cstdint>
 #include <string>
 #include <vector>
+#include <ciso646>
 
 namespace mchlib {
 	struct TigerHash {
@@ -35,6 +36,8 @@ namespace mchlib {
 			uint64_t data[3];
 			uint8_t byte_data[sizeof(uint64_t) * 3];
 		};
+
+		bool operator== (const TigerHash& parOther) const { return part_a == parOther.part_a and part_b == parOther.part_b and part_c == parOther.part_c; }
 	};
 
 	static_assert(sizeof(TigerHash) == 24, "Wrong struct size");
@@ -42,6 +45,7 @@ namespace mchlib {
 	void tiger_file ( const std::string& parPath, TigerHash& parHashFile, TigerHash& parHashDir, uint64_t& parSizeOut );
 	void tiger_init_hash ( TigerHash& parHash );
 	std::string tiger_to_string ( const TigerHash& parHash, bool parUpcase=false );
+	TigerHash string_to_tiger ( const std::string& parString );
 	void tiger_data ( const std::string& parData, TigerHash& parHash );
 	void tiger_data ( const std::vector<char>& parData, TigerHash& parHash );
 } //namespace mchlib
diff --git a/src/machinery/tiger.cpp b/src/machinery/tiger.cpp
index 4531ccd..70fd62b 100644
--- a/src/machinery/tiger.cpp
+++ b/src/machinery/tiger.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "dindexer-machinery/tiger.hpp"
+#include "helpers/casts.hpp"
 #include <fstream>
 #include <cstdint>
 #include <memory>
@@ -24,6 +25,7 @@
 #include <utility>
 #include <sstream>
 #include <iomanip>
+#include <boost/utility/string_ref.hpp>
 
 extern "C" void tiger ( const char* parStr, uint64_t parLength, uint64_t parHash[3], char parPadding );
 
@@ -153,6 +155,20 @@ namespace mchlib {
 		return oss.str();
 	}
 
+	TigerHash string_to_tiger (const std::string& parString) {
+		using boost::string_ref;
+		using TigerPartType = decltype(TigerHash::part_a);
+
+		assert(parString.size() == sizeof(TigerHash) * 2);
+
+		TigerHash retval;
+		const string_ref inp(parString);
+		retval.part_a = swap_long(dinhelp::lexical_cast<TigerPartType, dinhelp::tags::hex>(inp.substr(0, sizeof(TigerPartType) * 2)));
+		retval.part_b = swap_long(dinhelp::lexical_cast<TigerPartType, dinhelp::tags::hex>(inp.substr(sizeof(TigerPartType) * 2, sizeof(TigerPartType) * 2)));
+		retval.part_c = swap_long(dinhelp::lexical_cast<TigerPartType, dinhelp::tags::hex>(inp.substr(sizeof(TigerPartType) * 4, sizeof(TigerPartType) * 2)));
+		return retval;
+	}
+
 	void tiger_data (const std::string& parData, TigerHash& parHash) {
 		tiger (parData.data(), parData.size(), parHash.data, g_tiger_padding);
 	}
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index dfbe920..4a80dfe 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -4,6 +4,7 @@ add_executable(${PROJECT_NAME}
 	test_diriterator.cpp
 	test_guess_content_type.cpp
 	test_glob2regex.cpp
+	test_tiger_string_conv.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
diff --git a/test/unit/test_tiger_string_conv.cpp b/test/unit/test_tiger_string_conv.cpp
new file mode 100644
index 0000000..2e04395
--- /dev/null
+++ b/test/unit/test_tiger_string_conv.cpp
@@ -0,0 +1,63 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "dindexer-machinery/tiger.hpp"
+#include <gtest/gtest.h>
+#include <string>
+
+TEST(machinery, TigerStringConv) {
+	using mchlib::TigerHash;
+
+	const std::size_t TigerStringCharCount = sizeof(TigerHash) * 2;
+	{
+		TigerHash tiger_zero;
+		tiger_zero.part_a = tiger_zero.part_b = tiger_zero.part_c = 0;
+
+		const std::string expected(TigerStringCharCount, '0');
+		const std::string got = mchlib::tiger_to_string(tiger_zero);
+		EXPECT_EQ(expected, got);
+
+		auto hash2 = mchlib::string_to_tiger(got);
+		EXPECT_EQ(tiger_zero, hash2);
+	}
+
+	{
+		TigerHash t;
+		mchlib::tiger_init_hash(t);
+
+		const std::string expected = "efcdab89674523011032547698badcfe87e1b2c3b4a596f0";
+		EXPECT_EQ(TigerStringCharCount, expected.size());
+		const std::string got = mchlib::tiger_to_string(t);
+		EXPECT_EQ(expected, got);
+
+		auto hash2 = mchlib::string_to_tiger(got);
+		EXPECT_EQ(t, hash2);
+	}
+
+	{
+		TigerHash t;
+		t.part_a = t.part_b = t.part_c = 0xababababababababULL;
+
+		const std::string expected = "abababababababababababababababababababababababab";
+		EXPECT_EQ(TigerStringCharCount, expected.size());
+		const std::string got = mchlib::tiger_to_string(t);
+		EXPECT_EQ(expected, got);
+
+		auto hash2 = mchlib::string_to_tiger(got);
+		EXPECT_EQ(t, hash2);
+	}
+}

From 7ae8b955992b03ebb24cc4dac9075e75a1f46b8e Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 15 Jun 2016 15:05:25 +0100
Subject: [PATCH 066/170] Rename casts.hpp to lexical_cast.hpp

---
 include/helpers/{casts.hpp => lexical_cast.hpp} | 0
 src/machinery/tiger.cpp                         | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename include/helpers/{casts.hpp => lexical_cast.hpp} (100%)

diff --git a/include/helpers/casts.hpp b/include/helpers/lexical_cast.hpp
similarity index 100%
rename from include/helpers/casts.hpp
rename to include/helpers/lexical_cast.hpp
diff --git a/src/machinery/tiger.cpp b/src/machinery/tiger.cpp
index 70fd62b..7d835bc 100644
--- a/src/machinery/tiger.cpp
+++ b/src/machinery/tiger.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "dindexer-machinery/tiger.hpp"
-#include "helpers/casts.hpp"
+#include "helpers/lexical_cast.hpp"
 #include <fstream>
 #include <cstdint>
 #include <memory>

From 2c5030f929ccef38706b188a17dcac5d439be3fd Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 15 Jun 2016 17:27:32 +0100
Subject: [PATCH 067/170] Add dedicated tests for lexical_cast and fix failures
 I found.

---
 include/helpers/lexical_cast.hpp | 87 ++++++++++++++++++------------
 test/unit/CMakeLists.txt         |  1 +
 test/unit/test_lexical_cast.cpp  | 92 ++++++++++++++++++++++++++++++++
 3 files changed, 147 insertions(+), 33 deletions(-)
 create mode 100644 test/unit/test_lexical_cast.cpp

diff --git a/include/helpers/lexical_cast.hpp b/include/helpers/lexical_cast.hpp
index 1055933..01d3b0b 100644
--- a/include/helpers/lexical_cast.hpp
+++ b/include/helpers/lexical_cast.hpp
@@ -20,11 +20,11 @@
 
 #include "compatibility.h"
 #include "helpers/sequence_bt.hpp"
+#include "helpers/MaxSizedArray.hpp"
 #include <type_traits>
 #include <utility>
 #include <limits>
 #include <math.h>
-#include <array>
 #include <cstdint>
 #include <algorithm>
 #include <string>
@@ -42,10 +42,10 @@ namespace dinhelp {
 	} //namespace customize
 
 	namespace implem {
-		template <typename T>
-		inline constexpr std::size_t max_digits() {
-			return static_cast<std::size_t>(::log(std::numeric_limits<T>::max()));
-		}
+		int count_leading_zeroes ( uint8_t parValue ) a_always_inline;
+		int count_leading_zeroes ( uint16_t parValue ) a_always_inline;
+		int count_leading_zeroes ( uint32_t parValue ) a_always_inline;
+		int count_leading_zeroes ( uint64_t parValue ) a_always_inline;
 
 		template <std::size_t Base, std::size_t Val>
 		struct power {
@@ -56,26 +56,17 @@ namespace dinhelp {
 			enum { value = 1 };
 		};
 
-		constexpr std::size_t count_digits_10_compiletime (std::size_t parNum) {
-			return (parNum == 0 ? 0 : static_cast<std::size_t>(::log10(parNum))) + 1;
-		}
-
-		template <std::size_t N>
-		struct maxdigits {
-			enum { value = count_digits_10_compiletime(static_cast<std::size_t>(::pow(2.0, static_cast<double>(N)))) };
-		};
-
 		template <template <typename> class Tag, typename T, typename F>
-		inline std::array<uint8_t, max_digits<T>()> int_to_string (const F& parFrom) {
-			using ArrayRetType = std::array<uint8_t, max_digits<T>()>;
+		inline auto int_to_string (const F& parFrom) -> MaxSizedArray<uint8_t, Tag<F>::count_digits_bt(std::numeric_limits<F>::max())> {
+			using ArrayRetType = MaxSizedArray<uint8_t, Tag<F>::count_digits_bt(std::numeric_limits<F>::max())>;
 
 			ArrayRetType retval;
 			F div = 1;
 			for (std::size_t z = 0; z < Tag<F>::count_digits(parFrom); ++z) {
-				retval[Tag<F>::count_digits(parFrom) - z - 1] = static_cast<uint8_t>((parFrom / div) % Tag<F>::base);
+				retval.push_back(static_cast<uint8_t>((parFrom / div) % Tag<F>::base));
 				div *= Tag<F>::base;
 			}
-			std::fill(retval.begin() + Tag<F>::count_digits(parFrom), retval.end(), 0xff);
+			std::reverse(retval.begin(), retval.end());
 			return retval;
 		};
 
@@ -96,12 +87,14 @@ namespace dinhelp {
 		struct dec {
 			enum { base = 10 };
 
-			template <T... Powers, std::size_t... Digits>
-			static std::size_t count_digits (
-				T parValue,
-				dinhelp::bt::index_seq<Powers...> = dinhelp::bt::index_range<0, dinhelp::implem::max_digits<T>()>(),
-				dinhelp::bt::index_seq<Digits...> = dinhelp::bt::index_range<0, CHAR_BIT * sizeof(T)>()
-			) a_pure;
+			template <std::size_t... Powers, std::size_t... Digits>
+			static std::size_t count_digits_implem (T parValue, dinhelp::bt::index_seq<Powers...>, dinhelp::bt::index_seq<Digits...>) a_pure;
+
+			static std::size_t count_digits (T parValue) a_pure;
+
+			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
+				return (parNum == 0 ? 0 : static_cast<std::size_t>(::log10(parNum))) + 1;
+			}
 		};
 
 		template <typename T>
@@ -109,21 +102,33 @@ namespace dinhelp {
 			enum { base = 16 };
 
 			static std::size_t count_digits ( T parValue ) a_pure;
+			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
+				return (parNum == 0 ? 0 : static_cast<std::size_t>(::log10(parNum) / ::log10(base))) + 1;
+			}
 		};
 
 		//See: http://stackoverflow.com/questions/9721042/count-number-of-digits-which-method-is-most-efficient#9721113
 		template <typename T>
-		template <T... Powers, std::size_t... Digits>
-		std::size_t dec<T>::count_digits (T parValue, dinhelp::bt::index_seq<Powers...>, dinhelp::bt::index_seq<Digits...>) {
-			static T powers[] = { 0, dinhelp::implem::power<10, Powers + 1>::value... };
-			static std::size_t maxdigits[] = { dinhelp::implem::maxdigits<Digits>::value... };
-			const auto bits = sizeof(parValue) * CHAR_BIT - __builtin_clz(parValue);
+		template <std::size_t... Powers, std::size_t... Digits>
+		std::size_t dec<T>::count_digits_implem (T parValue, dinhelp::bt::index_seq<Powers...>, dinhelp::bt::index_seq<Digits...>) {
+			static T powers[] = { 0, static_cast<T>(dinhelp::implem::power<10, Powers + 1>::value)... };
+			static std::size_t maxdigits[] = { count_digits_bt(static_cast<std::size_t>(::pow(2.0, Digits)))... };
+			const auto bits = sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes(parValue);
 			return (parValue < powers[maxdigits[bits] - 1] ? maxdigits[bits] - 1 : maxdigits[bits]);
 		}
 
+		template <typename T>
+		std::size_t dec<T>::count_digits (T parValue) {
+			return count_digits_implem(
+				parValue,
+				dinhelp::bt::index_range<0, count_digits_bt(std::numeric_limits<T>::max()) + 1>(),
+				dinhelp::bt::index_range<0, CHAR_BIT * sizeof(T) + 1>()
+			);
+		}
+
 		template <typename T>
 		std::size_t hex<T>::count_digits (T parValue) {
-			return std::max(((sizeof(parValue) * CHAR_BIT - __builtin_clz(parValue)) + (CHAR_BIT / 2 - 1)) / (CHAR_BIT / 2), 1);
+			return std::max<std::size_t>(((sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes(parValue)) + (CHAR_BIT / 2 - 1)) / (CHAR_BIT / 2), 1);
 		}
 	} //namespace tags
 
@@ -141,6 +146,22 @@ namespace dinhelp {
 				return string_to_int<Tag, T, F>(parFrom);
 			}
 		};
+
+		inline int count_leading_zeroes (uint8_t parValue) {
+			return __builtin_clz(parValue) - (sizeof(unsigned int) * CHAR_BIT - sizeof(uint8_t) * CHAR_BIT);
+		}
+
+		inline int count_leading_zeroes (uint16_t parValue) {
+			return __builtin_clz(parValue) - (sizeof(unsigned int) * CHAR_BIT - sizeof(uint16_t) * CHAR_BIT);
+		}
+
+		inline int count_leading_zeroes (uint32_t parValue) {
+			return __builtin_clzl(parValue) - (sizeof(unsigned long) * CHAR_BIT - sizeof(uint32_t) * CHAR_BIT);
+		}
+
+		inline int count_leading_zeroes (uint64_t parValue) {
+			return __builtin_clzll(parValue) - (sizeof(unsigned long long) * CHAR_BIT - sizeof(uint64_t) * CHAR_BIT);
+		}
 	} //namespace implem
 
 	template <typename T, template <typename> class Tag=tags::dec, typename F=void>
@@ -152,12 +173,12 @@ namespace dinhelp {
 		template<>
 		struct index_array_to_string<std::string> {
 			template<std::size_t N>
-			static std::string make (const std::array<uint8_t, N> &parIndices) {
+			static std::string make (const MaxSizedArray<uint8_t, N> &parIndices) {
 				static const char symbols[] = {'0', '1', '2', '3', '4', '5',
 											   '6', '7', '8', '9', 'A', 'B',
 											   'C', 'D', 'E', 'F'};
-				std::string retval(N, ' ');
-				for (std::size_t z = 0; z < N; ++z) {
+				std::string retval(parIndices.size(), ' ');
+				for (std::size_t z = 0; z < parIndices.size(); ++z) {
 					retval[z] = symbols[parIndices[z]];
 				}
 				return retval;
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 4a80dfe..f2b4b94 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -5,6 +5,7 @@ add_executable(${PROJECT_NAME}
 	test_guess_content_type.cpp
 	test_glob2regex.cpp
 	test_tiger_string_conv.cpp
+	test_lexical_cast.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
diff --git a/test/unit/test_lexical_cast.cpp b/test/unit/test_lexical_cast.cpp
new file mode 100644
index 0000000..6ac2dd4
--- /dev/null
+++ b/test/unit/test_lexical_cast.cpp
@@ -0,0 +1,92 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "helpers/lexical_cast.hpp"
+#include <gtest/gtest.h>
+#include <cstdint>
+#include <string>
+#include <boost/utility/string_ref.hpp>
+
+TEST(helpers, lexical_cast) {
+	using dinhelp::lexical_cast;
+	using dinhelp::tags::hex;
+	using dinhelp::tags::dec;
+
+	{
+		const uint8_t value = 0x34;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("34", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("52", dec_str);
+	}
+	{
+		const uint16_t value = 0xFFFF;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("FFFF", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("65535", dec_str);
+	}
+	{
+		const uint16_t value = 0xFF;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("FF", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("255", dec_str);
+	}
+	{
+		const uint16_t value = 0x100;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("100", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("256", dec_str);
+	}
+	{
+		const uint32_t value = 0x1ABC;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("1ABC", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("6844", dec_str);
+	}
+	{
+		const uint32_t value = 0xffffffff;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("FFFFFFFF", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("4294967295", dec_str);
+	}
+	{
+		const uint32_t value = 1;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("1", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("1", dec_str);
+	}
+	{
+		const uint32_t value = 0;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("0", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("0", dec_str);
+	}
+	{
+		const uint64_t value = 0x12abcd34;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("12ABCD34", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("313249076", dec_str);
+	}
+}

From f9387114bfc68cd7138563af512be38dd5656280 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 15 Jun 2016 20:48:05 +0100
Subject: [PATCH 068/170] Implement handling of signed types and fix some build
 errors.

---
 include/helpers/lexical_cast.hpp | 115 +++++++++++++++++++++++--------
 test/unit/test_lexical_cast.cpp  |  14 ++++
 2 files changed, 102 insertions(+), 27 deletions(-)

diff --git a/include/helpers/lexical_cast.hpp b/include/helpers/lexical_cast.hpp
index 01d3b0b..c6a87f9 100644
--- a/include/helpers/lexical_cast.hpp
+++ b/include/helpers/lexical_cast.hpp
@@ -31,6 +31,7 @@
 #include <ciso646>
 #include <climits>
 #include <boost/range/adaptor/reversed.hpp>
+#include <cstddef>
 
 namespace dinhelp {
 	namespace customize {
@@ -42,10 +43,16 @@ namespace dinhelp {
 	} //namespace customize
 
 	namespace implem {
-		int count_leading_zeroes ( uint8_t parValue ) a_always_inline;
-		int count_leading_zeroes ( uint16_t parValue ) a_always_inline;
-		int count_leading_zeroes ( uint32_t parValue ) a_always_inline;
-		int count_leading_zeroes ( uint64_t parValue ) a_always_inline;
+		template <typename T>
+		typename std::make_unsigned<T>::type abs ( T parValue ) a_pure;
+
+		template <typename T> int count_leading_zeroes ( typename std::enable_if<std::numeric_limits<T>::is_signed, T>::type parValue ) a_always_inline;
+		template <typename T> int count_leading_zeroes ( typename std::enable_if<not std::numeric_limits<T>::is_signed, T>::type parValue ) a_always_inline;
+		int count_leading_zeroes_overload ( unsigned char parValue ) a_always_inline;
+		int count_leading_zeroes_overload ( unsigned short int parValue ) a_always_inline;
+		int count_leading_zeroes_overload ( unsigned int parValue ) a_always_inline;
+		int count_leading_zeroes_overload ( unsigned long parValue ) a_always_inline;
+		int count_leading_zeroes_overload ( unsigned long long parValue ) a_always_inline;
 
 		template <std::size_t Base, std::size_t Val>
 		struct power {
@@ -56,14 +63,26 @@ namespace dinhelp {
 			enum { value = 1 };
 		};
 
+		template <typename T, bool=std::numeric_limits<T>::is_signed>
+		struct is_negative;
+		template <typename T>
+		struct is_negative<T, true> {
+			static int check (T parValue) { return (parValue < 0 ? 1 : 0); }
+		};
+		template <typename T>
+		struct is_negative<T, false> {
+			static constexpr int check (T) { return 0; }
+		};
+
 		template <template <typename> class Tag, typename T, typename F>
-		inline auto int_to_string (const F& parFrom) -> MaxSizedArray<uint8_t, Tag<F>::count_digits_bt(std::numeric_limits<F>::max())> {
+		inline auto int_to_string (const F parFrom) -> MaxSizedArray<uint8_t, Tag<F>::count_digits_bt(std::numeric_limits<F>::max())> {
 			using ArrayRetType = MaxSizedArray<uint8_t, Tag<F>::count_digits_bt(std::numeric_limits<F>::max())>;
 
 			ArrayRetType retval;
 			F div = 1;
-			for (std::size_t z = 0; z < Tag<F>::count_digits(parFrom); ++z) {
-				retval.push_back(static_cast<uint8_t>((parFrom / div) % Tag<F>::base));
+			const auto sign_length = (is_negative<F>::check(parFrom) and Tag<F>::sign_allowed ? 1 : 0);
+			for (std::size_t z = 0; z < Tag<F>::count_digits(parFrom) - sign_length; ++z) {
+				retval.push_back(static_cast<uint8_t>((Tag<F>::make_unsigned(parFrom) / div) % Tag<F>::base));
 				div *= Tag<F>::base;
 			}
 			std::reverse(retval.begin(), retval.end());
@@ -78,30 +97,38 @@ namespace dinhelp {
 				retval += dinhelp::customize::char_to_int<decltype(chara), T>::make(chara) * mul;
 				mul *= Tag<T>::base;
 			}
-			return retval;
+			return retval * dinhelp::customize::char_to_int<typename F::value_type, T>::sgn(parFrom);
 		};
 	} //namespace implem
 
 	namespace tags {
 		template <typename T>
 		struct dec {
-			enum { base = 10 };
+			enum {
+				base = 10,
+				sign_allowed = 1
+			};
 
 			template <std::size_t... Powers, std::size_t... Digits>
 			static std::size_t count_digits_implem (T parValue, dinhelp::bt::index_seq<Powers...>, dinhelp::bt::index_seq<Digits...>) a_pure;
 
 			static std::size_t count_digits (T parValue) a_pure;
 
+			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
 			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
-				return (parNum == 0 ? 0 : static_cast<std::size_t>(::log10(parNum))) + 1;
+				return (parNum == 0 ? 0 : static_cast<std::size_t>(::log10(parNum))) + 1 + (std::numeric_limits<T>::is_signed ? 1 : 0);
 			}
 		};
 
 		template <typename T>
 		struct hex {
-			enum { base = 16 };
+			enum {
+				base = 16,
+				sign_allowed = 0
+			};
 
 			static std::size_t count_digits ( T parValue ) a_pure;
+			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
 			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
 				return (parNum == 0 ? 0 : static_cast<std::size_t>(::log10(parNum) / ::log10(base))) + 1;
 			}
@@ -113,8 +140,8 @@ namespace dinhelp {
 		std::size_t dec<T>::count_digits_implem (T parValue, dinhelp::bt::index_seq<Powers...>, dinhelp::bt::index_seq<Digits...>) {
 			static T powers[] = { 0, static_cast<T>(dinhelp::implem::power<10, Powers + 1>::value)... };
 			static std::size_t maxdigits[] = { count_digits_bt(static_cast<std::size_t>(::pow(2.0, Digits)))... };
-			const auto bits = sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes(parValue);
-			return (parValue < powers[maxdigits[bits] - 1] ? maxdigits[bits] - 1 : maxdigits[bits]);
+			const auto bits = sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<T>(parValue);
+			return (parValue < powers[maxdigits[bits] - 1] ? maxdigits[bits] - 1 : maxdigits[bits]) + dinhelp::implem::is_negative<T>::check(parValue);
 		}
 
 		template <typename T>
@@ -126,9 +153,19 @@ namespace dinhelp {
 			);
 		}
 
+		template <typename T>
+		typename std::make_unsigned<T>::type dec<T>::make_unsigned (T parValue) {
+			return dinhelp::implem::abs(parValue);
+		}
+
 		template <typename T>
 		std::size_t hex<T>::count_digits (T parValue) {
-			return std::max<std::size_t>(((sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes(parValue)) + (CHAR_BIT / 2 - 1)) / (CHAR_BIT / 2), 1);
+			return std::max<std::size_t>(((sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<typename std::make_unsigned<T>::type>(make_unsigned(parValue))) + (CHAR_BIT / 2 - 1)) / (CHAR_BIT / 2), 1);
+		}
+
+		template <typename T>
+		typename std::make_unsigned<T>::type hex<T>::make_unsigned (T parValue) {
+			return static_cast<typename std::make_unsigned<T>::type>(parValue);
 		}
 	} //namespace tags
 
@@ -138,7 +175,7 @@ namespace dinhelp {
 			template <typename T, typename F>
 			static T convert ( const typename std::enable_if<std::is_integral<F>::value, F>::type& parFrom ) {
 				const auto indices = int_to_string<Tag, T, F>(parFrom);
-				return dinhelp::customize::index_array_to_string<T>::make(indices);
+				return dinhelp::customize::index_array_to_string<T>::make(indices, is_negative<F>::check(parFrom) bitand Tag<F>::sign_allowed);
 			}
 
 			template <typename T, typename F>
@@ -147,20 +184,37 @@ namespace dinhelp {
 			}
 		};
 
-		inline int count_leading_zeroes (uint8_t parValue) {
-			return __builtin_clz(parValue) - (sizeof(unsigned int) * CHAR_BIT - sizeof(uint8_t) * CHAR_BIT);
+		template <typename T>
+		inline int count_leading_zeroes (typename std::enable_if<std::numeric_limits<T>::is_signed, T>::type parValue) {
+			return count_leading_zeroes<decltype(abs(parValue))>(abs(parValue));
 		}
 
-		inline int count_leading_zeroes (uint16_t parValue) {
-			return __builtin_clz(parValue) - (sizeof(unsigned int) * CHAR_BIT - sizeof(uint16_t) * CHAR_BIT);
+		template <typename T>
+		inline int count_leading_zeroes (typename std::enable_if<not std::numeric_limits<T>::is_signed, T>::type parValue) {
+			return count_leading_zeroes_overload(parValue) + sizeof(T) * CHAR_BIT;
 		}
 
-		inline int count_leading_zeroes (uint32_t parValue) {
-			return __builtin_clzl(parValue) - (sizeof(unsigned long) * CHAR_BIT - sizeof(uint32_t) * CHAR_BIT);
+		inline int count_leading_zeroes_overload (unsigned char parValue) {
+			return __builtin_clz(parValue) - sizeof(unsigned int) * CHAR_BIT;
+		}
+		inline int count_leading_zeroes_overload (unsigned short int parValue) {
+			return __builtin_clz(parValue) - sizeof(unsigned int) * CHAR_BIT;
+		}
+		inline int count_leading_zeroes_overload (unsigned int parValue) {
+			return __builtin_clz(parValue) - sizeof(unsigned int) * CHAR_BIT;
+		}
+		inline int count_leading_zeroes_overload (unsigned long parValue) {
+			return __builtin_clzl(parValue) - sizeof(unsigned long) * CHAR_BIT;
+		}
+		inline int count_leading_zeroes_overload (unsigned long long parValue) {
+			return __builtin_clzll(parValue) - sizeof(unsigned long long) * CHAR_BIT;
 		}
 
-		inline int count_leading_zeroes (uint64_t parValue) {
-			return __builtin_clzll(parValue) - (sizeof(unsigned long long) * CHAR_BIT - sizeof(uint64_t) * CHAR_BIT);
+		//See: http://stackoverflow.com/questions/16101062/why-does-stdabs-return-signed-types
+		template <typename T>
+		typename std::make_unsigned<T>::type abs (T parValue) {
+			//We need to cast before negating x to avoid the overflow.
+			return (parValue < 0 ? -static_cast<typename std::make_unsigned<T>::type>(parValue) : parValue);
 		}
 	} //namespace implem
 
@@ -173,13 +227,13 @@ namespace dinhelp {
 		template<>
 		struct index_array_to_string<std::string> {
 			template<std::size_t N>
-			static std::string make (const MaxSizedArray<uint8_t, N> &parIndices) {
+			static std::string make (const MaxSizedArray<uint8_t, N> &parIndices, int parNegative) {
 				static const char symbols[] = {'0', '1', '2', '3', '4', '5',
 											   '6', '7', '8', '9', 'A', 'B',
 											   'C', 'D', 'E', 'F'};
-				std::string retval(parIndices.size(), ' ');
-				for (std::size_t z = 0; z < parIndices.size(); ++z) {
-					retval[z] = symbols[parIndices[z]];
+				std::string retval(parIndices.size() + parNegative, '-');
+				for (auto z = parNegative; z < static_cast<int>(parIndices.size()) + parNegative; ++z) {
+					retval[z] = symbols[parIndices[z - parNegative]];
 				}
 				return retval;
 			}
@@ -194,8 +248,15 @@ namespace dinhelp {
 					return 10 + parChar - 'a';
 				else if (parChar >= 'A' and parChar <= 'F')
 					return 10 + parChar - 'A';
+				else if (parChar == '-')
+					return 0;
 				return 0;
 			}
+
+			template <typename Container>
+			static T sgn (const Container& parString) {
+				return static_cast<T>(std::numeric_limits<T>::is_signed and parString.begin() != parString.end() and *parString.begin() == '-' ? -1 : 1);
+			}
 		};
 	} //namespace customize
 } //namespace dinhelp
diff --git a/test/unit/test_lexical_cast.cpp b/test/unit/test_lexical_cast.cpp
index 6ac2dd4..efbfd12 100644
--- a/test/unit/test_lexical_cast.cpp
+++ b/test/unit/test_lexical_cast.cpp
@@ -89,4 +89,18 @@ TEST(helpers, lexical_cast) {
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("313249076", dec_str);
 	}
+	{
+		const int32_t value = 0x7800;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("7800", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("30720", dec_str);
+	}
+	{
+		const int32_t value = -1400;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("FFFFFA88", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("-1400", dec_str);
+	}
 }

From 691bdd1d1eedcb63af9decc739a320d06b0ed4d0 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 15 Jun 2016 22:38:25 +0100
Subject: [PATCH 069/170] Use new custom lexical_cast instead of the one from
 boost.

---
 src/backends/redis/backend_redis.cpp | 14 +++++++-------
 src/backends/redis/scan_iterator.cpp | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 8c5d484..2efa315 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -19,11 +19,11 @@
 #include "dindexer-machinery/recorddata.hpp"
 #include "backends/exposed_functions.hpp"
 #include "backends/backend_version.hpp"
+#include "helpers/lexical_cast.hpp"
 #include "dindexerConfig.h"
 #include "helpers/stringize.h"
 #include <utility>
 #include <yaml-cpp/yaml.h>
-#include <boost/lexical_cast.hpp>
 #include <array>
 #include <cstdint>
 
@@ -36,7 +36,7 @@ namespace dindb {
 		};
 
 		std::pair<std::string, mchlib::FileRecordData> pair_list_to_file_record (const redis::Command::hscan_range& parRange, const mchlib::TigerHash& parHash) {
-			using boost::lexical_cast;
+			using dinhelp::lexical_cast;
 
 			mchlib::FileRecordData retval;
 			retval.hash = parHash;
@@ -77,7 +77,7 @@ namespace dindb {
 		}
 
 		mchlib::SetRecordDataFull pair_list_to_set_record (const redis::Command::hscan_range& parRange) {
-			using boost::lexical_cast;
+			using dinhelp::lexical_cast;
 
 			mchlib::SetRecordDataFull retval;
 			for (const auto& itm : parRange) {
@@ -88,9 +88,9 @@ namespace dindb {
 				else if (itm.first == "fs_uuid")
 					retval.fs_uuid = itm.second;
 				else if (itm.first == "type")
-					retval.type = lexical_cast<char>(itm.second[0]);
+					retval.type = itm.second[0];
 				else if (itm.first == "content_type")
-					retval.content_type = lexical_cast<char>(itm.second[0]);
+					retval.content_type = itm.second[0];
 			}
 			return retval;
 		}
@@ -137,7 +137,7 @@ namespace dindb {
 	}
 
 	void BackendRedis::connect() {
-		using boost::lexical_cast;
+		using dinhelp::lexical_cast;
 
 		m_redis.connect();
 		if (m_redis.is_connected() and m_database > 0) {
@@ -172,7 +172,7 @@ namespace dindb {
 	}
 
 	void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
-		using boost::lexical_cast;
+		using dinhelp::lexical_cast;
 		using boost::string_ref;
 
 		redis::Reply set_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "set", "1");
diff --git a/src/backends/redis/scan_iterator.cpp b/src/backends/redis/scan_iterator.cpp
index 4f9d67e..593e4ed 100644
--- a/src/backends/redis/scan_iterator.cpp
+++ b/src/backends/redis/scan_iterator.cpp
@@ -16,10 +16,10 @@
  */
 
 #include "scan_iterator.hpp"
+#include "helpers/lexical_cast.hpp"
 #include "command.hpp"
 #include <cassert>
 #include <ciso646>
-#include <boost/lexical_cast.hpp>
 #include <string>
 
 namespace redis {
@@ -42,8 +42,8 @@ namespace redis {
 		}
 
 		Reply ScanIteratorBaseClass::run (const char* parCommand, long long parScanContext, std::size_t parCount) {
-			const auto scan_context = boost::lexical_cast<std::string>(parScanContext);
-			const auto count_hint = boost::lexical_cast<std::string>(parCount);
+			const auto scan_context = dinhelp::lexical_cast<std::string>(parScanContext);
+			const auto count_hint = dinhelp::lexical_cast<std::string>(parCount);
 			if (m_match_pattern.empty())
 				return m_command->run(parCommand, scan_context, "COUNT", count_hint);
 			else
@@ -51,8 +51,8 @@ namespace redis {
 		}
 
 		Reply ScanIteratorBaseClass::run (const char* parCommand, const boost::string_ref& parParameter, long long parScanContext, std::size_t parCount) {
-			const auto scan_context = boost::lexical_cast<std::string>(parScanContext);
-			const auto count_hint = boost::lexical_cast<std::string>(parCount);
+			const auto scan_context = dinhelp::lexical_cast<std::string>(parScanContext);
+			const auto count_hint = dinhelp::lexical_cast<std::string>(parCount);
 			if (m_match_pattern.empty())
 				return m_command->run(parCommand, parParameter, scan_context, "COUNT", count_hint);
 			else

From 53a42fa7c057e90d6a282dbcf7aa2458d65df92d Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 15 Jun 2016 23:04:46 +0100
Subject: [PATCH 070/170] Add bin tag to lexical_cast.

This also fixes a subtle bug: the size passed to MaxSizedArray in
int_to_string() was calculated on the max value of type F, but when
F was a signed type the max would only be for example 31 bits.
Conversion of negative numbers would then fail with an assertion.
---
 include/helpers/lexical_cast.hpp | 34 +++++++++++++++++++++++++++-----
 test/unit/test_lexical_cast.cpp  | 23 +++++++++++++++++++++
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/include/helpers/lexical_cast.hpp b/include/helpers/lexical_cast.hpp
index c6a87f9..4a1a1f5 100644
--- a/include/helpers/lexical_cast.hpp
+++ b/include/helpers/lexical_cast.hpp
@@ -24,7 +24,7 @@
 #include <type_traits>
 #include <utility>
 #include <limits>
-#include <math.h>
+#include <cmath>
 #include <cstdint>
 #include <algorithm>
 #include <string>
@@ -75,8 +75,8 @@ namespace dinhelp {
 		};
 
 		template <template <typename> class Tag, typename T, typename F>
-		inline auto int_to_string (const F parFrom) -> MaxSizedArray<uint8_t, Tag<F>::count_digits_bt(std::numeric_limits<F>::max())> {
-			using ArrayRetType = MaxSizedArray<uint8_t, Tag<F>::count_digits_bt(std::numeric_limits<F>::max())>;
+		inline auto int_to_string (const F parFrom) -> MaxSizedArray<uint8_t, Tag<F>::count_digits_bt(std::numeric_limits<typename std::make_unsigned<F>::type>::max())> {
+			using ArrayRetType = MaxSizedArray<uint8_t, Tag<F>::count_digits_bt(std::numeric_limits<typename std::make_unsigned<F>::type>::max())>;
 
 			ArrayRetType retval;
 			F div = 1;
@@ -116,7 +116,7 @@ namespace dinhelp {
 
 			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
 			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
-				return (parNum == 0 ? 0 : static_cast<std::size_t>(::log10(parNum))) + 1 + (std::numeric_limits<T>::is_signed ? 1 : 0);
+				return (parNum == 0 ? 0 : static_cast<std::size_t>(std::log10(static_cast<double>(parNum)))) + 1 + (std::numeric_limits<T>::is_signed ? 1 : 0);
 			}
 		};
 
@@ -130,7 +130,21 @@ namespace dinhelp {
 			static std::size_t count_digits ( T parValue ) a_pure;
 			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
 			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
-				return (parNum == 0 ? 0 : static_cast<std::size_t>(::log10(parNum) / ::log10(base))) + 1;
+				return (parNum == 0 ? 0 : static_cast<std::size_t>(std::log10(static_cast<double>(parNum)) / std::log10(static_cast<double>(base)))) + 1;
+			}
+		};
+
+		template <typename T>
+		struct bin {
+			enum {
+				base = 2,
+				sign_allowed = 0
+			};
+
+			static std::size_t count_digits ( T parValue ) a_pure;
+			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
+			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
+				return (parNum == 0 ? 0 : static_cast<std::size_t>(std::log2(static_cast<double>(parNum)))) + 1;
 			}
 		};
 
@@ -167,6 +181,16 @@ namespace dinhelp {
 		typename std::make_unsigned<T>::type hex<T>::make_unsigned (T parValue) {
 			return static_cast<typename std::make_unsigned<T>::type>(parValue);
 		}
+
+		template <typename T>
+		std::size_t bin<T>::count_digits (T parValue) {
+			return std::max<std::size_t>((sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<typename std::make_unsigned<T>::type>(make_unsigned(parValue))), 1);
+		}
+
+		template <typename T>
+		typename std::make_unsigned<T>::type bin<T>::make_unsigned (T parValue) {
+			return static_cast<typename std::make_unsigned<T>::type>(parValue);
+		}
 	} //namespace tags
 
 	namespace implem {
diff --git a/test/unit/test_lexical_cast.cpp b/test/unit/test_lexical_cast.cpp
index efbfd12..379b1f8 100644
--- a/test/unit/test_lexical_cast.cpp
+++ b/test/unit/test_lexical_cast.cpp
@@ -25,6 +25,7 @@ TEST(helpers, lexical_cast) {
 	using dinhelp::lexical_cast;
 	using dinhelp::tags::hex;
 	using dinhelp::tags::dec;
+	using dinhelp::tags::bin;
 
 	{
 		const uint8_t value = 0x34;
@@ -32,6 +33,8 @@ TEST(helpers, lexical_cast) {
 		EXPECT_EQ("34", hex_str);
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("52", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("110100", bin_str);
 	}
 	{
 		const uint16_t value = 0xFFFF;
@@ -39,6 +42,8 @@ TEST(helpers, lexical_cast) {
 		EXPECT_EQ("FFFF", hex_str);
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("65535", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("1111111111111111", bin_str);
 	}
 	{
 		const uint16_t value = 0xFF;
@@ -46,6 +51,8 @@ TEST(helpers, lexical_cast) {
 		EXPECT_EQ("FF", hex_str);
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("255", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("11111111", bin_str);
 	}
 	{
 		const uint16_t value = 0x100;
@@ -53,6 +60,8 @@ TEST(helpers, lexical_cast) {
 		EXPECT_EQ("100", hex_str);
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("256", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("100000000", bin_str);
 	}
 	{
 		const uint32_t value = 0x1ABC;
@@ -60,6 +69,8 @@ TEST(helpers, lexical_cast) {
 		EXPECT_EQ("1ABC", hex_str);
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("6844", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("1101010111100", bin_str);
 	}
 	{
 		const uint32_t value = 0xffffffff;
@@ -67,6 +78,8 @@ TEST(helpers, lexical_cast) {
 		EXPECT_EQ("FFFFFFFF", hex_str);
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("4294967295", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("11111111111111111111111111111111", bin_str);
 	}
 	{
 		const uint32_t value = 1;
@@ -74,6 +87,8 @@ TEST(helpers, lexical_cast) {
 		EXPECT_EQ("1", hex_str);
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("1", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("1", bin_str);
 	}
 	{
 		const uint32_t value = 0;
@@ -81,6 +96,8 @@ TEST(helpers, lexical_cast) {
 		EXPECT_EQ("0", hex_str);
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("0", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("0", bin_str);
 	}
 	{
 		const uint64_t value = 0x12abcd34;
@@ -88,6 +105,8 @@ TEST(helpers, lexical_cast) {
 		EXPECT_EQ("12ABCD34", hex_str);
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("313249076", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("10010101010111100110100110100", bin_str);
 	}
 	{
 		const int32_t value = 0x7800;
@@ -95,6 +114,8 @@ TEST(helpers, lexical_cast) {
 		EXPECT_EQ("7800", hex_str);
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("30720", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("111100000000000", bin_str);
 	}
 	{
 		const int32_t value = -1400;
@@ -102,5 +123,7 @@ TEST(helpers, lexical_cast) {
 		EXPECT_EQ("FFFFFA88", hex_str);
 		const auto dec_str = lexical_cast<std::string, dec>(value);
 		EXPECT_EQ("-1400", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("11111111111111111111101010001000", bin_str);
 	}
 }

From cdae333e1f5a802fe4787c0cbf9462d13e094e4d Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 20 Jun 2016 18:06:26 +0100
Subject: [PATCH 071/170] Don't throw if reply is of error type - just put it
 in Reply.

---
 src/backends/redis/command.cpp |  7 +------
 src/backends/redis/command.hpp |  5 -----
 src/backends/redis/reply.hpp   | 18 ++++++++++++++++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index a2d6d37..2994cff 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -43,7 +43,7 @@ namespace redis {
 					PtrToReplyIterator(parReply->element + parReply->elements, &make_redis_reply_type)
 				);
 			case REDIS_REPLY_ERROR:
-				throw RedisError(parReply->str, parReply->len);
+				return ErrorString(parReply->str, parReply->len);
 			default:
 				return Reply();
 			};
@@ -143,9 +143,4 @@ namespace redis {
 	auto Command::zscan (boost::string_ref parKey) -> zscan_range {
 		return zscan_range(zscan_iterator(this, parKey, false), zscan_iterator(this, parKey, true));
 	}
-
-	RedisError::RedisError (const char* parMessage, std::size_t parLength) :
-		std::runtime_error(std::string(parMessage, parLength))
-	{
-	}
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index b3b00a0..5b9b6b5 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -90,11 +90,6 @@ namespace redis {
 			LengthArray{ arg_to_bin_safe_length(string_ref(parCommand)), arg_to_bin_safe_length(std::forward<Args>(parArgs))... }.data()
 		);
 	}
-
-	class RedisError : public std::runtime_error {
-	public:
-		RedisError ( const char* parMessage, std::size_t parLength );
-	};
 } //namespace redis
 
 #endif
diff --git a/src/backends/redis/reply.hpp b/src/backends/redis/reply.hpp
index a1a6606..2bce8bc 100644
--- a/src/backends/redis/reply.hpp
+++ b/src/backends/redis/reply.hpp
@@ -25,17 +25,30 @@
 namespace redis {
 	struct Reply;
 
+	class ErrorString {
+	public:
+		ErrorString ( const char* parCStr, std::size_t parLen ) :
+			m_msg(parCStr, parLen)
+		{ }
+		const std::string& message ( void ) const noexcept { return m_msg; }
+
+	private:
+		std::string m_msg;
+	};
+
 	namespace implem {
 		using RedisVariantType = boost::variant<
 			long long,
 			std::string,
-			std::vector<Reply>
+			std::vector<Reply>,
+			ErrorString
 		>;
 	} //namespace implem
 	enum RedisVariantTypes {
 		RedisVariantType_Integer = 0,
 		RedisVariantType_String,
-		RedisVariantType_Array
+		RedisVariantType_Array,
+		RedisVariantType_Error
 	};
 
 	struct Reply : implem::RedisVariantType {
@@ -45,6 +58,7 @@ namespace redis {
 		Reply ( long long parVal ) : base_class(parVal) {}
 		Reply ( std::string&& parVal ) : base_class(std::move(parVal)) {}
 		Reply ( std::vector<Reply>&& parVal ) : base_class(std::move(parVal)) {}
+		Reply ( ErrorString&& parVal ) : base_class(std::move(parVal)) {}
 		~Reply ( void ) noexcept = default;
 	};
 

From 92ef212e44a3569778257bd63ce89bf215177a11 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 20 Jun 2016 18:19:06 +0100
Subject: [PATCH 072/170] Use async hiredis API.

---
 src/backends/redis/CMakeLists.txt |   1 +
 src/backends/redis/batch.cpp      | 159 ++++++++++++++++++++++++++++++
 src/backends/redis/batch.hpp      |  95 ++++++++++++++++++
 src/backends/redis/command.cpp    |  74 ++------------
 src/backends/redis/command.hpp    |  27 ++---
 5 files changed, 273 insertions(+), 83 deletions(-)
 create mode 100644 src/backends/redis/batch.cpp
 create mode 100644 src/backends/redis/batch.hpp

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index f268708..1595e81 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -7,6 +7,7 @@ add_library(${PROJECT_NAME} SHARED
 	command.cpp
 	scan_iterator.cpp
 	reply.cpp
+	batch.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
diff --git a/src/backends/redis/batch.cpp b/src/backends/redis/batch.cpp
new file mode 100644
index 0000000..a8a182d
--- /dev/null
+++ b/src/backends/redis/batch.cpp
@@ -0,0 +1,159 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "batch.hpp"
+#include <hiredis/hiredis.h>
+#include <hiredis/async.h>
+#include <cassert>
+#include <future>
+#include <ciso646>
+#include <boost/iterator/transform_iterator.hpp>
+#include <atomic>
+#include <mutex>
+#include <condition_variable>
+#include <iostream>
+
+namespace redis {
+	namespace {
+		const std::size_t g_max_redis_unanswered_commands = 1000;
+
+		struct HiredisCallbackData {
+			HiredisCallbackData ( std::atomic_size_t& parPendingFutures, std::condition_variable& parSendCmdCond ) :
+				promise(),
+				pending_futures(parPendingFutures),
+				send_command_condition(parSendCmdCond)
+			{
+			}
+
+			std::promise<Reply> promise;
+			std::atomic_size_t& pending_futures;
+			std::condition_variable& send_command_condition;
+		};
+
+		Reply make_redis_reply_type (redisReply* parReply) {
+			using boost::transform_iterator;
+			using PtrToReplyIterator = transform_iterator<Reply(*)(redisReply*), redisReply**>;
+
+			switch (parReply->type) {
+			case REDIS_REPLY_INTEGER:
+				return parReply->integer;
+			case REDIS_REPLY_STRING:
+				return std::string(parReply->str, parReply->len);
+			case REDIS_REPLY_ARRAY:
+				return std::vector<Reply>(
+					PtrToReplyIterator(parReply->element, &make_redis_reply_type),
+					PtrToReplyIterator(parReply->element + parReply->elements, &make_redis_reply_type)
+				);
+			case REDIS_REPLY_ERROR:
+				return ErrorString(parReply->str, parReply->len);
+			default:
+				return Reply();
+			};
+		}
+
+		void hiredis_run_callback (redisAsyncContext*, void* parReply, void* parPrivData) {
+			assert(parPrivData);
+			auto* data = static_cast<HiredisCallbackData*>(parPrivData);
+			const auto old_count = data->pending_futures.fetch_add(-1);
+			assert(old_count > 0);
+			if (old_count == g_max_redis_unanswered_commands)
+				data->send_command_condition.notify_one();
+
+			if (parReply) {
+				auto reply = make_redis_reply_type(static_cast<redisReply*>(parReply));
+				data->promise.set_value(std::move(reply));
+			}
+
+			delete data;
+		}
+	} //unnamed namespace
+
+	struct Batch::LocalData {
+		LocalData ( void ) :
+			free_cmd_slot(),
+			futures_mutex(),
+			pending_futures(0)
+		{
+		}
+
+		std::condition_variable free_cmd_slot;
+		std::mutex futures_mutex;
+		std::atomic_size_t pending_futures;
+	};
+
+	Batch::Batch (Batch&&) = default;
+
+	Batch::Batch (redisAsyncContext* parContext) :
+		m_futures(),
+		m_replies(),
+		m_local_data(new LocalData),
+		m_context(parContext)
+	{
+		assert(m_context);
+	}
+
+	Batch::~Batch() noexcept {
+	}
+
+	void Batch::run_pvt (int parArgc, const char** parArgv, std::size_t* parLengths) {
+		assert(not replies_requested());
+		assert(parArgc >= 1);
+		assert(parArgv);
+		assert(parLengths); //This /could/ be null, but I don't see why it should
+
+		const auto pending_futures = m_local_data->pending_futures.fetch_add(1);
+		auto* data = new HiredisCallbackData(m_local_data->pending_futures, m_local_data->free_cmd_slot);
+
+		std::cout << "run_pvt(), " << pending_futures << " items pending... ";
+		if (pending_futures >= g_max_redis_unanswered_commands) {
+			std::cout << " waiting... ";
+			std::unique_lock<std::mutex> u_lock(m_local_data->futures_mutex);
+			m_local_data->free_cmd_slot.wait(u_lock, [this]() { return m_local_data->pending_futures < g_max_redis_unanswered_commands; });
+		}
+		std::cout << "command sent to hiredis" << std::endl;
+
+		m_futures.push_back(data->promise.get_future());
+		const int command_added = redisAsyncCommandArgv(m_context, &hiredis_run_callback, data, parArgc, parArgv, parLengths);
+		assert(REDIS_OK == command_added); // REDIS_ERR if error
+	}
+
+	bool Batch::replies_requested() const {
+		return not m_replies.empty();
+	}
+
+	const std::vector<Reply>& Batch::replies() {
+		if (not replies_requested()) {
+			m_replies.reserve(m_futures.size());
+			for (auto& fut : m_futures) {
+				m_replies.push_back(fut.get());
+			}
+
+			auto empty_vec = std::move(m_futures);
+		}
+		return m_replies;
+	}
+
+	void Batch::throw_if_failed() {
+		const auto& rep = replies();
+		assert(false); //not implemented
+	}
+
+	RedisError::RedisError (const char* parMessage, std::size_t parLength) :
+		std::runtime_error(std::string(parMessage, parLength))
+	{
+	}
+} //namespace redis
diff --git a/src/backends/redis/batch.hpp b/src/backends/redis/batch.hpp
new file mode 100644
index 0000000..491129c
--- /dev/null
+++ b/src/backends/redis/batch.hpp
@@ -0,0 +1,95 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef idD81C81D99196491A8C9B68DED8ADD260
+#define idD81C81D99196491A8C9B68DED8ADD260
+
+#include "reply.hpp"
+#include "arg_to_bin_safe.hpp"
+#include <vector>
+#include <memory>
+
+struct redisAsyncContext;
+
+namespace std {
+	template <class R> class future;
+	template <class T> struct atomic;
+} //namespace std
+
+namespace redis {
+	class Command;
+
+	class Batch {
+		friend class Command;
+	public:
+		Batch ( Batch&& parOther );
+		Batch ( const Batch& ) = delete;
+		~Batch ( void ) noexcept;
+
+		const std::vector<Reply>& replies ( void );
+		bool replies_requested ( void ) const;
+		void throw_if_failed ( void );
+
+		template <typename... Args>
+		Batch& run ( const char* parCommand, Args&&... parArgs );
+
+		template <typename... Args>
+		Batch& operator() ( const char* parCommand, Args&&... parArgs );
+
+	private:
+		struct LocalData;
+
+		explicit Batch ( redisAsyncContext* parContext );
+		void run_pvt ( int parArgc, const char** parArgv, std::size_t* parLengths );
+
+		std::vector<std::future<Reply>> m_futures;
+		std::vector<Reply> m_replies;
+		std::unique_ptr<LocalData> m_local_data;
+		redisAsyncContext* m_context;
+	};
+
+	class RedisError : public std::runtime_error {
+	public:
+		RedisError ( const char* parMessage, std::size_t parLength );
+	};
+
+	template <typename... Args>
+	Batch& Batch::run (const char* parCommand, Args&&... parArgs) {
+		constexpr const std::size_t arg_count = sizeof...(Args) + 1;
+		using CharPointerArray = std::array<const char*, arg_count>;
+		using LengthArray = std::array<std::size_t, arg_count>;
+		using implem::arg_to_bin_safe_char;
+		using implem::arg_to_bin_safe_length;
+		using implem::MakeCharInfo;
+		using boost::string_ref;
+
+		this->run_pvt(
+			static_cast<int>(arg_count),
+			CharPointerArray{ (arg_to_bin_safe_char(string_ref(parCommand))), MakeCharInfo<typename std::remove_const<typename std::remove_reference<Args>::type>::type>(std::forward<Args>(parArgs)).data()... }.data(),
+			LengthArray{ arg_to_bin_safe_length(string_ref(parCommand)), arg_to_bin_safe_length(std::forward<Args>(parArgs))... }.data()
+		);
+
+		return *this;
+	}
+
+	template <typename... Args>
+	Batch& Batch::operator() (const char* parCommand, Args&&... parArgs) {
+		return this->run(parCommand, std::forward<Args>(parArgs)...);
+	}
+} //namespace redis
+
+#endif
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 2994cff..cb8044c 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -17,41 +17,19 @@
 
 #include "command.hpp"
 #include <hiredis/hiredis.h>
+#include <hiredis/async.h>
 #include <ciso646>
 #include <cassert>
 #include <sstream>
 #include <algorithm>
 #include <stdexcept>
-#include <boost/iterator/transform_iterator.hpp>
 
 namespace redis {
 	namespace {
-		using RedisReply = std::unique_ptr<redisReply, void(*)(void*)>;
-
-		Reply make_redis_reply_type (redisReply* parReply) {
-			using boost::transform_iterator;
-			using PtrToReplyIterator = transform_iterator<Reply(*)(redisReply*), redisReply**>;
-
-			switch (parReply->type) {
-			case REDIS_REPLY_INTEGER:
-				return parReply->integer;
-			case REDIS_REPLY_STRING:
-				return std::string(parReply->str, parReply->len);
-			case REDIS_REPLY_ARRAY:
-				return std::vector<Reply>(
-					PtrToReplyIterator(parReply->element, &make_redis_reply_type),
-					PtrToReplyIterator(parReply->element + parReply->elements, &make_redis_reply_type)
-				);
-			case REDIS_REPLY_ERROR:
-				return ErrorString(parReply->str, parReply->len);
-			default:
-				return Reply();
-			};
-		}
 	} //unnamed namespace
 
 	Command::Command (std::string&& parAddress, uint16_t parPort) :
-		m_conn(nullptr, &redisFree),
+		m_conn(nullptr, &redisAsyncDisconnect),
 		m_address(std::move(parAddress)),
 		m_port(parPort)
 	{
@@ -62,10 +40,9 @@ namespace redis {
 
 	void Command::connect() {
 		if (not m_conn) {
-			struct timeval timeout = {5, 500000}; //5.5 seconds?
 			RedisConnection conn(
-				redisConnectWithTimeout(m_address.c_str(), m_port, timeout),
-				&redisFree
+				redisAsyncConnect(m_address.c_str(), m_port),
+				&redisAsyncDisconnect
 			);
 			if (not conn) {
 				std::ostringstream oss;
@@ -86,44 +63,6 @@ namespace redis {
 		m_conn.reset();
 	}
 
-	Reply Command::run_pvt (int parArgc, const char** parArgv, std::size_t* parLengths) {
-		assert(parArgc >= 1);
-		assert(parArgv);
-		assert(parLengths); //This /could/ be null, but I don't see why it should
-		assert(is_connected());
-
-		RedisReply reply(
-			static_cast<redisReply*>(redisCommandArgv(m_conn.get(), parArgc, parArgv, parLengths)),
-			&freeReplyObject
-		);
-
-		return make_redis_reply_type(reply.get());
-
-		//std::string key;
-		//{
-		//	std::ostringstream key_oss;
-		//	RedisReply incr_reply(static_cast<redisReply*>(redisCommand(m_conn.get(), "incr set_counter")), &freeReplyObject);
-		//	key_oss << "sets:" << incr_reply->integer;
-		//	key = key_oss.str();
-		//}
-
-		//RedisReply insert_reply(
-		//	static_cast<redisReply*>(redisCommand(
-		//		m_conn.get(),
-		//		"hmset %b name %b disk_label %b fs_uuid %b",
-		//		key.data(),
-		//		key.size(),
-		//		parSetData.name.data(),
-		//		parSetData.name.size(),
-		//		parSetData.disk_label.data(),
-		//		parSetData.disk_label.size(),
-		//		parSetData.fs_uuid.data(),
-		//		parSetData.fs_uuid.size()
-		//	)),
-		//	&freeReplyObject
-		//);
-	}
-
 	bool Command::is_connected() const {
 		return m_conn and not m_conn->err;
 	}
@@ -143,4 +82,9 @@ namespace redis {
 	auto Command::zscan (boost::string_ref parKey) -> zscan_range {
 		return zscan_range(zscan_iterator(this, parKey, false), zscan_iterator(this, parKey, true));
 	}
+
+	Batch Command::make_batch() {
+		assert(is_connected());
+		return Batch(m_conn.get());
+	}
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 5b9b6b5..32cf891 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -18,9 +18,9 @@
 #ifndef idD83EEBFC927840C6B9F32D61A1D1E582
 #define idD83EEBFC927840C6B9F32D61A1D1E582
 
-#include "arg_to_bin_safe.hpp"
 #include "scan_iterator.hpp"
 #include "reply.hpp"
+#include "batch.hpp"
 #include <array>
 #include <memory>
 #include <string>
@@ -33,7 +33,7 @@
 #include <boost/utility/string_ref.hpp>
 #include <stdexcept>
 
-struct redisContext;
+struct redisAsyncContext;
 
 namespace redis {
 	class Command {
@@ -55,6 +55,8 @@ namespace redis {
 
 		bool is_connected ( void ) const;
 
+		Batch make_batch ( void );
+
 		template <typename... Args>
 		Reply run ( const char* parCommand, Args&&... parArgs );
 
@@ -65,9 +67,7 @@ namespace redis {
 		zscan_range zscan ( boost::string_ref parKey );
 
 	private:
-		using RedisConnection = std::unique_ptr<redisContext, void(*)(redisContext*)>;
-
-		Reply run_pvt ( int parArgc, const char** parArgv, std::size_t* parLengths );
+		using RedisConnection = std::unique_ptr<redisAsyncContext, void(*)(redisAsyncContext*)>;
 
 		RedisConnection m_conn;
 		std::string m_address;
@@ -76,19 +76,10 @@ namespace redis {
 
 	template <typename... Args>
 	Reply Command::run (const char* parCommand, Args&&... parArgs) {
-		constexpr const std::size_t arg_count = sizeof...(Args) + 1;
-		using CharPointerArray = std::array<const char*, arg_count>;
-		using LengthArray = std::array<std::size_t, arg_count>;
-		using implem::arg_to_bin_safe_char;
-		using implem::arg_to_bin_safe_length;
-		using implem::MakeCharInfo;
-		using boost::string_ref;
-
-		return this->run_pvt(
-			static_cast<int>(arg_count),
-			CharPointerArray{ (arg_to_bin_safe_char(string_ref(parCommand))), MakeCharInfo<typename std::remove_const<typename std::remove_reference<Args>::type>::type>(std::forward<Args>(parArgs)).data()... }.data(),
-			LengthArray{ arg_to_bin_safe_length(string_ref(parCommand)), arg_to_bin_safe_length(std::forward<Args>(parArgs))... }.data()
-		);
+		auto batch = make_batch();
+		batch.run(parCommand, std::forward<Args>(parArgs)...);
+		batch.throw_if_failed();
+		return batch.replies().front();
 	}
 } //namespace redis
 

From 832452707326e9b037227c140249a17f20ae2cad Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 20 Jun 2016 18:50:01 +0100
Subject: [PATCH 073/170] Import Findcryptopp.cmake.

See: https://github.com/ceph/ceph/blob/master/cmake/modules/Findcryptopp.cmake
---
 cmake/Modules/FindCryptoPP.cmake | 108 +++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 cmake/Modules/FindCryptoPP.cmake

diff --git a/cmake/Modules/FindCryptoPP.cmake b/cmake/Modules/FindCryptoPP.cmake
new file mode 100644
index 0000000..74a01e8
--- /dev/null
+++ b/cmake/Modules/FindCryptoPP.cmake
@@ -0,0 +1,108 @@
+# Module for locating the Crypto++ encryption library.
+#
+# Customizable variables:
+#   CRYPTOPP_ROOT_DIR
+#     This variable points to the CryptoPP root directory. On Windows the
+#     library location typically will have to be provided explicitly using the
+#     -D command-line option. The directory should include the include/cryptopp,
+#     lib and/or bin sub-directories.
+#
+# Read-only variables:
+#   CRYPTOPP_FOUND
+#     Indicates whether the library has been found.
+#
+#   CRYPTOPP_INCLUDE_DIRS
+#     Points to the CryptoPP include directory.
+#
+#   CRYPTOPP_LIBRARIES
+#     Points to the CryptoPP libraries that should be passed to
+#     target_link_libararies.
+#
+#
+# Copyright (c) 2012 Sergiu Dotenco
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+INCLUDE (FindPackageHandleStandardArgs)
+
+FIND_PATH (CRYPTOPP_ROOT_DIR
+  NAMES cryptopp/cryptlib.h include/cryptopp/cryptlib.h
+  PATHS ENV CRYPTOPPROOT
+  DOC "CryptoPP root directory")
+
+# Re-use the previous path:
+FIND_PATH (CRYPTOPP_INCLUDE_DIR
+  NAMES cryptopp/cryptlib.h
+  HINTS ${CRYPTOPP_ROOT_DIR}
+  PATH_SUFFIXES include
+  DOC "CryptoPP include directory")
+
+FIND_LIBRARY (CRYPTOPP_LIBRARY_DEBUG
+  NAMES cryptlibd cryptoppd
+  HINTS ${CRYPTOPP_ROOT_DIR}
+  PATH_SUFFIXES lib
+  DOC "CryptoPP debug library")
+
+FIND_LIBRARY (CRYPTOPP_LIBRARY_RELEASE
+  NAMES cryptlib cryptopp
+  HINTS ${CRYPTOPP_ROOT_DIR}
+  PATH_SUFFIXES lib
+  DOC "CryptoPP release library")
+
+IF (CRYPTOPP_LIBRARY_DEBUG AND CRYPTOPP_LIBRARY_RELEASE)
+  SET (CRYPTOPP_LIBRARY
+    optimized ${CRYPTOPP_LIBRARY_RELEASE}
+    debug ${CRYPTOPP_LIBRARY_DEBUG} CACHE DOC "CryptoPP library")
+ELSEIF (CRYPTOPP_LIBRARY_RELEASE)
+  SET (CRYPTOPP_LIBRARY ${CRYPTOPP_LIBRARY_RELEASE} CACHE DOC
+    "CryptoPP library")
+ENDIF (CRYPTOPP_LIBRARY_DEBUG AND CRYPTOPP_LIBRARY_RELEASE)
+
+IF (CRYPTOPP_INCLUDE_DIR)
+  SET (_CRYPTOPP_VERSION_HEADER ${CRYPTOPP_INCLUDE_DIR}/cryptopp/config.h)
+
+  IF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
+    FILE (STRINGS ${_CRYPTOPP_VERSION_HEADER} _CRYPTOPP_VERSION_TMP REGEX
+      "^#define CRYPTOPP_VERSION[ \t]+[0-9]+$")
+
+    STRING (REGEX REPLACE
+      "^#define CRYPTOPP_VERSION[ \t]+([0-9]+)" "\\1" _CRYPTOPP_VERSION_TMP
+      ${_CRYPTOPP_VERSION_TMP})
+
+    STRING (REGEX REPLACE "([0-9]+)[0-9][0-9]" "\\1" CRYPTOPP_VERSION_MAJOR
+      ${_CRYPTOPP_VERSION_TMP})
+    STRING (REGEX REPLACE "[0-9]([0-9])[0-9]" "\\1" CRYPTOPP_VERSION_MINOR
+      ${_CRYPTOPP_VERSION_TMP})
+    STRING (REGEX REPLACE "[0-9][0-9]([0-9])" "\\1" CRYPTOPP_VERSION_PATCH
+      ${_CRYPTOPP_VERSION_TMP})
+
+    SET (CRYPTOPP_VERSION_COUNT 3)
+    SET (CRYPTOPP_VERSION
+      ${CRYPTOPP_VERSION_MAJOR}.${CRYPTOPP_VERSION_MINOR}.${CRYPTOPP_VERSION_PATCH})
+  ENDIF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
+ENDIF (CRYPTOPP_INCLUDE_DIR)
+
+SET (CRYPTOPP_INCLUDE_DIRS ${CRYPTOPP_INCLUDE_DIR})
+SET (CRYPTOPP_LIBRARIES ${CRYPTOPP_LIBRARY})
+
+MARK_AS_ADVANCED (CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY CRYPTOPP_LIBRARY_DEBUG
+  CRYPTOPP_LIBRARY_RELEASE)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (CryptoPP REQUIRED_VARS CRYPTOPP_ROOT_DIR
+  CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY VERSION_VAR CRYPTOPP_VERSION)

From af0f18d5ff8d90476671ab44914f0bd32fb97a7a Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 20 Jun 2016 18:50:15 +0100
Subject: [PATCH 074/170] Fix indentation so vim is happy.

---
 cmake/Modules/FindCryptoPP.cmake | 118 +++++++++++++++++++------------
 1 file changed, 73 insertions(+), 45 deletions(-)

diff --git a/cmake/Modules/FindCryptoPP.cmake b/cmake/Modules/FindCryptoPP.cmake
index 74a01e8..2a2aaca 100644
--- a/cmake/Modules/FindCryptoPP.cmake
+++ b/cmake/Modules/FindCryptoPP.cmake
@@ -41,68 +41,96 @@
 
 INCLUDE (FindPackageHandleStandardArgs)
 
-FIND_PATH (CRYPTOPP_ROOT_DIR
-  NAMES cryptopp/cryptlib.h include/cryptopp/cryptlib.h
-  PATHS ENV CRYPTOPPROOT
-  DOC "CryptoPP root directory")
+FIND_PATH (
+	CRYPTOPP_ROOT_DIR
+	NAMES cryptopp/cryptlib.h include/cryptopp/cryptlib.h
+	PATHS ENV CRYPTOPPROOT
+	DOC "CryptoPP root directory"
+)
 
 # Re-use the previous path:
-FIND_PATH (CRYPTOPP_INCLUDE_DIR
-  NAMES cryptopp/cryptlib.h
-  HINTS ${CRYPTOPP_ROOT_DIR}
-  PATH_SUFFIXES include
-  DOC "CryptoPP include directory")
+FIND_PATH (
+	CRYPTOPP_INCLUDE_DIR
+	NAMES cryptopp/cryptlib.h
+	HINTS ${CRYPTOPP_ROOT_DIR}
+	PATH_SUFFIXES include
+	DOC "CryptoPP include directory"
+)
 
-FIND_LIBRARY (CRYPTOPP_LIBRARY_DEBUG
-  NAMES cryptlibd cryptoppd
-  HINTS ${CRYPTOPP_ROOT_DIR}
-  PATH_SUFFIXES lib
-  DOC "CryptoPP debug library")
+FIND_LIBRARY (
+	CRYPTOPP_LIBRARY_DEBUG
+	NAMES cryptlibd cryptoppd
+	HINTS ${CRYPTOPP_ROOT_DIR}
+	PATH_SUFFIXES lib
+	DOC "CryptoPP debug library"
+)
 
-FIND_LIBRARY (CRYPTOPP_LIBRARY_RELEASE
-  NAMES cryptlib cryptopp
-  HINTS ${CRYPTOPP_ROOT_DIR}
-  PATH_SUFFIXES lib
-  DOC "CryptoPP release library")
+FIND_LIBRARY (
+	CRYPTOPP_LIBRARY_RELEASE
+	NAMES cryptlib cryptopp
+	HINTS ${CRYPTOPP_ROOT_DIR}
+	PATH_SUFFIXES lib
+	DOC "CryptoPP release library"
+)
 
 IF (CRYPTOPP_LIBRARY_DEBUG AND CRYPTOPP_LIBRARY_RELEASE)
-  SET (CRYPTOPP_LIBRARY
-    optimized ${CRYPTOPP_LIBRARY_RELEASE}
-    debug ${CRYPTOPP_LIBRARY_DEBUG} CACHE DOC "CryptoPP library")
+	SET (
+		CRYPTOPP_LIBRARY
+		optimized ${CRYPTOPP_LIBRARY_RELEASE}
+		debug ${CRYPTOPP_LIBRARY_DEBUG} CACHE DOC "CryptoPP library"
+	)
 ELSEIF (CRYPTOPP_LIBRARY_RELEASE)
-  SET (CRYPTOPP_LIBRARY ${CRYPTOPP_LIBRARY_RELEASE} CACHE DOC
-    "CryptoPP library")
+	SET (
+		CRYPTOPP_LIBRARY ${CRYPTOPP_LIBRARY_RELEASE} CACHE DOC
+		"CryptoPP library"
+	)
 ENDIF (CRYPTOPP_LIBRARY_DEBUG AND CRYPTOPP_LIBRARY_RELEASE)
 
 IF (CRYPTOPP_INCLUDE_DIR)
-  SET (_CRYPTOPP_VERSION_HEADER ${CRYPTOPP_INCLUDE_DIR}/cryptopp/config.h)
+	SET (_CRYPTOPP_VERSION_HEADER ${CRYPTOPP_INCLUDE_DIR}/cryptopp/config.h)
 
-  IF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
-    FILE (STRINGS ${_CRYPTOPP_VERSION_HEADER} _CRYPTOPP_VERSION_TMP REGEX
-      "^#define CRYPTOPP_VERSION[ \t]+[0-9]+$")
+	IF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
+		FILE (
+			STRINGS ${_CRYPTOPP_VERSION_HEADER} _CRYPTOPP_VERSION_TMP REGEX
+			"^#define CRYPTOPP_VERSION[ \t]+[0-9]+$"
+		)
 
-    STRING (REGEX REPLACE
-      "^#define CRYPTOPP_VERSION[ \t]+([0-9]+)" "\\1" _CRYPTOPP_VERSION_TMP
-      ${_CRYPTOPP_VERSION_TMP})
+		STRING (
+			REGEX REPLACE
+			"^#define CRYPTOPP_VERSION[ \t]+([0-9]+)" "\\1" _CRYPTOPP_VERSION_TMP
+			${_CRYPTOPP_VERSION_TMP}
+		)
 
-    STRING (REGEX REPLACE "([0-9]+)[0-9][0-9]" "\\1" CRYPTOPP_VERSION_MAJOR
-      ${_CRYPTOPP_VERSION_TMP})
-    STRING (REGEX REPLACE "[0-9]([0-9])[0-9]" "\\1" CRYPTOPP_VERSION_MINOR
-      ${_CRYPTOPP_VERSION_TMP})
-    STRING (REGEX REPLACE "[0-9][0-9]([0-9])" "\\1" CRYPTOPP_VERSION_PATCH
-      ${_CRYPTOPP_VERSION_TMP})
+		STRING (
+			REGEX REPLACE "([0-9]+)[0-9][0-9]" "\\1" CRYPTOPP_VERSION_MAJOR
+			${_CRYPTOPP_VERSION_TMP}
+		)
+		STRING (
+			REGEX REPLACE "[0-9]([0-9])[0-9]" "\\1" CRYPTOPP_VERSION_MINOR
+			${_CRYPTOPP_VERSION_TMP}
+		)
+		STRING (
+			REGEX REPLACE "[0-9][0-9]([0-9])" "\\1" CRYPTOPP_VERSION_PATCH
+			${_CRYPTOPP_VERSION_TMP}
+		)
 
-    SET (CRYPTOPP_VERSION_COUNT 3)
-    SET (CRYPTOPP_VERSION
-      ${CRYPTOPP_VERSION_MAJOR}.${CRYPTOPP_VERSION_MINOR}.${CRYPTOPP_VERSION_PATCH})
-  ENDIF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
+		SET (CRYPTOPP_VERSION_COUNT 3)
+		SET (
+			CRYPTOPP_VERSION
+			${CRYPTOPP_VERSION_MAJOR}.${CRYPTOPP_VERSION_MINOR}.${CRYPTOPP_VERSION_PATCH}
+		)
+	ENDIF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
 ENDIF (CRYPTOPP_INCLUDE_DIR)
 
 SET (CRYPTOPP_INCLUDE_DIRS ${CRYPTOPP_INCLUDE_DIR})
 SET (CRYPTOPP_LIBRARIES ${CRYPTOPP_LIBRARY})
 
-MARK_AS_ADVANCED (CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY CRYPTOPP_LIBRARY_DEBUG
-  CRYPTOPP_LIBRARY_RELEASE)
+MARK_AS_ADVANCED (
+	CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY CRYPTOPP_LIBRARY_DEBUG
+	CRYPTOPP_LIBRARY_RELEASE
+)
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (CryptoPP REQUIRED_VARS CRYPTOPP_ROOT_DIR
-  CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY VERSION_VAR CRYPTOPP_VERSION)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (
+	CryptoPP REQUIRED_VARS CRYPTOPP_ROOT_DIR
+	CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY VERSION_VAR CRYPTOPP_VERSION
+)

From e179a31616571cb66997025a43457eceae9f444d Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 20 Jun 2016 18:56:31 +0100
Subject: [PATCH 075/170] Change CRYPTOPP case to CryptoPP as it seems to be
 the official convention.

Looking at this page https://cryptopp.com/wiki/CMake#Using_the_library_in_other_projects
it seems to me there should be or there is going to be a system-wide
official FindCryptoPP module. Those changes should match the case convention
from that page... somewhat. I'm not going to do the cryptopp-shared thing.

So *if* that official module will ever become available on mainstream distros,
and *if* they start using proper names, this file should just be deleted
and everything should keep on working just fine.
---
 cmake/Modules/FindCryptoPP.cmake | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/cmake/Modules/FindCryptoPP.cmake b/cmake/Modules/FindCryptoPP.cmake
index 2a2aaca..9a3b6a3 100644
--- a/cmake/Modules/FindCryptoPP.cmake
+++ b/cmake/Modules/FindCryptoPP.cmake
@@ -1,20 +1,20 @@
 # Module for locating the Crypto++ encryption library.
 #
 # Customizable variables:
-#   CRYPTOPP_ROOT_DIR
+#   CryptoPP_ROOT_DIR
 #     This variable points to the CryptoPP root directory. On Windows the
 #     library location typically will have to be provided explicitly using the
 #     -D command-line option. The directory should include the include/cryptopp,
 #     lib and/or bin sub-directories.
 #
 # Read-only variables:
-#   CRYPTOPP_FOUND
+#   CryptoPP_FOUND
 #     Indicates whether the library has been found.
 #
-#   CRYPTOPP_INCLUDE_DIRS
+#   CryptoPP_INCLUDE_DIRS
 #     Points to the CryptoPP include directory.
 #
-#   CRYPTOPP_LIBRARIES
+#   CryptoPP_LIBRARIES
 #     Points to the CryptoPP libraries that should be passed to
 #     target_link_libararies.
 #
@@ -42,7 +42,7 @@
 INCLUDE (FindPackageHandleStandardArgs)
 
 FIND_PATH (
-	CRYPTOPP_ROOT_DIR
+	CryptoPP_ROOT_DIR
 	NAMES cryptopp/cryptlib.h include/cryptopp/cryptlib.h
 	PATHS ENV CRYPTOPPROOT
 	DOC "CryptoPP root directory"
@@ -52,7 +52,7 @@ FIND_PATH (
 FIND_PATH (
 	CRYPTOPP_INCLUDE_DIR
 	NAMES cryptopp/cryptlib.h
-	HINTS ${CRYPTOPP_ROOT_DIR}
+	HINTS ${CryptoPP_ROOT_DIR}
 	PATH_SUFFIXES include
 	DOC "CryptoPP include directory"
 )
@@ -60,7 +60,7 @@ FIND_PATH (
 FIND_LIBRARY (
 	CRYPTOPP_LIBRARY_DEBUG
 	NAMES cryptlibd cryptoppd
-	HINTS ${CRYPTOPP_ROOT_DIR}
+	HINTS ${CryptoPP_ROOT_DIR}
 	PATH_SUFFIXES lib
 	DOC "CryptoPP debug library"
 )
@@ -68,7 +68,7 @@ FIND_LIBRARY (
 FIND_LIBRARY (
 	CRYPTOPP_LIBRARY_RELEASE
 	NAMES cryptlib cryptopp
-	HINTS ${CRYPTOPP_ROOT_DIR}
+	HINTS ${CryptoPP_ROOT_DIR}
 	PATH_SUFFIXES lib
 	DOC "CryptoPP release library"
 )
@@ -122,8 +122,8 @@ IF (CRYPTOPP_INCLUDE_DIR)
 	ENDIF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
 ENDIF (CRYPTOPP_INCLUDE_DIR)
 
-SET (CRYPTOPP_INCLUDE_DIRS ${CRYPTOPP_INCLUDE_DIR})
-SET (CRYPTOPP_LIBRARIES ${CRYPTOPP_LIBRARY})
+SET (CryptoPP_INCLUDE_DIRS ${CRYPTOPP_INCLUDE_DIR})
+SET (CryptoPP_LIBRARIES ${CRYPTOPP_LIBRARY})
 
 MARK_AS_ADVANCED (
 	CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY CRYPTOPP_LIBRARY_DEBUG
@@ -131,6 +131,6 @@ MARK_AS_ADVANCED (
 )
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS (
-	CryptoPP REQUIRED_VARS CRYPTOPP_ROOT_DIR
+	CryptoPP REQUIRED_VARS CryptoPP_ROOT_DIR
 	CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY VERSION_VAR CRYPTOPP_VERSION
 )

From 7957a9498083d6a6e8b8baaa61d1b6a45457d0cd Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 20 Jun 2016 19:04:24 +0100
Subject: [PATCH 076/170] Move cmake_on_off.h to helpers dir.

---
 include/{dindexer-common => helpers}/cmake_on_off.h | 0
 src/dindexerConfig.h.in                             | 2 +-
 src/machinery/machineryConfig.h.in                  | 2 +-
 src/main/timestamp.h.in                             | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/{dindexer-common => helpers}/cmake_on_off.h (100%)

diff --git a/include/dindexer-common/cmake_on_off.h b/include/helpers/cmake_on_off.h
similarity index 100%
rename from include/dindexer-common/cmake_on_off.h
rename to include/helpers/cmake_on_off.h
diff --git a/src/dindexerConfig.h.in b/src/dindexerConfig.h.in
index 7d2493c..1887d22 100644
--- a/src/dindexerConfig.h.in
+++ b/src/dindexerConfig.h.in
@@ -18,7 +18,7 @@
 #ifndef id48D6E1D45238460F99C2BCBFDE920791
 #define id48D6E1D45238460F99C2BCBFDE920791
 
-#include "dindexer-common/cmake_on_off.h"
+#include "helpers/cmake_on_off.h"
 
 #define PROGRAM_NAME "@bare_name@"
 #define VERSION_MAJOR @PROJECT_VERSION_MAJOR@
diff --git a/src/machinery/machineryConfig.h.in b/src/machinery/machineryConfig.h.in
index e33c358..9789884 100644
--- a/src/machinery/machineryConfig.h.in
+++ b/src/machinery/machineryConfig.h.in
@@ -18,7 +18,7 @@
 #ifndef id32A00B72E29D463795CBF66517387E8D
 #define id32A00B72E29D463795CBF66517387E8D
 
-#include "dindexer-common/cmake_on_off.h"
+#include "helpers/cmake_on_off.h"
 
 #if CMAKE_@DINDEXER_WITH_NICE_MEDIA_TYPES@
 #	define WITH_NICE_MEDIA_TYPES
diff --git a/src/main/timestamp.h.in b/src/main/timestamp.h.in
index 22a9339..0929435 100644
--- a/src/main/timestamp.h.in
+++ b/src/main/timestamp.h.in
@@ -18,7 +18,7 @@
 #ifndef id4A9E94ACFA43498097637025A5BA69E5
 #define id4A9E94ACFA43498097637025A5BA69E5
 
-#include "dindexer-common/cmake_on_off.h"
+#include "helpers/cmake_on_off.h"
 
 #if CMAKE_@DINDEXER_WITH_BUILD_DATE@
 #	define DINDEXER_BUILD_DATE "@DINDEXER_BUILD_DATE@"

From c61619eb3886dfe8e8989f22d4177da6b021697f Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 21 Jun 2016 14:19:59 +0100
Subject: [PATCH 077/170] Add code to submit scripts to Redis.

This is untested, but I can't test it until I implement other
things first. I also need to do some refactoring, so I need to
commit and make a checkpoint now.
Consider this code as good as if didn't exist.
---
 src/backends/redis/CMakeLists.txt   | 17 ++++++++
 src/backends/redis/batch.cpp        |  1 +
 src/backends/redis/command.cpp      | 68 +++++++++++++++++++++++++++++
 src/backends/redis/command.hpp      | 17 ++++++++
 src/backends/redis/redisConfig.h.in | 27 ++++++++++++
 5 files changed, 130 insertions(+)
 create mode 100644 src/backends/redis/redisConfig.h.in

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 1595e81..2ee8331 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -1,6 +1,7 @@
 project(${bare_name}-backend-redis CXX)
 
 find_package(hiredis 0.11.0 REQUIRED)
+find_package(CryptoPP 5.6)
 
 add_library(${PROJECT_NAME} SHARED
 	backend_redis.cpp
@@ -15,6 +16,9 @@ target_include_directories(${PROJECT_NAME} SYSTEM
 	PRIVATE ${HIREDIS_INCLUDE_DIRS}
 	PRIVATE ${CMAKE_SOURCE_DIR}/lib/better-enums
 )
+target_include_directories(${PROJECT_NAME}
+	PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-inc
@@ -22,6 +26,19 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${HIREDIS_LIBRARIES}
 )
 
+if (CryptoPP_FOUND)
+	target_link_libraries(${PROJECT_NAME} PRIVATE ${CryptoPP_LIBRARIES})
+	target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE ${CryptoPP_INCLUDE_DIRS})
+	set (has_cryptopp_lib ON)
+else()
+	set (has_cryptopp_lib OFF)
+endif()
+
+configure_file(
+	redisConfig.h.in
+	${CMAKE_CURRENT_BINARY_DIR}/redisConfig.h
+)
+
 install(TARGETS ${PROJECT_NAME}
 	LIBRARY DESTINATION lib
 	RUNTIME DESTINATION bin
diff --git a/src/backends/redis/batch.cpp b/src/backends/redis/batch.cpp
index a8a182d..e424fb4 100644
--- a/src/backends/redis/batch.cpp
+++ b/src/backends/redis/batch.cpp
@@ -65,6 +65,7 @@ namespace redis {
 			};
 		}
 
+		extern "C"
 		void hiredis_run_callback (redisAsyncContext*, void* parReply, void* parPrivData) {
 			assert(parPrivData);
 			auto* data = static_cast<HiredisCallbackData*>(parPrivData);
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index cb8044c..564aa73 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "command.hpp"
+#include "helpers/lexical_cast.hpp"
 #include <hiredis/hiredis.h>
 #include <hiredis/async.h>
 #include <ciso646>
@@ -23,9 +24,23 @@
 #include <sstream>
 #include <algorithm>
 #include <stdexcept>
+#if defined(WITH_CRYPTOPP)
+#	include <crypto++/sha.h>
+#endif
 
 namespace redis {
 	namespace {
+#if defined(WITH_CRYPTOPP)
+		struct LuaScriptHash {
+			union {
+				struct {
+					uint64_t part_a, part_b;
+					uint32_t part_c;
+				};
+				uint8_t raw_bytes[20];
+			};
+		};
+#endif
 	} //unnamed namespace
 
 	Command::Command (std::string&& parAddress, uint16_t parPort) :
@@ -87,4 +102,57 @@ namespace redis {
 		assert(is_connected());
 		return Batch(m_conn.get());
 	}
+
+#if defined(WITH_CRYPTOPP)
+	boost::string_ref Command::add_lua_script_ifn (const std::string& parScript) {
+		if (parScript.empty())
+			return boost::string_ref();
+
+		using dinhelp::lexical_cast;
+
+		static_assert(20 == CryptoPP::SHA1::DIGESTSIZE, "Unexpected SHA1 digest size");
+		static_assert(sizeof(LuaScriptHash) >= CryptoPP::SHA1::DIGESTSIZE, "Wrong SHA1 struct size");
+		static_assert(Sha1Array().size() == CryptoPP::SHA1::DIGESTSIZE, "Wrong array size");
+
+		LuaScriptHash digest;
+		CryptoPP::SHA1().CalculateDigest(digest.raw_bytes, reinterpret_cast<const uint8_t*>(parScript.data()), parScript.size());
+		//TODO: change when lexical_cast will support arrays
+		const std::string sha1_str = lexical_cast<std::string>(digest.part_a) + lexical_cast<std::string>(digest.part_b) + lexical_cast<std::string>(digest.part_c);
+		Sha1Array sha1_array;
+		std::copy(sha1_str.begin(), sha1_str.end(), sha1_array.begin());
+
+		auto it_found = m_known_hashes.find(sha1_array);
+		const bool was_present = (m_known_hashes.end() != it_found);
+		if (was_present) {
+			return boost::string_ref(it_found->data(), it_found->size());
+		}
+
+		auto reply = this->run("SCRIPT", "LOAD", parScript);
+		assert(not was_present);
+
+		assert(get_string(reply) == sha1_str);
+		const auto it_inserted = m_known_hashes.insert(it_found, sha1_array);
+		(void)reply;
+
+		return boost::string_ref(it_inserted->data(), it_inserted->size());
+	}
+#else
+	boost::string_ref Command::add_lua_script_ifn (const std::string& parScript) {
+		auto it_found = m_known_hashes.find(parScript);
+		const bool was_present = (m_known_hashes.end() != it_found);
+		if (was_present) {
+			return boost::string_ref(it_found->second.data(), it_found->second.size());
+		}
+
+		auto reply = this->run("SCRIPT", "LOAD", parScript);
+		assert(not was_present);
+
+		const auto sha1_str = get_string(reply);
+		Sha1Array sha1_array;
+		std::copy(sha1_str.begin(), sha1_str.end(), sha1_array.begin());
+		auto it_inserted = m_known_hashes.insert(it_found, std::make_pair(parScript, sha1_array));
+
+		return boost::string_ref(it_inserted->second.data(), it_inserted->second.size());
+	}
+#endif
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 32cf891..c99df18 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -21,6 +21,7 @@
 #include "scan_iterator.hpp"
 #include "reply.hpp"
 #include "batch.hpp"
+#include "redisConfig.h"
 #include <array>
 #include <memory>
 #include <string>
@@ -32,6 +33,12 @@
 #include <boost/range/iterator_range_core.hpp>
 #include <boost/utility/string_ref.hpp>
 #include <stdexcept>
+#if defined(WITH_CRYPTOPP)
+#	include <set>
+#else
+#	include <map>
+#endif
+#include <boost/utility/string_ref.hpp>
 
 struct redisAsyncContext;
 
@@ -66,10 +73,20 @@ namespace redis {
 		sscan_range sscan ( boost::string_ref parKey );
 		zscan_range zscan ( boost::string_ref parKey );
 
+		void submit_lua_script ( const std::string& parScript );
+
 	private:
 		using RedisConnection = std::unique_ptr<redisAsyncContext, void(*)(redisAsyncContext*)>;
+		using Sha1Array = std::array<char, 20>;
+
+		boost::string_ref add_lua_script_ifn ( const std::string& parScript );
 
 		RedisConnection m_conn;
+#if defined(WITH_CRYPTOPP)
+		std::set<Sha1Array> m_known_hashes;
+#else
+		std::map<std::string, Sha1Array> m_known_scripts;
+#endif
 		std::string m_address;
 		uint16_t m_port;
 	};
diff --git a/src/backends/redis/redisConfig.h.in b/src/backends/redis/redisConfig.h.in
new file mode 100644
index 0000000..e638fbd
--- /dev/null
+++ b/src/backends/redis/redisConfig.h.in
@@ -0,0 +1,27 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef idB3E2F339E3B64378B66342550C4D2089
+#define idB3E2F339E3B64378B66342550C4D2089
+
+#include "helpers/cmake_on_off.h"
+
+#if CMAKE_@has_cryptopp_lib@
+#	define WITH_CRYPTOPP
+#endif
+
+#endif

From 29e2375e3bf6cfdae9205093b2992870a31ac003 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 21 Jun 2016 14:20:30 +0100
Subject: [PATCH 078/170] Add constructor for opening connection to socket.

---
 src/backends/redis/command.cpp | 17 ++++++++++++++++-
 src/backends/redis/command.hpp |  2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 564aa73..3c04b46 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -50,13 +50,24 @@ namespace redis {
 	{
 	}
 
+	Command::Command (std::string&& parSocket) :
+		m_conn(nullptr, &redisAsyncDisconnect),
+		m_address(std::move(parSocket),
+		m_port(0)
+	{
+	}
+
 	Command::~Command() noexcept {
 	}
 
 	void Command::connect() {
 		if (not m_conn) {
 			RedisConnection conn(
-				redisAsyncConnect(m_address.c_str(), m_port),
+				(is_socket_connection() ?
+					redisAsyncConnectUnix(m_address.c_str())
+				:
+					redisAsyncConnect(m_address.c_str(), m_port)
+				),
 				&redisAsyncDisconnect
 			);
 			if (not conn) {
@@ -155,4 +166,8 @@ namespace redis {
 		return boost::string_ref(it_inserted->second.data(), it_inserted->second.size());
 	}
 #endif
+
+	bool Command::is_socket_connection() const {
+		return not (m_port or m_address.empty());
+	}
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index c99df18..3765ad8 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -55,6 +55,7 @@ namespace redis {
 		typedef boost::iterator_range<zscan_iterator> zscan_range;
 
 		Command ( std::string&& parAddress, uint16_t parPort );
+		explicit Command ( std::string&& parSocket );
 		~Command ( void ) noexcept;
 
 		void connect ( void );
@@ -80,6 +81,7 @@ namespace redis {
 		using Sha1Array = std::array<char, 20>;
 
 		boost::string_ref add_lua_script_ifn ( const std::string& parScript );
+		bool is_socket_connection ( void ) const;
 
 		RedisConnection m_conn;
 #if defined(WITH_CRYPTOPP)

From 40e189cf4db2891fc6de38f57628ff0a6a4c7d30 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 21 Jun 2016 17:52:13 +0100
Subject: [PATCH 079/170] Add on_connect/on_disconnect hiredis callbacks.

---
 src/backends/redis/command.cpp | 36 +++++++++++++++++++++++++++++-----
 src/backends/redis/command.hpp |  4 ++++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 3c04b46..b3951ea 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -43,17 +43,34 @@ namespace redis {
 #endif
 	} //unnamed namespace
 
+	void on_connect (const redisAsyncContext* parContext, int parStatus) {
+		assert(parContext and parContext->data);
+		Command& self = *static_cast<Command*>(parContext->data);
+
+		self.m_connection_lost = false;
+		self.m_connected = (parStatus == REDIS_OK);
+	}
+
+	void on_disconnect (const redisAsyncContext* parContext, int parStatus) {
+		assert(parContext and parContext->data);
+		Command& self = *static_cast<Command*>(parContext->data);
+		assert(self.m_connected);
+
+		self.m_connection_lost = (REDIS_ERR == parStatus);
+		self.m_connected = false;
+	};
+
 	Command::Command (std::string&& parAddress, uint16_t parPort) :
 		m_conn(nullptr, &redisAsyncDisconnect),
 		m_address(std::move(parAddress)),
-		m_port(parPort)
+		m_port(parPort),
+		m_connected(false),
+		m_connection_lost(false)
 	{
 	}
 
 	Command::Command (std::string&& parSocket) :
-		m_conn(nullptr, &redisAsyncDisconnect),
-		m_address(std::move(parSocket),
-		m_port(0)
+		Command(std::move(parSocket), 0)
 	{
 	}
 
@@ -75,12 +92,19 @@ namespace redis {
 				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port;
 				throw std::runtime_error(oss.str());
 			}
+			else {
+				conn->data = this;
+			}
 			if (conn->err) {
 				std::ostringstream oss;
 				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port <<
 					": " << conn->errstr;
 				throw std::runtime_error(oss.str());
 			}
+			if (REDIS_OK != redisAsyncSetConnectCallback(conn.get(), &on_connect))
+				throw std::runtime_error("Unable to set \"on_connect()\" callback");
+			if (REDIS_OK != redisAsyncSetDisconnectCallback(conn.get(), &on_disconnect))
+				throw std::runtime_error("Unable to set \"on_disconnect()\" callback");
 			std::swap(conn, m_conn);
 		}
 	}
@@ -90,7 +114,9 @@ namespace redis {
 	}
 
 	bool Command::is_connected() const {
-		return m_conn and not m_conn->err;
+		const bool connected = m_conn and not m_conn->err and m_connected;
+		assert(not m_connection_lost or connected);
+		return connected;
 	}
 
 	auto Command::scan() -> scan_range {
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 3765ad8..6b1fd66 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -44,6 +44,8 @@ struct redisAsyncContext;
 
 namespace redis {
 	class Command {
+		friend void on_connect ( const redisAsyncContext*, int );
+		friend void on_disconnect ( const redisAsyncContext*, int );
 	public:
 		typedef ScanIterator<ScanSingleValues<std::string>> scan_iterator;
 		typedef boost::iterator_range<scan_iterator> scan_range;
@@ -91,6 +93,8 @@ namespace redis {
 #endif
 		std::string m_address;
 		uint16_t m_port;
+		bool m_connected;
+		bool m_connection_lost;
 	};
 
 	template <typename... Args>

From 2e68e639bf60deffb803b232f520183ed4109412 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 29 Jun 2016 22:48:50 +0100
Subject: [PATCH 080/170] Support conversion to lower case hex.

---
 include/helpers/lexical_cast.hpp | 65 +++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/include/helpers/lexical_cast.hpp b/include/helpers/lexical_cast.hpp
index 4a1a1f5..18332c9 100644
--- a/include/helpers/lexical_cast.hpp
+++ b/include/helpers/lexical_cast.hpp
@@ -80,9 +80,10 @@ namespace dinhelp {
 
 			ArrayRetType retval;
 			F div = 1;
+			constexpr const std::size_t charset_offs = (Tag<F>::lower_case ? Tag<F>::base : 0);
 			const auto sign_length = (is_negative<F>::check(parFrom) and Tag<F>::sign_allowed ? 1 : 0);
 			for (std::size_t z = 0; z < Tag<F>::count_digits(parFrom) - sign_length; ++z) {
-				retval.push_back(static_cast<uint8_t>((Tag<F>::make_unsigned(parFrom) / div) % Tag<F>::base));
+				retval.push_back(static_cast<uint8_t>(((Tag<F>::make_unsigned(parFrom) / div) % Tag<F>::base) + charset_offs));
 				div *= Tag<F>::base;
 			}
 			std::reverse(retval.begin(), retval.end());
@@ -99,6 +100,21 @@ namespace dinhelp {
 			}
 			return retval * dinhelp::customize::char_to_int<typename F::value_type, T>::sgn(parFrom);
 		};
+
+		template <typename T, bool LowerCase>
+		struct hex {
+			enum {
+				base = 16,
+				sign_allowed = 0,
+				lower_case = (LowerCase ? 1 : 0)
+			};
+
+			static std::size_t count_digits ( T parValue ) a_pure;
+			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
+			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
+				return (parNum == 0 ? 0 : static_cast<std::size_t>(std::log10(static_cast<double>(parNum)) / std::log10(static_cast<double>(base)))) + 1;
+			}
+		};
 	} //namespace implem
 
 	namespace tags {
@@ -106,7 +122,8 @@ namespace dinhelp {
 		struct dec {
 			enum {
 				base = 10,
-				sign_allowed = 1
+				sign_allowed = 1,
+				lower_case = 0
 			};
 
 			template <std::size_t... Powers, std::size_t... Digits>
@@ -121,24 +138,16 @@ namespace dinhelp {
 		};
 
 		template <typename T>
-		struct hex {
-			enum {
-				base = 16,
-				sign_allowed = 0
-			};
-
-			static std::size_t count_digits ( T parValue ) a_pure;
-			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
-			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
-				return (parNum == 0 ? 0 : static_cast<std::size_t>(std::log10(static_cast<double>(parNum)) / std::log10(static_cast<double>(base)))) + 1;
-			}
-		};
+		using hex = dinhelp::implem::hex<T, false>;
+		template <typename T>
+		using hexl = dinhelp::implem::hex<T, true>;
 
 		template <typename T>
 		struct bin {
 			enum {
 				base = 2,
-				sign_allowed = 0
+				sign_allowed = 0,
+				lower_case = 0
 			};
 
 			static std::size_t count_digits ( T parValue ) a_pure;
@@ -172,16 +181,6 @@ namespace dinhelp {
 			return dinhelp::implem::abs(parValue);
 		}
 
-		template <typename T>
-		std::size_t hex<T>::count_digits (T parValue) {
-			return std::max<std::size_t>(((sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<typename std::make_unsigned<T>::type>(make_unsigned(parValue))) + (CHAR_BIT / 2 - 1)) / (CHAR_BIT / 2), 1);
-		}
-
-		template <typename T>
-		typename std::make_unsigned<T>::type hex<T>::make_unsigned (T parValue) {
-			return static_cast<typename std::make_unsigned<T>::type>(parValue);
-		}
-
 		template <typename T>
 		std::size_t bin<T>::count_digits (T parValue) {
 			return std::max<std::size_t>((sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<typename std::make_unsigned<T>::type>(make_unsigned(parValue))), 1);
@@ -240,6 +239,16 @@ namespace dinhelp {
 			//We need to cast before negating x to avoid the overflow.
 			return (parValue < 0 ? -static_cast<typename std::make_unsigned<T>::type>(parValue) : parValue);
 		}
+
+		template <typename T, bool LowerCase>
+		std::size_t hex<T, LowerCase>::count_digits (T parValue) {
+			return std::max<std::size_t>(((sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<typename std::make_unsigned<T>::type>(make_unsigned(parValue))) + (CHAR_BIT / 2 - 1)) / (CHAR_BIT / 2), 1);
+		}
+
+		template <typename T, bool LowerCase>
+		typename std::make_unsigned<T>::type hex<T, LowerCase>::make_unsigned (T parValue) {
+			return static_cast<typename std::make_unsigned<T>::type>(parValue);
+		}
 	} //namespace implem
 
 	template <typename T, template <typename> class Tag=tags::dec, typename F=void>
@@ -254,7 +263,11 @@ namespace dinhelp {
 			static std::string make (const MaxSizedArray<uint8_t, N> &parIndices, int parNegative) {
 				static const char symbols[] = {'0', '1', '2', '3', '4', '5',
 											   '6', '7', '8', '9', 'A', 'B',
-											   'C', 'D', 'E', 'F'};
+											   'C', 'D', 'E', 'F',
+											   '0', '1', '2', '3', '4', '5',
+											   '6', '7', '8', '9', 'a', 'b',
+											   'c', 'd', 'e', 'f'
+				};
 				std::string retval(parIndices.size() + parNegative, '-');
 				for (auto z = parNegative; z < static_cast<int>(parIndices.size()) + parNegative; ++z) {
 					retval[z] = symbols[parIndices[z - parNegative]];

From 7f25fdb37ce5dfebea034059ff1bc61b176f0d3f Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 29 Jun 2016 22:49:38 +0100
Subject: [PATCH 081/170] Add support for 'status string' replies from Redis.

---
 src/backends/redis/reply.cpp | 11 +++++++++++
 src/backends/redis/reply.hpp | 19 +++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/reply.cpp b/src/backends/redis/reply.cpp
index 9751f11..575d543 100644
--- a/src/backends/redis/reply.cpp
+++ b/src/backends/redis/reply.cpp
@@ -50,6 +50,11 @@ namespace redis {
 		return boost::get<std::vector<Reply>>(parReply);
 	}
 
+	const ErrorString& get_error_string (const Reply& parReply) {
+		assert(RedisVariantType_Error == parReply.which());
+		return boost::get<ErrorString>(parReply);
+	}
+
 	template <>
 	const std::string& get<std::string> (const Reply& parReply) {
 		return get_string(parReply);
@@ -65,7 +70,13 @@ namespace redis {
 		return get_integer(parReply);
 	}
 
+	template <>
+	const ErrorString& get<ErrorString> (const Reply& parReply) {
+		return get_error_string(parReply);
+	}
+
 	template const std::string& get<std::string> ( const Reply& parReply );
 	template const std::vector<Reply>& get<std::vector<Reply>> ( const Reply& parReply );
 	template const long long& get<long long> ( const Reply& parReply );
+	template const ErrorString& get<ErrorString> ( const Reply& parReply );
 } //namespace redis
diff --git a/src/backends/redis/reply.hpp b/src/backends/redis/reply.hpp
index 2bce8bc..bffbe25 100644
--- a/src/backends/redis/reply.hpp
+++ b/src/backends/redis/reply.hpp
@@ -32,6 +32,17 @@ namespace redis {
 		{ }
 		const std::string& message ( void ) const noexcept { return m_msg; }
 
+	private:
+		std::string m_msg;
+	};
+	class StatusString {
+	public:
+		StatusString ( const char* parCStr, std::size_t parLen ) :
+			m_msg(parCStr, parLen)
+		{ }
+		const std::string& message ( void ) const noexcept { return m_msg; }
+		bool is_ok ( void ) const { return "OK" == m_msg; }
+
 	private:
 		std::string m_msg;
 	};
@@ -41,14 +52,16 @@ namespace redis {
 			long long,
 			std::string,
 			std::vector<Reply>,
-			ErrorString
+			ErrorString,
+			StatusString
 		>;
 	} //namespace implem
 	enum RedisVariantTypes {
 		RedisVariantType_Integer = 0,
 		RedisVariantType_String,
 		RedisVariantType_Array,
-		RedisVariantType_Error
+		RedisVariantType_Error,
+		RedisVariantType_Status
 	};
 
 	struct Reply : implem::RedisVariantType {
@@ -59,6 +72,7 @@ namespace redis {
 		Reply ( std::string&& parVal ) : base_class(std::move(parVal)) {}
 		Reply ( std::vector<Reply>&& parVal ) : base_class(std::move(parVal)) {}
 		Reply ( ErrorString&& parVal ) : base_class(std::move(parVal)) {}
+		Reply ( StatusString&& parVal ) : base_class(std::move(parVal)) {}
 		~Reply ( void ) noexcept = default;
 	};
 
@@ -66,6 +80,7 @@ namespace redis {
 	long long get_integer_autoconv_if_str ( const Reply& parReply );
 	const std::string& get_string ( const Reply& parReply );
 	const std::vector<Reply>& get_array ( const Reply& parReply );
+	const ErrorString& get_error_string ( const Reply& parReply );
 
 	template <typename T>
 	const T& get ( const Reply& parReply );

From cf9ac6b2963e1649916157d67e8e41c635f10685 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 29 Jun 2016 22:51:45 +0100
Subject: [PATCH 082/170] Add locking so async communication works correctly.

helgrind says it works. I think.
---
 cmake/Modules/Findlibev.cmake         |  31 ++++
 docs/hiredis_libev_multithread.md     | 166 ++++++++++++++++++++
 src/backends/redis/CMakeLists.txt     |   9 ++
 src/backends/redis/backend_redis.cpp  |  36 ++++-
 src/backends/redis/batch.cpp          |  42 +++++-
 src/backends/redis/batch.hpp          |   3 +-
 src/backends/redis/command.cpp        | 208 ++++++++++++++++----------
 src/backends/redis/command.hpp        |  30 ++--
 src/backends/redis/script.cpp         |  21 +++
 src/backends/redis/script.hpp         |  28 ++++
 src/backends/redis/script_manager.cpp | 115 ++++++++++++++
 src/backends/redis/script_manager.hpp |  54 +++++++
 12 files changed, 637 insertions(+), 106 deletions(-)
 create mode 100644 cmake/Modules/Findlibev.cmake
 create mode 100644 docs/hiredis_libev_multithread.md
 create mode 100644 src/backends/redis/script.cpp
 create mode 100644 src/backends/redis/script.hpp
 create mode 100644 src/backends/redis/script_manager.cpp
 create mode 100644 src/backends/redis/script_manager.hpp

diff --git a/cmake/Modules/Findlibev.cmake b/cmake/Modules/Findlibev.cmake
new file mode 100644
index 0000000..665d4c0
--- /dev/null
+++ b/cmake/Modules/Findlibev.cmake
@@ -0,0 +1,31 @@
+# Try to find libev
+# Once done, this will define
+#
+# LIBEV_FOUND        - system has libev
+# LIBEV_INCLUDE_DIRS - libev include directories
+# LIBEV_LIBRARIES    - libraries needed to use libev
+
+if(LIBEV_INCLUDE_DIRS AND LIBEV_LIBRARIES)
+  set(LIBEV_FIND_QUIETLY TRUE)
+else()
+  find_path(
+    LIBEV_INCLUDE_DIR
+    NAMES ev.h
+    HINTS ${LIBEV_ROOT_DIR}
+    PATH_SUFFIXES include)
+
+  find_library(
+    LIBEV_LIBRARY
+    NAME ev
+    HINTS ${LIBEV_ROOT_DIR}
+    PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR})
+
+  set(LIBEV_INCLUDE_DIRS ${LIBEV_INCLUDE_DIR})
+  set(LIBEV_LIBRARIES ${LIBEV_LIBRARY})
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(
+    libev DEFAULT_MSG LIBEV_LIBRARY LIBEV_INCLUDE_DIR)
+
+  mark_as_advanced(LIBEV_LIBRARY LIBEV_INCLUDE_DIR)
+endif()
diff --git a/docs/hiredis_libev_multithread.md b/docs/hiredis_libev_multithread.md
new file mode 100644
index 0000000..c86602f
--- /dev/null
+++ b/docs/hiredis_libev_multithread.md
@@ -0,0 +1,166 @@
+[TOC]
+
+# Using hiredis+libev in a separate thread for events
+
+Used sources:
+
+1. [stackoverflow.com/questions/14621261][link_so_1]
+2. [stackoverflow.com/questions/8611126][link_so_2]
+3. [libev thread locking example][link_ev_doc]
+
+
+## Explanation
+
+### Link 1
+
+Possibly due to the original question asked, [Link 1][link_so_1] seems to show that you need to have at least two ev_loop objects created in order to run one in a separate thread. The code on that page:
+
+```cpp
+//This program is demo for using pthreads with libev.
+//Try using Timeout values as large as 1.0 and as small as 0.000001
+//and notice the difference in the output
+
+//(c) 2009 debuguo
+//(c) 2013 enthusiasticgeek for stack overflow
+//Free to distribute and improve the code. Leave credits intact
+
+#include <ev.h>
+#include <stdio.h> // for puts
+#include <stdlib.h>
+#include <pthread.h>
+
+pthread_mutex_t lock;
+double timeout = 0.00001;
+ev_timer timeout_watcher;
+int timeout_count = 0;
+
+ev_async async_watcher;
+int async_count = 0;
+
+struct ev_loop* loop2;
+
+void* loop2thread(void* args)
+{
+    printf("Inside loop 2"); // Here one could initiate another timeout watcher
+    ev_loop(loop2, 0);       // similar to the main loop - call it say timeout_cb1
+    return NULL;
+}
+
+static void async_cb (EV_P_ ev_async *w, int revents)
+{
+    //puts ("async ready");
+    pthread_mutex_lock(&lock);     //Don't forget locking
+    ++async_count;
+    printf("async = %d, timeout = %d \n", async_count, timeout_count);
+    pthread_mutex_unlock(&lock);   //Don't forget unlocking
+}
+
+static void timeout_cb (EV_P_ ev_timer *w, int revents) // Timer callback function
+{
+    //puts ("timeout");
+    if (ev_async_pending(&async_watcher)==false) { //the event has not yet been processed (or even noted) by the event loop? (i.e. Is it serviced? If yes then proceed to)
+        ev_async_send(loop2, &async_watcher); //Sends/signals/activates the given ev_async watcher, that is, feeds an EV_ASYNC event on the watcher into the event loop.
+    }
+
+    pthread_mutex_lock(&lock);     //Don't forget locking
+    ++timeout_count;
+    pthread_mutex_unlock(&lock);   //Don't forget unlocking
+    w->repeat = timeout;
+    ev_timer_again(loop, &timeout_watcher); //Start the timer again.
+}
+
+int main (int argc, char** argv)
+{
+    if (argc < 2) {
+        puts("Timeout value missing.\n./demo <timeout>");
+        return -1;
+    }
+    timeout = atof(argv[1]);
+
+    struct ev_loop *loop = EV_DEFAULT;  //or ev_default_loop (0);
+
+    //Initialize pthread
+    pthread_mutex_init(&lock, NULL);
+    pthread_t thread;
+
+    // This loop sits in the pthread
+    loop2 = ev_loop_new(0);
+
+    //This block is specifically used pre-empting thread (i.e. temporary interruption and suspension of a task, without asking for its cooperation, with the intention to resume that task later.)
+    //This takes into account thread safety
+    ev_async_init(&async_watcher, async_cb);
+    ev_async_start(loop2, &async_watcher);
+    pthread_create(&thread, NULL, loop2thread, NULL);
+
+    ev_timer_init (&timeout_watcher, timeout_cb, timeout, 0.); // Non repeating timer. The timer starts repeating in the timeout callback function
+    ev_timer_start (loop, &timeout_watcher);
+
+    // now wait for events to arrive
+    ev_loop(loop, 0);
+    //Wait on threads for execution
+    pthread_join(thread, NULL);
+
+    pthread_mutex_destroy(&lock);
+    return 0;
+}
+```
+
+with the comment *"Note for libev 4+ ev_loop should be ev_run."* is still slightly useful but it shouldn't be taken as a model.
+
+
+### Link 2
+
+The [second link][link_so_2] is what shows that one ev_loop is enough. This is the code provided by the original poster:
+
+```cpp
+    void RedisSubscriber::Start() {
+        m_redis = redisAsyncConnect(m_addr.c_str(),m_port);
+        m_redis->data = (void*)this;
+
+        m_loop = ev_loop_new(EVFLAG_NOINOTIFY);
+        redisLibevAttach(m_loop, m_redis);
+        redisAsyncSetConnectCallback(m_redis,connectCallback);
+        redisAsyncSetDisconnectCallback(m_redis,disconnectCallback);
+        redisAsyncCommand(m_redis, subscribeCallback, NULL, "SUBSCRIBE %s", m_channel.c_str());
+
+        m_thread = boost::thread(ev_loop,m_loop,0);
+    }
+
+    void RedisSubscriber::Stop() {
+        redisAsyncFree(m_redis);
+        m_thread.join();
+        m_redis = 0;
+    }
+
+    void RedisSubscriber::connectCallback(const redisAsyncContext *c) {
+
+    }
+
+    void RedisSubscriber::disconnectCallback(const redisAsyncContext *c, int status) {
+        RedisSubscriber* r = (RedisSubscriber*)(c->data);
+        ev_unloop(r->m_loop,EVUNLOOP_ALL);
+    }
+
+    void RedisSubscriber::subscribeCallback(redisAsyncContext *c, void *r, void *privdata) {
+
+    }
+```
+
+There are no accepted answers, but the answer from *themoondothshine* provides very useful info. Here is what it says:
+
+Assuming that you mean ev_run for your boost::thread, here's what you can do:
+
+1. Setup an `ev_async`
+2. In the callback of `ev_async` call `ev_break`.
+3. Call `ev_async_send` from `RedisSubscriber::Stop()`. `ev_async` watchers are thread-safe -- it uses memory barriers for synchronising between threads.
+
+This will cause the event loop to stop, and `m_thread.join()` will return.
+
+
+### Link 3
+
+The [THREAD LOCKING EXAMPLE][link_ev_doc] shows how to lock in order to protect the ev_loop object in use.
+
+[link_so_1]: http://stackoverflow.com/questions/14621261/using-libev-with-multiple-threads#14779930
+[link_so_2]: http://stackoverflow.com/questions/8611126/hiredis-libev-and-boostthreads
+[link_ev_doc]: http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#THREAD_LOCKING_EXAMPLE
diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 2ee8331..f5105db 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -2,6 +2,7 @@ project(${bare_name}-backend-redis CXX)
 
 find_package(hiredis 0.11.0 REQUIRED)
 find_package(CryptoPP 5.6)
+find_package(libev 4.0 REQUIRED)
 
 add_library(${PROJECT_NAME} SHARED
 	backend_redis.cpp
@@ -9,12 +10,15 @@ add_library(${PROJECT_NAME} SHARED
 	scan_iterator.cpp
 	reply.cpp
 	batch.cpp
+	script.cpp
+	script_manager.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
 	PUBLIC ${Boost_INCLUDE_DIRS}
 	PRIVATE ${HIREDIS_INCLUDE_DIRS}
 	PRIVATE ${CMAKE_SOURCE_DIR}/lib/better-enums
+	PRIVATE ${LIBEV_INCLUDE_DIRS}
 )
 target_include_directories(${PROJECT_NAME}
 	PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
@@ -24,6 +28,11 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-inc
 	PRIVATE ${bare_name}-pq
 	PRIVATE ${HIREDIS_LIBRARIES}
+	PRIVATE ${LIBEV_LIBRARIES}
+)
+
+target_compile_definitions(${PROJECT_NAME}
+	PRIVATE EV_COMPAT3=0
 )
 
 if (CryptoPP_FOUND)
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 2efa315..427aec2 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -35,11 +35,10 @@ namespace dindb {
 			uint16_t database;
 		};
 
-		std::pair<std::string, mchlib::FileRecordData> pair_list_to_file_record (const redis::Command::hscan_range& parRange, const mchlib::TigerHash& parHash) {
+		std::pair<std::string, mchlib::FileRecordData> pair_list_to_file_record (const redis::Command::hscan_range& parRange) {
 			using dinhelp::lexical_cast;
 
 			mchlib::FileRecordData retval;
-			retval.hash = parHash;
 			std::array<std::string, 2> mime;
 			std::string group_key;
 
@@ -47,7 +46,7 @@ namespace dindb {
 				if (itm.first == "path")
 					retval.abs_path = itm.second;
 				else if (itm.first == "hash")
-					assert(tiger_to_string(parHash) == itm.second);
+					retval.hash = mchlib::string_to_tiger(itm.second);
 				else if (itm.first == "size")
 					retval.size = lexical_cast<decltype(retval.size)>(
 							itm.second);
@@ -124,6 +123,19 @@ namespace YAML {
 	};
 } //namespace YAML
 
+//namespace redis {
+//	template <>
+//	struct RedisStructAdapt<mchlib::FileRecordData> {
+//		static bool decode (const Command::hscan_range& parFrom, mchlib::FileRecordData& parOut) {
+//			return true;
+//		}
+//
+//		static void encode (const Command::hscan_range& parFrom, mchlib::FileRecordData& parOut) {
+//			return true;
+//		}
+//	};
+//}
+
 namespace dindb {
 	BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort, uint16_t parDatabase, bool parConnect) :
 		m_redis(std::move(parAddress), parPort),
@@ -140,9 +152,18 @@ namespace dindb {
 		using dinhelp::lexical_cast;
 
 		m_redis.connect();
-		if (m_redis.is_connected() and m_database > 0) {
-			m_redis.run("SELECT", lexical_cast<std::string>(m_database));
-			m_redis.run("CLIENT", "SETNAME", PROGRAM_NAME "_v" STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_PATCH));
+		m_redis.wait_for_connect();
+		if (m_redis.is_connected()) {
+			auto batch = m_redis.make_batch();
+			batch.run("SELECT", lexical_cast<std::string>(m_database));
+			batch.run("CLIENT", "SETNAME", PROGRAM_NAME "_v" STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_PATCH));
+			batch.throw_if_failed();
+			m_redis.submit_lua_script("return 42;");
+		}
+		else {
+			std::ostringstream oss;
+			oss << "Error connecting to Redis: " << m_redis.connection_error();
+			throw std::runtime_error(oss.str());
 		}
 	}
 
@@ -186,6 +207,7 @@ namespace dindb {
 			"type", parSetData.type,
 			"content_type", parSetData.content_type
 		);
+		//m_redis.hmset(parSetData);
 
 		for (const auto& file_data : parData) {
 			redis::Reply file_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "files", "1");
@@ -223,7 +245,7 @@ namespace dindb {
 		}
 		else {
 			const auto result_id = redis::get_string(hash_reply);
-			auto set_key_and_file_item = pair_list_to_file_record(m_redis.hscan(result_id), parHash);
+			auto set_key_and_file_item = pair_list_to_file_record(m_redis.hscan(result_id));
 			parItem = std::move(set_key_and_file_item.second);
 			const std::string group_key = std::move(set_key_and_file_item.first);
 
diff --git a/src/backends/redis/batch.cpp b/src/backends/redis/batch.cpp
index e424fb4..e30bc83 100644
--- a/src/backends/redis/batch.cpp
+++ b/src/backends/redis/batch.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "batch.hpp"
+#include "command.hpp"
 #include <hiredis/hiredis.h>
 #include <hiredis/async.h>
 #include <cassert>
@@ -26,6 +27,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <iostream>
+#include <sstream>
 
 namespace redis {
 	namespace {
@@ -60,12 +62,14 @@ namespace redis {
 				);
 			case REDIS_REPLY_ERROR:
 				return ErrorString(parReply->str, parReply->len);
+			case REDIS_REPLY_STATUS:
+				return StatusString(parReply->str, parReply->len);
 			default:
+				assert(false); //not reached
 				return Reply();
 			};
 		}
 
-		extern "C"
 		void hiredis_run_callback (redisAsyncContext*, void* parReply, void* parPrivData) {
 			assert(parPrivData);
 			auto* data = static_cast<HiredisCallbackData*>(parPrivData);
@@ -78,6 +82,9 @@ namespace redis {
 				auto reply = make_redis_reply_type(static_cast<redisReply*>(parReply));
 				data->promise.set_value(std::move(reply));
 			}
+			else {
+				assert(false); //Should this case also be managed?
+			}
 
 			delete data;
 		}
@@ -98,12 +105,14 @@ namespace redis {
 
 	Batch::Batch (Batch&&) = default;
 
-	Batch::Batch (redisAsyncContext* parContext) :
+	Batch::Batch (redisAsyncContext* parContext, Command* parCommand) :
 		m_futures(),
 		m_replies(),
 		m_local_data(new LocalData),
+		m_command(parCommand),
 		m_context(parContext)
 	{
+		assert(m_command);
 		assert(m_context);
 	}
 
@@ -125,11 +134,16 @@ namespace redis {
 			std::unique_lock<std::mutex> u_lock(m_local_data->futures_mutex);
 			m_local_data->free_cmd_slot.wait(u_lock, [this]() { return m_local_data->pending_futures < g_max_redis_unanswered_commands; });
 		}
-		std::cout << "command sent to hiredis" << std::endl;
+		std::cout << " emplace_back(future)... ";
 
-		m_futures.push_back(data->promise.get_future());
+		m_futures.emplace_back(data->promise.get_future());
+		m_command->lock();
 		const int command_added = redisAsyncCommandArgv(m_context, &hiredis_run_callback, data, parArgc, parArgv, parLengths);
+		m_command->unlock();
 		assert(REDIS_OK == command_added); // REDIS_ERR if error
+
+		std::cout << "command sent to hiredis" << std::endl;
+		m_command->wakeup_thread();
 	}
 
 	bool Batch::replies_requested() const {
@@ -140,7 +154,7 @@ namespace redis {
 		if (not replies_requested()) {
 			m_replies.reserve(m_futures.size());
 			for (auto& fut : m_futures) {
-				m_replies.push_back(fut.get());
+				m_replies.emplace_back(fut.get());
 			}
 
 			auto empty_vec = std::move(m_futures);
@@ -149,8 +163,22 @@ namespace redis {
 	}
 
 	void Batch::throw_if_failed() {
-		const auto& rep = replies();
-		assert(false); //not implemented
+		std::ostringstream oss;
+		int err_count = 0;
+		const int max_reported_errors = 3;
+
+		oss << "Error in reply: ";
+		for (const auto& rep : replies()) {
+			if (rep.which() == RedisVariantType_Error) {
+				++err_count;
+				if (err_count <= max_reported_errors)
+					oss << '"' << get_error_string(rep).message() << "\" ";
+			}
+		}
+		if (err_count) {
+			oss << " (showing " << err_count << '/' << max_reported_errors << " errors on " << replies().size() << " total replies)";
+			throw std::runtime_error(oss.str());
+		}
 	}
 
 	RedisError::RedisError (const char* parMessage, std::size_t parLength) :
diff --git a/src/backends/redis/batch.hpp b/src/backends/redis/batch.hpp
index 491129c..bf28737 100644
--- a/src/backends/redis/batch.hpp
+++ b/src/backends/redis/batch.hpp
@@ -53,12 +53,13 @@ namespace redis {
 	private:
 		struct LocalData;
 
-		explicit Batch ( redisAsyncContext* parContext );
+		Batch ( redisAsyncContext* parContext, Command* parCommand );
 		void run_pvt ( int parArgc, const char** parArgv, std::size_t* parLengths );
 
 		std::vector<std::future<Reply>> m_futures;
 		std::vector<Reply> m_replies;
 		std::unique_ptr<LocalData> m_local_data;
+		Command* m_command;
 		redisAsyncContext* m_context;
 	};
 
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index b3951ea..5430829 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -16,57 +16,115 @@
  */
 
 #include "command.hpp"
-#include "helpers/lexical_cast.hpp"
+#include "script_manager.hpp"
 #include <hiredis/hiredis.h>
 #include <hiredis/async.h>
+#include <hiredis/adapters/libev.h>
+#include <ev.h>
 #include <ciso646>
 #include <cassert>
 #include <sstream>
 #include <algorithm>
 #include <stdexcept>
-#if defined(WITH_CRYPTOPP)
-#	include <crypto++/sha.h>
-#endif
+#include <signal.h>
+#include <thread>
+#include <condition_variable>
+#include <atomic>
+#include <mutex>
+
+//See docs directory for info about hiredis/libev with multithreading
 
 namespace redis {
 	namespace {
-#if defined(WITH_CRYPTOPP)
-		struct LuaScriptHash {
-			union {
-				struct {
-					uint64_t part_a, part_b;
-					uint32_t part_c;
-				};
-				uint8_t raw_bytes[20];
-			};
-		};
-#endif
+		void async_callback (ev_loop* /*parLoop*/, ev_async* /*parObject*/, int /*parRevents*/) {
+		}
+
+		void async_halt_loop (ev_loop* parLoop, ev_async* /*parObject*/, int /*parRevents*/) {
+			ev_break(parLoop, EVBREAK_ALL);
+		}
+
+		void lock_mutex_libev (ev_loop* parLoop) {
+			std::mutex* mtx = static_cast<std::mutex*>(ev_userdata(parLoop));
+			assert(mtx);
+			mtx->lock();
+		}
+
+		void unlock_mutex_libev (ev_loop* parLoop) {
+			std::mutex* mtx = static_cast<std::mutex*>(ev_userdata(parLoop));
+			assert(mtx);
+			mtx->unlock();
+		}
 	} //unnamed namespace
 
+	struct Command::LocalData {
+		explicit LocalData (Command* parCommand) :
+			lua_scripts(parCommand),
+			redis_poll_thread(),
+			connect_processed(false),
+			disconnect_processed(true)
+		{
+		}
+
+		ScriptManager lua_scripts;
+		ev_async watcher_wakeup;
+		ev_async watcher_halt;
+		std::thread redis_poll_thread;
+		std::mutex hiredis_mutex;
+		std::mutex libev_mutex;
+		std::condition_variable condition_connected;
+		std::condition_variable condition_disconnected;
+		std::string connect_err_msg;
+		std::atomic_bool connect_processed;
+		std::atomic_bool disconnect_processed;
+	};
+
 	void on_connect (const redisAsyncContext* parContext, int parStatus) {
 		assert(parContext and parContext->data);
 		Command& self = *static_cast<Command*>(parContext->data);
+		assert(parContext == self.m_conn.get());
+		assert(not self.m_local_data->connect_processed);
 
 		self.m_connection_lost = false;
 		self.m_connected = (parStatus == REDIS_OK);
+		self.m_local_data->connect_processed = true;
+		self.m_local_data->connect_err_msg = parContext->errstr;
+		self.m_local_data->condition_connected.notify_one();
 	}
 
 	void on_disconnect (const redisAsyncContext* parContext, int parStatus) {
 		assert(parContext and parContext->data);
 		Command& self = *static_cast<Command*>(parContext->data);
 		assert(self.m_connected);
+		assert(not self.m_local_data->disconnect_processed);
 
 		self.m_connection_lost = (REDIS_ERR == parStatus);
 		self.m_connected = false;
+		self.m_local_data->disconnect_processed = true;
+		self.m_local_data->connect_err_msg.clear();
+		self.m_local_data->condition_disconnected.notify_one();
 	};
 
 	Command::Command (std::string&& parAddress, uint16_t parPort) :
 		m_conn(nullptr, &redisAsyncDisconnect),
+		m_libev_loop_thread(ev_loop_new(EVFLAG_NOINOTIFY), &ev_loop_destroy),
 		m_address(std::move(parAddress)),
+		m_local_data(new LocalData(this)),
 		m_port(parPort),
 		m_connected(false),
 		m_connection_lost(false)
 	{
+		//Init libev stuff
+		{
+			signal(SIGPIPE, SIG_IGN);
+
+			//See: http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#THREAD_LOCKING_EXAMPLE
+			ev_async_init(&m_local_data->watcher_wakeup, &async_callback);
+			ev_async_start(m_libev_loop_thread.get(), &m_local_data->watcher_wakeup);
+			ev_async_init(&m_local_data->watcher_halt, &async_halt_loop);
+			ev_async_start(m_libev_loop_thread.get(), &m_local_data->watcher_halt);
+			ev_set_userdata(m_libev_loop_thread.get(), &m_local_data->libev_mutex);
+			ev_set_loop_release_cb(m_libev_loop_thread.get(), &unlock_mutex_libev, &lock_mutex_libev);
+		}
 	}
 
 	Command::Command (std::string&& parSocket) :
@@ -75,10 +133,13 @@ namespace redis {
 	}
 
 	Command::~Command() noexcept {
+		this->disconnect();
+		this->wait_for_disconnect();
 	}
 
 	void Command::connect() {
 		if (not m_conn) {
+			m_local_data->disconnect_processed = false;
 			RedisConnection conn(
 				(is_socket_connection() ?
 					redisAsyncConnectUnix(m_address.c_str())
@@ -95,22 +156,48 @@ namespace redis {
 			else {
 				conn->data = this;
 			}
-			if (conn->err) {
-				std::ostringstream oss;
-				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port <<
-					": " << conn->errstr;
-				throw std::runtime_error(oss.str());
-			}
+			if (REDIS_OK != redisLibevAttach(m_libev_loop_thread.get(), conn.get()))
+				throw std::runtime_error("Unable to set event loop");
 			if (REDIS_OK != redisAsyncSetConnectCallback(conn.get(), &on_connect))
 				throw std::runtime_error("Unable to set \"on_connect()\" callback");
 			if (REDIS_OK != redisAsyncSetDisconnectCallback(conn.get(), &on_disconnect))
 				throw std::runtime_error("Unable to set \"on_disconnect()\" callback");
 			std::swap(conn, m_conn);
+			m_local_data->redis_poll_thread = std::thread([this]() {
+				m_local_data->libev_mutex.lock();
+				ev_run(m_libev_loop_thread.get(), 0);
+				m_local_data->libev_mutex.unlock();
+			});
+			wakeup_thread();
+		}
+	}
+
+	void Command::wait_for_connect() {
+		if (not m_local_data->connect_processed) {
+			std::unique_lock<std::mutex> lk(m_local_data->hiredis_mutex);
+			m_local_data->condition_connected.wait(lk, [this]() { return m_local_data->connect_processed.load(); });
+			assert(true == m_local_data->connect_processed);
 		}
 	}
 
 	void Command::disconnect() {
-		m_conn.reset();
+		assert(m_local_data->redis_poll_thread.joinable());
+		m_local_data->connect_processed = false;
+		{
+			std::lock_guard<std::mutex> lock(m_local_data->libev_mutex);
+			assert(not ev_async_pending(&m_local_data->watcher_halt));
+			ev_async_send(m_libev_loop_thread.get(), &m_local_data->watcher_halt);
+			m_conn.reset();
+		}
+		m_local_data->redis_poll_thread.join();
+	}
+
+	void Command::wait_for_disconnect() {
+		if (not m_local_data->disconnect_processed) {
+			std::unique_lock<std::mutex> lk(m_local_data->hiredis_mutex);
+			m_local_data->condition_disconnected.wait(lk, [this]() { return m_local_data->disconnect_processed.load(); });
+			assert(true == m_local_data->disconnect_processed);
+		}
 	}
 
 	bool Command::is_connected() const {
@@ -119,6 +206,10 @@ namespace redis {
 		return connected;
 	}
 
+	boost::string_ref Command::connection_error() const {
+		return m_local_data->connect_err_msg;
+	}
+
 	auto Command::scan() -> scan_range {
 		return scan_range(scan_iterator(this, false), scan_iterator(this, true));
 	}
@@ -137,63 +228,28 @@ namespace redis {
 
 	Batch Command::make_batch() {
 		assert(is_connected());
-		return Batch(m_conn.get());
+		return Batch(m_conn.get(), this);
 	}
 
-#if defined(WITH_CRYPTOPP)
-	boost::string_ref Command::add_lua_script_ifn (const std::string& parScript) {
-		if (parScript.empty())
-			return boost::string_ref();
-
-		using dinhelp::lexical_cast;
-
-		static_assert(20 == CryptoPP::SHA1::DIGESTSIZE, "Unexpected SHA1 digest size");
-		static_assert(sizeof(LuaScriptHash) >= CryptoPP::SHA1::DIGESTSIZE, "Wrong SHA1 struct size");
-		static_assert(Sha1Array().size() == CryptoPP::SHA1::DIGESTSIZE, "Wrong array size");
-
-		LuaScriptHash digest;
-		CryptoPP::SHA1().CalculateDigest(digest.raw_bytes, reinterpret_cast<const uint8_t*>(parScript.data()), parScript.size());
-		//TODO: change when lexical_cast will support arrays
-		const std::string sha1_str = lexical_cast<std::string>(digest.part_a) + lexical_cast<std::string>(digest.part_b) + lexical_cast<std::string>(digest.part_c);
-		Sha1Array sha1_array;
-		std::copy(sha1_str.begin(), sha1_str.end(), sha1_array.begin());
-
-		auto it_found = m_known_hashes.find(sha1_array);
-		const bool was_present = (m_known_hashes.end() != it_found);
-		if (was_present) {
-			return boost::string_ref(it_found->data(), it_found->size());
-		}
-
-		auto reply = this->run("SCRIPT", "LOAD", parScript);
-		assert(not was_present);
-
-		assert(get_string(reply) == sha1_str);
-		const auto it_inserted = m_known_hashes.insert(it_found, sha1_array);
-		(void)reply;
-
-		return boost::string_ref(it_inserted->data(), it_inserted->size());
-	}
-#else
-	boost::string_ref Command::add_lua_script_ifn (const std::string& parScript) {
-		auto it_found = m_known_hashes.find(parScript);
-		const bool was_present = (m_known_hashes.end() != it_found);
-		if (was_present) {
-			return boost::string_ref(it_found->second.data(), it_found->second.size());
-		}
-
-		auto reply = this->run("SCRIPT", "LOAD", parScript);
-		assert(not was_present);
-
-		const auto sha1_str = get_string(reply);
-		Sha1Array sha1_array;
-		std::copy(sha1_str.begin(), sha1_str.end(), sha1_array.begin());
-		auto it_inserted = m_known_hashes.insert(it_found, std::make_pair(parScript, sha1_array));
-
-		return boost::string_ref(it_inserted->second.data(), it_inserted->second.size());
-	}
-#endif
-
 	bool Command::is_socket_connection() const {
 		return not (m_port or m_address.empty());
 	}
+
+	void Command::submit_lua_script (const std::string& parScript) {
+		m_local_data->lua_scripts.submit_lua_script(parScript);
+	}
+
+	void Command::wakeup_thread() {
+		std::lock_guard<std::mutex> lock(m_local_data->libev_mutex);
+		if (ev_async_pending(&m_local_data->watcher_wakeup) == false)
+			ev_async_send(m_libev_loop_thread.get(), &m_local_data->watcher_wakeup);
+	}
+
+	void Command::lock() {
+		m_local_data->libev_mutex.lock();
+	}
+
+	void Command::unlock() {
+		m_local_data->libev_mutex.unlock();
+	}
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 6b1fd66..eb8a81e 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -33,14 +33,9 @@
 #include <boost/range/iterator_range_core.hpp>
 #include <boost/utility/string_ref.hpp>
 #include <stdexcept>
-#if defined(WITH_CRYPTOPP)
-#	include <set>
-#else
-#	include <map>
-#endif
-#include <boost/utility/string_ref.hpp>
 
 struct redisAsyncContext;
+struct ev_loop;
 
 namespace redis {
 	class Command {
@@ -61,9 +56,12 @@ namespace redis {
 		~Command ( void ) noexcept;
 
 		void connect ( void );
+		void wait_for_connect ( void );
 		void disconnect ( void );
+		void wait_for_disconnect ( void );
 
 		bool is_connected ( void ) const;
+		boost::string_ref connection_error ( void ) const;
 
 		Batch make_batch ( void );
 
@@ -77,24 +75,26 @@ namespace redis {
 		zscan_range zscan ( boost::string_ref parKey );
 
 		void submit_lua_script ( const std::string& parScript );
+		void wakeup_thread();
+		void lock();
+		void unlock();
 
 	private:
 		using RedisConnection = std::unique_ptr<redisAsyncContext, void(*)(redisAsyncContext*)>;
-		using Sha1Array = std::array<char, 20>;
+		using LibevLoop = std::unique_ptr<ev_loop, void(*)(ev_loop*)>;
 
-		boost::string_ref add_lua_script_ifn ( const std::string& parScript );
 		bool is_socket_connection ( void ) const;
+		void on_connect_successful ( void );
+
+		struct LocalData;
 
 		RedisConnection m_conn;
-#if defined(WITH_CRYPTOPP)
-		std::set<Sha1Array> m_known_hashes;
-#else
-		std::map<std::string, Sha1Array> m_known_scripts;
-#endif
+		LibevLoop m_libev_loop_thread;
 		std::string m_address;
+		std::unique_ptr<LocalData> m_local_data;
 		uint16_t m_port;
-		bool m_connected;
-		bool m_connection_lost;
+		volatile bool m_connected;
+		volatile bool m_connection_lost;
 	};
 
 	template <typename... Args>
diff --git a/src/backends/redis/script.cpp b/src/backends/redis/script.cpp
new file mode 100644
index 0000000..2e1502c
--- /dev/null
+++ b/src/backends/redis/script.cpp
@@ -0,0 +1,21 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "script.hpp"
+
+namespace redis {
+} //namespace redis
diff --git a/src/backends/redis/script.hpp b/src/backends/redis/script.hpp
new file mode 100644
index 0000000..f547df3
--- /dev/null
+++ b/src/backends/redis/script.hpp
@@ -0,0 +1,28 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id5B30CDA57F894CD6888093B64F9433DA
+#define id5B30CDA57F894CD6888093B64F9433DA
+
+#include "script_manager.hpp"
+
+namespace redis {
+	class Script {
+	};
+} //namespace redis
+
+#endif
diff --git a/src/backends/redis/script_manager.cpp b/src/backends/redis/script_manager.cpp
new file mode 100644
index 0000000..0f7c98e
--- /dev/null
+++ b/src/backends/redis/script_manager.cpp
@@ -0,0 +1,115 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "script_manager.hpp"
+#include "helpers/lexical_cast.hpp"
+#include "command.hpp"
+#include <cassert>
+#if defined(WITH_CRYPTOPP)
+#	include <crypto++/sha.h>
+#endif
+
+namespace redis {
+	namespace {
+#if defined(WITH_CRYPTOPP)
+		struct LuaScriptHash {
+			union {
+				struct {
+					uint64_t part_a, part_b;
+					uint32_t part_c;
+				};
+				uint8_t raw_bytes[20];
+			};
+		};
+#endif
+	} //unnamed namespace
+
+	ScriptManager::ScriptManager (Command* parCommand) :
+		m_command(parCommand)
+	{
+		assert(m_command);
+	}
+
+#if defined(WITH_CRYPTOPP)
+	boost::string_ref ScriptManager::add_lua_script_ifn (const std::string& parScript) {
+		assert(m_command->is_connected());
+
+		if (parScript.empty())
+			return boost::string_ref();
+
+		using dinhelp::lexical_cast;
+
+		static_assert(20 == CryptoPP::SHA1::DIGESTSIZE, "Unexpected SHA1 digest size");
+		static_assert(sizeof(LuaScriptHash) >= CryptoPP::SHA1::DIGESTSIZE, "Wrong SHA1 struct size");
+		static_assert(Sha1Array().size() == CryptoPP::SHA1::DIGESTSIZE * 2, "Wrong array size");
+
+		LuaScriptHash digest;
+		CryptoPP::SHA1().CalculateDigest(digest.raw_bytes, reinterpret_cast<const uint8_t*>(parScript.data()), parScript.size());
+		//TODO: change when lexical_cast will support arrays
+		auto sha1_str_parta = lexical_cast<std::string, dinhelp::tags::hexl>(__builtin_bswap64(digest.part_a));
+		auto sha1_str_partb = lexical_cast<std::string, dinhelp::tags::hexl>(__builtin_bswap64(digest.part_b));
+		auto sha1_str_partc = lexical_cast<std::string, dinhelp::tags::hexl>(__builtin_bswap32(digest.part_c));
+		const std::string sha1_str =
+			std::string(sizeof(digest.part_a) * 2 - sha1_str_parta.size(), '0') + sha1_str_parta +
+			std::string(sizeof(digest.part_b) * 2 - sha1_str_partb.size(), '0') + sha1_str_partb +
+			std::string(sizeof(digest.part_c) * 2 - sha1_str_partc.size(), '0') + sha1_str_partc
+		;
+		Sha1Array sha1_array;
+		assert(sha1_str.size() == sha1_array.size());
+		std::copy(sha1_str.begin(), sha1_str.end(), sha1_array.begin());
+
+		auto it_found = m_known_hashes.find(sha1_array);
+		const bool was_present = (m_known_hashes.end() != it_found);
+		if (was_present) {
+			return boost::string_ref(it_found->data(), it_found->size());
+		}
+
+		auto reply = m_command->run("SCRIPT", "LOAD", parScript);
+		assert(not was_present);
+
+		assert(get_string(reply) == sha1_str);
+		const auto it_inserted = m_known_hashes.insert(it_found, sha1_array);
+		(void)reply;
+
+		return boost::string_ref(it_inserted->data(), it_inserted->size());
+	}
+#else
+	boost::string_ref ScriptManager::add_lua_script_ifn (const std::string& parScript) {
+		assert(m_command->is_connected());
+
+		auto it_found = m_known_hashes.find(parScript);
+		const bool was_present = (m_known_hashes.end() != it_found);
+		if (was_present) {
+			return boost::string_ref(it_found->second.data(), it_found->second.size());
+		}
+
+		auto reply = m_command->run("SCRIPT", "LOAD", parScript);
+		assert(not was_present);
+
+		const auto sha1_str = get_string(reply);
+		Sha1Array sha1_array;
+		std::copy(sha1_str.begin(), sha1_str.end(), sha1_array.begin());
+		auto it_inserted = m_known_hashes.insert(it_found, std::make_pair(parScript, sha1_array));
+
+		return boost::string_ref(it_inserted->second.data(), it_inserted->second.size());
+	}
+#endif
+
+	void ScriptManager::submit_lua_script (const std::string& parScript) {
+		add_lua_script_ifn(parScript);
+	}
+} //namespace redis
diff --git a/src/backends/redis/script_manager.hpp b/src/backends/redis/script_manager.hpp
new file mode 100644
index 0000000..08b744a
--- /dev/null
+++ b/src/backends/redis/script_manager.hpp
@@ -0,0 +1,54 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id8E124FF76DF449CDB8FBA806F8EF4E78
+#define id8E124FF76DF449CDB8FBA806F8EF4E78
+
+#include "redisConfig.h"
+#include <boost/utility/string_ref.hpp>
+#if defined(WITH_CRYPTOPP)
+#	include <set>
+#else
+#	include <map>
+#endif
+#include <string>
+#include <array>
+
+namespace redis {
+	class Command;
+
+	class ScriptManager {
+	public:
+		explicit ScriptManager ( Command* parCommand );
+
+		void submit_lua_script ( const std::string& parScript );
+
+	private:
+		using Sha1Array = std::array<char, 40>;
+
+		boost::string_ref add_lua_script_ifn ( const std::string& parScript );
+
+		Command* m_command;
+#if defined(WITH_CRYPTOPP)
+		std::set<Sha1Array> m_known_hashes;
+#else
+		std::map<std::string, Sha1Array> m_known_scripts;
+#endif
+	};
+} //namespace redis
+
+#endif

From 0efd71a2fab485ec9886351a4f0769ab661ae150 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 30 Jun 2016 09:35:34 +0100
Subject: [PATCH 083/170] Refactor connection code.

Move all redis connection and libev code out from command.
Command just wraps some useful methods in AsyncConnection now.
---
 src/backends/redis/CMakeLists.txt       |   1 +
 src/backends/redis/async_connection.cpp | 212 ++++++++++++++++++++++++
 src/backends/redis/async_connection.hpp |  74 +++++++++
 src/backends/redis/batch.cpp            |  23 +--
 src/backends/redis/batch.hpp            |   8 +-
 src/backends/redis/command.cpp          | 179 ++------------------
 src/backends/redis/command.hpp          |  21 ---
 7 files changed, 316 insertions(+), 202 deletions(-)
 create mode 100644 src/backends/redis/async_connection.cpp
 create mode 100644 src/backends/redis/async_connection.hpp

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index f5105db..d04a0b3 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -12,6 +12,7 @@ add_library(${PROJECT_NAME} SHARED
 	batch.cpp
 	script.cpp
 	script_manager.cpp
+	async_connection.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
diff --git a/src/backends/redis/async_connection.cpp b/src/backends/redis/async_connection.cpp
new file mode 100644
index 0000000..cf48a01
--- /dev/null
+++ b/src/backends/redis/async_connection.cpp
@@ -0,0 +1,212 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "async_connection.hpp"
+#include <hiredis/async.h>
+#include <hiredis/adapters/libev.h>
+#include <ev.h>
+#include <thread>
+#include <condition_variable>
+#include <atomic>
+#include <mutex>
+#include <signal.h>
+#include <cassert>
+#include <sstream>
+
+namespace redis {
+	namespace {
+		void async_callback (ev_loop* /*parLoop*/, ev_async* /*parObject*/, int /*parRevents*/) {
+		}
+
+		void async_halt_loop (ev_loop* parLoop, ev_async* /*parObject*/, int /*parRevents*/) {
+			ev_break(parLoop, EVBREAK_ALL);
+		}
+
+		void lock_mutex_libev (ev_loop* parLoop) {
+			std::mutex* mtx = static_cast<std::mutex*>(ev_userdata(parLoop));
+			assert(mtx);
+			mtx->lock();
+		}
+
+		void unlock_mutex_libev (ev_loop* parLoop) {
+			std::mutex* mtx = static_cast<std::mutex*>(ev_userdata(parLoop));
+			assert(mtx);
+			mtx->unlock();
+		}
+	} //unnamed namespace
+
+	struct AsyncConnection::LocalData {
+		LocalData() :
+			redis_poll_thread(),
+			connect_processed(false),
+			disconnect_processed(true)
+		{
+		}
+
+		ev_async watcher_wakeup;
+		ev_async watcher_halt;
+		std::thread redis_poll_thread;
+		std::mutex hiredis_mutex;
+		std::mutex libev_mutex;
+		std::condition_variable condition_connected;
+		std::condition_variable condition_disconnected;
+		std::string connect_err_msg;
+		std::atomic_bool connect_processed;
+		std::atomic_bool disconnect_processed;
+	};
+
+	void on_connect (const redisAsyncContext* parContext, int parStatus) {
+		assert(parContext and parContext->data);
+		AsyncConnection& self = *static_cast<AsyncConnection*>(parContext->data);
+		assert(parContext == self.m_conn.get());
+		assert(not self.m_local_data->connect_processed);
+
+		self.m_connection_lost = false;
+		self.m_connected = (parStatus == REDIS_OK);
+		self.m_local_data->connect_processed = true;
+		self.m_local_data->connect_err_msg = parContext->errstr;
+		self.m_local_data->condition_connected.notify_one();
+	}
+
+	void on_disconnect (const redisAsyncContext* parContext, int parStatus) {
+		assert(parContext and parContext->data);
+		AsyncConnection& self = *static_cast<AsyncConnection*>(parContext->data);
+		assert(self.m_connected);
+		assert(not self.m_local_data->disconnect_processed);
+
+		self.m_connection_lost = (REDIS_ERR == parStatus);
+		self.m_connected = false;
+		self.m_local_data->disconnect_processed = true;
+		self.m_local_data->connect_err_msg.clear();
+		self.m_local_data->condition_disconnected.notify_one();
+	};
+
+	AsyncConnection::AsyncConnection(std::string&& parAddress, uint16_t parPort) :
+		m_conn(nullptr, &redisAsyncDisconnect),
+		m_local_data(new LocalData()),
+		m_libev_loop_thread(ev_loop_new(EVFLAG_NOINOTIFY), &ev_loop_destroy),
+		m_address(std::move(parAddress)),
+		m_port(parPort),
+		m_connected(false),
+		m_connection_lost(false)
+	{
+		//Init libev stuff
+		{
+			signal(SIGPIPE, SIG_IGN);
+
+			//See: http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#THREAD_LOCKING_EXAMPLE
+			ev_async_init(&m_local_data->watcher_wakeup, &async_callback);
+			ev_async_start(m_libev_loop_thread.get(), &m_local_data->watcher_wakeup);
+			ev_async_init(&m_local_data->watcher_halt, &async_halt_loop);
+			ev_async_start(m_libev_loop_thread.get(), &m_local_data->watcher_halt);
+			ev_set_userdata(m_libev_loop_thread.get(), &m_local_data->libev_mutex);
+			ev_set_loop_release_cb(m_libev_loop_thread.get(), &unlock_mutex_libev, &lock_mutex_libev);
+		}
+	}
+
+	AsyncConnection::~AsyncConnection() noexcept {
+		this->disconnect();
+		this->wait_for_disconnect();
+	}
+
+	void AsyncConnection::connect() {
+		if (not m_conn) {
+			m_local_data->disconnect_processed = false;
+			RedisConnection conn(
+				(is_socket_connection() ?
+					redisAsyncConnectUnix(m_address.c_str())
+				:
+					redisAsyncConnect(m_address.c_str(), m_port)
+				),
+				&redisAsyncDisconnect
+			);
+			if (not conn) {
+				std::ostringstream oss;
+				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port;
+				throw std::runtime_error(oss.str());
+			}
+			else {
+				conn->data = this;
+			}
+			if (REDIS_OK != redisLibevAttach(m_libev_loop_thread.get(), conn.get()))
+				throw std::runtime_error("Unable to set event loop");
+			if (REDIS_OK != redisAsyncSetConnectCallback(conn.get(), &on_connect))
+				throw std::runtime_error("Unable to set \"on_connect()\" callback");
+			if (REDIS_OK != redisAsyncSetDisconnectCallback(conn.get(), &on_disconnect))
+				throw std::runtime_error("Unable to set \"on_disconnect()\" callback");
+			std::swap(conn, m_conn);
+			m_local_data->redis_poll_thread = std::thread([this]() {
+				m_local_data->libev_mutex.lock();
+				ev_run(m_libev_loop_thread.get(), 0);
+				m_local_data->libev_mutex.unlock();
+			});
+			wakeup_event_thread();
+		}
+	}
+
+	void AsyncConnection::wait_for_connect() {
+		if (not m_local_data->connect_processed) {
+			std::unique_lock<std::mutex> lk(m_local_data->hiredis_mutex);
+			m_local_data->condition_connected.wait(lk, [this]() { return m_local_data->connect_processed.load(); });
+			assert(true == m_local_data->connect_processed);
+		}
+	}
+
+	void AsyncConnection::disconnect() {
+		assert(m_local_data->redis_poll_thread.joinable());
+		m_local_data->connect_processed = false;
+		{
+			std::lock_guard<std::mutex> lock(m_local_data->libev_mutex);
+			assert(not ev_async_pending(&m_local_data->watcher_halt));
+			ev_async_send(m_libev_loop_thread.get(), &m_local_data->watcher_halt);
+			m_conn.reset();
+		}
+		m_local_data->redis_poll_thread.join();
+	}
+
+	void AsyncConnection::wait_for_disconnect() {
+		if (not m_local_data->disconnect_processed) {
+			std::unique_lock<std::mutex> lk(m_local_data->hiredis_mutex);
+			m_local_data->condition_disconnected.wait(lk, [this]() { return m_local_data->disconnect_processed.load(); });
+			assert(true == m_local_data->disconnect_processed);
+		}
+	}
+
+	bool AsyncConnection::is_connected() const {
+		const bool connected = m_conn and not m_conn->err and m_connected;
+		assert(not m_connection_lost or connected);
+		return connected;
+	}
+
+	boost::string_ref AsyncConnection::connection_error() const {
+		return m_local_data->connect_err_msg;
+	}
+
+	void AsyncConnection::wakeup_event_thread() {
+		std::lock_guard<std::mutex> lock(m_local_data->libev_mutex);
+		if (ev_async_pending(&m_local_data->watcher_wakeup) == false)
+			ev_async_send(m_libev_loop_thread.get(), &m_local_data->watcher_wakeup);
+	}
+
+	std::mutex& AsyncConnection::event_mutex() {
+		return m_local_data->libev_mutex;
+	}
+
+	bool AsyncConnection::is_socket_connection() const {
+		return not (m_port or m_address.empty());
+	}
+} //namespace redis
diff --git a/src/backends/redis/async_connection.hpp b/src/backends/redis/async_connection.hpp
new file mode 100644
index 0000000..7c1fce7
--- /dev/null
+++ b/src/backends/redis/async_connection.hpp
@@ -0,0 +1,74 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id982A651A9BC34F6E9BA935A804B3A0A4
+#define id982A651A9BC34F6E9BA935A804B3A0A4
+
+#include <memory>
+#include <string>
+#include <cstdint>
+#include <boost/utility/string_ref.hpp>
+
+struct redisAsyncContext;
+struct ev_loop;
+
+namespace std {
+	class mutex;
+} //namespace std
+
+namespace redis {
+	class AsyncConnection {
+		friend void on_connect ( const redisAsyncContext*, int );
+		friend void on_disconnect ( const redisAsyncContext*, int );
+	public:
+		AsyncConnection ( std::string&& parAddress, uint16_t parPort );
+		~AsyncConnection ( void ) noexcept;
+
+		void connect ( void );
+		void wait_for_connect ( void );
+		void disconnect ( void );
+		void wait_for_disconnect ( void );
+
+		bool is_connected ( void ) const;
+		boost::string_ref connection_error ( void ) const;
+		void wakeup_event_thread ( void );
+		std::mutex& event_mutex ( void );
+		redisAsyncContext* connection ( void );
+
+	private:
+		using RedisConnection = std::unique_ptr<redisAsyncContext, void(*)(redisAsyncContext*)>;
+		using LibevLoop = std::unique_ptr<ev_loop, void(*)(ev_loop*)>;
+
+		bool is_socket_connection ( void ) const;
+
+		struct LocalData;
+
+		RedisConnection m_conn;
+		std::unique_ptr<LocalData> m_local_data;
+		LibevLoop m_libev_loop_thread;
+		std::string m_address;
+		uint16_t m_port;
+		volatile bool m_connected;
+		volatile bool m_connection_lost;
+	};
+
+	inline redisAsyncContext* AsyncConnection::connection() {
+		return m_conn.get();
+	}
+} //namespace redis
+
+#endif
diff --git a/src/backends/redis/batch.cpp b/src/backends/redis/batch.cpp
index e30bc83..d24cccf 100644
--- a/src/backends/redis/batch.cpp
+++ b/src/backends/redis/batch.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "batch.hpp"
-#include "command.hpp"
+#include "async_connection.hpp"
 #include <hiredis/hiredis.h>
 #include <hiredis/async.h>
 #include <cassert>
@@ -105,15 +105,14 @@ namespace redis {
 
 	Batch::Batch (Batch&&) = default;
 
-	Batch::Batch (redisAsyncContext* parContext, Command* parCommand) :
+	Batch::Batch (AsyncConnection* parConn) :
 		m_futures(),
 		m_replies(),
 		m_local_data(new LocalData),
-		m_command(parCommand),
-		m_context(parContext)
+		m_async_conn(parConn)
 	{
-		assert(m_command);
-		assert(m_context);
+		assert(m_async_conn);
+		assert(m_async_conn->connection());
 	}
 
 	Batch::~Batch() noexcept {
@@ -137,13 +136,15 @@ namespace redis {
 		std::cout << " emplace_back(future)... ";
 
 		m_futures.emplace_back(data->promise.get_future());
-		m_command->lock();
-		const int command_added = redisAsyncCommandArgv(m_context, &hiredis_run_callback, data, parArgc, parArgv, parLengths);
-		m_command->unlock();
-		assert(REDIS_OK == command_added); // REDIS_ERR if error
+		{
+			std::lock_guard<std::mutex> lock(m_async_conn->event_mutex());
+			const int command_added = redisAsyncCommandArgv(m_async_conn->connection(), &hiredis_run_callback, data, parArgc, parArgv, parLengths);
+			assert(REDIS_OK == command_added); // REDIS_ERR if error
+			static_cast<void>(command_added);
+		}
 
 		std::cout << "command sent to hiredis" << std::endl;
-		m_command->wakeup_thread();
+		m_async_conn->wakeup_event_thread();
 	}
 
 	bool Batch::replies_requested() const {
diff --git a/src/backends/redis/batch.hpp b/src/backends/redis/batch.hpp
index bf28737..ccced3f 100644
--- a/src/backends/redis/batch.hpp
+++ b/src/backends/redis/batch.hpp
@@ -23,8 +23,6 @@
 #include <vector>
 #include <memory>
 
-struct redisAsyncContext;
-
 namespace std {
 	template <class R> class future;
 	template <class T> struct atomic;
@@ -32,6 +30,7 @@ namespace std {
 
 namespace redis {
 	class Command;
+	class AsyncConnection;
 
 	class Batch {
 		friend class Command;
@@ -53,14 +52,13 @@ namespace redis {
 	private:
 		struct LocalData;
 
-		Batch ( redisAsyncContext* parContext, Command* parCommand );
+		explicit Batch ( AsyncConnection* parConn );
 		void run_pvt ( int parArgc, const char** parArgv, std::size_t* parLengths );
 
 		std::vector<std::future<Reply>> m_futures;
 		std::vector<Reply> m_replies;
 		std::unique_ptr<LocalData> m_local_data;
-		Command* m_command;
-		redisAsyncContext* m_context;
+		AsyncConnection* m_async_conn;
 	};
 
 	class RedisError : public std::runtime_error {
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 5430829..00ca1ca 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -17,114 +17,33 @@
 
 #include "command.hpp"
 #include "script_manager.hpp"
+#include "async_connection.hpp"
 #include <hiredis/hiredis.h>
-#include <hiredis/async.h>
-#include <hiredis/adapters/libev.h>
-#include <ev.h>
 #include <ciso646>
 #include <cassert>
-#include <sstream>
 #include <algorithm>
 #include <stdexcept>
-#include <signal.h>
-#include <thread>
-#include <condition_variable>
-#include <atomic>
-#include <mutex>
 
 //See docs directory for info about hiredis/libev with multithreading
 
 namespace redis {
 	namespace {
-		void async_callback (ev_loop* /*parLoop*/, ev_async* /*parObject*/, int /*parRevents*/) {
-		}
-
-		void async_halt_loop (ev_loop* parLoop, ev_async* /*parObject*/, int /*parRevents*/) {
-			ev_break(parLoop, EVBREAK_ALL);
-		}
-
-		void lock_mutex_libev (ev_loop* parLoop) {
-			std::mutex* mtx = static_cast<std::mutex*>(ev_userdata(parLoop));
-			assert(mtx);
-			mtx->lock();
-		}
-
-		void unlock_mutex_libev (ev_loop* parLoop) {
-			std::mutex* mtx = static_cast<std::mutex*>(ev_userdata(parLoop));
-			assert(mtx);
-			mtx->unlock();
-		}
 	} //unnamed namespace
 
 	struct Command::LocalData {
-		explicit LocalData (Command* parCommand) :
-			lua_scripts(parCommand),
-			redis_poll_thread(),
-			connect_processed(false),
-			disconnect_processed(true)
+		explicit LocalData (Command* parCommand, std::string&& parAddress, uint16_t parPort) :
+			async_connection(std::move(parAddress), parPort),
+			lua_scripts(parCommand)
 		{
 		}
 
+		AsyncConnection async_connection;
 		ScriptManager lua_scripts;
-		ev_async watcher_wakeup;
-		ev_async watcher_halt;
-		std::thread redis_poll_thread;
-		std::mutex hiredis_mutex;
-		std::mutex libev_mutex;
-		std::condition_variable condition_connected;
-		std::condition_variable condition_disconnected;
-		std::string connect_err_msg;
-		std::atomic_bool connect_processed;
-		std::atomic_bool disconnect_processed;
-	};
-
-	void on_connect (const redisAsyncContext* parContext, int parStatus) {
-		assert(parContext and parContext->data);
-		Command& self = *static_cast<Command*>(parContext->data);
-		assert(parContext == self.m_conn.get());
-		assert(not self.m_local_data->connect_processed);
-
-		self.m_connection_lost = false;
-		self.m_connected = (parStatus == REDIS_OK);
-		self.m_local_data->connect_processed = true;
-		self.m_local_data->connect_err_msg = parContext->errstr;
-		self.m_local_data->condition_connected.notify_one();
-	}
-
-	void on_disconnect (const redisAsyncContext* parContext, int parStatus) {
-		assert(parContext and parContext->data);
-		Command& self = *static_cast<Command*>(parContext->data);
-		assert(self.m_connected);
-		assert(not self.m_local_data->disconnect_processed);
-
-		self.m_connection_lost = (REDIS_ERR == parStatus);
-		self.m_connected = false;
-		self.m_local_data->disconnect_processed = true;
-		self.m_local_data->connect_err_msg.clear();
-		self.m_local_data->condition_disconnected.notify_one();
 	};
 
 	Command::Command (std::string&& parAddress, uint16_t parPort) :
-		m_conn(nullptr, &redisAsyncDisconnect),
-		m_libev_loop_thread(ev_loop_new(EVFLAG_NOINOTIFY), &ev_loop_destroy),
-		m_address(std::move(parAddress)),
-		m_local_data(new LocalData(this)),
-		m_port(parPort),
-		m_connected(false),
-		m_connection_lost(false)
+		m_local_data(new LocalData(this, std::move(parAddress), parPort))
 	{
-		//Init libev stuff
-		{
-			signal(SIGPIPE, SIG_IGN);
-
-			//See: http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#THREAD_LOCKING_EXAMPLE
-			ev_async_init(&m_local_data->watcher_wakeup, &async_callback);
-			ev_async_start(m_libev_loop_thread.get(), &m_local_data->watcher_wakeup);
-			ev_async_init(&m_local_data->watcher_halt, &async_halt_loop);
-			ev_async_start(m_libev_loop_thread.get(), &m_local_data->watcher_halt);
-			ev_set_userdata(m_libev_loop_thread.get(), &m_local_data->libev_mutex);
-			ev_set_loop_release_cb(m_libev_loop_thread.get(), &unlock_mutex_libev, &lock_mutex_libev);
-		}
 	}
 
 	Command::Command (std::string&& parSocket) :
@@ -132,82 +51,30 @@ namespace redis {
 	{
 	}
 
-	Command::~Command() noexcept {
-		this->disconnect();
-		this->wait_for_disconnect();
-	}
+	Command::~Command() noexcept = default;
 
 	void Command::connect() {
-		if (not m_conn) {
-			m_local_data->disconnect_processed = false;
-			RedisConnection conn(
-				(is_socket_connection() ?
-					redisAsyncConnectUnix(m_address.c_str())
-				:
-					redisAsyncConnect(m_address.c_str(), m_port)
-				),
-				&redisAsyncDisconnect
-			);
-			if (not conn) {
-				std::ostringstream oss;
-				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port;
-				throw std::runtime_error(oss.str());
-			}
-			else {
-				conn->data = this;
-			}
-			if (REDIS_OK != redisLibevAttach(m_libev_loop_thread.get(), conn.get()))
-				throw std::runtime_error("Unable to set event loop");
-			if (REDIS_OK != redisAsyncSetConnectCallback(conn.get(), &on_connect))
-				throw std::runtime_error("Unable to set \"on_connect()\" callback");
-			if (REDIS_OK != redisAsyncSetDisconnectCallback(conn.get(), &on_disconnect))
-				throw std::runtime_error("Unable to set \"on_disconnect()\" callback");
-			std::swap(conn, m_conn);
-			m_local_data->redis_poll_thread = std::thread([this]() {
-				m_local_data->libev_mutex.lock();
-				ev_run(m_libev_loop_thread.get(), 0);
-				m_local_data->libev_mutex.unlock();
-			});
-			wakeup_thread();
-		}
+		m_local_data->async_connection.connect();
 	}
 
 	void Command::wait_for_connect() {
-		if (not m_local_data->connect_processed) {
-			std::unique_lock<std::mutex> lk(m_local_data->hiredis_mutex);
-			m_local_data->condition_connected.wait(lk, [this]() { return m_local_data->connect_processed.load(); });
-			assert(true == m_local_data->connect_processed);
-		}
+		m_local_data->async_connection.wait_for_connect();
 	}
 
 	void Command::disconnect() {
-		assert(m_local_data->redis_poll_thread.joinable());
-		m_local_data->connect_processed = false;
-		{
-			std::lock_guard<std::mutex> lock(m_local_data->libev_mutex);
-			assert(not ev_async_pending(&m_local_data->watcher_halt));
-			ev_async_send(m_libev_loop_thread.get(), &m_local_data->watcher_halt);
-			m_conn.reset();
-		}
-		m_local_data->redis_poll_thread.join();
+		m_local_data->async_connection.disconnect();
 	}
 
 	void Command::wait_for_disconnect() {
-		if (not m_local_data->disconnect_processed) {
-			std::unique_lock<std::mutex> lk(m_local_data->hiredis_mutex);
-			m_local_data->condition_disconnected.wait(lk, [this]() { return m_local_data->disconnect_processed.load(); });
-			assert(true == m_local_data->disconnect_processed);
-		}
+		m_local_data->async_connection.wait_for_disconnect();
 	}
 
 	bool Command::is_connected() const {
-		const bool connected = m_conn and not m_conn->err and m_connected;
-		assert(not m_connection_lost or connected);
-		return connected;
+		return m_local_data->async_connection.is_connected();
 	}
 
 	boost::string_ref Command::connection_error() const {
-		return m_local_data->connect_err_msg;
+		return m_local_data->async_connection.connection_error();
 	}
 
 	auto Command::scan() -> scan_range {
@@ -228,28 +95,10 @@ namespace redis {
 
 	Batch Command::make_batch() {
 		assert(is_connected());
-		return Batch(m_conn.get(), this);
-	}
-
-	bool Command::is_socket_connection() const {
-		return not (m_port or m_address.empty());
+		return Batch(&m_local_data->async_connection);
 	}
 
 	void Command::submit_lua_script (const std::string& parScript) {
 		m_local_data->lua_scripts.submit_lua_script(parScript);
 	}
-
-	void Command::wakeup_thread() {
-		std::lock_guard<std::mutex> lock(m_local_data->libev_mutex);
-		if (ev_async_pending(&m_local_data->watcher_wakeup) == false)
-			ev_async_send(m_libev_loop_thread.get(), &m_local_data->watcher_wakeup);
-	}
-
-	void Command::lock() {
-		m_local_data->libev_mutex.lock();
-	}
-
-	void Command::unlock() {
-		m_local_data->libev_mutex.unlock();
-	}
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index eb8a81e..32b37f3 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -23,7 +23,6 @@
 #include "batch.hpp"
 #include "redisConfig.h"
 #include <array>
-#include <memory>
 #include <string>
 #include <cstdint>
 #include <cstddef>
@@ -34,13 +33,8 @@
 #include <boost/utility/string_ref.hpp>
 #include <stdexcept>
 
-struct redisAsyncContext;
-struct ev_loop;
-
 namespace redis {
 	class Command {
-		friend void on_connect ( const redisAsyncContext*, int );
-		friend void on_disconnect ( const redisAsyncContext*, int );
 	public:
 		typedef ScanIterator<ScanSingleValues<std::string>> scan_iterator;
 		typedef boost::iterator_range<scan_iterator> scan_range;
@@ -75,26 +69,11 @@ namespace redis {
 		zscan_range zscan ( boost::string_ref parKey );
 
 		void submit_lua_script ( const std::string& parScript );
-		void wakeup_thread();
-		void lock();
-		void unlock();
 
 	private:
-		using RedisConnection = std::unique_ptr<redisAsyncContext, void(*)(redisAsyncContext*)>;
-		using LibevLoop = std::unique_ptr<ev_loop, void(*)(ev_loop*)>;
-
-		bool is_socket_connection ( void ) const;
-		void on_connect_successful ( void );
-
 		struct LocalData;
 
-		RedisConnection m_conn;
-		LibevLoop m_libev_loop_thread;
-		std::string m_address;
 		std::unique_ptr<LocalData> m_local_data;
-		uint16_t m_port;
-		volatile bool m_connected;
-		volatile bool m_connection_lost;
 	};
 
 	template <typename... Args>

From 8d7d4c555578bc9785b4b1802411151576a91f2b Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 30 Jun 2016 11:27:15 +0100
Subject: [PATCH 084/170] Implement Script class.

---
 src/backends/redis/backend_redis.cpp  |  1 -
 src/backends/redis/command.cpp        |  5 +--
 src/backends/redis/command.hpp        |  4 +--
 src/backends/redis/script.cpp         |  5 +++
 src/backends/redis/script.hpp         | 49 ++++++++++++++++++++++++++-
 src/backends/redis/script_manager.cpp |  4 ---
 src/backends/redis/script_manager.hpp |  7 +++-
 7 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 427aec2..ca87f91 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -158,7 +158,6 @@ namespace dindb {
 			batch.run("SELECT", lexical_cast<std::string>(m_database));
 			batch.run("CLIENT", "SETNAME", PROGRAM_NAME "_v" STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_PATCH));
 			batch.throw_if_failed();
-			m_redis.submit_lua_script("return 42;");
 		}
 		else {
 			std::ostringstream oss;
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 00ca1ca..e58707f 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -98,7 +98,8 @@ namespace redis {
 		return Batch(&m_local_data->async_connection);
 	}
 
-	void Command::submit_lua_script (const std::string& parScript) {
-		m_local_data->lua_scripts.submit_lua_script(parScript);
+	Script Command::make_script (const std::string &parScript) {
+		auto sha1 = m_local_data->lua_scripts.submit_lua_script(parScript);
+		return Script(sha1, m_local_data->lua_scripts);
 	}
 } //namespace redis
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 32b37f3..d9c6fbf 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -22,6 +22,7 @@
 #include "reply.hpp"
 #include "batch.hpp"
 #include "redisConfig.h"
+#include "script.hpp"
 #include <array>
 #include <string>
 #include <cstdint>
@@ -58,6 +59,7 @@ namespace redis {
 		boost::string_ref connection_error ( void ) const;
 
 		Batch make_batch ( void );
+		Script make_script ( const std::string& parScript );
 
 		template <typename... Args>
 		Reply run ( const char* parCommand, Args&&... parArgs );
@@ -68,8 +70,6 @@ namespace redis {
 		sscan_range sscan ( boost::string_ref parKey );
 		zscan_range zscan ( boost::string_ref parKey );
 
-		void submit_lua_script ( const std::string& parScript );
-
 	private:
 		struct LocalData;
 
diff --git a/src/backends/redis/script.cpp b/src/backends/redis/script.cpp
index 2e1502c..af7eeac 100644
--- a/src/backends/redis/script.cpp
+++ b/src/backends/redis/script.cpp
@@ -18,4 +18,9 @@
 #include "script.hpp"
 
 namespace redis {
+	Script::Script (boost::string_ref parSha1, ScriptManager& parManager) :
+		m_sha1(parSha1),
+		m_manager(parManager)
+	{
+	}
 } //namespace redis
diff --git a/src/backends/redis/script.hpp b/src/backends/redis/script.hpp
index f547df3..e169bf6 100644
--- a/src/backends/redis/script.hpp
+++ b/src/backends/redis/script.hpp
@@ -18,11 +18,58 @@
 #ifndef id5B30CDA57F894CD6888093B64F9433DA
 #define id5B30CDA57F894CD6888093B64F9433DA
 
-#include "script_manager.hpp"
+#include "batch.hpp"
+#include "helpers/lexical_cast.hpp"
+#include "helpers/sequence_bt.hpp"
+#include <boost/utility/string_ref.hpp>
+#include <tuple>
 
 namespace redis {
+	class ScriptManager;
+
 	class Script {
+	public:
+		Script ( Script&& ) = default;
+		Script ( boost::string_ref parSha1, ScriptManager& parManager );
+		~Script ( void ) noexcept = default;
+
+		template <typename... Keys, typename... Values>
+		void run ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues );
+
+	private:
+		template <typename... Keys, typename... Values, std::size_t... KeyIndices, std::size_t... ValueIndices>
+		void run_with_indices ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dinhelp::bt::index_seq<KeyIndices...>, dinhelp::bt::index_seq<ValueIndices...> );
+
+		boost::string_ref m_sha1;
+		ScriptManager& m_manager;
 	};
+
+	template <typename... Keys, typename... Values>
+	void Script::run (Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues) {
+		this->run_with_indices(
+			parBatch,
+			parKeys,
+			parValues,
+			::dinhelp::bt::index_range<0, sizeof...(Keys)>(),
+			::dinhelp::bt::index_range<0, sizeof...(Values)>()
+		);
+	}
+
+	template <typename... Keys, typename... Values, std::size_t... KeyIndices, std::size_t... ValueIndices>
+	void Script::run_with_indices (Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dinhelp::bt::index_seq<KeyIndices...>, dinhelp::bt::index_seq<ValueIndices...>) {
+		static_assert(sizeof...(Keys) == sizeof...(KeyIndices), "Wrong index count");
+		static_assert(sizeof...(Values) == sizeof...(ValueIndices), "Wrong value count");
+		static_assert(sizeof...(Keys) == std::tuple_size<decltype(parKeys)>::value, "Wrong key count");
+		static_assert(sizeof...(Values) == std::tuple_size<decltype(parValues)>::value, "Wrong value count");
+
+		parBatch.run(
+			"EVALSHA",
+			m_sha1,
+			dinhelp::lexical_cast<std::string>(sizeof...(Keys)),
+			std::get<KeyIndices>(parKeys)...,
+			std::get<ValueIndices>(parValues)...
+		);
+	}
 } //namespace redis
 
 #endif
diff --git a/src/backends/redis/script_manager.cpp b/src/backends/redis/script_manager.cpp
index 0f7c98e..1e86f54 100644
--- a/src/backends/redis/script_manager.cpp
+++ b/src/backends/redis/script_manager.cpp
@@ -108,8 +108,4 @@ namespace redis {
 		return boost::string_ref(it_inserted->second.data(), it_inserted->second.size());
 	}
 #endif
-
-	void ScriptManager::submit_lua_script (const std::string& parScript) {
-		add_lua_script_ifn(parScript);
-	}
 } //namespace redis
diff --git a/src/backends/redis/script_manager.hpp b/src/backends/redis/script_manager.hpp
index 08b744a..5cec852 100644
--- a/src/backends/redis/script_manager.hpp
+++ b/src/backends/redis/script_manager.hpp
@@ -27,6 +27,7 @@
 #endif
 #include <string>
 #include <array>
+#include <boost/utility/string_ref.hpp>
 
 namespace redis {
 	class Command;
@@ -35,7 +36,7 @@ namespace redis {
 	public:
 		explicit ScriptManager ( Command* parCommand );
 
-		void submit_lua_script ( const std::string& parScript );
+		boost::string_ref submit_lua_script ( const std::string& parScript );
 
 	private:
 		using Sha1Array = std::array<char, 40>;
@@ -49,6 +50,10 @@ namespace redis {
 		std::map<std::string, Sha1Array> m_known_scripts;
 #endif
 	};
+
+	inline boost::string_ref ScriptManager::submit_lua_script (const std::string& parScript) {
+		return add_lua_script_ifn(parScript);
+	}
 } //namespace redis
 
 #endif

From 53bb4684b425db674dfc666b80360ea318ea8c88 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 30 Jun 2016 11:37:05 +0100
Subject: [PATCH 085/170] Allow disabling use of cryptopp from code.

Just comment out the definition of MAKE_SHA1_WITH_CRYPTOPP
and the code will fall back to getting the sha1 from Redis.
---
 src/backends/redis/script_manager.cpp | 6 +++---
 src/backends/redis/script_manager.hpp | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/backends/redis/script_manager.cpp b/src/backends/redis/script_manager.cpp
index 1e86f54..ba1fb0d 100644
--- a/src/backends/redis/script_manager.cpp
+++ b/src/backends/redis/script_manager.cpp
@@ -19,13 +19,13 @@
 #include "helpers/lexical_cast.hpp"
 #include "command.hpp"
 #include <cassert>
-#if defined(WITH_CRYPTOPP)
+#if defined(MAKE_SHA1_WITH_CRYPTOPP)
 #	include <crypto++/sha.h>
 #endif
 
 namespace redis {
 	namespace {
-#if defined(WITH_CRYPTOPP)
+#if defined(MAKE_SHA1_WITH_CRYPTOPP)
 		struct LuaScriptHash {
 			union {
 				struct {
@@ -44,7 +44,7 @@ namespace redis {
 		assert(m_command);
 	}
 
-#if defined(WITH_CRYPTOPP)
+#if defined(MAKE_SHA1_WITH_CRYPTOPP)
 	boost::string_ref ScriptManager::add_lua_script_ifn (const std::string& parScript) {
 		assert(m_command->is_connected());
 
diff --git a/src/backends/redis/script_manager.hpp b/src/backends/redis/script_manager.hpp
index 5cec852..39fe4c9 100644
--- a/src/backends/redis/script_manager.hpp
+++ b/src/backends/redis/script_manager.hpp
@@ -19,8 +19,11 @@
 #define id8E124FF76DF449CDB8FBA806F8EF4E78
 
 #include "redisConfig.h"
-#include <boost/utility/string_ref.hpp>
 #if defined(WITH_CRYPTOPP)
+#	define MAKE_SHA1_WITH_CRYPTOPP
+#endif
+#include <boost/utility/string_ref.hpp>
+#if defined(MAKE_SHA1_WITH_CRYPTOPP)
 #	include <set>
 #else
 #	include <map>
@@ -44,7 +47,7 @@ namespace redis {
 		boost::string_ref add_lua_script_ifn ( const std::string& parScript );
 
 		Command* m_command;
-#if defined(WITH_CRYPTOPP)
+#if defined(MAKE_SHA1_WITH_CRYPTOPP)
 		std::set<Sha1Array> m_known_hashes;
 #else
 		std::map<std::string, Sha1Array> m_known_scripts;

From 14587f1cb84cee082a2e92c12849804ec5487286 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 30 Jun 2016 11:40:05 +0100
Subject: [PATCH 086/170] Buildfix when not using cryptopp.

---
 src/backends/redis/script_manager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backends/redis/script_manager.cpp b/src/backends/redis/script_manager.cpp
index ba1fb0d..73071e6 100644
--- a/src/backends/redis/script_manager.cpp
+++ b/src/backends/redis/script_manager.cpp
@@ -91,8 +91,8 @@ namespace redis {
 	boost::string_ref ScriptManager::add_lua_script_ifn (const std::string& parScript) {
 		assert(m_command->is_connected());
 
-		auto it_found = m_known_hashes.find(parScript);
-		const bool was_present = (m_known_hashes.end() != it_found);
+		auto it_found = m_known_scripts.find(parScript);
+		const bool was_present = (m_known_scripts.end() != it_found);
 		if (was_present) {
 			return boost::string_ref(it_found->second.data(), it_found->second.size());
 		}
@@ -103,7 +103,7 @@ namespace redis {
 		const auto sha1_str = get_string(reply);
 		Sha1Array sha1_array;
 		std::copy(sha1_str.begin(), sha1_str.end(), sha1_array.begin());
-		auto it_inserted = m_known_hashes.insert(it_found, std::make_pair(parScript, sha1_array));
+		auto it_inserted = m_known_scripts.insert(it_found, std::make_pair(parScript, sha1_array));
 
 		return boost::string_ref(it_inserted->second.data(), it_inserted->second.size());
 	}

From 0df8c5875cd01b2195eb8c273fd727d448bd4004 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 30 Jun 2016 12:41:01 +0100
Subject: [PATCH 087/170] Buildfix on gcc 5.4

---
 include/helpers/implem/AutomemBase.inl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/helpers/implem/AutomemBase.inl b/include/helpers/implem/AutomemBase.inl
index 6909bda..03c63da 100644
--- a/include/helpers/implem/AutomemBase.inl
+++ b/include/helpers/implem/AutomemBase.inl
@@ -46,7 +46,7 @@ namespace dinhelp {
 	template <typename T, size_t S, typename A>
 	T* AutomemRawBase_heap<T, S, A>::AllocMemory() {
 #if !defined(NDEBUG)
-		Assert(nullptr == m_localMem);
+		assert(nullptr == m_localMem);
 #endif
 		m_localMem = A().allocate(S);
 #if defined(ASSERTIONSENABLED)
@@ -65,7 +65,7 @@ namespace dinhelp {
 	template <typename T, size_t S, typename A>
 	void AutomemRawBase_heap<T, S, A>::FreeMemory() noexcept {
 #if !defined(NDEBUG)
-		Assert(nullptr != m_localMem);
+		assert(nullptr != m_localMem);
 #endif
 		A().deallocate(m_localMem, S);
 #if !defined(NDEBUG)

From fc4bec4e1939606dee261be04386ff77fb17943b Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 11:45:00 +0100
Subject: [PATCH 088/170] Import ohm-scripts from soveran's repo.

They will be used by the redis backend (not the redis wrapper).
---
 .gitmodules     | 3 +++
 lib/ohm-scripts | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/ohm-scripts

diff --git a/.gitmodules b/.gitmodules
index 94e1d37..112dc9e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "lib/better-enums"]
 	path = lib/better-enums
 	url = https://github.com/aantron/better-enums
+[submodule "lib/ohm-scripts"]
+	path = lib/ohm-scripts
+	url = https://github.com/soveran/ohm-scripts.git
diff --git a/lib/ohm-scripts b/lib/ohm-scripts
new file mode 160000
index 0000000..407e421
--- /dev/null
+++ b/lib/ohm-scripts
@@ -0,0 +1 @@
+Subproject commit 407e421ddd1209bf8168dc27a3abf0fc7ad9105c

From e728eb2a9e37a6a9e2672c2f81d02b3a375229b2 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 14:17:51 +0100
Subject: [PATCH 089/170] Various really small changes.

---
 src/backends/redis/script_manager.hpp | 2 +-
 src/common/CMakeLists.txt             | 4 ++--
 src/machinery/CMakeLists.txt          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/backends/redis/script_manager.hpp b/src/backends/redis/script_manager.hpp
index 39fe4c9..66b1153 100644
--- a/src/backends/redis/script_manager.hpp
+++ b/src/backends/redis/script_manager.hpp
@@ -46,7 +46,7 @@ namespace redis {
 
 		boost::string_ref add_lua_script_ifn ( const std::string& parScript );
 
-		Command* m_command;
+		Command* const m_command;
 #if defined(MAKE_SHA1_WITH_CRYPTOPP)
 		std::set<Sha1Array> m_known_hashes;
 #else
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index d8a1ebd..3acf126 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(${bare_name}-common CXX C)
+project(${bare_name}-common CXX)
 
 find_package(Readline 6.3 REQUIRED)
 
@@ -32,7 +32,7 @@ target_link_libraries(${PROJECT_NAME}
 #	ARCHIVE DESTINATION lib/static
 #)
 
-#Allow to link with .so
+#Allow linking with .so
 #see https://cmake.org/pipermail/cmake/2007-May/014350.html
 #and http://stackoverflow.com/questions/6093547/what-do-r-x86-64-32s-and-r-x86-64-64-relocation-mean/6093910#6093910
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
diff --git a/src/machinery/CMakeLists.txt b/src/machinery/CMakeLists.txt
index 64c87c6..3b32b59 100644
--- a/src/machinery/CMakeLists.txt
+++ b/src/machinery/CMakeLists.txt
@@ -26,9 +26,8 @@ add_library(${PROJECT_NAME} SHARED
 	scantask/setbasic.cpp
 )
 
-target_include_directories(${PROJECT_NAME}
+target_include_directories(${PROJECT_NAME} SYSTEM
 	PRIVATE ${MAGIC_INCLUDE_DIR}
-	PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 target_link_libraries(${PROJECT_NAME}
@@ -37,6 +36,7 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 target_include_directories(${PROJECT_NAME}
+	PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
 	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
 	PUBLIC ${CMAKE_SOURCE_DIR}/lib/better-enums
 )

From 5f5b2b5770384d9a16505b749303746751358156 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 14:49:40 +0100
Subject: [PATCH 090/170] New core library.

---
 CMakeLists.txt                        |   1 +
 include/dindexer-core/searchpaths.hpp |  66 +++++++++++++
 src/core/CMakeLists.txt               |  35 +++++++
 src/core/searchpaths.cpp              | 136 ++++++++++++++++++++++++++
 4 files changed, 238 insertions(+)
 create mode 100644 include/dindexer-core/searchpaths.hpp
 create mode 100644 src/core/CMakeLists.txt
 create mode 100644 src/core/searchpaths.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1f926e..8ef6463 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,6 +128,7 @@ add_subdirectory(src/machinery)
 add_subdirectory(lib/pbl)
 add_subdirectory(lib/glob2regex)
 add_subdirectory(src/backends)
+add_subdirectory(src/core)
 
 #Actions
 add_subdirectory(src/main)
diff --git a/include/dindexer-core/searchpaths.hpp b/include/dindexer-core/searchpaths.hpp
new file mode 100644
index 0000000..6ab5664
--- /dev/null
+++ b/include/dindexer-core/searchpaths.hpp
@@ -0,0 +1,66 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef idDD90110B9C7E44C4AAF8B46A663B11DC
+#define idDD90110B9C7E44C4AAF8B46A663B11DC
+
+#include <vector>
+#include <initializer_list>
+#include <string>
+#include <boost/utility/string_ref.hpp>
+#include <functional>
+
+namespace dincore {
+	class SearchPaths {
+	public:
+		enum SearchType {
+			Directory,
+			File,
+			Any
+		};
+		using Predicate = std::function<bool(boost::string_ref, const std::string& parPath)>;
+
+		SearchPaths ( void ) = default;
+		explicit SearchPaths ( std::vector<std::string>&& parList );
+		SearchPaths ( std::initializer_list<std::string> parInit );
+		~SearchPaths ( void ) noexcept;
+
+		void add_path ( std::string&& parPath );
+		std::string first_hit ( boost::string_ref parFile, SearchType parType=Any ) const;
+		std::string first_hit ( Predicate parPredicate, SearchType parType=Any ) const;
+
+	private:
+		std::vector<std::string> m_paths;
+	};
+
+	class ShallowSearchPaths {
+	public:
+		ShallowSearchPaths ( void ) = default;
+		explicit ShallowSearchPaths ( std::vector<boost::string_ref>&& parList );
+		ShallowSearchPaths ( std::initializer_list<boost::string_ref> parInit );
+		~ShallowSearchPaths ( void ) noexcept;
+
+		void add_path ( boost::string_ref parPath );
+		std::string first_hit ( boost::string_ref parFile, SearchPaths::SearchType parType=SearchPaths::Any ) const;
+		std::string first_hit ( SearchPaths::Predicate parPredicate, SearchPaths::SearchType parType=SearchPaths::Any ) const;
+
+	private:
+		std::vector<boost::string_ref> m_paths;
+	};
+} //namespace dincore
+
+#endif
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
new file mode 100644
index 0000000..fd9d26e
--- /dev/null
+++ b/src/core/CMakeLists.txt
@@ -0,0 +1,35 @@
+project(${bare_name}-core CXX)
+
+add_library(${PROJECT_NAME}
+	searchpaths.cpp
+)
+
+target_link_libraries(${PROJECT_NAME}
+	PRIVATE ${bare_name}-if
+)
+
+target_include_directories(${PROJECT_NAME}
+	PRIVATE ${DINDEXER_PUB_INCLUDE_DIR}/${bare_name}-core
+)
+
+target_compile_features(${PROJECT_NAME}
+	INTERFACE cxx_nullptr
+	INTERFACE cxx_range_for
+	INTERFACE cxx_lambdas
+	INTERFACE cxx_decltype_auto
+	INTERFACE cxx_defaulted_functions
+	INTERFACE cxx_deleted_functions
+	INTERFACE cxx_auto_type
+	INTERFACE cxx_decltype_incomplete_return_types
+	INTERFACE cxx_defaulted_move_initializers
+	INTERFACE cxx_noexcept
+	INTERFACE cxx_rvalue_references
+	INTERFACE cxx_generalized_initializers
+	INTERFACE cxx_variadic_templates
+)
+
+install(TARGETS ${PROJECT_NAME}
+	LIBRARY DESTINATION lib
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib/static
+)
diff --git a/src/core/searchpaths.cpp b/src/core/searchpaths.cpp
new file mode 100644
index 0000000..573361b
--- /dev/null
+++ b/src/core/searchpaths.cpp
@@ -0,0 +1,136 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "searchpaths.hpp"
+#include <algorithm>
+#include <boost/filesystem.hpp>
+#include <boost/range/iterator_range_core.hpp>
+#include <ciso646>
+#include <cassert>
+
+namespace dincore {
+	namespace {
+		const std::string& STR_to_string (const std::string& parString) {
+			return parString;
+		}
+
+		std::string STR_to_string (boost::string_ref parString) {
+			return std::string(parString.data(), parString.size());
+		}
+
+		template <typename STR>
+		std::string first_hit_impl (const std::vector<STR>& parPaths, SearchPaths::Predicate parPredicate, SearchPaths::SearchType parType) {
+			using boost::filesystem::path;
+			using boost::filesystem::is_directory;
+			using boost::filesystem::directory_iterator;
+			using boost::filesystem::directory_entry;
+			using boost::make_iterator_range;
+
+			for (const auto& curr_dir_path : parPaths) {
+				path curr_path(STR_to_string(curr_dir_path));
+				auto listing = make_iterator_range(directory_iterator(curr_path), directory_iterator());
+				for (const directory_entry& entry : listing) {
+					if (
+						(parType == SearchPaths::Any) or
+						(parType == SearchPaths::Directory and is_directory(entry)) or
+						(parType == SearchPaths::File and not is_directory(entry))
+					) {
+						auto str_path = entry.path().string();
+						if (parPredicate(curr_dir_path, str_path))
+							return str_path;
+					}
+				}
+			}
+			return std::string();
+		}
+
+		//std::string make_file_path (boost::string_ref parPath, boost::string_ref parName) {
+		//	assert(not parName.empty());
+		//	if (parName.empty())
+		//		return std::string(parPath.data(), parPath.size());
+
+		//	std::string retval;
+		//	const std::size_t slash = (not parPath.empty() and parPath[parPath.size() - 1] != '/' ? 1 : 0);
+		//	retval.reserve(parPath.size() + parName.size() + slash);
+		//	std::copy(parPath.begin(), parPath.end(), retval.begin());
+		//	retval[parPath.size()] = '/';
+		//	std::copy(parName.begin(), parName.end(), retval.begin() + parPath.size() + slash);
+		//	return retval;
+		//}
+
+		bool is_same_filename (boost::string_ref parBaseDir, const std::string& parFullPath, boost::string_ref parFilename) {
+			assert(parBaseDir.size() < parFullPath.size());
+			return boost::string_ref(parFullPath).substr(parBaseDir.size() + 1) == parFilename;
+		}
+	} //unnamed namespace
+
+	SearchPaths::SearchPaths (std::vector<std::string>&& parList) :
+		m_paths(std::move(parList))
+	{
+	}
+
+	SearchPaths::SearchPaths (std::initializer_list<std::string> parInit) :
+		m_paths(parInit)
+	{
+	}
+
+	SearchPaths::~SearchPaths() noexcept = default;
+
+	void SearchPaths::add_path (std::string&& parPath) {
+		if (std::find(m_paths.begin(), m_paths.end(), parPath) == m_paths.end()) {
+			m_paths.emplace_back(std::move(parPath));
+		}
+	}
+
+	std::string SearchPaths::first_hit (boost::string_ref parFile, SearchType parType) const {
+		using std::placeholders::_1;
+		using std::placeholders::_2;
+		return first_hit_impl(m_paths, std::bind(&is_same_filename, _1, _2, parFile), parType);
+	}
+
+	std::string SearchPaths::first_hit (Predicate parPredicate, SearchType parType) const {
+		return first_hit_impl(m_paths, parPredicate, parType);
+	}
+
+	ShallowSearchPaths::ShallowSearchPaths (std::vector<boost::string_ref>&& parList) :
+		m_paths(std::move(parList))
+	{
+	}
+
+	ShallowSearchPaths::ShallowSearchPaths (std::initializer_list<boost::string_ref> parInit) :
+		m_paths(parInit)
+	{
+	}
+
+	ShallowSearchPaths::~ShallowSearchPaths() noexcept = default;
+
+	void ShallowSearchPaths::add_path (boost::string_ref parPath) {
+		if (std::find(m_paths.begin(), m_paths.end(), parPath) == m_paths.end()) {
+			m_paths.push_back(parPath);
+		}
+	}
+
+	std::string ShallowSearchPaths::first_hit (boost::string_ref parFile, SearchPaths::SearchType parType) const {
+		using std::placeholders::_1;
+		using std::placeholders::_2;
+		return first_hit_impl(m_paths, std::bind(&is_same_filename, _1, _2, parFile), parType);
+	}
+
+	std::string ShallowSearchPaths::first_hit (SearchPaths::Predicate parPredicate, SearchPaths::SearchType parType) const {
+		return first_hit_impl(m_paths, parPredicate, parType);
+	}
+} //namespace dincore

From baddd228fa9118cfe8854e7181684b5c9ad8d7bb Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 14:50:51 +0100
Subject: [PATCH 091/170] find_plugin_by_name() now relies on the new
 SearchPaths class.

---
 src/common/CMakeLists.txt |  1 +
 src/common/settings.cpp   | 29 ++++++++++-------------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 3acf126..2242e42 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -24,6 +24,7 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${YAMLCPP_LIBRARY}
 	PRIVATE ${Readline_LIBRARY}
 	${bare_name}-backend
+	${bare_name}-core
 )
 
 #install(TARGETS ${PROJECT_NAME}
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 95b6b45..e3a66f1 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -17,6 +17,7 @@
 
 #include "dindexer-common/settings.hpp"
 #include "dindexer-common/split_tags.hpp"
+#include "dindexer-core/searchpaths.hpp"
 #include "dindexerConfig.h"
 #include <yaml-cpp/yaml.h>
 #include <ciso646>
@@ -29,7 +30,7 @@
 namespace dinlib {
 	namespace {
 		std::string expand ( const char* parString );
-		std::string find_plugin_by_name ( const std::vector<boost::string_ref>& parSearchPaths, const std::string& parName );
+		std::string find_plugin_by_name ( std::vector<boost::string_ref>&& parSearchPaths, const std::string& parName );
 		void throw_if_plugin_failed ( const dindb::BackendPlugin& parPlugin, const std::string& parPluginPath, const std::string& parIntendedName );
 	} //unnamed namespace
 
@@ -68,24 +69,14 @@ namespace dinlib {
 			return oss.str();
 		}
 
-		std::string find_plugin_by_name (const std::vector<boost::string_ref>& parSearchPaths, const std::string& parName) {
-			using boost::filesystem::path;
-			using boost::filesystem::is_directory;
-			using boost::filesystem::directory_iterator;
-			using boost::filesystem::directory_entry;
-			using boost::make_iterator_range;
-
-			for (auto search_path : parSearchPaths) {
-				const std::string search_path_cpy(search_path.begin(), search_path.end());
-				path curr_path(search_path_cpy);
-				auto listing = make_iterator_range(directory_iterator(curr_path), directory_iterator());
-				for (const directory_entry& entry : listing) {
-					auto current_full_path = entry.path().string();
-					if (not is_directory(entry) and dindb::backend_name(current_full_path) == parName)
-						return current_full_path;
-				}
-			}
-			return std::string();
+		std::string find_plugin_by_name (std::vector<boost::string_ref>&& parSearchPaths, const std::string& parName) {
+			dincore::ShallowSearchPaths search_paths(std::move(parSearchPaths));
+			return search_paths.first_hit(
+				[&parName](boost::string_ref, const std::string& parPath) {
+					return dindb::backend_name(parPath) == parName;
+				},
+				dincore::SearchPaths::File
+			);
 		}
 
 		void throw_if_plugin_failed (const dindb::BackendPlugin& parPlugin, const std::string& parPluginPath, const std::string& parIntendedName) {

From cc943791efc278d94513726d6a93aaa0dd74e4a7 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 15:17:13 +0100
Subject: [PATCH 092/170] core should always be a .so

---
 src/core/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index fd9d26e..5ae3892 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(${bare_name}-core CXX)
 
-add_library(${PROJECT_NAME}
+add_library(${PROJECT_NAME} SHARED
 	searchpaths.cpp
 )
 

From afae0b6d1130d04b69294a6dc7ee259fd9620ed4 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 15:18:26 +0100
Subject: [PATCH 093/170] Load Lua script search paths into a SearchPaths.

---
 src/backends/redis/CMakeLists.txt    | 20 +++++++++++++++++++-
 src/backends/redis/backend_redis.cpp | 14 +++++++++++---
 src/backends/redis/backend_redis.hpp |  4 +++-
 src/backends/redis/redisConfig.h.in  |  2 ++
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index d04a0b3..19f75d5 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(${bare_name}-backend-redis CXX)
 
+set(DINDEXER_REDIS_SCRIPTS_PATH "${CMAKE_INSTALL_PREFIX}/${bare_name}/redis" CACHE STRING "Path where Lua scripts for Redis are stored")
+
 find_package(hiredis 0.11.0 REQUIRED)
 find_package(CryptoPP 5.6)
 find_package(libev 4.0 REQUIRED)
@@ -27,7 +29,7 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-inc
-	PRIVATE ${bare_name}-pq
+	PUBLIC ${bare_name}-core
 	PRIVATE ${HIREDIS_LIBRARIES}
 	PRIVATE ${LIBEV_LIBRARIES}
 )
@@ -48,10 +50,26 @@ configure_file(
 	redisConfig.h.in
 	${CMAKE_CURRENT_BINARY_DIR}/redisConfig.h
 )
+set(LUA_SCRIPTS
+	"${CMAKE_SOURCE_DIR}/lib/ohm-scripts/save.lua"
+	"${CMAKE_SOURCE_DIR}/lib/ohm-scripts/delete.lua"
+)
 
 install(TARGETS ${PROJECT_NAME}
 	LIBRARY DESTINATION lib
 	RUNTIME DESTINATION bin
 	ARCHIVE DESTINATION lib/static
 )
+
+set(lua_script_list "")
+foreach (lua_script ${LUA_SCRIPTS})
+	get_filename_component(lua_script_basename "${lua_script}" NAME)
+	configure_file("${lua_script}" "${CMAKE_CURRENT_BINARY_DIR}/lua/${lua_script_basename}" COPYONLY)
+	list(APPEND lua_script_list "${CMAKE_CURRENT_BINARY_DIR}/lua/${lua_script_basename}")
+endforeach()
+unset(lua_script)
+unset(lua_script_basename)
+install(FILES ${lua_script_list} DESTINATION "${DINDEXER_REDIS_SCRIPTS_PATH}")
+unset(lua_script_list)
+
 ln_backend(${PROJECT_NAME})
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index ca87f91..fd18299 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -137,8 +137,9 @@ namespace YAML {
 //}
 
 namespace dindb {
-	BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort, uint16_t parDatabase, bool parConnect) :
+	BackendRedis::BackendRedis(std::string&& parAddress, uint16_t parPort, uint16_t parDatabase, bool parConnect, dincore::SearchPaths&& parLuaPaths) :
 		m_redis(std::move(parAddress), parPort),
+		m_lua_script_paths(std::move(parLuaPaths)),
 		m_database(parDatabase)
 	{
 		if (parConnect)
@@ -290,12 +291,19 @@ extern "C" dindb::Backend* dindexer_create_backend (const YAML::Node* parConfig)
 	if (not parConfig)
 		return nullptr;
 
-	auto config = parConfig->as<dindb::RedisConnectionSettings>();
+	auto& config_node = *parConfig;
+	auto config = config_node["connection"].as<dindb::RedisConnectionSettings>();
+
+	auto vec = (config_node["script_paths"] ? config_node["script_paths"].as<std::vector<std::string>>() : std::vector<std::string>());
+	dincore::SearchPaths lua_paths(std::move(vec));
+	lua_paths.add_path(REDIS_SCRIPTS_PATH);
+
 	return new dindb::BackendRedis(
 		std::move(config.address),
 		config.port,
 		config.database,
-		true
+		true,
+		std::move(lua_paths)
 	);
 }
 
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index 2958694..d7ced97 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -20,6 +20,7 @@
 
 #include "backends/db_backend.hpp"
 #include "command.hpp"
+#include "dindexer-core/searchpaths.hpp"
 #include <string>
 #include <cstdint>
 
@@ -27,7 +28,7 @@ namespace dindb {
 	class BackendRedis : public Backend {
 	public:
 		BackendRedis ( BackendRedis&& ) = default;
-		BackendRedis ( std::string&& parAddress, uint16_t parPort, uint16_t parDatabase, bool parConnect );
+		BackendRedis ( std::string&& parAddress, uint16_t parPort, uint16_t parDatabase, bool parConnect, dincore::SearchPaths&& parLuaPaths );
 		virtual ~BackendRedis ( void ) noexcept;
 
 		virtual void connect ( void ) override;
@@ -57,6 +58,7 @@ namespace dindb {
 
 	private:
 		redis::Command m_redis;
+		dincore::SearchPaths m_lua_script_paths;
 		uint16_t m_database;
 	};
 } //namespace dindb
diff --git a/src/backends/redis/redisConfig.h.in b/src/backends/redis/redisConfig.h.in
index e638fbd..3fd23bc 100644
--- a/src/backends/redis/redisConfig.h.in
+++ b/src/backends/redis/redisConfig.h.in
@@ -24,4 +24,6 @@
 #	define WITH_CRYPTOPP
 #endif
 
+#define REDIS_SCRIPTS_PATH "@DINDEXER_REDIS_SCRIPTS_PATH@"
+
 #endif

From 53f9e721721a33c38e34768b45b953befcaec473 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 15:20:49 +0100
Subject: [PATCH 094/170] Nest postgre settings into node "connection" for
 consistency with redis.

---
 dindexer.yml                                   | 11 ++++++-----
 src/backends/postgresql/backend_postgresql.cpp |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dindexer.yml b/dindexer.yml
index 0f1330f..4d084c3 100644
--- a/dindexer.yml
+++ b/dindexer.yml
@@ -2,9 +2,10 @@
 ---
 backend_name: postgresql
 postgresql_settings:
-    username: your_username
-    password: your_password
-    dbname: dindexer
-    port: 5432
-    address: 200.100.200.100
+    connection:
+        username: your_username
+        password: your_password
+        dbname: dindexer
+        port: 5432
+        address: 200.100.200.100
 backend_paths: path to your build_dir/src/backend
diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
index 933a9ce..3d31c05 100644
--- a/src/backends/postgresql/backend_postgresql.cpp
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -167,7 +167,8 @@ extern "C" dindb::Backend* dindexer_create_backend (const YAML::Node* parConfig)
 	if (not parConfig)
 		return nullptr;
 
-	auto config = parConfig->as<dindb::PostgreConnectionSettings>();
+	auto& config_node = *parConfig;
+	auto config = config_node["connection"].as<dindb::PostgreConnectionSettings>();
 	return new dindb::BackendPostgreSql(
 		std::move(config.username),
 		std::move(config.password),

From 0e31aa7ea0353bd096a1ffa39836d9ff0a724a72 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 15:22:31 +0100
Subject: [PATCH 095/170] Update sample config with dummy Redis settings.

---
 dindexer.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dindexer.yml b/dindexer.yml
index 4d084c3..eeb1a26 100644
--- a/dindexer.yml
+++ b/dindexer.yml
@@ -8,4 +8,14 @@ postgresql_settings:
         dbname: dindexer
         port: 5432
         address: 200.100.200.100
+
+redis_settings:
+    connection:
+        address: 200.100.200.100
+        port: 6379
+
+    script_paths:
+    - /home/duckz/dev/build/dindexer/Debug/src/backends/redis/lua
+    - /home/duckz/dev/build/dindexer/Release/src/backends/redis/lua
+
 backend_paths: path to your build_dir/src/backend

From 1aacca9e21b2398ef4900a76495f301568c6fc84 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 16:08:21 +0100
Subject: [PATCH 096/170] Load save and delete scripts upon connection to
 Redis.

---
 src/backends/redis/backend_redis.cpp | 21 +++++++++++++++++++++
 src/backends/redis/backend_redis.hpp |  3 +++
 src/backends/redis/script.cpp        |  8 +++++++-
 src/backends/redis/script.hpp        | 10 +++++++++-
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index fd18299..6d9db6c 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -26,6 +26,7 @@
 #include <yaml-cpp/yaml.h>
 #include <array>
 #include <cstdint>
+#include <fstream>
 
 namespace dindb {
 	namespace {
@@ -93,6 +94,23 @@ namespace dindb {
 			}
 			return retval;
 		}
+
+		std::string read_script (const dincore::SearchPaths& parSearch, const char* parName) {
+			const auto full_path = parSearch.first_hit(boost::string_ref(parName));
+			if (full_path.empty()) {
+				const std::string msg = std::string("Unable to locate and load Lua script \"") + parName + "\" from any of the given search paths";
+				throw std::runtime_error(msg);
+			}
+
+			std::ifstream script(full_path);
+			std::string retval;
+			script.seekg(0, std::ios::end);
+			retval.reserve(script.tellg());
+			script.seekg(0, std::ios::beg);
+			retval.assign(std::istreambuf_iterator<char>(script), std::istreambuf_iterator<char>());
+
+			return retval;
+		}
 	} //unnamed namespace
 } //namespace dindb
 
@@ -165,6 +183,9 @@ namespace dindb {
 			oss << "Error connecting to Redis: " << m_redis.connection_error();
 			throw std::runtime_error(oss.str());
 		}
+
+		m_script_save = m_redis.make_script(read_script(m_lua_script_paths, "save.lua"));
+		m_script_delete = m_redis.make_script(read_script(m_lua_script_paths, "delete.lua"));
 	}
 
 	void BackendRedis::disconnect() {
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index d7ced97..040a22a 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -20,6 +20,7 @@
 
 #include "backends/db_backend.hpp"
 #include "command.hpp"
+#include "script.hpp"
 #include "dindexer-core/searchpaths.hpp"
 #include <string>
 #include <cstdint>
@@ -58,6 +59,8 @@ namespace dindb {
 
 	private:
 		redis::Command m_redis;
+		redis::Script m_script_save;
+		redis::Script m_script_delete;
 		dincore::SearchPaths m_lua_script_paths;
 		uint16_t m_database;
 	};
diff --git a/src/backends/redis/script.cpp b/src/backends/redis/script.cpp
index af7eeac..d88ec39 100644
--- a/src/backends/redis/script.cpp
+++ b/src/backends/redis/script.cpp
@@ -18,9 +18,15 @@
 #include "script.hpp"
 
 namespace redis {
+	Script::Script() :
+		m_sha1(),
+		m_manager(nullptr)
+	{
+	}
+
 	Script::Script (boost::string_ref parSha1, ScriptManager& parManager) :
 		m_sha1(parSha1),
-		m_manager(parManager)
+		m_manager(&parManager)
 	{
 	}
 } //namespace redis
diff --git a/src/backends/redis/script.hpp b/src/backends/redis/script.hpp
index e169bf6..033469c 100644
--- a/src/backends/redis/script.hpp
+++ b/src/backends/redis/script.hpp
@@ -23,12 +23,15 @@
 #include "helpers/sequence_bt.hpp"
 #include <boost/utility/string_ref.hpp>
 #include <tuple>
+#include <cassert>
+#include <ciso646>
 
 namespace redis {
 	class ScriptManager;
 
 	class Script {
 	public:
+		Script ( void );
 		Script ( Script&& ) = default;
 		Script ( boost::string_ref parSha1, ScriptManager& parManager );
 		~Script ( void ) noexcept = default;
@@ -36,12 +39,14 @@ namespace redis {
 		template <typename... Keys, typename... Values>
 		void run ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues );
 
+		Script& operator= ( Script&& ) = default;
+
 	private:
 		template <typename... Keys, typename... Values, std::size_t... KeyIndices, std::size_t... ValueIndices>
 		void run_with_indices ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dinhelp::bt::index_seq<KeyIndices...>, dinhelp::bt::index_seq<ValueIndices...> );
 
 		boost::string_ref m_sha1;
-		ScriptManager& m_manager;
+		ScriptManager* m_manager;
 	};
 
 	template <typename... Keys, typename... Values>
@@ -62,6 +67,9 @@ namespace redis {
 		static_assert(sizeof...(Keys) == std::tuple_size<decltype(parKeys)>::value, "Wrong key count");
 		static_assert(sizeof...(Values) == std::tuple_size<decltype(parValues)>::value, "Wrong value count");
 
+		assert(not m_sha1.empty());
+		assert(m_manager);
+
 		parBatch.run(
 			"EVALSHA",
 			m_sha1,

From 034ebca8739ec117b80b513ea56373840eeca5d8 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 19:52:27 +0100
Subject: [PATCH 097/170] Don't choke on nil replies from Redis.

---
 src/backends/redis/batch.cpp | 2 ++
 src/backends/redis/reply.cpp | 4 ++++
 src/backends/redis/reply.hpp | 7 +++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/batch.cpp b/src/backends/redis/batch.cpp
index d24cccf..5fa56b2 100644
--- a/src/backends/redis/batch.cpp
+++ b/src/backends/redis/batch.cpp
@@ -64,6 +64,8 @@ namespace redis {
 				return ErrorString(parReply->str, parReply->len);
 			case REDIS_REPLY_STATUS:
 				return StatusString(parReply->str, parReply->len);
+			case REDIS_REPLY_NIL:
+				return nullptr;
 			default:
 				assert(false); //not reached
 				return Reply();
diff --git a/src/backends/redis/reply.cpp b/src/backends/redis/reply.cpp
index 575d543..d7aa376 100644
--- a/src/backends/redis/reply.cpp
+++ b/src/backends/redis/reply.cpp
@@ -26,6 +26,10 @@ namespace redis {
 	}
 
 	const std::string& get_string (const Reply& parReply) {
+		static const std::string empty_str;
+		if (RedisVariantType_Nil == parReply.which())
+			return empty_str;
+
 		assert(RedisVariantType_String == parReply.which());
 		return boost::get<std::string>(parReply);
 	}
diff --git a/src/backends/redis/reply.hpp b/src/backends/redis/reply.hpp
index bffbe25..9c6c33e 100644
--- a/src/backends/redis/reply.hpp
+++ b/src/backends/redis/reply.hpp
@@ -53,7 +53,8 @@ namespace redis {
 			std::string,
 			std::vector<Reply>,
 			ErrorString,
-			StatusString
+			StatusString,
+			std::nullptr_t
 		>;
 	} //namespace implem
 	enum RedisVariantTypes {
@@ -61,7 +62,8 @@ namespace redis {
 		RedisVariantType_String,
 		RedisVariantType_Array,
 		RedisVariantType_Error,
-		RedisVariantType_Status
+		RedisVariantType_Status,
+		RedisVariantType_Nil
 	};
 
 	struct Reply : implem::RedisVariantType {
@@ -73,6 +75,7 @@ namespace redis {
 		Reply ( std::vector<Reply>&& parVal ) : base_class(std::move(parVal)) {}
 		Reply ( ErrorString&& parVal ) : base_class(std::move(parVal)) {}
 		Reply ( StatusString&& parVal ) : base_class(std::move(parVal)) {}
+		Reply ( std::nullptr_t parVal ) : base_class(parVal) {}
 		~Reply ( void ) noexcept = default;
 	};
 

From 5b14823cb84b7f6bd0bb216c060f51196a71ec40 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 19:52:55 +0100
Subject: [PATCH 098/170] Implement storing scan result in Redis backend. Yay!

---
 src/backends/redis/backend_redis.cpp | 38 ++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 6d9db6c..d46fc31 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -27,6 +27,7 @@
 #include <array>
 #include <cstdint>
 #include <fstream>
+#include <boost/range/empty.hpp>
 
 namespace dindb {
 	namespace {
@@ -218,8 +219,16 @@ namespace dindb {
 		using boost::string_ref;
 
 		redis::Reply set_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "set", "1");
+		redis::Reply file_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "files", lexical_cast<std::string>(parData.size()));
+
 		const std::string set_key = PROGRAM_NAME ":set:" + lexical_cast<std::string>(redis::get_integer(set_id_reply));
-		redis::Reply insert_set_reply = m_redis.run(
+		const auto casted_data_size = static_cast<decltype(redis::get_integer(file_id_reply))>(parData.size());
+		assert(redis::get_integer(file_id_reply) >= casted_data_size);
+		const auto base_file_id = redis::get_integer(file_id_reply) - casted_data_size + 1;
+
+		auto batch = m_redis.make_batch();
+
+		batch.run(
 			"HMSET",
 			set_key,
 			"name", parSetData.name,
@@ -228,13 +237,12 @@ namespace dindb {
 			"type", parSetData.type,
 			"content_type", parSetData.content_type
 		);
-		//m_redis.hmset(parSetData);
 
-		for (const auto& file_data : parData) {
-			redis::Reply file_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "files", "1");
-			const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(redis::get_integer(file_id_reply));
+		for (auto z = base_file_id; z < casted_data_size; ++z) {
+			const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(z);
+			const auto& file_data = parData[z - base_file_id];
 			const std::string hash = tiger_to_string(file_data.hash);
-			redis::Reply insert_file_reply = m_redis.run(
+			batch.run(
 				"HMSET",
 				file_key,
 				"hash", hash,
@@ -250,15 +258,19 @@ namespace dindb {
 				"group_id", set_key
 			);
 
-			redis::Reply insert_hash_reply = m_redis.run(
+			batch.run(
 				"SADD",
-				"hash:" + hash,
+				PROGRAM_NAME ":hash:" + hash,
 				file_key
 			);
 		}
+
+		batch.throw_if_failed();
 	}
 
 	bool BackendRedis::search_file_by_hash (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) {
+		using boost::empty;
+
 		const std::string hash_key = "hash:" + tiger_to_string(parHash);
 		redis::Reply hash_reply = m_redis.run("SRANDMEMBER", hash_key);
 		if (redis::RedisVariantType_Integer == hash_reply.which() and not redis::get_integer(hash_reply)) {
@@ -270,8 +282,14 @@ namespace dindb {
 			parItem = std::move(set_key_and_file_item.second);
 			const std::string group_key = std::move(set_key_and_file_item.first);
 
-			auto set_item = pair_list_to_set_record(m_redis.hscan(group_key));
-			return true;
+			auto scan_range = m_redis.hscan(group_key);
+			if (empty(scan_range)) {
+				return false;
+			}
+			else {
+				parSet = pair_list_to_set_record(m_redis.hscan(group_key));
+				return true;
+			}
 		}
 	}
 

From 004ba83752bfca2eed7d6f0e2d341938d11a44ef Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 21:32:09 +0100
Subject: [PATCH 099/170] Fix find-by-hash function.

---
 src/backends/redis/backend_redis.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index d46fc31..35ee375 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -271,9 +271,9 @@ namespace dindb {
 	bool BackendRedis::search_file_by_hash (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) {
 		using boost::empty;
 
-		const std::string hash_key = "hash:" + tiger_to_string(parHash);
+		const std::string hash_key = PROGRAM_NAME ":hash:" + tiger_to_string(parHash);
 		redis::Reply hash_reply = m_redis.run("SRANDMEMBER", hash_key);
-		if (redis::RedisVariantType_Integer == hash_reply.which() and not redis::get_integer(hash_reply)) {
+		if (redis::RedisVariantType_Nil == hash_reply.which() or (redis::RedisVariantType_Integer == hash_reply.which() and not redis::get_integer(hash_reply))) {
 			return false;
 		}
 		else {

From e92ee0cef08fd2c31490984841914add69eb3188 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 21:33:01 +0100
Subject: [PATCH 100/170] Revert "Import ohm-scripts from soveran's repo."

This reverts commit fc4bec4e1939606dee261be04386ff77fb17943b.
---
 .gitmodules     | 3 ---
 lib/ohm-scripts | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 lib/ohm-scripts

diff --git a/.gitmodules b/.gitmodules
index 112dc9e..94e1d37 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,3 @@
 [submodule "lib/better-enums"]
 	path = lib/better-enums
 	url = https://github.com/aantron/better-enums
-[submodule "lib/ohm-scripts"]
-	path = lib/ohm-scripts
-	url = https://github.com/soveran/ohm-scripts.git
diff --git a/lib/ohm-scripts b/lib/ohm-scripts
deleted file mode 160000
index 407e421..0000000
--- a/lib/ohm-scripts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 407e421ddd1209bf8168dc27a3abf0fc7ad9105c

From 678e8c90d142eebc7b09d2e96f795575c8a6d239 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 21:35:31 +0100
Subject: [PATCH 101/170] Revert "Load save and delete scripts upon connection
 to Redis."

This reverts commit 1aacca9e21b2398ef4900a76495f301568c6fc84.
---
 src/backends/redis/backend_redis.cpp | 21 ---------------------
 src/backends/redis/backend_redis.hpp |  3 ---
 src/backends/redis/script.cpp        |  8 +-------
 src/backends/redis/script.hpp        | 10 +---------
 4 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 35ee375..990a6e1 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -26,7 +26,6 @@
 #include <yaml-cpp/yaml.h>
 #include <array>
 #include <cstdint>
-#include <fstream>
 #include <boost/range/empty.hpp>
 
 namespace dindb {
@@ -95,23 +94,6 @@ namespace dindb {
 			}
 			return retval;
 		}
-
-		std::string read_script (const dincore::SearchPaths& parSearch, const char* parName) {
-			const auto full_path = parSearch.first_hit(boost::string_ref(parName));
-			if (full_path.empty()) {
-				const std::string msg = std::string("Unable to locate and load Lua script \"") + parName + "\" from any of the given search paths";
-				throw std::runtime_error(msg);
-			}
-
-			std::ifstream script(full_path);
-			std::string retval;
-			script.seekg(0, std::ios::end);
-			retval.reserve(script.tellg());
-			script.seekg(0, std::ios::beg);
-			retval.assign(std::istreambuf_iterator<char>(script), std::istreambuf_iterator<char>());
-
-			return retval;
-		}
 	} //unnamed namespace
 } //namespace dindb
 
@@ -184,9 +166,6 @@ namespace dindb {
 			oss << "Error connecting to Redis: " << m_redis.connection_error();
 			throw std::runtime_error(oss.str());
 		}
-
-		m_script_save = m_redis.make_script(read_script(m_lua_script_paths, "save.lua"));
-		m_script_delete = m_redis.make_script(read_script(m_lua_script_paths, "delete.lua"));
 	}
 
 	void BackendRedis::disconnect() {
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index 040a22a..d7ced97 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -20,7 +20,6 @@
 
 #include "backends/db_backend.hpp"
 #include "command.hpp"
-#include "script.hpp"
 #include "dindexer-core/searchpaths.hpp"
 #include <string>
 #include <cstdint>
@@ -59,8 +58,6 @@ namespace dindb {
 
 	private:
 		redis::Command m_redis;
-		redis::Script m_script_save;
-		redis::Script m_script_delete;
 		dincore::SearchPaths m_lua_script_paths;
 		uint16_t m_database;
 	};
diff --git a/src/backends/redis/script.cpp b/src/backends/redis/script.cpp
index d88ec39..af7eeac 100644
--- a/src/backends/redis/script.cpp
+++ b/src/backends/redis/script.cpp
@@ -18,15 +18,9 @@
 #include "script.hpp"
 
 namespace redis {
-	Script::Script() :
-		m_sha1(),
-		m_manager(nullptr)
-	{
-	}
-
 	Script::Script (boost::string_ref parSha1, ScriptManager& parManager) :
 		m_sha1(parSha1),
-		m_manager(&parManager)
+		m_manager(parManager)
 	{
 	}
 } //namespace redis
diff --git a/src/backends/redis/script.hpp b/src/backends/redis/script.hpp
index 033469c..e169bf6 100644
--- a/src/backends/redis/script.hpp
+++ b/src/backends/redis/script.hpp
@@ -23,15 +23,12 @@
 #include "helpers/sequence_bt.hpp"
 #include <boost/utility/string_ref.hpp>
 #include <tuple>
-#include <cassert>
-#include <ciso646>
 
 namespace redis {
 	class ScriptManager;
 
 	class Script {
 	public:
-		Script ( void );
 		Script ( Script&& ) = default;
 		Script ( boost::string_ref parSha1, ScriptManager& parManager );
 		~Script ( void ) noexcept = default;
@@ -39,14 +36,12 @@ namespace redis {
 		template <typename... Keys, typename... Values>
 		void run ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues );
 
-		Script& operator= ( Script&& ) = default;
-
 	private:
 		template <typename... Keys, typename... Values, std::size_t... KeyIndices, std::size_t... ValueIndices>
 		void run_with_indices ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dinhelp::bt::index_seq<KeyIndices...>, dinhelp::bt::index_seq<ValueIndices...> );
 
 		boost::string_ref m_sha1;
-		ScriptManager* m_manager;
+		ScriptManager& m_manager;
 	};
 
 	template <typename... Keys, typename... Values>
@@ -67,9 +62,6 @@ namespace redis {
 		static_assert(sizeof...(Keys) == std::tuple_size<decltype(parKeys)>::value, "Wrong key count");
 		static_assert(sizeof...(Values) == std::tuple_size<decltype(parValues)>::value, "Wrong value count");
 
-		assert(not m_sha1.empty());
-		assert(m_manager);
-
 		parBatch.run(
 			"EVALSHA",
 			m_sha1,

From 75335cd3901ed694485dd1ab7ee97b4e5e95e26e Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 8 Jul 2016 21:36:50 +0100
Subject: [PATCH 102/170] Implement default ctor and move assignment in Script.

---
 src/backends/redis/script.cpp |  8 +++++++-
 src/backends/redis/script.hpp | 10 +++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/script.cpp b/src/backends/redis/script.cpp
index af7eeac..d88ec39 100644
--- a/src/backends/redis/script.cpp
+++ b/src/backends/redis/script.cpp
@@ -18,9 +18,15 @@
 #include "script.hpp"
 
 namespace redis {
+	Script::Script() :
+		m_sha1(),
+		m_manager(nullptr)
+	{
+	}
+
 	Script::Script (boost::string_ref parSha1, ScriptManager& parManager) :
 		m_sha1(parSha1),
-		m_manager(parManager)
+		m_manager(&parManager)
 	{
 	}
 } //namespace redis
diff --git a/src/backends/redis/script.hpp b/src/backends/redis/script.hpp
index e169bf6..033469c 100644
--- a/src/backends/redis/script.hpp
+++ b/src/backends/redis/script.hpp
@@ -23,12 +23,15 @@
 #include "helpers/sequence_bt.hpp"
 #include <boost/utility/string_ref.hpp>
 #include <tuple>
+#include <cassert>
+#include <ciso646>
 
 namespace redis {
 	class ScriptManager;
 
 	class Script {
 	public:
+		Script ( void );
 		Script ( Script&& ) = default;
 		Script ( boost::string_ref parSha1, ScriptManager& parManager );
 		~Script ( void ) noexcept = default;
@@ -36,12 +39,14 @@ namespace redis {
 		template <typename... Keys, typename... Values>
 		void run ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues );
 
+		Script& operator= ( Script&& ) = default;
+
 	private:
 		template <typename... Keys, typename... Values, std::size_t... KeyIndices, std::size_t... ValueIndices>
 		void run_with_indices ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dinhelp::bt::index_seq<KeyIndices...>, dinhelp::bt::index_seq<ValueIndices...> );
 
 		boost::string_ref m_sha1;
-		ScriptManager& m_manager;
+		ScriptManager* m_manager;
 	};
 
 	template <typename... Keys, typename... Values>
@@ -62,6 +67,9 @@ namespace redis {
 		static_assert(sizeof...(Keys) == std::tuple_size<decltype(parKeys)>::value, "Wrong key count");
 		static_assert(sizeof...(Values) == std::tuple_size<decltype(parValues)>::value, "Wrong value count");
 
+		assert(not m_sha1.empty());
+		assert(m_manager);
+
 		parBatch.run(
 			"EVALSHA",
 			m_sha1,

From 446d173ad3d47893438b2a8567f00ee40552f1d4 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sat, 9 Jul 2016 14:57:30 +0100
Subject: [PATCH 103/170] Fix broken static_assert.

---
 src/backends/redis/script.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/script.hpp b/src/backends/redis/script.hpp
index 033469c..088e9e0 100644
--- a/src/backends/redis/script.hpp
+++ b/src/backends/redis/script.hpp
@@ -64,8 +64,8 @@ namespace redis {
 	void Script::run_with_indices (Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dinhelp::bt::index_seq<KeyIndices...>, dinhelp::bt::index_seq<ValueIndices...>) {
 		static_assert(sizeof...(Keys) == sizeof...(KeyIndices), "Wrong index count");
 		static_assert(sizeof...(Values) == sizeof...(ValueIndices), "Wrong value count");
-		static_assert(sizeof...(Keys) == std::tuple_size<decltype(parKeys)>::value, "Wrong key count");
-		static_assert(sizeof...(Values) == std::tuple_size<decltype(parValues)>::value, "Wrong value count");
+		static_assert(sizeof...(Keys) == std::tuple_size<std::tuple<Keys...>>::value, "Wrong key count");
+		static_assert(sizeof...(Values) == std::tuple_size<std::tuple<Values...>>::value, "Wrong value count");
 
 		assert(not m_sha1.empty());
 		assert(m_manager);

From d6e95eac8e0003b656e16ac290812640d956cf0d Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sat, 9 Jul 2016 14:57:58 +0100
Subject: [PATCH 104/170] Enable tagging by id in Redis backend.

---
 src/backends/redis/CMakeLists.txt    |  3 +--
 src/backends/redis/backend_redis.cpp | 37 ++++++++++++++++++++++++++++
 src/backends/redis/backend_redis.hpp |  2 ++
 src/backends/redis/tag_if_in_set.lua | 30 ++++++++++++++++++++++
 4 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 src/backends/redis/tag_if_in_set.lua

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 19f75d5..19f7f05 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -51,8 +51,7 @@ configure_file(
 	${CMAKE_CURRENT_BINARY_DIR}/redisConfig.h
 )
 set(LUA_SCRIPTS
-	"${CMAKE_SOURCE_DIR}/lib/ohm-scripts/save.lua"
-	"${CMAKE_SOURCE_DIR}/lib/ohm-scripts/delete.lua"
+	tag_if_in_set.lua
 )
 
 install(TARGETS ${PROJECT_NAME}
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 990a6e1..3bd8543 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -27,6 +27,8 @@
 #include <array>
 #include <cstdint>
 #include <boost/range/empty.hpp>
+#include <fstream>
+#include <sstream>
 
 namespace dindb {
 	namespace {
@@ -94,6 +96,23 @@ namespace dindb {
 			}
 			return retval;
 		}
+
+		std::string read_script (const dincore::SearchPaths& parSearch, const char* parName) {
+			const auto full_path = parSearch.first_hit(boost::string_ref(parName));
+			if (full_path.empty()) {
+				const std::string msg = std::string("Unable to locate and load Lua script \"") + parName + "\" from any of the given search paths";
+				throw std::runtime_error(msg);
+			}
+
+			std::ifstream script(full_path);
+			std::string retval;
+			script.seekg(0, std::ios::end);
+			retval.reserve(script.tellg());
+			script.seekg(0, std::ios::beg);
+			retval.assign(std::istreambuf_iterator<char>(script), std::istreambuf_iterator<char>());
+
+			return retval;
+		}
 	} //unnamed namespace
 } //namespace dindb
 
@@ -140,6 +159,7 @@ namespace YAML {
 namespace dindb {
 	BackendRedis::BackendRedis(std::string&& parAddress, uint16_t parPort, uint16_t parDatabase, bool parConnect, dincore::SearchPaths&& parLuaPaths) :
 		m_redis(std::move(parAddress), parPort),
+		m_tag_if_in_set(),
 		m_lua_script_paths(std::move(parLuaPaths)),
 		m_database(parDatabase)
 	{
@@ -166,6 +186,8 @@ namespace dindb {
 			oss << "Error connecting to Redis: " << m_redis.connection_error();
 			throw std::runtime_error(oss.str());
 		}
+
+		m_tag_if_in_set = m_redis.make_script(read_script(m_lua_script_paths, "tag_if_in_set.lua"));
 	}
 
 	void BackendRedis::disconnect() {
@@ -173,6 +195,21 @@ namespace dindb {
 	}
 
 	void BackendRedis::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		using dinhelp::lexical_cast;
+
+		auto batch = m_redis.make_batch();
+		const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
+		for (const auto file_id : parFiles) {
+			for (const auto &tag : parTags) {
+				std::ostringstream oss;
+				oss << PROGRAM_NAME ":tag:" << tag;
+				const std::string tag_key = oss.str();
+				const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(file_id);
+				m_tag_if_in_set.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
+			}
+		}
+
+		batch.throw_if_failed();
 	}
 
 	void BackendRedis::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index d7ced97..08fb6cc 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -20,6 +20,7 @@
 
 #include "backends/db_backend.hpp"
 #include "command.hpp"
+#include "script.hpp"
 #include "dindexer-core/searchpaths.hpp"
 #include <string>
 #include <cstdint>
@@ -58,6 +59,7 @@ namespace dindb {
 
 	private:
 		redis::Command m_redis;
+		redis::Script m_tag_if_in_set;
 		dincore::SearchPaths m_lua_script_paths;
 		uint16_t m_database;
 	};
diff --git a/src/backends/redis/tag_if_in_set.lua b/src/backends/redis/tag_if_in_set.lua
new file mode 100644
index 0000000..6c9ec12
--- /dev/null
+++ b/src/backends/redis/tag_if_in_set.lua
@@ -0,0 +1,30 @@
+-- Copyright 2015, 2016, Michele Santullo
+-- This file is part of "dindexer".
+--
+-- "dindexer" is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- "dindexer" 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 General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+
+local tag_key = KEYS[1]
+local file_key = KEYS[2]
+local group_key = ARGV[1]
+
+if group_key == "" then
+	return redis.call("SADD", tag_key, file_key)
+else
+	local found_group_key = redis.call("HGET", file_key, "group_id")
+	if found_group_key == group_key then
+		return redis.call("SADD", tag_key, file_key)
+	else
+		return nil
+	end
+end

From 01d587b7dae4d47929961d4043f69f7c543eb18e Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 13:56:46 +0100
Subject: [PATCH 105/170] Move redis range to record data struct into a
 separate file.

---
 src/backends/redis/backend_redis.cpp     | 77 +------------------
 src/backends/redis/command.hpp           | 18 +++++
 src/backends/redis/record_data_adapt.hpp | 97 ++++++++++++++++++++++++
 3 files changed, 118 insertions(+), 74 deletions(-)
 create mode 100644 src/backends/redis/record_data_adapt.hpp

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 3bd8543..63c6eab 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -22,6 +22,7 @@
 #include "helpers/lexical_cast.hpp"
 #include "dindexerConfig.h"
 #include "helpers/stringize.h"
+#include "record_data_adapt.hpp"
 #include <utility>
 #include <yaml-cpp/yaml.h>
 #include <array>
@@ -38,65 +39,6 @@ namespace dindb {
 			uint16_t database;
 		};
 
-		std::pair<std::string, mchlib::FileRecordData> pair_list_to_file_record (const redis::Command::hscan_range& parRange) {
-			using dinhelp::lexical_cast;
-
-			mchlib::FileRecordData retval;
-			std::array<std::string, 2> mime;
-			std::string group_key;
-
-			for (const auto itm : parRange) {
-				if (itm.first == "path")
-					retval.abs_path = itm.second;
-				else if (itm.first == "hash")
-					retval.hash = mchlib::string_to_tiger(itm.second);
-				else if (itm.first == "size")
-					retval.size = lexical_cast<decltype(retval.size)>(
-							itm.second);
-				else if (itm.first == "level")
-					retval.level = lexical_cast<decltype(retval.level)>(
-							itm.second);
-				else if (itm.first == "mime_type")
-					mime[0] = itm.second;
-				else if (itm.first == "mime_charset")
-					mime[1] = itm.second;
-				else if (itm.first == "is_directory")
-					retval.is_directory = (itm.second[0] == '0' ? false : true);
-				else if (itm.first == "is_symlink")
-					retval.is_symlink = (itm.second[0] == '0' ? false : true);
-				else if (itm.first == "unreadable")
-					retval.unreadable = (itm.second[0] == '0' ? false : true);
-				else if (itm.first == "hash_valid")
-					retval.hash_valid = (itm.second[0] == '0' ? false : true);
-				else if (itm.first == "group_id")
-					group_key = itm.second;
-			}
-			retval.mime_full = mime[0] + mime[1];
-			retval.mime_type_offset = 0;
-			retval.mime_type_length = retval.mime_charset_offset = static_cast<uint16_t>(mime[0].size());
-			retval.mime_charset_length = static_cast<uint16_t>(mime[1].size());
-			return std::make_pair(group_key, std::move(retval));
-		}
-
-		mchlib::SetRecordDataFull pair_list_to_set_record (const redis::Command::hscan_range& parRange) {
-			using dinhelp::lexical_cast;
-
-			mchlib::SetRecordDataFull retval;
-			for (const auto& itm : parRange) {
-				if (itm.first == "name")
-					retval.name = itm.second;
-				else if (itm.first == "disk_label")
-					retval.disk_label = itm.second;
-				else if (itm.first == "fs_uuid")
-					retval.fs_uuid = itm.second;
-				else if (itm.first == "type")
-					retval.type = itm.second[0];
-				else if (itm.first == "content_type")
-					retval.content_type = itm.second[0];
-			}
-			return retval;
-		}
-
 		std::string read_script (const dincore::SearchPaths& parSearch, const char* parName) {
 			const auto full_path = parSearch.first_hit(boost::string_ref(parName));
 			if (full_path.empty()) {
@@ -143,19 +85,6 @@ namespace YAML {
 	};
 } //namespace YAML
 
-//namespace redis {
-//	template <>
-//	struct RedisStructAdapt<mchlib::FileRecordData> {
-//		static bool decode (const Command::hscan_range& parFrom, mchlib::FileRecordData& parOut) {
-//			return true;
-//		}
-//
-//		static void encode (const Command::hscan_range& parFrom, mchlib::FileRecordData& parOut) {
-//			return true;
-//		}
-//	};
-//}
-
 namespace dindb {
 	BackendRedis::BackendRedis(std::string&& parAddress, uint16_t parPort, uint16_t parDatabase, bool parConnect, dincore::SearchPaths&& parLuaPaths) :
 		m_redis(std::move(parAddress), parPort),
@@ -294,7 +223,7 @@ namespace dindb {
 		}
 		else {
 			const auto result_id = redis::get_string(hash_reply);
-			auto set_key_and_file_item = pair_list_to_file_record(m_redis.hscan(result_id));
+			auto set_key_and_file_item = redis::range_as<FileRecordDataWithGroup>(m_redis.hscan(result_id));
 			parItem = std::move(set_key_and_file_item.second);
 			const std::string group_key = std::move(set_key_and_file_item.first);
 
@@ -303,7 +232,7 @@ namespace dindb {
 				return false;
 			}
 			else {
-				parSet = pair_list_to_set_record(m_redis.hscan(group_key));
+				parSet = redis::range_as<mchlib::SetRecordDataFull>(m_redis.hscan(group_key));
 				return true;
 			}
 		}
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index d9c6fbf..17c3172 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -31,7 +31,9 @@
 #include <vector>
 #include <utility>
 #include <boost/range/iterator_range_core.hpp>
+#include <boost/range/empty.hpp>
 #include <boost/utility/string_ref.hpp>
+#include <ciso646>
 #include <stdexcept>
 
 namespace redis {
@@ -83,6 +85,22 @@ namespace redis {
 		batch.throw_if_failed();
 		return batch.replies().front();
 	}
+
+	template <typename T>
+	struct StructAdapt;
+
+	template <typename AS, typename I>
+	AS range_conv ( const boost::iterator_range<I>& parRange );
+
+	template <typename AS, typename I>
+	inline AS range_as (const boost::iterator_range<I>& parRange) {
+		assert(not boost::empty(parRange));
+		AS retval;
+		const auto success = StructAdapt<AS>::decode(parRange, retval);
+		if (not success)
+			throw std::runtime_error("Error decoding range");
+		return retval;
+	};
 } //namespace redis
 
 #endif
diff --git a/src/backends/redis/record_data_adapt.hpp b/src/backends/redis/record_data_adapt.hpp
new file mode 100644
index 0000000..c0aaaca
--- /dev/null
+++ b/src/backends/redis/record_data_adapt.hpp
@@ -0,0 +1,97 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id2949D72CC2F246D4A289FFB820CC3A8F
+#define id2949D72CC2F246D4A289FFB820CC3A8F
+
+#include "dindexer-machinery/recorddata.hpp"
+#include "helpers/lexical_cast.hpp"
+#include <array>
+#include <string>
+#include <cstdint>
+#include <utility>
+
+namespace dindb {
+	using FileRecordDataWithGroup = std::pair<std::string, mchlib::FileRecordData>;
+} //namespace dindb
+
+namespace redis {
+	template <>
+	struct StructAdapt<dindb::FileRecordDataWithGroup> {
+		template <typename R>
+		static bool decode (const R& parRange, dindb::FileRecordDataWithGroup& parOut) {
+			using dinhelp::lexical_cast;
+
+			std::array<std::string, 2> mime;
+			std::string group_key;
+
+			for (const auto itm : parRange) {
+				if (itm.first == "path")
+					parOut.second.abs_path = itm.second;
+				else if (itm.first == "hash")
+					parOut.second.hash = mchlib::string_to_tiger(itm.second);
+				else if (itm.first == "size")
+					parOut.second.size = lexical_cast<decltype(parOut.second.size)>(itm.second);
+				else if (itm.first == "level")
+					parOut.second.level = lexical_cast<decltype(parOut.second.level)>(itm.second);
+				else if (itm.first == "mime_type")
+					mime[0] = itm.second;
+				else if (itm.first == "mime_charset")
+					mime[1] = itm.second;
+				else if (itm.first == "is_directory")
+					parOut.second.is_directory = (itm.second[0] == '0' ? false : true);
+				else if (itm.first == "is_symlink")
+					parOut.second.is_symlink = (itm.second[0] == '0' ? false : true);
+				else if (itm.first == "unreadable")
+					parOut.second.unreadable = (itm.second[0] == '0' ? false : true);
+				else if (itm.first == "hash_valid")
+					parOut.second.hash_valid = (itm.second[0] == '0' ? false : true);
+				else if (itm.first == "group_id")
+					parOut.first = itm.second;
+			}
+			parOut.second.mime_full = mime[0] + mime[1];
+			parOut.second.mime_type_offset = 0;
+			parOut.second.mime_type_length = parOut.second.mime_charset_offset = static_cast<uint16_t>(mime[0].size());
+			parOut.second.mime_charset_length = static_cast<uint16_t>(mime[1].size());
+			return true;
+		}
+	};
+
+	template <>
+	struct StructAdapt<mchlib::SetRecordDataFull> {
+		template <typename R>
+		static bool decode (const R& parRange, mchlib::SetRecordDataFull& parOut) {
+			using dinhelp::lexical_cast;
+
+			for (const auto& itm : parRange) {
+				if (itm.first == "name")
+					parOut.name = itm.second;
+				else if (itm.first == "disk_label")
+					parOut.disk_label = itm.second;
+				else if (itm.first == "fs_uuid")
+					parOut.fs_uuid = itm.second;
+				else if (itm.first == "type")
+					parOut.type = itm.second[0];
+				else if (itm.first == "content_type")
+					parOut.content_type = itm.second[0];
+			}
+			return true;
+		}
+	};
+} //namespace redis
+
+#endif

From 7b77913b499fdd5a82c58a58fe0aa2d2ee2b9712 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 13:57:16 +0100
Subject: [PATCH 106/170] Allow passing a pattern to *scan commands.

---
 src/backends/redis/command.cpp | 16 ++++++++--------
 src/backends/redis/command.hpp |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index e58707f..490501b 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -77,20 +77,20 @@ namespace redis {
 		return m_local_data->async_connection.connection_error();
 	}
 
-	auto Command::scan() -> scan_range {
-		return scan_range(scan_iterator(this, false), scan_iterator(this, true));
+	auto Command::scan (boost::string_ref parPattern) -> scan_range {
+		return scan_range(scan_iterator(this, false, parPattern), scan_iterator(this, true));
 	}
 
-	auto Command::hscan (boost::string_ref parKey) -> hscan_range {
-		return hscan_range(hscan_iterator(this, parKey, false), hscan_iterator(this, parKey, true));
+	auto Command::hscan (boost::string_ref parKey, boost::string_ref parPattern) -> hscan_range {
+		return hscan_range(hscan_iterator(this, parKey, false, parPattern), hscan_iterator(this, parKey, true));
 	}
 
-	auto Command::sscan (boost::string_ref parKey) -> sscan_range {
-		return sscan_range(sscan_iterator(this, parKey, false), sscan_iterator(this, parKey, true));
+	auto Command::sscan (boost::string_ref parKey, boost::string_ref parPattern) -> sscan_range {
+		return sscan_range(sscan_iterator(this, parKey, false, parPattern), sscan_iterator(this, parKey, true));
 	}
 
-	auto Command::zscan (boost::string_ref parKey) -> zscan_range {
-		return zscan_range(zscan_iterator(this, parKey, false), zscan_iterator(this, parKey, true));
+	auto Command::zscan (boost::string_ref parKey, boost::string_ref parPattern) -> zscan_range {
+		return zscan_range(zscan_iterator(this, parKey, false, parPattern), zscan_iterator(this, parKey, true));
 	}
 
 	Batch Command::make_batch() {
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 17c3172..767581c 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -67,10 +67,10 @@ namespace redis {
 		Reply run ( const char* parCommand, Args&&... parArgs );
 
 		//Single Redis command wrappers
-		scan_range scan ( void );
-		hscan_range hscan ( boost::string_ref parKey );
-		sscan_range sscan ( boost::string_ref parKey );
-		zscan_range zscan ( boost::string_ref parKey );
+		scan_range scan ( boost::string_ref parPattern=boost::string_ref() );
+		hscan_range hscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
+		sscan_range sscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
+		zscan_range zscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
 
 	private:
 		struct LocalData;

From 9c2f1d7403a971b3bf939c368869b6812c2db02c Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 13:59:45 +0100
Subject: [PATCH 107/170] Move tagging by id into a separate file.

---
 src/backends/redis/CMakeLists.txt    |  1 +
 src/backends/redis/backend_redis.cpp | 18 +------
 src/backends/redis/tag.cpp           | 63 +++++++++++++++++++++++
 src/backends/redis/tag.hpp           | 75 ++++++++++++++++++++++++++++
 4 files changed, 141 insertions(+), 16 deletions(-)
 create mode 100644 src/backends/redis/tag.cpp
 create mode 100644 src/backends/redis/tag.hpp

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 19f7f05..121572a 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -15,6 +15,7 @@ add_library(${PROJECT_NAME} SHARED
 	script.cpp
 	script_manager.cpp
 	async_connection.cpp
+	tag.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 63c6eab..822b4e0 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -22,6 +22,7 @@
 #include "helpers/lexical_cast.hpp"
 #include "dindexerConfig.h"
 #include "helpers/stringize.h"
+#include "tag.hpp"
 #include "record_data_adapt.hpp"
 #include <utility>
 #include <yaml-cpp/yaml.h>
@@ -29,7 +30,6 @@
 #include <cstdint>
 #include <boost/range/empty.hpp>
 #include <fstream>
-#include <sstream>
 
 namespace dindb {
 	namespace {
@@ -124,21 +124,7 @@ namespace dindb {
 	}
 
 	void BackendRedis::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		using dinhelp::lexical_cast;
-
-		auto batch = m_redis.make_batch();
-		const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
-		for (const auto file_id : parFiles) {
-			for (const auto &tag : parTags) {
-				std::ostringstream oss;
-				oss << PROGRAM_NAME ":tag:" << tag;
-				const std::string tag_key = oss.str();
-				const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(file_id);
-				m_tag_if_in_set.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
-			}
-		}
-
-		batch.throw_if_failed();
+		dindb::tag_files(m_redis, m_tag_if_in_set, parFiles, parTags, parSet);
 	}
 
 	void BackendRedis::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
new file mode 100644
index 0000000..99fbba1
--- /dev/null
+++ b/src/backends/redis/tag.cpp
@@ -0,0 +1,63 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "tag.hpp"
+#include "command.hpp"
+#include "dindexerConfig.h"
+#include "helpers/lexical_cast.hpp"
+#include <sstream>
+#include <tuple>
+#include <regex>
+
+namespace dindb {
+	namespace {
+	} //unnamed namespace
+
+	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		using dinhelp::lexical_cast;
+
+		auto batch = parRedis.make_batch();
+		const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
+		for (const auto file_id : parFiles) {
+			for (const auto &tag : parTags) {
+				std::ostringstream oss;
+				oss << PROGRAM_NAME ":tag:" << tag;
+				const std::string tag_key = oss.str();
+				const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(file_id);
+				parTagIfInSet.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
+			}
+		}
+
+		batch.throw_if_failed();
+	}
+
+	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	}
+
+	void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	}
+
+	void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	}
+
+	void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<uint64_t>& parFiles, GroupIDType parSet) {
+	}
+
+	void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, GroupIDType parSet) {
+	}
+} //namespace dindb
+
diff --git a/src/backends/redis/tag.hpp b/src/backends/redis/tag.hpp
new file mode 100644
index 0000000..1b4b55b
--- /dev/null
+++ b/src/backends/redis/tag.hpp
@@ -0,0 +1,75 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id2874EA620CF0415CAF5B005E227BC44B
+#define id2874EA620CF0415CAF5B005E227BC44B
+
+#include "backends/db_backend.hpp"
+#include <vector>
+#include <boost/utility/string_ref.hpp>
+#include <cstdint>
+
+namespace redis {
+	class Command;
+	class Script;
+} //namespace redis
+
+namespace dindb {
+	void tag_files (
+		redis::Command& parRedis,
+		redis::Script& parTagIfInSet,
+		const std::vector<uint64_t>& parFiles,
+		const std::vector<boost::string_ref>& parTags,
+		GroupIDType parSet
+	);
+	void tag_files (
+		redis::Command& parRedis,
+		redis::Script& parTagIfInSet,
+		const std::vector<std::string>& parRegexes,
+		const std::vector<boost::string_ref>& parTags,
+		GroupIDType parSet
+	);
+
+	void delete_tags (
+		redis::Command& parRedis,
+		redis::Script& parDeleIfInSet,
+		const std::vector<uint64_t>& parFiles,
+		const std::vector<boost::string_ref>& parTags,
+		GroupIDType parSet
+	);
+	void delete_tags (
+		redis::Command& parRedis,
+		redis::Script& parDeleIfInSet,
+		const std::vector<std::string>& parRegexes,
+		const std::vector<boost::string_ref>& parTags,
+		GroupIDType parSet
+	);
+	void delete_all_tags (
+		redis::Command& parRedis,
+		redis::Script& parDeleIfInSet,
+		const std::vector<uint64_t>& parFiles,
+		GroupIDType parSet
+	);
+	void delete_all_tags (
+		redis::Command& parRedis,
+		redis::Script& parDeleIfInSet,
+		const std::vector<std::string>& parRegexes,
+		GroupIDType parSet
+	);
+} //namespace dindb
+
+#endif

From af7443c48b8cc7b2fef9d9bed6b44d6fcaa1025f Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 14:00:51 +0100
Subject: [PATCH 108/170] Implement tagging by regex.

---
 src/backends/redis/backend_redis.cpp |  1 +
 src/backends/redis/tag.cpp           | 32 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 822b4e0..491d34a 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -128,6 +128,7 @@ namespace dindb {
 	}
 
 	void BackendRedis::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		dindb::tag_files(m_redis, m_tag_if_in_set, parRegexes, parTags, parSet);
 	}
 
 	void BackendRedis::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index 99fbba1..dfcfa35 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -25,6 +25,18 @@
 
 namespace dindb {
 	namespace {
+		std::vector<std::regex> compile_regexes (const std::vector<std::string>& parRegexes) {
+			std::vector<std::regex> retval;
+			retval.reserve(parRegexes.size());
+			for (const auto& str : parRegexes) {
+				retval.emplace_back(std::regex(
+					str,
+					std::regex_constants::optimize | std::regex_constants::nosubs | std::regex_constants::ECMAScript
+				));
+			}
+			assert(retval.size() == parRegexes.size());
+			return retval;
+		}
 	} //unnamed namespace
 
 	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
@@ -46,6 +58,26 @@ namespace dindb {
 	}
 
 	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		using dinhelp::lexical_cast;
+
+		auto batch = parRedis.make_batch();
+		const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
+		const auto regexes = compile_regexes(parRegexes);
+		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
+			const auto& file_key = itm;
+			const auto path = redis::get_string(parRedis.run("HGET", file_key, "path"));
+			for (const auto& regex : regexes) {
+				if (not std::regex_search(path, regex))
+					continue;
+
+				for (const auto &tag : parTags) {
+					std::ostringstream oss;
+					oss << PROGRAM_NAME ":tag:" << tag;
+					const std::string tag_key = oss.str();
+					parTagIfInSet.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
+				}
+			}
+		}
 	}
 
 	void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {

From de00a4b469311cbd26dc25d177a76ab3274c39a0 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 14:01:43 +0100
Subject: [PATCH 109/170] Add and load dele_tag_if_in_set Lua script.

---
 src/backends/redis/CMakeLists.txt         |  1 +
 src/backends/redis/backend_redis.cpp      |  5 ++++
 src/backends/redis/backend_redis.hpp      |  1 +
 src/backends/redis/dele_tag_if_in_set.lua | 30 +++++++++++++++++++++++
 4 files changed, 37 insertions(+)
 create mode 100644 src/backends/redis/dele_tag_if_in_set.lua

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 121572a..95cd5e5 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -53,6 +53,7 @@ configure_file(
 )
 set(LUA_SCRIPTS
 	tag_if_in_set.lua
+	dele_tag_if_in_set.lua
 )
 
 install(TARGETS ${PROJECT_NAME}
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 491d34a..35b235d 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -117,6 +117,7 @@ namespace dindb {
 		}
 
 		m_tag_if_in_set = m_redis.make_script(read_script(m_lua_script_paths, "tag_if_in_set.lua"));
+		m_dele_tag_if_in_set = m_redis.make_script(read_script(m_lua_script_paths, "dele_tag_if_in_set.lua"));
 	}
 
 	void BackendRedis::disconnect() {
@@ -132,15 +133,19 @@ namespace dindb {
 	}
 
 	void BackendRedis::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		dindb::delete_tags(m_redis, m_dele_tag_if_in_set, parFiles, parTags, parSet);
 	}
 
 	void BackendRedis::delete_tags (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		dindb::delete_tags(m_redis, m_dele_tag_if_in_set, parRegexes, parTags, parSet);
 	}
 
 	void BackendRedis::delete_all_tags (const std::vector<FileIDType>& parFiles, GroupIDType parSet) {
+		dindb::delete_all_tags(m_redis, m_dele_tag_if_in_set, parFiles, parSet);
 	}
 
 	void BackendRedis::delete_all_tags (const std::vector<std::string>& parRegexes, GroupIDType parSet) {
+		dindb::delete_all_tags(m_redis, m_dele_tag_if_in_set, parRegexes, parSet);
 	}
 
 	void BackendRedis::delete_group (const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index 08fb6cc..be03011 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -60,6 +60,7 @@ namespace dindb {
 	private:
 		redis::Command m_redis;
 		redis::Script m_tag_if_in_set;
+		redis::Script m_dele_tag_if_in_set;
 		dincore::SearchPaths m_lua_script_paths;
 		uint16_t m_database;
 	};
diff --git a/src/backends/redis/dele_tag_if_in_set.lua b/src/backends/redis/dele_tag_if_in_set.lua
new file mode 100644
index 0000000..ea51924
--- /dev/null
+++ b/src/backends/redis/dele_tag_if_in_set.lua
@@ -0,0 +1,30 @@
+-- Copyright 2015, 2016, Michele Santullo
+-- This file is part of "dindexer".
+--
+-- "dindexer" is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- "dindexer" 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 General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+
+local tag_key = KEYS[1]
+local file_key = KEYS[2]
+local group_key = ARGV[1]
+
+if group_key == "" then
+	return redis.call("SREM", tag_key, file_key)
+else
+	local found_group_key = redis.call("HGET", file_key, "group_id")
+	if found_group_key == group_key then
+		return redis.call("SREM", tag_key, file_key)
+	else
+		return nil
+	end
+end

From 77fb699ec26e57481bbd8a70f19edc732fa746cc Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 14:02:42 +0100
Subject: [PATCH 110/170] Drop unneeded (and wrong) prototype.

---
 src/backends/redis/command.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 767581c..58717e9 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -89,9 +89,6 @@ namespace redis {
 	template <typename T>
 	struct StructAdapt;
 
-	template <typename AS, typename I>
-	AS range_conv ( const boost::iterator_range<I>& parRange );
-
 	template <typename AS, typename I>
 	inline AS range_as (const boost::iterator_range<I>& parRange) {
 		assert(not boost::empty(parRange));

From 3d7632ef2cfe07f1ffa7d3a1f4bc61c47f052ef7 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 14:07:15 +0100
Subject: [PATCH 111/170] Forgot to wait for batch to complete.

And batch was declared in the wrong place anyways -_-
---
 src/backends/redis/tag.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index dfcfa35..e9d8d2d 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -60,12 +60,13 @@ namespace dindb {
 	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 		using dinhelp::lexical_cast;
 
-		auto batch = parRedis.make_batch();
 		const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
 		const auto regexes = compile_regexes(parRegexes);
 		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
 			const auto& file_key = itm;
 			const auto path = redis::get_string(parRedis.run("HGET", file_key, "path"));
+
+			auto batch = parRedis.make_batch();
 			for (const auto& regex : regexes) {
 				if (not std::regex_search(path, regex))
 					continue;
@@ -77,6 +78,7 @@ namespace dindb {
 					parTagIfInSet.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
 				}
 			}
+			batch.throw_if_failed();
 		}
 	}
 

From 7451b8dc5dd083122d658f504ce2915a7868681b Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 14:10:39 +0100
Subject: [PATCH 112/170] Implement delete tag by id.

---
 src/backends/redis/tag.cpp | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index e9d8d2d..d873097 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -37,24 +37,28 @@ namespace dindb {
 			assert(retval.size() == parRegexes.size());
 			return retval;
 		}
+
+		void run_script (redis::Command& parRedis, redis::Script& parScript, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+			using dinhelp::lexical_cast;
+
+			auto batch = parRedis.make_batch();
+			const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
+			for (const auto file_id : parFiles) {
+				for (const auto &tag : parTags) {
+					std::ostringstream oss;
+					oss << PROGRAM_NAME ":tag:" << tag;
+					const std::string tag_key = oss.str();
+					const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(file_id);
+					parScript.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
+				}
+			}
+
+			batch.throw_if_failed();
+		}
 	} //unnamed namespace
 
 	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		using dinhelp::lexical_cast;
-
-		auto batch = parRedis.make_batch();
-		const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
-		for (const auto file_id : parFiles) {
-			for (const auto &tag : parTags) {
-				std::ostringstream oss;
-				oss << PROGRAM_NAME ":tag:" << tag;
-				const std::string tag_key = oss.str();
-				const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(file_id);
-				parTagIfInSet.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
-			}
-		}
-
-		batch.throw_if_failed();
+		run_script(parRedis, parTagIfInSet, parFiles, parTags, parSet);
 	}
 
 	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
@@ -83,6 +87,7 @@ namespace dindb {
 	}
 
 	void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		run_script(parRedis, parDeleIfInSet, parFiles, parTags, parSet);
 	}
 
 	void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {

From 9423c4da7350b7e06644f9cad54e2b04f785b454 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 14:13:41 +0100
Subject: [PATCH 113/170] Implement deleting tags by regex.

---
 src/backends/redis/tag.cpp | 55 +++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index d873097..adb9fe3 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -38,7 +38,7 @@ namespace dindb {
 			return retval;
 		}
 
-		void run_script (redis::Command& parRedis, redis::Script& parScript, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		void run_id_based_script (redis::Command& parRedis, redis::Script& parScript, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 			using dinhelp::lexical_cast;
 
 			auto batch = parRedis.make_batch();
@@ -55,42 +55,47 @@ namespace dindb {
 
 			batch.throw_if_failed();
 		}
+
+		void run_regex_based_script(redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+			using dinhelp::lexical_cast;
+
+			const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
+			const auto regexes = compile_regexes(parRegexes);
+			for (const auto &itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
+				const auto &file_key = itm;
+				const auto path = redis::get_string(parRedis.run("HGET", file_key, "path"));
+
+				auto batch = parRedis.make_batch();
+				for (const auto &regex : regexes) {
+					if (not std::regex_search(path, regex))
+						continue;
+
+					for (const auto &tag : parTags) {
+						std::ostringstream oss;
+						oss << PROGRAM_NAME ":tag:" << tag;
+						const std::string tag_key = oss.str();
+						parTagIfInSet.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
+					}
+				}
+				batch.throw_if_failed();
+			}
+		}
 	} //unnamed namespace
 
 	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		run_script(parRedis, parTagIfInSet, parFiles, parTags, parSet);
+		run_id_based_script(parRedis, parTagIfInSet, parFiles, parTags, parSet);
 	}
 
 	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		using dinhelp::lexical_cast;
-
-		const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
-		const auto regexes = compile_regexes(parRegexes);
-		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
-			const auto& file_key = itm;
-			const auto path = redis::get_string(parRedis.run("HGET", file_key, "path"));
-
-			auto batch = parRedis.make_batch();
-			for (const auto& regex : regexes) {
-				if (not std::regex_search(path, regex))
-					continue;
-
-				for (const auto &tag : parTags) {
-					std::ostringstream oss;
-					oss << PROGRAM_NAME ":tag:" << tag;
-					const std::string tag_key = oss.str();
-					parTagIfInSet.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
-				}
-			}
-			batch.throw_if_failed();
-		}
+		run_regex_based_script(parRedis, parTagIfInSet, parRegexes, parTags, parSet);
 	}
 
 	void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		run_script(parRedis, parDeleIfInSet, parFiles, parTags, parSet);
+		run_id_based_script(parRedis, parDeleIfInSet, parFiles, parTags, parSet);
 	}
 
 	void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		run_regex_based_script(parRedis, parDeleIfInSet, parRegexes, parTags, parSet);
 	}
 
 	void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<uint64_t>& parFiles, GroupIDType parSet) {

From 4bd7c3515a385ce0599c6d91a841f4d23afa3b5a Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 16:52:20 +0100
Subject: [PATCH 114/170] Improve lua scripts.

Now a "tags" field gets added to the file item. It contains a comma
separated sorted list of the tags to which the item belongs.
---
 src/backends/redis/dele_tag_if_in_set.lua | 50 ++++++++++++++++++++---
 src/backends/redis/tag_if_in_set.lua      | 47 ++++++++++++++++++---
 2 files changed, 85 insertions(+), 12 deletions(-)

diff --git a/src/backends/redis/dele_tag_if_in_set.lua b/src/backends/redis/dele_tag_if_in_set.lua
index ea51924..124f0aa 100644
--- a/src/backends/redis/dele_tag_if_in_set.lua
+++ b/src/backends/redis/dele_tag_if_in_set.lua
@@ -18,13 +18,51 @@ local tag_key = KEYS[1]
 local file_key = KEYS[2]
 local group_key = ARGV[1]
 
-if group_key == "" then
-	return redis.call("SREM", tag_key, file_key)
-else
+local function split_string(inputstr, sep)
+	if sep == nil then
+		sep = "%s"
+	end
+	local t = {}
+	local z = 1
+	for str in string.gmatch(inputstr, "([^"..sep.."]+)") do
+		t[z] = str
+		z = z + 1
+	end
+	return t
+end
+
+local function dele_tag_from_list(tag_list, dele_tag)
+	tag_list = split_string(tag_list or "", ",")
+
+	local z = 1
+	for _,str in ipairs(tag_list) do
+		if str == dele_tag then
+			table.remove(tag_list, z)
+			break
+		end
+		z = z + 1
+	end
+	return table.concat(tag_list, ",")
+end
+
+if group_key ~= "" then
 	local found_group_key = redis.call("HGET", file_key, "group_id")
-	if found_group_key == group_key then
-		return redis.call("SREM", tag_key, file_key)
-	else
+	if found_group_key ~= group_key then
 		return nil
 	end
 end
+
+local dele_tag = split_string(tag_key, ":")
+local new_tag_list = dele_tag_from_list(redis.call("HGET", file_key, "tags"), dele_tag[#dele_tag])
+
+if new_tag_list == "" then
+	redis.call("HDEL", file_key, "tags")
+else
+	redis.call("HSET", file_key, "tags", new_tag_list)
+end
+
+local retval = redis.call("SREM", tag_key, file_key)
+if redis.call("SCARD", tag_key) == 0 then
+	redis.call("SREM", tag_key)
+end
+return retval
diff --git a/src/backends/redis/tag_if_in_set.lua b/src/backends/redis/tag_if_in_set.lua
index 6c9ec12..70c3419 100644
--- a/src/backends/redis/tag_if_in_set.lua
+++ b/src/backends/redis/tag_if_in_set.lua
@@ -18,13 +18,48 @@ local tag_key = KEYS[1]
 local file_key = KEYS[2]
 local group_key = ARGV[1]
 
-if group_key == "" then
-	return redis.call("SADD", tag_key, file_key)
-else
+local function split_string(inputstr, sep)
+	if sep == nil then
+		sep = "%s"
+	end
+	local t = {}
+	local z = 1
+	for str in string.gmatch(inputstr, "([^"..sep.."]+)") do
+		t[z] = str
+		z = z + 1
+	end
+	return t
+end
+
+local function add_tag_to_list(tag_list, new_tag)
+	if tag_list == false or tag_list == "" then
+		return new_tag
+	end
+	tag_list = split_string(tag_list, ",")
+
+	local new_tag_found = false
+	for _,str in ipairs(tag_list) do
+		if str == new_tag then
+			new_tag_found = true
+			break
+		end
+	end
+	if not new_tag_found then
+		tag_list[#tag_list+1] = new_tag
+	end
+	table.sort(tag_list)
+	return table.concat(tag_list, ",")
+end
+
+if group_key ~= "" then
 	local found_group_key = redis.call("HGET", file_key, "group_id")
-	if found_group_key == group_key then
-		return redis.call("SADD", tag_key, file_key)
-	else
+	if found_group_key ~= group_key then
 		return nil
 	end
 end
+
+local new_tag = split_string(tag_key, ":")
+local new_tag_list = add_tag_to_list(redis.call("HGET", file_key, "tags"), new_tag[#new_tag])
+
+redis.call("HSET", file_key, "tags", new_tag_list)
+return redis.call("SADD", tag_key, file_key)

From f12d498e405b5ba452f30aee36ee6484eeec541c Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 17:12:19 +0100
Subject: [PATCH 115/170] Move split_tags to core.

---
 include/{dindexer-common => dindexer-core}/split_tags.hpp | 4 ++--
 src/common/CMakeLists.txt                                 | 1 -
 src/common/settings.cpp                                   | 4 +++-
 src/core/CMakeLists.txt                                   | 1 +
 src/{common => core}/split_tags.cpp                       | 6 +++---
 src/locate/main.cpp                                       | 4 ++--
 src/tag/main.cpp                                          | 8 ++++----
 test/unit_cli/test_tag_splitting.cpp                      | 4 ++--
 8 files changed, 17 insertions(+), 15 deletions(-)
 rename include/{dindexer-common => dindexer-core}/split_tags.hpp (96%)
 rename src/{common => core}/split_tags.cpp (96%)

diff --git a/include/dindexer-common/split_tags.hpp b/include/dindexer-core/split_tags.hpp
similarity index 96%
rename from include/dindexer-common/split_tags.hpp
rename to include/dindexer-core/split_tags.hpp
index 3005751..6af5d6b 100644
--- a/include/dindexer-common/split_tags.hpp
+++ b/include/dindexer-core/split_tags.hpp
@@ -23,9 +23,9 @@
 #include <boost/utility/string_ref.hpp>
 #include "helpers/compatibility.h"
 
-namespace dinlib {
+namespace dincore {
 	std::vector<boost::string_ref> split_and_trim ( const std::string& parList, char parSeparator ) a_pure;
 	std::vector<boost::string_ref> split_tags ( const std::string& parCommaSeparatedList ) a_pure;
-} //namespace dinlib
+} //namespace dincore
 
 #endif
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 2242e42..aaa2809 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -8,7 +8,6 @@ add_library(${PROJECT_NAME}
 	validationerror.cpp
 	common_info.cpp
 	readline_wrapper.cpp
-	split_tags.cpp
 )
 
 target_include_directories(${PROJECT_NAME}
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index e3a66f1..bdb66d2 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "dindexer-common/settings.hpp"
-#include "dindexer-common/split_tags.hpp"
+#include "dindexer-core/split_tags.hpp"
 #include "dindexer-core/searchpaths.hpp"
 #include "dindexerConfig.h"
 #include <yaml-cpp/yaml.h>
@@ -35,6 +35,8 @@ namespace dinlib {
 	} //unnamed namespace
 
 	void load_settings (const std::string& parPath, dinlib::Settings& parOut, bool parExpand) {
+		using dincore::split_and_trim;
+
 		const std::string path = (parExpand ? expand(parPath.c_str()) : parPath);
 		std::string search_paths;
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 5ae3892..db7fa9b 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -2,6 +2,7 @@ project(${bare_name}-core CXX)
 
 add_library(${PROJECT_NAME} SHARED
 	searchpaths.cpp
+	split_tags.cpp
 )
 
 target_link_libraries(${PROJECT_NAME}
diff --git a/src/common/split_tags.cpp b/src/core/split_tags.cpp
similarity index 96%
rename from src/common/split_tags.cpp
rename to src/core/split_tags.cpp
index 931a8d5..cdc5ef9 100644
--- a/src/common/split_tags.cpp
+++ b/src/core/split_tags.cpp
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dindexer-common/split_tags.hpp"
+#include "dindexer-core/split_tags.hpp"
 #include <boost/algorithm/string/finder.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
@@ -24,7 +24,7 @@
 #include <boost/range/adaptor/filtered.hpp>
 #include <ciso646>
 
-namespace dinlib {
+namespace dincore {
 	std::vector<boost::string_ref> split_tags (const std::string& parCommaSeparatedList) {
 		return split_and_trim(parCommaSeparatedList, ',');
 	}
@@ -52,4 +52,4 @@ namespace dinlib {
 				filtered([](const string_ref& r){return not r.empty();})
 		);
 	}
-} //namespace dinlib
+} //namespace dincore
diff --git a/src/locate/main.cpp b/src/locate/main.cpp
index 860a7a5..6e8fa91 100644
--- a/src/locate/main.cpp
+++ b/src/locate/main.cpp
@@ -17,7 +17,7 @@
 
 #include "commandline.hpp"
 #include "dindexer-common/settings.hpp"
-#include "dindexer-common/split_tags.hpp"
+#include "dindexer-core/split_tags.hpp"
 #include "dindexerConfig.h"
 #include "hash.hpp"
 #include "glob2regex/glob2regex.hpp"
@@ -47,7 +47,7 @@ namespace {
 		if (not parVM.count("tags"))
 			return std::vector<boost::string_ref>();
 		else
-			return dinlib::split_tags(parVM["tags"].as<std::string>());
+			return dincore::split_tags(parVM["tags"].as<std::string>());
 	}
 } //unnamed namespace
 
diff --git a/src/tag/main.cpp b/src/tag/main.cpp
index 454bc43..f934d9a 100644
--- a/src/tag/main.cpp
+++ b/src/tag/main.cpp
@@ -18,7 +18,7 @@
 #include "commandline.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexerConfig.h"
-#include "dindexer-common/split_tags.hpp"
+#include "dindexer-core/split_tags.hpp"
 #include "glob2regex/glob2regex.hpp"
 #include "enum.h"
 #include <iostream>
@@ -62,7 +62,7 @@ namespace {
 		switch (parMode) {
 		case TaggingMode::ID:
 		{
-			auto ids_string = dinlib::split_tags(parVM["ids"].as<std::string>());
+			auto ids_string = dincore::split_tags(parVM["ids"].as<std::string>());
 			std::vector<uint64_t> ids;
 			ids.reserve(ids_string.size());
 			std::transform(ids_string.begin(), ids_string.end(), std::back_inserter(ids), &lexical_cast<uint64_t, string_ref>);
@@ -92,7 +92,7 @@ namespace {
 		switch (parMode) {
 		case TaggingMode::ID:
 		{
-			auto ids_string = dinlib::split_tags(parVM["ids"].as<std::string>());
+			auto ids_string = dincore::split_tags(parVM["ids"].as<std::string>());
 			std::vector<uint64_t> ids;
 			ids.reserve(ids_string.size());
 			std::transform(ids_string.begin(), ids_string.end(), std::back_inserter(ids), &lexical_cast<uint64_t, string_ref>);
@@ -157,7 +157,7 @@ int main (int parArgc, char* parArgv[]) {
 	}
 
 	const auto master_tags_string = vm["tags"].as<std::string>();
-	const std::vector<boost::string_ref> tags = dinlib::split_tags(master_tags_string);
+	const std::vector<boost::string_ref> tags = dincore::split_tags(master_tags_string);
 	const auto mode = (glob_mode ? TaggingMode::Glob : TaggingMode::ID);
 
 	if (not vm.count("delete"))
diff --git a/test/unit_cli/test_tag_splitting.cpp b/test/unit_cli/test_tag_splitting.cpp
index 08066f6..0b8ef5b 100644
--- a/test/unit_cli/test_tag_splitting.cpp
+++ b/test/unit_cli/test_tag_splitting.cpp
@@ -18,10 +18,10 @@
 #include <gtest/gtest.h>
 #include <sstream>
 #include <boost/lexical_cast.hpp>
-#include "dindexer-common/split_tags.hpp"
+#include "dindexer-core/split_tags.hpp"
 
 TEST(cli_main, split_tags) {
-	using dinlib::split_tags;
+	using dincore::split_tags;
 
 	{
 		const std::string test_tags = "tag1,tag2";

From 83fe7c75d66d828908a4ca4565846e5710814896 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sun, 10 Jul 2016 17:15:45 +0100
Subject: [PATCH 116/170] Implement delete all tags by id.

---
 src/backends/redis/dele_tag_if_in_set.lua |  2 +-
 src/backends/redis/tag.cpp                | 35 ++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/dele_tag_if_in_set.lua b/src/backends/redis/dele_tag_if_in_set.lua
index 124f0aa..23ca35d 100644
--- a/src/backends/redis/dele_tag_if_in_set.lua
+++ b/src/backends/redis/dele_tag_if_in_set.lua
@@ -63,6 +63,6 @@ end
 
 local retval = redis.call("SREM", tag_key, file_key)
 if redis.call("SCARD", tag_key) == 0 then
-	redis.call("SREM", tag_key)
+	redis.call("DEL", tag_key)
 end
 return retval
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index adb9fe3..efb7fe4 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -19,12 +19,28 @@
 #include "command.hpp"
 #include "dindexerConfig.h"
 #include "helpers/lexical_cast.hpp"
+#include "dindexer-core/split_tags.hpp"
 #include <sstream>
 #include <tuple>
 #include <regex>
+#include <unordered_set>
+#include <boost/functional/hash.hpp>
+
+namespace std {
+    template<>
+    struct hash<boost::string_ref> {
+        size_t operator() (boost::string_ref const& sr) const {
+            return boost::hash_range(sr.begin(), sr.end());
+        }
+    };
+} //namespace std
 
 namespace dindb {
 	namespace {
+		std::string make_file_key (uint64_t parID) {
+			return PROGRAM_NAME ":file:" + dinhelp::lexical_cast<std::string>(parID);
+		}
+
 		std::vector<std::regex> compile_regexes (const std::vector<std::string>& parRegexes) {
 			std::vector<std::regex> retval;
 			retval.reserve(parRegexes.size());
@@ -48,7 +64,7 @@ namespace dindb {
 					std::ostringstream oss;
 					oss << PROGRAM_NAME ":tag:" << tag;
 					const std::string tag_key = oss.str();
-					const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(file_id);
+					const std::string file_key = make_file_key(file_id);
 					parScript.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
 				}
 			}
@@ -99,6 +115,23 @@ namespace dindb {
 	}
 
 	void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<uint64_t>& parFiles, GroupIDType parSet) {
+		auto batch = parRedis.make_batch();
+		for (const auto file_id : parFiles) {
+			const auto file_key = make_file_key(file_id);
+			batch.run("HGET", file_key, "tags");
+		}
+
+		batch.throw_if_failed();
+		std::unordered_set<boost::string_ref> dele_tags;
+		for (const auto& reply : batch.replies()) {
+			auto tags = dincore::split_tags(redis::get_string(reply));
+			for (const auto& tag : tags) {
+				dele_tags.insert(tag);
+			}
+		}
+
+		std::vector<boost::string_ref> vec_dele_tags(dele_tags.begin(), dele_tags.end());
+		delete_tags(parRedis, parDeleIfInSet, parFiles, vec_dele_tags, parSet);
 	}
 
 	void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, GroupIDType parSet) {

From 016f357704e67f0b7dec89660dae16ff7d17b37e Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 11:58:52 +0100
Subject: [PATCH 117/170] Use boost::regex and implement delete_all_tags by
 regex.

std::regex doesn't understand the (?i) modifier, which makes it
throw an exception on regex generated by the frontend. I can't
change the frontend, or the postgre plugin would break... thankfully
boost comes to the rescue :)
---
 src/backends/redis/CMakeLists.txt |  3 ++
 src/backends/redis/tag.cpp        | 64 ++++++++++++++++++++++++++++---
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 95cd5e5..941b141 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -5,6 +5,7 @@ set(DINDEXER_REDIS_SCRIPTS_PATH "${CMAKE_INSTALL_PREFIX}/${bare_name}/redis" CAC
 find_package(hiredis 0.11.0 REQUIRED)
 find_package(CryptoPP 5.6)
 find_package(libev 4.0 REQUIRED)
+find_package(Boost 1.53.0 REQUIRED COMPONENTS regex)
 
 add_library(${PROJECT_NAME} SHARED
 	backend_redis.cpp
@@ -23,6 +24,7 @@ target_include_directories(${PROJECT_NAME} SYSTEM
 	PRIVATE ${HIREDIS_INCLUDE_DIRS}
 	PRIVATE ${CMAKE_SOURCE_DIR}/lib/better-enums
 	PRIVATE ${LIBEV_INCLUDE_DIRS}
+	PRIVATE ${Boost_INCLUDE_DIRS}
 )
 target_include_directories(${PROJECT_NAME}
 	PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
@@ -33,6 +35,7 @@ target_link_libraries(${PROJECT_NAME}
 	PUBLIC ${bare_name}-core
 	PRIVATE ${HIREDIS_LIBRARIES}
 	PRIVATE ${LIBEV_LIBRARIES}
+	PRIVATE ${Boost_LIBRARIES}
 )
 
 target_compile_definitions(${PROJECT_NAME}
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index efb7fe4..6562b37 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -22,7 +22,7 @@
 #include "dindexer-core/split_tags.hpp"
 #include <sstream>
 #include <tuple>
-#include <regex>
+#include <boost/regex.hpp>
 #include <unordered_set>
 #include <boost/functional/hash.hpp>
 
@@ -41,13 +41,13 @@ namespace dindb {
 			return PROGRAM_NAME ":file:" + dinhelp::lexical_cast<std::string>(parID);
 		}
 
-		std::vector<std::regex> compile_regexes (const std::vector<std::string>& parRegexes) {
-			std::vector<std::regex> retval;
+		std::vector<boost::regex> compile_regexes (const std::vector<std::string>& parRegexes) {
+			std::vector<boost::regex> retval;
 			retval.reserve(parRegexes.size());
 			for (const auto& str : parRegexes) {
-				retval.emplace_back(std::regex(
+				retval.emplace_back(boost::regex(
 					str,
-					std::regex_constants::optimize | std::regex_constants::nosubs | std::regex_constants::ECMAScript
+					boost::regex_constants::optimize | boost::regex_constants::nosubs | boost::regex_constants::perl
 				));
 			}
 			assert(retval.size() == parRegexes.size());
@@ -83,7 +83,7 @@ namespace dindb {
 
 				auto batch = parRedis.make_batch();
 				for (const auto &regex : regexes) {
-					if (not std::regex_search(path, regex))
+					if (not boost::regex_search(path, regex))
 						continue;
 
 					for (const auto &tag : parTags) {
@@ -92,10 +92,17 @@ namespace dindb {
 						const std::string tag_key = oss.str();
 						parTagIfInSet.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
 					}
+					break;
 				}
 				batch.throw_if_failed();
 			}
 		}
+
+		template <typename T>
+		T id_from_redis_key (const std::string& parKey) {
+			assert(not parKey.empty());
+			return dinhelp::lexical_cast<T>(dincore::split_and_trim(parKey, ':').back());
+		}
 	} //unnamed namespace
 
 	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
@@ -135,6 +142,51 @@ namespace dindb {
 	}
 
 	void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, GroupIDType parSet) {
+		using dinhelp::lexical_cast;
+
+		const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
+		const auto regexes = compile_regexes(parRegexes);
+
+		std::set<std::string> dele_tags;
+		std::vector<uint64_t> ids;
+
+		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
+			const auto& file_key = itm;
+			auto file_reply = parRedis.run("HMGET", file_key, "path", "tags", "group_id");
+			auto& file_replies = redis::get_array(file_reply);
+			assert(file_replies.size() == 3);
+			const auto group_id = id_from_redis_key<GroupIDType>(redis::get_string(file_replies[2]));
+			if (parSet != InvalidGroupID and parSet != group_id)
+				continue;
+
+			const auto path = redis::get_string(file_replies[0]);
+			const auto tags_str = (file_replies[1].which() == redis::RedisVariantType_Nil ? std::string() : redis::get_string(file_replies[1]));
+			const auto tags = dincore::split_tags(tags_str);
+			const auto file_id = id_from_redis_key<FileIDType>(file_key);
+
+			for (const auto &regex : regexes) {
+				if (not boost::regex_search(path, regex))
+					continue;
+
+				ids.push_back(file_id);
+
+				for (const auto &tag : tags) {
+					dele_tags.insert(std::string(tag.data(), tag.size()));
+				}
+				break;
+			}
+		}
+
+		std::vector<boost::string_ref> dele_tags_vec;
+		dele_tags_vec.reserve(dele_tags.size());
+		std::transform(
+			dele_tags.begin(),
+			dele_tags.end(),
+			std::back_inserter(dele_tags_vec),
+			[](const std::string& parS) { return boost::string_ref(parS); }
+		);
+
+		delete_tags(parRedis, parDeleIfInSet, ids, dele_tags_vec, parSet);
 	}
 } //namespace dindb
 

From e70b137002050f41f18c876fb753c793a47fabc4 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 16:45:24 +0100
Subject: [PATCH 118/170] Fix sporadic failure in lexical_cast.

---
 include/helpers/lexical_cast.hpp | 14 +++++++------
 test/unit/test_lexical_cast.cpp  | 36 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/include/helpers/lexical_cast.hpp b/include/helpers/lexical_cast.hpp
index 18332c9..7417892 100644
--- a/include/helpers/lexical_cast.hpp
+++ b/include/helpers/lexical_cast.hpp
@@ -161,17 +161,19 @@ namespace dinhelp {
 		template <typename T>
 		template <std::size_t... Powers, std::size_t... Digits>
 		std::size_t dec<T>::count_digits_implem (T parValue, dinhelp::bt::index_seq<Powers...>, dinhelp::bt::index_seq<Digits...>) {
-			static T powers[] = { 0, static_cast<T>(dinhelp::implem::power<10, Powers + 1>::value)... };
-			static std::size_t maxdigits[] = { count_digits_bt(static_cast<std::size_t>(::pow(2.0, Digits)))... };
-			const auto bits = sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<T>(parValue);
-			return (parValue < powers[maxdigits[bits] - 1] ? maxdigits[bits] - 1 : maxdigits[bits]) + dinhelp::implem::is_negative<T>::check(parValue);
+			typedef typename std::make_unsigned<T>::type UT;
+			static constexpr UT powers[] = { 0, static_cast<UT>(dinhelp::implem::power<10, Powers + 1>::value)... };
+			static constexpr std::size_t maxdigits[] = { count_digits_bt(static_cast<std::size_t>(::pow(2.0, Digits))) - (std::numeric_limits<T>::is_signed ? 1 : 0)... };
+			const auto bits = sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<T>(dinhelp::implem::abs(parValue));
+			static_assert(std::is_same<UT, decltype(dinhelp::implem::abs(parValue))>::value, "Unexpected type");
+			return (dinhelp::implem::abs(parValue) < powers[maxdigits[bits] - 1] ? maxdigits[bits] - 1 : maxdigits[bits]) + dinhelp::implem::is_negative<T>::check(parValue);
 		}
 
 		template <typename T>
 		std::size_t dec<T>::count_digits (T parValue) {
 			return count_digits_implem(
 				parValue,
-				dinhelp::bt::index_range<0, count_digits_bt(std::numeric_limits<T>::max()) + 1>(),
+				dinhelp::bt::index_range<0, count_digits_bt(std::numeric_limits<T>::max()) - (std::numeric_limits<T>::is_signed ? 1 : 0) - 1>(),
 				dinhelp::bt::index_range<0, CHAR_BIT * sizeof(T) + 1>()
 			);
 		}
@@ -209,7 +211,7 @@ namespace dinhelp {
 
 		template <typename T>
 		inline int count_leading_zeroes (typename std::enable_if<std::numeric_limits<T>::is_signed, T>::type parValue) {
-			return count_leading_zeroes<decltype(abs(parValue))>(abs(parValue));
+			return count_leading_zeroes<decltype(dinhelp::implem::abs(parValue))>(dinhelp::implem::abs(parValue));
 		}
 
 		template <typename T>
diff --git a/test/unit/test_lexical_cast.cpp b/test/unit/test_lexical_cast.cpp
index 379b1f8..976f438 100644
--- a/test/unit/test_lexical_cast.cpp
+++ b/test/unit/test_lexical_cast.cpp
@@ -126,4 +126,40 @@ TEST(helpers, lexical_cast) {
 		const auto bin_str = lexical_cast<std::string, bin>(value);
 		EXPECT_EQ("11111111111111111111101010001000", bin_str);
 	}
+	{
+		const int32_t value = 515;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("203", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("515", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("1000000011", bin_str);
+	}
+	{
+		const int64_t value = 515;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("203", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("515", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("1000000011", bin_str);
+	}
+	{
+		const uint32_t value = 515;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("203", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("515", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("1000000011", bin_str);
+	}
+	{
+		const uint64_t value = 515;
+		const auto hex_str = lexical_cast<std::string, hex>(value);
+		EXPECT_EQ("203", hex_str);
+		const auto dec_str = lexical_cast<std::string, dec>(value);
+		EXPECT_EQ("515", dec_str);
+		const auto bin_str = lexical_cast<std::string, bin>(value);
+		EXPECT_EQ("1000000011", bin_str);
+	}
 }

From 62727d683166d86ecafcf1b7272ee115210e928a Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 16:45:46 +0100
Subject: [PATCH 119/170] Make sequence_bt more generic by taking the index
 type as well.

---
 include/helpers/sequence_bt.hpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/include/helpers/sequence_bt.hpp b/include/helpers/sequence_bt.hpp
index b79e126..d514c5e 100644
--- a/include/helpers/sequence_bt.hpp
+++ b/include/helpers/sequence_bt.hpp
@@ -22,26 +22,32 @@
 
 namespace dinhelp {
 	namespace bt {
-		template <std::size_t... I>
-		struct index_seq {
+		template <typename T, T... I>
+		struct number_seq {
 		};
 
+		template <std::size_t... I>
+		using index_seq = number_seq<std::size_t, I...>;
+
 		namespace implem {
-			template <std::size_t MIN, std::size_t MAX, std::size_t... I>
+			template <typename T, T MIN, T MAX, T... I>
 			struct range_builder;
 
-			template <std::size_t MIN, std::size_t... I>
-			struct range_builder<MIN, MIN, I...> {
-				typedef index_seq<I...> type;
+			template <typename T, T MIN, T... I>
+			struct range_builder<T, MIN, MIN, I...> {
+				typedef number_seq<T, I...> type;
 			};
 
-			template <std::size_t MIN, std::size_t N, std::size_t... I>
-			struct range_builder : public range_builder<MIN, N - 1, N - 1, I...> {
+			template <typename T, T MIN, T N, T... I>
+			struct range_builder : public range_builder<T, MIN, N - 1, N - 1, I...> {
 			};
 		} //namespace implem
 
+		template <typename T, T MIN, T MAX>
+		using number_range = typename implem::range_builder<T, MIN, MAX>::type;
+
 		template <std::size_t MIN, std::size_t MAX>
-		using index_range = typename implem::range_builder<MIN, MAX>::type;
+		using index_range = number_range<std::size_t, MIN, MAX>;
 	} //namespace bt
 } //namespace dinhelp
 

From bd06158d4c1e0fab65647342bbc05e6868ea3083 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 17:44:54 +0100
Subject: [PATCH 120/170] Store group id and file id instead of full keys.

---
 src/backends/redis/backend_redis.cpp      |  7 ++++---
 src/backends/redis/dele_tag_if_in_set.lua |  8 ++++----
 src/backends/redis/tag.cpp                | 11 +++++------
 src/backends/redis/tag_if_in_set.lua      |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 35b235d..711d1b9 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -158,7 +158,8 @@ namespace dindb {
 		redis::Reply set_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "set", "1");
 		redis::Reply file_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "files", lexical_cast<std::string>(parData.size()));
 
-		const std::string set_key = PROGRAM_NAME ":set:" + lexical_cast<std::string>(redis::get_integer(set_id_reply));
+		const auto group_id = lexical_cast<std::string>(redis::get_integer(set_id_reply));
+		const std::string set_key = PROGRAM_NAME ":set:" + group_id;
 		const auto casted_data_size = static_cast<decltype(redis::get_integer(file_id_reply))>(parData.size());
 		assert(redis::get_integer(file_id_reply) >= casted_data_size);
 		const auto base_file_id = redis::get_integer(file_id_reply) - casted_data_size + 1;
@@ -192,13 +193,13 @@ namespace dindb {
 				"is_symlink", (file_data.is_symlink ? '1' : '0'),
 				"unreadable", (file_data.unreadable ? '1' : '0'),
 				"hash_valid", (file_data.hash_valid ? '1' : '0'),
-				"group_id", set_key
+				"group_id", group_id
 			);
 
 			batch.run(
 				"SADD",
 				PROGRAM_NAME ":hash:" + hash,
-				file_key
+				lexical_cast<std::string>(z)
 			);
 		}
 
diff --git a/src/backends/redis/dele_tag_if_in_set.lua b/src/backends/redis/dele_tag_if_in_set.lua
index 23ca35d..eb5ada7 100644
--- a/src/backends/redis/dele_tag_if_in_set.lua
+++ b/src/backends/redis/dele_tag_if_in_set.lua
@@ -16,7 +16,7 @@
 
 local tag_key = KEYS[1]
 local file_key = KEYS[2]
-local group_key = ARGV[1]
+local group_id = ARGV[1]
 
 local function split_string(inputstr, sep)
 	if sep == nil then
@@ -45,9 +45,9 @@ local function dele_tag_from_list(tag_list, dele_tag)
 	return table.concat(tag_list, ",")
 end
 
-if group_key ~= "" then
-	local found_group_key = redis.call("HGET", file_key, "group_id")
-	if found_group_key ~= group_key then
+if group_id ~= 0 then
+	local found_group_id = redis.call("HGET", file_key, "group_id")
+	if found_group_id ~= group_id then
 		return nil
 	end
 end
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index 6562b37..e979c64 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -58,14 +58,14 @@ namespace dindb {
 			using dinhelp::lexical_cast;
 
 			auto batch = parRedis.make_batch();
-			const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
+			const std::string set_id = lexical_cast<std::string>(parSet);
 			for (const auto file_id : parFiles) {
 				for (const auto &tag : parTags) {
 					std::ostringstream oss;
 					oss << PROGRAM_NAME ":tag:" << tag;
 					const std::string tag_key = oss.str();
 					const std::string file_key = make_file_key(file_id);
-					parScript.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
+					parScript.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_id));
 				}
 			}
 
@@ -75,7 +75,7 @@ namespace dindb {
 		void run_regex_based_script(redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 			using dinhelp::lexical_cast;
 
-			const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
+			const std::string set_id = lexical_cast<std::string>(parSet);
 			const auto regexes = compile_regexes(parRegexes);
 			for (const auto &itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
 				const auto &file_key = itm;
@@ -90,7 +90,7 @@ namespace dindb {
 						std::ostringstream oss;
 						oss << PROGRAM_NAME ":tag:" << tag;
 						const std::string tag_key = oss.str();
-						parTagIfInSet.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_key));
+						parTagIfInSet.run(batch, std::make_tuple(tag_key, file_key), std::make_tuple(set_id));
 					}
 					break;
 				}
@@ -144,7 +144,6 @@ namespace dindb {
 	void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, GroupIDType parSet) {
 		using dinhelp::lexical_cast;
 
-		const std::string set_key = (parSet != InvalidGroupID ? PROGRAM_NAME ":set:" + lexical_cast<std::string>(parSet) : "");
 		const auto regexes = compile_regexes(parRegexes);
 
 		std::set<std::string> dele_tags;
@@ -155,7 +154,7 @@ namespace dindb {
 			auto file_reply = parRedis.run("HMGET", file_key, "path", "tags", "group_id");
 			auto& file_replies = redis::get_array(file_reply);
 			assert(file_replies.size() == 3);
-			const auto group_id = id_from_redis_key<GroupIDType>(redis::get_string(file_replies[2]));
+			const auto group_id = lexical_cast<GroupIDType>(redis::get_string(file_replies[2]));
 			if (parSet != InvalidGroupID and parSet != group_id)
 				continue;
 
diff --git a/src/backends/redis/tag_if_in_set.lua b/src/backends/redis/tag_if_in_set.lua
index 70c3419..2fc166f 100644
--- a/src/backends/redis/tag_if_in_set.lua
+++ b/src/backends/redis/tag_if_in_set.lua
@@ -16,7 +16,7 @@
 
 local tag_key = KEYS[1]
 local file_key = KEYS[2]
-local group_key = ARGV[1]
+local group_id = ARGV[1]
 
 local function split_string(inputstr, sep)
 	if sep == nil then
@@ -51,9 +51,9 @@ local function add_tag_to_list(tag_list, new_tag)
 	return table.concat(tag_list, ",")
 end
 
-if group_key ~= "" then
-	local found_group_key = redis.call("HGET", file_key, "group_id")
-	if found_group_key ~= group_key then
+if group_id ~= 0 then
+	local found_group_id = redis.call("HGET", file_key, "group_id")
+	if found_group_id ~= group_id then
 		return nil
 	end
 end

From e5007cf96fdf5790b4b34a90bdfbb70153ef5492 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 17:46:08 +0100
Subject: [PATCH 121/170] Use GroupIDType and FileIDType instead of uint.

---
 src/backends/postgresql/delete.cpp   | 10 +++++-----
 src/backends/postgresql/delete.hpp   |  5 ++---
 src/backends/redis/backend_redis.cpp |  2 +-
 src/backends/redis/backend_redis.hpp |  2 +-
 src/backends/redis/tag.cpp           | 12 ++++++------
 src/backends/redis/tag.hpp           |  7 +++----
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/backends/postgresql/delete.cpp b/src/backends/postgresql/delete.cpp
index a87fda4..ee50a74 100644
--- a/src/backends/postgresql/delete.cpp
+++ b/src/backends/postgresql/delete.cpp
@@ -29,7 +29,7 @@
 
 namespace dindb {
 	namespace {
-		IDDescMap fetch_existing_ids (pq::Connection& parConn, const std::vector<uint32_t>& parIDs) {
+		IDDescMap fetch_existing_ids (pq::Connection& parConn, const std::vector<GroupIDType>& parIDs) {
 			using boost::lexical_cast;
 
 			IDDescMap retmap;
@@ -39,7 +39,7 @@ namespace dindb {
 
 			std::ostringstream oss;
 			oss << "SELECT \"id\",\"desc\" FROM \"sets\" WHERE \"id\"=";
-			boost::copy(parIDs, infix_ostream_iterator<uint32_t>(oss, " OR \"id\"="));
+			boost::copy(parIDs, infix_ostream_iterator<GroupIDType>(oss, " OR \"id\"="));
 			oss << ';';
 
 			auto resultset = parConn.query(oss.str());
@@ -50,7 +50,7 @@ namespace dindb {
 		}
 	} //unnamed namespace
 
-	void delete_group_from_db (pq::Connection& parDB, const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
+	void delete_group_from_db (pq::Connection& parDB, const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
 		assert(parDB.is_connected());
 
 		const auto dele_ids = fetch_existing_ids(parDB, parIDs);
@@ -65,9 +65,9 @@ namespace dindb {
 		ids.reserve(dele_ids.size());
 		std::ostringstream oss;
 		oss << "BEGIN;\nDELETE FROM \"files\" WHERE \"group_id\"=";
-		boost::copy(dele_ids | boost::adaptors::map_keys, infix_ostream_iterator<uint32_t>(oss, " OR \"group_id\"="));
+		boost::copy(dele_ids | boost::adaptors::map_keys, infix_ostream_iterator<GroupIDType>(oss, " OR \"group_id\"="));
 		oss << ";\nDELETE FROM \"sets\" WHERE \"id\"=";
-		boost::copy(dele_ids | boost::adaptors::map_keys, infix_ostream_iterator<uint32_t>(oss, " OR \"id\"="));
+		boost::copy(dele_ids | boost::adaptors::map_keys, infix_ostream_iterator<GroupIDType>(oss, " OR \"id\"="));
 		oss << ";\nCOMMIT;";
 
 		parDB.query(oss.str());
diff --git a/src/backends/postgresql/delete.hpp b/src/backends/postgresql/delete.hpp
index 341cc47..befe62a 100644
--- a/src/backends/postgresql/delete.hpp
+++ b/src/backends/postgresql/delete.hpp
@@ -22,7 +22,6 @@
 #include <functional>
 #include <vector>
 #include <string>
-#include <cstdint>
 #include <map>
 
 namespace pq {
@@ -30,10 +29,10 @@ namespace pq {
 } //namespace pq
 
 namespace dindb {
-	using IDDescMap = std::map<uint32_t, std::string>;
+	using IDDescMap = std::map<GroupIDType, std::string>;
 	using ConfirmDeleCallback = std::function<bool(const IDDescMap&)>;
 
-	void delete_group_from_db ( pq::Connection& parDB, const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf );
+	void delete_group_from_db ( pq::Connection& parDB, const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf );
 } //namespace dindb
 
 #endif
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 711d1b9..34e4912 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -148,7 +148,7 @@ namespace dindb {
 		dindb::delete_all_tags(m_redis, m_dele_tag_if_in_set, parRegexes, parSet);
 	}
 
-	void BackendRedis::delete_group (const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf) {
+	void BackendRedis::delete_group (const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
 	}
 
 	void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index be03011..bd24782 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -42,7 +42,7 @@ namespace dindb {
 		virtual void delete_all_tags ( const std::vector<FileIDType>& parFiles, GroupIDType parSet ) override;
 		virtual void delete_all_tags ( const std::vector<std::string>& parRegexes, GroupIDType parSet ) override;
 
-		virtual void delete_group ( const std::vector<uint32_t>& parIDs, ConfirmDeleCallback parConf ) override;
+		virtual void delete_group ( const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf ) override;
 
 		virtual void write_files ( const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature ) override;
 		virtual bool search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash ) override;
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index e979c64..9af54cb 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -37,7 +37,7 @@ namespace std {
 
 namespace dindb {
 	namespace {
-		std::string make_file_key (uint64_t parID) {
+		std::string make_file_key (FileIDType parID) {
 			return PROGRAM_NAME ":file:" + dinhelp::lexical_cast<std::string>(parID);
 		}
 
@@ -54,7 +54,7 @@ namespace dindb {
 			return retval;
 		}
 
-		void run_id_based_script (redis::Command& parRedis, redis::Script& parScript, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		void run_id_based_script (redis::Command& parRedis, redis::Script& parScript, const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 			using dinhelp::lexical_cast;
 
 			auto batch = parRedis.make_batch();
@@ -105,7 +105,7 @@ namespace dindb {
 		}
 	} //unnamed namespace
 
-	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 		run_id_based_script(parRedis, parTagIfInSet, parFiles, parTags, parSet);
 	}
 
@@ -113,7 +113,7 @@ namespace dindb {
 		run_regex_based_script(parRedis, parTagIfInSet, parRegexes, parTags, parSet);
 	}
 
-	void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<uint64_t>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 		run_id_based_script(parRedis, parDeleIfInSet, parFiles, parTags, parSet);
 	}
 
@@ -121,7 +121,7 @@ namespace dindb {
 		run_regex_based_script(parRedis, parDeleIfInSet, parRegexes, parTags, parSet);
 	}
 
-	void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<uint64_t>& parFiles, GroupIDType parSet) {
+	void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<FileIDType>& parFiles, GroupIDType parSet) {
 		auto batch = parRedis.make_batch();
 		for (const auto file_id : parFiles) {
 			const auto file_key = make_file_key(file_id);
@@ -147,7 +147,7 @@ namespace dindb {
 		const auto regexes = compile_regexes(parRegexes);
 
 		std::set<std::string> dele_tags;
-		std::vector<uint64_t> ids;
+		std::vector<FileIDType> ids;
 
 		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
 			const auto& file_key = itm;
diff --git a/src/backends/redis/tag.hpp b/src/backends/redis/tag.hpp
index 1b4b55b..93c6962 100644
--- a/src/backends/redis/tag.hpp
+++ b/src/backends/redis/tag.hpp
@@ -21,7 +21,6 @@
 #include "backends/db_backend.hpp"
 #include <vector>
 #include <boost/utility/string_ref.hpp>
-#include <cstdint>
 
 namespace redis {
 	class Command;
@@ -32,7 +31,7 @@ namespace dindb {
 	void tag_files (
 		redis::Command& parRedis,
 		redis::Script& parTagIfInSet,
-		const std::vector<uint64_t>& parFiles,
+		const std::vector<FileIDType>& parFiles,
 		const std::vector<boost::string_ref>& parTags,
 		GroupIDType parSet
 	);
@@ -47,7 +46,7 @@ namespace dindb {
 	void delete_tags (
 		redis::Command& parRedis,
 		redis::Script& parDeleIfInSet,
-		const std::vector<uint64_t>& parFiles,
+		const std::vector<FileIDType>& parFiles,
 		const std::vector<boost::string_ref>& parTags,
 		GroupIDType parSet
 	);
@@ -61,7 +60,7 @@ namespace dindb {
 	void delete_all_tags (
 		redis::Command& parRedis,
 		redis::Script& parDeleIfInSet,
-		const std::vector<uint64_t>& parFiles,
+		const std::vector<FileIDType>& parFiles,
 		GroupIDType parSet
 	);
 	void delete_all_tags (

From e3fa82006f49d0c32eeb6ceaf05625e1e71be7e7 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 17:47:00 +0100
Subject: [PATCH 122/170] Fix off-by-one error.

Also use undordered_set instead of set.
---
 src/backends/redis/backend_redis.cpp | 2 +-
 src/backends/redis/tag.cpp           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 34e4912..b1ada5e 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -176,7 +176,7 @@ namespace dindb {
 			"content_type", parSetData.content_type
 		);
 
-		for (auto z = base_file_id; z < casted_data_size; ++z) {
+		for (auto z = base_file_id; z < casted_data_size + 1; ++z) {
 			const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(z);
 			const auto& file_data = parData[z - base_file_id];
 			const std::string hash = tiger_to_string(file_data.hash);
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index 9af54cb..ba63faf 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -146,7 +146,7 @@ namespace dindb {
 
 		const auto regexes = compile_regexes(parRegexes);
 
-		std::set<std::string> dele_tags;
+		std::unordered_set<std::string> dele_tags;
 		std::vector<FileIDType> ids;
 
 		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {

From dbd958daec3a322658285857f687f9022bd8131b Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 17:47:28 +0100
Subject: [PATCH 123/170] Recursively check for failures.

---
 src/backends/redis/batch.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/backends/redis/batch.cpp b/src/backends/redis/batch.cpp
index 5fa56b2..da43256 100644
--- a/src/backends/redis/batch.cpp
+++ b/src/backends/redis/batch.cpp
@@ -90,6 +90,21 @@ namespace redis {
 
 			delete data;
 		}
+
+		int array_throw_if_failed (int parErrCount, int parMaxReportedErrors, const std::vector<Reply>& parReplies, std::ostream& parStream) {
+			int err_count = 0;
+			for (const auto& rep : parReplies) {
+				if (rep.which() == RedisVariantType_Error) {
+					++err_count;
+					if (err_count + parErrCount <= parMaxReportedErrors)
+						parStream << '"' << get_error_string(rep).message() << "\" ";
+				}
+				else if (rep.which() == RedisVariantType_Array) {
+					err_count += array_throw_if_failed(err_count + parErrCount, parMaxReportedErrors, get_array(rep), parStream);
+				}
+			}
+			return err_count;
+		}
 	} //unnamed namespace
 
 	struct Batch::LocalData {
@@ -167,17 +182,10 @@ namespace redis {
 
 	void Batch::throw_if_failed() {
 		std::ostringstream oss;
-		int err_count = 0;
 		const int max_reported_errors = 3;
 
 		oss << "Error in reply: ";
-		for (const auto& rep : replies()) {
-			if (rep.which() == RedisVariantType_Error) {
-				++err_count;
-				if (err_count <= max_reported_errors)
-					oss << '"' << get_error_string(rep).message() << "\" ";
-			}
-		}
+		const int err_count = array_throw_if_failed(0, max_reported_errors, replies(), oss);
 		if (err_count) {
 			oss << " (showing " << err_count << '/' << max_reported_errors << " errors on " << replies().size() << " total replies)";
 			throw std::runtime_error(oss.str());

From bfdf84971131e8ed2e0d1f032d4ad4cb328a8eab Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 17:48:05 +0100
Subject: [PATCH 124/170] Implement delete_group.

---
 src/backends/redis/CMakeLists.txt    |   2 +
 src/backends/redis/backend_redis.cpp |   8 +-
 src/backends/redis/backend_redis.hpp |   1 +
 src/backends/redis/dele_hash.lua     |  27 +++++
 src/backends/redis/delete.cpp        | 152 +++++++++++++++++++++++++++
 src/backends/redis/delete.hpp        |  45 ++++++++
 6 files changed, 234 insertions(+), 1 deletion(-)
 create mode 100644 src/backends/redis/dele_hash.lua
 create mode 100644 src/backends/redis/delete.cpp
 create mode 100644 src/backends/redis/delete.hpp

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 941b141..8f3db1e 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -17,6 +17,7 @@ add_library(${PROJECT_NAME} SHARED
 	script_manager.cpp
 	async_connection.cpp
 	tag.cpp
+	delete.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
@@ -57,6 +58,7 @@ configure_file(
 set(LUA_SCRIPTS
 	tag_if_in_set.lua
 	dele_tag_if_in_set.lua
+	dele_hash.lua
 )
 
 install(TARGETS ${PROJECT_NAME}
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index b1ada5e..dcdd07b 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -23,6 +23,7 @@
 #include "dindexerConfig.h"
 #include "helpers/stringize.h"
 #include "tag.hpp"
+#include "delete.hpp"
 #include "record_data_adapt.hpp"
 #include <utility>
 #include <yaml-cpp/yaml.h>
@@ -108,6 +109,7 @@ namespace dindb {
 			auto batch = m_redis.make_batch();
 			batch.run("SELECT", lexical_cast<std::string>(m_database));
 			batch.run("CLIENT", "SETNAME", PROGRAM_NAME "_v" STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_PATCH));
+			batch.run("SCRIPT", "FLUSH");
 			batch.throw_if_failed();
 		}
 		else {
@@ -118,6 +120,7 @@ namespace dindb {
 
 		m_tag_if_in_set = m_redis.make_script(read_script(m_lua_script_paths, "tag_if_in_set.lua"));
 		m_dele_tag_if_in_set = m_redis.make_script(read_script(m_lua_script_paths, "dele_tag_if_in_set.lua"));
+		m_dele_hash = m_redis.make_script(read_script(m_lua_script_paths, "dele_hash.lua"));
 	}
 
 	void BackendRedis::disconnect() {
@@ -149,6 +152,7 @@ namespace dindb {
 	}
 
 	void BackendRedis::delete_group (const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
+		delete_group_from_db(m_redis, m_dele_tag_if_in_set, m_dele_hash, parIDs, parConf);
 	}
 
 	void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
@@ -173,7 +177,9 @@ namespace dindb {
 			"disk_label", parSetData.disk_label,
 			"fs_uuid", parSetData.fs_uuid,
 			"type", parSetData.type,
-			"content_type", parSetData.content_type
+			"content_type", parSetData.content_type,
+			"base_file_id", lexical_cast<std::string>(base_file_id),
+			"file_count", lexical_cast<std::string>(parData.size())
 		);
 
 		for (auto z = base_file_id; z < casted_data_size + 1; ++z) {
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index bd24782..a3ed3dc 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -61,6 +61,7 @@ namespace dindb {
 		redis::Command m_redis;
 		redis::Script m_tag_if_in_set;
 		redis::Script m_dele_tag_if_in_set;
+		redis::Script m_dele_hash;
 		dincore::SearchPaths m_lua_script_paths;
 		uint16_t m_database;
 	};
diff --git a/src/backends/redis/dele_hash.lua b/src/backends/redis/dele_hash.lua
new file mode 100644
index 0000000..078482e
--- /dev/null
+++ b/src/backends/redis/dele_hash.lua
@@ -0,0 +1,27 @@
+-- Copyright 2015, 2016, Michele Santullo
+-- This file is part of "dindexer".
+--
+-- "dindexer" is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- "dindexer" 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 General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+
+local hash_key = KEYS[1]
+local base_index = ARGV[1]
+local file_count = ARGV[2]
+
+for z = base_index, base_index + file_count - 1 do
+	redis.call("SREM", hash_key, z)
+end
+if redis.call("SCARD", hash_key) == 0 then
+	redis.call("DEL", hash_key)
+end
+return nil
diff --git a/src/backends/redis/delete.cpp b/src/backends/redis/delete.cpp
new file mode 100644
index 0000000..1c0aa5e
--- /dev/null
+++ b/src/backends/redis/delete.cpp
@@ -0,0 +1,152 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "delete.hpp"
+#include "tag.hpp"
+#include "command.hpp"
+#include "helpers/lexical_cast.hpp"
+#include "helpers/sequence_bt.hpp"
+#include "dindexerConfig.h"
+#include <vector>
+#include <tuple>
+#include <utility>
+#include <boost/iterator/counting_iterator.hpp>
+#include <algorithm>
+
+namespace dindb {
+	namespace {
+		std::pair<bool, std::size_t> confirm_dele (redis::Batch& parBatch, const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
+			using dinhelp::lexical_cast;
+
+			if (parIDs.empty())
+				return std::make_pair(false, parIDs.size());
+
+			for (auto id : parIDs) {
+				const auto set_key = PROGRAM_NAME ":set:" + lexical_cast<std::string>(id);
+				parBatch.run("HMGET", set_key, "base_file_id", "file_count", "name");
+			}
+
+			std::map<GroupIDType, std::string> set_dele_list;
+			std::size_t id_index = 0;
+			for (const auto& reply : parBatch.replies()) {
+				const auto res = redis::get_array(reply);
+				assert(res.size() == 3);
+				if (redis::RedisVariantType_Nil != res[0].which()) {
+					assert(redis::RedisVariantType_Nil != res[1].which());
+					set_dele_list[parIDs[id_index]] = redis::get_string(res[2]);
+				}
+				++id_index;
+			}
+
+			if (set_dele_list.empty())
+				return std::make_pair(false, set_dele_list.size());
+			else
+				return std::make_pair(parConf(set_dele_list), set_dele_list.size());
+				//return std::make_pair(true, set_dele_list.size());
+		}
+
+		template <typename IT, IT CHUNK, typename F, IT... SVALS>
+		void chunked_run_pvt (redis::Batch& parBatch, const char* parCommand, IT parFrom, IT parCount, F parMakeKey, dinhelp::bt::number_seq<IT, SVALS...>) {
+			for (IT i = 0; i < parCount / CHUNK; ++i) {
+				parBatch.run(parCommand, parMakeKey(i * CHUNK + parFrom + SVALS)...);
+			}
+			for (auto i = ((parFrom + parCount) / CHUNK) * CHUNK; i < parFrom + parCount; ++i) {
+				const auto key = parMakeKey(i);
+				parBatch.run(parCommand, key);
+			}
+		}
+
+		template <typename IT, IT CHUNK, typename F>
+		void chunked_run (redis::Batch& parBatch, const char* parCommand, IT parFrom, IT parCount, F parMakeKey) {
+			chunked_run_pvt<IT, CHUNK, F>(parBatch, parCommand, parFrom, parCount, parMakeKey, dinhelp::bt::number_range<IT, 0, CHUNK>());
+		};
+	} //unnamed namespace
+
+	void delete_group_from_db (redis::Command& parRedis, redis::Script& parDeleTagIfInSet, redis::Script& parDeleHash, const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
+		using dinhelp::lexical_cast;
+		using IDRange = std::tuple<GroupIDType, FileIDType, FileIDType>;
+
+		auto set_batch = parRedis.make_batch();
+
+		auto dele_pair = confirm_dele(set_batch, parIDs, parConf);
+		assert(set_batch.replies_requested());
+		if (not dele_pair.first)
+			return;
+
+		std::vector<IDRange> ranges;
+		ranges.reserve(dele_pair.second);
+		std::size_t id_index = 0;
+		for (const auto& reply : set_batch.replies()) {
+			const auto res = redis::get_array(reply);
+			if (redis::RedisVariantType_Nil != res[0].which()) {
+				ranges.push_back(
+					IDRange(
+						parIDs[id_index],
+						lexical_cast<FileIDType>(redis::get_string(res[0])),
+						lexical_cast<FileIDType>(redis::get_string(res[1]))
+					)
+				);
+			}
+			++id_index;
+		}
+		assert(ranges.size() == dele_pair.second);
+
+		for (const auto& dele_tuple : ranges) {
+			const auto set_id = std::get<0>(dele_tuple);
+			const auto file_base_index = std::get<1>(dele_tuple);
+			const auto file_count = std::get<2>(dele_tuple);
+
+			std::vector<FileIDType> ids;
+			ids.reserve(file_count);
+			std::copy(
+				boost::counting_iterator<FileIDType>(file_base_index),
+				boost::counting_iterator<FileIDType>(file_base_index + file_count),
+				std::back_inserter(ids)
+			);
+
+			delete_all_tags(parRedis, parDeleTagIfInSet, ids, set_id);
+		}
+
+		auto dele_batch = parRedis.make_batch();
+		for (const auto& dele_tuple : ranges) {
+			const auto set_id = std::get<0>(dele_tuple);
+			const auto file_base_index = std::get<1>(dele_tuple);
+			const auto file_count = std::get<2>(dele_tuple);
+
+			auto hash_query_batch = parRedis.make_batch();
+			for (FileIDType i = file_base_index; i < file_base_index + file_count; ++i) {
+				const auto file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(i);
+				hash_query_batch.run("HGET", file_key, "hash");
+			}
+			hash_query_batch.throw_if_failed();
+
+			for (const auto& rep : hash_query_batch.replies()) {
+				const auto hash_key = PROGRAM_NAME ":hash:" + redis::get_string(rep);
+				parDeleHash.run(
+					dele_batch,
+					std::make_tuple(hash_key),
+					std::make_tuple(lexical_cast<std::string>(file_base_index), lexical_cast<std::string>(file_count))
+				);
+			}
+
+			dele_batch.run("DEL", PROGRAM_NAME ":set:" + lexical_cast<std::string>(set_id));
+			chunked_run<FileIDType, 8>(dele_batch, +"DEL", file_base_index, file_count, [](FileIDType id){return PROGRAM_NAME ":file:" + lexical_cast<std::string>(id);});
+		}
+
+		dele_batch.throw_if_failed();
+	}
+} //namespace dindb
diff --git a/src/backends/redis/delete.hpp b/src/backends/redis/delete.hpp
new file mode 100644
index 0000000..75074ac
--- /dev/null
+++ b/src/backends/redis/delete.hpp
@@ -0,0 +1,45 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id1E0F8FEB88EC4FED843FFEE7BAB624BB
+#define id1E0F8FEB88EC4FED843FFEE7BAB624BB
+
+#include "backends/db_backend.hpp"
+#include <functional>
+#include <vector>
+#include <string>
+#include <map>
+
+namespace redis {
+	class Command;
+	class Script;
+} //namespace redis
+
+namespace dindb {
+	using IDDescMap = std::map<GroupIDType, std::string>;
+	using ConfirmDeleCallback = std::function<bool(const IDDescMap&)>;
+
+	void delete_group_from_db (
+		redis::Command& parRedis,
+		redis::Script& parDeleTagIfInSet,
+		redis::Script& parDeleHash,
+		const std::vector<GroupIDType>& parIDs,
+		ConfirmDeleCallback parConf
+	);
+} //namespace dindb
+
+#endif

From 645cf5858b50f4ce1b5f3b50488c6f244df163b0 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 18:02:50 +0100
Subject: [PATCH 125/170] Implement find_all_sets.

---
 src/backends/redis/CMakeLists.txt    |  1 +
 src/backends/redis/backend_redis.cpp |  3 ++-
 src/backends/redis/find.cpp          | 35 ++++++++++++++++++++++++++++
 src/backends/redis/find.hpp          | 32 +++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 src/backends/redis/find.cpp
 create mode 100644 src/backends/redis/find.hpp

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 8f3db1e..096d0a2 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -18,6 +18,7 @@ add_library(${PROJECT_NAME} SHARED
 	async_connection.cpp
 	tag.cpp
 	delete.cpp
+	find.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index dcdd07b..3762a64 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -24,6 +24,7 @@
 #include "helpers/stringize.h"
 #include "tag.hpp"
 #include "delete.hpp"
+#include "find.hpp"
 #include "record_data_adapt.hpp"
 #include <utility>
 #include <yaml-cpp/yaml.h>
@@ -254,7 +255,7 @@ namespace dindb {
 	}
 
 	std::vector<GroupIDType> BackendRedis::find_all_sets() {
-		return std::vector<GroupIDType>();
+		return dindb::find_all_sets(m_redis);
 	}
 
 	std::vector<dinhelp::MaxSizedArray<std::string, 4>> BackendRedis::find_set_details (const std::vector<GroupIDType>& parSets) {
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
new file mode 100644
index 0000000..f4f4628
--- /dev/null
+++ b/src/backends/redis/find.cpp
@@ -0,0 +1,35 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "find.hpp"
+#include "command.hpp"
+#include "helpers/lexical_cast.hpp"
+#include "dindexerConfig.h"
+#include "dindexer-core/split_tags.hpp"
+
+namespace dindb {
+	std::vector<GroupIDType> find_all_sets (redis::Command& parRedis) {
+		using dincore::split_and_trim;
+		using dinhelp::lexical_cast;
+
+		std::vector<GroupIDType> retval;
+		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":set:*")) {
+			retval.push_back(lexical_cast<GroupIDType>(split_and_trim(itm, ':').back()));
+		}
+		return retval;
+	}
+} //namespace dindb
diff --git a/src/backends/redis/find.hpp b/src/backends/redis/find.hpp
new file mode 100644
index 0000000..b6df4cc
--- /dev/null
+++ b/src/backends/redis/find.hpp
@@ -0,0 +1,32 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef idB4972996B4494E66A03B6AE205B1FA36
+#define idB4972996B4494E66A03B6AE205B1FA36
+
+#include "backends/db_backend.hpp"
+#include <vector>
+
+namespace redis {
+	class Command;
+} //namespace redis
+
+namespace dindb {
+	std::vector<GroupIDType> find_all_sets ( redis::Command& parRedis );
+} //namespace dindb
+
+#endif

From 5566b81b45331d057838c375f96862ac043e5956 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 18:37:47 +0100
Subject: [PATCH 126/170] Add a reset() method to batch.

---
 src/backends/redis/batch.cpp | 14 ++++++++++++++
 src/backends/redis/batch.hpp |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/src/backends/redis/batch.cpp b/src/backends/redis/batch.cpp
index da43256..0d5f6c2 100644
--- a/src/backends/redis/batch.cpp
+++ b/src/backends/redis/batch.cpp
@@ -133,6 +133,7 @@ namespace redis {
 	}
 
 	Batch::~Batch() noexcept {
+		this->reset();
 	}
 
 	void Batch::run_pvt (int parArgc, const char** parArgv, std::size_t* parLengths) {
@@ -192,6 +193,19 @@ namespace redis {
 		}
 	}
 
+	void Batch::reset() noexcept {
+		try {
+			this->replies(); //force waiting for any pending jobs
+		}
+		catch (...) {
+			assert(false);
+		}
+
+		assert(0 == m_local_data->pending_futures);
+		m_futures.clear();
+		m_replies.clear();
+	}
+
 	RedisError::RedisError (const char* parMessage, std::size_t parLength) :
 		std::runtime_error(std::string(parMessage, parLength))
 	{
diff --git a/src/backends/redis/batch.hpp b/src/backends/redis/batch.hpp
index ccced3f..7f8fe69 100644
--- a/src/backends/redis/batch.hpp
+++ b/src/backends/redis/batch.hpp
@@ -49,6 +49,8 @@ namespace redis {
 		template <typename... Args>
 		Batch& operator() ( const char* parCommand, Args&&... parArgs );
 
+		void reset ( void ) noexcept;
+
 	private:
 		struct LocalData;
 

From d46cb322b94370bbe1b42fdef8af49f9a1a9e816 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 18:38:08 +0100
Subject: [PATCH 127/170] Implement locate_in_db().

---
 src/backends/redis/backend_redis.cpp |  2 +-
 src/backends/redis/find.cpp          | 52 ++++++++++++++++++++++++++++
 src/backends/redis/find.hpp          |  1 +
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 3762a64..ec11d96 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -239,7 +239,7 @@ namespace dindb {
 	}
 
 	std::vector<LocatedItem> BackendRedis::locate_in_db (const std::string& parSearch, const TagList& parTags) {
-		return std::vector<LocatedItem>();
+		return dindb::locate_in_db(m_redis, parSearch, parTags);
 	}
 
 	std::vector<LocatedItem> BackendRedis::locate_in_db (const mchlib::TigerHash& parSearch, const TagList& parTags) {
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index f4f4628..ca2692e 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -20,8 +20,30 @@
 #include "helpers/lexical_cast.hpp"
 #include "dindexerConfig.h"
 #include "dindexer-core/split_tags.hpp"
+#include <boost/regex.hpp>
 
 namespace dindb {
+	namespace {
+		void store_matching_paths (redis::Batch& parBatch, std::vector<LocatedItem>& parOut, std::vector<FileIDType>& parIDs, const boost::regex& parSearch) {
+			using dinhelp::lexical_cast;
+			assert(parIDs.size() == parBatch.replies().size());
+
+			parBatch.throw_if_failed();
+			std::size_t id_index = 0;
+			for (const auto& itm : parBatch.replies()) {
+				const auto reply = redis::get_array(itm);
+				const auto& path = redis::get_string(reply[0]);
+
+				if (boost::regex_search(path, parSearch)) {
+					const auto group_id = lexical_cast<GroupIDType>(redis::get_string(reply[1]));
+					parOut.push_back(LocatedItem{path, parIDs[id_index], group_id});
+				}
+				assert(id_index < parIDs.size());
+				++id_index;
+			}
+		}
+	} //unnamed namespace
+
 	std::vector<GroupIDType> find_all_sets (redis::Command& parRedis) {
 		using dincore::split_and_trim;
 		using dinhelp::lexical_cast;
@@ -32,4 +54,34 @@ namespace dindb {
 		}
 		return retval;
 	}
+
+	std::vector<LocatedItem> locate_in_db (redis::Command& parRedis, const std::string& parSearch, const TagList& parTags) {
+		using dincore::split_and_trim;
+		using dinhelp::lexical_cast;
+
+		const boost::regex search(parSearch, boost::regex_constants::optimize | boost::regex_constants::nosubs | boost::regex_constants::perl);
+		const int prefetch_count = 500;
+
+		std::vector<LocatedItem> retval;
+		std::vector<FileIDType> ids;
+		ids.reserve(prefetch_count);
+
+		int curr_count = 0;
+		auto batch = parRedis.make_batch();
+		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
+			++curr_count;
+			batch.run("HMGET", itm, "path", "group_id");
+			ids.push_back(lexical_cast<FileIDType>(split_and_trim(itm, ':').back()));
+
+			if (curr_count == prefetch_count) {
+				store_matching_paths(batch, retval, ids, search);
+				batch.reset();
+				curr_count = 0;
+				ids.clear();
+			}
+		}
+		if (curr_count)
+			store_matching_paths(batch, retval, ids, search);
+		return retval;
+	}
 } //namespace dindb
diff --git a/src/backends/redis/find.hpp b/src/backends/redis/find.hpp
index b6df4cc..f88e087 100644
--- a/src/backends/redis/find.hpp
+++ b/src/backends/redis/find.hpp
@@ -27,6 +27,7 @@ namespace redis {
 
 namespace dindb {
 	std::vector<GroupIDType> find_all_sets ( redis::Command& parRedis );
+	std::vector<LocatedItem> locate_in_db ( redis::Command& parRedis, const std::string& parSearch, const TagList& parTags );
 } //namespace dindb
 
 #endif

From 417e7105d33e1bc66cd4c48a04fee504a8cca019 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 19:30:21 +0100
Subject: [PATCH 128/170] Import Sprout. This is to fix the build on clang.

Sprout is needed because pow, log2 and log10 are constexpr on gcc,
but that's nonstandard. Sprout provides the constexpr version of
those functions.

Also fix warnings. I still get plenty of warnings about some suggested
paretheses, but it seems to be a bug from clang. See
https://llvm.org/bugs/show_bug.cgi?id=21629 for the bug report.
---
 .gitmodules                             |  3 +++
 CMakeLists.txt                          |  1 +
 include/helpers/lexical_cast.hpp        | 12 +++++++-----
 lib/sprout                              |  1 +
 src/backends/redis/async_connection.cpp | 11 ++++++++---
 5 files changed, 20 insertions(+), 8 deletions(-)
 create mode 160000 lib/sprout

diff --git a/.gitmodules b/.gitmodules
index 94e1d37..1984ae6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "lib/better-enums"]
 	path = lib/better-enums
 	url = https://github.com/aantron/better-enums
+[submodule "lib/sprout"]
+	path = lib/sprout
+	url = https://github.com/bolero-MURAKAMI/Sprout.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ef6463..2a0e6d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,7 @@ target_compile_features(${PROJECT_NAME}
 target_include_directories(${bare_name}-inc
 	INTERFACE ${PROJECT_BINARY_DIR}
 	INTERFACE ${CMAKE_SOURCE_DIR}/include
+	INTERFACE ${CMAKE_SOURCE_DIR}/lib/sprout
 )
 
 
diff --git a/include/helpers/lexical_cast.hpp b/include/helpers/lexical_cast.hpp
index 7417892..f5bced8 100644
--- a/include/helpers/lexical_cast.hpp
+++ b/include/helpers/lexical_cast.hpp
@@ -21,10 +21,12 @@
 #include "compatibility.h"
 #include "helpers/sequence_bt.hpp"
 #include "helpers/MaxSizedArray.hpp"
+#include "sprout/math/log10.hpp"
+#include "sprout/math/log2.hpp"
+#include "sprout/math/pow.hpp"
 #include <type_traits>
 #include <utility>
 #include <limits>
-#include <cmath>
 #include <cstdint>
 #include <algorithm>
 #include <string>
@@ -112,7 +114,7 @@ namespace dinhelp {
 			static std::size_t count_digits ( T parValue ) a_pure;
 			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
 			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
-				return (parNum == 0 ? 0 : static_cast<std::size_t>(std::log10(static_cast<double>(parNum)) / std::log10(static_cast<double>(base)))) + 1;
+				return (parNum == 0 ? 0 : static_cast<std::size_t>(sprout::log10(static_cast<double>(parNum)) / sprout::log10(static_cast<double>(base)))) + 1;
 			}
 		};
 	} //namespace implem
@@ -133,7 +135,7 @@ namespace dinhelp {
 
 			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
 			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
-				return (parNum == 0 ? 0 : static_cast<std::size_t>(std::log10(static_cast<double>(parNum)))) + 1 + (std::numeric_limits<T>::is_signed ? 1 : 0);
+				return (parNum == 0 ? 0 : static_cast<std::size_t>(sprout::log10(static_cast<double>(parNum)))) + 1 + (std::numeric_limits<T>::is_signed ? 1 : 0);
 			}
 		};
 
@@ -153,7 +155,7 @@ namespace dinhelp {
 			static std::size_t count_digits ( T parValue ) a_pure;
 			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
 			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
-				return (parNum == 0 ? 0 : static_cast<std::size_t>(std::log2(static_cast<double>(parNum)))) + 1;
+				return (parNum == 0 ? 0 : static_cast<std::size_t>(sprout::log2(static_cast<double>(parNum)))) + 1;
 			}
 		};
 
@@ -163,7 +165,7 @@ namespace dinhelp {
 		std::size_t dec<T>::count_digits_implem (T parValue, dinhelp::bt::index_seq<Powers...>, dinhelp::bt::index_seq<Digits...>) {
 			typedef typename std::make_unsigned<T>::type UT;
 			static constexpr UT powers[] = { 0, static_cast<UT>(dinhelp::implem::power<10, Powers + 1>::value)... };
-			static constexpr std::size_t maxdigits[] = { count_digits_bt(static_cast<std::size_t>(::pow(2.0, Digits))) - (std::numeric_limits<T>::is_signed ? 1 : 0)... };
+			static constexpr std::size_t maxdigits[] = { count_digits_bt(static_cast<std::size_t>(sprout::pow(2.0, Digits))) - (std::numeric_limits<T>::is_signed ? 1 : 0)... };
 			const auto bits = sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<T>(dinhelp::implem::abs(parValue));
 			static_assert(std::is_same<UT, decltype(dinhelp::implem::abs(parValue))>::value, "Unexpected type");
 			return (dinhelp::implem::abs(parValue) < powers[maxdigits[bits] - 1] ? maxdigits[bits] - 1 : maxdigits[bits]) + dinhelp::implem::is_negative<T>::check(parValue);
diff --git a/lib/sprout b/lib/sprout
new file mode 160000
index 0000000..fea5e75
--- /dev/null
+++ b/lib/sprout
@@ -0,0 +1 @@
+Subproject commit fea5e752bda763c27ecd6f84531cdd0b4f82399d
diff --git a/src/backends/redis/async_connection.cpp b/src/backends/redis/async_connection.cpp
index cf48a01..483bc3c 100644
--- a/src/backends/redis/async_connection.cpp
+++ b/src/backends/redis/async_connection.cpp
@@ -36,13 +36,18 @@ namespace redis {
 			ev_break(parLoop, EVBREAK_ALL);
 		}
 
-		void lock_mutex_libev (ev_loop* parLoop) {
+		void lock_mutex_libev (ev_loop* parLoop) noexcept {
 			std::mutex* mtx = static_cast<std::mutex*>(ev_userdata(parLoop));
 			assert(mtx);
-			mtx->lock();
+			try {
+				mtx->lock();
+			}
+			catch (const std::system_error&) {
+				assert(false);
+			}
 		}
 
-		void unlock_mutex_libev (ev_loop* parLoop) {
+		void unlock_mutex_libev (ev_loop* parLoop) noexcept {
 			std::mutex* mtx = static_cast<std::mutex*>(ev_userdata(parLoop));
 			assert(mtx);
 			mtx->unlock();

From 0d16e4005ebaef35882555d7835944c17c18e76e Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 11 Jul 2016 19:30:44 +0100
Subject: [PATCH 129/170] I forgot to check the tags...

---
 src/backends/redis/find.cpp | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index ca2692e..6b38d87 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -21,10 +21,28 @@
 #include "dindexerConfig.h"
 #include "dindexer-core/split_tags.hpp"
 #include <boost/regex.hpp>
+#include <ciso646>
+#include <algorithm>
 
 namespace dindb {
 	namespace {
-		void store_matching_paths (redis::Batch& parBatch, std::vector<LocatedItem>& parOut, std::vector<FileIDType>& parIDs, const boost::regex& parSearch) {
+		bool all_tags_match (const TagList& parTags, const std::string& parTaglist) {
+			const auto tags = dincore::split_tags(parTaglist);
+
+			if (tags.size() >= parTags.size()) {
+				for (const auto& required_tag : parTags) {
+					if (std::find(tags.begin(), tags.end(), required_tag) == tags.end()) {
+						return false;
+					}
+				}
+			}
+			else {
+				return false;
+			}
+			return true;
+		}
+
+		void store_matching_paths (redis::Batch& parBatch, std::vector<LocatedItem>& parOut, std::vector<FileIDType>& parIDs, const boost::regex& parSearch, const TagList& parTags) {
 			using dinhelp::lexical_cast;
 			assert(parIDs.size() == parBatch.replies().size());
 
@@ -35,8 +53,10 @@ namespace dindb {
 				const auto& path = redis::get_string(reply[0]);
 
 				if (boost::regex_search(path, parSearch)) {
-					const auto group_id = lexical_cast<GroupIDType>(redis::get_string(reply[1]));
-					parOut.push_back(LocatedItem{path, parIDs[id_index], group_id});
+					if (parTags.empty() or all_tags_match(parTags, redis::get_string(reply[2]))) {
+						const auto group_id = lexical_cast<GroupIDType>(redis::get_string(reply[1]));
+						parOut.push_back(LocatedItem{path, parIDs[id_index], group_id});
+					}
 				}
 				assert(id_index < parIDs.size());
 				++id_index;
@@ -70,18 +90,18 @@ namespace dindb {
 		auto batch = parRedis.make_batch();
 		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
 			++curr_count;
-			batch.run("HMGET", itm, "path", "group_id");
+			batch.run("HMGET", itm, "path", "group_id", "tags");
 			ids.push_back(lexical_cast<FileIDType>(split_and_trim(itm, ':').back()));
 
 			if (curr_count == prefetch_count) {
-				store_matching_paths(batch, retval, ids, search);
+				store_matching_paths(batch, retval, ids, search, parTags);
 				batch.reset();
 				curr_count = 0;
 				ids.clear();
 			}
 		}
 		if (curr_count)
-			store_matching_paths(batch, retval, ids, search);
+			store_matching_paths(batch, retval, ids, search, parTags);
 		return retval;
 	}
 } //namespace dindb

From d0242e2721964b9066a9d7d75bc9a3d243385f33 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 10:43:32 +0100
Subject: [PATCH 130/170] New IncRedis class. Makes high-level access to Redis
 easier.

---
 src/backends/redis/CMakeLists.txt    |  1 +
 src/backends/redis/backend_redis.cpp | 56 ++++++++--------
 src/backends/redis/backend_redis.hpp |  4 +-
 src/backends/redis/incredis.cpp      | 97 ++++++++++++++++++++++++++++
 src/backends/redis/incredis.hpp      | 59 +++++++++++++++++
 5 files changed, 187 insertions(+), 30 deletions(-)
 create mode 100644 src/backends/redis/incredis.cpp
 create mode 100644 src/backends/redis/incredis.hpp

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 096d0a2..1966159 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -19,6 +19,7 @@ add_library(${PROJECT_NAME} SHARED
 	tag.cpp
 	delete.cpp
 	find.cpp
+	incredis.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index ec11d96..7f98628 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -107,7 +107,7 @@ namespace dindb {
 		m_redis.connect();
 		m_redis.wait_for_connect();
 		if (m_redis.is_connected()) {
-			auto batch = m_redis.make_batch();
+			auto batch = m_redis.command().make_batch();
 			batch.run("SELECT", lexical_cast<std::string>(m_database));
 			batch.run("CLIENT", "SETNAME", PROGRAM_NAME "_v" STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_PATCH));
 			batch.run("SCRIPT", "FLUSH");
@@ -115,13 +115,13 @@ namespace dindb {
 		}
 		else {
 			std::ostringstream oss;
-			oss << "Error connecting to Redis: " << m_redis.connection_error();
+			oss << "Error connecting to Redis: " << m_redis.command().connection_error();
 			throw std::runtime_error(oss.str());
 		}
 
-		m_tag_if_in_set = m_redis.make_script(read_script(m_lua_script_paths, "tag_if_in_set.lua"));
-		m_dele_tag_if_in_set = m_redis.make_script(read_script(m_lua_script_paths, "dele_tag_if_in_set.lua"));
-		m_dele_hash = m_redis.make_script(read_script(m_lua_script_paths, "dele_hash.lua"));
+		m_tag_if_in_set = m_redis.command().make_script(read_script(m_lua_script_paths, "tag_if_in_set.lua"));
+		m_dele_tag_if_in_set = m_redis.command().make_script(read_script(m_lua_script_paths, "dele_tag_if_in_set.lua"));
+		m_dele_hash = m_redis.command().make_script(read_script(m_lua_script_paths, "dele_hash.lua"));
 	}
 
 	void BackendRedis::disconnect() {
@@ -129,47 +129,47 @@ namespace dindb {
 	}
 
 	void BackendRedis::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		dindb::tag_files(m_redis, m_tag_if_in_set, parFiles, parTags, parSet);
+		dindb::tag_files(m_redis.command(), m_tag_if_in_set, parFiles, parTags, parSet);
 	}
 
 	void BackendRedis::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		dindb::tag_files(m_redis, m_tag_if_in_set, parRegexes, parTags, parSet);
+		dindb::tag_files(m_redis.command(), m_tag_if_in_set, parRegexes, parTags, parSet);
 	}
 
 	void BackendRedis::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		dindb::delete_tags(m_redis, m_dele_tag_if_in_set, parFiles, parTags, parSet);
+		dindb::delete_tags(m_redis.command(), m_dele_tag_if_in_set, parFiles, parTags, parSet);
 	}
 
 	void BackendRedis::delete_tags (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		dindb::delete_tags(m_redis, m_dele_tag_if_in_set, parRegexes, parTags, parSet);
+		dindb::delete_tags(m_redis.command(), m_dele_tag_if_in_set, parRegexes, parTags, parSet);
 	}
 
 	void BackendRedis::delete_all_tags (const std::vector<FileIDType>& parFiles, GroupIDType parSet) {
-		dindb::delete_all_tags(m_redis, m_dele_tag_if_in_set, parFiles, parSet);
+		dindb::delete_all_tags(m_redis.command(), m_dele_tag_if_in_set, parFiles, parSet);
 	}
 
 	void BackendRedis::delete_all_tags (const std::vector<std::string>& parRegexes, GroupIDType parSet) {
-		dindb::delete_all_tags(m_redis, m_dele_tag_if_in_set, parRegexes, parSet);
+		dindb::delete_all_tags(m_redis.command(), m_dele_tag_if_in_set, parRegexes, parSet);
 	}
 
 	void BackendRedis::delete_group (const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
-		delete_group_from_db(m_redis, m_dele_tag_if_in_set, m_dele_hash, parIDs, parConf);
+		delete_group_from_db(m_redis.command(), m_dele_tag_if_in_set, m_dele_hash, parIDs, parConf);
 	}
 
 	void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
 		using dinhelp::lexical_cast;
 		using boost::string_ref;
 
-		redis::Reply set_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "set", "1");
-		redis::Reply file_id_reply = m_redis.run("HINCRBY", PROGRAM_NAME ":indices", "files", lexical_cast<std::string>(parData.size()));
+		const auto data_size = static_cast<int>(parData.size());
+		const auto group_id_int = m_redis.hincrby(PROGRAM_NAME ":indices", "set", 1);
+		const auto file_id_int = m_redis.hincrby(PROGRAM_NAME ":indices", "files", data_size);
 
-		const auto group_id = lexical_cast<std::string>(redis::get_integer(set_id_reply));
+		const auto group_id = lexical_cast<std::string>(group_id_int);
 		const std::string set_key = PROGRAM_NAME ":set:" + group_id;
-		const auto casted_data_size = static_cast<decltype(redis::get_integer(file_id_reply))>(parData.size());
-		assert(redis::get_integer(file_id_reply) >= casted_data_size);
-		const auto base_file_id = redis::get_integer(file_id_reply) - casted_data_size + 1;
+		assert(file_id_int >= data_size);
+		const auto base_file_id = file_id_int - data_size + 1;
 
-		auto batch = m_redis.make_batch();
+		auto batch = m_redis.command().make_batch();
 
 		batch.run(
 			"HMSET",
@@ -183,7 +183,7 @@ namespace dindb {
 			"file_count", lexical_cast<std::string>(parData.size())
 		);
 
-		for (auto z = base_file_id; z < casted_data_size + 1; ++z) {
+		for (auto z = base_file_id; z < data_size + 1; ++z) {
 			const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(z);
 			const auto& file_data = parData[z - base_file_id];
 			const std::string hash = tiger_to_string(file_data.hash);
@@ -217,29 +217,29 @@ namespace dindb {
 		using boost::empty;
 
 		const std::string hash_key = PROGRAM_NAME ":hash:" + tiger_to_string(parHash);
-		redis::Reply hash_reply = m_redis.run("SRANDMEMBER", hash_key);
-		if (redis::RedisVariantType_Nil == hash_reply.which() or (redis::RedisVariantType_Integer == hash_reply.which() and not redis::get_integer(hash_reply))) {
+		auto hash_reply = m_redis.srandmember(hash_key);
+		if (not hash_reply) {
 			return false;
 		}
 		else {
-			const auto result_id = redis::get_string(hash_reply);
-			auto set_key_and_file_item = redis::range_as<FileRecordDataWithGroup>(m_redis.hscan(result_id));
+			const auto result_id = std::move(*hash_reply);
+			auto set_key_and_file_item = redis::range_as<FileRecordDataWithGroup>(m_redis.command().hscan(result_id));
 			parItem = std::move(set_key_and_file_item.second);
 			const std::string group_key = std::move(set_key_and_file_item.first);
 
-			auto scan_range = m_redis.hscan(group_key);
+			auto scan_range = m_redis.command().hscan(group_key);
 			if (empty(scan_range)) {
 				return false;
 			}
 			else {
-				parSet = redis::range_as<mchlib::SetRecordDataFull>(m_redis.hscan(group_key));
+				parSet = redis::range_as<mchlib::SetRecordDataFull>(m_redis.command().hscan(group_key));
 				return true;
 			}
 		}
 	}
 
 	std::vector<LocatedItem> BackendRedis::locate_in_db (const std::string& parSearch, const TagList& parTags) {
-		return dindb::locate_in_db(m_redis, parSearch, parTags);
+		return dindb::locate_in_db(m_redis.command(), parSearch, parTags);
 	}
 
 	std::vector<LocatedItem> BackendRedis::locate_in_db (const mchlib::TigerHash& parSearch, const TagList& parTags) {
@@ -255,7 +255,7 @@ namespace dindb {
 	}
 
 	std::vector<GroupIDType> BackendRedis::find_all_sets() {
-		return dindb::find_all_sets(m_redis);
+		return dindb::find_all_sets(m_redis.command());
 	}
 
 	std::vector<dinhelp::MaxSizedArray<std::string, 4>> BackendRedis::find_set_details (const std::vector<GroupIDType>& parSets) {
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index a3ed3dc..4959d87 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -19,7 +19,7 @@
 #define idB2F92EE07A004D5293FD0657EEE8F75B
 
 #include "backends/db_backend.hpp"
-#include "command.hpp"
+#include "incredis.hpp"
 #include "script.hpp"
 #include "dindexer-core/searchpaths.hpp"
 #include <string>
@@ -58,7 +58,7 @@ namespace dindb {
 		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath ) override;
 
 	private:
-		redis::Command m_redis;
+		redis::IncRedis m_redis;
 		redis::Script m_tag_if_in_set;
 		redis::Script m_dele_tag_if_in_set;
 		redis::Script m_dele_hash;
diff --git a/src/backends/redis/incredis.cpp b/src/backends/redis/incredis.cpp
new file mode 100644
index 0000000..1487c4d
--- /dev/null
+++ b/src/backends/redis/incredis.cpp
@@ -0,0 +1,97 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "incredis.hpp"
+#include "helpers/compatibility.h"
+#include "helpers/lexical_cast.hpp"
+#include <utility>
+#include <cassert>
+#include <ciso646>
+
+namespace redis {
+	namespace {
+		inline IncRedis::opt_string optional_string ( const Reply& parReply ) a_always_inline;
+		inline IncRedis::opt_string_list optional_string_list ( const Reply& parReply ) a_always_inline;
+
+		IncRedis::opt_string optional_string (const Reply& parReply) {
+			assert(parReply.which() == RedisVariantType_Nil or parReply.which() == RedisVariantType_String);
+			if (RedisVariantType_Nil == parReply.which())
+				return boost::none;
+			else
+				return get_string(parReply);
+		}
+
+		IncRedis::opt_string_list optional_string_list (const Reply& parReply) {
+			assert(parReply.which() == RedisVariantType_Nil or parReply.which() == RedisVariantType_Array);
+			if (RedisVariantType_Nil == parReply.which()) {
+				return boost::none;
+			}
+			else {
+				auto replies = get_array(parReply);
+				IncRedis::opt_string_list::value_type retval;
+				retval.reserve(replies.size());
+				for (const auto& rep : replies) {
+					retval.emplace_back(optional_string(rep));
+				}
+				return IncRedis::opt_string_list(std::move(retval));
+			}
+		}
+	}
+	IncRedis::IncRedis (std::string &&parAddress, uint16_t parPort) :
+		m_command(std::move(parAddress), parPort)
+	{
+	}
+
+	IncRedis::IncRedis (std::string&& parSocket) :
+		m_command(std::move(parSocket))
+	{
+	}
+
+	void IncRedis::connect() {
+		m_command.connect();
+	}
+
+	void IncRedis::wait_for_connect() {
+		m_command.wait_for_connect();
+	}
+
+	void IncRedis::disconnect() {
+		m_command.disconnect();
+	}
+
+	void IncRedis::wait_for_disconnect() {
+		m_command.wait_for_disconnect();
+	}
+
+	auto IncRedis::hget (boost::string_ref parKey, boost::string_ref parField) -> opt_string {
+		return optional_string(m_command.run("HGET", parKey, parField));
+	}
+
+	int IncRedis::hincrby (boost::string_ref parKey, boost::string_ref parField, int parInc) {
+		const auto inc = dinhelp::lexical_cast<std::string>(parInc);
+		auto reply = m_command.run("HINCRBY", parKey, parField, inc);
+		return get_integer(reply);
+	}
+
+	auto IncRedis::srandmember (boost::string_ref parKey, int parCount) -> opt_string_list {
+		return optional_string_list(m_command.run("SRANDMEMBER", parKey, dinhelp::lexical_cast<std::string>(parCount)));
+	}
+
+	auto IncRedis::srandmember (boost::string_ref parKey) -> opt_string {
+		return optional_string(m_command.run("SRANDMEMBER", parKey));
+	}
+} //namespace redis
diff --git a/src/backends/redis/incredis.hpp b/src/backends/redis/incredis.hpp
new file mode 100644
index 0000000..809b1de
--- /dev/null
+++ b/src/backends/redis/incredis.hpp
@@ -0,0 +1,59 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id7D338900114548A890B1EECE0C4D3C4C
+#define id7D338900114548A890B1EECE0C4D3C4C
+
+#include "command.hpp"
+#include <boost/optional.hpp>
+#include <string>
+#include <boost/utility/string_ref.hpp>
+#include <vector>
+
+namespace redis {
+	class IncRedis {
+	public:
+		typedef boost::optional<std::string> opt_string;
+		typedef boost::optional<std::vector<opt_string>> opt_string_list;
+
+		IncRedis ( std::string&& parAddress, uint16_t parPort );
+		explicit IncRedis ( std::string&& parSocket );
+		~IncRedis ( void ) noexcept = default;
+
+		void connect ( void );
+		void wait_for_connect ( void );
+		void disconnect ( void );
+		void wait_for_disconnect ( void );
+		bool is_connected ( void ) const { return m_command.is_connected(); }
+
+		Command& command ( void ) { return m_command; }
+		const Command& command ( void ) const { return m_command; }
+
+		//Hash
+		opt_string hget ( boost::string_ref parKey, boost::string_ref parField );
+		int hincrby ( boost::string_ref parKey, boost::string_ref parField, int parInc );
+
+		//Set
+		opt_string_list srandmember ( boost::string_ref parKey, int parCount );
+		opt_string srandmember ( boost::string_ref parKey );
+
+	private:
+		Command m_command;
+	};
+} //namespace redis
+
+#endif

From 64b87c52bbe044c478df40c45f3e79b72b4ad944 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 10:55:45 +0100
Subject: [PATCH 131/170] Move *scan function from Command to IncRedis.

Pass down IncRedis as required to fix the build.
---
 src/backends/redis/backend_redis.cpp | 24 +++++++++++-----------
 src/backends/redis/command.cpp       | 16 ---------------
 src/backends/redis/command.hpp       | 18 -----------------
 src/backends/redis/delete.cpp        | 10 +++++-----
 src/backends/redis/delete.hpp        |  4 ++--
 src/backends/redis/find.cpp          |  8 ++++----
 src/backends/redis/find.hpp          |  6 +++---
 src/backends/redis/incredis.cpp      | 16 +++++++++++++++
 src/backends/redis/incredis.hpp      | 18 +++++++++++++++++
 src/backends/redis/tag.cpp           | 30 ++++++++++++++--------------
 src/backends/redis/tag.hpp           | 14 ++++++-------
 11 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 7f98628..7845d0d 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -129,31 +129,31 @@ namespace dindb {
 	}
 
 	void BackendRedis::tag_files (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		dindb::tag_files(m_redis.command(), m_tag_if_in_set, parFiles, parTags, parSet);
+		dindb::tag_files(m_redis, m_tag_if_in_set, parFiles, parTags, parSet);
 	}
 
 	void BackendRedis::tag_files (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		dindb::tag_files(m_redis.command(), m_tag_if_in_set, parRegexes, parTags, parSet);
+		dindb::tag_files(m_redis, m_tag_if_in_set, parRegexes, parTags, parSet);
 	}
 
 	void BackendRedis::delete_tags (const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		dindb::delete_tags(m_redis.command(), m_dele_tag_if_in_set, parFiles, parTags, parSet);
+		dindb::delete_tags(m_redis, m_dele_tag_if_in_set, parFiles, parTags, parSet);
 	}
 
 	void BackendRedis::delete_tags (const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-		dindb::delete_tags(m_redis.command(), m_dele_tag_if_in_set, parRegexes, parTags, parSet);
+		dindb::delete_tags(m_redis, m_dele_tag_if_in_set, parRegexes, parTags, parSet);
 	}
 
 	void BackendRedis::delete_all_tags (const std::vector<FileIDType>& parFiles, GroupIDType parSet) {
-		dindb::delete_all_tags(m_redis.command(), m_dele_tag_if_in_set, parFiles, parSet);
+		dindb::delete_all_tags(m_redis, m_dele_tag_if_in_set, parFiles, parSet);
 	}
 
 	void BackendRedis::delete_all_tags (const std::vector<std::string>& parRegexes, GroupIDType parSet) {
-		dindb::delete_all_tags(m_redis.command(), m_dele_tag_if_in_set, parRegexes, parSet);
+		dindb::delete_all_tags(m_redis, m_dele_tag_if_in_set, parRegexes, parSet);
 	}
 
 	void BackendRedis::delete_group (const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
-		delete_group_from_db(m_redis.command(), m_dele_tag_if_in_set, m_dele_hash, parIDs, parConf);
+		delete_group_from_db(m_redis, m_dele_tag_if_in_set, m_dele_hash, parIDs, parConf);
 	}
 
 	void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
@@ -223,23 +223,23 @@ namespace dindb {
 		}
 		else {
 			const auto result_id = std::move(*hash_reply);
-			auto set_key_and_file_item = redis::range_as<FileRecordDataWithGroup>(m_redis.command().hscan(result_id));
+			auto set_key_and_file_item = redis::range_as<FileRecordDataWithGroup>(m_redis.hscan(result_id));
 			parItem = std::move(set_key_and_file_item.second);
 			const std::string group_key = std::move(set_key_and_file_item.first);
 
-			auto scan_range = m_redis.command().hscan(group_key);
+			auto scan_range = m_redis.hscan(group_key);
 			if (empty(scan_range)) {
 				return false;
 			}
 			else {
-				parSet = redis::range_as<mchlib::SetRecordDataFull>(m_redis.command().hscan(group_key));
+				parSet = redis::range_as<mchlib::SetRecordDataFull>(m_redis.hscan(group_key));
 				return true;
 			}
 		}
 	}
 
 	std::vector<LocatedItem> BackendRedis::locate_in_db (const std::string& parSearch, const TagList& parTags) {
-		return dindb::locate_in_db(m_redis.command(), parSearch, parTags);
+		return dindb::locate_in_db(m_redis, parSearch, parTags);
 	}
 
 	std::vector<LocatedItem> BackendRedis::locate_in_db (const mchlib::TigerHash& parSearch, const TagList& parTags) {
@@ -255,7 +255,7 @@ namespace dindb {
 	}
 
 	std::vector<GroupIDType> BackendRedis::find_all_sets() {
-		return dindb::find_all_sets(m_redis.command());
+		return dindb::find_all_sets(m_redis);
 	}
 
 	std::vector<dinhelp::MaxSizedArray<std::string, 4>> BackendRedis::find_set_details (const std::vector<GroupIDType>& parSets) {
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 490501b..22084d4 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -77,22 +77,6 @@ namespace redis {
 		return m_local_data->async_connection.connection_error();
 	}
 
-	auto Command::scan (boost::string_ref parPattern) -> scan_range {
-		return scan_range(scan_iterator(this, false, parPattern), scan_iterator(this, true));
-	}
-
-	auto Command::hscan (boost::string_ref parKey, boost::string_ref parPattern) -> hscan_range {
-		return hscan_range(hscan_iterator(this, parKey, false, parPattern), hscan_iterator(this, parKey, true));
-	}
-
-	auto Command::sscan (boost::string_ref parKey, boost::string_ref parPattern) -> sscan_range {
-		return sscan_range(sscan_iterator(this, parKey, false, parPattern), sscan_iterator(this, parKey, true));
-	}
-
-	auto Command::zscan (boost::string_ref parKey, boost::string_ref parPattern) -> zscan_range {
-		return zscan_range(zscan_iterator(this, parKey, false, parPattern), zscan_iterator(this, parKey, true));
-	}
-
 	Batch Command::make_batch() {
 		assert(is_connected());
 		return Batch(&m_local_data->async_connection);
diff --git a/src/backends/redis/command.hpp b/src/backends/redis/command.hpp
index 58717e9..b49000c 100644
--- a/src/backends/redis/command.hpp
+++ b/src/backends/redis/command.hpp
@@ -18,7 +18,6 @@
 #ifndef idD83EEBFC927840C6B9F32D61A1D1E582
 #define idD83EEBFC927840C6B9F32D61A1D1E582
 
-#include "scan_iterator.hpp"
 #include "reply.hpp"
 #include "batch.hpp"
 #include "redisConfig.h"
@@ -30,8 +29,6 @@
 #include <cassert>
 #include <vector>
 #include <utility>
-#include <boost/range/iterator_range_core.hpp>
-#include <boost/range/empty.hpp>
 #include <boost/utility/string_ref.hpp>
 #include <ciso646>
 #include <stdexcept>
@@ -39,15 +36,6 @@
 namespace redis {
 	class Command {
 	public:
-		typedef ScanIterator<ScanSingleValues<std::string>> scan_iterator;
-		typedef boost::iterator_range<scan_iterator> scan_range;
-		typedef ScanIterator<ScanPairs<std::pair<std::string, std::string>, ScanCommands::HSCAN>> hscan_iterator;
-		typedef boost::iterator_range<hscan_iterator> hscan_range;
-		typedef ScanIterator<ScanSingleValuesInKey<std::string>> sscan_iterator;
-		typedef boost::iterator_range<sscan_iterator> sscan_range;
-		typedef ScanIterator<ScanPairs<std::pair<std::string, std::string>, ScanCommands::ZSCAN>> zscan_iterator;
-		typedef boost::iterator_range<zscan_iterator> zscan_range;
-
 		Command ( std::string&& parAddress, uint16_t parPort );
 		explicit Command ( std::string&& parSocket );
 		~Command ( void ) noexcept;
@@ -66,12 +54,6 @@ namespace redis {
 		template <typename... Args>
 		Reply run ( const char* parCommand, Args&&... parArgs );
 
-		//Single Redis command wrappers
-		scan_range scan ( boost::string_ref parPattern=boost::string_ref() );
-		hscan_range hscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
-		sscan_range sscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
-		zscan_range zscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
-
 	private:
 		struct LocalData;
 
diff --git a/src/backends/redis/delete.cpp b/src/backends/redis/delete.cpp
index 1c0aa5e..18a1c87 100644
--- a/src/backends/redis/delete.cpp
+++ b/src/backends/redis/delete.cpp
@@ -17,7 +17,7 @@
 
 #include "delete.hpp"
 #include "tag.hpp"
-#include "command.hpp"
+#include "incredis.hpp"
 #include "helpers/lexical_cast.hpp"
 #include "helpers/sequence_bt.hpp"
 #include "dindexerConfig.h"
@@ -76,11 +76,11 @@ namespace dindb {
 		};
 	} //unnamed namespace
 
-	void delete_group_from_db (redis::Command& parRedis, redis::Script& parDeleTagIfInSet, redis::Script& parDeleHash, const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
+	void delete_group_from_db (redis::IncRedis& parRedis, redis::Script& parDeleTagIfInSet, redis::Script& parDeleHash, const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
 		using dinhelp::lexical_cast;
 		using IDRange = std::tuple<GroupIDType, FileIDType, FileIDType>;
 
-		auto set_batch = parRedis.make_batch();
+		auto set_batch = parRedis.command().make_batch();
 
 		auto dele_pair = confirm_dele(set_batch, parIDs, parConf);
 		assert(set_batch.replies_requested());
@@ -121,13 +121,13 @@ namespace dindb {
 			delete_all_tags(parRedis, parDeleTagIfInSet, ids, set_id);
 		}
 
-		auto dele_batch = parRedis.make_batch();
+		auto dele_batch = parRedis.command().make_batch();
 		for (const auto& dele_tuple : ranges) {
 			const auto set_id = std::get<0>(dele_tuple);
 			const auto file_base_index = std::get<1>(dele_tuple);
 			const auto file_count = std::get<2>(dele_tuple);
 
-			auto hash_query_batch = parRedis.make_batch();
+			auto hash_query_batch = parRedis.command().make_batch();
 			for (FileIDType i = file_base_index; i < file_base_index + file_count; ++i) {
 				const auto file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(i);
 				hash_query_batch.run("HGET", file_key, "hash");
diff --git a/src/backends/redis/delete.hpp b/src/backends/redis/delete.hpp
index 75074ac..aa07f1e 100644
--- a/src/backends/redis/delete.hpp
+++ b/src/backends/redis/delete.hpp
@@ -25,7 +25,7 @@
 #include <map>
 
 namespace redis {
-	class Command;
+	class IncRedis;
 	class Script;
 } //namespace redis
 
@@ -34,7 +34,7 @@ namespace dindb {
 	using ConfirmDeleCallback = std::function<bool(const IDDescMap&)>;
 
 	void delete_group_from_db (
-		redis::Command& parRedis,
+		redis::IncRedis& parRedis,
 		redis::Script& parDeleTagIfInSet,
 		redis::Script& parDeleHash,
 		const std::vector<GroupIDType>& parIDs,
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index 6b38d87..daa4155 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "find.hpp"
-#include "command.hpp"
+#include "incredis.hpp"
 #include "helpers/lexical_cast.hpp"
 #include "dindexerConfig.h"
 #include "dindexer-core/split_tags.hpp"
@@ -64,7 +64,7 @@ namespace dindb {
 		}
 	} //unnamed namespace
 
-	std::vector<GroupIDType> find_all_sets (redis::Command& parRedis) {
+	std::vector<GroupIDType> find_all_sets (redis::IncRedis& parRedis) {
 		using dincore::split_and_trim;
 		using dinhelp::lexical_cast;
 
@@ -75,7 +75,7 @@ namespace dindb {
 		return retval;
 	}
 
-	std::vector<LocatedItem> locate_in_db (redis::Command& parRedis, const std::string& parSearch, const TagList& parTags) {
+	std::vector<LocatedItem> locate_in_db (redis::IncRedis& parRedis, const std::string& parSearch, const TagList& parTags) {
 		using dincore::split_and_trim;
 		using dinhelp::lexical_cast;
 
@@ -87,7 +87,7 @@ namespace dindb {
 		ids.reserve(prefetch_count);
 
 		int curr_count = 0;
-		auto batch = parRedis.make_batch();
+		auto batch = parRedis.command().make_batch();
 		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
 			++curr_count;
 			batch.run("HMGET", itm, "path", "group_id", "tags");
diff --git a/src/backends/redis/find.hpp b/src/backends/redis/find.hpp
index f88e087..969c9f4 100644
--- a/src/backends/redis/find.hpp
+++ b/src/backends/redis/find.hpp
@@ -22,12 +22,12 @@
 #include <vector>
 
 namespace redis {
-	class Command;
+	class IncRedis;
 } //namespace redis
 
 namespace dindb {
-	std::vector<GroupIDType> find_all_sets ( redis::Command& parRedis );
-	std::vector<LocatedItem> locate_in_db ( redis::Command& parRedis, const std::string& parSearch, const TagList& parTags );
+	std::vector<GroupIDType> find_all_sets ( redis::IncRedis& parRedis );
+	std::vector<LocatedItem> locate_in_db ( redis::IncRedis& parRedis, const std::string& parSearch, const TagList& parTags );
 } //namespace dindb
 
 #endif
diff --git a/src/backends/redis/incredis.cpp b/src/backends/redis/incredis.cpp
index 1487c4d..bcf977e 100644
--- a/src/backends/redis/incredis.cpp
+++ b/src/backends/redis/incredis.cpp
@@ -77,6 +77,22 @@ namespace redis {
 		m_command.wait_for_disconnect();
 	}
 
+	auto IncRedis::scan (boost::string_ref parPattern) -> scan_range {
+		return scan_range(scan_iterator(&m_command, false, parPattern), scan_iterator(&m_command, true));
+	}
+
+	auto IncRedis::hscan (boost::string_ref parKey, boost::string_ref parPattern) -> hscan_range {
+		return hscan_range(hscan_iterator(&m_command, parKey, false, parPattern), hscan_iterator(&m_command, parKey, true));
+	}
+
+	auto IncRedis::sscan (boost::string_ref parKey, boost::string_ref parPattern) -> sscan_range {
+		return sscan_range(sscan_iterator(&m_command, parKey, false, parPattern), sscan_iterator(&m_command, parKey, true));
+	}
+
+	auto IncRedis::zscan (boost::string_ref parKey, boost::string_ref parPattern) -> zscan_range {
+		return zscan_range(zscan_iterator(&m_command, parKey, false, parPattern), zscan_iterator(&m_command, parKey, true));
+	}
+
 	auto IncRedis::hget (boost::string_ref parKey, boost::string_ref parField) -> opt_string {
 		return optional_string(m_command.run("HGET", parKey, parField));
 	}
diff --git a/src/backends/redis/incredis.hpp b/src/backends/redis/incredis.hpp
index 809b1de..1aa976a 100644
--- a/src/backends/redis/incredis.hpp
+++ b/src/backends/redis/incredis.hpp
@@ -19,14 +19,26 @@
 #define id7D338900114548A890B1EECE0C4D3C4C
 
 #include "command.hpp"
+#include "scan_iterator.hpp"
 #include <boost/optional.hpp>
 #include <string>
 #include <boost/utility/string_ref.hpp>
 #include <vector>
+#include <boost/range/iterator_range_core.hpp>
+#include <boost/range/empty.hpp>
 
 namespace redis {
 	class IncRedis {
 	public:
+		typedef ScanIterator<ScanSingleValues<std::string>> scan_iterator;
+		typedef boost::iterator_range<scan_iterator> scan_range;
+		typedef ScanIterator<ScanPairs<std::pair<std::string, std::string>, ScanCommands::HSCAN>> hscan_iterator;
+		typedef boost::iterator_range<hscan_iterator> hscan_range;
+		typedef ScanIterator<ScanSingleValuesInKey<std::string>> sscan_iterator;
+		typedef boost::iterator_range<sscan_iterator> sscan_range;
+		typedef ScanIterator<ScanPairs<std::pair<std::string, std::string>, ScanCommands::ZSCAN>> zscan_iterator;
+		typedef boost::iterator_range<zscan_iterator> zscan_range;
+
 		typedef boost::optional<std::string> opt_string;
 		typedef boost::optional<std::vector<opt_string>> opt_string_list;
 
@@ -43,6 +55,12 @@ namespace redis {
 		Command& command ( void ) { return m_command; }
 		const Command& command ( void ) const { return m_command; }
 
+		//Scan
+		scan_range scan ( boost::string_ref parPattern=boost::string_ref() );
+		hscan_range hscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
+		sscan_range sscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
+		zscan_range zscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
+
 		//Hash
 		opt_string hget ( boost::string_ref parKey, boost::string_ref parField );
 		int hincrby ( boost::string_ref parKey, boost::string_ref parField, int parInc );
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index ba63faf..b08ec08 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "tag.hpp"
-#include "command.hpp"
+#include "incredis.hpp"
 #include "dindexerConfig.h"
 #include "helpers/lexical_cast.hpp"
 #include "dindexer-core/split_tags.hpp"
@@ -54,10 +54,10 @@ namespace dindb {
 			return retval;
 		}
 
-		void run_id_based_script (redis::Command& parRedis, redis::Script& parScript, const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		void run_id_based_script (redis::IncRedis& parRedis, redis::Script& parScript, const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 			using dinhelp::lexical_cast;
 
-			auto batch = parRedis.make_batch();
+			auto batch = parRedis.command().make_batch();
 			const std::string set_id = lexical_cast<std::string>(parSet);
 			for (const auto file_id : parFiles) {
 				for (const auto &tag : parTags) {
@@ -72,18 +72,18 @@ namespace dindb {
 			batch.throw_if_failed();
 		}
 
-		void run_regex_based_script(redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+		void run_regex_based_script(redis::IncRedis& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 			using dinhelp::lexical_cast;
 
 			const std::string set_id = lexical_cast<std::string>(parSet);
 			const auto regexes = compile_regexes(parRegexes);
 			for (const auto &itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
 				const auto &file_key = itm;
-				const auto path = redis::get_string(parRedis.run("HGET", file_key, "path"));
+				const auto path = parRedis.hget(file_key, "path");
 
-				auto batch = parRedis.make_batch();
+				auto batch = parRedis.command().make_batch();
 				for (const auto &regex : regexes) {
-					if (not boost::regex_search(path, regex))
+					if (not path or not boost::regex_search(*path, regex))
 						continue;
 
 					for (const auto &tag : parTags) {
@@ -105,24 +105,24 @@ namespace dindb {
 		}
 	} //unnamed namespace
 
-	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	void tag_files (redis::IncRedis& parRedis, redis::Script& parTagIfInSet, const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 		run_id_based_script(parRedis, parTagIfInSet, parFiles, parTags, parSet);
 	}
 
-	void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	void tag_files (redis::IncRedis& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 		run_regex_based_script(parRedis, parTagIfInSet, parRegexes, parTags, parSet);
 	}
 
-	void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	void delete_tags (redis::IncRedis& parRedis, redis::Script& parDeleIfInSet, const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 		run_id_based_script(parRedis, parDeleIfInSet, parFiles, parTags, parSet);
 	}
 
-	void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
+	void delete_tags (redis::IncRedis& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
 		run_regex_based_script(parRedis, parDeleIfInSet, parRegexes, parTags, parSet);
 	}
 
-	void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<FileIDType>& parFiles, GroupIDType parSet) {
-		auto batch = parRedis.make_batch();
+	void delete_all_tags (redis::IncRedis& parRedis, redis::Script& parDeleIfInSet, const std::vector<FileIDType>& parFiles, GroupIDType parSet) {
+		auto batch = parRedis.command().make_batch();
 		for (const auto file_id : parFiles) {
 			const auto file_key = make_file_key(file_id);
 			batch.run("HGET", file_key, "tags");
@@ -141,7 +141,7 @@ namespace dindb {
 		delete_tags(parRedis, parDeleIfInSet, parFiles, vec_dele_tags, parSet);
 	}
 
-	void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, GroupIDType parSet) {
+	void delete_all_tags (redis::IncRedis& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, GroupIDType parSet) {
 		using dinhelp::lexical_cast;
 
 		const auto regexes = compile_regexes(parRegexes);
@@ -151,7 +151,7 @@ namespace dindb {
 
 		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
 			const auto& file_key = itm;
-			auto file_reply = parRedis.run("HMGET", file_key, "path", "tags", "group_id");
+			auto file_reply = parRedis.command().run("HMGET", file_key, "path", "tags", "group_id");
 			auto& file_replies = redis::get_array(file_reply);
 			assert(file_replies.size() == 3);
 			const auto group_id = lexical_cast<GroupIDType>(redis::get_string(file_replies[2]));
diff --git a/src/backends/redis/tag.hpp b/src/backends/redis/tag.hpp
index 93c6962..3f4acd3 100644
--- a/src/backends/redis/tag.hpp
+++ b/src/backends/redis/tag.hpp
@@ -23,20 +23,20 @@
 #include <boost/utility/string_ref.hpp>
 
 namespace redis {
-	class Command;
+	class IncRedis;
 	class Script;
 } //namespace redis
 
 namespace dindb {
 	void tag_files (
-		redis::Command& parRedis,
+		redis::IncRedis& parRedis,
 		redis::Script& parTagIfInSet,
 		const std::vector<FileIDType>& parFiles,
 		const std::vector<boost::string_ref>& parTags,
 		GroupIDType parSet
 	);
 	void tag_files (
-		redis::Command& parRedis,
+		redis::IncRedis& parRedis,
 		redis::Script& parTagIfInSet,
 		const std::vector<std::string>& parRegexes,
 		const std::vector<boost::string_ref>& parTags,
@@ -44,27 +44,27 @@ namespace dindb {
 	);
 
 	void delete_tags (
-		redis::Command& parRedis,
+		redis::IncRedis& parRedis,
 		redis::Script& parDeleIfInSet,
 		const std::vector<FileIDType>& parFiles,
 		const std::vector<boost::string_ref>& parTags,
 		GroupIDType parSet
 	);
 	void delete_tags (
-		redis::Command& parRedis,
+		redis::IncRedis& parRedis,
 		redis::Script& parDeleIfInSet,
 		const std::vector<std::string>& parRegexes,
 		const std::vector<boost::string_ref>& parTags,
 		GroupIDType parSet
 	);
 	void delete_all_tags (
-		redis::Command& parRedis,
+		redis::IncRedis& parRedis,
 		redis::Script& parDeleIfInSet,
 		const std::vector<FileIDType>& parFiles,
 		GroupIDType parSet
 	);
 	void delete_all_tags (
-		redis::Command& parRedis,
+		redis::IncRedis& parRedis,
 		redis::Script& parDeleIfInSet,
 		const std::vector<std::string>& parRegexes,
 		GroupIDType parSet

From e02b0a16f588f736641f012356a55999d7b90922 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 11:40:44 +0100
Subject: [PATCH 132/170] Implement hmget() method and use it.

---
 src/backends/redis/incredis.cpp |  8 ++++++--
 src/backends/redis/incredis.hpp | 10 ++++++++++
 src/backends/redis/tag.cpp      | 14 ++++++++------
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/backends/redis/incredis.cpp b/src/backends/redis/incredis.cpp
index bcf977e..59792fb 100644
--- a/src/backends/redis/incredis.cpp
+++ b/src/backends/redis/incredis.cpp
@@ -18,7 +18,6 @@
 #include "incredis.hpp"
 #include "helpers/compatibility.h"
 #include "helpers/lexical_cast.hpp"
-#include <utility>
 #include <cassert>
 #include <ciso646>
 
@@ -50,7 +49,8 @@ namespace redis {
 				return IncRedis::opt_string_list(std::move(retval));
 			}
 		}
-	}
+	} //unnamed namespace
+
 	IncRedis::IncRedis (std::string &&parAddress, uint16_t parPort) :
 		m_command(std::move(parAddress), parPort)
 	{
@@ -110,4 +110,8 @@ namespace redis {
 	auto IncRedis::srandmember (boost::string_ref parKey) -> opt_string {
 		return optional_string(m_command.run("SRANDMEMBER", parKey));
 	}
+
+	auto IncRedis::reply_to_string_list (const Reply& parReply) -> opt_string_list {
+		return optional_string_list(parReply);
+	}
 } //namespace redis
diff --git a/src/backends/redis/incredis.hpp b/src/backends/redis/incredis.hpp
index 1aa976a..af57700 100644
--- a/src/backends/redis/incredis.hpp
+++ b/src/backends/redis/incredis.hpp
@@ -26,6 +26,7 @@
 #include <vector>
 #include <boost/range/iterator_range_core.hpp>
 #include <boost/range/empty.hpp>
+#include <utility>
 
 namespace redis {
 	class IncRedis {
@@ -63,6 +64,8 @@ namespace redis {
 
 		//Hash
 		opt_string hget ( boost::string_ref parKey, boost::string_ref parField );
+		template <typename... Args>
+		opt_string_list hmget ( boost::string_ref parKey, Args&&... parArgs );
 		int hincrby ( boost::string_ref parKey, boost::string_ref parField, int parInc );
 
 		//Set
@@ -70,8 +73,15 @@ namespace redis {
 		opt_string srandmember ( boost::string_ref parKey );
 
 	private:
+		static opt_string_list reply_to_string_list ( const Reply& parReply );
+
 		Command m_command;
 	};
+
+	template <typename... Args>
+	auto IncRedis::hmget (boost::string_ref parKey, Args&&... parArgs) -> opt_string_list {
+		return reply_to_string_list(m_command.run("HMGET", parKey, std::forward<Args>(parArgs)...));
+	}
 } //namespace redis
 
 #endif
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index b08ec08..36f5462 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -151,15 +151,17 @@ namespace dindb {
 
 		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
 			const auto& file_key = itm;
-			auto file_reply = parRedis.command().run("HMGET", file_key, "path", "tags", "group_id");
-			auto& file_replies = redis::get_array(file_reply);
-			assert(file_replies.size() == 3);
-			const auto group_id = lexical_cast<GroupIDType>(redis::get_string(file_replies[2]));
+			auto opt_file_replies = parRedis.hmget(file_key, "path", "tags", "group_id");
+			assert(opt_file_replies and opt_file_replies->size() == 3);
+			if (not opt_file_replies)
+				continue;
+			const auto& file_replies = *opt_file_replies;
+			const auto group_id = lexical_cast<GroupIDType>(*file_replies[2]);
 			if (parSet != InvalidGroupID and parSet != group_id)
 				continue;
 
-			const auto path = redis::get_string(file_replies[0]);
-			const auto tags_str = (file_replies[1].which() == redis::RedisVariantType_Nil ? std::string() : redis::get_string(file_replies[1]));
+			const auto& path = *file_replies[0];
+			const auto tags_str = (file_replies[1] ? std::string() : *file_replies[1]);
 			const auto tags = dincore::split_tags(tags_str);
 			const auto file_id = id_from_redis_key<FileIDType>(file_key);
 

From e0670ff433a0f13439108887bff065d1f69d3932 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 12:07:36 +0100
Subject: [PATCH 133/170] New IncRedisBatch class.

Wraps Batch similarly to how IncRedis wraps Command.
---
 src/backends/redis/CMakeLists.txt     |  1 +
 src/backends/redis/backend_redis.cpp  |  8 ++--
 src/backends/redis/incredis.cpp       |  4 ++
 src/backends/redis/incredis.hpp       |  3 ++
 src/backends/redis/incredis_batch.cpp | 59 +++++++++++++++++++++++++++
 src/backends/redis/incredis_batch.hpp | 58 ++++++++++++++++++++++++++
 6 files changed, 129 insertions(+), 4 deletions(-)
 create mode 100644 src/backends/redis/incredis_batch.cpp
 create mode 100644 src/backends/redis/incredis_batch.hpp

diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 1966159..7a0c208 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -20,6 +20,7 @@ add_library(${PROJECT_NAME} SHARED
 	delete.cpp
 	find.cpp
 	incredis.cpp
+	incredis_batch.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 7845d0d..0d68294 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -107,10 +107,10 @@ namespace dindb {
 		m_redis.connect();
 		m_redis.wait_for_connect();
 		if (m_redis.is_connected()) {
-			auto batch = m_redis.command().make_batch();
-			batch.run("SELECT", lexical_cast<std::string>(m_database));
-			batch.run("CLIENT", "SETNAME", PROGRAM_NAME "_v" STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_PATCH));
-			batch.run("SCRIPT", "FLUSH");
+			auto batch = m_redis.make_batch();
+			batch.select(m_database);
+			batch.client_setname(PROGRAM_NAME "_v" STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_PATCH));
+			batch.script_flush();
 			batch.throw_if_failed();
 		}
 		else {
diff --git a/src/backends/redis/incredis.cpp b/src/backends/redis/incredis.cpp
index 59792fb..3ef978b 100644
--- a/src/backends/redis/incredis.cpp
+++ b/src/backends/redis/incredis.cpp
@@ -77,6 +77,10 @@ namespace redis {
 		m_command.wait_for_disconnect();
 	}
 
+	IncRedisBatch IncRedis::make_batch() {
+		return m_command.make_batch();
+	}
+
 	auto IncRedis::scan (boost::string_ref parPattern) -> scan_range {
 		return scan_range(scan_iterator(&m_command, false, parPattern), scan_iterator(&m_command, true));
 	}
diff --git a/src/backends/redis/incredis.hpp b/src/backends/redis/incredis.hpp
index af57700..a047e20 100644
--- a/src/backends/redis/incredis.hpp
+++ b/src/backends/redis/incredis.hpp
@@ -19,6 +19,7 @@
 #define id7D338900114548A890B1EECE0C4D3C4C
 
 #include "command.hpp"
+#include "incredis_batch.hpp"
 #include "scan_iterator.hpp"
 #include <boost/optional.hpp>
 #include <string>
@@ -53,6 +54,8 @@ namespace redis {
 		void wait_for_disconnect ( void );
 		bool is_connected ( void ) const { return m_command.is_connected(); }
 
+		IncRedisBatch make_batch ( void );
+
 		Command& command ( void ) { return m_command; }
 		const Command& command ( void ) const { return m_command; }
 
diff --git a/src/backends/redis/incredis_batch.cpp b/src/backends/redis/incredis_batch.cpp
new file mode 100644
index 0000000..f377759
--- /dev/null
+++ b/src/backends/redis/incredis_batch.cpp
@@ -0,0 +1,59 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "incredis_batch.hpp"
+#include "helpers/lexical_cast.hpp"
+#include <utility>
+
+namespace redis {
+	IncRedisBatch::IncRedisBatch (Batch&& parBatch) :
+		m_batch(std::move(parBatch))
+	{
+	}
+
+	void IncRedisBatch::reset() {
+		m_batch.reset();
+	}
+	void IncRedisBatch::throw_if_failed() {
+		m_batch.throw_if_failed();
+	}
+
+	IncRedisBatch& IncRedisBatch::select (int parIndex) {
+		m_batch.run("SELECT", dinhelp::lexical_cast<std::string>(parIndex));
+		return *this;
+	}
+
+	IncRedisBatch& IncRedisBatch::client_setname (boost::string_ref parName) {
+		m_batch.run("CLIENT", "SETNAME", parName);
+		return *this;
+	}
+
+	IncRedisBatch& IncRedisBatch::hget (boost::string_ref parKey, boost::string_ref parField) {
+		m_batch.run("HGET", parKey, parField);
+		return *this;
+	}
+
+	IncRedisBatch& IncRedisBatch::hincrby (boost::string_ref parKey, boost::string_ref parField, int parInc) {
+		m_batch.run("HINCRBY", parKey, parField, dinhelp::lexical_cast<std::string>(parInc));
+		return *this;
+	}
+
+	IncRedisBatch& IncRedisBatch::script_flush() {
+		m_batch.run("SCRIPT", "FLUSH");
+		return *this;
+	}
+} //namespace redis
diff --git a/src/backends/redis/incredis_batch.hpp b/src/backends/redis/incredis_batch.hpp
new file mode 100644
index 0000000..838f68b
--- /dev/null
+++ b/src/backends/redis/incredis_batch.hpp
@@ -0,0 +1,58 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id3C772A92AB0E440DA84DAFD807BC962D
+#define id3C772A92AB0E440DA84DAFD807BC962D
+
+#include "batch.hpp"
+#include <boost/utility/string_ref.hpp>
+
+namespace redis {
+	class IncRedisBatch {
+	public:
+		IncRedisBatch ( Batch&& parBatch );
+
+		void reset ( void );
+		void throw_if_failed ( void );
+		Batch& batch ( void ) { return m_batch; }
+		const Batch& batch ( void ) const { return m_batch; }
+
+		//Misc
+		IncRedisBatch& select ( int parIndex );
+		IncRedisBatch& client_setname ( boost::string_ref parName );
+
+		//Hash
+		IncRedisBatch& hget ( boost::string_ref parKey, boost::string_ref parField );
+		template <typename... Args>
+		IncRedisBatch& hmget ( boost::string_ref parKey, Args&&... parArgs );
+		IncRedisBatch& hincrby ( boost::string_ref parKey, boost::string_ref parField, int parInc );
+
+		//Script
+		IncRedisBatch& script_flush ( void );
+
+	private:
+		Batch m_batch;
+	};
+
+	template <typename... Args>
+	IncRedisBatch& IncRedisBatch::hmget (boost::string_ref parKey, Args&&... parArgs) {
+		m_batch.run("HMGET", parKey, std::forward<Args>(parArgs)...);
+		return *this;
+	}
+} //namespace redis
+
+#endif

From f4c495c5ea44bcc15aabc2a8cf1e3a65de2bce00 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 12:30:17 +0100
Subject: [PATCH 134/170] New wrapper methods.

---
 src/backends/redis/incredis.cpp       |  5 ++++
 src/backends/redis/incredis.hpp       |  4 +++
 src/backends/redis/incredis_batch.cpp | 10 ++++++++
 src/backends/redis/incredis_batch.hpp | 36 +++++++++++++++++++++++++++
 4 files changed, 55 insertions(+)

diff --git a/src/backends/redis/incredis.cpp b/src/backends/redis/incredis.cpp
index 3ef978b..2ab7cbb 100644
--- a/src/backends/redis/incredis.cpp
+++ b/src/backends/redis/incredis.cpp
@@ -115,6 +115,11 @@ namespace redis {
 		return optional_string(m_command.run("SRANDMEMBER", parKey));
 	}
 
+	bool IncRedis::script_flush() {
+		const auto ret = get<StatusString>(m_command.run("SCRIPT", "FLUSH"));
+		return ret.is_ok();
+	}
+
 	auto IncRedis::reply_to_string_list (const Reply& parReply) -> opt_string_list {
 		return optional_string_list(parReply);
 	}
diff --git a/src/backends/redis/incredis.hpp b/src/backends/redis/incredis.hpp
index a047e20..e464485 100644
--- a/src/backends/redis/incredis.hpp
+++ b/src/backends/redis/incredis.hpp
@@ -75,6 +75,9 @@ namespace redis {
 		opt_string_list srandmember ( boost::string_ref parKey, int parCount );
 		opt_string srandmember ( boost::string_ref parKey );
 
+		//Script
+		bool script_flush ( void );
+
 	private:
 		static opt_string_list reply_to_string_list ( const Reply& parReply );
 
@@ -83,6 +86,7 @@ namespace redis {
 
 	template <typename... Args>
 	auto IncRedis::hmget (boost::string_ref parKey, Args&&... parArgs) -> opt_string_list {
+		static_assert(sizeof...(Args) > 0, "No fields specified");
 		return reply_to_string_list(m_command.run("HMGET", parKey, std::forward<Args>(parArgs)...));
 	}
 } //namespace redis
diff --git a/src/backends/redis/incredis_batch.cpp b/src/backends/redis/incredis_batch.cpp
index f377759..2cae9de 100644
--- a/src/backends/redis/incredis_batch.cpp
+++ b/src/backends/redis/incredis_batch.cpp
@@ -52,6 +52,16 @@ namespace redis {
 		return *this;
 	}
 
+	IncRedisBatch& IncRedisBatch::srandmember (boost::string_ref parKey, int parCount) {
+		m_batch.run("SRANDMEMBER", parKey, dinhelp::lexical_cast<std::string>(parCount));
+		return *this;
+	}
+
+	IncRedisBatch& IncRedisBatch::srandmember (boost::string_ref parKey) {
+		m_batch.run("SRANDMEMBER", parKey);
+		return *this;
+	}
+
 	IncRedisBatch& IncRedisBatch::script_flush() {
 		m_batch.run("SCRIPT", "FLUSH");
 		return *this;
diff --git a/src/backends/redis/incredis_batch.hpp b/src/backends/redis/incredis_batch.hpp
index 838f68b..b173489 100644
--- a/src/backends/redis/incredis_batch.hpp
+++ b/src/backends/redis/incredis_batch.hpp
@@ -24,23 +24,37 @@
 namespace redis {
 	class IncRedisBatch {
 	public:
+		IncRedisBatch ( void ) = delete;
+		IncRedisBatch ( IncRedisBatch&& ) = default;
+		IncRedisBatch ( const Batch& ) = delete;
 		IncRedisBatch ( Batch&& parBatch );
 
 		void reset ( void );
 		void throw_if_failed ( void );
+		const std::vector<Reply>& replies ( void ) { return m_batch.replies(); }
 		Batch& batch ( void ) { return m_batch; }
 		const Batch& batch ( void ) const { return m_batch; }
 
 		//Misc
 		IncRedisBatch& select ( int parIndex );
 		IncRedisBatch& client_setname ( boost::string_ref parName );
+		template <typename... Args>
+		IncRedisBatch& del ( Args&&... parArgs );
 
 		//Hash
 		IncRedisBatch& hget ( boost::string_ref parKey, boost::string_ref parField );
 		template <typename... Args>
 		IncRedisBatch& hmget ( boost::string_ref parKey, Args&&... parArgs );
+		template <typename... Args>
+		IncRedisBatch& hmset ( boost::string_ref parKey, Args&&... parArgs );
 		IncRedisBatch& hincrby ( boost::string_ref parKey, boost::string_ref parField, int parInc );
 
+		//Set
+		IncRedisBatch& srandmember ( boost::string_ref parKey, int parCount );
+		IncRedisBatch& srandmember ( boost::string_ref parKey );
+		template <typename... Args>
+		IncRedisBatch& sadd ( boost::string_ref parKey, Args&&... parArgs );
+
 		//Script
 		IncRedisBatch& script_flush ( void );
 
@@ -50,9 +64,31 @@ namespace redis {
 
 	template <typename... Args>
 	IncRedisBatch& IncRedisBatch::hmget (boost::string_ref parKey, Args&&... parArgs) {
+		static_assert(sizeof...(Args) > 0, "No fields specified");
 		m_batch.run("HMGET", parKey, std::forward<Args>(parArgs)...);
 		return *this;
 	}
+
+	template <typename... Args>
+	IncRedisBatch& IncRedisBatch::hmset (boost::string_ref parKey, Args&&... parArgs) {
+		static_assert(sizeof...(Args) % 2 == 0, "Uneven number of parameters received");
+		m_batch.run("HMSET", parKey, std::forward<Args>(parArgs)...);
+		return *this;
+	}
+
+	template <typename... Args>
+	IncRedisBatch& IncRedisBatch::sadd (boost::string_ref parKey, Args&&... parArgs) {
+		static_assert(sizeof...(Args) > 0, "No members specified");
+		m_batch.run("SADD", parKey, std::forward<Args>(parArgs)...);
+		return *this;
+	}
+
+	template <typename... Args>
+	IncRedisBatch& IncRedisBatch::del (Args&&... parArgs) {
+		static_assert(sizeof...(Args) > 0, "No keys specified");
+		m_batch.run("DEL", std::forward<Args>(parArgs)...);
+		return *this;
+	}
 } //namespace redis
 
 #endif

From d6682eb1309773d3ddf2e5cdca144707f9c39943 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 12:30:53 +0100
Subject: [PATCH 135/170] Call wrapper methods instead of plain run().

---
 src/backends/redis/backend_redis.cpp | 11 ++++-------
 src/backends/redis/delete.cpp        | 20 ++++++++++----------
 src/backends/redis/find.cpp          |  6 +++---
 src/backends/redis/tag.cpp           |  4 ++--
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 0d68294..e981772 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -169,10 +169,9 @@ namespace dindb {
 		assert(file_id_int >= data_size);
 		const auto base_file_id = file_id_int - data_size + 1;
 
-		auto batch = m_redis.command().make_batch();
+		auto batch = m_redis.make_batch();
 
-		batch.run(
-			"HMSET",
+		batch.hmset(
 			set_key,
 			"name", parSetData.name,
 			"disk_label", parSetData.disk_label,
@@ -187,8 +186,7 @@ namespace dindb {
 			const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(z);
 			const auto& file_data = parData[z - base_file_id];
 			const std::string hash = tiger_to_string(file_data.hash);
-			batch.run(
-				"HMSET",
+			batch.hmset(
 				file_key,
 				"hash", hash,
 				"path", file_data.path(),
@@ -203,8 +201,7 @@ namespace dindb {
 				"group_id", group_id
 			);
 
-			batch.run(
-				"SADD",
+			batch.sadd(
 				PROGRAM_NAME ":hash:" + hash,
 				lexical_cast<std::string>(z)
 			);
diff --git a/src/backends/redis/delete.cpp b/src/backends/redis/delete.cpp
index 18a1c87..3e6945f 100644
--- a/src/backends/redis/delete.cpp
+++ b/src/backends/redis/delete.cpp
@@ -29,7 +29,7 @@
 
 namespace dindb {
 	namespace {
-		std::pair<bool, std::size_t> confirm_dele (redis::Batch& parBatch, const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
+		std::pair<bool, std::size_t> confirm_dele (redis::IncRedisBatch& parBatch, const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
 			using dinhelp::lexical_cast;
 
 			if (parIDs.empty())
@@ -37,7 +37,7 @@ namespace dindb {
 
 			for (auto id : parIDs) {
 				const auto set_key = PROGRAM_NAME ":set:" + lexical_cast<std::string>(id);
-				parBatch.run("HMGET", set_key, "base_file_id", "file_count", "name");
+				parBatch.hmget(set_key, "base_file_id", "file_count", "name");
 			}
 
 			std::map<GroupIDType, std::string> set_dele_list;
@@ -80,10 +80,10 @@ namespace dindb {
 		using dinhelp::lexical_cast;
 		using IDRange = std::tuple<GroupIDType, FileIDType, FileIDType>;
 
-		auto set_batch = parRedis.command().make_batch();
+		auto set_batch = parRedis.make_batch();
 
 		auto dele_pair = confirm_dele(set_batch, parIDs, parConf);
-		assert(set_batch.replies_requested());
+		assert(set_batch.batch().replies_requested());
 		if (not dele_pair.first)
 			return;
 
@@ -121,30 +121,30 @@ namespace dindb {
 			delete_all_tags(parRedis, parDeleTagIfInSet, ids, set_id);
 		}
 
-		auto dele_batch = parRedis.command().make_batch();
+		auto dele_batch = parRedis.make_batch();
 		for (const auto& dele_tuple : ranges) {
 			const auto set_id = std::get<0>(dele_tuple);
 			const auto file_base_index = std::get<1>(dele_tuple);
 			const auto file_count = std::get<2>(dele_tuple);
 
-			auto hash_query_batch = parRedis.command().make_batch();
+			auto hash_query_batch = parRedis.make_batch();
 			for (FileIDType i = file_base_index; i < file_base_index + file_count; ++i) {
 				const auto file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(i);
-				hash_query_batch.run("HGET", file_key, "hash");
+				hash_query_batch.hget(file_key, "hash");
 			}
 			hash_query_batch.throw_if_failed();
 
 			for (const auto& rep : hash_query_batch.replies()) {
 				const auto hash_key = PROGRAM_NAME ":hash:" + redis::get_string(rep);
 				parDeleHash.run(
-					dele_batch,
+					dele_batch.batch(),
 					std::make_tuple(hash_key),
 					std::make_tuple(lexical_cast<std::string>(file_base_index), lexical_cast<std::string>(file_count))
 				);
 			}
 
-			dele_batch.run("DEL", PROGRAM_NAME ":set:" + lexical_cast<std::string>(set_id));
-			chunked_run<FileIDType, 8>(dele_batch, +"DEL", file_base_index, file_count, [](FileIDType id){return PROGRAM_NAME ":file:" + lexical_cast<std::string>(id);});
+			dele_batch.del(PROGRAM_NAME ":set:" + lexical_cast<std::string>(set_id));
+			chunked_run<FileIDType, 8>(dele_batch.batch(), +"DEL", file_base_index, file_count, [](FileIDType id){return PROGRAM_NAME ":file:" + lexical_cast<std::string>(id);});
 		}
 
 		dele_batch.throw_if_failed();
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index daa4155..6f750c6 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -42,7 +42,7 @@ namespace dindb {
 			return true;
 		}
 
-		void store_matching_paths (redis::Batch& parBatch, std::vector<LocatedItem>& parOut, std::vector<FileIDType>& parIDs, const boost::regex& parSearch, const TagList& parTags) {
+		void store_matching_paths (redis::IncRedisBatch& parBatch, std::vector<LocatedItem>& parOut, std::vector<FileIDType>& parIDs, const boost::regex& parSearch, const TagList& parTags) {
 			using dinhelp::lexical_cast;
 			assert(parIDs.size() == parBatch.replies().size());
 
@@ -87,10 +87,10 @@ namespace dindb {
 		ids.reserve(prefetch_count);
 
 		int curr_count = 0;
-		auto batch = parRedis.command().make_batch();
+		auto batch = parRedis.make_batch();
 		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
 			++curr_count;
-			batch.run("HMGET", itm, "path", "group_id", "tags");
+			batch.hmget(itm, "path", "group_id", "tags");
 			ids.push_back(lexical_cast<FileIDType>(split_and_trim(itm, ':').back()));
 
 			if (curr_count == prefetch_count) {
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index 36f5462..1c7cfc0 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -122,10 +122,10 @@ namespace dindb {
 	}
 
 	void delete_all_tags (redis::IncRedis& parRedis, redis::Script& parDeleIfInSet, const std::vector<FileIDType>& parFiles, GroupIDType parSet) {
-		auto batch = parRedis.command().make_batch();
+		auto batch = parRedis.make_batch();
 		for (const auto file_id : parFiles) {
 			const auto file_key = make_file_key(file_id);
-			batch.run("HGET", file_key, "tags");
+			batch.hget(file_key, "tags");
 		}
 
 		batch.throw_if_failed();

From e2122277ee1cf09e85458c8e0aeee979e5ab1995 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 12:37:39 +0100
Subject: [PATCH 136/170] Crash fix.

---
 src/backends/redis/batch.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/backends/redis/batch.cpp b/src/backends/redis/batch.cpp
index 0d5f6c2..07c634a 100644
--- a/src/backends/redis/batch.cpp
+++ b/src/backends/redis/batch.cpp
@@ -133,7 +133,8 @@ namespace redis {
 	}
 
 	Batch::~Batch() noexcept {
-		this->reset();
+		if (m_local_data)
+			this->reset();
 	}
 
 	void Batch::run_pvt (int parArgc, const char** parArgv, std::size_t* parLengths) {
@@ -201,6 +202,7 @@ namespace redis {
 			assert(false);
 		}
 
+		assert(m_local_data);
 		assert(0 == m_local_data->pending_futures);
 		m_futures.clear();
 		m_replies.clear();

From 01be1a94e5bfe9c9e167839264568cc44fffc9ba Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 13:40:12 +0100
Subject: [PATCH 137/170] Bugfix - files where not being stored reliably.

Some crashes were also happening.
---
 include/dindexer-machinery/recorddata.hpp | 18 +++++++++++++++---
 src/backends/redis/backend_redis.cpp      | 18 ++++++++++++++----
 src/backends/redis/batch.cpp              |  1 +
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/include/dindexer-machinery/recorddata.hpp b/include/dindexer-machinery/recorddata.hpp
index 8ecf5ce..7a13cbb 100644
--- a/include/dindexer-machinery/recorddata.hpp
+++ b/include/dindexer-machinery/recorddata.hpp
@@ -87,9 +87,21 @@ namespace mchlib {
 		bool operator== ( const FileRecordData& parOther ) const;
 #endif
 
-		boost::string_ref path ( void ) const { return boost::string_ref(abs_path).substr(path_offset); }
-		boost::string_ref mime_type ( void ) const { return boost::string_ref(mime_full.get()).substr(mime_type_offset, mime_type_length); }
-		boost::string_ref mime_charset ( void ) const { return boost::string_ref(mime_full.get()).substr(mime_charset_offset, mime_charset_length); }
+		boost::string_ref path ( void ) const {
+			assert(abs_path.data());
+			return boost::string_ref(abs_path).substr(path_offset);
+		}
+
+		boost::string_ref mime_type ( void ) const {
+			assert(mime_full.get().data());
+			return boost::string_ref(mime_full.get()).substr(mime_type_offset, mime_type_length);
+		}
+
+		boost::string_ref mime_charset ( void ) const {
+			assert(mime_full.get().data());
+			return boost::string_ref(mime_full.get()).substr(mime_charset_offset, mime_charset_length);
+		}
+
 		void set_mime_parts ( boost::string_ref parType, boost::string_ref parCharset ) {
 			const auto& mime = mime_full.get();
 			{
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index e981772..e20c1c6 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -182,8 +182,13 @@ namespace dindb {
 			"file_count", lexical_cast<std::string>(parData.size())
 		);
 
-		for (auto z = base_file_id; z < data_size + 1; ++z) {
+#if !defined(NDEBUG)
+		std::size_t inserted_count = 0;
+#endif
+		for (auto z = base_file_id; z < base_file_id + data_size; ++z) {
 			const std::string file_key = PROGRAM_NAME ":file:" + lexical_cast<std::string>(z);
+			assert(z >= base_file_id);
+			assert(static_cast<std::size_t>(z - base_file_id) < parData.size());
 			const auto& file_data = parData[z - base_file_id];
 			const std::string hash = tiger_to_string(file_data.hash);
 			batch.hmset(
@@ -205,7 +210,11 @@ namespace dindb {
 				PROGRAM_NAME ":hash:" + hash,
 				lexical_cast<std::string>(z)
 			);
+#if !defined(NDEBUG)
+			++inserted_count;
+#endif
 		}
+		assert(inserted_count == parData.size());
 
 		batch.throw_if_failed();
 	}
@@ -219,10 +228,11 @@ namespace dindb {
 			return false;
 		}
 		else {
-			const auto result_id = std::move(*hash_reply);
-			auto set_key_and_file_item = redis::range_as<FileRecordDataWithGroup>(m_redis.hscan(result_id));
+			const auto file_key = PROGRAM_NAME ":file:" + *hash_reply;
+			auto set_key_and_file_item = redis::range_as<FileRecordDataWithGroup>(m_redis.hscan(file_key));
 			parItem = std::move(set_key_and_file_item.second);
-			const std::string group_key = std::move(set_key_and_file_item.first);
+			assert(parItem.hash == parHash);
+			const std::string group_key = PROGRAM_NAME ":set:" + set_key_and_file_item.first;
 
 			auto scan_range = m_redis.hscan(group_key);
 			if (empty(scan_range)) {
diff --git a/src/backends/redis/batch.cpp b/src/backends/redis/batch.cpp
index 07c634a..3deb630 100644
--- a/src/backends/redis/batch.cpp
+++ b/src/backends/redis/batch.cpp
@@ -142,6 +142,7 @@ namespace redis {
 		assert(parArgc >= 1);
 		assert(parArgv);
 		assert(parLengths); //This /could/ be null, but I don't see why it should
+		assert(m_local_data);
 
 		const auto pending_futures = m_local_data->pending_futures.fetch_add(1);
 		auto* data = new HiredisCallbackData(m_local_data->pending_futures, m_local_data->free_cmd_slot);

From afb2e6884925de024aa1c45fd4b37f8dc6f6e269 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 16:42:27 +0100
Subject: [PATCH 138/170] Implement locate_in_db() by hash.

---
 src/backends/redis/backend_redis.cpp |  2 +-
 src/backends/redis/find.cpp          | 63 ++++++++++++++++++++++++++++
 src/backends/redis/find.hpp          |  1 +
 src/backends/redis/incredis.cpp      |  6 ++-
 src/backends/redis/incredis.hpp      |  1 +
 5 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index e20c1c6..3bcf4e1 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -250,7 +250,7 @@ namespace dindb {
 	}
 
 	std::vector<LocatedItem> BackendRedis::locate_in_db (const mchlib::TigerHash& parSearch, const TagList& parTags) {
-		return std::vector<LocatedItem>();
+		return dindb::locate_in_db(m_redis, parSearch, parTags);
 	}
 
 	std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSearch, bool parCaseInsensitive) {
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index 6f750c6..b41cb12 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -20,9 +20,13 @@
 #include "helpers/lexical_cast.hpp"
 #include "dindexerConfig.h"
 #include "dindexer-core/split_tags.hpp"
+#include "dindexer-machinery/tiger.hpp"
 #include <boost/regex.hpp>
 #include <ciso646>
 #include <algorithm>
+#include <boost/range/adaptor/filtered.hpp>
+#include <boost/range/adaptor/transformed.hpp>
+#include <boost/iterator/zip_iterator.hpp>
 
 namespace dindb {
 	namespace {
@@ -62,6 +66,20 @@ namespace dindb {
 				++id_index;
 			}
 		}
+
+		//See: http://stackoverflow.com/questions/12552277/whats-the-best-way-to-iterate-over-two-or-more-containers-simultaneously/12553437#12553437
+		//(referenced from http://stackoverflow.com/questions/16982190/c-use-boost-range-transformed-adaptor-with-binary-function)
+		//What became of this? http://marc.info/?l=boost-users&m=129619765731342
+		template <typename... Conts>
+		auto zip_range (Conts&... parConts) -> decltype(boost::make_iterator_range(
+			boost::make_zip_iterator(boost::make_tuple(parConts.begin()...)),
+		    boost::make_zip_iterator(boost::make_tuple(parConts.end()...)))
+		) {
+			return {
+				boost::make_zip_iterator(boost::make_tuple(parConts.begin()...)),
+				boost::make_zip_iterator(boost::make_tuple(parConts.end()...))
+			};
+		}
 	} //unnamed namespace
 
 	std::vector<GroupIDType> find_all_sets (redis::IncRedis& parRedis) {
@@ -104,4 +122,49 @@ namespace dindb {
 			store_matching_paths(batch, retval, ids, search, parTags);
 		return retval;
 	}
+
+	std::vector<LocatedItem> locate_in_db (redis::IncRedis& parRedis, const mchlib::TigerHash& parSearch, const TagList& parTags) {
+		using boost::adaptors::filtered;
+		using boost::adaptors::transformed;
+		using boost::tuple;
+		using boost::make_tuple;
+		using redis::get_string;
+		using redis::Reply;
+		using std::vector;
+		using dinhelp::lexical_cast;
+
+		const auto hash_key = PROGRAM_NAME ":hash:" + mchlib::tiger_to_string(parSearch, false);
+		const auto file_ids = parRedis.smembers(hash_key);
+
+		vector<std::string> ids;
+		if (file_ids) {
+			auto batch = parRedis.make_batch();
+			for (auto&& file_id : *file_ids) {
+				if (not file_id)
+					continue;
+
+				const auto file_key = PROGRAM_NAME ":file:" + *file_id;
+				ids.emplace_back(std::move(*file_id));
+				batch.hmget(file_key, "path", "group_id", "tags");
+			}
+			batch.throw_if_failed();
+
+			assert(batch.replies().size() == ids.size());
+			return boost::copy_range<vector<LocatedItem>>(
+				zip_range(batch.replies(), ids) |
+				transformed([](const tuple<Reply, std::string>& r)
+				            { return make_tuple(redis::get_array(r.get<0>()), r.get<1>()); }
+				) |
+				filtered([&parTags](const tuple<vector<Reply>, std::string>& t)
+				         { return parTags.empty() or all_tags_match(parTags, get_string(t.get<0>()[2])); }
+				) |
+				transformed([&ids](const tuple<vector<Reply>, std::string>& t)
+				            { return LocatedItem{ get_string(t.get<0>()[0]), lexical_cast<FileIDType>(t.get<1>()), lexical_cast<GroupIDType>(get_string(t.get<0>()[1])) }; }
+				)
+			);
+		}
+		else {
+			return std::vector<LocatedItem>();
+		}
+	}
 } //namespace dindb
diff --git a/src/backends/redis/find.hpp b/src/backends/redis/find.hpp
index 969c9f4..5e1293c 100644
--- a/src/backends/redis/find.hpp
+++ b/src/backends/redis/find.hpp
@@ -28,6 +28,7 @@ namespace redis {
 namespace dindb {
 	std::vector<GroupIDType> find_all_sets ( redis::IncRedis& parRedis );
 	std::vector<LocatedItem> locate_in_db ( redis::IncRedis& parRedis, const std::string& parSearch, const TagList& parTags );
+	std::vector<LocatedItem> locate_in_db ( redis::IncRedis& parRedis, const mchlib::TigerHash& parSearch, const TagList& parTags );
 } //namespace dindb
 
 #endif
diff --git a/src/backends/redis/incredis.cpp b/src/backends/redis/incredis.cpp
index 2ab7cbb..2e7ca88 100644
--- a/src/backends/redis/incredis.cpp
+++ b/src/backends/redis/incredis.cpp
@@ -24,7 +24,7 @@
 namespace redis {
 	namespace {
 		inline IncRedis::opt_string optional_string ( const Reply& parReply ) a_always_inline;
-		inline IncRedis::opt_string_list optional_string_list ( const Reply& parReply ) a_always_inline;
+		IncRedis::opt_string_list optional_string_list ( const Reply& parReply );
 
 		IncRedis::opt_string optional_string (const Reply& parReply) {
 			assert(parReply.which() == RedisVariantType_Nil or parReply.which() == RedisVariantType_String);
@@ -115,6 +115,10 @@ namespace redis {
 		return optional_string(m_command.run("SRANDMEMBER", parKey));
 	}
 
+	auto IncRedis::smembers (boost::string_ref parKey) -> opt_string_list {
+		return optional_string_list(m_command.run("SMEMBERS", parKey));
+	}
+
 	bool IncRedis::script_flush() {
 		const auto ret = get<StatusString>(m_command.run("SCRIPT", "FLUSH"));
 		return ret.is_ok();
diff --git a/src/backends/redis/incredis.hpp b/src/backends/redis/incredis.hpp
index e464485..5ea6727 100644
--- a/src/backends/redis/incredis.hpp
+++ b/src/backends/redis/incredis.hpp
@@ -74,6 +74,7 @@ namespace redis {
 		//Set
 		opt_string_list srandmember ( boost::string_ref parKey, int parCount );
 		opt_string srandmember ( boost::string_ref parKey );
+		opt_string_list smembers ( boost::string_ref parKey );
 
 		//Script
 		bool script_flush ( void );

From bcfd1287c943f8ae2e65c820592118dab91b806f Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 17:20:56 +0100
Subject: [PATCH 139/170] Extract the boost::copy_range part into a new
 function.

By making a more generic function, both locate functions can
use the same code now.
---
 src/backends/redis/find.cpp | 109 ++++++++++++++++++++----------------
 1 file changed, 62 insertions(+), 47 deletions(-)

diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index b41cb12..3c45dc6 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -21,15 +21,21 @@
 #include "dindexerConfig.h"
 #include "dindexer-core/split_tags.hpp"
 #include "dindexer-machinery/tiger.hpp"
+#include "helpers/compatibility.h"
 #include <boost/regex.hpp>
 #include <ciso646>
 #include <algorithm>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/iterator/zip_iterator.hpp>
+#include <functional>
+#include <iterator>
 
 namespace dindb {
 	namespace {
+		inline std::string to_std_string ( boost::string_ref parStr ) a_always_inline;
+		inline void concatenate ( std::vector<LocatedItem>&& parAppend, std::vector<LocatedItem>& parOut ) a_always_inline;
+
 		bool all_tags_match (const TagList& parTags, const std::string& parTaglist) {
 			const auto tags = dincore::split_tags(parTaglist);
 
@@ -46,27 +52,6 @@ namespace dindb {
 			return true;
 		}
 
-		void store_matching_paths (redis::IncRedisBatch& parBatch, std::vector<LocatedItem>& parOut, std::vector<FileIDType>& parIDs, const boost::regex& parSearch, const TagList& parTags) {
-			using dinhelp::lexical_cast;
-			assert(parIDs.size() == parBatch.replies().size());
-
-			parBatch.throw_if_failed();
-			std::size_t id_index = 0;
-			for (const auto& itm : parBatch.replies()) {
-				const auto reply = redis::get_array(itm);
-				const auto& path = redis::get_string(reply[0]);
-
-				if (boost::regex_search(path, parSearch)) {
-					if (parTags.empty() or all_tags_match(parTags, redis::get_string(reply[2]))) {
-						const auto group_id = lexical_cast<GroupIDType>(redis::get_string(reply[1]));
-						parOut.push_back(LocatedItem{path, parIDs[id_index], group_id});
-					}
-				}
-				assert(id_index < parIDs.size());
-				++id_index;
-			}
-		}
-
 		//See: http://stackoverflow.com/questions/12552277/whats-the-best-way-to-iterate-over-two-or-more-containers-simultaneously/12553437#12553437
 		//(referenced from http://stackoverflow.com/questions/16982190/c-use-boost-range-transformed-adaptor-with-binary-function)
 		//What became of this? http://marc.info/?l=boost-users&m=129619765731342
@@ -80,6 +65,45 @@ namespace dindb {
 				boost::make_zip_iterator(boost::make_tuple(parConts.end()...))
 			};
 		}
+
+		std::vector<LocatedItem> store_filtered_items (
+			const std::vector<redis::Reply>& parReplies,
+			const std::vector<std::string>& parIDs,
+			std::function<bool(const boost::tuple<std::vector<redis::Reply>, std::string>&)> parFilter
+		) {
+			using boost::adaptors::filtered;
+			using boost::adaptors::transformed;
+			using boost::tuple;
+			using boost::make_tuple;
+			using redis::get_string;
+			using redis::Reply;
+			using std::vector;
+			using dinhelp::lexical_cast;
+
+			assert(parReplies.size() == parIDs.size());
+			return boost::copy_range<vector<LocatedItem>>(
+					zip_range(parReplies, parIDs) |
+							transformed([](const tuple<Reply, std::string>& r) {
+								return make_tuple(redis::get_array(r.get<0>()), r.get<1>());
+							}) |
+							filtered(parFilter) |
+							transformed([](const tuple<vector<Reply>, std::string>& t) {
+								return LocatedItem{
+									get_string(t.get<0>()[0]),
+									lexical_cast<FileIDType>(t.get<1>()),
+									lexical_cast<GroupIDType>(get_string(t.get<0>()[1]))
+								};
+							})
+			);
+		}
+
+		std::string to_std_string (boost::string_ref parStr) {
+			return std::string(parStr.data(), parStr.size());
+		}
+
+		void concatenate (std::vector<LocatedItem>&& parAppend, std::vector<LocatedItem>& parOut) {
+			parOut.insert(parOut.end(), std::make_move_iterator(parAppend.begin()), std::make_move_iterator(parAppend.end()));
+		}
 	} //unnamed namespace
 
 	std::vector<GroupIDType> find_all_sets (redis::IncRedis& parRedis) {
@@ -101,42 +125,39 @@ namespace dindb {
 		const int prefetch_count = 500;
 
 		std::vector<LocatedItem> retval;
-		std::vector<FileIDType> ids;
+		std::vector<std::string> ids;
 		ids.reserve(prefetch_count);
 
+		auto filter = [&parTags, &search](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
+			return (parTags.empty() or all_tags_match(parTags, redis::get_string(t.get<0>()[2]))) and
+				boost::regex_search(redis::get_string(t.get<0>()[0]), search);
+		};
+
 		int curr_count = 0;
 		auto batch = parRedis.make_batch();
 		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
 			++curr_count;
 			batch.hmget(itm, "path", "group_id", "tags");
-			ids.push_back(lexical_cast<FileIDType>(split_and_trim(itm, ':').back()));
+			ids.push_back(to_std_string(split_and_trim(itm, ':').back()));
 
 			if (curr_count == prefetch_count) {
-				store_matching_paths(batch, retval, ids, search, parTags);
+				concatenate(store_filtered_items(batch.replies(), ids, filter), retval);
 				batch.reset();
 				curr_count = 0;
 				ids.clear();
 			}
 		}
 		if (curr_count)
-			store_matching_paths(batch, retval, ids, search, parTags);
+			concatenate(store_filtered_items(batch.replies(), ids, filter), retval);
+
 		return retval;
 	}
 
 	std::vector<LocatedItem> locate_in_db (redis::IncRedis& parRedis, const mchlib::TigerHash& parSearch, const TagList& parTags) {
-		using boost::adaptors::filtered;
-		using boost::adaptors::transformed;
-		using boost::tuple;
-		using boost::make_tuple;
-		using redis::get_string;
-		using redis::Reply;
-		using std::vector;
-		using dinhelp::lexical_cast;
-
 		const auto hash_key = PROGRAM_NAME ":hash:" + mchlib::tiger_to_string(parSearch, false);
 		const auto file_ids = parRedis.smembers(hash_key);
 
-		vector<std::string> ids;
+		std::vector<std::string> ids;
 		if (file_ids) {
 			auto batch = parRedis.make_batch();
 			for (auto&& file_id : *file_ids) {
@@ -149,18 +170,12 @@ namespace dindb {
 			}
 			batch.throw_if_failed();
 
-			assert(batch.replies().size() == ids.size());
-			return boost::copy_range<vector<LocatedItem>>(
-				zip_range(batch.replies(), ids) |
-				transformed([](const tuple<Reply, std::string>& r)
-				            { return make_tuple(redis::get_array(r.get<0>()), r.get<1>()); }
-				) |
-				filtered([&parTags](const tuple<vector<Reply>, std::string>& t)
-				         { return parTags.empty() or all_tags_match(parTags, get_string(t.get<0>()[2])); }
-				) |
-				transformed([&ids](const tuple<vector<Reply>, std::string>& t)
-				            { return LocatedItem{ get_string(t.get<0>()[0]), lexical_cast<FileIDType>(t.get<1>()), lexical_cast<GroupIDType>(get_string(t.get<0>()[1])) }; }
-				)
+			return store_filtered_items(
+				batch.replies(),
+				ids,
+				[&parTags](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
+					return parTags.empty() or all_tags_match(parTags, redis::get_string(t.get<0>()[2]));
+				}
 			);
 		}
 		else {

From e0eaad2587a2ecf0677766bdda3f4ef520e770e9 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 18:08:10 +0100
Subject: [PATCH 140/170] Implement locate_sets_in_db().

---
 src/backends/redis/backend_redis.cpp |   5 +-
 src/backends/redis/delete.cpp        |   2 +-
 src/backends/redis/find.cpp          | 102 +++++++++++++++++++++++++--
 src/backends/redis/find.hpp          |   3 +-
 4 files changed, 102 insertions(+), 10 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 3bcf4e1..a0bb74f 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -179,7 +179,8 @@ namespace dindb {
 			"type", parSetData.type,
 			"content_type", parSetData.content_type,
 			"base_file_id", lexical_cast<std::string>(base_file_id),
-			"file_count", lexical_cast<std::string>(parData.size())
+			"item_count", lexical_cast<std::string>(parData.size()),
+			"dir_count", lexical_cast<std::string>(std::count_if(parData.begin(), parData.end(), [](const mchlib::FileRecordData& r){return r.is_directory;}))
 		);
 
 #if !defined(NDEBUG)
@@ -254,7 +255,7 @@ namespace dindb {
 	}
 
 	std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSearch, bool parCaseInsensitive) {
-		return std::vector<LocatedSet>();
+		return dindb::locate_sets_in_db(m_redis, parSearch, parCaseInsensitive);
 	}
 
 	std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive) {
diff --git a/src/backends/redis/delete.cpp b/src/backends/redis/delete.cpp
index 3e6945f..fb612e1 100644
--- a/src/backends/redis/delete.cpp
+++ b/src/backends/redis/delete.cpp
@@ -37,7 +37,7 @@ namespace dindb {
 
 			for (auto id : parIDs) {
 				const auto set_key = PROGRAM_NAME ":set:" + lexical_cast<std::string>(id);
-				parBatch.hmget(set_key, "base_file_id", "file_count", "name");
+				parBatch.hmget(set_key, "base_file_id", "item_count", "name");
 			}
 
 			std::map<GroupIDType, std::string> set_dele_list;
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index 3c45dc6..574d84a 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -30,11 +30,15 @@
 #include <boost/iterator/zip_iterator.hpp>
 #include <functional>
 #include <iterator>
+#include <cstdint>
 
 namespace dindb {
 	namespace {
+		const int g_prefetch_count = 500;
+
 		inline std::string to_std_string ( boost::string_ref parStr ) a_always_inline;
-		inline void concatenate ( std::vector<LocatedItem>&& parAppend, std::vector<LocatedItem>& parOut ) a_always_inline;
+		template <typename T>
+		inline void concatenate ( std::vector<T>&& parAppend, std::vector<T>& parOut ) a_always_inline;
 
 		bool all_tags_match (const TagList& parTags, const std::string& parTaglist) {
 			const auto tags = dincore::split_tags(parTaglist);
@@ -80,6 +84,8 @@ namespace dindb {
 			using std::vector;
 			using dinhelp::lexical_cast;
 
+			//Reply is expected to contain: "path", "group_id", "tags"
+
 			assert(parReplies.size() == parIDs.size());
 			return boost::copy_range<vector<LocatedItem>>(
 					zip_range(parReplies, parIDs) |
@@ -97,11 +103,49 @@ namespace dindb {
 			);
 		}
 
+		std::vector<LocatedSet> store_filtered_sets (
+			const std::vector<redis::Reply>& parReplies,
+		    const std::vector<std::string>& parIDs,
+		    std::function<bool(const boost::tuple<std::vector<redis::Reply>, std::string>&)> parFilter
+		) {
+			using boost::adaptors::filtered;
+			using boost::adaptors::transformed;
+			using boost::tuple;
+			using boost::make_tuple;
+			using redis::get_string;
+			using redis::Reply;
+			using std::vector;
+			using dinhelp::lexical_cast;
+
+			//Reply is expected to contain: "desc", "item_count", "dir_count"
+
+			assert(parReplies.size() == parIDs.size());
+			return boost::copy_range<vector<LocatedSet>>(
+					zip_range(parReplies, parIDs) |
+							transformed([](const tuple<Reply, std::string>& r) {
+								return make_tuple(redis::get_array(r.get<0>()), r.get<1>());
+							}) |
+							filtered(parFilter) |
+							transformed([](const tuple<vector<Reply>, std::string>& t) {
+								const auto itm_count = lexical_cast<uint32_t>(get_string(t.get<0>()[1]));
+								const auto dir_count = lexical_cast<uint32_t>(get_string(t.get<0>()[2]));
+								assert(dir_count <= itm_count);
+								return LocatedSet{
+										get_string(t.get<0>()[0]),
+										lexical_cast<GroupIDType>(t.get<1>()),
+								        itm_count - dir_count,
+								        dir_count
+								};
+							})
+			);
+		}
+
 		std::string to_std_string (boost::string_ref parStr) {
 			return std::string(parStr.data(), parStr.size());
 		}
 
-		void concatenate (std::vector<LocatedItem>&& parAppend, std::vector<LocatedItem>& parOut) {
+		template <typename T>
+		void concatenate (std::vector<T>&& parAppend, std::vector<T>& parOut) {
 			parOut.insert(parOut.end(), std::make_move_iterator(parAppend.begin()), std::make_move_iterator(parAppend.end()));
 		}
 	} //unnamed namespace
@@ -117,12 +161,11 @@ namespace dindb {
 		return retval;
 	}
 
-	std::vector<LocatedItem> locate_in_db (redis::IncRedis& parRedis, const std::string& parSearch, const TagList& parTags) {
+	std::vector<LocatedItem> locate_in_db (redis::IncRedis& parRedis, const std::string& parRegex, const TagList& parTags) {
 		using dincore::split_and_trim;
-		using dinhelp::lexical_cast;
 
-		const boost::regex search(parSearch, boost::regex_constants::optimize | boost::regex_constants::nosubs | boost::regex_constants::perl);
-		const int prefetch_count = 500;
+		const boost::regex search(parRegex, boost::regex_constants::optimize | boost::regex_constants::nosubs | boost::regex_constants::perl);
+		const int prefetch_count = g_prefetch_count;
 
 		std::vector<LocatedItem> retval;
 		std::vector<std::string> ids;
@@ -182,4 +225,51 @@ namespace dindb {
 			return std::vector<LocatedItem>();
 		}
 	}
+
+	std::vector<LocatedSet> locate_sets_in_db (redis::IncRedis& parRedis, const std::string& parSubstr, bool parCaseInsensitive) {
+		using dincore::split_and_trim;
+
+		const int prefetch_count = g_prefetch_count;
+		std::vector<LocatedSet> retval;
+		std::vector<std::string> set_ids;
+		set_ids.reserve(prefetch_count);
+
+		auto filter_case_ins = [&parSubstr](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
+			const auto& s = redis::get_string(t.get<0>()[0]);
+			return s.end() != std::search(
+				s.begin(),
+				s.end(),
+				parSubstr.begin(),
+				parSubstr.end(),
+		        [](char c1, char c2) {return std::toupper(c1) == std::toupper(c2);}
+			);
+		};
+		auto filter_case_sens = [&parSubstr](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
+			return redis::get_string(t.get<0>()[0]).find(parSubstr) != std::string::npos;
+		};
+		std::function<bool(const boost::tuple<std::vector<redis::Reply>, std::string>&)> filter;
+		if (parCaseInsensitive)
+			filter = filter_case_ins;
+		else
+			filter = filter_case_sens;
+
+		int curr_count = 0;
+		auto batch = parRedis.make_batch();
+		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":set:*")) {
+			++curr_count;
+			batch.hmget(itm, "desc", "item_count", "dir_count");
+			set_ids.push_back(to_std_string(split_and_trim(itm, ':').back()));
+
+			if (curr_count == prefetch_count) {
+				concatenate(store_filtered_sets(batch.replies(), set_ids, filter), retval);
+				batch.reset();
+				curr_count = 0;
+				set_ids.clear();
+			}
+		}
+		if (curr_count)
+			concatenate(store_filtered_sets(batch.replies(), set_ids, filter), retval);
+
+		return retval;
+	}
 } //namespace dindb
diff --git a/src/backends/redis/find.hpp b/src/backends/redis/find.hpp
index 5e1293c..201d37b 100644
--- a/src/backends/redis/find.hpp
+++ b/src/backends/redis/find.hpp
@@ -27,8 +27,9 @@ namespace redis {
 
 namespace dindb {
 	std::vector<GroupIDType> find_all_sets ( redis::IncRedis& parRedis );
-	std::vector<LocatedItem> locate_in_db ( redis::IncRedis& parRedis, const std::string& parSearch, const TagList& parTags );
+	std::vector<LocatedItem> locate_in_db ( redis::IncRedis& parRedis, const std::string& parRegex, const TagList& parTags );
 	std::vector<LocatedItem> locate_in_db ( redis::IncRedis& parRedis, const mchlib::TigerHash& parSearch, const TagList& parTags );
+	std::vector<LocatedSet> locate_sets_in_db ( redis::IncRedis& parRedis, const std::string& parSubstr, bool parCaseInsensitive );
 } //namespace dindb
 
 #endif

From 346f7ce971c1d7b6274871ba77e6fadebf150b43 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 18:50:51 +0100
Subject: [PATCH 141/170] Refactor code so there is less copy paste.

---
 src/backends/redis/find.cpp | 187 ++++++++++++++++--------------------
 1 file changed, 81 insertions(+), 106 deletions(-)

diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index 574d84a..e257a67 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -34,11 +34,15 @@
 
 namespace dindb {
 	namespace {
-		const int g_prefetch_count = 500;
-
 		inline std::string to_std_string ( boost::string_ref parStr ) a_always_inline;
 		template <typename T>
 		inline void concatenate ( std::vector<T>&& parAppend, std::vector<T>& parOut ) a_always_inline;
+		template <typename T>
+		inline T construct ( const std::vector<redis::Reply>& parData, const std::string& parID ) a_always_inline;
+		template <>
+		inline LocatedItem construct ( const std::vector<redis::Reply>& parData, const std::string& parID ) a_always_inline;
+		template <>
+		inline LocatedSet construct ( const std::vector<redis::Reply>& parData, const std::string& parID ) a_always_inline;
 
 		bool all_tags_match (const TagList& parTags, const std::string& parTaglist) {
 			const auto tags = dincore::split_tags(parTaglist);
@@ -70,7 +74,8 @@ namespace dindb {
 			};
 		}
 
-		std::vector<LocatedItem> store_filtered_items (
+		template <typename T>
+		std::vector<T> store_filtered_items (
 			const std::vector<redis::Reply>& parReplies,
 			const std::vector<std::string>& parIDs,
 			std::function<bool(const boost::tuple<std::vector<redis::Reply>, std::string>&)> parFilter
@@ -84,59 +89,16 @@ namespace dindb {
 			using std::vector;
 			using dinhelp::lexical_cast;
 
-			//Reply is expected to contain: "path", "group_id", "tags"
-
 			assert(parReplies.size() == parIDs.size());
-			return boost::copy_range<vector<LocatedItem>>(
-					zip_range(parReplies, parIDs) |
-							transformed([](const tuple<Reply, std::string>& r) {
-								return make_tuple(redis::get_array(r.get<0>()), r.get<1>());
-							}) |
-							filtered(parFilter) |
-							transformed([](const tuple<vector<Reply>, std::string>& t) {
-								return LocatedItem{
-									get_string(t.get<0>()[0]),
-									lexical_cast<FileIDType>(t.get<1>()),
-									lexical_cast<GroupIDType>(get_string(t.get<0>()[1]))
-								};
-							})
-			);
-		}
-
-		std::vector<LocatedSet> store_filtered_sets (
-			const std::vector<redis::Reply>& parReplies,
-		    const std::vector<std::string>& parIDs,
-		    std::function<bool(const boost::tuple<std::vector<redis::Reply>, std::string>&)> parFilter
-		) {
-			using boost::adaptors::filtered;
-			using boost::adaptors::transformed;
-			using boost::tuple;
-			using boost::make_tuple;
-			using redis::get_string;
-			using redis::Reply;
-			using std::vector;
-			using dinhelp::lexical_cast;
-
-			//Reply is expected to contain: "desc", "item_count", "dir_count"
-
-			assert(parReplies.size() == parIDs.size());
-			return boost::copy_range<vector<LocatedSet>>(
-					zip_range(parReplies, parIDs) |
-							transformed([](const tuple<Reply, std::string>& r) {
-								return make_tuple(redis::get_array(r.get<0>()), r.get<1>());
-							}) |
-							filtered(parFilter) |
-							transformed([](const tuple<vector<Reply>, std::string>& t) {
-								const auto itm_count = lexical_cast<uint32_t>(get_string(t.get<0>()[1]));
-								const auto dir_count = lexical_cast<uint32_t>(get_string(t.get<0>()[2]));
-								assert(dir_count <= itm_count);
-								return LocatedSet{
-										get_string(t.get<0>()[0]),
-										lexical_cast<GroupIDType>(t.get<1>()),
-								        itm_count - dir_count,
-								        dir_count
-								};
-							})
+			return boost::copy_range<vector<T>>(
+				zip_range(parReplies, parIDs) |
+				transformed([](const tuple<Reply, std::string>& r) {
+					return make_tuple(redis::get_array(r.get<0>()), r.get<1>());
+				}) |
+				filtered(parFilter) |
+				transformed([](const tuple<vector<Reply>, std::string>& t) {
+					return construct<T>(t.get<0>(), t.get<1>());
+				})
 			);
 		}
 
@@ -148,6 +110,67 @@ namespace dindb {
 		void concatenate (std::vector<T>&& parAppend, std::vector<T>& parOut) {
 			parOut.insert(parOut.end(), std::make_move_iterator(parAppend.begin()), std::make_move_iterator(parAppend.end()));
 		}
+
+		template <>
+		LocatedItem construct (const std::vector<redis::Reply>& parData, const std::string& parID) {
+			using dinhelp::lexical_cast;
+
+			//parData is expected to contain: "path", "group_id", "tags"
+
+			assert(parData.size() == 3);
+			return LocatedItem{
+				redis::get_string(parData[0]),
+				lexical_cast<FileIDType>(parID),
+				lexical_cast<GroupIDType>(redis::get_string(parData[1]))
+			};
+		}
+
+		template <>
+		LocatedSet construct (const std::vector<redis::Reply>& parData, const std::string& parID) {
+			using dinhelp::lexical_cast;
+
+			//parData is expected to contain: "desc", "item_count", "dir_count"
+
+			assert(parData.size() == 3);
+			const auto itm_count = lexical_cast<uint32_t>(redis::get_string(parData[1]));
+			const auto dir_count = lexical_cast<uint32_t>(redis::get_string(parData[2]));
+			assert(dir_count <= itm_count);
+
+			return LocatedSet{
+				redis::get_string(parData[0]),
+				lexical_cast<GroupIDType>(parID),
+				itm_count - dir_count,
+				dir_count
+			};
+		}
+
+		template <typename T, typename F, typename... FIELDS>
+		std::vector<T> locate_in_bursts (redis::IncRedis& parRedis, const char* parScanKeyFilter, F parFilter, FIELDS&&... parFields) {
+			using dincore::split_and_trim;
+
+			const int prefetch_count = 500;
+			std::vector<T> retval;
+			std::vector<std::string> ids;
+			ids.reserve(prefetch_count);
+
+			int curr_count = 0;
+			auto batch = parRedis.make_batch();
+			for (const auto& itm : parRedis.scan(parScanKeyFilter)) {
+				++curr_count;
+				batch.hmget(itm, std::forward<FIELDS>(parFields)...);
+				ids.push_back(to_std_string(split_and_trim(itm, ':').back()));
+
+				if (curr_count == prefetch_count) {
+					concatenate(store_filtered_items<T>(batch.replies(), ids, parFilter), retval);
+					batch.reset();
+					curr_count = 0;
+					ids.clear();
+				}
+			}
+			if (curr_count)
+				concatenate(store_filtered_items<T>(batch.replies(), ids, parFilter), retval);
+			return retval;
+		}
 	} //unnamed namespace
 
 	std::vector<GroupIDType> find_all_sets (redis::IncRedis& parRedis) {
@@ -162,38 +185,14 @@ namespace dindb {
 	}
 
 	std::vector<LocatedItem> locate_in_db (redis::IncRedis& parRedis, const std::string& parRegex, const TagList& parTags) {
-		using dincore::split_and_trim;
-
 		const boost::regex search(parRegex, boost::regex_constants::optimize | boost::regex_constants::nosubs | boost::regex_constants::perl);
-		const int prefetch_count = g_prefetch_count;
-
-		std::vector<LocatedItem> retval;
-		std::vector<std::string> ids;
-		ids.reserve(prefetch_count);
 
 		auto filter = [&parTags, &search](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
 			return (parTags.empty() or all_tags_match(parTags, redis::get_string(t.get<0>()[2]))) and
 				boost::regex_search(redis::get_string(t.get<0>()[0]), search);
 		};
 
-		int curr_count = 0;
-		auto batch = parRedis.make_batch();
-		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) {
-			++curr_count;
-			batch.hmget(itm, "path", "group_id", "tags");
-			ids.push_back(to_std_string(split_and_trim(itm, ':').back()));
-
-			if (curr_count == prefetch_count) {
-				concatenate(store_filtered_items(batch.replies(), ids, filter), retval);
-				batch.reset();
-				curr_count = 0;
-				ids.clear();
-			}
-		}
-		if (curr_count)
-			concatenate(store_filtered_items(batch.replies(), ids, filter), retval);
-
-		return retval;
+		return locate_in_bursts<LocatedItem>(parRedis, PROGRAM_NAME ":file:*", filter, "path", "group_id", "tags");
 	}
 
 	std::vector<LocatedItem> locate_in_db (redis::IncRedis& parRedis, const mchlib::TigerHash& parSearch, const TagList& parTags) {
@@ -213,7 +212,7 @@ namespace dindb {
 			}
 			batch.throw_if_failed();
 
-			return store_filtered_items(
+			return store_filtered_items<LocatedItem>(
 				batch.replies(),
 				ids,
 				[&parTags](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
@@ -227,13 +226,6 @@ namespace dindb {
 	}
 
 	std::vector<LocatedSet> locate_sets_in_db (redis::IncRedis& parRedis, const std::string& parSubstr, bool parCaseInsensitive) {
-		using dincore::split_and_trim;
-
-		const int prefetch_count = g_prefetch_count;
-		std::vector<LocatedSet> retval;
-		std::vector<std::string> set_ids;
-		set_ids.reserve(prefetch_count);
-
 		auto filter_case_ins = [&parSubstr](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
 			const auto& s = redis::get_string(t.get<0>()[0]);
 			return s.end() != std::search(
@@ -253,23 +245,6 @@ namespace dindb {
 		else
 			filter = filter_case_sens;
 
-		int curr_count = 0;
-		auto batch = parRedis.make_batch();
-		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":set:*")) {
-			++curr_count;
-			batch.hmget(itm, "desc", "item_count", "dir_count");
-			set_ids.push_back(to_std_string(split_and_trim(itm, ':').back()));
-
-			if (curr_count == prefetch_count) {
-				concatenate(store_filtered_sets(batch.replies(), set_ids, filter), retval);
-				batch.reset();
-				curr_count = 0;
-				set_ids.clear();
-			}
-		}
-		if (curr_count)
-			concatenate(store_filtered_sets(batch.replies(), set_ids, filter), retval);
-
-		return retval;
+		return locate_in_bursts<LocatedSet>(parRedis, PROGRAM_NAME ":set:*", filter, "desc", "item_count", "dir_count");
 	}
 } //namespace dindb

From 5e69367c2c95e22adc8807166e284652c847c101 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 19:01:31 +0100
Subject: [PATCH 142/170] Implement locate_sets_in_db().

It's finally got fast & easy to write! Too bad it was the last one...
---
 src/backends/redis/backend_redis.cpp |  8 ++++----
 src/backends/redis/backend_redis.hpp |  4 ++--
 src/backends/redis/find.cpp          | 24 +++++++++++++++++++-----
 src/backends/redis/find.hpp          |  1 +
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index a0bb74f..72b5ae8 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -254,12 +254,12 @@ namespace dindb {
 		return dindb::locate_in_db(m_redis, parSearch, parTags);
 	}
 
-	std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSearch, bool parCaseInsensitive) {
-		return dindb::locate_sets_in_db(m_redis, parSearch, parCaseInsensitive);
+	std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSubstr, bool parCaseInsensitive) {
+		return dindb::locate_sets_in_db(m_redis, parSubstr, parCaseInsensitive);
 	}
 
-	std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive) {
-		return std::vector<LocatedSet>();
+	std::vector<LocatedSet> BackendRedis::locate_sets_in_db (const std::string& parSubstr, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive) {
+		return dindb::locate_sets_in_db(m_redis, parSubstr, parSets, parCaseInsensitive);
 	}
 
 	std::vector<GroupIDType> BackendRedis::find_all_sets() {
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index 4959d87..d4fe587 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -49,8 +49,8 @@ namespace dindb {
 
 		virtual std::vector<LocatedItem> locate_in_db ( const std::string& parSearch, const TagList& parTags ) override;
 		virtual std::vector<LocatedItem> locate_in_db ( const mchlib::TigerHash& parSearch, const TagList& parTags ) override;
-		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, bool parCaseInsensitive ) override;
-		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive ) override;
+		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSubstr, bool parCaseInsensitive ) override;
+		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSubstr, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive ) override;
 
 		virtual std::vector<GroupIDType> find_all_sets ( void ) override;
 		virtual std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details ( const std::vector<GroupIDType>& parSets ) override;
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index e257a67..18b578d 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -226,18 +226,31 @@ namespace dindb {
 	}
 
 	std::vector<LocatedSet> locate_sets_in_db (redis::IncRedis& parRedis, const std::string& parSubstr, bool parCaseInsensitive) {
-		auto filter_case_ins = [&parSubstr](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
+		return locate_sets_in_db(parRedis, parSubstr, std::vector<GroupIDType>(), parCaseInsensitive);
+	}
+
+	std::vector<LocatedSet> locate_sets_in_db (redis::IncRedis& parRedis, const std::string& parSubstr, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive) {
+		using dinhelp::lexical_cast;
+
+		auto filter_case_ins = [&parSubstr, &parSets](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
 			const auto& s = redis::get_string(t.get<0>()[0]);
 			return s.end() != std::search(
 				s.begin(),
 				s.end(),
 				parSubstr.begin(),
 				parSubstr.end(),
-		        [](char c1, char c2) {return std::toupper(c1) == std::toupper(c2);}
-			);
+				[](char c1, char c2) {return std::toupper(c1) == std::toupper(c2);}) and
+				(
+					parSets.empty() or
+					std::find(parSets.begin(), parSets.end(), lexical_cast<GroupIDType>(t.get<1>())) != parSets.end()
+				);
 		};
-		auto filter_case_sens = [&parSubstr](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
-			return redis::get_string(t.get<0>()[0]).find(parSubstr) != std::string::npos;
+		auto filter_case_sens = [&parSubstr, &parSets](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
+			return redis::get_string(t.get<0>()[0]).find(parSubstr) != std::string::npos and
+				(
+					parSets.empty() or
+					std::find(parSets.begin(), parSets.end(), lexical_cast<GroupIDType>(t.get<1>())) != parSets.end()
+				);
 		};
 		std::function<bool(const boost::tuple<std::vector<redis::Reply>, std::string>&)> filter;
 		if (parCaseInsensitive)
@@ -246,5 +259,6 @@ namespace dindb {
 			filter = filter_case_sens;
 
 		return locate_in_bursts<LocatedSet>(parRedis, PROGRAM_NAME ":set:*", filter, "desc", "item_count", "dir_count");
+
 	}
 } //namespace dindb
diff --git a/src/backends/redis/find.hpp b/src/backends/redis/find.hpp
index 201d37b..6db9ea1 100644
--- a/src/backends/redis/find.hpp
+++ b/src/backends/redis/find.hpp
@@ -30,6 +30,7 @@ namespace dindb {
 	std::vector<LocatedItem> locate_in_db ( redis::IncRedis& parRedis, const std::string& parRegex, const TagList& parTags );
 	std::vector<LocatedItem> locate_in_db ( redis::IncRedis& parRedis, const mchlib::TigerHash& parSearch, const TagList& parTags );
 	std::vector<LocatedSet> locate_sets_in_db ( redis::IncRedis& parRedis, const std::string& parSubstr, bool parCaseInsensitive );
+	std::vector<LocatedSet> locate_sets_in_db ( redis::IncRedis& parRedis, const std::string& parSubstr, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive );
 } //namespace dindb
 
 #endif

From 4b0aa85ac2a6e5b7577fff200eafe96e2c3db23c Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 19:31:52 +0100
Subject: [PATCH 143/170] Fix typo in enum name.

---
 src/backends/postgresql/backend_postgresql.cpp | 2 +-
 src/backends/postgresql/navigate.cpp           | 2 +-
 src/backends/postgresql/navigate.hpp           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
index 3d31c05..8c9cc38 100644
--- a/src/backends/postgresql/backend_postgresql.cpp
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -149,7 +149,7 @@ namespace dindb {
 		return dindb::find_set_details<
 			dindb::SetDetail_ID,
 			dindb::SetDetail_Desc,
-			dindb::SetDetail_CreeationDate,
+			dindb::SetDetail_CreationDate,
 			dindb::SetDetail_DiskLabel
 		>(*m_conn, parSets);
 	}
diff --git a/src/backends/postgresql/navigate.cpp b/src/backends/postgresql/navigate.cpp
index ae06f75..6886c4c 100644
--- a/src/backends/postgresql/navigate.cpp
+++ b/src/backends/postgresql/navigate.cpp
@@ -42,7 +42,7 @@ namespace dindb {
 		const SetDetailsMap g_set_details_map {
 			{SetDetail_Desc, "desc"},
 			{SetDetail_Type, "type"},
-			{SetDetail_CreeationDate, "creation"},
+			{SetDetail_CreationDate, "creation"},
 			{SetDetail_AppName, "app_name"},
 			{SetDetail_ID, "id"},
 			{SetDetail_DiskLabel, "disk_label"},
diff --git a/src/backends/postgresql/navigate.hpp b/src/backends/postgresql/navigate.hpp
index cc732ba..28415d1 100644
--- a/src/backends/postgresql/navigate.hpp
+++ b/src/backends/postgresql/navigate.hpp
@@ -42,7 +42,7 @@ namespace dindb {
 	enum SetDetails {
 		SetDetail_Desc = 0x01,
 		SetDetail_Type = 0x02,
-		SetDetail_CreeationDate = 0x04,
+		SetDetail_CreationDate = 0x04,
 		SetDetail_AppName = 0x08,
 		SetDetail_ID = 0x10,
 		SetDetail_DiskLabel = 0x20,

From d10ae6846dd0cbda06b876a3c5865c790c27ce13 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 20:31:31 +0100
Subject: [PATCH 144/170] Bugfix - cope with empty scan replies.

And, don't assert if anybody tries to disconnect twice. Just do nothing.
---
 src/backends/redis/async_connection.cpp |  2 ++
 src/backends/redis/scan_iterator.inl    | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/backends/redis/async_connection.cpp b/src/backends/redis/async_connection.cpp
index 483bc3c..db92d04 100644
--- a/src/backends/redis/async_connection.cpp
+++ b/src/backends/redis/async_connection.cpp
@@ -172,6 +172,8 @@ namespace redis {
 	}
 
 	void AsyncConnection::disconnect() {
+		if (not m_local_data->connect_processed)
+			return;
 		assert(m_local_data->redis_poll_thread.joinable());
 		m_local_data->connect_processed = false;
 		{
diff --git a/src/backends/redis/scan_iterator.inl b/src/backends/redis/scan_iterator.inl
index 1e7a443..2dcc424 100644
--- a/src/backends/redis/scan_iterator.inl
+++ b/src/backends/redis/scan_iterator.inl
@@ -82,16 +82,16 @@ namespace redis {
 		}
 		else {
 			std::vector<Reply> array_reply;
-			long long new_context;
+			long long new_context = m_scan_context;
 
 			do {
-				auto whole_reply = this->forward_scan_command<ValueFetch>(0);
+				auto whole_reply = this->forward_scan_command<ValueFetch>(new_context);
 
 				array_reply = get_array(whole_reply);
 				assert(2 == array_reply.size());
 				assert(array_reply.size() % ValueFetch::step == 0);
 				new_context = get_integer_autoconv_if_str(array_reply[0]);
-			} while (new_context and array_reply.empty());
+			} while (new_context and get_array(array_reply[1]).empty());
 
 			const auto variant_array = get_array(array_reply[1]);
 			assert(variant_array.size() % ValueFetch::step == 0);
@@ -131,14 +131,14 @@ namespace redis {
 
 	template <typename ValueFetch>
 	template <typename T>
-	Reply ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<HasScanTargetMethod<T>::value, int>::type) {
-		return implem::ScanIteratorBaseClass::run(T::command(), T::scan_target(), m_scan_context, T::work_count);
+	Reply ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<HasScanTargetMethod<T>::value, long long>::type parContext) {
+		return implem::ScanIteratorBaseClass::run(T::command(), T::scan_target(), parContext, T::work_count);
 	}
 
 	template <typename ValueFetch>
 	template <typename T>
-	Reply ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type) {
-		return implem::ScanIteratorBaseClass::run(T::command(), m_scan_context, T::work_count);
+	Reply ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<not HasScanTargetMethod<T>::value, long long>::type parContext) {
+		return implem::ScanIteratorBaseClass::run(T::command(), parContext, T::work_count);
 	}
 
 	template <typename T>

From d7c254e1a0c51dd2cb1c0d484b434426d6419d28 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Tue, 12 Jul 2016 20:31:57 +0100
Subject: [PATCH 145/170] Implement find_set_details().

---
 src/backends/redis/backend_redis.cpp | 10 ++++++---
 src/backends/redis/find.cpp          | 32 ++++++++++++++++++++++++++--
 src/backends/redis/find.hpp          |  2 ++
 src/backends/redis/scan_iterator.hpp |  4 ++--
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 72b5ae8..555337e 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -32,6 +32,7 @@
 #include <cstdint>
 #include <boost/range/empty.hpp>
 #include <fstream>
+#include <ctime>
 
 namespace dindb {
 	namespace {
@@ -180,7 +181,8 @@ namespace dindb {
 			"content_type", parSetData.content_type,
 			"base_file_id", lexical_cast<std::string>(base_file_id),
 			"item_count", lexical_cast<std::string>(parData.size()),
-			"dir_count", lexical_cast<std::string>(std::count_if(parData.begin(), parData.end(), [](const mchlib::FileRecordData& r){return r.is_directory;}))
+			"dir_count", lexical_cast<std::string>(std::count_if(parData.begin(), parData.end(), [](const mchlib::FileRecordData& r){return r.is_directory;})),
+			"creation", lexical_cast<std::string>(std::time(nullptr))
 		);
 
 #if !defined(NDEBUG)
@@ -204,7 +206,9 @@ namespace dindb {
 				"is_symlink", (file_data.is_symlink ? '1' : '0'),
 				"unreadable", (file_data.unreadable ? '1' : '0'),
 				"hash_valid", (file_data.hash_valid ? '1' : '0'),
-				"group_id", group_id
+				"group_id", group_id,
+				"atime", lexical_cast<std::string>(file_data.atime),
+				"mtime", lexical_cast<std::string>(file_data.mtime)
 			);
 
 			batch.sadd(
@@ -267,7 +271,7 @@ namespace dindb {
 	}
 
 	std::vector<dinhelp::MaxSizedArray<std::string, 4>> BackendRedis::find_set_details (const std::vector<GroupIDType>& parSets) {
-		return std::vector<dinhelp::MaxSizedArray<std::string, 4>>();
+		return dindb::find_set_details(m_redis, parSets);
 	}
 
 	std::vector<dinhelp::MaxSizedArray<std::string, 1>> BackendRedis::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index 18b578d..f6b6e96 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -84,7 +84,6 @@ namespace dindb {
 			using boost::adaptors::transformed;
 			using boost::tuple;
 			using boost::make_tuple;
-			using redis::get_string;
 			using redis::Reply;
 			using std::vector;
 			using dinhelp::lexical_cast;
@@ -259,6 +258,35 @@ namespace dindb {
 			filter = filter_case_sens;
 
 		return locate_in_bursts<LocatedSet>(parRedis, PROGRAM_NAME ":set:*", filter, "desc", "item_count", "dir_count");
-
 	}
+
+	std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details (redis::IncRedis& parRedis, const std::vector<GroupIDType>& parSets) {
+		using dinhelp::lexical_cast;
+		using MArr = dinhelp::MaxSizedArray<std::string, 4>;
+
+		auto batch = parRedis.make_batch();
+		for (auto set_id : parSets) {
+			const auto set_key = PROGRAM_NAME ":set:" + lexical_cast<std::string>(set_id);
+			batch.hmget(set_key, "creation", "name", "disk_label");
+		}
+		batch.throw_if_failed();
+
+		std::vector<MArr> retval;
+		auto curr_set = parSets.begin();
+		for (const auto& reply : batch.replies()) {
+			const auto& reply_list = get_array(reply);
+			if (redis::RedisVariantType_Nil != reply_list[0].which() and
+				redis::RedisVariantType_Nil != reply_list[1].which() and
+				redis::RedisVariantType_Nil != reply_list[2].which())
+			{
+				retval.resize(retval.size() + 1);
+				retval.back().push_back(lexical_cast<std::string>(*curr_set));
+				retval.back().push_back(get_string(reply_list[1]));
+				retval.back().push_back(get_string(reply_list[0]));
+				retval.back().push_back(get_string(reply_list[2]));
+			}
+			++curr_set;
+		}
+		return retval;
+	};
 } //namespace dindb
diff --git a/src/backends/redis/find.hpp b/src/backends/redis/find.hpp
index 6db9ea1..b31b64d 100644
--- a/src/backends/redis/find.hpp
+++ b/src/backends/redis/find.hpp
@@ -19,6 +19,7 @@
 #define idB4972996B4494E66A03B6AE205B1FA36
 
 #include "backends/db_backend.hpp"
+#include "helpers/MaxSizedArray.hpp"
 #include <vector>
 
 namespace redis {
@@ -31,6 +32,7 @@ namespace dindb {
 	std::vector<LocatedItem> locate_in_db ( redis::IncRedis& parRedis, const mchlib::TigerHash& parSearch, const TagList& parTags );
 	std::vector<LocatedSet> locate_sets_in_db ( redis::IncRedis& parRedis, const std::string& parSubstr, bool parCaseInsensitive );
 	std::vector<LocatedSet> locate_sets_in_db ( redis::IncRedis& parRedis, const std::string& parSubstr, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive );
+	std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details ( redis::IncRedis& parRedis, const std::vector<GroupIDType>& parSets );
 } //namespace dindb
 
 #endif
diff --git a/src/backends/redis/scan_iterator.hpp b/src/backends/redis/scan_iterator.hpp
index b6f1a0c..339abaf 100644
--- a/src/backends/redis/scan_iterator.hpp
+++ b/src/backends/redis/scan_iterator.hpp
@@ -78,9 +78,9 @@ namespace redis {
 
 	private:
 		template <typename T>
-		Reply forward_scan_command ( typename std::enable_if<HasScanTargetMethod<T>::value, int>::type parDummy );
+		Reply forward_scan_command ( typename std::enable_if<HasScanTargetMethod<T>::value, long long>::type parContext );
 		template <typename T>
-		Reply forward_scan_command ( typename std::enable_if<not HasScanTargetMethod<T>::value, int>::type parDummy );
+		Reply forward_scan_command ( typename std::enable_if<not HasScanTargetMethod<T>::value, long long>::type parContext );
 		bool is_end ( void ) const;
 
 		void increment ( void );

From a9b979dd0390a97b449405bffb683fb14eeb4926 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 13 Jul 2016 01:08:17 +0100
Subject: [PATCH 146/170] Implement zadd().

---
 src/backends/redis/find.cpp           |  3 +-
 src/backends/redis/incredis_batch.hpp | 78 +++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index f6b6e96..737988a 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -174,11 +174,10 @@ namespace dindb {
 
 	std::vector<GroupIDType> find_all_sets (redis::IncRedis& parRedis) {
 		using dincore::split_and_trim;
-		using dinhelp::lexical_cast;
 
 		std::vector<GroupIDType> retval;
 		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":set:*")) {
-			retval.push_back(lexical_cast<GroupIDType>(split_and_trim(itm, ':').back()));
+			retval.push_back(dinhelp::lexical_cast<GroupIDType>(split_and_trim(itm, ':').back()));
 		}
 		return retval;
 	}
diff --git a/src/backends/redis/incredis_batch.hpp b/src/backends/redis/incredis_batch.hpp
index b173489..2112892 100644
--- a/src/backends/redis/incredis_batch.hpp
+++ b/src/backends/redis/incredis_batch.hpp
@@ -19,11 +19,20 @@
 #define id3C772A92AB0E440DA84DAFD807BC962D
 
 #include "batch.hpp"
+#include "helpers/sequence_bt.hpp"
 #include <boost/utility/string_ref.hpp>
+#include <boost/lexical_cast.hpp>
+#include <type_traits>
 
 namespace redis {
 	class IncRedisBatch {
 	public:
+		enum ZADD_Mode {
+			ZADD_XX_UpdateOnly,
+			ZADD_NX_AlwaysAdd,
+			ZADD_None
+		};
+
 		IncRedisBatch ( void ) = delete;
 		IncRedisBatch ( IncRedisBatch&& ) = default;
 		IncRedisBatch ( const Batch& ) = delete;
@@ -55,6 +64,10 @@ namespace redis {
 		template <typename... Args>
 		IncRedisBatch& sadd ( boost::string_ref parKey, Args&&... parArgs );
 
+		//Sorted set
+		template <typename... Args>
+		IncRedisBatch& zadd ( boost::string_ref parKey, ZADD_Mode parMode, bool parChange, Args&&... parArgs );
+
 		//Script
 		IncRedisBatch& script_flush ( void );
 
@@ -62,6 +75,11 @@ namespace redis {
 		Batch m_batch;
 	};
 
+	namespace implem {
+		template <std::size_t... I, typename... Args>
+		void run_conv_floats_to_strings ( Batch& parBatch, dinhelp::bt::index_seq<I...>, Args&&... parArgs );
+	} //namespace implem
+
 	template <typename... Args>
 	IncRedisBatch& IncRedisBatch::hmget (boost::string_ref parKey, Args&&... parArgs) {
 		static_assert(sizeof...(Args) > 0, "No fields specified");
@@ -71,6 +89,7 @@ namespace redis {
 
 	template <typename... Args>
 	IncRedisBatch& IncRedisBatch::hmset (boost::string_ref parKey, Args&&... parArgs) {
+		static_assert(sizeof...(Args) >= 1, "No parameters specified");
 		static_assert(sizeof...(Args) % 2 == 0, "Uneven number of parameters received");
 		m_batch.run("HMSET", parKey, std::forward<Args>(parArgs)...);
 		return *this;
@@ -89,6 +108,65 @@ namespace redis {
 		m_batch.run("DEL", std::forward<Args>(parArgs)...);
 		return *this;
 	}
+
+	template <typename... Args>
+	IncRedisBatch& IncRedisBatch::zadd (boost::string_ref parKey, ZADD_Mode parMode, bool parChange, Args&&... parArgs) {
+		static_assert(sizeof...(Args) >= 1, "No score/value pairs specified");
+		static_assert(sizeof...(Args) % 2 == 0, "Uneven number of parameters received");
+
+		using dinhelp::bt::index_range;
+
+		if (parChange) {
+			if (ZADD_None == parMode)
+				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, "CH", std::forward<Args>(parArgs)...);
+			else if (ZADD_NX_AlwaysAdd == parMode)
+				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, "NX", "CH", std::forward<Args>(parArgs)...);
+			else if (ZADD_XX_UpdateOnly == parMode)
+				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, "XX", "CH", std::forward<Args>(parArgs)...);
+		}
+		else {
+			if (ZADD_None == parMode)
+				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, std::forward<Args>(parArgs)...);
+			else if (ZADD_NX_AlwaysAdd == parMode)
+				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, "NX", std::forward<Args>(parArgs)...);
+			else if (ZADD_XX_UpdateOnly == parMode)
+				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, "XX", std::forward<Args>(parArgs)...);
+		}
+		return *this;
+	}
+
+	namespace implem {
+		template <std::size_t IGNORE_COUNT, std::size_t IDX, typename T, bool STRINGIZE=(IDX>=IGNORE_COUNT) && ((IDX-IGNORE_COUNT)%2)==0>
+		struct stringize_or_forward_impl {
+			typedef T type;
+			static T&& do_it ( T&& parT ) { return std::forward<T>(parT); }
+		};
+		template <std::size_t IGNORE_COUNT, std::size_t IDX, typename T>
+		struct stringize_or_forward_impl<IGNORE_COUNT, IDX, T, true> {
+			static_assert(std::is_floating_point<T>::value, "Scores must be given as floating point values");
+			typedef std::string type;
+			static std::string do_it ( T parT ) { return boost::lexical_cast<std::string>(parT); }
+		};
+
+		template <std::size_t IGNORE_COUNT, std::size_t IDX, typename T>
+		auto stringize_or_forward (T&& parValue) -> typename stringize_or_forward_impl<IGNORE_COUNT, IDX, T>::type {
+			return stringize_or_forward_impl<IGNORE_COUNT, IDX, T>::do_it(std::forward<T>(parValue));
+		}
+
+		template <std::size_t PreArgsCount, std::size_t... I, typename... Args>
+		void run_conv_floats_to_strings_impl (Batch& parBatch, dinhelp::bt::index_seq<I...>, Args&&... parArgs) {
+			static_assert(sizeof...(I) == sizeof...(Args), "Wrong number of indices");
+			static_assert(PreArgsCount <= sizeof...(I), "Can't ignore more arguments than those that were received");
+			parBatch.run(stringize_or_forward<PreArgsCount, I>(std::forward<Args>(parArgs))...);
+		}
+
+		template <std::size_t... I, typename... Args>
+		void run_conv_floats_to_strings (Batch& parBatch, dinhelp::bt::index_seq<I...>, Args&&... parArgs) {
+			static_assert(sizeof...(Args) >= sizeof...(I), "Unexpected count, there should be at least as many argument as there are indices");
+			constexpr const auto pre_args_count = sizeof...(Args) - sizeof...(I);
+			run_conv_floats_to_strings_impl<pre_args_count>(parBatch, dinhelp::bt::index_range<0, sizeof...(Args)>(), std::forward<Args>(parArgs)...);
+		};
+	} //namespace implem
 } //namespace redis
 
 #endif

From 9a84f63e549428759715b91869da12640b9b573e Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 13 Jul 2016 01:47:38 +0100
Subject: [PATCH 147/170] Implement zrangebyscore().

---
 src/backends/redis/incredis.cpp       |  7 +++++++
 src/backends/redis/incredis.hpp       |  3 +++
 src/backends/redis/incredis_batch.cpp | 23 +++++++++++++++++++++++
 src/backends/redis/incredis_batch.hpp |  1 +
 4 files changed, 34 insertions(+)

diff --git a/src/backends/redis/incredis.cpp b/src/backends/redis/incredis.cpp
index 2e7ca88..26999b8 100644
--- a/src/backends/redis/incredis.cpp
+++ b/src/backends/redis/incredis.cpp
@@ -119,6 +119,13 @@ namespace redis {
 		return optional_string_list(m_command.run("SMEMBERS", parKey));
 	}
 
+	auto IncRedis::zrangebyscore (boost::string_ref parKey, double parMin, bool parMinIncl, double parMax, bool parMaxIncl, bool parWithScores) -> opt_string_list {
+		auto batch = make_batch();
+		batch.zrangebyscore(parKey, parMin, parMinIncl, parMax, parMaxIncl, parWithScores);
+		assert(batch.replies().size() == 1);
+		return optional_string_list(batch.replies().front());
+	}
+
 	bool IncRedis::script_flush() {
 		const auto ret = get<StatusString>(m_command.run("SCRIPT", "FLUSH"));
 		return ret.is_ok();
diff --git a/src/backends/redis/incredis.hpp b/src/backends/redis/incredis.hpp
index 5ea6727..bcd45e6 100644
--- a/src/backends/redis/incredis.hpp
+++ b/src/backends/redis/incredis.hpp
@@ -76,6 +76,9 @@ namespace redis {
 		opt_string srandmember ( boost::string_ref parKey );
 		opt_string_list smembers ( boost::string_ref parKey );
 
+		//Sorted set
+		opt_string_list zrangebyscore ( boost::string_ref parKey, double parMin, bool parMinIncl, double parMax, bool parMaxIncl, bool parWithScores );
+
 		//Script
 		bool script_flush ( void );
 
diff --git a/src/backends/redis/incredis_batch.cpp b/src/backends/redis/incredis_batch.cpp
index 2cae9de..0f625b9 100644
--- a/src/backends/redis/incredis_batch.cpp
+++ b/src/backends/redis/incredis_batch.cpp
@@ -17,9 +17,21 @@
 
 #include "incredis_batch.hpp"
 #include "helpers/lexical_cast.hpp"
+#include <sstream>
 #include <utility>
+#include <ciso646>
 
 namespace redis {
+	namespace {
+		std::string make_boundary (double parValue, bool parExclude) {
+			std::ostringstream oss;
+			if (parExclude)
+				oss << '(';
+			oss << parValue;
+			return oss.str();
+		}
+	} //unnamed namespace
+
 	IncRedisBatch::IncRedisBatch (Batch&& parBatch) :
 		m_batch(std::move(parBatch))
 	{
@@ -62,6 +74,17 @@ namespace redis {
 		return *this;
 	}
 
+	IncRedisBatch& IncRedisBatch::zrangebyscore (boost::string_ref parKey, double parMin, bool parMinIncl, double parMax, bool parMaxIncl, bool parWithScores) {
+		auto lower_bound = make_boundary(parMin, not parMinIncl);
+		auto upper_bound = make_boundary(parMax, not parMaxIncl);
+
+		if (parWithScores)
+			m_batch.run("ZRANGEBYSCORE", parKey, lower_bound, upper_bound, "WITHSCORES");
+		else
+			m_batch.run("ZRANGEBYSCORE", parKey, lower_bound, upper_bound);
+		return *this;
+	}
+
 	IncRedisBatch& IncRedisBatch::script_flush() {
 		m_batch.run("SCRIPT", "FLUSH");
 		return *this;
diff --git a/src/backends/redis/incredis_batch.hpp b/src/backends/redis/incredis_batch.hpp
index 2112892..db3f256 100644
--- a/src/backends/redis/incredis_batch.hpp
+++ b/src/backends/redis/incredis_batch.hpp
@@ -67,6 +67,7 @@ namespace redis {
 		//Sorted set
 		template <typename... Args>
 		IncRedisBatch& zadd ( boost::string_ref parKey, ZADD_Mode parMode, bool parChange, Args&&... parArgs );
+		IncRedisBatch& zrangebyscore ( boost::string_ref parKey, double parMin, bool parMinIncl, double parMax, bool parMaxIncl, bool parWithScores );
 
 		//Script
 		IncRedisBatch& script_flush ( void );

From f58d7d84ebf1f42961825861ee6d0f9b6ceb8bf4 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 13 Jul 2016 01:48:40 +0100
Subject: [PATCH 148/170] Implement find_file_details().

---
 src/backends/redis/backend_redis.cpp |  5 ++++-
 src/backends/redis/delete.cpp        |  1 +
 src/backends/redis/find.cpp          | 33 ++++++++++++++++++++++++++--
 src/backends/redis/find.hpp          |  1 +
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 555337e..720cce6 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -167,6 +167,7 @@ namespace dindb {
 
 		const auto group_id = lexical_cast<std::string>(group_id_int);
 		const std::string set_key = PROGRAM_NAME ":set:" + group_id;
+		const std::string level_key = PROGRAM_NAME ":levels:" + group_id;
 		assert(file_id_int >= data_size);
 		const auto base_file_id = file_id_int - data_size + 1;
 
@@ -215,6 +216,8 @@ namespace dindb {
 				PROGRAM_NAME ":hash:" + hash,
 				lexical_cast<std::string>(z)
 			);
+
+			batch.zadd(level_key, redis::IncRedisBatch::ZADD_None, false, static_cast<double>(file_data.level), file_key);
 #if !defined(NDEBUG)
 			++inserted_count;
 #endif
@@ -275,7 +278,7 @@ namespace dindb {
 	}
 
 	std::vector<dinhelp::MaxSizedArray<std::string, 1>> BackendRedis::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
-		return std::vector<dinhelp::MaxSizedArray<std::string, 1>>();
+		return dindb::find_file_details(m_redis, parSetID, parLevel, parDir);
 	}
 
 	std::vector<std::string> BackendRedis::find_paths_starting_by (GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) {
diff --git a/src/backends/redis/delete.cpp b/src/backends/redis/delete.cpp
index fb612e1..b7711d5 100644
--- a/src/backends/redis/delete.cpp
+++ b/src/backends/redis/delete.cpp
@@ -144,6 +144,7 @@ namespace dindb {
 			}
 
 			dele_batch.del(PROGRAM_NAME ":set:" + lexical_cast<std::string>(set_id));
+			dele_batch.del(PROGRAM_NAME ":levels:" + lexical_cast<std::string>(set_id));
 			chunked_run<FileIDType, 8>(dele_batch.batch(), +"DEL", file_base_index, file_count, [](FileIDType id){return PROGRAM_NAME ":file:" + lexical_cast<std::string>(id);});
 		}
 
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index 737988a..16f1405 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -31,6 +31,7 @@
 #include <functional>
 #include <iterator>
 #include <cstdint>
+#include <boost/algorithm/string/predicate.hpp>
 
 namespace dindb {
 	namespace {
@@ -261,7 +262,6 @@ namespace dindb {
 
 	std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details (redis::IncRedis& parRedis, const std::vector<GroupIDType>& parSets) {
 		using dinhelp::lexical_cast;
-		using MArr = dinhelp::MaxSizedArray<std::string, 4>;
 
 		auto batch = parRedis.make_batch();
 		for (auto set_id : parSets) {
@@ -270,7 +270,7 @@ namespace dindb {
 		}
 		batch.throw_if_failed();
 
-		std::vector<MArr> retval;
+		std::vector<dinhelp::MaxSizedArray<std::string, 4>> retval;
 		auto curr_set = parSets.begin();
 		for (const auto& reply : batch.replies()) {
 			const auto& reply_list = get_array(reply);
@@ -288,4 +288,33 @@ namespace dindb {
 		}
 		return retval;
 	};
+
+	std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details (redis::IncRedis& parRedis, GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
+		using dinhelp::lexical_cast;
+		using RetListType = std::vector<dinhelp::MaxSizedArray<std::string, 1>>;
+
+		const double level = static_cast<float>(parLevel);
+		auto lst = parRedis.zrangebyscore(PROGRAM_NAME ":levels:" + lexical_cast<std::string>(parSetID), level, true, level, true, false);
+		if (not lst)
+			return RetListType();
+
+		auto batch = parRedis.make_batch();
+		for (const auto& itm : *lst) {
+			if (itm)
+				batch.hget(*itm, "path");
+		}
+		batch.throw_if_failed();
+
+		std::vector<dinhelp::MaxSizedArray<std::string, 1>> retval;
+		for (auto& reply : batch.replies()) {
+			if (redis::RedisVariantType_Nil != reply.which()) {
+				auto curr_path = get_string(reply);
+				if (boost::starts_with(curr_path, parDir)) {
+					retval.resize(retval.size() + 1);
+					retval.back().push_back(std::move(curr_path));
+				}
+			}
+		}
+		return retval;
+	};
 } //namespace dindb
diff --git a/src/backends/redis/find.hpp b/src/backends/redis/find.hpp
index b31b64d..d06395d 100644
--- a/src/backends/redis/find.hpp
+++ b/src/backends/redis/find.hpp
@@ -33,6 +33,7 @@ namespace dindb {
 	std::vector<LocatedSet> locate_sets_in_db ( redis::IncRedis& parRedis, const std::string& parSubstr, bool parCaseInsensitive );
 	std::vector<LocatedSet> locate_sets_in_db ( redis::IncRedis& parRedis, const std::string& parSubstr, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive );
 	std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details ( redis::IncRedis& parRedis, const std::vector<GroupIDType>& parSets );
+	std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( redis::IncRedis& parRedis, GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir );
 } //namespace dindb
 
 #endif

From 12c062b9396eeff92181747256c1a50746982cd5 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 13 Jul 2016 12:17:54 +0100
Subject: [PATCH 149/170] Prevent values being stolen accidentally and provide
 proper overloads.

---
 include/helpers/MaxSizedArray.hpp | 15 +++++++++------
 include/helpers/MaxSizedArray.inl | 12 ++++++++++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/include/helpers/MaxSizedArray.hpp b/include/helpers/MaxSizedArray.hpp
index d147176..560b6ce 100644
--- a/include/helpers/MaxSizedArray.hpp
+++ b/include/helpers/MaxSizedArray.hpp
@@ -78,8 +78,9 @@ namespace dinhelp {
 		iterator erase ( const iterator& parDele );
 		iterator erase ( const iterator& parFrom, const iterator& parToExcl );
 		void clear ( void );
-		mov_reference operator[] ( size_type parIndex );
-		const_reference operator[] ( size_type parIndex ) const;
+		reference operator[] ( size_type parIndex ) &;
+		mov_reference operator[] ( size_type parIndex ) &&;
+		const_reference operator[] ( size_type parIndex ) const &;
 		MaxSizedArray& operator= ( const MaxSizedArray& parOther );
 		bool operator== ( const MaxSizedArray& parOther ) const;
 		bool operator!= ( const MaxSizedArray& parOther ) const;
@@ -95,10 +96,12 @@ namespace dinhelp {
 		const_reverse_iterator rbegin ( void ) const;
 		reverse_iterator rend ( void );
 		const_reverse_iterator rend ( void ) const;
-		reference front ( void ) { return (*this)[0]; }
-		reference back ( void ) { return (*this)[size() - 1]; }
-		const_reference front ( void ) const { return (*this)[0]; }
-		const_reference back ( void ) const { return (*this)[size() - 1]; }
+		reference front ( void ) & { return (*this)[0]; }
+		reference back ( void ) & { return (*this)[size() - 1]; }
+		mov_reference front ( void ) && { return (*this)[0]; }
+		mov_reference back ( void ) && { return (*this)[size() - 1]; }
+		const_reference front ( void ) const & { return (*this)[0]; }
+		const_reference back ( void ) const & { return (*this)[size() - 1]; }
 
 	private:
 		pointer GetPointer_NoAssert ( void ) { return m_localMem; }
diff --git a/include/helpers/MaxSizedArray.inl b/include/helpers/MaxSizedArray.inl
index f46661d..17201c1 100644
--- a/include/helpers/MaxSizedArray.inl
+++ b/include/helpers/MaxSizedArray.inl
@@ -104,7 +104,15 @@ namespace dinhelp {
 	///-------------------------------------------------------------------------
 	///-------------------------------------------------------------------------
 	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::mov_reference MaxSizedArray<T, S, A>::operator[] (size_type parIndex) {
+	typename MaxSizedArray<T, S, A>::reference MaxSizedArray<T, S, A>::operator[] (size_type parIndex) & {
+		assert(parIndex < size());
+		return m_localMem[parIndex];
+	}
+
+	///-------------------------------------------------------------------------
+	///-------------------------------------------------------------------------
+	template <typename T, size_t S, typename A>
+	typename MaxSizedArray<T, S, A>::mov_reference MaxSizedArray<T, S, A>::operator[] (size_type parIndex) && {
 		assert(parIndex < size());
 		return std::move(m_localMem[parIndex]);
 	}
@@ -112,7 +120,7 @@ namespace dinhelp {
 	///-------------------------------------------------------------------------
 	///-------------------------------------------------------------------------
 	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::const_reference MaxSizedArray<T, S, A>::operator[] (size_type parIndex) const {
+	typename MaxSizedArray<T, S, A>::const_reference MaxSizedArray<T, S, A>::operator[] (size_type parIndex) const & {
 		assert(parIndex < size());
 		return m_localMem[parIndex];
 	}

From 853fb13495a9f088625e778d2f6df00f2bc3a82c Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 13 Jul 2016 12:19:27 +0100
Subject: [PATCH 150/170] Implement find_paths_starting_by().

---
 src/backends/redis/backend_redis.cpp |  5 +++--
 src/backends/redis/find.cpp          | 11 +++++++++++
 src/backends/redis/find.hpp          |  4 ++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 720cce6..bd91a19 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -183,7 +183,8 @@ namespace dindb {
 			"base_file_id", lexical_cast<std::string>(base_file_id),
 			"item_count", lexical_cast<std::string>(parData.size()),
 			"dir_count", lexical_cast<std::string>(std::count_if(parData.begin(), parData.end(), [](const mchlib::FileRecordData& r){return r.is_directory;})),
-			"creation", lexical_cast<std::string>(std::time(nullptr))
+			"creation", lexical_cast<std::string>(std::time(nullptr)),
+			"app_name", parSignature
 		);
 
 #if !defined(NDEBUG)
@@ -282,7 +283,7 @@ namespace dindb {
 	}
 
 	std::vector<std::string> BackendRedis::find_paths_starting_by (GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) {
-		return std::vector<std::string>();
+		return dindb::find_paths_starting_by(m_redis, parGroupID, parLevel, parPath);
 	}
 } //namespace dindb
 
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index 16f1405..746ab95 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -317,4 +317,15 @@ namespace dindb {
 		}
 		return retval;
 	};
+
+	std::vector<std::string> find_paths_starting_by (redis::IncRedis& parRedis, GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) {
+		using boost::adaptors::transformed;
+		using dinhelp::MaxSizedArray;
+
+		auto file_details = find_file_details(parRedis, parGroupID, parLevel, parPath);
+		return boost::copy_range<std::vector<std::string>>(
+			file_details |
+			transformed([](MaxSizedArray<std::string, 1>& a){return std::move(a.front());})
+		);
+	}
 } //namespace dindb
diff --git a/src/backends/redis/find.hpp b/src/backends/redis/find.hpp
index d06395d..0f8bc86 100644
--- a/src/backends/redis/find.hpp
+++ b/src/backends/redis/find.hpp
@@ -21,6 +21,9 @@
 #include "backends/db_backend.hpp"
 #include "helpers/MaxSizedArray.hpp"
 #include <vector>
+#include <string>
+#include <boost/utility/string_ref.hpp>
+#include <cstdint>
 
 namespace redis {
 	class IncRedis;
@@ -34,6 +37,7 @@ namespace dindb {
 	std::vector<LocatedSet> locate_sets_in_db ( redis::IncRedis& parRedis, const std::string& parSubstr, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive );
 	std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details ( redis::IncRedis& parRedis, const std::vector<GroupIDType>& parSets );
 	std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( redis::IncRedis& parRedis, GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir );
+	std::vector<std::string> find_paths_starting_by ( redis::IncRedis& parRedis, GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath );
 } //namespace dindb
 
 #endif

From 960f10c370c3bcbfa61dcb13840af377174b8a5f Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 13 Jul 2016 12:19:52 +0100
Subject: [PATCH 151/170] Silence verbose feedback from commands sent to Redis.

---
 src/backends/redis/batch.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/backends/redis/batch.cpp b/src/backends/redis/batch.cpp
index 3deb630..2654bb4 100644
--- a/src/backends/redis/batch.cpp
+++ b/src/backends/redis/batch.cpp
@@ -26,9 +26,14 @@
 #include <atomic>
 #include <mutex>
 #include <condition_variable>
-#include <iostream>
 #include <sstream>
 
+//#define VERBOSE_HIREDIS_COMM
+
+#if defined(VERBOSE_HIREDIS_COMM)
+#   include <iostream>
+#endif
+
 namespace redis {
 	namespace {
 		const std::size_t g_max_redis_unanswered_commands = 1000;
@@ -147,13 +152,19 @@ namespace redis {
 		const auto pending_futures = m_local_data->pending_futures.fetch_add(1);
 		auto* data = new HiredisCallbackData(m_local_data->pending_futures, m_local_data->free_cmd_slot);
 
+#if defined(VERBOSE_HIREDIS_COMM)
 		std::cout << "run_pvt(), " << pending_futures << " items pending... ";
+#endif
 		if (pending_futures >= g_max_redis_unanswered_commands) {
+#if defined(VERBOSE_HIREDIS_COMM)
 			std::cout << " waiting... ";
+#endif
 			std::unique_lock<std::mutex> u_lock(m_local_data->futures_mutex);
 			m_local_data->free_cmd_slot.wait(u_lock, [this]() { return m_local_data->pending_futures < g_max_redis_unanswered_commands; });
 		}
+#if defined(VERBOSE_HIREDIS_COMM)
 		std::cout << " emplace_back(future)... ";
+#endif
 
 		m_futures.emplace_back(data->promise.get_future());
 		{
@@ -163,7 +174,9 @@ namespace redis {
 			static_cast<void>(command_added);
 		}
 
+#if defined(VERBOSE_HIREDIS_COMM)
 		std::cout << "command sent to hiredis" << std::endl;
+#endif
 		m_async_conn->wakeup_event_thread();
 	}
 

From 43e53c37408c10ebe18f02544b46c9a5709b4d1c Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 13 Jul 2016 14:28:32 +0100
Subject: [PATCH 152/170] Move pending futures count's ownership to Command.

This is to make the count global across batches created from
the same Command.
---
 src/backends/redis/batch.cpp   | 10 +++++-----
 src/backends/redis/batch.hpp   |  2 +-
 src/backends/redis/command.cpp |  7 +++++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/backends/redis/batch.cpp b/src/backends/redis/batch.cpp
index 2654bb4..ef1959a 100644
--- a/src/backends/redis/batch.cpp
+++ b/src/backends/redis/batch.cpp
@@ -113,24 +113,24 @@ namespace redis {
 	} //unnamed namespace
 
 	struct Batch::LocalData {
-		LocalData ( void ) :
+		explicit LocalData ( std::atomic_size_t& parPendingFutures ) :
 			free_cmd_slot(),
 			futures_mutex(),
-			pending_futures(0)
+			pending_futures(parPendingFutures)
 		{
 		}
 
 		std::condition_variable free_cmd_slot;
 		std::mutex futures_mutex;
-		std::atomic_size_t pending_futures;
+		std::atomic_size_t& pending_futures;
 	};
 
 	Batch::Batch (Batch&&) = default;
 
-	Batch::Batch (AsyncConnection* parConn) :
+	Batch::Batch (AsyncConnection* parConn, std::atomic_size_t& parPendingFutures) :
 		m_futures(),
 		m_replies(),
-		m_local_data(new LocalData),
+		m_local_data(new LocalData(parPendingFutures)),
 		m_async_conn(parConn)
 	{
 		assert(m_async_conn);
diff --git a/src/backends/redis/batch.hpp b/src/backends/redis/batch.hpp
index 7f8fe69..813d11c 100644
--- a/src/backends/redis/batch.hpp
+++ b/src/backends/redis/batch.hpp
@@ -54,7 +54,7 @@ namespace redis {
 	private:
 		struct LocalData;
 
-		explicit Batch ( AsyncConnection* parConn );
+		explicit Batch ( AsyncConnection* parConn, std::atomic<std::size_t>& parPendingFutures );
 		void run_pvt ( int parArgc, const char** parArgv, std::size_t* parLengths );
 
 		std::vector<std::future<Reply>> m_futures;
diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp
index 22084d4..7dee157 100644
--- a/src/backends/redis/command.cpp
+++ b/src/backends/redis/command.cpp
@@ -23,6 +23,7 @@
 #include <cassert>
 #include <algorithm>
 #include <stdexcept>
+#include <atomic>
 
 //See docs directory for info about hiredis/libev with multithreading
 
@@ -33,12 +34,14 @@ namespace redis {
 	struct Command::LocalData {
 		explicit LocalData (Command* parCommand, std::string&& parAddress, uint16_t parPort) :
 			async_connection(std::move(parAddress), parPort),
-			lua_scripts(parCommand)
+			lua_scripts(parCommand),
+			pending_futures(0)
 		{
 		}
 
 		AsyncConnection async_connection;
 		ScriptManager lua_scripts;
+		std::atomic_size_t pending_futures;
 	};
 
 	Command::Command (std::string&& parAddress, uint16_t parPort) :
@@ -79,7 +82,7 @@ namespace redis {
 
 	Batch Command::make_batch() {
 		assert(is_connected());
-		return Batch(&m_local_data->async_connection);
+		return Batch(&m_local_data->async_connection, m_local_data->pending_futures);
 	}
 
 	Script Command::make_script (const std::string &parScript) {

From 4e41ea1864a99614dd945a09ce42f06a5cf466c6 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 13 Jul 2016 15:13:59 +0100
Subject: [PATCH 153/170] Move hiredis wrapper into a separate .so

...but the new cmake file has some ugly hacks. Trying to work on
the problems...
---
 CMakeLists.txt                                |  1 +
 src/backends/redis/CMakeLists.txt             | 32 +-------
 src/backends/redis/backend_redis.cpp          |  1 +
 src/backends/redis/redisConfig.h.in           |  6 --
 src/incredis/CMakeLists.txt                   | 74 +++++++++++++++++++
 .../redis => incredis}/arg_to_bin_safe.hpp    |  0
 .../redis => incredis}/async_connection.cpp   |  0
 .../redis => incredis}/async_connection.hpp   |  0
 src/{backends/redis => incredis}/batch.cpp    |  0
 src/{backends/redis => incredis}/batch.hpp    |  0
 src/{backends/redis => incredis}/command.cpp  |  0
 src/{backends/redis => incredis}/command.hpp  |  1 -
 src/{backends/redis => incredis}/incredis.cpp |  0
 src/{backends/redis => incredis}/incredis.hpp |  0
 src/incredis/incredisConfig.h.in              | 27 +++++++
 .../redis => incredis}/incredis_batch.cpp     |  0
 .../redis => incredis}/incredis_batch.hpp     |  0
 src/{backends/redis => incredis}/reply.cpp    |  0
 src/{backends/redis => incredis}/reply.hpp    |  0
 .../redis => incredis}/scan_iterator.cpp      |  0
 .../redis => incredis}/scan_iterator.hpp      |  0
 .../redis => incredis}/scan_iterator.inl      |  0
 src/{backends/redis => incredis}/script.cpp   |  0
 src/{backends/redis => incredis}/script.hpp   |  0
 .../redis => incredis}/script_manager.cpp     |  0
 .../redis => incredis}/script_manager.hpp     |  2 +-
 26 files changed, 106 insertions(+), 38 deletions(-)
 create mode 100644 src/incredis/CMakeLists.txt
 rename src/{backends/redis => incredis}/arg_to_bin_safe.hpp (100%)
 rename src/{backends/redis => incredis}/async_connection.cpp (100%)
 rename src/{backends/redis => incredis}/async_connection.hpp (100%)
 rename src/{backends/redis => incredis}/batch.cpp (100%)
 rename src/{backends/redis => incredis}/batch.hpp (100%)
 rename src/{backends/redis => incredis}/command.cpp (100%)
 rename src/{backends/redis => incredis}/command.hpp (98%)
 rename src/{backends/redis => incredis}/incredis.cpp (100%)
 rename src/{backends/redis => incredis}/incredis.hpp (100%)
 create mode 100644 src/incredis/incredisConfig.h.in
 rename src/{backends/redis => incredis}/incredis_batch.cpp (100%)
 rename src/{backends/redis => incredis}/incredis_batch.hpp (100%)
 rename src/{backends/redis => incredis}/reply.cpp (100%)
 rename src/{backends/redis => incredis}/reply.hpp (100%)
 rename src/{backends/redis => incredis}/scan_iterator.cpp (100%)
 rename src/{backends/redis => incredis}/scan_iterator.hpp (100%)
 rename src/{backends/redis => incredis}/scan_iterator.inl (100%)
 rename src/{backends/redis => incredis}/script.cpp (100%)
 rename src/{backends/redis => incredis}/script.hpp (100%)
 rename src/{backends/redis => incredis}/script_manager.cpp (100%)
 rename src/{backends/redis => incredis}/script_manager.hpp (98%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a0e6d6..4851520 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,6 +130,7 @@ add_subdirectory(lib/pbl)
 add_subdirectory(lib/glob2regex)
 add_subdirectory(src/backends)
 add_subdirectory(src/core)
+add_subdirectory(src/incredis)
 
 #Actions
 add_subdirectory(src/main)
diff --git a/src/backends/redis/CMakeLists.txt b/src/backends/redis/CMakeLists.txt
index 7a0c208..538504a 100644
--- a/src/backends/redis/CMakeLists.txt
+++ b/src/backends/redis/CMakeLists.txt
@@ -2,58 +2,30 @@ project(${bare_name}-backend-redis CXX)
 
 set(DINDEXER_REDIS_SCRIPTS_PATH "${CMAKE_INSTALL_PREFIX}/${bare_name}/redis" CACHE STRING "Path where Lua scripts for Redis are stored")
 
-find_package(hiredis 0.11.0 REQUIRED)
-find_package(CryptoPP 5.6)
-find_package(libev 4.0 REQUIRED)
 find_package(Boost 1.53.0 REQUIRED COMPONENTS regex)
 
 add_library(${PROJECT_NAME} SHARED
 	backend_redis.cpp
-	command.cpp
-	scan_iterator.cpp
-	reply.cpp
-	batch.cpp
-	script.cpp
-	script_manager.cpp
-	async_connection.cpp
 	tag.cpp
 	delete.cpp
 	find.cpp
-	incredis.cpp
-	incredis_batch.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
 	PUBLIC ${Boost_INCLUDE_DIRS}
-	PRIVATE ${HIREDIS_INCLUDE_DIRS}
-	PRIVATE ${CMAKE_SOURCE_DIR}/lib/better-enums
-	PRIVATE ${LIBEV_INCLUDE_DIRS}
-	PRIVATE ${Boost_INCLUDE_DIRS}
 )
 target_include_directories(${PROJECT_NAME}
 	PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+	PUBLIC ${CMAKE_SOURCE_DIR}/src/incredis
 )
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-inc
 	PUBLIC ${bare_name}-core
-	PRIVATE ${HIREDIS_LIBRARIES}
-	PRIVATE ${LIBEV_LIBRARIES}
 	PRIVATE ${Boost_LIBRARIES}
+	PRIVATE incredis
 )
 
-target_compile_definitions(${PROJECT_NAME}
-	PRIVATE EV_COMPAT3=0
-)
-
-if (CryptoPP_FOUND)
-	target_link_libraries(${PROJECT_NAME} PRIVATE ${CryptoPP_LIBRARIES})
-	target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE ${CryptoPP_INCLUDE_DIRS})
-	set (has_cryptopp_lib ON)
-else()
-	set (has_cryptopp_lib OFF)
-endif()
-
 configure_file(
 	redisConfig.h.in
 	${CMAKE_CURRENT_BINARY_DIR}/redisConfig.h
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index bd91a19..7f991ba 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -21,6 +21,7 @@
 #include "backends/backend_version.hpp"
 #include "helpers/lexical_cast.hpp"
 #include "dindexerConfig.h"
+#include "redisConfig.h"
 #include "helpers/stringize.h"
 #include "tag.hpp"
 #include "delete.hpp"
diff --git a/src/backends/redis/redisConfig.h.in b/src/backends/redis/redisConfig.h.in
index 3fd23bc..6f1267d 100644
--- a/src/backends/redis/redisConfig.h.in
+++ b/src/backends/redis/redisConfig.h.in
@@ -18,12 +18,6 @@
 #ifndef idB3E2F339E3B64378B66342550C4D2089
 #define idB3E2F339E3B64378B66342550C4D2089
 
-#include "helpers/cmake_on_off.h"
-
-#if CMAKE_@has_cryptopp_lib@
-#	define WITH_CRYPTOPP
-#endif
-
 #define REDIS_SCRIPTS_PATH "@DINDEXER_REDIS_SCRIPTS_PATH@"
 
 #endif
diff --git a/src/incredis/CMakeLists.txt b/src/incredis/CMakeLists.txt
new file mode 100644
index 0000000..a78aae6
--- /dev/null
+++ b/src/incredis/CMakeLists.txt
@@ -0,0 +1,74 @@
+project(incredis CXX)
+
+find_package(hiredis 0.11.0 REQUIRED)
+find_package(CryptoPP 5.6)
+find_package(libev 4.0 REQUIRED)
+find_package(Boost 1.53.0 REQUIRED)
+
+add_library(${PROJECT_NAME} SHARED
+	command.cpp
+	scan_iterator.cpp
+	reply.cpp
+	batch.cpp
+	script.cpp
+	script_manager.cpp
+	async_connection.cpp
+	incredis.cpp
+	incredis_batch.cpp
+)
+
+target_include_directories(${PROJECT_NAME} SYSTEM
+	PUBLIC ${Boost_INCLUDE_DIRS}
+	PRIVATE ${HIREDIS_INCLUDE_DIRS}
+	PUBLIC ${CMAKE_SOURCE_DIR}/lib/better-enums
+	PRIVATE ${LIBEV_INCLUDE_DIRS}
+	PRIVATE ${Boost_INCLUDE_DIRS}
+)
+target_include_directories(${PROJECT_NAME}
+	PUBLIC ${CMAKE_SOURCE_DIR}/include
+	PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+	PUBLIC ${CMAKE_SOURCE_DIR}/lib/sprout
+)
+
+target_link_libraries(${PROJECT_NAME}
+	PRIVATE ${HIREDIS_LIBRARIES}
+	PRIVATE ${LIBEV_LIBRARIES}
+	PRIVATE ${Boost_LIBRARIES}
+)
+
+configure_file(
+	incredisConfig.h.in
+	${CMAKE_CURRENT_BINARY_DIR}/incredisConfig.h
+)
+
+target_compile_definitions(${PROJECT_NAME}
+	PRIVATE EV_COMPAT3=0
+)
+
+if (CryptoPP_FOUND)
+	target_link_libraries(${PROJECT_NAME} PRIVATE ${CryptoPP_LIBRARIES})
+	target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE ${CryptoPP_INCLUDE_DIRS})
+	set (has_cryptopp_lib ON)
+else()
+	set (has_cryptopp_lib OFF)
+endif()
+
+install(TARGETS ${PROJECT_NAME}
+	LIBRARY DESTINATION lib
+	RUNTIME DESTINATION bin
+	ARCHIVE DESTINATION lib/static
+)
+
+target_compile_features(${PROJECT_NAME}
+	PUBLIC cxx_nullptr
+	PUBLIC cxx_range_for
+	PUBLIC cxx_lambdas
+	PUBLIC cxx_decltype_auto
+	PUBLIC cxx_defaulted_functions
+	PUBLIC cxx_deleted_functions
+	PUBLIC cxx_auto_type
+	PUBLIC cxx_decltype_incomplete_return_types
+	PUBLIC cxx_defaulted_move_initializers
+	PUBLIC cxx_noexcept
+	PUBLIC cxx_rvalue_references
+)
diff --git a/src/backends/redis/arg_to_bin_safe.hpp b/src/incredis/arg_to_bin_safe.hpp
similarity index 100%
rename from src/backends/redis/arg_to_bin_safe.hpp
rename to src/incredis/arg_to_bin_safe.hpp
diff --git a/src/backends/redis/async_connection.cpp b/src/incredis/async_connection.cpp
similarity index 100%
rename from src/backends/redis/async_connection.cpp
rename to src/incredis/async_connection.cpp
diff --git a/src/backends/redis/async_connection.hpp b/src/incredis/async_connection.hpp
similarity index 100%
rename from src/backends/redis/async_connection.hpp
rename to src/incredis/async_connection.hpp
diff --git a/src/backends/redis/batch.cpp b/src/incredis/batch.cpp
similarity index 100%
rename from src/backends/redis/batch.cpp
rename to src/incredis/batch.cpp
diff --git a/src/backends/redis/batch.hpp b/src/incredis/batch.hpp
similarity index 100%
rename from src/backends/redis/batch.hpp
rename to src/incredis/batch.hpp
diff --git a/src/backends/redis/command.cpp b/src/incredis/command.cpp
similarity index 100%
rename from src/backends/redis/command.cpp
rename to src/incredis/command.cpp
diff --git a/src/backends/redis/command.hpp b/src/incredis/command.hpp
similarity index 98%
rename from src/backends/redis/command.hpp
rename to src/incredis/command.hpp
index b49000c..d474d5f 100644
--- a/src/backends/redis/command.hpp
+++ b/src/incredis/command.hpp
@@ -20,7 +20,6 @@
 
 #include "reply.hpp"
 #include "batch.hpp"
-#include "redisConfig.h"
 #include "script.hpp"
 #include <array>
 #include <string>
diff --git a/src/backends/redis/incredis.cpp b/src/incredis/incredis.cpp
similarity index 100%
rename from src/backends/redis/incredis.cpp
rename to src/incredis/incredis.cpp
diff --git a/src/backends/redis/incredis.hpp b/src/incredis/incredis.hpp
similarity index 100%
rename from src/backends/redis/incredis.hpp
rename to src/incredis/incredis.hpp
diff --git a/src/incredis/incredisConfig.h.in b/src/incredis/incredisConfig.h.in
new file mode 100644
index 0000000..a0c985f
--- /dev/null
+++ b/src/incredis/incredisConfig.h.in
@@ -0,0 +1,27 @@
+/* Copyright 2015, 2016, Michele Santullo
+ * This file is part of "dindexer".
+ *
+ * "dindexer" is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * "dindexer" 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef id2F97AF7626CE45F08742867A2A737482
+#define id2F97AF7626CE45F08742867A2A737482
+
+#include "helpers/cmake_on_off.h"
+
+#if CMAKE_@has_cryptopp_lib@
+#	define WITH_CRYPTOPP
+#endif
+
+#endif
diff --git a/src/backends/redis/incredis_batch.cpp b/src/incredis/incredis_batch.cpp
similarity index 100%
rename from src/backends/redis/incredis_batch.cpp
rename to src/incredis/incredis_batch.cpp
diff --git a/src/backends/redis/incredis_batch.hpp b/src/incredis/incredis_batch.hpp
similarity index 100%
rename from src/backends/redis/incredis_batch.hpp
rename to src/incredis/incredis_batch.hpp
diff --git a/src/backends/redis/reply.cpp b/src/incredis/reply.cpp
similarity index 100%
rename from src/backends/redis/reply.cpp
rename to src/incredis/reply.cpp
diff --git a/src/backends/redis/reply.hpp b/src/incredis/reply.hpp
similarity index 100%
rename from src/backends/redis/reply.hpp
rename to src/incredis/reply.hpp
diff --git a/src/backends/redis/scan_iterator.cpp b/src/incredis/scan_iterator.cpp
similarity index 100%
rename from src/backends/redis/scan_iterator.cpp
rename to src/incredis/scan_iterator.cpp
diff --git a/src/backends/redis/scan_iterator.hpp b/src/incredis/scan_iterator.hpp
similarity index 100%
rename from src/backends/redis/scan_iterator.hpp
rename to src/incredis/scan_iterator.hpp
diff --git a/src/backends/redis/scan_iterator.inl b/src/incredis/scan_iterator.inl
similarity index 100%
rename from src/backends/redis/scan_iterator.inl
rename to src/incredis/scan_iterator.inl
diff --git a/src/backends/redis/script.cpp b/src/incredis/script.cpp
similarity index 100%
rename from src/backends/redis/script.cpp
rename to src/incredis/script.cpp
diff --git a/src/backends/redis/script.hpp b/src/incredis/script.hpp
similarity index 100%
rename from src/backends/redis/script.hpp
rename to src/incredis/script.hpp
diff --git a/src/backends/redis/script_manager.cpp b/src/incredis/script_manager.cpp
similarity index 100%
rename from src/backends/redis/script_manager.cpp
rename to src/incredis/script_manager.cpp
diff --git a/src/backends/redis/script_manager.hpp b/src/incredis/script_manager.hpp
similarity index 98%
rename from src/backends/redis/script_manager.hpp
rename to src/incredis/script_manager.hpp
index 66b1153..e9a8065 100644
--- a/src/backends/redis/script_manager.hpp
+++ b/src/incredis/script_manager.hpp
@@ -18,7 +18,7 @@
 #ifndef id8E124FF76DF449CDB8FBA806F8EF4E78
 #define id8E124FF76DF449CDB8FBA806F8EF4E78
 
-#include "redisConfig.h"
+#include "incredisConfig.h"
 #if defined(WITH_CRYPTOPP)
 #	define MAKE_SHA1_WITH_CRYPTOPP
 #endif

From 0b10316d9e854d3be6ff22840141a021e00f9419 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 14 Jul 2016 11:02:06 +0100
Subject: [PATCH 154/170] Use lexical_cast from dinhelp, not boost.

---
 src/incredis/reply.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/incredis/reply.cpp b/src/incredis/reply.cpp
index d7aa376..9351f86 100644
--- a/src/incredis/reply.cpp
+++ b/src/incredis/reply.cpp
@@ -16,8 +16,8 @@
  */
 
 #include "reply.hpp"
+#include "helpers/lexical_cast.hpp"
 #include <boost/variant/get.hpp>
-#include <boost/lexical_cast.hpp>
 
 namespace redis {
 	const long long& get_integer (const Reply& parReply) {
@@ -35,7 +35,7 @@ namespace redis {
 	}
 
 	long long get_integer_autoconv_if_str (const Reply &parReply) {
-		using boost::lexical_cast;
+		using dinhelp::lexical_cast;
 
 		const auto type = parReply.which();
 		switch (type) {

From dc814b4d09e5c8c43697bb107e9f06a2af56c8fa Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 14 Jul 2016 11:24:41 +0100
Subject: [PATCH 155/170] Move flatinsertin2dlist to postgresql backend.

It's the only place using that header and its use is so
specialized I struggle to even remember what it does.
---
 .../helpers => src/backends/postgresql}/flatinsertin2dlist.hpp  | 2 +-
 .../implem => src/backends/postgresql}/flatinsertin2dlist.inl   | 0
 src/backends/postgresql/navigate.hpp                            | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {include/helpers => src/backends/postgresql}/flatinsertin2dlist.hpp (98%)
 rename {include/helpers/implem => src/backends/postgresql}/flatinsertin2dlist.inl (100%)

diff --git a/include/helpers/flatinsertin2dlist.hpp b/src/backends/postgresql/flatinsertin2dlist.hpp
similarity index 98%
rename from include/helpers/flatinsertin2dlist.hpp
rename to src/backends/postgresql/flatinsertin2dlist.hpp
index 927b47d..010ba9f 100644
--- a/include/helpers/flatinsertin2dlist.hpp
+++ b/src/backends/postgresql/flatinsertin2dlist.hpp
@@ -54,6 +54,6 @@ namespace dinhelp {
 	};
 } //namespace dinhelp
 
-#include "implem/flatinsertin2dlist.inl"
+#include "flatinsertin2dlist.inl"
 
 #endif
diff --git a/include/helpers/implem/flatinsertin2dlist.inl b/src/backends/postgresql/flatinsertin2dlist.inl
similarity index 100%
rename from include/helpers/implem/flatinsertin2dlist.inl
rename to src/backends/postgresql/flatinsertin2dlist.inl
diff --git a/src/backends/postgresql/navigate.hpp b/src/backends/postgresql/navigate.hpp
index 28415d1..da74b82 100644
--- a/src/backends/postgresql/navigate.hpp
+++ b/src/backends/postgresql/navigate.hpp
@@ -19,7 +19,7 @@
 #define id63F35BA8B3C94A129291D963ABE66018
 
 #include "dindexer-machinery/recorddata.hpp"
-#include "helpers/flatinsertin2dlist.hpp"
+#include "flatinsertin2dlist.hpp"
 #include "helpers/MaxSizedArray.hpp"
 #include "backends/db_backend.hpp"
 #include <memory>

From 3edb83dce3c92ae3fe666cbec57b2ef3f33c9dbd Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 14 Jul 2016 14:05:19 +0100
Subject: [PATCH 156/170] Add new shared_git_project module for cmake.

---
 CMakeLists.txt                         |  3 +-
 cmake/Modules/shared_git_project.cmake | 86 ++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 cmake/Modules/shared_git_project.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4851520..699f6aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@ include(gccversion)
 include(CPack)
 include(CTest)
 include(timestamp)
+include(shared_git_project)
 
 option(DINDEXER_DEBUG_CFG_FILE "Enable to set the config file path to the build path" OFF)
 option(DINDEXER_WITH_MEDIA_AUTODETECT "Enable code that tries to autodetect the media type and sets --type automatically" ON)
@@ -143,7 +144,7 @@ add_subdirectory(src/tag)
 
 #Tests
 if (BUILD_TESTING)
-	add_subdirectory(test/gtest)
+	add_shared_git_project(test/gtest)
 	add_subdirectory(test/unit)
 	add_subdirectory(test/unit_cli)
 endif()
diff --git a/cmake/Modules/shared_git_project.cmake b/cmake/Modules/shared_git_project.cmake
new file mode 100644
index 0000000..6924aaa
--- /dev/null
+++ b/cmake/Modules/shared_git_project.cmake
@@ -0,0 +1,86 @@
+cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR)
+
+function (add_shared_git_project SUBMODULE_PATH)
+	if (IS_ABSOLUTE "${SUBMODULE_PATH}")
+		set(submod_path "${SUBMODULE_PATH}")
+	else()
+		set(submod_path "${CMAKE_CURRENT_SOURCE_DIR}/${SUBMODULE_PATH}")
+	endif()
+
+	if (NOT EXISTS "${submod_path}")
+		message(FATAL_ERROR "Path \"${submod_path}\" doesn't exist")
+	endif()
+	if (NOT IS_DIRECTORY "${submod_path}")
+		message(FATAL_ERROR "Path \"${submod_path}\" is not a valid directory")
+	endif()
+
+	if (NOT EXISTS "${submod_path}/.git")
+		message(FATAL_ERROR ".git not found in \"${submod_path}\". Not a git submodule?")
+	endif()
+	if (IS_DIRECTORY "${submod_path}/.git")
+		message(FATAL_ERROR "\"${submod_path}.git\" is a directory, not a file as expected. Not a git submodule?")
+	endif()
+
+	get_filename_component(proj_name_orig "${submod_path}" NAME)
+	if ("${proj_name_orig}" STREQUAL "")
+		message(FATAL_ERROR "Couldn't make up a name for given project in \"${submod_path}\"")
+	endif()
+
+	string(MAKE_C_IDENTIFIER "${submod_path}" proj_name_c_id)
+	string(TOUPPER ${proj_name_c_id} proj_name)
+
+	get_property(shared_projects_list GLOBAL PROPERTY SHARED_PROJECTS_LIST)
+	list(FIND shared_projects_list ${proj_name} found_index)
+	if (${found_index} GREATER -1)
+		#nothing to do, the variable is already set so the project must have been
+		#included already
+		return()
+	endif()
+
+	#Obtain the path to the working tree
+	# see http://stackoverflow.com/questions/27379818/git-possible-to-use-same-submodule-working-copy-by-multiple-projects
+	# git rev-parse --git-dir --show-toplevel
+	execute_process(
+		COMMAND git rev-parse --show-toplevel
+		WORKING_DIRECTORY "${submod_path}"
+		OUTPUT_VARIABLE matched_gitdir
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+
+	#Make sure we got an absolute path
+	if (IS_ABSOLUTE "${matched_gitdir}")
+		set(reported_submodule_dir "${matched_gitdir}")
+	else()
+		file(RELATIVE_PATH reported_submodule_dir "${CMAKE_CURRENT_SOURCE_DIR}" "${submod_path}/${matched_gitdir}")
+	endif()
+	unset(matched_gitdir)
+
+	#Check if submodule is a subdirectory of the current source dir
+	file(RELATIVE_PATH reported_submodule_rel_path "${CMAKE_CURRENT_SOURCE_DIR}" "${reported_submodule_dir}")
+	string(LENGTH "${reported_submodule_rel_path}" rel_path_len)
+	message(STATUS "\"${reported_submodule_rel_path}\" - ${rel_path_len}")
+	if (${rel_path_len} GREATER 2)
+		string(SUBSTRING reported_submodule_rel_path 0 3 first_bit)
+		if ("../" STREQUAL "${first_bit}")
+			set(is_out_of_dirtree ON)
+		else()
+			set(is_out_of_dirtree OFF)
+		endif()
+		unset(first_bit)
+	else()
+		set(is_out_of_dirtree OFF)
+	endif()
+	unset(rel_path_len)
+
+	#Globally mark current submodule as handled
+	set_property(GLOBAL APPEND PROPERTY SHARED_PROJECTS_LIST ${proj_name})
+
+	set(shared_project_binary "${CMAKE_CURRENT_BINARY_DIR}/shared_projects/${proj_name_orig}")
+	if (is_out_of_dirtree)
+		#message("Would call add_subdirectory(\"${reported_submodule_dir}\" \"${shared_project_binary}\")")
+		add_subdirectory("${reported_submodule_dir}" "${shared_project_binary}")
+	else()
+		#message("Would call add_subdirectory(\"${reported_submodule_rel_path}\")")
+		add_subdirectory("${reported_submodule_rel_path}")
+	endif()
+endfunction()

From a5d9d6b716b546575f1c922f498ab4974f40cfad Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 14 Jul 2016 15:27:11 +0100
Subject: [PATCH 157/170] Remove helpers from this repo.

They have been pulled out into a separate git repository.
Adding that as a submodule in an upcoming commit.
---
 include/helpers/MaxSizedArray.hpp        | 117 ---------
 include/helpers/MaxSizedArray.inl        | 289 ---------------------
 include/helpers/cmake_on_off.h           |  38 ---
 include/helpers/compatibility.h          |  62 -----
 include/helpers/has_method.hpp           |  54 ----
 include/helpers/implem/AutomemBase.hpp   |  91 -------
 include/helpers/implem/AutomemBase.inl   | 118 ---------
 include/helpers/implem/IteratorOnPtr.hpp | 314 -----------------------
 include/helpers/infix_iterator.hpp       |  48 ----
 include/helpers/lengthof.h               |  37 ---
 include/helpers/lexical_cast.hpp         | 304 ----------------------
 include/helpers/sequence_bt.hpp          |  54 ----
 include/helpers/string_bt.hpp            | 112 --------
 include/helpers/stringize.h              |  24 --
 14 files changed, 1662 deletions(-)
 delete mode 100644 include/helpers/MaxSizedArray.hpp
 delete mode 100644 include/helpers/MaxSizedArray.inl
 delete mode 100644 include/helpers/cmake_on_off.h
 delete mode 100644 include/helpers/compatibility.h
 delete mode 100644 include/helpers/has_method.hpp
 delete mode 100644 include/helpers/implem/AutomemBase.hpp
 delete mode 100644 include/helpers/implem/AutomemBase.inl
 delete mode 100644 include/helpers/implem/IteratorOnPtr.hpp
 delete mode 100644 include/helpers/infix_iterator.hpp
 delete mode 100644 include/helpers/lengthof.h
 delete mode 100644 include/helpers/lexical_cast.hpp
 delete mode 100644 include/helpers/sequence_bt.hpp
 delete mode 100644 include/helpers/string_bt.hpp
 delete mode 100644 include/helpers/stringize.h

diff --git a/include/helpers/MaxSizedArray.hpp b/include/helpers/MaxSizedArray.hpp
deleted file mode 100644
index 560b6ce..0000000
--- a/include/helpers/MaxSizedArray.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef idBC9F804ADD33468A9C7657E823FFC706
-#define idBC9F804ADD33468A9C7657E823FFC706
-
-#include "implem/AutomemBase.hpp"
-#include "implem/IteratorOnPtr.hpp"
-#include <memory>
-#include <cstddef>
-#include <type_traits>
-#include <cassert>
-#include <utility>
-
-namespace dinhelp {
-	const size_t MAXSZARR_MAX_STACK_ALLOC_SIZE = MAX_STACK_ALLOC_SIZE;
-
-	//TODO: add a template parameter to force stack allocation regardless of
-	//sizeof(T) * S
-	template <typename T, size_t S, typename A=std::allocator<T> >
-	class MaxSizedArray :
-		private std::conditional<
-			(sizeof(T) * S > (MAXSZARR_MAX_STACK_ALLOC_SIZE > 4 * sizeof(T*) ? MAXSZARR_MAX_STACK_ALLOC_SIZE - sizeof(T*) : MAXSZARR_MAX_STACK_ALLOC_SIZE)),
-			AutomemRawBase_heap<T, S, A>,
-			AutomemRawBase_stack<T, S>
-		>::type
-	{
-		typedef typename std::conditional<
-			(sizeof(T) * S > (MAXSZARR_MAX_STACK_ALLOC_SIZE > 4 * sizeof(T*) ? MAXSZARR_MAX_STACK_ALLOC_SIZE - sizeof(T*) : MAXSZARR_MAX_STACK_ALLOC_SIZE)),
-			AutomemRawBase_heap<T, S, A>,
-			AutomemRawBase_stack<T, S>
-		>::type parent_type;
-
-	public:
-		typedef IteratorOnPtr<T*, T, false> iterator;
-		typedef IteratorOnPtr<const T*, const T, false> const_iterator;
-		typedef IteratorOnPtr<T*, T, true> reverse_iterator;
-		typedef IteratorOnPtr<const T*, const T, true> const_reverse_iterator;
-		typedef T& reference;
-		typedef T&& mov_reference;
-		typedef const T& const_reference;
-		typedef size_t size_type;
-		typedef ptrdiff_t difference_type;
-		typedef T value_type;
-		typedef T* pointer;
-		typedef const T* const_pointer;
-
-		enum MAX_SIZE_ENUM {
-			MAX_SIZE = S
-		};
-
-		MaxSizedArray ( void );
-		MaxSizedArray ( const MaxSizedArray& parOther );
-		MaxSizedArray ( MaxSizedArray&& parOther );
-		~MaxSizedArray ( void );
-
-		bool empty ( void ) const;
-		size_type size ( void ) const;
-		size_type capacity ( void ) const { return S; }
-		size_type max_size ( void ) const { return S; }
-		void push_back ( const value_type& parNewItem );
-		void push_back ( value_type&& parNewItem );
-		void pop_back ( void );
-		iterator erase ( const iterator& parDele );
-		iterator erase ( const iterator& parFrom, const iterator& parToExcl );
-		void clear ( void );
-		reference operator[] ( size_type parIndex ) &;
-		mov_reference operator[] ( size_type parIndex ) &&;
-		const_reference operator[] ( size_type parIndex ) const &;
-		MaxSizedArray& operator= ( const MaxSizedArray& parOther );
-		bool operator== ( const MaxSizedArray& parOther ) const;
-		bool operator!= ( const MaxSizedArray& parOther ) const;
-		pointer GetPointer ( void );
-		const_pointer GetPointer ( void ) const;
-		void reserve ( size_type parReserve );
-
-		iterator begin ( void );
-		const_iterator begin ( void ) const;
-		iterator end ( void );
-		const_iterator end ( void ) const;
-		reverse_iterator rbegin ( void );
-		const_reverse_iterator rbegin ( void ) const;
-		reverse_iterator rend ( void );
-		const_reverse_iterator rend ( void ) const;
-		reference front ( void ) & { return (*this)[0]; }
-		reference back ( void ) & { return (*this)[size() - 1]; }
-		mov_reference front ( void ) && { return (*this)[0]; }
-		mov_reference back ( void ) && { return (*this)[size() - 1]; }
-		const_reference front ( void ) const & { return (*this)[0]; }
-		const_reference back ( void ) const & { return (*this)[size() - 1]; }
-
-	private:
-		pointer GetPointer_NoAssert ( void ) { return m_localMem; }
-		const_pointer GetPointer_NoAssert ( void ) const { return m_localMem; }
-
-		T* m_localMem; //A copy of memory pointer is required
-		size_type m_used;
-	};
-} //namespace dinhelp
-
-#include "MaxSizedArray.inl"
-
-#endif
diff --git a/include/helpers/MaxSizedArray.inl b/include/helpers/MaxSizedArray.inl
deleted file mode 100644
index 17201c1..0000000
--- a/include/helpers/MaxSizedArray.inl
+++ /dev/null
@@ -1,289 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace dinhelp {
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	MaxSizedArray<T, S, A>::MaxSizedArray() {
-		m_localMem = this->AllocMemory();
-		m_used = 0;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	MaxSizedArray<T, S, A>::MaxSizedArray (const MaxSizedArray& parOther) :
-		parent_type(),
-		m_used(0)
-	{
-		m_localMem = this->AllocMemory();
-		const size_type count = parOther.size();
-		for (size_type z = 0; z < count; ++z) {
-			this->push_back(parOther[z]);
-		}
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	MaxSizedArray<T, S, A>::MaxSizedArray (MaxSizedArray&& parOther) :
-		parent_type(),
-		m_used(0)
-	{
-		m_localMem = this->AllocMemory();
-		const size_type count = parOther.size();
-		for (size_type z = 0; z < count; ++z) {
-			this->push_back(std::move(parOther[z]));
-		}
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	MaxSizedArray<T, S, A>::~MaxSizedArray() {
-		this->clear();
-		this->FreeMemory();
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	bool MaxSizedArray<T, S, A>::empty() const {
-		return 0 == m_used;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::size_type MaxSizedArray<T, S, A>::size() const {
-		return m_used;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	void MaxSizedArray<T, S, A>::push_back (value_type&& parNewItem) {
-		assert(size() < capacity());
-		this->GetNewT(m_used, std::move(parNewItem));
-		++m_used;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	void MaxSizedArray<T, S, A>::push_back (const value_type& parNewItem) {
-		assert(size() < capacity());
-		this->GetNewT(m_used, parNewItem);
-		++m_used;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	void MaxSizedArray<T, S, A>::pop_back() {
-		assert(not empty());
-		m_localMem[m_used - 1].~T();
-		--m_used;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::reference MaxSizedArray<T, S, A>::operator[] (size_type parIndex) & {
-		assert(parIndex < size());
-		return m_localMem[parIndex];
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::mov_reference MaxSizedArray<T, S, A>::operator[] (size_type parIndex) && {
-		assert(parIndex < size());
-		return std::move(m_localMem[parIndex]);
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::const_reference MaxSizedArray<T, S, A>::operator[] (size_type parIndex) const & {
-		assert(parIndex < size());
-		return m_localMem[parIndex];
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	MaxSizedArray<T, S, A>& MaxSizedArray<T, S, A>::operator= (const MaxSizedArray& parOther) {
-		m_used = parOther.m_used;
-		std::copy(parOther.GetMemPtr(), parOther.GetMemPtr() + parOther.size(), this->GetMemPtr());
-		return *this;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	bool MaxSizedArray<T, S, A>::operator== (const MaxSizedArray& parOther) const {
-		if (size() != parOther.size())
-			return false;
-		for (size_type z = 0; z < size(); ++z) {
-			if ((*this)[z] != parOther[z])
-				return false;
-		}
-		return true;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	bool MaxSizedArray<T, S, A>::operator!= (const MaxSizedArray& parOther) const {
-		return not (*this == parOther);
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::pointer MaxSizedArray<T, S, A>::GetPointer() {
-		assert(size() > 0);
-		return GetPointer_NoAssert();
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::const_pointer MaxSizedArray<T, S, A>::GetPointer() const {
-		assert(size() > 0);
-		return GetPointer_NoAssert();
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	void MaxSizedArray<T, S, A>::clear() {
-		const size_type count = this->size();
-		for (size_type z = 0; z < count; ++z) {
-			(*this)[z].~T();
-		}
-		m_used = 0;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::iterator MaxSizedArray<T, S, A>::begin() {
-		return iterator(GetPointer_NoAssert(), size());
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::const_iterator MaxSizedArray<T, S, A>::begin() const {
-		return const_iterator(GetPointer_NoAssert(), size());
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::iterator MaxSizedArray<T, S, A>::end() {
-		return iterator(GetPointer_NoAssert() + size(), 0);
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::const_iterator MaxSizedArray<T, S, A>::end() const {
-		return const_iterator(GetPointer_NoAssert() + size(), 0);
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::reverse_iterator MaxSizedArray<T, S, A>::rbegin() {
-		return reverse_iterator(GetPointer_NoAssert() + size() - 1, size());
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::const_reverse_iterator MaxSizedArray<T, S, A>::rbegin() const {
-		return const_reverse_iterator(GetPointer_NoAssert() + size() - 1, size());
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::reverse_iterator MaxSizedArray<T, S, A>::rend() {
-		return reverse_iterator(GetPointer_NoAssert() - 1, 0);
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::const_reverse_iterator MaxSizedArray<T, S, A>::rend() const {
-		return const_reverse_iterator(GetPointer_NoAssert() - 1, 0);
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::iterator MaxSizedArray<T, S, A>::erase (const iterator& parDele) {
-		assert(end() != parDele);
-		return erase(parDele, parDele + 1);
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	typename MaxSizedArray<T, S, A>::iterator MaxSizedArray<T, S, A>::erase (const iterator& parFrom, const iterator& parToExcl) {
-		assert(parFrom >= begin());
-		assert(parToExcl <= end());
-		assert(parToExcl >= parFrom);
-
-		//I'm doing this in two passes: first, I'm deleting as many elements as
-		//the ones that would be left at the end (that is, delete and move),
-		//then delete everything to the end of the buffer, if necessary.
-		const size_type deleCount = static_cast<size_type>(parToExcl - parFrom);
-		const size_type firstIndexToDele = static_cast<size_type>(parFrom - begin());
-		const size_type& sz = m_used;
-		assert(firstIndexToDele + deleCount <= sz);
-		const size_type deleAndCopyCount = sz - (firstIndexToDele + deleCount);
-
-		//As said, make room and copy from the cut tail
-		for (size_type z = firstIndexToDele; z < firstIndexToDele + deleAndCopyCount; z++) {
-			(*this)[z].~T();
-			new(&(*this)[z]) T((*this)[z + deleCount]);
-		}
-
-		//Any leftover is rubbish
-		for (size_type z = firstIndexToDele + deleAndCopyCount; z < sz; z++) {
-			(*this)[z].~T();
-		}
-
-		m_used -= deleCount;
-		return begin() + firstIndexToDele;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	void MaxSizedArray<T, S, A>::reserve (size_type parReserve) {
-		assert(parReserve <= S);
-		if (parReserve > S) {
-			throw std::length_error("Unable to reserve more memory than the build-time size for MaxSizedArray");
-		}
-	}
-} //namespace dinhelp
diff --git a/include/helpers/cmake_on_off.h b/include/helpers/cmake_on_off.h
deleted file mode 100644
index 165ab95..0000000
--- a/include/helpers/cmake_on_off.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id9B6B373E88404330ADEE51A4EC861787
-#define id9B6B373E88404330ADEE51A4EC861787
-
-#if !defined(CMAKE_ON)
-#	define CMAKE_ON 1
-#	define CMAKE_on 1
-#	define CMAKE_On 1
-#	define CMAKE_oN 1
-#endif
-#if !defined(CMAKE_OFF)
-#	define CMAKE_OFF 0
-#	define CMAKE_OFf 0
-#	define CMAKE_OfF 0
-#	define CMAKE_Off 0
-#	define CMAKE_oFF 0
-#	define CMAKE_oFf 0
-#	define CMAKE_ofF 0
-#	define CMAKE_off 0
-#endif
-
-#endif
diff --git a/include/helpers/compatibility.h b/include/helpers/compatibility.h
deleted file mode 100644
index e59a560..0000000
--- a/include/helpers/compatibility.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id45CDD1DAEF4F42968E3C89F68FDDA9BC
-#define id45CDD1DAEF4F42968E3C89F68FDDA9BC
-
-#if defined(__GNUC__)
-#	if defined(__clang__)
-#		if !defined(__has_attribute)
-			//Fall back to version number comparing
-#		else
-#			if __has_attribute(flatten)
-#				define a_flatten __attribute__((flatten))
-#			else
-#				define a_flatten
-#			endif
-#			if __has_attribute(always_inline)
-#				define a_always_inline __attribute__((always_inline))
-#			else
-#				define a_always_inline
-#			endif
-#			if __has_attribute(pure)
-#				define a_pure __attribute__((pure))
-#			else
-#				define a_pure
-#			endif
-#			if __has_attribute(deprecated)
-#				define a_deprecated __attribute__((deprecated))
-#			else
-#				define a_deprecated
-#endif
-#		endif
-#	else
-		//Fix here if you get warnings about unsupported attributes on your compiler
-#		define a_flatten __attribute__((flatten))
-#		define a_always_inline __attribute__((always_inline))
-#		define a_pure __attribute__((pure))
-#		define a_deprecated __attribute__((deprecated))
-#	endif
-#else
-#	warning "Unsupported compiler, please fill this section or file a bug"
-#	define a_flatten
-#	define a_always_inline
-#	define a_pure
-#	define a_deprecated
-#endif
-
-#endif
diff --git a/include/helpers/has_method.hpp b/include/helpers/has_method.hpp
deleted file mode 100644
index d641771..0000000
--- a/include/helpers/has_method.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2015 Michele "King_DuckZ" Santullo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef idFBC29C5127784D35BE62F7BAC16E3687
-#define idFBC29C5127784D35BE62F7BAC16E3687
-
-#define define_has_method(method_name,pretty_name) \
-	template <typename T> \
-	struct Has ## pretty_name ## Method { \
-	private: \
-		struct TrueType { int a[2]; }; \
-		typedef int FalseType; \
-		template <typename C> static TrueType has_method ( decltype(&C::method_name) ); \
-		template <typename C> static FalseType has_method ( ... ); \
-	public: \
-		enum { value = sizeof(has_method<T>(0)) == sizeof(TrueType) }; \
-	}
-#define define_has_typedef(typedef_name,pretty_name) \
-	template <typename T> \
-	struct Has ## pretty_name ## Typedef { \
-	private: \
-		struct TrueType { int a[2]; }; \
-		typedef int FalseType; \
-		template <typename C> static TrueType has_typedef ( const typename C::typedef_name* ); \
-		template <typename C> static FalseType has_typedef ( ... ); \
-	public: \
-		enum { value = sizeof(has_typedef<T>(nullptr)) == sizeof(TrueType) }; \
-	}
-#define define_has_enum(enum_name,pretty_name) \
-	template <typename T> \
-	struct Has ## pretty_name ## Enum { \
-	private: \
-		struct TrueType { int a[2]; }; \
-		typedef int FalseType; \
-		template <typename C> static TrueType has_enum ( decltype(C::enum_name)* ); \
-		template <typename C> static FalseType has_enum ( ... ); \
-	public:\
-		enum { value = sizeof(has_enum<T>(nullptr)) == sizeof(TrueType) }; \
-	}
-
-#endif
diff --git a/include/helpers/implem/AutomemBase.hpp b/include/helpers/implem/AutomemBase.hpp
deleted file mode 100644
index c632976..0000000
--- a/include/helpers/implem/AutomemBase.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef idDB299AE3079F4830BB1D543C07F7B594
-#define idDB299AE3079F4830BB1D543C07F7B594
-
-//Classes in this file are low level and only intended to be used by library
-//code. They don't do much by themselves and shoud never be used from outside.
-
-#include <memory>
-#include <algorithm>
-#include <cassert>
-#include <cstdint>
-
-#if !defined(NDEBUG)
-#	define ASSERTIONSENABLED
-#endif
-
-namespace dinhelp {
-	const size_t MAX_STACK_ALLOC_SIZE = 128;
-
-	///-------------------------------------------------------------------------
-	///Heap-based allocation, only gets raw memory
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A=std::allocator<T> >
-	class AutomemRawBase_heap {
-	protected:
-		AutomemRawBase_heap ( void );
-		AutomemRawBase_heap ( const AutomemRawBase_heap& ) = delete; //Copy ctor can't be implemented at this level
-		AutomemRawBase_heap ( AutomemRawBase_heap&& parOther );
-
-		template <typename... Args>
-		T* GetNewT ( size_t parIndex, Args&&... parArgs );
-		T* AllocMemory ( void );
-		void FreeMemory ( void ) noexcept;
-		void swap ( AutomemRawBase_heap& parOther ) noexcept { std::swap(m_localMem, parOther.m_localMem); }
-	private:
-		void operator= (const AutomemRawBase_heap&);
-
-#if defined(ASSERTIONSENABLED)
-		typedef uintptr_t PTR_INT_TYPE;
-		static_assert(sizeof(PTR_INT_TYPE) == sizeof(char*), "Wrong uintptr_t size");
-#endif
-		T* m_localMem;
-	};
-
-	///-------------------------------------------------------------------------
-	///Stack-based allocation, only gets raw memory
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S>
-	class AutomemRawBase_stack {
-	protected:
-		AutomemRawBase_stack ( void ) = default;
-		AutomemRawBase_stack ( const AutomemRawBase_stack& ) = delete; //Copy ctor can't be implemented at this level
-		AutomemRawBase_stack ( AutomemRawBase_stack&& ) = delete;
-		~AutomemRawBase_stack ( void ) = default;
-
-		template <typename... Args>
-		T* GetNewT ( size_t parIndex, Args&&... parArgs );
-		T* AllocMemory ( void );
-		void FreeMemory ( void ) noexcept { return; }
-	private:
-#if defined(ASSERTIONSENABLED)
-		typedef uintptr_t PTR_INT_TYPE;
-		static_assert(sizeof(PTR_INT_TYPE) == sizeof(char*), "Wrong uintptr_t size");
-#endif
-		void operator= (const AutomemRawBase_stack&);
-		typename std::aligned_storage<sizeof(T), alignof(T)>::type m_localMem[S];
-	};
-} //namespace dinhelp
-
-#include "AutomemBase.inl"
-
-#if defined(ASSERTIONSENABLED)
-#	undef ASSERTIONSENABLED
-#endif
-#endif
diff --git a/include/helpers/implem/AutomemBase.inl b/include/helpers/implem/AutomemBase.inl
deleted file mode 100644
index 03c63da..0000000
--- a/include/helpers/implem/AutomemBase.inl
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace dinhelp {
-	namespace {
-#if defined(ASSERTIONSENABLED)
-		const char g_guard = 0xAB;
-#endif
-	} //unnamed namespace
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	AutomemRawBase_heap<T, S, A>::AutomemRawBase_heap() {
-#if !defined(NDEBUG)
-		m_localMem = nullptr;
-#endif
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	AutomemRawBase_heap<T, S, A>::AutomemRawBase_heap (AutomemRawBase_heap&& parOther) {
-#if !defined(NDEBUG)
-		m_localMem = nullptr;
-#endif
-		this->swap(parOther);
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	T* AutomemRawBase_heap<T, S, A>::AllocMemory() {
-#if !defined(NDEBUG)
-		assert(nullptr == m_localMem);
-#endif
-		m_localMem = A().allocate(S);
-#if defined(ASSERTIONSENABLED)
-		assert(reinterpret_cast<PTR_INT_TYPE>(m_localMem) % alignof(T) == 0); //Make sure alignment is correct
-		std::fill(
-			reinterpret_cast<char*>(&m_localMem[0]),
-			reinterpret_cast<char*>(&m_localMem[0]) + sizeof(m_localMem),
-			g_guard
-		);
-#endif
-		return m_localMem;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	void AutomemRawBase_heap<T, S, A>::FreeMemory() noexcept {
-#if !defined(NDEBUG)
-		assert(nullptr != m_localMem);
-#endif
-		A().deallocate(m_localMem, S);
-#if !defined(NDEBUG)
-		m_localMem = nullptr;
-#endif
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S, typename A>
-	template <typename... Args>
-	T* AutomemRawBase_heap<T, S, A>::GetNewT (size_t parIndex, Args&&... parArgs) {
-		assert(parIndex < S);
-		T* const location = m_localMem + parIndex;
-#if defined(ASSERTIONSENABLED)
-		assert(reinterpret_cast<PTR_INT_TYPE>(location) % alignof(T) == 0);
-		assert(g_guard == *reinterpret_cast<const char*>(location));
-#endif
-		return new(location) T(std::forward<Args...>(parArgs)...);
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S>
-	T* AutomemRawBase_stack<T, S>::AllocMemory() {
-#if defined(ASSERTIONSENABLED)
-		assert(reinterpret_cast<PTR_INT_TYPE>(m_localMem) % alignof(T) == 0); //Make sure alignment is correct
-		std::fill(
-			reinterpret_cast<char*>(&m_localMem[0]),
-			reinterpret_cast<char*>(&m_localMem[0]) + sizeof(m_localMem),
-			g_guard
-		);
-#endif
-		return reinterpret_cast<T*>(&m_localMem[0]);
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename T, size_t S>
-	template <typename... Args>
-	T* AutomemRawBase_stack<T, S>::GetNewT (size_t parIndex, Args&&... parArgs) {
-		assert(parIndex < S);
-		auto* const location = &m_localMem[parIndex];
-#if defined(ASSERTIONSENABLED)
-		assert(reinterpret_cast<PTR_INT_TYPE>(location) % alignof(T) == 0);
-		assert(g_guard == *reinterpret_cast<const char*>(location));
-#endif
-		return new(location) T(std::forward<Args...>(parArgs)...);
-	}
-} //namespace dinhelp
diff --git a/include/helpers/implem/IteratorOnPtr.hpp b/include/helpers/implem/IteratorOnPtr.hpp
deleted file mode 100644
index 4845592..0000000
--- a/include/helpers/implem/IteratorOnPtr.hpp
+++ /dev/null
@@ -1,314 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id1B822B1775424D879AA6AD1739B5BC91
-#define id1B822B1775424D879AA6AD1739B5BC91
-
-#include <iterator>
-#include <cstdint>
-#include <type_traits>
-#include <cassert>
-
-namespace dinhelp {
-	namespace implem_iop {
-		template <typename P, typename T, int32_t I>
-		class IteratorOnPtr_base : public std::iterator<std::random_access_iterator_tag, T> {
-			typedef std::iterator<std::random_access_iterator_tag, T> parent_type;
-		public:
-			//Typedefs to be STL-compliant
-			typedef typename parent_type::iterator_category iterator_category;
-			typedef typename parent_type::value_type value_type;
-			typedef typename parent_type::difference_type difference_type;
-			typedef typename parent_type::pointer pointer;
-			typedef typename std::remove_reference<T>::type& reference;
-
-			IteratorOnPtr_base ( P parPointer, difference_type parSize );
-			IteratorOnPtr_base ( const IteratorOnPtr_base& parOther );
-			template <typename P1, typename T1>
-			explicit IteratorOnPtr_base ( const IteratorOnPtr_base<P1, T1, I>& parOther );
-			~IteratorOnPtr_base ( void );
-
-			difference_type operator- ( const IteratorOnPtr_base& parOther ) const;
-
-			bool operator== ( const IteratorOnPtr_base& parOther ) const { return m_pointer == parOther.m_pointer; }
-			bool operator!= ( const IteratorOnPtr_base& parOther ) const { return not operator==(parOther); }
-			bool operator< ( const IteratorOnPtr_base& parOther ) const { return m_pointer < parOther.m_pointer; }
-			bool operator>= ( const IteratorOnPtr_base& parOther ) const { return not operator<(parOther); }
-			bool operator> ( const IteratorOnPtr_base& parOther ) const { return parOther < *this; }
-			bool operator<= ( const IteratorOnPtr_base& parOther ) const { return not operator>(parOther); }
-
-			P GetPointer ( void ) { return m_pointer; }
-			const P GetPointer ( void ) const { return m_pointer; }
-#if !defined(NDEBUG)
-			difference_type GetSize ( void ) const { return GetSize(0); }
-#endif
-
-		protected:
-			enum {
-				STEP = (I < 0 ? -I : I)
-			};
-
-#if !defined(NDEBUG)
-			difference_type GetSize ( difference_type parAdvance ) const;
-			bool CanAdvance ( difference_type parAdvance ) const;
-			void AlterSize ( difference_type parAdvance );
-#endif
-			void MoveIterator ( difference_type parAdvance );
-
-			P m_pointer;
-
-		private:
-#if !defined(NDEBUG)
-			difference_type m_size;
-#endif
-		};
-	} //namespace implem_iop
-
-	template <typename P, typename T, bool R>
-	class IteratorOnPtr : public implem_iop::IteratorOnPtr_base<P, T, (R ? -1 : 1)> {
-		typedef implem_iop::IteratorOnPtr_base<P, T, (R ? -1 : 1)> parent_type;
-		enum {
-			STEP = parent_type::STEP
-		};
-	public:
-		typedef typename parent_type::iterator_category iterator_category;
-		typedef typename parent_type::value_type value_type;
-		typedef typename parent_type::difference_type difference_type;
-		typedef typename parent_type::pointer pointer;
-		typedef typename parent_type::reference reference;
-
-		IteratorOnPtr ( void );
-		IteratorOnPtr ( P parPointer, difference_type parSize );
-		IteratorOnPtr ( const IteratorOnPtr& parOther ) : parent_type(parOther) { return; }
-		template <typename P1, typename T1>
-		IteratorOnPtr ( const IteratorOnPtr<P1, T1, R>& parOther ) : parent_type(parOther) {}
-		~IteratorOnPtr ( void );
-
-		IteratorOnPtr& operator++ ( void ); //pre
-		IteratorOnPtr operator++ ( int ); //post
-		IteratorOnPtr& operator-- ( void );
-		IteratorOnPtr operator-- ( int );
-		reference operator* ( void );
-		pointer operator-> ( void );
-
-		using parent_type::operator-;
-		IteratorOnPtr operator+ ( difference_type parOther ) const;
-		IteratorOnPtr operator- ( difference_type parOther ) const;
-		IteratorOnPtr& operator+= ( difference_type parOther );
-		IteratorOnPtr& operator-= ( difference_type parOther );
-	protected:
-	private:
-	};
-
-	namespace implem_iop {
-		///---------------------------------------------------------------------
-		///---------------------------------------------------------------------
-		template <typename P, typename T, int32_t I>
-#if !defined(NDEBUG)
-		IteratorOnPtr_base<P, T, I>::IteratorOnPtr_base (P parPointer, difference_type parSize) :
-			m_pointer(parPointer),
-			m_size(parSize)
-#else
-		IteratorOnPtr_base<P, T, I>::IteratorOnPtr_base (P parPointer, difference_type) :
-			m_pointer(parPointer)
-#endif
-		{
-			static_assert(I != 0, "Step must be non-zero");
-		}
-
-		///---------------------------------------------------------------------
-		///---------------------------------------------------------------------
-		template <typename P, typename T, int32_t I>
-		template <typename P1, typename T1>
-		IteratorOnPtr_base<P, T, I>::IteratorOnPtr_base (const IteratorOnPtr_base<P1, T1, I>& parOther) {
-			m_pointer = parOther.GetPointer();
-#if !defined(NDEBUG)
-			m_size = parOther.GetSize();
-#endif
-		}
-
-		///---------------------------------------------------------------------
-		///---------------------------------------------------------------------
-		template <typename P, typename T, int32_t I>
-		IteratorOnPtr_base<P, T, I>::IteratorOnPtr_base (const IteratorOnPtr_base& parOther) {
-			m_pointer = parOther.m_pointer;
-#if !defined(NDEBUG)
-			m_size = parOther.m_size;
-#endif
-		}
-
-		///---------------------------------------------------------------------
-		///---------------------------------------------------------------------
-		template <typename P, typename T, int32_t I>
-		IteratorOnPtr_base<P, T, I>::~IteratorOnPtr_base() {
-		}
-
-		///---------------------------------------------------------------------
-		///---------------------------------------------------------------------
-		template <typename P, typename T, int32_t I>
-		typename IteratorOnPtr_base<P, T, I>::difference_type IteratorOnPtr_base<P, T, I>::operator- (const IteratorOnPtr_base& parOther) const {
-			if (I > 0)
-				return m_pointer - parOther.m_pointer;
-			else
-				return parOther.m_pointer - m_pointer;
-		}
-
-#if !defined(NDEBUG)
-		///---------------------------------------------------------------------
-		///---------------------------------------------------------------------
-		template <typename P, typename T, int32_t I>
-		typename IteratorOnPtr_base<P, T, I>::difference_type IteratorOnPtr_base<P, T, I>::GetSize (difference_type parAdvance) const {
-			return m_size - STEP * parAdvance;
-		}
-
-		///---------------------------------------------------------------------
-		///---------------------------------------------------------------------
-		template <typename P, typename T, int32_t I>
-		bool IteratorOnPtr_base<P, T, I>::CanAdvance (difference_type parAdvance) const {
-			return (m_size >= STEP * parAdvance);
-		}
-
-		///---------------------------------------------------------------------
-		///---------------------------------------------------------------------
-		template <typename P, typename T, int32_t I>
-		void IteratorOnPtr_base<P, T, I>::AlterSize (difference_type parAdvance) {
-			m_size = GetSize(parAdvance);
-		}
-#endif
-
-		///---------------------------------------------------------------------
-		///---------------------------------------------------------------------
-		template <typename P, typename T, int32_t I>
-		void IteratorOnPtr_base<P, T, I>::MoveIterator (difference_type parAdvance) {
-#if !defined(NDEBUG)
-			assert(CanAdvance(parAdvance));
-			AlterSize(parAdvance);
-#endif
-			m_pointer += I * parAdvance;
-		}
-	} //namespace implem_iop
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	IteratorOnPtr<P, T, R>::IteratorOnPtr() :
-		parent_type(NULL, 0)
-	{
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	IteratorOnPtr<P, T, R>::IteratorOnPtr (P parPointer, difference_type parSize) :
-		parent_type(parPointer, parSize)
-	{
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	IteratorOnPtr<P, T, R>::~IteratorOnPtr() {
-	}
-
-	///-------------------------------------------------------------------------
-	///Pre-increment.
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	IteratorOnPtr<P, T, R>& IteratorOnPtr<P, T, R>::operator++() {
-		this->MoveIterator(1);
-		return *this;
-	}
-
-	///-------------------------------------------------------------------------
-	///Post-increment.
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	IteratorOnPtr<P, T, R> IteratorOnPtr<P, T, R>::operator++ (int) {
-		IteratorOnPtr<P, T, R> retVal(*this);
-		this->MoveIterator(1);
-		return retVal;
-	}
-
-	///-------------------------------------------------------------------------
-	///Pre-decrement.
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	IteratorOnPtr<P, T, R>& IteratorOnPtr<P, T, R>::operator--() {
-		this->MoveIterator(-1);
-		return *this;
-	}
-
-	///-------------------------------------------------------------------------
-	///Post-decrement.
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	IteratorOnPtr<P, T, R> IteratorOnPtr<P, T, R>::operator-- (int) {
-		IteratorOnPtr<P, T, R> retVal(*this);
-		this->MoveIterator(-1);
-		return retVal;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	typename IteratorOnPtr<P, T, R>::reference IteratorOnPtr<P, T, R>::operator*() {
-		return *(this->m_pointer);
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	typename IteratorOnPtr<P, T, R>::pointer IteratorOnPtr<P, T, R>::operator->() {
-		return this->m_pointer;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	IteratorOnPtr<P, T, R> IteratorOnPtr<P, T, R>::operator+ (difference_type parOther) const {
-		IteratorOnPtr<P, T, R> retVal(*this);
-		retVal += parOther;
-		return retVal;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	IteratorOnPtr<P, T, R> IteratorOnPtr<P, T, R>::operator- (difference_type parOther) const {
-		IteratorOnPtr<P, T, R> retVal(*this);
-		retVal -= parOther;
-		return retVal;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	IteratorOnPtr<P, T, R>& IteratorOnPtr<P, T, R>::operator+= (difference_type parOther) {
-		this->MoveIterator(parOther);
-		return *this;
-	}
-
-	///-------------------------------------------------------------------------
-	///-------------------------------------------------------------------------
-	template <typename P, typename T, bool R>
-	IteratorOnPtr<P, T, R>& IteratorOnPtr<P, T, R>::operator-= (difference_type parOther) {
-		this->MoveIterator(-parOther);
-		return *this;
-	}
-} //namespace dinhelp
-
-#endif
diff --git a/include/helpers/infix_iterator.hpp b/include/helpers/infix_iterator.hpp
deleted file mode 100644
index ca65e34..0000000
--- a/include/helpers/infix_iterator.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// see http://stackoverflow.com/questions/3496982/printing-lists-with-commas-c/3497021#3497021
-// infix_iterator.h
-//
-// Lifted from Jerry Coffin's 's prefix_ostream_iterator
-#if !defined(INFIX_ITERATOR_H_)
-#define  INFIX_ITERATOR_H_
-#include <ostream>
-#include <iterator>
-template <class T,
-          class charT=char,
-          class traits=std::char_traits<charT> >
-class infix_ostream_iterator :
-    public std::iterator<std::output_iterator_tag,void,void,void,void>
-{
-    std::basic_ostream<charT,traits> *os;
-    charT const* delimiter;
-    bool first_elem;
-public:
-    typedef charT char_type;
-    typedef traits traits_type;
-    typedef std::basic_ostream<charT,traits> ostream_type;
-    infix_ostream_iterator(ostream_type& s)
-        : os(&s),delimiter(0), first_elem(true)
-    {}
-    infix_ostream_iterator(ostream_type& s, charT const *d)
-        : os(&s),delimiter(d), first_elem(true)
-    {}
-    infix_ostream_iterator<T,charT,traits>& operator=(T const &item)
-    {
-        // Here's the only real change from ostream_iterator:
-        // Normally, the '*os << item;' would come before the 'if'.
-        if (!first_elem && delimiter != 0)
-            *os << delimiter;
-        *os << item;
-        first_elem = false;
-        return *this;
-    }
-    infix_ostream_iterator<T,charT,traits> &operator*() {
-        return *this;
-    }
-    infix_ostream_iterator<T,charT,traits> &operator++() {
-        return *this;
-    }
-    infix_ostream_iterator<T,charT,traits> &operator++(int) {
-        return *this;
-    }
-};
-#endif
diff --git a/include/helpers/lengthof.h b/include/helpers/lengthof.h
deleted file mode 100644
index 45e78c3..0000000
--- a/include/helpers/lengthof.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id19B690A53A9546D5BD95D89FFF388283
-#define id19B690A53A9546D5BD95D89FFF388283
-
-#if defined(__cplusplus)
-#	include <cstddef>
-#else
-#	include <stddef.h>
-#endif
-
-#if defined(lengthof)
-#	undef lengthof
-#endif
-//http://stackoverflow.com/questions/4415524/common-array-length-macro-for-c#4415646
-#if defined(__cplusplus)
-#	define lengthof(x) ((sizeof(x)/sizeof(0[x])) / ((std::size_t)(!(sizeof(x) % sizeof(0[x])))))
-#else
-#	define lengthof(x) ((sizeof(x)/sizeof(0[x])) / ((size_t)(!(sizeof(x) % sizeof(0[x])))))
-#endif
-
-#endif
diff --git a/include/helpers/lexical_cast.hpp b/include/helpers/lexical_cast.hpp
deleted file mode 100644
index f5bced8..0000000
--- a/include/helpers/lexical_cast.hpp
+++ /dev/null
@@ -1,304 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id942A6B5AB2AF443C82D4321775BFC9E8
-#define id942A6B5AB2AF443C82D4321775BFC9E8
-
-#include "compatibility.h"
-#include "helpers/sequence_bt.hpp"
-#include "helpers/MaxSizedArray.hpp"
-#include "sprout/math/log10.hpp"
-#include "sprout/math/log2.hpp"
-#include "sprout/math/pow.hpp"
-#include <type_traits>
-#include <utility>
-#include <limits>
-#include <cstdint>
-#include <algorithm>
-#include <string>
-#include <ciso646>
-#include <climits>
-#include <boost/range/adaptor/reversed.hpp>
-#include <cstddef>
-
-namespace dinhelp {
-	namespace customize {
-		template<typename T>
-		struct index_array_to_string;
-
-		template<typename C, typename T>
-		struct char_to_int;
-	} //namespace customize
-
-	namespace implem {
-		template <typename T>
-		typename std::make_unsigned<T>::type abs ( T parValue ) a_pure;
-
-		template <typename T> int count_leading_zeroes ( typename std::enable_if<std::numeric_limits<T>::is_signed, T>::type parValue ) a_always_inline;
-		template <typename T> int count_leading_zeroes ( typename std::enable_if<not std::numeric_limits<T>::is_signed, T>::type parValue ) a_always_inline;
-		int count_leading_zeroes_overload ( unsigned char parValue ) a_always_inline;
-		int count_leading_zeroes_overload ( unsigned short int parValue ) a_always_inline;
-		int count_leading_zeroes_overload ( unsigned int parValue ) a_always_inline;
-		int count_leading_zeroes_overload ( unsigned long parValue ) a_always_inline;
-		int count_leading_zeroes_overload ( unsigned long long parValue ) a_always_inline;
-
-		template <std::size_t Base, std::size_t Val>
-		struct power {
-			enum { value = Base * power<Base, Val - 1>::value };
-		};
-		template <std::size_t Base>
-		struct power<Base, 0> {
-			enum { value = 1 };
-		};
-
-		template <typename T, bool=std::numeric_limits<T>::is_signed>
-		struct is_negative;
-		template <typename T>
-		struct is_negative<T, true> {
-			static int check (T parValue) { return (parValue < 0 ? 1 : 0); }
-		};
-		template <typename T>
-		struct is_negative<T, false> {
-			static constexpr int check (T) { return 0; }
-		};
-
-		template <template <typename> class Tag, typename T, typename F>
-		inline auto int_to_string (const F parFrom) -> MaxSizedArray<uint8_t, Tag<F>::count_digits_bt(std::numeric_limits<typename std::make_unsigned<F>::type>::max())> {
-			using ArrayRetType = MaxSizedArray<uint8_t, Tag<F>::count_digits_bt(std::numeric_limits<typename std::make_unsigned<F>::type>::max())>;
-
-			ArrayRetType retval;
-			F div = 1;
-			constexpr const std::size_t charset_offs = (Tag<F>::lower_case ? Tag<F>::base : 0);
-			const auto sign_length = (is_negative<F>::check(parFrom) and Tag<F>::sign_allowed ? 1 : 0);
-			for (std::size_t z = 0; z < Tag<F>::count_digits(parFrom) - sign_length; ++z) {
-				retval.push_back(static_cast<uint8_t>(((Tag<F>::make_unsigned(parFrom) / div) % Tag<F>::base) + charset_offs));
-				div *= Tag<F>::base;
-			}
-			std::reverse(retval.begin(), retval.end());
-			return retval;
-		};
-
-		template <template <typename> class Tag, typename T, typename F>
-		inline T string_to_int (const F& parFrom) {
-			T retval(0);
-			T mul(1);
-			for (auto chara : boost::adaptors::reverse(parFrom)) {
-				retval += dinhelp::customize::char_to_int<decltype(chara), T>::make(chara) * mul;
-				mul *= Tag<T>::base;
-			}
-			return retval * dinhelp::customize::char_to_int<typename F::value_type, T>::sgn(parFrom);
-		};
-
-		template <typename T, bool LowerCase>
-		struct hex {
-			enum {
-				base = 16,
-				sign_allowed = 0,
-				lower_case = (LowerCase ? 1 : 0)
-			};
-
-			static std::size_t count_digits ( T parValue ) a_pure;
-			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
-			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
-				return (parNum == 0 ? 0 : static_cast<std::size_t>(sprout::log10(static_cast<double>(parNum)) / sprout::log10(static_cast<double>(base)))) + 1;
-			}
-		};
-	} //namespace implem
-
-	namespace tags {
-		template <typename T>
-		struct dec {
-			enum {
-				base = 10,
-				sign_allowed = 1,
-				lower_case = 0
-			};
-
-			template <std::size_t... Powers, std::size_t... Digits>
-			static std::size_t count_digits_implem (T parValue, dinhelp::bt::index_seq<Powers...>, dinhelp::bt::index_seq<Digits...>) a_pure;
-
-			static std::size_t count_digits (T parValue) a_pure;
-
-			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
-			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
-				return (parNum == 0 ? 0 : static_cast<std::size_t>(sprout::log10(static_cast<double>(parNum)))) + 1 + (std::numeric_limits<T>::is_signed ? 1 : 0);
-			}
-		};
-
-		template <typename T>
-		using hex = dinhelp::implem::hex<T, false>;
-		template <typename T>
-		using hexl = dinhelp::implem::hex<T, true>;
-
-		template <typename T>
-		struct bin {
-			enum {
-				base = 2,
-				sign_allowed = 0,
-				lower_case = 0
-			};
-
-			static std::size_t count_digits ( T parValue ) a_pure;
-			static typename std::make_unsigned<T>::type make_unsigned ( T parValue ) a_pure;
-			static constexpr std::size_t count_digits_bt (std::size_t parNum) {
-				return (parNum == 0 ? 0 : static_cast<std::size_t>(sprout::log2(static_cast<double>(parNum)))) + 1;
-			}
-		};
-
-		//See: http://stackoverflow.com/questions/9721042/count-number-of-digits-which-method-is-most-efficient#9721113
-		template <typename T>
-		template <std::size_t... Powers, std::size_t... Digits>
-		std::size_t dec<T>::count_digits_implem (T parValue, dinhelp::bt::index_seq<Powers...>, dinhelp::bt::index_seq<Digits...>) {
-			typedef typename std::make_unsigned<T>::type UT;
-			static constexpr UT powers[] = { 0, static_cast<UT>(dinhelp::implem::power<10, Powers + 1>::value)... };
-			static constexpr std::size_t maxdigits[] = { count_digits_bt(static_cast<std::size_t>(sprout::pow(2.0, Digits))) - (std::numeric_limits<T>::is_signed ? 1 : 0)... };
-			const auto bits = sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<T>(dinhelp::implem::abs(parValue));
-			static_assert(std::is_same<UT, decltype(dinhelp::implem::abs(parValue))>::value, "Unexpected type");
-			return (dinhelp::implem::abs(parValue) < powers[maxdigits[bits] - 1] ? maxdigits[bits] - 1 : maxdigits[bits]) + dinhelp::implem::is_negative<T>::check(parValue);
-		}
-
-		template <typename T>
-		std::size_t dec<T>::count_digits (T parValue) {
-			return count_digits_implem(
-				parValue,
-				dinhelp::bt::index_range<0, count_digits_bt(std::numeric_limits<T>::max()) - (std::numeric_limits<T>::is_signed ? 1 : 0) - 1>(),
-				dinhelp::bt::index_range<0, CHAR_BIT * sizeof(T) + 1>()
-			);
-		}
-
-		template <typename T>
-		typename std::make_unsigned<T>::type dec<T>::make_unsigned (T parValue) {
-			return dinhelp::implem::abs(parValue);
-		}
-
-		template <typename T>
-		std::size_t bin<T>::count_digits (T parValue) {
-			return std::max<std::size_t>((sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<typename std::make_unsigned<T>::type>(make_unsigned(parValue))), 1);
-		}
-
-		template <typename T>
-		typename std::make_unsigned<T>::type bin<T>::make_unsigned (T parValue) {
-			return static_cast<typename std::make_unsigned<T>::type>(parValue);
-		}
-	} //namespace tags
-
-	namespace implem {
-		template <template <typename> class Tag>
-		struct lexical_cast {
-			template <typename T, typename F>
-			static T convert ( const typename std::enable_if<std::is_integral<F>::value, F>::type& parFrom ) {
-				const auto indices = int_to_string<Tag, T, F>(parFrom);
-				return dinhelp::customize::index_array_to_string<T>::make(indices, is_negative<F>::check(parFrom) bitand Tag<F>::sign_allowed);
-			}
-
-			template <typename T, typename F>
-			static typename std::enable_if<std::is_integral<T>::value, T>::type convert ( const F& parFrom ) {
-				return string_to_int<Tag, T, F>(parFrom);
-			}
-		};
-
-		template <typename T>
-		inline int count_leading_zeroes (typename std::enable_if<std::numeric_limits<T>::is_signed, T>::type parValue) {
-			return count_leading_zeroes<decltype(dinhelp::implem::abs(parValue))>(dinhelp::implem::abs(parValue));
-		}
-
-		template <typename T>
-		inline int count_leading_zeroes (typename std::enable_if<not std::numeric_limits<T>::is_signed, T>::type parValue) {
-			return count_leading_zeroes_overload(parValue) + sizeof(T) * CHAR_BIT;
-		}
-
-		inline int count_leading_zeroes_overload (unsigned char parValue) {
-			return __builtin_clz(parValue) - sizeof(unsigned int) * CHAR_BIT;
-		}
-		inline int count_leading_zeroes_overload (unsigned short int parValue) {
-			return __builtin_clz(parValue) - sizeof(unsigned int) * CHAR_BIT;
-		}
-		inline int count_leading_zeroes_overload (unsigned int parValue) {
-			return __builtin_clz(parValue) - sizeof(unsigned int) * CHAR_BIT;
-		}
-		inline int count_leading_zeroes_overload (unsigned long parValue) {
-			return __builtin_clzl(parValue) - sizeof(unsigned long) * CHAR_BIT;
-		}
-		inline int count_leading_zeroes_overload (unsigned long long parValue) {
-			return __builtin_clzll(parValue) - sizeof(unsigned long long) * CHAR_BIT;
-		}
-
-		//See: http://stackoverflow.com/questions/16101062/why-does-stdabs-return-signed-types
-		template <typename T>
-		typename std::make_unsigned<T>::type abs (T parValue) {
-			//We need to cast before negating x to avoid the overflow.
-			return (parValue < 0 ? -static_cast<typename std::make_unsigned<T>::type>(parValue) : parValue);
-		}
-
-		template <typename T, bool LowerCase>
-		std::size_t hex<T, LowerCase>::count_digits (T parValue) {
-			return std::max<std::size_t>(((sizeof(parValue) * CHAR_BIT - dinhelp::implem::count_leading_zeroes<typename std::make_unsigned<T>::type>(make_unsigned(parValue))) + (CHAR_BIT / 2 - 1)) / (CHAR_BIT / 2), 1);
-		}
-
-		template <typename T, bool LowerCase>
-		typename std::make_unsigned<T>::type hex<T, LowerCase>::make_unsigned (T parValue) {
-			return static_cast<typename std::make_unsigned<T>::type>(parValue);
-		}
-	} //namespace implem
-
-	template <typename T, template <typename> class Tag=tags::dec, typename F=void>
-	inline T lexical_cast (const F& parFrom) {
-		return dinhelp::implem::lexical_cast<Tag>::template convert<T, F>(parFrom);
-	}
-
-	namespace customize {
-		template<>
-		struct index_array_to_string<std::string> {
-			template<std::size_t N>
-			static std::string make (const MaxSizedArray<uint8_t, N> &parIndices, int parNegative) {
-				static const char symbols[] = {'0', '1', '2', '3', '4', '5',
-											   '6', '7', '8', '9', 'A', 'B',
-											   'C', 'D', 'E', 'F',
-											   '0', '1', '2', '3', '4', '5',
-											   '6', '7', '8', '9', 'a', 'b',
-											   'c', 'd', 'e', 'f'
-				};
-				std::string retval(parIndices.size() + parNegative, '-');
-				for (auto z = parNegative; z < static_cast<int>(parIndices.size()) + parNegative; ++z) {
-					retval[z] = symbols[parIndices[z - parNegative]];
-				}
-				return retval;
-			}
-		};
-
-		template<typename T>
-		struct char_to_int<char, T> {
-			static T make (char parChar) {
-				if (parChar >= '0' and parChar <= '9')
-					return parChar - '0';
-				else if (parChar >= 'a' and parChar <= 'f')
-					return 10 + parChar - 'a';
-				else if (parChar >= 'A' and parChar <= 'F')
-					return 10 + parChar - 'A';
-				else if (parChar == '-')
-					return 0;
-				return 0;
-			}
-
-			template <typename Container>
-			static T sgn (const Container& parString) {
-				return static_cast<T>(std::numeric_limits<T>::is_signed and parString.begin() != parString.end() and *parString.begin() == '-' ? -1 : 1);
-			}
-		};
-	} //namespace customize
-} //namespace dinhelp
-#endif
diff --git a/include/helpers/sequence_bt.hpp b/include/helpers/sequence_bt.hpp
deleted file mode 100644
index d514c5e..0000000
--- a/include/helpers/sequence_bt.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id4FAEF395B9ED47CB9D6B50B54C9A289A
-#define id4FAEF395B9ED47CB9D6B50B54C9A289A
-
-#include <cstddef>
-
-namespace dinhelp {
-	namespace bt {
-		template <typename T, T... I>
-		struct number_seq {
-		};
-
-		template <std::size_t... I>
-		using index_seq = number_seq<std::size_t, I...>;
-
-		namespace implem {
-			template <typename T, T MIN, T MAX, T... I>
-			struct range_builder;
-
-			template <typename T, T MIN, T... I>
-			struct range_builder<T, MIN, MIN, I...> {
-				typedef number_seq<T, I...> type;
-			};
-
-			template <typename T, T MIN, T N, T... I>
-			struct range_builder : public range_builder<T, MIN, N - 1, N - 1, I...> {
-			};
-		} //namespace implem
-
-		template <typename T, T MIN, T MAX>
-		using number_range = typename implem::range_builder<T, MIN, MAX>::type;
-
-		template <std::size_t MIN, std::size_t MAX>
-		using index_range = number_range<std::size_t, MIN, MAX>;
-	} //namespace bt
-} //namespace dinhelp
-
-#endif
diff --git a/include/helpers/string_bt.hpp b/include/helpers/string_bt.hpp
deleted file mode 100644
index 820ad81..0000000
--- a/include/helpers/string_bt.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id170B0E6C34D14EBA9B92A35977BDBFB3
-#define id170B0E6C34D14EBA9B92A35977BDBFB3
-
-#include "sequence_bt.hpp"
-#include <cstddef>
-#include <iostream>
-#include <stdexcept>
-
-namespace dinhelp {
-	namespace bt {
-		template <std::size_t S>
-		class string;
-
-		template <std::size_t S>
-		std::ostream& operator<< ( std::ostream& parStream, const string<S>& parString );
-
-		template <std::size_t S>
-		class string {
-		public:
-			friend std::ostream& operator<< <>( std::ostream& parStream, const string<S>& parString );
-			constexpr string ( const char* parString );
-
-			constexpr std::size_t size ( void ) const { return S - 1; }
-			template <std::size_t S2>
-			constexpr string<S + S2 - 1> operator+ ( const string<S2>& parOther ) const;
-			constexpr char operator[] ( std::size_t parIndex ) const;
-
-			template <typename... Args>
-			constexpr string ( Args... );
-
-			constexpr const char (&data_arr() const)[S] { return m_data; }
-			constexpr const char* data() const { return m_data; }
-
-		private:
-			template <std::size_t... I>
-			constexpr string ( const index_seq<I...>&, const char* parString );
-
-			const char m_data[S];
-		};
-
-		namespace implem {
-			template <std::size_t S, std::size_t S2, std::size_t... I>
-			constexpr string<S + S2 - 1> concat ( const index_seq<I...>&, const string<S>& parLeft, const string<S2>& parRight ) {
-				return string<S + S2 - 1>(
-					(I < S - 1 ? parLeft[I] : (I < S + S2 - 2 ? parRight[I - (S - 1)] : '\0'))...
-				);
-			}
-
-		} //namespace implem
-
-		template <std::size_t S>
-		template <std::size_t... I>
-		constexpr string<S>::string (const index_seq<I...>&, const char* parString) :
-			m_data{parString[I]...}
-		{
-		}
-
-		template <std::size_t S>
-		inline constexpr string<S>::string (const char* parString) :
-			string(index_range<0, S>(), parString)
-		{
-		}
-
-		template <std::size_t S>
-		template <typename... Args>
-		inline constexpr string<S>::string (Args... parArgs) :
-			m_data{parArgs...}
-		{
-		}
-
-		template <std::size_t S>
-		template <std::size_t S2>
-		constexpr inline string<S + S2 - 1> string<S>::operator+ (const string<S2>& parOther) const {
-			return implem::concat(index_range<0, S + S2 - 1>(), string<S>(m_data), parOther);
-		}
-
-		template <std::size_t S>
-		inline std::ostream& operator<< (std::ostream& parStream, const string<S>& parString) {
-			parStream << parString.m_data;
-			return parStream;
-		}
-
-		template <std::size_t S>
-		constexpr char string<S>::operator[] (std::size_t parIndex) const {
-			return (parIndex < S ? m_data[parIndex] : throw std::out_of_range(""));
-		}
-
-		template <std::size_t S>
-		constexpr string<S> make_string (const char (&parData)[S]) {
-			return string<S>(parData);
-		}
-	} //namespace bt
-} //namespace dinhelp
-
-#endif
diff --git a/include/helpers/stringize.h b/include/helpers/stringize.h
deleted file mode 100644
index b007909..0000000
--- a/include/helpers/stringize.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id8B9FF1807C05459DAE8CD05312147416
-#define id8B9FF1807C05459DAE8CD05312147416
-
-#define STRINGIZE_IMPL(s) #s
-#define STRINGIZE(s) STRINGIZE_IMPL(s)
-
-#endif

From aeb8dee561a27af9dd89cefe1b04e7a2ac3e305a Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 14 Jul 2016 15:36:29 +0100
Subject: [PATCH 158/170] Fix detection of strings starting by ../

---
 cmake/Modules/shared_git_project.cmake | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cmake/Modules/shared_git_project.cmake b/cmake/Modules/shared_git_project.cmake
index 6924aaa..af71eca 100644
--- a/cmake/Modules/shared_git_project.cmake
+++ b/cmake/Modules/shared_git_project.cmake
@@ -58,9 +58,8 @@ function (add_shared_git_project SUBMODULE_PATH)
 	#Check if submodule is a subdirectory of the current source dir
 	file(RELATIVE_PATH reported_submodule_rel_path "${CMAKE_CURRENT_SOURCE_DIR}" "${reported_submodule_dir}")
 	string(LENGTH "${reported_submodule_rel_path}" rel_path_len)
-	message(STATUS "\"${reported_submodule_rel_path}\" - ${rel_path_len}")
 	if (${rel_path_len} GREATER 2)
-		string(SUBSTRING reported_submodule_rel_path 0 3 first_bit)
+		string(SUBSTRING "${reported_submodule_rel_path}" 0 3 first_bit)
 		if ("../" STREQUAL "${first_bit}")
 			set(is_out_of_dirtree ON)
 		else()
@@ -77,10 +76,10 @@ function (add_shared_git_project SUBMODULE_PATH)
 
 	set(shared_project_binary "${CMAKE_CURRENT_BINARY_DIR}/shared_projects/${proj_name_orig}")
 	if (is_out_of_dirtree)
-		#message("Would call add_subdirectory(\"${reported_submodule_dir}\" \"${shared_project_binary}\")")
+		#message(FATAL_ERROR "Would call add_subdirectory(\"${reported_submodule_dir}\" \"${shared_project_binary}\")")
 		add_subdirectory("${reported_submodule_dir}" "${shared_project_binary}")
 	else()
-		#message("Would call add_subdirectory(\"${reported_submodule_rel_path}\")")
+		#message(FATAL_ERROR "Would call add_subdirectory(\"${reported_submodule_rel_path}\")")
 		add_subdirectory("${reported_submodule_rel_path}")
 	endif()
 endfunction()

From a5477c99cf5ee15d1f0d8f38f34412896f521ca1 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 14 Jul 2016 15:52:03 +0100
Subject: [PATCH 159/170] Import duckhandy as a submodule and fix includes.

---
 .gitmodules                                       | 3 +++
 CMakeLists.txt                                    | 2 ++
 README.md                                         | 2 --
 include/backends/db_backend.hpp                   | 2 +-
 include/dindexer-core/split_tags.hpp              | 2 +-
 include/dindexer-machinery/guess_content_type.hpp | 2 +-
 include/dindexer-machinery/mediatypes.hpp         | 2 +-
 include/pq/implem/pq_type_helpers.hpp             | 2 +-
 lib/duckhandy                                     | 1 +
 src/backends/postgresql/delete.cpp                | 2 +-
 src/backends/postgresql/navigate.cpp              | 2 +-
 src/backends/postgresql/navigate.hpp              | 2 +-
 src/backends/redis/backend_redis.cpp              | 4 ++--
 src/backends/redis/delete.cpp                     | 4 ++--
 src/backends/redis/find.cpp                       | 4 ++--
 src/backends/redis/find.hpp                       | 2 +-
 src/backends/redis/record_data_adapt.hpp          | 2 +-
 src/backends/redis/tag.cpp                        | 2 +-
 src/common/commandline.cpp                        | 6 +++---
 src/common/common_info.cpp                        | 2 +-
 src/dindexerConfig.h.in                           | 2 +-
 src/incredis/arg_to_bin_safe.hpp                  | 2 +-
 src/incredis/incredis.cpp                         | 4 ++--
 src/incredis/incredisConfig.h.in                  | 2 +-
 src/incredis/incredis_batch.cpp                   | 2 +-
 src/incredis/incredis_batch.hpp                   | 2 +-
 src/incredis/reply.cpp                            | 2 +-
 src/incredis/scan_iterator.cpp                    | 2 +-
 src/incredis/scan_iterator.hpp                    | 2 +-
 src/incredis/script.hpp                           | 4 ++--
 src/incredis/script_manager.cpp                   | 2 +-
 src/machinery/discinfo.cpp                        | 2 +-
 src/machinery/machineryConfig.h.in                | 2 +-
 src/machinery/machinery_info.cpp                  | 2 +-
 src/machinery/scantask/dirtree.cpp                | 2 +-
 src/machinery/tiger.cpp                           | 2 +-
 src/main/damerau_levenshtein.h                    | 2 +-
 src/main/findactions.c                            | 2 +-
 src/main/main.c                                   | 2 +-
 src/main/timestamp.h.in                           | 2 +-
 src/main/utf8_ops.h                               | 2 +-
 src/navigate/entrypath.cpp                        | 2 +-
 src/navigate/listdircontent.cpp                   | 2 +-
 test/unit/test_diriterator.cpp                    | 2 +-
 test/unit/test_lexical_cast.cpp                   | 4 ++--
 45 files changed, 55 insertions(+), 51 deletions(-)
 create mode 160000 lib/duckhandy

diff --git a/.gitmodules b/.gitmodules
index 1984ae6..f8d2413 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 699f6aa..884cfa1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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}
diff --git a/README.md b/README.md
index 47804e6..0d03187 100644
--- a/README.md
+++ b/README.md
@@ -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.
 
diff --git a/include/backends/db_backend.hpp b/include/backends/db_backend.hpp
index b195f78..0e613c3 100644
--- a/include/backends/db_backend.hpp
+++ b/include/backends/db_backend.hpp
@@ -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>
diff --git a/include/dindexer-core/split_tags.hpp b/include/dindexer-core/split_tags.hpp
index 6af5d6b..95a5f6b 100644
--- a/include/dindexer-core/split_tags.hpp
+++ b/include/dindexer-core/split_tags.hpp
@@ -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;
diff --git a/include/dindexer-machinery/guess_content_type.hpp b/include/dindexer-machinery/guess_content_type.hpp
index fb2da6b..e90fcef 100644
--- a/include/dindexer-machinery/guess_content_type.hpp
+++ b/include/dindexer-machinery/guess_content_type.hpp
@@ -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 {
diff --git a/include/dindexer-machinery/mediatypes.hpp b/include/dindexer-machinery/mediatypes.hpp
index 205179a..a14b078 100644
--- a/include/dindexer-machinery/mediatypes.hpp
+++ b/include/dindexer-machinery/mediatypes.hpp
@@ -18,7 +18,7 @@
 #ifndef id700AFD0F33634ACC88079BB8853A9E13
 #define id700AFD0F33634ACC88079BB8853A9E13
 
-#include "helpers/compatibility.h"
+#include "duckhandy/compatibility.h"
 #include "enum.h"
 #include <string>
 
diff --git a/include/pq/implem/pq_type_helpers.hpp b/include/pq/implem/pq_type_helpers.hpp
index 2ebf303..3be6f73 100644
--- a/include/pq/implem/pq_type_helpers.hpp
+++ b/include/pq/implem/pq_type_helpers.hpp
@@ -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>
diff --git a/lib/duckhandy b/lib/duckhandy
new file mode 160000
index 0000000..0da25f9
--- /dev/null
+++ b/lib/duckhandy
@@ -0,0 +1 @@
+Subproject commit 0da25f9094c08ccb1312e502e020db6a68504d34
diff --git a/src/backends/postgresql/delete.cpp b/src/backends/postgresql/delete.cpp
index ee50a74..1304ce8 100644
--- a/src/backends/postgresql/delete.cpp
+++ b/src/backends/postgresql/delete.cpp
@@ -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>
diff --git a/src/backends/postgresql/navigate.cpp b/src/backends/postgresql/navigate.cpp
index 6886c4c..f2f7057 100644
--- a/src/backends/postgresql/navigate.cpp
+++ b/src/backends/postgresql/navigate.cpp
@@ -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>
diff --git a/src/backends/postgresql/navigate.hpp b/src/backends/postgresql/navigate.hpp
index da74b82..42a1e54 100644
--- a/src/backends/postgresql/navigate.hpp
+++ b/src/backends/postgresql/navigate.hpp
@@ -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>
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index 7f991ba..b936051 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -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"
diff --git a/src/backends/redis/delete.cpp b/src/backends/redis/delete.cpp
index b7711d5..efae498 100644
--- a/src/backends/redis/delete.cpp
+++ b/src/backends/redis/delete.cpp
@@ -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>
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index 746ab95..c922906 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -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>
diff --git a/src/backends/redis/find.hpp b/src/backends/redis/find.hpp
index 0f8bc86..2ff893c 100644
--- a/src/backends/redis/find.hpp
+++ b/src/backends/redis/find.hpp
@@ -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>
diff --git a/src/backends/redis/record_data_adapt.hpp b/src/backends/redis/record_data_adapt.hpp
index c0aaaca..43ff9af 100644
--- a/src/backends/redis/record_data_adapt.hpp
+++ b/src/backends/redis/record_data_adapt.hpp
@@ -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>
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index 1c7cfc0..aa33b6c 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -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>
diff --git a/src/common/commandline.cpp b/src/common/commandline.cpp
index 74e9277..2fd86b6 100644
--- a/src/common/commandline.cpp
+++ b/src/common/commandline.cpp
@@ -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>
diff --git a/src/common/common_info.cpp b/src/common/common_info.cpp
index 8ed97d5..e3d1173 100644
--- a/src/common/common_info.cpp
+++ b/src/common/common_info.cpp
@@ -17,7 +17,7 @@
 
 #include "dindexer-common/common_info.hpp"
 #include "dindexerConfig.h"
-#include "helpers/stringize.h"
+#include "duckhandy/stringize.h"
 
 namespace dinlib {
 	namespace {
diff --git a/src/dindexerConfig.h.in b/src/dindexerConfig.h.in
index 1887d22..dee6e91 100644
--- a/src/dindexerConfig.h.in
+++ b/src/dindexerConfig.h.in
@@ -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@
diff --git a/src/incredis/arg_to_bin_safe.hpp b/src/incredis/arg_to_bin_safe.hpp
index 41ab8d2..f49efd3 100644
--- a/src/incredis/arg_to_bin_safe.hpp
+++ b/src/incredis/arg_to_bin_safe.hpp
@@ -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>
diff --git a/src/incredis/incredis.cpp b/src/incredis/incredis.cpp
index 26999b8..868a5eb 100644
--- a/src/incredis/incredis.cpp
+++ b/src/incredis/incredis.cpp
@@ -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>
 
diff --git a/src/incredis/incredisConfig.h.in b/src/incredis/incredisConfig.h.in
index a0c985f..b574398 100644
--- a/src/incredis/incredisConfig.h.in
+++ b/src/incredis/incredisConfig.h.in
@@ -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
diff --git a/src/incredis/incredis_batch.cpp b/src/incredis/incredis_batch.cpp
index 0f625b9..c9ca335 100644
--- a/src/incredis/incredis_batch.cpp
+++ b/src/incredis/incredis_batch.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "incredis_batch.hpp"
-#include "helpers/lexical_cast.hpp"
+#include "duckhandy/lexical_cast.hpp"
 #include <sstream>
 #include <utility>
 #include <ciso646>
diff --git a/src/incredis/incredis_batch.hpp b/src/incredis/incredis_batch.hpp
index db3f256..bdd8727 100644
--- a/src/incredis/incredis_batch.hpp
+++ b/src/incredis/incredis_batch.hpp
@@ -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>
diff --git a/src/incredis/reply.cpp b/src/incredis/reply.cpp
index 9351f86..3aa6b5e 100644
--- a/src/incredis/reply.cpp
+++ b/src/incredis/reply.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "reply.hpp"
-#include "helpers/lexical_cast.hpp"
+#include "duckhandy/lexical_cast.hpp"
 #include <boost/variant/get.hpp>
 
 namespace redis {
diff --git a/src/incredis/scan_iterator.cpp b/src/incredis/scan_iterator.cpp
index 593e4ed..b53afb4 100644
--- a/src/incredis/scan_iterator.cpp
+++ b/src/incredis/scan_iterator.cpp
@@ -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>
diff --git a/src/incredis/scan_iterator.hpp b/src/incredis/scan_iterator.hpp
index 339abaf..bf2e202 100644
--- a/src/incredis/scan_iterator.hpp
+++ b/src/incredis/scan_iterator.hpp
@@ -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>
diff --git a/src/incredis/script.hpp b/src/incredis/script.hpp
index 088e9e0..d15de62 100644
--- a/src/incredis/script.hpp
+++ b/src/incredis/script.hpp
@@ -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>
diff --git a/src/incredis/script_manager.cpp b/src/incredis/script_manager.cpp
index 73071e6..9a8634c 100644
--- a/src/incredis/script_manager.cpp
+++ b/src/incredis/script_manager.cpp
@@ -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)
diff --git a/src/machinery/discinfo.cpp b/src/machinery/discinfo.cpp
index ee96b6d..65bd2c7 100644
--- a/src/machinery/discinfo.cpp
+++ b/src/machinery/discinfo.cpp
@@ -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>
diff --git a/src/machinery/machineryConfig.h.in b/src/machinery/machineryConfig.h.in
index 9789884..84a46de 100644
--- a/src/machinery/machineryConfig.h.in
+++ b/src/machinery/machineryConfig.h.in
@@ -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
diff --git a/src/machinery/machinery_info.cpp b/src/machinery/machinery_info.cpp
index d5c2089..6d7e17a 100644
--- a/src/machinery/machinery_info.cpp
+++ b/src/machinery/machinery_info.cpp
@@ -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() {
diff --git a/src/machinery/scantask/dirtree.cpp b/src/machinery/scantask/dirtree.cpp
index 4cd3764..875652a 100644
--- a/src/machinery/scantask/dirtree.cpp
+++ b/src/machinery/scantask/dirtree.cpp
@@ -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>
diff --git a/src/machinery/tiger.cpp b/src/machinery/tiger.cpp
index 7d835bc..69b66de 100644
--- a/src/machinery/tiger.cpp
+++ b/src/machinery/tiger.cpp
@@ -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>
diff --git a/src/main/damerau_levenshtein.h b/src/main/damerau_levenshtein.h
index 1bbcf74..1bc898d 100644
--- a/src/main/damerau_levenshtein.h
+++ b/src/main/damerau_levenshtein.h
@@ -18,7 +18,7 @@
 #ifndef id88738025C6B24BDEB604A5AE3C36EE8D
 #define id88738025C6B24BDEB604A5AE3C36EE8D
 
-#include "helpers/compatibility.h"
+#include "duckhandy/compatibility.h"
 #if defined(__cplusplus)
 #	include <cstddef>
 #else
diff --git a/src/main/findactions.c b/src/main/findactions.c
index a2790db..9da2d95 100644
--- a/src/main/findactions.c
+++ b/src/main/findactions.c
@@ -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>
diff --git a/src/main/main.c b/src/main/main.c
index f961f0b..ed972b4 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -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>
diff --git a/src/main/timestamp.h.in b/src/main/timestamp.h.in
index 0929435..f2303df 100644
--- a/src/main/timestamp.h.in
+++ b/src/main/timestamp.h.in
@@ -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@"
diff --git a/src/main/utf8_ops.h b/src/main/utf8_ops.h
index 9d9be43..e981bf9 100644
--- a/src/main/utf8_ops.h
+++ b/src/main/utf8_ops.h
@@ -20,7 +20,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "helpers/compatibility.h"
+#include "duckhandy/compatibility.h"
 
 typedef uint32_t Character;
 
diff --git a/src/navigate/entrypath.cpp b/src/navigate/entrypath.cpp
index 31b5e27..5eafdad 100644
--- a/src/navigate/entrypath.cpp
+++ b/src/navigate/entrypath.cpp
@@ -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>
diff --git a/src/navigate/listdircontent.cpp b/src/navigate/listdircontent.cpp
index d7be0ac..76f8b04 100644
--- a/src/navigate/listdircontent.cpp
+++ b/src/navigate/listdircontent.cpp
@@ -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>
diff --git a/test/unit/test_diriterator.cpp b/test/unit/test_diriterator.cpp
index 1cbcfb6..c57847d 100644
--- a/test/unit/test_diriterator.cpp
+++ b/test/unit/test_diriterator.cpp
@@ -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>
diff --git a/test/unit/test_lexical_cast.cpp b/test/unit/test_lexical_cast.cpp
index 976f438..50a1eba 100644
--- a/test/unit/test_lexical_cast.cpp
+++ b/test/unit/test_lexical_cast.cpp
@@ -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;

From 7a3438def6a905aec99de22d8ba93d68cc88f777 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 14 Jul 2016 16:02:15 +0100
Subject: [PATCH 160/170] Fix namespaces.

Build works, except for incredis which I'm going to move out anyways.
---
 CMakeLists.txt                                |  3 ++-
 include/backends/db_backend.hpp               |  4 +--
 include/pq/implem/pq_type_helpers.hpp         |  2 +-
 .../postgresql/backend_postgresql.cpp         |  4 +--
 .../postgresql/backend_postgresql.hpp         |  4 +--
 .../postgresql/flatinsertin2dlist.hpp         |  4 +--
 .../postgresql/flatinsertin2dlist.inl         |  4 +--
 src/backends/postgresql/navigate.hpp          |  6 ++---
 src/backends/redis/backend_redis.cpp          |  8 +++---
 src/backends/redis/backend_redis.hpp          |  4 +--
 src/backends/redis/delete.cpp                 |  8 +++---
 src/backends/redis/find.cpp                   | 26 +++++++++----------
 src/backends/redis/find.hpp                   |  4 +--
 src/backends/redis/record_data_adapt.hpp      |  4 +--
 src/backends/redis/tag.cpp                    | 10 +++----
 src/incredis/incredis.cpp                     |  4 +--
 src/incredis/incredis_batch.cpp               |  6 ++---
 src/incredis/incredis_batch.hpp               | 10 +++----
 src/incredis/reply.cpp                        |  2 +-
 src/incredis/scan_iterator.cpp                |  8 +++---
 src/incredis/script.hpp                       | 10 +++----
 src/incredis/script_manager.cpp               |  8 +++---
 src/machinery/tiger.cpp                       |  6 ++---
 test/unit/test_lexical_cast.cpp               |  8 +++---
 24 files changed, 79 insertions(+), 78 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 884cfa1..c13a6c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,7 +131,6 @@ add_subdirectory(lib/pbl)
 add_subdirectory(lib/glob2regex)
 add_subdirectory(src/backends)
 add_subdirectory(src/core)
-add_subdirectory(src/incredis)
 add_shared_git_project(lib/duckhandy)
 
 #Actions
@@ -154,6 +153,8 @@ target_link_libraries(${PROJECT_NAME}
 	INTERFACE ${Boost_LIBRARIES}
 	INTERFACE ${bare_name}-pq
 	INTERFACE ${bare_name}-inc
+)
+target_link_libraries(${bare_name}-inc
 	INTERFACE duckhandy
 )
 
diff --git a/include/backends/db_backend.hpp b/include/backends/db_backend.hpp
index 0e613c3..1ef8ce5 100644
--- a/include/backends/db_backend.hpp
+++ b/include/backends/db_backend.hpp
@@ -82,8 +82,8 @@ namespace dindb {
 		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive ) = 0;
 
 		virtual std::vector<GroupIDType> find_all_sets ( void ) = 0;
-		virtual std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details ( const std::vector<GroupIDType>& parSets ) = 0;
-		virtual std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) = 0;
+		virtual std::vector<dhandy::MaxSizedArray<std::string, 4>> find_set_details ( const std::vector<GroupIDType>& parSets ) = 0;
+		virtual std::vector<dhandy::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) = 0;
 		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath ) = 0;
 	};
 } //namespace dindb
diff --git a/include/pq/implem/pq_type_helpers.hpp b/include/pq/implem/pq_type_helpers.hpp
index 3be6f73..dc60a6d 100644
--- a/include/pq/implem/pq_type_helpers.hpp
+++ b/include/pq/implem/pq_type_helpers.hpp
@@ -30,7 +30,7 @@ struct pg_param;
 typedef pg_param PGparam;
 
 namespace pq {
-	namespace bt = dinhelp::bt;
+	namespace bt = dhandy::bt;
 
 	class Connection;
 
diff --git a/src/backends/postgresql/backend_postgresql.cpp b/src/backends/postgresql/backend_postgresql.cpp
index 8c9cc38..7dd3d45 100644
--- a/src/backends/postgresql/backend_postgresql.cpp
+++ b/src/backends/postgresql/backend_postgresql.cpp
@@ -145,7 +145,7 @@ namespace dindb {
 		return dindb::find_all_sets(*m_conn);
 	}
 
-	std::vector<dinhelp::MaxSizedArray<std::string, 4>> BackendPostgreSql::find_set_details (const std::vector<GroupIDType>& parSets) {
+	std::vector<dhandy::MaxSizedArray<std::string, 4>> BackendPostgreSql::find_set_details (const std::vector<GroupIDType>& parSets) {
 		return dindb::find_set_details<
 			dindb::SetDetail_ID,
 			dindb::SetDetail_Desc,
@@ -154,7 +154,7 @@ namespace dindb {
 		>(*m_conn, parSets);
 	}
 
-	std::vector<dinhelp::MaxSizedArray<std::string, 1>> BackendPostgreSql::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
+	std::vector<dhandy::MaxSizedArray<std::string, 1>> BackendPostgreSql::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
 		return dindb::find_file_details<dindb::FileDetail_Path>(*m_conn, parSetID, parLevel, parDir);
 	}
 
diff --git a/src/backends/postgresql/backend_postgresql.hpp b/src/backends/postgresql/backend_postgresql.hpp
index 3b0b872..56d7b13 100644
--- a/src/backends/postgresql/backend_postgresql.hpp
+++ b/src/backends/postgresql/backend_postgresql.hpp
@@ -55,8 +55,8 @@ namespace dindb {
 		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSearch, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive ) override;
 
 		virtual std::vector<GroupIDType> find_all_sets ( void ) override;
-		virtual std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details ( const std::vector<GroupIDType>& parSets ) override;
-		virtual std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) override;
+		virtual std::vector<dhandy::MaxSizedArray<std::string, 4>> find_set_details ( const std::vector<GroupIDType>& parSets ) override;
+		virtual std::vector<dhandy::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) override;
 		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath ) override;
 
 	private:
diff --git a/src/backends/postgresql/flatinsertin2dlist.hpp b/src/backends/postgresql/flatinsertin2dlist.hpp
index 010ba9f..fcabeb4 100644
--- a/src/backends/postgresql/flatinsertin2dlist.hpp
+++ b/src/backends/postgresql/flatinsertin2dlist.hpp
@@ -32,7 +32,7 @@
 #include <stdexcept>
 #include <utility>
 
-namespace dinhelp {
+namespace dhandy {
 	template <typename OuterList, typename InnerList=typename OuterList::value_type, typename InnerVal=typename InnerList::value_type>
 	class FlatInsertIn2DList {
 	public:
@@ -52,7 +52,7 @@ namespace dinhelp {
 		const std::size_t m_inner_count;
 		const std::size_t m_outer_count;
 	};
-} //namespace dinhelp
+} //namespace dhandy
 
 #include "flatinsertin2dlist.inl"
 
diff --git a/src/backends/postgresql/flatinsertin2dlist.inl b/src/backends/postgresql/flatinsertin2dlist.inl
index 4778887..f03d929 100644
--- a/src/backends/postgresql/flatinsertin2dlist.inl
+++ b/src/backends/postgresql/flatinsertin2dlist.inl
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace dinhelp {
+namespace dhandy {
 	template <typename OuterList, typename InnerList, typename InnerVal>
 	FlatInsertIn2DList<OuterList, InnerList, InnerVal>::FlatInsertIn2DList (list_type* parList, std::size_t parInnerCount, std::size_t parOuterCount) :
 		m_list(parList),
@@ -70,4 +70,4 @@ namespace dinhelp {
 			return (m_list->size() - 1) * m_inner_count + m_list[m_list->size() - 1].size();
 		}
 	}
-} //namespace dinhelp
+} //namespace dhandy
diff --git a/src/backends/postgresql/navigate.hpp b/src/backends/postgresql/navigate.hpp
index 42a1e54..1a9a8d9 100644
--- a/src/backends/postgresql/navigate.hpp
+++ b/src/backends/postgresql/navigate.hpp
@@ -37,7 +37,7 @@ namespace pq {
 } //namespace pq
 
 namespace dindb {
-	using dinhelp::MaxSizedArray;
+	using dhandy::MaxSizedArray;
 
 	enum SetDetails {
 		SetDetail_Desc = 0x01,
@@ -109,7 +109,7 @@ namespace dindb {
 	template <SetDetails... D>
 	inline
 	auto find_set_details (pq::Connection& parDB, const std::vector<GroupIDType>& parIDs) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>> {
-		using dinhelp::FlatInsertIn2DList;
+		using dhandy::FlatInsertIn2DList;
 		typedef std::vector<MaxSizedArray<std::string, sizeof...(D)>> ReturnType;
 		typedef void(FlatInsertIn2DList<ReturnType>::*FlatPushBackFunc)(std::string&&);
 
@@ -125,7 +125,7 @@ namespace dindb {
 	template <FileDetails... D>
 	inline
 	auto find_file_details (pq::Connection& parDB, GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) -> std::vector<MaxSizedArray<std::string, sizeof...(D)>> {
-		using dinhelp::FlatInsertIn2DList;
+		using dhandy::FlatInsertIn2DList;
 		typedef std::vector<MaxSizedArray<std::string, sizeof...(D)>> ReturnType;
 		typedef void(FlatInsertIn2DList<ReturnType>::*FlatPushBackFunc)(std::string&&);
 
diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp
index b936051..ec3383a 100644
--- a/src/backends/redis/backend_redis.cpp
+++ b/src/backends/redis/backend_redis.cpp
@@ -104,7 +104,7 @@ namespace dindb {
 	}
 
 	void BackendRedis::connect() {
-		using dinhelp::lexical_cast;
+		using dhandy::lexical_cast;
 
 		m_redis.connect();
 		m_redis.wait_for_connect();
@@ -159,7 +159,7 @@ namespace dindb {
 	}
 
 	void BackendRedis::write_files (const std::vector<mchlib::FileRecordData>& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) {
-		using dinhelp::lexical_cast;
+		using dhandy::lexical_cast;
 		using boost::string_ref;
 
 		const auto data_size = static_cast<int>(parData.size());
@@ -275,11 +275,11 @@ namespace dindb {
 		return dindb::find_all_sets(m_redis);
 	}
 
-	std::vector<dinhelp::MaxSizedArray<std::string, 4>> BackendRedis::find_set_details (const std::vector<GroupIDType>& parSets) {
+	std::vector<dhandy::MaxSizedArray<std::string, 4>> BackendRedis::find_set_details (const std::vector<GroupIDType>& parSets) {
 		return dindb::find_set_details(m_redis, parSets);
 	}
 
-	std::vector<dinhelp::MaxSizedArray<std::string, 1>> BackendRedis::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
+	std::vector<dhandy::MaxSizedArray<std::string, 1>> BackendRedis::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
 		return dindb::find_file_details(m_redis, parSetID, parLevel, parDir);
 	}
 
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index d4fe587..3c93bda 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -53,8 +53,8 @@ namespace dindb {
 		virtual std::vector<LocatedSet> locate_sets_in_db ( const std::string& parSubstr, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive ) override;
 
 		virtual std::vector<GroupIDType> find_all_sets ( void ) override;
-		virtual std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details ( const std::vector<GroupIDType>& parSets ) override;
-		virtual std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) override;
+		virtual std::vector<dhandy::MaxSizedArray<std::string, 4>> find_set_details ( const std::vector<GroupIDType>& parSets ) override;
+		virtual std::vector<dhandy::MaxSizedArray<std::string, 1>> find_file_details ( GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir ) override;
 		virtual std::vector<std::string> find_paths_starting_by ( GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath ) override;
 
 	private:
diff --git a/src/backends/redis/delete.cpp b/src/backends/redis/delete.cpp
index efae498..3631117 100644
--- a/src/backends/redis/delete.cpp
+++ b/src/backends/redis/delete.cpp
@@ -30,7 +30,7 @@
 namespace dindb {
 	namespace {
 		std::pair<bool, std::size_t> confirm_dele (redis::IncRedisBatch& parBatch, const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
-			using dinhelp::lexical_cast;
+			using dhandy::lexical_cast;
 
 			if (parIDs.empty())
 				return std::make_pair(false, parIDs.size());
@@ -60,7 +60,7 @@ namespace dindb {
 		}
 
 		template <typename IT, IT CHUNK, typename F, IT... SVALS>
-		void chunked_run_pvt (redis::Batch& parBatch, const char* parCommand, IT parFrom, IT parCount, F parMakeKey, dinhelp::bt::number_seq<IT, SVALS...>) {
+		void chunked_run_pvt (redis::Batch& parBatch, const char* parCommand, IT parFrom, IT parCount, F parMakeKey, dhandy::bt::number_seq<IT, SVALS...>) {
 			for (IT i = 0; i < parCount / CHUNK; ++i) {
 				parBatch.run(parCommand, parMakeKey(i * CHUNK + parFrom + SVALS)...);
 			}
@@ -72,12 +72,12 @@ namespace dindb {
 
 		template <typename IT, IT CHUNK, typename F>
 		void chunked_run (redis::Batch& parBatch, const char* parCommand, IT parFrom, IT parCount, F parMakeKey) {
-			chunked_run_pvt<IT, CHUNK, F>(parBatch, parCommand, parFrom, parCount, parMakeKey, dinhelp::bt::number_range<IT, 0, CHUNK>());
+			chunked_run_pvt<IT, CHUNK, F>(parBatch, parCommand, parFrom, parCount, parMakeKey, dhandy::bt::number_range<IT, 0, CHUNK>());
 		};
 	} //unnamed namespace
 
 	void delete_group_from_db (redis::IncRedis& parRedis, redis::Script& parDeleTagIfInSet, redis::Script& parDeleHash, const std::vector<GroupIDType>& parIDs, ConfirmDeleCallback parConf) {
-		using dinhelp::lexical_cast;
+		using dhandy::lexical_cast;
 		using IDRange = std::tuple<GroupIDType, FileIDType, FileIDType>;
 
 		auto set_batch = parRedis.make_batch();
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index c922906..b111c0d 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -87,7 +87,7 @@ namespace dindb {
 			using boost::make_tuple;
 			using redis::Reply;
 			using std::vector;
-			using dinhelp::lexical_cast;
+			using dhandy::lexical_cast;
 
 			assert(parReplies.size() == parIDs.size());
 			return boost::copy_range<vector<T>>(
@@ -113,7 +113,7 @@ namespace dindb {
 
 		template <>
 		LocatedItem construct (const std::vector<redis::Reply>& parData, const std::string& parID) {
-			using dinhelp::lexical_cast;
+			using dhandy::lexical_cast;
 
 			//parData is expected to contain: "path", "group_id", "tags"
 
@@ -127,7 +127,7 @@ namespace dindb {
 
 		template <>
 		LocatedSet construct (const std::vector<redis::Reply>& parData, const std::string& parID) {
-			using dinhelp::lexical_cast;
+			using dhandy::lexical_cast;
 
 			//parData is expected to contain: "desc", "item_count", "dir_count"
 
@@ -178,7 +178,7 @@ namespace dindb {
 
 		std::vector<GroupIDType> retval;
 		for (const auto& itm : parRedis.scan(PROGRAM_NAME ":set:*")) {
-			retval.push_back(dinhelp::lexical_cast<GroupIDType>(split_and_trim(itm, ':').back()));
+			retval.push_back(dhandy::lexical_cast<GroupIDType>(split_and_trim(itm, ':').back()));
 		}
 		return retval;
 	}
@@ -229,7 +229,7 @@ namespace dindb {
 	}
 
 	std::vector<LocatedSet> locate_sets_in_db (redis::IncRedis& parRedis, const std::string& parSubstr, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive) {
-		using dinhelp::lexical_cast;
+		using dhandy::lexical_cast;
 
 		auto filter_case_ins = [&parSubstr, &parSets](const boost::tuple<std::vector<redis::Reply>, std::string>& t) {
 			const auto& s = redis::get_string(t.get<0>()[0]);
@@ -260,8 +260,8 @@ namespace dindb {
 		return locate_in_bursts<LocatedSet>(parRedis, PROGRAM_NAME ":set:*", filter, "desc", "item_count", "dir_count");
 	}
 
-	std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details (redis::IncRedis& parRedis, const std::vector<GroupIDType>& parSets) {
-		using dinhelp::lexical_cast;
+	std::vector<dhandy::MaxSizedArray<std::string, 4>> find_set_details (redis::IncRedis& parRedis, const std::vector<GroupIDType>& parSets) {
+		using dhandy::lexical_cast;
 
 		auto batch = parRedis.make_batch();
 		for (auto set_id : parSets) {
@@ -270,7 +270,7 @@ namespace dindb {
 		}
 		batch.throw_if_failed();
 
-		std::vector<dinhelp::MaxSizedArray<std::string, 4>> retval;
+		std::vector<dhandy::MaxSizedArray<std::string, 4>> retval;
 		auto curr_set = parSets.begin();
 		for (const auto& reply : batch.replies()) {
 			const auto& reply_list = get_array(reply);
@@ -289,9 +289,9 @@ namespace dindb {
 		return retval;
 	};
 
-	std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details (redis::IncRedis& parRedis, GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
-		using dinhelp::lexical_cast;
-		using RetListType = std::vector<dinhelp::MaxSizedArray<std::string, 1>>;
+	std::vector<dhandy::MaxSizedArray<std::string, 1>> find_file_details (redis::IncRedis& parRedis, GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) {
+		using dhandy::lexical_cast;
+		using RetListType = std::vector<dhandy::MaxSizedArray<std::string, 1>>;
 
 		const double level = static_cast<float>(parLevel);
 		auto lst = parRedis.zrangebyscore(PROGRAM_NAME ":levels:" + lexical_cast<std::string>(parSetID), level, true, level, true, false);
@@ -305,7 +305,7 @@ namespace dindb {
 		}
 		batch.throw_if_failed();
 
-		std::vector<dinhelp::MaxSizedArray<std::string, 1>> retval;
+		std::vector<dhandy::MaxSizedArray<std::string, 1>> retval;
 		for (auto& reply : batch.replies()) {
 			if (redis::RedisVariantType_Nil != reply.which()) {
 				auto curr_path = get_string(reply);
@@ -320,7 +320,7 @@ namespace dindb {
 
 	std::vector<std::string> find_paths_starting_by (redis::IncRedis& parRedis, GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) {
 		using boost::adaptors::transformed;
-		using dinhelp::MaxSizedArray;
+		using dhandy::MaxSizedArray;
 
 		auto file_details = find_file_details(parRedis, parGroupID, parLevel, parPath);
 		return boost::copy_range<std::vector<std::string>>(
diff --git a/src/backends/redis/find.hpp b/src/backends/redis/find.hpp
index 2ff893c..209a768 100644
--- a/src/backends/redis/find.hpp
+++ b/src/backends/redis/find.hpp
@@ -35,8 +35,8 @@ namespace dindb {
 	std::vector<LocatedItem> locate_in_db ( redis::IncRedis& parRedis, const mchlib::TigerHash& parSearch, const TagList& parTags );
 	std::vector<LocatedSet> locate_sets_in_db ( redis::IncRedis& parRedis, const std::string& parSubstr, bool parCaseInsensitive );
 	std::vector<LocatedSet> locate_sets_in_db ( redis::IncRedis& parRedis, const std::string& parSubstr, const std::vector<GroupIDType>& parSets, bool parCaseInsensitive );
-	std::vector<dinhelp::MaxSizedArray<std::string, 4>> find_set_details ( redis::IncRedis& parRedis, const std::vector<GroupIDType>& parSets );
-	std::vector<dinhelp::MaxSizedArray<std::string, 1>> find_file_details ( redis::IncRedis& parRedis, GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir );
+	std::vector<dhandy::MaxSizedArray<std::string, 4>> find_set_details ( redis::IncRedis& parRedis, const std::vector<GroupIDType>& parSets );
+	std::vector<dhandy::MaxSizedArray<std::string, 1>> find_file_details ( redis::IncRedis& parRedis, GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir );
 	std::vector<std::string> find_paths_starting_by ( redis::IncRedis& parRedis, GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath );
 } //namespace dindb
 
diff --git a/src/backends/redis/record_data_adapt.hpp b/src/backends/redis/record_data_adapt.hpp
index 43ff9af..f57b838 100644
--- a/src/backends/redis/record_data_adapt.hpp
+++ b/src/backends/redis/record_data_adapt.hpp
@@ -34,7 +34,7 @@ namespace redis {
 	struct StructAdapt<dindb::FileRecordDataWithGroup> {
 		template <typename R>
 		static bool decode (const R& parRange, dindb::FileRecordDataWithGroup& parOut) {
-			using dinhelp::lexical_cast;
+			using dhandy::lexical_cast;
 
 			std::array<std::string, 2> mime;
 			std::string group_key;
@@ -75,7 +75,7 @@ namespace redis {
 	struct StructAdapt<mchlib::SetRecordDataFull> {
 		template <typename R>
 		static bool decode (const R& parRange, mchlib::SetRecordDataFull& parOut) {
-			using dinhelp::lexical_cast;
+			using dhandy::lexical_cast;
 
 			for (const auto& itm : parRange) {
 				if (itm.first == "name")
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index aa33b6c..9d823ba 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -38,7 +38,7 @@ namespace std {
 namespace dindb {
 	namespace {
 		std::string make_file_key (FileIDType parID) {
-			return PROGRAM_NAME ":file:" + dinhelp::lexical_cast<std::string>(parID);
+			return PROGRAM_NAME ":file:" + dhandy::lexical_cast<std::string>(parID);
 		}
 
 		std::vector<boost::regex> compile_regexes (const std::vector<std::string>& parRegexes) {
@@ -55,7 +55,7 @@ namespace dindb {
 		}
 
 		void run_id_based_script (redis::IncRedis& parRedis, redis::Script& parScript, const std::vector<FileIDType>& parFiles, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-			using dinhelp::lexical_cast;
+			using dhandy::lexical_cast;
 
 			auto batch = parRedis.command().make_batch();
 			const std::string set_id = lexical_cast<std::string>(parSet);
@@ -73,7 +73,7 @@ namespace dindb {
 		}
 
 		void run_regex_based_script(redis::IncRedis& parRedis, redis::Script& parTagIfInSet, const std::vector<std::string>& parRegexes, const std::vector<boost::string_ref>& parTags, GroupIDType parSet) {
-			using dinhelp::lexical_cast;
+			using dhandy::lexical_cast;
 
 			const std::string set_id = lexical_cast<std::string>(parSet);
 			const auto regexes = compile_regexes(parRegexes);
@@ -101,7 +101,7 @@ namespace dindb {
 		template <typename T>
 		T id_from_redis_key (const std::string& parKey) {
 			assert(not parKey.empty());
-			return dinhelp::lexical_cast<T>(dincore::split_and_trim(parKey, ':').back());
+			return dhandy::lexical_cast<T>(dincore::split_and_trim(parKey, ':').back());
 		}
 	} //unnamed namespace
 
@@ -142,7 +142,7 @@ namespace dindb {
 	}
 
 	void delete_all_tags (redis::IncRedis& parRedis, redis::Script& parDeleIfInSet, const std::vector<std::string>& parRegexes, GroupIDType parSet) {
-		using dinhelp::lexical_cast;
+		using dhandy::lexical_cast;
 
 		const auto regexes = compile_regexes(parRegexes);
 
diff --git a/src/incredis/incredis.cpp b/src/incredis/incredis.cpp
index 868a5eb..a603a35 100644
--- a/src/incredis/incredis.cpp
+++ b/src/incredis/incredis.cpp
@@ -102,13 +102,13 @@ namespace redis {
 	}
 
 	int IncRedis::hincrby (boost::string_ref parKey, boost::string_ref parField, int parInc) {
-		const auto inc = dinhelp::lexical_cast<std::string>(parInc);
+		const auto inc = dhandy::lexical_cast<std::string>(parInc);
 		auto reply = m_command.run("HINCRBY", parKey, parField, inc);
 		return get_integer(reply);
 	}
 
 	auto IncRedis::srandmember (boost::string_ref parKey, int parCount) -> opt_string_list {
-		return optional_string_list(m_command.run("SRANDMEMBER", parKey, dinhelp::lexical_cast<std::string>(parCount)));
+		return optional_string_list(m_command.run("SRANDMEMBER", parKey, dhandy::lexical_cast<std::string>(parCount)));
 	}
 
 	auto IncRedis::srandmember (boost::string_ref parKey) -> opt_string {
diff --git a/src/incredis/incredis_batch.cpp b/src/incredis/incredis_batch.cpp
index c9ca335..8c83b43 100644
--- a/src/incredis/incredis_batch.cpp
+++ b/src/incredis/incredis_batch.cpp
@@ -45,7 +45,7 @@ namespace redis {
 	}
 
 	IncRedisBatch& IncRedisBatch::select (int parIndex) {
-		m_batch.run("SELECT", dinhelp::lexical_cast<std::string>(parIndex));
+		m_batch.run("SELECT", dhandy::lexical_cast<std::string>(parIndex));
 		return *this;
 	}
 
@@ -60,12 +60,12 @@ namespace redis {
 	}
 
 	IncRedisBatch& IncRedisBatch::hincrby (boost::string_ref parKey, boost::string_ref parField, int parInc) {
-		m_batch.run("HINCRBY", parKey, parField, dinhelp::lexical_cast<std::string>(parInc));
+		m_batch.run("HINCRBY", parKey, parField, dhandy::lexical_cast<std::string>(parInc));
 		return *this;
 	}
 
 	IncRedisBatch& IncRedisBatch::srandmember (boost::string_ref parKey, int parCount) {
-		m_batch.run("SRANDMEMBER", parKey, dinhelp::lexical_cast<std::string>(parCount));
+		m_batch.run("SRANDMEMBER", parKey, dhandy::lexical_cast<std::string>(parCount));
 		return *this;
 	}
 
diff --git a/src/incredis/incredis_batch.hpp b/src/incredis/incredis_batch.hpp
index bdd8727..4b9c026 100644
--- a/src/incredis/incredis_batch.hpp
+++ b/src/incredis/incredis_batch.hpp
@@ -78,7 +78,7 @@ namespace redis {
 
 	namespace implem {
 		template <std::size_t... I, typename... Args>
-		void run_conv_floats_to_strings ( Batch& parBatch, dinhelp::bt::index_seq<I...>, Args&&... parArgs );
+		void run_conv_floats_to_strings ( Batch& parBatch, dhandy::bt::index_seq<I...>, Args&&... parArgs );
 	} //namespace implem
 
 	template <typename... Args>
@@ -115,7 +115,7 @@ namespace redis {
 		static_assert(sizeof...(Args) >= 1, "No score/value pairs specified");
 		static_assert(sizeof...(Args) % 2 == 0, "Uneven number of parameters received");
 
-		using dinhelp::bt::index_range;
+		using dhandy::bt::index_range;
 
 		if (parChange) {
 			if (ZADD_None == parMode)
@@ -155,17 +155,17 @@ namespace redis {
 		}
 
 		template <std::size_t PreArgsCount, std::size_t... I, typename... Args>
-		void run_conv_floats_to_strings_impl (Batch& parBatch, dinhelp::bt::index_seq<I...>, Args&&... parArgs) {
+		void run_conv_floats_to_strings_impl (Batch& parBatch, dhandy::bt::index_seq<I...>, Args&&... parArgs) {
 			static_assert(sizeof...(I) == sizeof...(Args), "Wrong number of indices");
 			static_assert(PreArgsCount <= sizeof...(I), "Can't ignore more arguments than those that were received");
 			parBatch.run(stringize_or_forward<PreArgsCount, I>(std::forward<Args>(parArgs))...);
 		}
 
 		template <std::size_t... I, typename... Args>
-		void run_conv_floats_to_strings (Batch& parBatch, dinhelp::bt::index_seq<I...>, Args&&... parArgs) {
+		void run_conv_floats_to_strings (Batch& parBatch, dhandy::bt::index_seq<I...>, Args&&... parArgs) {
 			static_assert(sizeof...(Args) >= sizeof...(I), "Unexpected count, there should be at least as many argument as there are indices");
 			constexpr const auto pre_args_count = sizeof...(Args) - sizeof...(I);
-			run_conv_floats_to_strings_impl<pre_args_count>(parBatch, dinhelp::bt::index_range<0, sizeof...(Args)>(), std::forward<Args>(parArgs)...);
+			run_conv_floats_to_strings_impl<pre_args_count>(parBatch, dhandy::bt::index_range<0, sizeof...(Args)>(), std::forward<Args>(parArgs)...);
 		};
 	} //namespace implem
 } //namespace redis
diff --git a/src/incredis/reply.cpp b/src/incredis/reply.cpp
index 3aa6b5e..ac6d1ce 100644
--- a/src/incredis/reply.cpp
+++ b/src/incredis/reply.cpp
@@ -35,7 +35,7 @@ namespace redis {
 	}
 
 	long long get_integer_autoconv_if_str (const Reply &parReply) {
-		using dinhelp::lexical_cast;
+		using dhandy::lexical_cast;
 
 		const auto type = parReply.which();
 		switch (type) {
diff --git a/src/incredis/scan_iterator.cpp b/src/incredis/scan_iterator.cpp
index b53afb4..ef9f232 100644
--- a/src/incredis/scan_iterator.cpp
+++ b/src/incredis/scan_iterator.cpp
@@ -42,8 +42,8 @@ namespace redis {
 		}
 
 		Reply ScanIteratorBaseClass::run (const char* parCommand, long long parScanContext, std::size_t parCount) {
-			const auto scan_context = dinhelp::lexical_cast<std::string>(parScanContext);
-			const auto count_hint = dinhelp::lexical_cast<std::string>(parCount);
+			const auto scan_context = dhandy::lexical_cast<std::string>(parScanContext);
+			const auto count_hint = dhandy::lexical_cast<std::string>(parCount);
 			if (m_match_pattern.empty())
 				return m_command->run(parCommand, scan_context, "COUNT", count_hint);
 			else
@@ -51,8 +51,8 @@ namespace redis {
 		}
 
 		Reply ScanIteratorBaseClass::run (const char* parCommand, const boost::string_ref& parParameter, long long parScanContext, std::size_t parCount) {
-			const auto scan_context = dinhelp::lexical_cast<std::string>(parScanContext);
-			const auto count_hint = dinhelp::lexical_cast<std::string>(parCount);
+			const auto scan_context = dhandy::lexical_cast<std::string>(parScanContext);
+			const auto count_hint = dhandy::lexical_cast<std::string>(parCount);
 			if (m_match_pattern.empty())
 				return m_command->run(parCommand, parParameter, scan_context, "COUNT", count_hint);
 			else
diff --git a/src/incredis/script.hpp b/src/incredis/script.hpp
index d15de62..79b8fff 100644
--- a/src/incredis/script.hpp
+++ b/src/incredis/script.hpp
@@ -43,7 +43,7 @@ namespace redis {
 
 	private:
 		template <typename... Keys, typename... Values, std::size_t... KeyIndices, std::size_t... ValueIndices>
-		void run_with_indices ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dinhelp::bt::index_seq<KeyIndices...>, dinhelp::bt::index_seq<ValueIndices...> );
+		void run_with_indices ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dhandy::bt::index_seq<KeyIndices...>, dhandy::bt::index_seq<ValueIndices...> );
 
 		boost::string_ref m_sha1;
 		ScriptManager* m_manager;
@@ -55,13 +55,13 @@ namespace redis {
 			parBatch,
 			parKeys,
 			parValues,
-			::dinhelp::bt::index_range<0, sizeof...(Keys)>(),
-			::dinhelp::bt::index_range<0, sizeof...(Values)>()
+			::dhandy::bt::index_range<0, sizeof...(Keys)>(),
+			::dhandy::bt::index_range<0, sizeof...(Values)>()
 		);
 	}
 
 	template <typename... Keys, typename... Values, std::size_t... KeyIndices, std::size_t... ValueIndices>
-	void Script::run_with_indices (Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dinhelp::bt::index_seq<KeyIndices...>, dinhelp::bt::index_seq<ValueIndices...>) {
+	void Script::run_with_indices (Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dhandy::bt::index_seq<KeyIndices...>, dhandy::bt::index_seq<ValueIndices...>) {
 		static_assert(sizeof...(Keys) == sizeof...(KeyIndices), "Wrong index count");
 		static_assert(sizeof...(Values) == sizeof...(ValueIndices), "Wrong value count");
 		static_assert(sizeof...(Keys) == std::tuple_size<std::tuple<Keys...>>::value, "Wrong key count");
@@ -73,7 +73,7 @@ namespace redis {
 		parBatch.run(
 			"EVALSHA",
 			m_sha1,
-			dinhelp::lexical_cast<std::string>(sizeof...(Keys)),
+			dhandy::lexical_cast<std::string>(sizeof...(Keys)),
 			std::get<KeyIndices>(parKeys)...,
 			std::get<ValueIndices>(parValues)...
 		);
diff --git a/src/incredis/script_manager.cpp b/src/incredis/script_manager.cpp
index 9a8634c..fba9f87 100644
--- a/src/incredis/script_manager.cpp
+++ b/src/incredis/script_manager.cpp
@@ -51,7 +51,7 @@ namespace redis {
 		if (parScript.empty())
 			return boost::string_ref();
 
-		using dinhelp::lexical_cast;
+		using dhandy::lexical_cast;
 
 		static_assert(20 == CryptoPP::SHA1::DIGESTSIZE, "Unexpected SHA1 digest size");
 		static_assert(sizeof(LuaScriptHash) >= CryptoPP::SHA1::DIGESTSIZE, "Wrong SHA1 struct size");
@@ -60,9 +60,9 @@ namespace redis {
 		LuaScriptHash digest;
 		CryptoPP::SHA1().CalculateDigest(digest.raw_bytes, reinterpret_cast<const uint8_t*>(parScript.data()), parScript.size());
 		//TODO: change when lexical_cast will support arrays
-		auto sha1_str_parta = lexical_cast<std::string, dinhelp::tags::hexl>(__builtin_bswap64(digest.part_a));
-		auto sha1_str_partb = lexical_cast<std::string, dinhelp::tags::hexl>(__builtin_bswap64(digest.part_b));
-		auto sha1_str_partc = lexical_cast<std::string, dinhelp::tags::hexl>(__builtin_bswap32(digest.part_c));
+		auto sha1_str_parta = lexical_cast<std::string, dhandy::tags::hexl>(__builtin_bswap64(digest.part_a));
+		auto sha1_str_partb = lexical_cast<std::string, dhandy::tags::hexl>(__builtin_bswap64(digest.part_b));
+		auto sha1_str_partc = lexical_cast<std::string, dhandy::tags::hexl>(__builtin_bswap32(digest.part_c));
 		const std::string sha1_str =
 			std::string(sizeof(digest.part_a) * 2 - sha1_str_parta.size(), '0') + sha1_str_parta +
 			std::string(sizeof(digest.part_b) * 2 - sha1_str_partb.size(), '0') + sha1_str_partb +
diff --git a/src/machinery/tiger.cpp b/src/machinery/tiger.cpp
index 69b66de..58ec3cc 100644
--- a/src/machinery/tiger.cpp
+++ b/src/machinery/tiger.cpp
@@ -163,9 +163,9 @@ namespace mchlib {
 
 		TigerHash retval;
 		const string_ref inp(parString);
-		retval.part_a = swap_long(dinhelp::lexical_cast<TigerPartType, dinhelp::tags::hex>(inp.substr(0, sizeof(TigerPartType) * 2)));
-		retval.part_b = swap_long(dinhelp::lexical_cast<TigerPartType, dinhelp::tags::hex>(inp.substr(sizeof(TigerPartType) * 2, sizeof(TigerPartType) * 2)));
-		retval.part_c = swap_long(dinhelp::lexical_cast<TigerPartType, dinhelp::tags::hex>(inp.substr(sizeof(TigerPartType) * 4, sizeof(TigerPartType) * 2)));
+		retval.part_a = swap_long(dhandy::lexical_cast<TigerPartType, dhandy::tags::hex>(inp.substr(0, sizeof(TigerPartType) * 2)));
+		retval.part_b = swap_long(dhandy::lexical_cast<TigerPartType, dhandy::tags::hex>(inp.substr(sizeof(TigerPartType) * 2, sizeof(TigerPartType) * 2)));
+		retval.part_c = swap_long(dhandy::lexical_cast<TigerPartType, dhandy::tags::hex>(inp.substr(sizeof(TigerPartType) * 4, sizeof(TigerPartType) * 2)));
 		return retval;
 	}
 
diff --git a/test/unit/test_lexical_cast.cpp b/test/unit/test_lexical_cast.cpp
index 50a1eba..f2aec65 100644
--- a/test/unit/test_lexical_cast.cpp
+++ b/test/unit/test_lexical_cast.cpp
@@ -22,10 +22,10 @@
 #include <boost/utility/string_ref.hpp>
 
 TEST(duckhandy, lexical_cast) {
-	using dinhelp::lexical_cast;
-	using dinhelp::tags::hex;
-	using dinhelp::tags::dec;
-	using dinhelp::tags::bin;
+	using dhandy::lexical_cast;
+	using dhandy::tags::hex;
+	using dhandy::tags::dec;
+	using dhandy::tags::bin;
 
 	{
 		const uint8_t value = 0x34;

From 2f6c4f3dabf4505348f3d1bc896c113d6bc85847 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 14 Jul 2016 17:30:45 +0100
Subject: [PATCH 161/170] Remove incredis and import it as a submodule.

---
 .gitmodules                            |   3 +
 CMakeLists.txt                         |   2 +-
 cmake/Modules/FindCryptoPP.cmake       | 136 ---------------
 cmake/Modules/Findhiredis.cmake        |  55 ------
 cmake/Modules/Findlibev.cmake          |  31 ----
 cmake/Modules/shared_git_project.cmake |   2 +-
 lib/incredis                           |   1 +
 src/incredis/CMakeLists.txt            |  74 --------
 src/incredis/arg_to_bin_safe.hpp       |  91 ----------
 src/incredis/async_connection.cpp      | 219 -----------------------
 src/incredis/async_connection.hpp      |  74 --------
 src/incredis/batch.cpp                 | 229 -------------------------
 src/incredis/batch.hpp                 |  96 -----------
 src/incredis/command.cpp               |  92 ----------
 src/incredis/command.hpp               |  84 ---------
 src/incredis/incredis.cpp              | 137 ---------------
 src/incredis/incredis.hpp              |  98 -----------
 src/incredis/incredisConfig.h.in       |  27 ---
 src/incredis/incredis_batch.cpp        |  92 ----------
 src/incredis/incredis_batch.hpp        | 173 -------------------
 src/incredis/reply.cpp                 |  86 ----------
 src/incredis/reply.hpp                 |  92 ----------
 src/incredis/scan_iterator.cpp         |  62 -------
 src/incredis/scan_iterator.hpp         | 144 ----------------
 src/incredis/scan_iterator.inl         | 161 -----------------
 src/incredis/script.cpp                |  32 ----
 src/incredis/script.hpp                |  83 ---------
 src/incredis/script_manager.cpp        | 111 ------------
 src/incredis/script_manager.hpp        |  62 -------
 29 files changed, 6 insertions(+), 2543 deletions(-)
 delete mode 100644 cmake/Modules/FindCryptoPP.cmake
 delete mode 100644 cmake/Modules/Findhiredis.cmake
 delete mode 100644 cmake/Modules/Findlibev.cmake
 create mode 160000 lib/incredis
 delete mode 100644 src/incredis/CMakeLists.txt
 delete mode 100644 src/incredis/arg_to_bin_safe.hpp
 delete mode 100644 src/incredis/async_connection.cpp
 delete mode 100644 src/incredis/async_connection.hpp
 delete mode 100644 src/incredis/batch.cpp
 delete mode 100644 src/incredis/batch.hpp
 delete mode 100644 src/incredis/command.cpp
 delete mode 100644 src/incredis/command.hpp
 delete mode 100644 src/incredis/incredis.cpp
 delete mode 100644 src/incredis/incredis.hpp
 delete mode 100644 src/incredis/incredisConfig.h.in
 delete mode 100644 src/incredis/incredis_batch.cpp
 delete mode 100644 src/incredis/incredis_batch.hpp
 delete mode 100644 src/incredis/reply.cpp
 delete mode 100644 src/incredis/reply.hpp
 delete mode 100644 src/incredis/scan_iterator.cpp
 delete mode 100644 src/incredis/scan_iterator.hpp
 delete mode 100644 src/incredis/scan_iterator.inl
 delete mode 100644 src/incredis/script.cpp
 delete mode 100644 src/incredis/script.hpp
 delete mode 100644 src/incredis/script_manager.cpp
 delete mode 100644 src/incredis/script_manager.hpp

diff --git a/.gitmodules b/.gitmodules
index f8d2413..5340279 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "lib/duckhandy"]
 	path = lib/duckhandy
 	url = https://github.com/KingDuckZ/duckhandy.git
+[submodule "lib/incredis"]
+	path = lib/incredis
+	url = ../incredis.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c13a6c8..6b49ace 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,6 @@ target_compile_features(${PROJECT_NAME}
 target_include_directories(${bare_name}-inc
 	INTERFACE ${PROJECT_BINARY_DIR}
 	INTERFACE ${CMAKE_SOURCE_DIR}/include
-	INTERFACE ${CMAKE_SOURCE_DIR}/lib/sprout
 )
 
 
@@ -132,6 +131,7 @@ add_subdirectory(lib/glob2regex)
 add_subdirectory(src/backends)
 add_subdirectory(src/core)
 add_shared_git_project(lib/duckhandy)
+add_shared_git_project(lib/incredis EXCLUDE_FROM_ALL)
 
 #Actions
 add_subdirectory(src/main)
diff --git a/cmake/Modules/FindCryptoPP.cmake b/cmake/Modules/FindCryptoPP.cmake
deleted file mode 100644
index 9a3b6a3..0000000
--- a/cmake/Modules/FindCryptoPP.cmake
+++ /dev/null
@@ -1,136 +0,0 @@
-# Module for locating the Crypto++ encryption library.
-#
-# Customizable variables:
-#   CryptoPP_ROOT_DIR
-#     This variable points to the CryptoPP root directory. On Windows the
-#     library location typically will have to be provided explicitly using the
-#     -D command-line option. The directory should include the include/cryptopp,
-#     lib and/or bin sub-directories.
-#
-# Read-only variables:
-#   CryptoPP_FOUND
-#     Indicates whether the library has been found.
-#
-#   CryptoPP_INCLUDE_DIRS
-#     Points to the CryptoPP include directory.
-#
-#   CryptoPP_LIBRARIES
-#     Points to the CryptoPP libraries that should be passed to
-#     target_link_libararies.
-#
-#
-# Copyright (c) 2012 Sergiu Dotenco
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-INCLUDE (FindPackageHandleStandardArgs)
-
-FIND_PATH (
-	CryptoPP_ROOT_DIR
-	NAMES cryptopp/cryptlib.h include/cryptopp/cryptlib.h
-	PATHS ENV CRYPTOPPROOT
-	DOC "CryptoPP root directory"
-)
-
-# Re-use the previous path:
-FIND_PATH (
-	CRYPTOPP_INCLUDE_DIR
-	NAMES cryptopp/cryptlib.h
-	HINTS ${CryptoPP_ROOT_DIR}
-	PATH_SUFFIXES include
-	DOC "CryptoPP include directory"
-)
-
-FIND_LIBRARY (
-	CRYPTOPP_LIBRARY_DEBUG
-	NAMES cryptlibd cryptoppd
-	HINTS ${CryptoPP_ROOT_DIR}
-	PATH_SUFFIXES lib
-	DOC "CryptoPP debug library"
-)
-
-FIND_LIBRARY (
-	CRYPTOPP_LIBRARY_RELEASE
-	NAMES cryptlib cryptopp
-	HINTS ${CryptoPP_ROOT_DIR}
-	PATH_SUFFIXES lib
-	DOC "CryptoPP release library"
-)
-
-IF (CRYPTOPP_LIBRARY_DEBUG AND CRYPTOPP_LIBRARY_RELEASE)
-	SET (
-		CRYPTOPP_LIBRARY
-		optimized ${CRYPTOPP_LIBRARY_RELEASE}
-		debug ${CRYPTOPP_LIBRARY_DEBUG} CACHE DOC "CryptoPP library"
-	)
-ELSEIF (CRYPTOPP_LIBRARY_RELEASE)
-	SET (
-		CRYPTOPP_LIBRARY ${CRYPTOPP_LIBRARY_RELEASE} CACHE DOC
-		"CryptoPP library"
-	)
-ENDIF (CRYPTOPP_LIBRARY_DEBUG AND CRYPTOPP_LIBRARY_RELEASE)
-
-IF (CRYPTOPP_INCLUDE_DIR)
-	SET (_CRYPTOPP_VERSION_HEADER ${CRYPTOPP_INCLUDE_DIR}/cryptopp/config.h)
-
-	IF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
-		FILE (
-			STRINGS ${_CRYPTOPP_VERSION_HEADER} _CRYPTOPP_VERSION_TMP REGEX
-			"^#define CRYPTOPP_VERSION[ \t]+[0-9]+$"
-		)
-
-		STRING (
-			REGEX REPLACE
-			"^#define CRYPTOPP_VERSION[ \t]+([0-9]+)" "\\1" _CRYPTOPP_VERSION_TMP
-			${_CRYPTOPP_VERSION_TMP}
-		)
-
-		STRING (
-			REGEX REPLACE "([0-9]+)[0-9][0-9]" "\\1" CRYPTOPP_VERSION_MAJOR
-			${_CRYPTOPP_VERSION_TMP}
-		)
-		STRING (
-			REGEX REPLACE "[0-9]([0-9])[0-9]" "\\1" CRYPTOPP_VERSION_MINOR
-			${_CRYPTOPP_VERSION_TMP}
-		)
-		STRING (
-			REGEX REPLACE "[0-9][0-9]([0-9])" "\\1" CRYPTOPP_VERSION_PATCH
-			${_CRYPTOPP_VERSION_TMP}
-		)
-
-		SET (CRYPTOPP_VERSION_COUNT 3)
-		SET (
-			CRYPTOPP_VERSION
-			${CRYPTOPP_VERSION_MAJOR}.${CRYPTOPP_VERSION_MINOR}.${CRYPTOPP_VERSION_PATCH}
-		)
-	ENDIF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
-ENDIF (CRYPTOPP_INCLUDE_DIR)
-
-SET (CryptoPP_INCLUDE_DIRS ${CRYPTOPP_INCLUDE_DIR})
-SET (CryptoPP_LIBRARIES ${CRYPTOPP_LIBRARY})
-
-MARK_AS_ADVANCED (
-	CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY CRYPTOPP_LIBRARY_DEBUG
-	CRYPTOPP_LIBRARY_RELEASE
-)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (
-	CryptoPP REQUIRED_VARS CryptoPP_ROOT_DIR
-	CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARY VERSION_VAR CRYPTOPP_VERSION
-)
diff --git a/cmake/Modules/Findhiredis.cmake b/cmake/Modules/Findhiredis.cmake
deleted file mode 100644
index c8d0336..0000000
--- a/cmake/Modules/Findhiredis.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-#Find libhiredis
-#
-#	HIREDIS_INCLUDE_DIRS		-	where to find hiredis/hiredis.h
-#	HIREDIS_LIBRARIES		-	list of libraries when using libhiredis
-#	HIREDIS_FOUND			-	true if libhiredis found
-#	HIREDIS_VERSION_STRING		-	the version of the libhiredis found
-#
-
-find_path(HIREDIS_INCLUDE_DIR NAMES hiredis/hiredis.h)
-
-find_library(HIREDIS_LIBRARY NAMES
-	hiredis
-)
-
-if(HIREDIS_INCLUDE_DIR)
-	if(EXISTS "${HIREDIS_INCLUDE_DIR}/hiredis/hiredis.h")
-		set(hiredis_ver_tmp_major 0)
-		set(hiredis_ver_tmp_minor 0)
-		set(hiredis_ver_tmp_patch 0)
-		file(STRINGS "${HIREDIS_INCLUDE_DIR}/hiredis/hiredis.h" hiredis_version_nums REGEX "^#define[\t ]+HIREDIS_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+")
-		foreach(hiredis_version_def IN LISTS hiredis_version_nums)
-			if ("${hiredis_version_def}" MATCHES "HIREDIS_MAJOR")
-				string(REGEX REPLACE "^#define[\t ]+HIREDIS_MAJOR[\t ]+([0-9]+).*" "\\1" hiredis_ver_tmp_major "${hiredis_version_def}")
-			elseif ("${hiredis_version_def}" MATCHES "HIREDIS_MINOR")
-				string(REGEX REPLACE "^#define[\t ]+HIREDIS_MINOR[\t ]+([0-9]+).*" "\\1" hiredis_ver_tmp_minor "${hiredis_version_def}")
-			elseif ("${hiredis_version_def}" MATCHES "HIREDIS_PATCH")
-				string(REGEX REPLACE "^#define[\t ]+HIREDIS_PATCH[\t ]+([0-9]+).*" "\\1" hiredis_ver_tmp_patch "${hiredis_version_def}")
-			endif()
-		endforeach()
-
-		unset(hiredis_version_nums)
-		unset(hiredis_version_def)
-		set(HIREDIS_VERSION_STRING "${hiredis_ver_tmp_major}.${hiredis_ver_tmp_minor}.${hiredis_ver_tmp_patch}")
-		unset(hiredis_ver_tmp_major)
-		unset(hiredis_ver_tmp_minor)
-		unset(hiredis_ver_tmp_patch)
-	endif()
-endif()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(hiredis
-	REQUIRED_VARS HIREDIS_LIBRARY HIREDIS_INCLUDE_DIR
-	VERSION_VAR HIREDIS_VERSION_STRING
-)
-
-if(HIREDIS_FOUND)
-	set(HIREDIS_LIBRARIES ${HIREDIS_LIBRARY})
-	set(HIREDIS_INCLUDE_DIRS ${HIREDIS_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(
-    HIREDIS_ROOT_DIR
-    HIREDIS_INCLUDE_DIR
-    HIREDIS_LIBRARY
-)
diff --git a/cmake/Modules/Findlibev.cmake b/cmake/Modules/Findlibev.cmake
deleted file mode 100644
index 665d4c0..0000000
--- a/cmake/Modules/Findlibev.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-# Try to find libev
-# Once done, this will define
-#
-# LIBEV_FOUND        - system has libev
-# LIBEV_INCLUDE_DIRS - libev include directories
-# LIBEV_LIBRARIES    - libraries needed to use libev
-
-if(LIBEV_INCLUDE_DIRS AND LIBEV_LIBRARIES)
-  set(LIBEV_FIND_QUIETLY TRUE)
-else()
-  find_path(
-    LIBEV_INCLUDE_DIR
-    NAMES ev.h
-    HINTS ${LIBEV_ROOT_DIR}
-    PATH_SUFFIXES include)
-
-  find_library(
-    LIBEV_LIBRARY
-    NAME ev
-    HINTS ${LIBEV_ROOT_DIR}
-    PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR})
-
-  set(LIBEV_INCLUDE_DIRS ${LIBEV_INCLUDE_DIR})
-  set(LIBEV_LIBRARIES ${LIBEV_LIBRARY})
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(
-    libev DEFAULT_MSG LIBEV_LIBRARY LIBEV_INCLUDE_DIR)
-
-  mark_as_advanced(LIBEV_LIBRARY LIBEV_INCLUDE_DIR)
-endif()
diff --git a/cmake/Modules/shared_git_project.cmake b/cmake/Modules/shared_git_project.cmake
index af71eca..74c92af 100644
--- a/cmake/Modules/shared_git_project.cmake
+++ b/cmake/Modules/shared_git_project.cmake
@@ -26,7 +26,7 @@ function (add_shared_git_project SUBMODULE_PATH)
 		message(FATAL_ERROR "Couldn't make up a name for given project in \"${submod_path}\"")
 	endif()
 
-	string(MAKE_C_IDENTIFIER "${submod_path}" proj_name_c_id)
+	string(MAKE_C_IDENTIFIER "${proj_name_orig}" proj_name_c_id)
 	string(TOUPPER ${proj_name_c_id} proj_name)
 
 	get_property(shared_projects_list GLOBAL PROPERTY SHARED_PROJECTS_LIST)
diff --git a/lib/incredis b/lib/incredis
new file mode 160000
index 0000000..6aad99c
--- /dev/null
+++ b/lib/incredis
@@ -0,0 +1 @@
+Subproject commit 6aad99c0f460da5c09b719f6112ab38e4fea2ce7
diff --git a/src/incredis/CMakeLists.txt b/src/incredis/CMakeLists.txt
deleted file mode 100644
index a78aae6..0000000
--- a/src/incredis/CMakeLists.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-project(incredis CXX)
-
-find_package(hiredis 0.11.0 REQUIRED)
-find_package(CryptoPP 5.6)
-find_package(libev 4.0 REQUIRED)
-find_package(Boost 1.53.0 REQUIRED)
-
-add_library(${PROJECT_NAME} SHARED
-	command.cpp
-	scan_iterator.cpp
-	reply.cpp
-	batch.cpp
-	script.cpp
-	script_manager.cpp
-	async_connection.cpp
-	incredis.cpp
-	incredis_batch.cpp
-)
-
-target_include_directories(${PROJECT_NAME} SYSTEM
-	PUBLIC ${Boost_INCLUDE_DIRS}
-	PRIVATE ${HIREDIS_INCLUDE_DIRS}
-	PUBLIC ${CMAKE_SOURCE_DIR}/lib/better-enums
-	PRIVATE ${LIBEV_INCLUDE_DIRS}
-	PRIVATE ${Boost_INCLUDE_DIRS}
-)
-target_include_directories(${PROJECT_NAME}
-	PUBLIC ${CMAKE_SOURCE_DIR}/include
-	PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
-	PUBLIC ${CMAKE_SOURCE_DIR}/lib/sprout
-)
-
-target_link_libraries(${PROJECT_NAME}
-	PRIVATE ${HIREDIS_LIBRARIES}
-	PRIVATE ${LIBEV_LIBRARIES}
-	PRIVATE ${Boost_LIBRARIES}
-)
-
-configure_file(
-	incredisConfig.h.in
-	${CMAKE_CURRENT_BINARY_DIR}/incredisConfig.h
-)
-
-target_compile_definitions(${PROJECT_NAME}
-	PRIVATE EV_COMPAT3=0
-)
-
-if (CryptoPP_FOUND)
-	target_link_libraries(${PROJECT_NAME} PRIVATE ${CryptoPP_LIBRARIES})
-	target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE ${CryptoPP_INCLUDE_DIRS})
-	set (has_cryptopp_lib ON)
-else()
-	set (has_cryptopp_lib OFF)
-endif()
-
-install(TARGETS ${PROJECT_NAME}
-	LIBRARY DESTINATION lib
-	RUNTIME DESTINATION bin
-	ARCHIVE DESTINATION lib/static
-)
-
-target_compile_features(${PROJECT_NAME}
-	PUBLIC cxx_nullptr
-	PUBLIC cxx_range_for
-	PUBLIC cxx_lambdas
-	PUBLIC cxx_decltype_auto
-	PUBLIC cxx_defaulted_functions
-	PUBLIC cxx_deleted_functions
-	PUBLIC cxx_auto_type
-	PUBLIC cxx_decltype_incomplete_return_types
-	PUBLIC cxx_defaulted_move_initializers
-	PUBLIC cxx_noexcept
-	PUBLIC cxx_rvalue_references
-)
diff --git a/src/incredis/arg_to_bin_safe.hpp b/src/incredis/arg_to_bin_safe.hpp
deleted file mode 100644
index f49efd3..0000000
--- a/src/incredis/arg_to_bin_safe.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id9348909738B047B7B6912D73CB519039
-#define id9348909738B047B7B6912D73CB519039
-
-#include "duckhandy/compatibility.h"
-#include <cstddef>
-#include <boost/utility/string_ref.hpp>
-#include <string>
-
-namespace redis {
-	namespace implem {
-		template <typename T>
-		const char* arg_to_bin_safe_char ( const T& parArg );
-
-		template <typename T>
-		std::size_t arg_to_bin_safe_length ( const T& parArg ) a_pure;
-
-		template <typename T>
-		struct MakeCharInfo;
-
-		template<>
-		struct MakeCharInfo<std::string> {
-			MakeCharInfo ( const std::string& parData ) : m_string(parData) {}
-			const char* data ( void ) const { return m_string.data(); }
-			std::size_t size ( void ) const { return m_string.size(); }
-
-		private:
-			const std::string& m_string;
-		};
-
-		template<>
-		struct MakeCharInfo<boost::string_ref> {
-			MakeCharInfo ( const boost::string_ref& parData ) : m_data(parData.data()), m_size(parData.size()) {}
-			const char* data ( void ) const { return m_data; }
-			std::size_t size ( void ) const { return m_size; }
-
-		private:
-			const char* const m_data;
-			const std::size_t m_size;
-		};
-
-		template<>
-		struct MakeCharInfo<char> {
-			MakeCharInfo ( char parData ) : m_data(parData) {}
-			const char* data ( void ) const { return &m_data; }
-			std::size_t size ( void ) const { return 1; }
-
-		private:
-			const char m_data;
-		};
-
-		template <std::size_t N>
-		struct MakeCharInfo<char[N]> {
-			static_assert(N > 0, "Given input should have at least one character as it's assumed to be a null-terminated string");
-			MakeCharInfo ( const char (&parData)[N] ) : m_data(parData, N - 1) {}
-			const char* data ( void ) const { return m_data.data(); }
-			std::size_t size ( void ) const { return m_data.size(); }
-
-		private:
-			boost::string_ref m_data;
-		};
-
-		template <typename T>
-		inline const char* arg_to_bin_safe_char (const T& parArg) {
-			return MakeCharInfo<T>(parArg).data();
-		}
-
-		template <typename T>
-		inline std::size_t arg_to_bin_safe_length (const T& parArg) {
-			return MakeCharInfo<T>(parArg).size();
-		}
-	} //namespace implem
-} //namespace redis
-
-#endif
diff --git a/src/incredis/async_connection.cpp b/src/incredis/async_connection.cpp
deleted file mode 100644
index db92d04..0000000
--- a/src/incredis/async_connection.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "async_connection.hpp"
-#include <hiredis/async.h>
-#include <hiredis/adapters/libev.h>
-#include <ev.h>
-#include <thread>
-#include <condition_variable>
-#include <atomic>
-#include <mutex>
-#include <signal.h>
-#include <cassert>
-#include <sstream>
-
-namespace redis {
-	namespace {
-		void async_callback (ev_loop* /*parLoop*/, ev_async* /*parObject*/, int /*parRevents*/) {
-		}
-
-		void async_halt_loop (ev_loop* parLoop, ev_async* /*parObject*/, int /*parRevents*/) {
-			ev_break(parLoop, EVBREAK_ALL);
-		}
-
-		void lock_mutex_libev (ev_loop* parLoop) noexcept {
-			std::mutex* mtx = static_cast<std::mutex*>(ev_userdata(parLoop));
-			assert(mtx);
-			try {
-				mtx->lock();
-			}
-			catch (const std::system_error&) {
-				assert(false);
-			}
-		}
-
-		void unlock_mutex_libev (ev_loop* parLoop) noexcept {
-			std::mutex* mtx = static_cast<std::mutex*>(ev_userdata(parLoop));
-			assert(mtx);
-			mtx->unlock();
-		}
-	} //unnamed namespace
-
-	struct AsyncConnection::LocalData {
-		LocalData() :
-			redis_poll_thread(),
-			connect_processed(false),
-			disconnect_processed(true)
-		{
-		}
-
-		ev_async watcher_wakeup;
-		ev_async watcher_halt;
-		std::thread redis_poll_thread;
-		std::mutex hiredis_mutex;
-		std::mutex libev_mutex;
-		std::condition_variable condition_connected;
-		std::condition_variable condition_disconnected;
-		std::string connect_err_msg;
-		std::atomic_bool connect_processed;
-		std::atomic_bool disconnect_processed;
-	};
-
-	void on_connect (const redisAsyncContext* parContext, int parStatus) {
-		assert(parContext and parContext->data);
-		AsyncConnection& self = *static_cast<AsyncConnection*>(parContext->data);
-		assert(parContext == self.m_conn.get());
-		assert(not self.m_local_data->connect_processed);
-
-		self.m_connection_lost = false;
-		self.m_connected = (parStatus == REDIS_OK);
-		self.m_local_data->connect_processed = true;
-		self.m_local_data->connect_err_msg = parContext->errstr;
-		self.m_local_data->condition_connected.notify_one();
-	}
-
-	void on_disconnect (const redisAsyncContext* parContext, int parStatus) {
-		assert(parContext and parContext->data);
-		AsyncConnection& self = *static_cast<AsyncConnection*>(parContext->data);
-		assert(self.m_connected);
-		assert(not self.m_local_data->disconnect_processed);
-
-		self.m_connection_lost = (REDIS_ERR == parStatus);
-		self.m_connected = false;
-		self.m_local_data->disconnect_processed = true;
-		self.m_local_data->connect_err_msg.clear();
-		self.m_local_data->condition_disconnected.notify_one();
-	};
-
-	AsyncConnection::AsyncConnection(std::string&& parAddress, uint16_t parPort) :
-		m_conn(nullptr, &redisAsyncDisconnect),
-		m_local_data(new LocalData()),
-		m_libev_loop_thread(ev_loop_new(EVFLAG_NOINOTIFY), &ev_loop_destroy),
-		m_address(std::move(parAddress)),
-		m_port(parPort),
-		m_connected(false),
-		m_connection_lost(false)
-	{
-		//Init libev stuff
-		{
-			signal(SIGPIPE, SIG_IGN);
-
-			//See: http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#THREAD_LOCKING_EXAMPLE
-			ev_async_init(&m_local_data->watcher_wakeup, &async_callback);
-			ev_async_start(m_libev_loop_thread.get(), &m_local_data->watcher_wakeup);
-			ev_async_init(&m_local_data->watcher_halt, &async_halt_loop);
-			ev_async_start(m_libev_loop_thread.get(), &m_local_data->watcher_halt);
-			ev_set_userdata(m_libev_loop_thread.get(), &m_local_data->libev_mutex);
-			ev_set_loop_release_cb(m_libev_loop_thread.get(), &unlock_mutex_libev, &lock_mutex_libev);
-		}
-	}
-
-	AsyncConnection::~AsyncConnection() noexcept {
-		this->disconnect();
-		this->wait_for_disconnect();
-	}
-
-	void AsyncConnection::connect() {
-		if (not m_conn) {
-			m_local_data->disconnect_processed = false;
-			RedisConnection conn(
-				(is_socket_connection() ?
-					redisAsyncConnectUnix(m_address.c_str())
-				:
-					redisAsyncConnect(m_address.c_str(), m_port)
-				),
-				&redisAsyncDisconnect
-			);
-			if (not conn) {
-				std::ostringstream oss;
-				oss << "Unable to connect to Redis server at " << m_address << ':' << m_port;
-				throw std::runtime_error(oss.str());
-			}
-			else {
-				conn->data = this;
-			}
-			if (REDIS_OK != redisLibevAttach(m_libev_loop_thread.get(), conn.get()))
-				throw std::runtime_error("Unable to set event loop");
-			if (REDIS_OK != redisAsyncSetConnectCallback(conn.get(), &on_connect))
-				throw std::runtime_error("Unable to set \"on_connect()\" callback");
-			if (REDIS_OK != redisAsyncSetDisconnectCallback(conn.get(), &on_disconnect))
-				throw std::runtime_error("Unable to set \"on_disconnect()\" callback");
-			std::swap(conn, m_conn);
-			m_local_data->redis_poll_thread = std::thread([this]() {
-				m_local_data->libev_mutex.lock();
-				ev_run(m_libev_loop_thread.get(), 0);
-				m_local_data->libev_mutex.unlock();
-			});
-			wakeup_event_thread();
-		}
-	}
-
-	void AsyncConnection::wait_for_connect() {
-		if (not m_local_data->connect_processed) {
-			std::unique_lock<std::mutex> lk(m_local_data->hiredis_mutex);
-			m_local_data->condition_connected.wait(lk, [this]() { return m_local_data->connect_processed.load(); });
-			assert(true == m_local_data->connect_processed);
-		}
-	}
-
-	void AsyncConnection::disconnect() {
-		if (not m_local_data->connect_processed)
-			return;
-		assert(m_local_data->redis_poll_thread.joinable());
-		m_local_data->connect_processed = false;
-		{
-			std::lock_guard<std::mutex> lock(m_local_data->libev_mutex);
-			assert(not ev_async_pending(&m_local_data->watcher_halt));
-			ev_async_send(m_libev_loop_thread.get(), &m_local_data->watcher_halt);
-			m_conn.reset();
-		}
-		m_local_data->redis_poll_thread.join();
-	}
-
-	void AsyncConnection::wait_for_disconnect() {
-		if (not m_local_data->disconnect_processed) {
-			std::unique_lock<std::mutex> lk(m_local_data->hiredis_mutex);
-			m_local_data->condition_disconnected.wait(lk, [this]() { return m_local_data->disconnect_processed.load(); });
-			assert(true == m_local_data->disconnect_processed);
-		}
-	}
-
-	bool AsyncConnection::is_connected() const {
-		const bool connected = m_conn and not m_conn->err and m_connected;
-		assert(not m_connection_lost or connected);
-		return connected;
-	}
-
-	boost::string_ref AsyncConnection::connection_error() const {
-		return m_local_data->connect_err_msg;
-	}
-
-	void AsyncConnection::wakeup_event_thread() {
-		std::lock_guard<std::mutex> lock(m_local_data->libev_mutex);
-		if (ev_async_pending(&m_local_data->watcher_wakeup) == false)
-			ev_async_send(m_libev_loop_thread.get(), &m_local_data->watcher_wakeup);
-	}
-
-	std::mutex& AsyncConnection::event_mutex() {
-		return m_local_data->libev_mutex;
-	}
-
-	bool AsyncConnection::is_socket_connection() const {
-		return not (m_port or m_address.empty());
-	}
-} //namespace redis
diff --git a/src/incredis/async_connection.hpp b/src/incredis/async_connection.hpp
deleted file mode 100644
index 7c1fce7..0000000
--- a/src/incredis/async_connection.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id982A651A9BC34F6E9BA935A804B3A0A4
-#define id982A651A9BC34F6E9BA935A804B3A0A4
-
-#include <memory>
-#include <string>
-#include <cstdint>
-#include <boost/utility/string_ref.hpp>
-
-struct redisAsyncContext;
-struct ev_loop;
-
-namespace std {
-	class mutex;
-} //namespace std
-
-namespace redis {
-	class AsyncConnection {
-		friend void on_connect ( const redisAsyncContext*, int );
-		friend void on_disconnect ( const redisAsyncContext*, int );
-	public:
-		AsyncConnection ( std::string&& parAddress, uint16_t parPort );
-		~AsyncConnection ( void ) noexcept;
-
-		void connect ( void );
-		void wait_for_connect ( void );
-		void disconnect ( void );
-		void wait_for_disconnect ( void );
-
-		bool is_connected ( void ) const;
-		boost::string_ref connection_error ( void ) const;
-		void wakeup_event_thread ( void );
-		std::mutex& event_mutex ( void );
-		redisAsyncContext* connection ( void );
-
-	private:
-		using RedisConnection = std::unique_ptr<redisAsyncContext, void(*)(redisAsyncContext*)>;
-		using LibevLoop = std::unique_ptr<ev_loop, void(*)(ev_loop*)>;
-
-		bool is_socket_connection ( void ) const;
-
-		struct LocalData;
-
-		RedisConnection m_conn;
-		std::unique_ptr<LocalData> m_local_data;
-		LibevLoop m_libev_loop_thread;
-		std::string m_address;
-		uint16_t m_port;
-		volatile bool m_connected;
-		volatile bool m_connection_lost;
-	};
-
-	inline redisAsyncContext* AsyncConnection::connection() {
-		return m_conn.get();
-	}
-} //namespace redis
-
-#endif
diff --git a/src/incredis/batch.cpp b/src/incredis/batch.cpp
deleted file mode 100644
index ef1959a..0000000
--- a/src/incredis/batch.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "batch.hpp"
-#include "async_connection.hpp"
-#include <hiredis/hiredis.h>
-#include <hiredis/async.h>
-#include <cassert>
-#include <future>
-#include <ciso646>
-#include <boost/iterator/transform_iterator.hpp>
-#include <atomic>
-#include <mutex>
-#include <condition_variable>
-#include <sstream>
-
-//#define VERBOSE_HIREDIS_COMM
-
-#if defined(VERBOSE_HIREDIS_COMM)
-#   include <iostream>
-#endif
-
-namespace redis {
-	namespace {
-		const std::size_t g_max_redis_unanswered_commands = 1000;
-
-		struct HiredisCallbackData {
-			HiredisCallbackData ( std::atomic_size_t& parPendingFutures, std::condition_variable& parSendCmdCond ) :
-				promise(),
-				pending_futures(parPendingFutures),
-				send_command_condition(parSendCmdCond)
-			{
-			}
-
-			std::promise<Reply> promise;
-			std::atomic_size_t& pending_futures;
-			std::condition_variable& send_command_condition;
-		};
-
-		Reply make_redis_reply_type (redisReply* parReply) {
-			using boost::transform_iterator;
-			using PtrToReplyIterator = transform_iterator<Reply(*)(redisReply*), redisReply**>;
-
-			switch (parReply->type) {
-			case REDIS_REPLY_INTEGER:
-				return parReply->integer;
-			case REDIS_REPLY_STRING:
-				return std::string(parReply->str, parReply->len);
-			case REDIS_REPLY_ARRAY:
-				return std::vector<Reply>(
-					PtrToReplyIterator(parReply->element, &make_redis_reply_type),
-					PtrToReplyIterator(parReply->element + parReply->elements, &make_redis_reply_type)
-				);
-			case REDIS_REPLY_ERROR:
-				return ErrorString(parReply->str, parReply->len);
-			case REDIS_REPLY_STATUS:
-				return StatusString(parReply->str, parReply->len);
-			case REDIS_REPLY_NIL:
-				return nullptr;
-			default:
-				assert(false); //not reached
-				return Reply();
-			};
-		}
-
-		void hiredis_run_callback (redisAsyncContext*, void* parReply, void* parPrivData) {
-			assert(parPrivData);
-			auto* data = static_cast<HiredisCallbackData*>(parPrivData);
-			const auto old_count = data->pending_futures.fetch_add(-1);
-			assert(old_count > 0);
-			if (old_count == g_max_redis_unanswered_commands)
-				data->send_command_condition.notify_one();
-
-			if (parReply) {
-				auto reply = make_redis_reply_type(static_cast<redisReply*>(parReply));
-				data->promise.set_value(std::move(reply));
-			}
-			else {
-				assert(false); //Should this case also be managed?
-			}
-
-			delete data;
-		}
-
-		int array_throw_if_failed (int parErrCount, int parMaxReportedErrors, const std::vector<Reply>& parReplies, std::ostream& parStream) {
-			int err_count = 0;
-			for (const auto& rep : parReplies) {
-				if (rep.which() == RedisVariantType_Error) {
-					++err_count;
-					if (err_count + parErrCount <= parMaxReportedErrors)
-						parStream << '"' << get_error_string(rep).message() << "\" ";
-				}
-				else if (rep.which() == RedisVariantType_Array) {
-					err_count += array_throw_if_failed(err_count + parErrCount, parMaxReportedErrors, get_array(rep), parStream);
-				}
-			}
-			return err_count;
-		}
-	} //unnamed namespace
-
-	struct Batch::LocalData {
-		explicit LocalData ( std::atomic_size_t& parPendingFutures ) :
-			free_cmd_slot(),
-			futures_mutex(),
-			pending_futures(parPendingFutures)
-		{
-		}
-
-		std::condition_variable free_cmd_slot;
-		std::mutex futures_mutex;
-		std::atomic_size_t& pending_futures;
-	};
-
-	Batch::Batch (Batch&&) = default;
-
-	Batch::Batch (AsyncConnection* parConn, std::atomic_size_t& parPendingFutures) :
-		m_futures(),
-		m_replies(),
-		m_local_data(new LocalData(parPendingFutures)),
-		m_async_conn(parConn)
-	{
-		assert(m_async_conn);
-		assert(m_async_conn->connection());
-	}
-
-	Batch::~Batch() noexcept {
-		if (m_local_data)
-			this->reset();
-	}
-
-	void Batch::run_pvt (int parArgc, const char** parArgv, std::size_t* parLengths) {
-		assert(not replies_requested());
-		assert(parArgc >= 1);
-		assert(parArgv);
-		assert(parLengths); //This /could/ be null, but I don't see why it should
-		assert(m_local_data);
-
-		const auto pending_futures = m_local_data->pending_futures.fetch_add(1);
-		auto* data = new HiredisCallbackData(m_local_data->pending_futures, m_local_data->free_cmd_slot);
-
-#if defined(VERBOSE_HIREDIS_COMM)
-		std::cout << "run_pvt(), " << pending_futures << " items pending... ";
-#endif
-		if (pending_futures >= g_max_redis_unanswered_commands) {
-#if defined(VERBOSE_HIREDIS_COMM)
-			std::cout << " waiting... ";
-#endif
-			std::unique_lock<std::mutex> u_lock(m_local_data->futures_mutex);
-			m_local_data->free_cmd_slot.wait(u_lock, [this]() { return m_local_data->pending_futures < g_max_redis_unanswered_commands; });
-		}
-#if defined(VERBOSE_HIREDIS_COMM)
-		std::cout << " emplace_back(future)... ";
-#endif
-
-		m_futures.emplace_back(data->promise.get_future());
-		{
-			std::lock_guard<std::mutex> lock(m_async_conn->event_mutex());
-			const int command_added = redisAsyncCommandArgv(m_async_conn->connection(), &hiredis_run_callback, data, parArgc, parArgv, parLengths);
-			assert(REDIS_OK == command_added); // REDIS_ERR if error
-			static_cast<void>(command_added);
-		}
-
-#if defined(VERBOSE_HIREDIS_COMM)
-		std::cout << "command sent to hiredis" << std::endl;
-#endif
-		m_async_conn->wakeup_event_thread();
-	}
-
-	bool Batch::replies_requested() const {
-		return not m_replies.empty();
-	}
-
-	const std::vector<Reply>& Batch::replies() {
-		if (not replies_requested()) {
-			m_replies.reserve(m_futures.size());
-			for (auto& fut : m_futures) {
-				m_replies.emplace_back(fut.get());
-			}
-
-			auto empty_vec = std::move(m_futures);
-		}
-		return m_replies;
-	}
-
-	void Batch::throw_if_failed() {
-		std::ostringstream oss;
-		const int max_reported_errors = 3;
-
-		oss << "Error in reply: ";
-		const int err_count = array_throw_if_failed(0, max_reported_errors, replies(), oss);
-		if (err_count) {
-			oss << " (showing " << err_count << '/' << max_reported_errors << " errors on " << replies().size() << " total replies)";
-			throw std::runtime_error(oss.str());
-		}
-	}
-
-	void Batch::reset() noexcept {
-		try {
-			this->replies(); //force waiting for any pending jobs
-		}
-		catch (...) {
-			assert(false);
-		}
-
-		assert(m_local_data);
-		assert(0 == m_local_data->pending_futures);
-		m_futures.clear();
-		m_replies.clear();
-	}
-
-	RedisError::RedisError (const char* parMessage, std::size_t parLength) :
-		std::runtime_error(std::string(parMessage, parLength))
-	{
-	}
-} //namespace redis
diff --git a/src/incredis/batch.hpp b/src/incredis/batch.hpp
deleted file mode 100644
index 813d11c..0000000
--- a/src/incredis/batch.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef idD81C81D99196491A8C9B68DED8ADD260
-#define idD81C81D99196491A8C9B68DED8ADD260
-
-#include "reply.hpp"
-#include "arg_to_bin_safe.hpp"
-#include <vector>
-#include <memory>
-
-namespace std {
-	template <class R> class future;
-	template <class T> struct atomic;
-} //namespace std
-
-namespace redis {
-	class Command;
-	class AsyncConnection;
-
-	class Batch {
-		friend class Command;
-	public:
-		Batch ( Batch&& parOther );
-		Batch ( const Batch& ) = delete;
-		~Batch ( void ) noexcept;
-
-		const std::vector<Reply>& replies ( void );
-		bool replies_requested ( void ) const;
-		void throw_if_failed ( void );
-
-		template <typename... Args>
-		Batch& run ( const char* parCommand, Args&&... parArgs );
-
-		template <typename... Args>
-		Batch& operator() ( const char* parCommand, Args&&... parArgs );
-
-		void reset ( void ) noexcept;
-
-	private:
-		struct LocalData;
-
-		explicit Batch ( AsyncConnection* parConn, std::atomic<std::size_t>& parPendingFutures );
-		void run_pvt ( int parArgc, const char** parArgv, std::size_t* parLengths );
-
-		std::vector<std::future<Reply>> m_futures;
-		std::vector<Reply> m_replies;
-		std::unique_ptr<LocalData> m_local_data;
-		AsyncConnection* m_async_conn;
-	};
-
-	class RedisError : public std::runtime_error {
-	public:
-		RedisError ( const char* parMessage, std::size_t parLength );
-	};
-
-	template <typename... Args>
-	Batch& Batch::run (const char* parCommand, Args&&... parArgs) {
-		constexpr const std::size_t arg_count = sizeof...(Args) + 1;
-		using CharPointerArray = std::array<const char*, arg_count>;
-		using LengthArray = std::array<std::size_t, arg_count>;
-		using implem::arg_to_bin_safe_char;
-		using implem::arg_to_bin_safe_length;
-		using implem::MakeCharInfo;
-		using boost::string_ref;
-
-		this->run_pvt(
-			static_cast<int>(arg_count),
-			CharPointerArray{ (arg_to_bin_safe_char(string_ref(parCommand))), MakeCharInfo<typename std::remove_const<typename std::remove_reference<Args>::type>::type>(std::forward<Args>(parArgs)).data()... }.data(),
-			LengthArray{ arg_to_bin_safe_length(string_ref(parCommand)), arg_to_bin_safe_length(std::forward<Args>(parArgs))... }.data()
-		);
-
-		return *this;
-	}
-
-	template <typename... Args>
-	Batch& Batch::operator() (const char* parCommand, Args&&... parArgs) {
-		return this->run(parCommand, std::forward<Args>(parArgs)...);
-	}
-} //namespace redis
-
-#endif
diff --git a/src/incredis/command.cpp b/src/incredis/command.cpp
deleted file mode 100644
index 7dee157..0000000
--- a/src/incredis/command.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "command.hpp"
-#include "script_manager.hpp"
-#include "async_connection.hpp"
-#include <hiredis/hiredis.h>
-#include <ciso646>
-#include <cassert>
-#include <algorithm>
-#include <stdexcept>
-#include <atomic>
-
-//See docs directory for info about hiredis/libev with multithreading
-
-namespace redis {
-	namespace {
-	} //unnamed namespace
-
-	struct Command::LocalData {
-		explicit LocalData (Command* parCommand, std::string&& parAddress, uint16_t parPort) :
-			async_connection(std::move(parAddress), parPort),
-			lua_scripts(parCommand),
-			pending_futures(0)
-		{
-		}
-
-		AsyncConnection async_connection;
-		ScriptManager lua_scripts;
-		std::atomic_size_t pending_futures;
-	};
-
-	Command::Command (std::string&& parAddress, uint16_t parPort) :
-		m_local_data(new LocalData(this, std::move(parAddress), parPort))
-	{
-	}
-
-	Command::Command (std::string&& parSocket) :
-		Command(std::move(parSocket), 0)
-	{
-	}
-
-	Command::~Command() noexcept = default;
-
-	void Command::connect() {
-		m_local_data->async_connection.connect();
-	}
-
-	void Command::wait_for_connect() {
-		m_local_data->async_connection.wait_for_connect();
-	}
-
-	void Command::disconnect() {
-		m_local_data->async_connection.disconnect();
-	}
-
-	void Command::wait_for_disconnect() {
-		m_local_data->async_connection.wait_for_disconnect();
-	}
-
-	bool Command::is_connected() const {
-		return m_local_data->async_connection.is_connected();
-	}
-
-	boost::string_ref Command::connection_error() const {
-		return m_local_data->async_connection.connection_error();
-	}
-
-	Batch Command::make_batch() {
-		assert(is_connected());
-		return Batch(&m_local_data->async_connection, m_local_data->pending_futures);
-	}
-
-	Script Command::make_script (const std::string &parScript) {
-		auto sha1 = m_local_data->lua_scripts.submit_lua_script(parScript);
-		return Script(sha1, m_local_data->lua_scripts);
-	}
-} //namespace redis
diff --git a/src/incredis/command.hpp b/src/incredis/command.hpp
deleted file mode 100644
index d474d5f..0000000
--- a/src/incredis/command.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef idD83EEBFC927840C6B9F32D61A1D1E582
-#define idD83EEBFC927840C6B9F32D61A1D1E582
-
-#include "reply.hpp"
-#include "batch.hpp"
-#include "script.hpp"
-#include <array>
-#include <string>
-#include <cstdint>
-#include <cstddef>
-#include <cassert>
-#include <vector>
-#include <utility>
-#include <boost/utility/string_ref.hpp>
-#include <ciso646>
-#include <stdexcept>
-
-namespace redis {
-	class Command {
-	public:
-		Command ( std::string&& parAddress, uint16_t parPort );
-		explicit Command ( std::string&& parSocket );
-		~Command ( void ) noexcept;
-
-		void connect ( void );
-		void wait_for_connect ( void );
-		void disconnect ( void );
-		void wait_for_disconnect ( void );
-
-		bool is_connected ( void ) const;
-		boost::string_ref connection_error ( void ) const;
-
-		Batch make_batch ( void );
-		Script make_script ( const std::string& parScript );
-
-		template <typename... Args>
-		Reply run ( const char* parCommand, Args&&... parArgs );
-
-	private:
-		struct LocalData;
-
-		std::unique_ptr<LocalData> m_local_data;
-	};
-
-	template <typename... Args>
-	Reply Command::run (const char* parCommand, Args&&... parArgs) {
-		auto batch = make_batch();
-		batch.run(parCommand, std::forward<Args>(parArgs)...);
-		batch.throw_if_failed();
-		return batch.replies().front();
-	}
-
-	template <typename T>
-	struct StructAdapt;
-
-	template <typename AS, typename I>
-	inline AS range_as (const boost::iterator_range<I>& parRange) {
-		assert(not boost::empty(parRange));
-		AS retval;
-		const auto success = StructAdapt<AS>::decode(parRange, retval);
-		if (not success)
-			throw std::runtime_error("Error decoding range");
-		return retval;
-	};
-} //namespace redis
-
-#endif
diff --git a/src/incredis/incredis.cpp b/src/incredis/incredis.cpp
deleted file mode 100644
index a603a35..0000000
--- a/src/incredis/incredis.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "incredis.hpp"
-#include "duckhandy/compatibility.h"
-#include "duckhandy/lexical_cast.hpp"
-#include <cassert>
-#include <ciso646>
-
-namespace redis {
-	namespace {
-		inline IncRedis::opt_string optional_string ( const Reply& parReply ) a_always_inline;
-		IncRedis::opt_string_list optional_string_list ( const Reply& parReply );
-
-		IncRedis::opt_string optional_string (const Reply& parReply) {
-			assert(parReply.which() == RedisVariantType_Nil or parReply.which() == RedisVariantType_String);
-			if (RedisVariantType_Nil == parReply.which())
-				return boost::none;
-			else
-				return get_string(parReply);
-		}
-
-		IncRedis::opt_string_list optional_string_list (const Reply& parReply) {
-			assert(parReply.which() == RedisVariantType_Nil or parReply.which() == RedisVariantType_Array);
-			if (RedisVariantType_Nil == parReply.which()) {
-				return boost::none;
-			}
-			else {
-				auto replies = get_array(parReply);
-				IncRedis::opt_string_list::value_type retval;
-				retval.reserve(replies.size());
-				for (const auto& rep : replies) {
-					retval.emplace_back(optional_string(rep));
-				}
-				return IncRedis::opt_string_list(std::move(retval));
-			}
-		}
-	} //unnamed namespace
-
-	IncRedis::IncRedis (std::string &&parAddress, uint16_t parPort) :
-		m_command(std::move(parAddress), parPort)
-	{
-	}
-
-	IncRedis::IncRedis (std::string&& parSocket) :
-		m_command(std::move(parSocket))
-	{
-	}
-
-	void IncRedis::connect() {
-		m_command.connect();
-	}
-
-	void IncRedis::wait_for_connect() {
-		m_command.wait_for_connect();
-	}
-
-	void IncRedis::disconnect() {
-		m_command.disconnect();
-	}
-
-	void IncRedis::wait_for_disconnect() {
-		m_command.wait_for_disconnect();
-	}
-
-	IncRedisBatch IncRedis::make_batch() {
-		return m_command.make_batch();
-	}
-
-	auto IncRedis::scan (boost::string_ref parPattern) -> scan_range {
-		return scan_range(scan_iterator(&m_command, false, parPattern), scan_iterator(&m_command, true));
-	}
-
-	auto IncRedis::hscan (boost::string_ref parKey, boost::string_ref parPattern) -> hscan_range {
-		return hscan_range(hscan_iterator(&m_command, parKey, false, parPattern), hscan_iterator(&m_command, parKey, true));
-	}
-
-	auto IncRedis::sscan (boost::string_ref parKey, boost::string_ref parPattern) -> sscan_range {
-		return sscan_range(sscan_iterator(&m_command, parKey, false, parPattern), sscan_iterator(&m_command, parKey, true));
-	}
-
-	auto IncRedis::zscan (boost::string_ref parKey, boost::string_ref parPattern) -> zscan_range {
-		return zscan_range(zscan_iterator(&m_command, parKey, false, parPattern), zscan_iterator(&m_command, parKey, true));
-	}
-
-	auto IncRedis::hget (boost::string_ref parKey, boost::string_ref parField) -> opt_string {
-		return optional_string(m_command.run("HGET", parKey, parField));
-	}
-
-	int IncRedis::hincrby (boost::string_ref parKey, boost::string_ref parField, int parInc) {
-		const auto inc = dhandy::lexical_cast<std::string>(parInc);
-		auto reply = m_command.run("HINCRBY", parKey, parField, inc);
-		return get_integer(reply);
-	}
-
-	auto IncRedis::srandmember (boost::string_ref parKey, int parCount) -> opt_string_list {
-		return optional_string_list(m_command.run("SRANDMEMBER", parKey, dhandy::lexical_cast<std::string>(parCount)));
-	}
-
-	auto IncRedis::srandmember (boost::string_ref parKey) -> opt_string {
-		return optional_string(m_command.run("SRANDMEMBER", parKey));
-	}
-
-	auto IncRedis::smembers (boost::string_ref parKey) -> opt_string_list {
-		return optional_string_list(m_command.run("SMEMBERS", parKey));
-	}
-
-	auto IncRedis::zrangebyscore (boost::string_ref parKey, double parMin, bool parMinIncl, double parMax, bool parMaxIncl, bool parWithScores) -> opt_string_list {
-		auto batch = make_batch();
-		batch.zrangebyscore(parKey, parMin, parMinIncl, parMax, parMaxIncl, parWithScores);
-		assert(batch.replies().size() == 1);
-		return optional_string_list(batch.replies().front());
-	}
-
-	bool IncRedis::script_flush() {
-		const auto ret = get<StatusString>(m_command.run("SCRIPT", "FLUSH"));
-		return ret.is_ok();
-	}
-
-	auto IncRedis::reply_to_string_list (const Reply& parReply) -> opt_string_list {
-		return optional_string_list(parReply);
-	}
-} //namespace redis
diff --git a/src/incredis/incredis.hpp b/src/incredis/incredis.hpp
deleted file mode 100644
index bcd45e6..0000000
--- a/src/incredis/incredis.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id7D338900114548A890B1EECE0C4D3C4C
-#define id7D338900114548A890B1EECE0C4D3C4C
-
-#include "command.hpp"
-#include "incredis_batch.hpp"
-#include "scan_iterator.hpp"
-#include <boost/optional.hpp>
-#include <string>
-#include <boost/utility/string_ref.hpp>
-#include <vector>
-#include <boost/range/iterator_range_core.hpp>
-#include <boost/range/empty.hpp>
-#include <utility>
-
-namespace redis {
-	class IncRedis {
-	public:
-		typedef ScanIterator<ScanSingleValues<std::string>> scan_iterator;
-		typedef boost::iterator_range<scan_iterator> scan_range;
-		typedef ScanIterator<ScanPairs<std::pair<std::string, std::string>, ScanCommands::HSCAN>> hscan_iterator;
-		typedef boost::iterator_range<hscan_iterator> hscan_range;
-		typedef ScanIterator<ScanSingleValuesInKey<std::string>> sscan_iterator;
-		typedef boost::iterator_range<sscan_iterator> sscan_range;
-		typedef ScanIterator<ScanPairs<std::pair<std::string, std::string>, ScanCommands::ZSCAN>> zscan_iterator;
-		typedef boost::iterator_range<zscan_iterator> zscan_range;
-
-		typedef boost::optional<std::string> opt_string;
-		typedef boost::optional<std::vector<opt_string>> opt_string_list;
-
-		IncRedis ( std::string&& parAddress, uint16_t parPort );
-		explicit IncRedis ( std::string&& parSocket );
-		~IncRedis ( void ) noexcept = default;
-
-		void connect ( void );
-		void wait_for_connect ( void );
-		void disconnect ( void );
-		void wait_for_disconnect ( void );
-		bool is_connected ( void ) const { return m_command.is_connected(); }
-
-		IncRedisBatch make_batch ( void );
-
-		Command& command ( void ) { return m_command; }
-		const Command& command ( void ) const { return m_command; }
-
-		//Scan
-		scan_range scan ( boost::string_ref parPattern=boost::string_ref() );
-		hscan_range hscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
-		sscan_range sscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
-		zscan_range zscan ( boost::string_ref parKey, boost::string_ref parPattern=boost::string_ref() );
-
-		//Hash
-		opt_string hget ( boost::string_ref parKey, boost::string_ref parField );
-		template <typename... Args>
-		opt_string_list hmget ( boost::string_ref parKey, Args&&... parArgs );
-		int hincrby ( boost::string_ref parKey, boost::string_ref parField, int parInc );
-
-		//Set
-		opt_string_list srandmember ( boost::string_ref parKey, int parCount );
-		opt_string srandmember ( boost::string_ref parKey );
-		opt_string_list smembers ( boost::string_ref parKey );
-
-		//Sorted set
-		opt_string_list zrangebyscore ( boost::string_ref parKey, double parMin, bool parMinIncl, double parMax, bool parMaxIncl, bool parWithScores );
-
-		//Script
-		bool script_flush ( void );
-
-	private:
-		static opt_string_list reply_to_string_list ( const Reply& parReply );
-
-		Command m_command;
-	};
-
-	template <typename... Args>
-	auto IncRedis::hmget (boost::string_ref parKey, Args&&... parArgs) -> opt_string_list {
-		static_assert(sizeof...(Args) > 0, "No fields specified");
-		return reply_to_string_list(m_command.run("HMGET", parKey, std::forward<Args>(parArgs)...));
-	}
-} //namespace redis
-
-#endif
diff --git a/src/incredis/incredisConfig.h.in b/src/incredis/incredisConfig.h.in
deleted file mode 100644
index b574398..0000000
--- a/src/incredis/incredisConfig.h.in
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id2F97AF7626CE45F08742867A2A737482
-#define id2F97AF7626CE45F08742867A2A737482
-
-#include "duckhandy/cmake_on_off.h"
-
-#if CMAKE_@has_cryptopp_lib@
-#	define WITH_CRYPTOPP
-#endif
-
-#endif
diff --git a/src/incredis/incredis_batch.cpp b/src/incredis/incredis_batch.cpp
deleted file mode 100644
index 8c83b43..0000000
--- a/src/incredis/incredis_batch.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "incredis_batch.hpp"
-#include "duckhandy/lexical_cast.hpp"
-#include <sstream>
-#include <utility>
-#include <ciso646>
-
-namespace redis {
-	namespace {
-		std::string make_boundary (double parValue, bool parExclude) {
-			std::ostringstream oss;
-			if (parExclude)
-				oss << '(';
-			oss << parValue;
-			return oss.str();
-		}
-	} //unnamed namespace
-
-	IncRedisBatch::IncRedisBatch (Batch&& parBatch) :
-		m_batch(std::move(parBatch))
-	{
-	}
-
-	void IncRedisBatch::reset() {
-		m_batch.reset();
-	}
-	void IncRedisBatch::throw_if_failed() {
-		m_batch.throw_if_failed();
-	}
-
-	IncRedisBatch& IncRedisBatch::select (int parIndex) {
-		m_batch.run("SELECT", dhandy::lexical_cast<std::string>(parIndex));
-		return *this;
-	}
-
-	IncRedisBatch& IncRedisBatch::client_setname (boost::string_ref parName) {
-		m_batch.run("CLIENT", "SETNAME", parName);
-		return *this;
-	}
-
-	IncRedisBatch& IncRedisBatch::hget (boost::string_ref parKey, boost::string_ref parField) {
-		m_batch.run("HGET", parKey, parField);
-		return *this;
-	}
-
-	IncRedisBatch& IncRedisBatch::hincrby (boost::string_ref parKey, boost::string_ref parField, int parInc) {
-		m_batch.run("HINCRBY", parKey, parField, dhandy::lexical_cast<std::string>(parInc));
-		return *this;
-	}
-
-	IncRedisBatch& IncRedisBatch::srandmember (boost::string_ref parKey, int parCount) {
-		m_batch.run("SRANDMEMBER", parKey, dhandy::lexical_cast<std::string>(parCount));
-		return *this;
-	}
-
-	IncRedisBatch& IncRedisBatch::srandmember (boost::string_ref parKey) {
-		m_batch.run("SRANDMEMBER", parKey);
-		return *this;
-	}
-
-	IncRedisBatch& IncRedisBatch::zrangebyscore (boost::string_ref parKey, double parMin, bool parMinIncl, double parMax, bool parMaxIncl, bool parWithScores) {
-		auto lower_bound = make_boundary(parMin, not parMinIncl);
-		auto upper_bound = make_boundary(parMax, not parMaxIncl);
-
-		if (parWithScores)
-			m_batch.run("ZRANGEBYSCORE", parKey, lower_bound, upper_bound, "WITHSCORES");
-		else
-			m_batch.run("ZRANGEBYSCORE", parKey, lower_bound, upper_bound);
-		return *this;
-	}
-
-	IncRedisBatch& IncRedisBatch::script_flush() {
-		m_batch.run("SCRIPT", "FLUSH");
-		return *this;
-	}
-} //namespace redis
diff --git a/src/incredis/incredis_batch.hpp b/src/incredis/incredis_batch.hpp
deleted file mode 100644
index 4b9c026..0000000
--- a/src/incredis/incredis_batch.hpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id3C772A92AB0E440DA84DAFD807BC962D
-#define id3C772A92AB0E440DA84DAFD807BC962D
-
-#include "batch.hpp"
-#include "duckhandy/sequence_bt.hpp"
-#include <boost/utility/string_ref.hpp>
-#include <boost/lexical_cast.hpp>
-#include <type_traits>
-
-namespace redis {
-	class IncRedisBatch {
-	public:
-		enum ZADD_Mode {
-			ZADD_XX_UpdateOnly,
-			ZADD_NX_AlwaysAdd,
-			ZADD_None
-		};
-
-		IncRedisBatch ( void ) = delete;
-		IncRedisBatch ( IncRedisBatch&& ) = default;
-		IncRedisBatch ( const Batch& ) = delete;
-		IncRedisBatch ( Batch&& parBatch );
-
-		void reset ( void );
-		void throw_if_failed ( void );
-		const std::vector<Reply>& replies ( void ) { return m_batch.replies(); }
-		Batch& batch ( void ) { return m_batch; }
-		const Batch& batch ( void ) const { return m_batch; }
-
-		//Misc
-		IncRedisBatch& select ( int parIndex );
-		IncRedisBatch& client_setname ( boost::string_ref parName );
-		template <typename... Args>
-		IncRedisBatch& del ( Args&&... parArgs );
-
-		//Hash
-		IncRedisBatch& hget ( boost::string_ref parKey, boost::string_ref parField );
-		template <typename... Args>
-		IncRedisBatch& hmget ( boost::string_ref parKey, Args&&... parArgs );
-		template <typename... Args>
-		IncRedisBatch& hmset ( boost::string_ref parKey, Args&&... parArgs );
-		IncRedisBatch& hincrby ( boost::string_ref parKey, boost::string_ref parField, int parInc );
-
-		//Set
-		IncRedisBatch& srandmember ( boost::string_ref parKey, int parCount );
-		IncRedisBatch& srandmember ( boost::string_ref parKey );
-		template <typename... Args>
-		IncRedisBatch& sadd ( boost::string_ref parKey, Args&&... parArgs );
-
-		//Sorted set
-		template <typename... Args>
-		IncRedisBatch& zadd ( boost::string_ref parKey, ZADD_Mode parMode, bool parChange, Args&&... parArgs );
-		IncRedisBatch& zrangebyscore ( boost::string_ref parKey, double parMin, bool parMinIncl, double parMax, bool parMaxIncl, bool parWithScores );
-
-		//Script
-		IncRedisBatch& script_flush ( void );
-
-	private:
-		Batch m_batch;
-	};
-
-	namespace implem {
-		template <std::size_t... I, typename... Args>
-		void run_conv_floats_to_strings ( Batch& parBatch, dhandy::bt::index_seq<I...>, Args&&... parArgs );
-	} //namespace implem
-
-	template <typename... Args>
-	IncRedisBatch& IncRedisBatch::hmget (boost::string_ref parKey, Args&&... parArgs) {
-		static_assert(sizeof...(Args) > 0, "No fields specified");
-		m_batch.run("HMGET", parKey, std::forward<Args>(parArgs)...);
-		return *this;
-	}
-
-	template <typename... Args>
-	IncRedisBatch& IncRedisBatch::hmset (boost::string_ref parKey, Args&&... parArgs) {
-		static_assert(sizeof...(Args) >= 1, "No parameters specified");
-		static_assert(sizeof...(Args) % 2 == 0, "Uneven number of parameters received");
-		m_batch.run("HMSET", parKey, std::forward<Args>(parArgs)...);
-		return *this;
-	}
-
-	template <typename... Args>
-	IncRedisBatch& IncRedisBatch::sadd (boost::string_ref parKey, Args&&... parArgs) {
-		static_assert(sizeof...(Args) > 0, "No members specified");
-		m_batch.run("SADD", parKey, std::forward<Args>(parArgs)...);
-		return *this;
-	}
-
-	template <typename... Args>
-	IncRedisBatch& IncRedisBatch::del (Args&&... parArgs) {
-		static_assert(sizeof...(Args) > 0, "No keys specified");
-		m_batch.run("DEL", std::forward<Args>(parArgs)...);
-		return *this;
-	}
-
-	template <typename... Args>
-	IncRedisBatch& IncRedisBatch::zadd (boost::string_ref parKey, ZADD_Mode parMode, bool parChange, Args&&... parArgs) {
-		static_assert(sizeof...(Args) >= 1, "No score/value pairs specified");
-		static_assert(sizeof...(Args) % 2 == 0, "Uneven number of parameters received");
-
-		using dhandy::bt::index_range;
-
-		if (parChange) {
-			if (ZADD_None == parMode)
-				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, "CH", std::forward<Args>(parArgs)...);
-			else if (ZADD_NX_AlwaysAdd == parMode)
-				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, "NX", "CH", std::forward<Args>(parArgs)...);
-			else if (ZADD_XX_UpdateOnly == parMode)
-				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, "XX", "CH", std::forward<Args>(parArgs)...);
-		}
-		else {
-			if (ZADD_None == parMode)
-				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, std::forward<Args>(parArgs)...);
-			else if (ZADD_NX_AlwaysAdd == parMode)
-				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, "NX", std::forward<Args>(parArgs)...);
-			else if (ZADD_XX_UpdateOnly == parMode)
-				implem::run_conv_floats_to_strings(m_batch, index_range<0, sizeof...(Args)>(), "ZADD", parKey, "XX", std::forward<Args>(parArgs)...);
-		}
-		return *this;
-	}
-
-	namespace implem {
-		template <std::size_t IGNORE_COUNT, std::size_t IDX, typename T, bool STRINGIZE=(IDX>=IGNORE_COUNT) && ((IDX-IGNORE_COUNT)%2)==0>
-		struct stringize_or_forward_impl {
-			typedef T type;
-			static T&& do_it ( T&& parT ) { return std::forward<T>(parT); }
-		};
-		template <std::size_t IGNORE_COUNT, std::size_t IDX, typename T>
-		struct stringize_or_forward_impl<IGNORE_COUNT, IDX, T, true> {
-			static_assert(std::is_floating_point<T>::value, "Scores must be given as floating point values");
-			typedef std::string type;
-			static std::string do_it ( T parT ) { return boost::lexical_cast<std::string>(parT); }
-		};
-
-		template <std::size_t IGNORE_COUNT, std::size_t IDX, typename T>
-		auto stringize_or_forward (T&& parValue) -> typename stringize_or_forward_impl<IGNORE_COUNT, IDX, T>::type {
-			return stringize_or_forward_impl<IGNORE_COUNT, IDX, T>::do_it(std::forward<T>(parValue));
-		}
-
-		template <std::size_t PreArgsCount, std::size_t... I, typename... Args>
-		void run_conv_floats_to_strings_impl (Batch& parBatch, dhandy::bt::index_seq<I...>, Args&&... parArgs) {
-			static_assert(sizeof...(I) == sizeof...(Args), "Wrong number of indices");
-			static_assert(PreArgsCount <= sizeof...(I), "Can't ignore more arguments than those that were received");
-			parBatch.run(stringize_or_forward<PreArgsCount, I>(std::forward<Args>(parArgs))...);
-		}
-
-		template <std::size_t... I, typename... Args>
-		void run_conv_floats_to_strings (Batch& parBatch, dhandy::bt::index_seq<I...>, Args&&... parArgs) {
-			static_assert(sizeof...(Args) >= sizeof...(I), "Unexpected count, there should be at least as many argument as there are indices");
-			constexpr const auto pre_args_count = sizeof...(Args) - sizeof...(I);
-			run_conv_floats_to_strings_impl<pre_args_count>(parBatch, dhandy::bt::index_range<0, sizeof...(Args)>(), std::forward<Args>(parArgs)...);
-		};
-	} //namespace implem
-} //namespace redis
-
-#endif
diff --git a/src/incredis/reply.cpp b/src/incredis/reply.cpp
deleted file mode 100644
index ac6d1ce..0000000
--- a/src/incredis/reply.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "reply.hpp"
-#include "duckhandy/lexical_cast.hpp"
-#include <boost/variant/get.hpp>
-
-namespace redis {
-	const long long& get_integer (const Reply& parReply) {
-		assert(RedisVariantType_Integer == parReply.which());
-		return boost::get<long long>(parReply);
-	}
-
-	const std::string& get_string (const Reply& parReply) {
-		static const std::string empty_str;
-		if (RedisVariantType_Nil == parReply.which())
-			return empty_str;
-
-		assert(RedisVariantType_String == parReply.which());
-		return boost::get<std::string>(parReply);
-	}
-
-	long long get_integer_autoconv_if_str (const Reply &parReply) {
-		using dhandy::lexical_cast;
-
-		const auto type = parReply.which();
-		switch (type) {
-		case RedisVariantType_Integer:
-			return get_integer(parReply);
-		case RedisVariantType_String:
-			return lexical_cast<long long>(get_string(parReply));
-		default:
-			assert(false);
-			return 0;
-		}
-	}
-
-	const std::vector<Reply>& get_array (const Reply& parReply) {
-		assert(RedisVariantType_Array == parReply.which());
-		return boost::get<std::vector<Reply>>(parReply);
-	}
-
-	const ErrorString& get_error_string (const Reply& parReply) {
-		assert(RedisVariantType_Error == parReply.which());
-		return boost::get<ErrorString>(parReply);
-	}
-
-	template <>
-	const std::string& get<std::string> (const Reply& parReply) {
-		return get_string(parReply);
-	}
-
-	template <>
-	const std::vector<Reply>& get<std::vector<Reply>> (const Reply& parReply) {
-		return get_array(parReply);
-	}
-
-	template <>
-	const long long& get<long long> (const Reply& parReply) {
-		return get_integer(parReply);
-	}
-
-	template <>
-	const ErrorString& get<ErrorString> (const Reply& parReply) {
-		return get_error_string(parReply);
-	}
-
-	template const std::string& get<std::string> ( const Reply& parReply );
-	template const std::vector<Reply>& get<std::vector<Reply>> ( const Reply& parReply );
-	template const long long& get<long long> ( const Reply& parReply );
-	template const ErrorString& get<ErrorString> ( const Reply& parReply );
-} //namespace redis
diff --git a/src/incredis/reply.hpp b/src/incredis/reply.hpp
deleted file mode 100644
index 9c6c33e..0000000
--- a/src/incredis/reply.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id93FA96E3071745D9A1E45D4D29B9F7D0
-#define id93FA96E3071745D9A1E45D4D29B9F7D0
-
-#include <boost/variant/variant.hpp>
-#include <string>
-#include <vector>
-
-namespace redis {
-	struct Reply;
-
-	class ErrorString {
-	public:
-		ErrorString ( const char* parCStr, std::size_t parLen ) :
-			m_msg(parCStr, parLen)
-		{ }
-		const std::string& message ( void ) const noexcept { return m_msg; }
-
-	private:
-		std::string m_msg;
-	};
-	class StatusString {
-	public:
-		StatusString ( const char* parCStr, std::size_t parLen ) :
-			m_msg(parCStr, parLen)
-		{ }
-		const std::string& message ( void ) const noexcept { return m_msg; }
-		bool is_ok ( void ) const { return "OK" == m_msg; }
-
-	private:
-		std::string m_msg;
-	};
-
-	namespace implem {
-		using RedisVariantType = boost::variant<
-			long long,
-			std::string,
-			std::vector<Reply>,
-			ErrorString,
-			StatusString,
-			std::nullptr_t
-		>;
-	} //namespace implem
-	enum RedisVariantTypes {
-		RedisVariantType_Integer = 0,
-		RedisVariantType_String,
-		RedisVariantType_Array,
-		RedisVariantType_Error,
-		RedisVariantType_Status,
-		RedisVariantType_Nil
-	};
-
-	struct Reply : implem::RedisVariantType {
-		using base_class = implem::RedisVariantType;
-
-		Reply ( void ) = default;
-		Reply ( long long parVal ) : base_class(parVal) {}
-		Reply ( std::string&& parVal ) : base_class(std::move(parVal)) {}
-		Reply ( std::vector<Reply>&& parVal ) : base_class(std::move(parVal)) {}
-		Reply ( ErrorString&& parVal ) : base_class(std::move(parVal)) {}
-		Reply ( StatusString&& parVal ) : base_class(std::move(parVal)) {}
-		Reply ( std::nullptr_t parVal ) : base_class(parVal) {}
-		~Reply ( void ) noexcept = default;
-	};
-
-	const long long& get_integer ( const Reply& parReply );
-	long long get_integer_autoconv_if_str ( const Reply& parReply );
-	const std::string& get_string ( const Reply& parReply );
-	const std::vector<Reply>& get_array ( const Reply& parReply );
-	const ErrorString& get_error_string ( const Reply& parReply );
-
-	template <typename T>
-	const T& get ( const Reply& parReply );
-} //namespace redis
-
-#endif
diff --git a/src/incredis/scan_iterator.cpp b/src/incredis/scan_iterator.cpp
deleted file mode 100644
index ef9f232..0000000
--- a/src/incredis/scan_iterator.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "scan_iterator.hpp"
-#include "duckhandy/lexical_cast.hpp"
-#include "command.hpp"
-#include <cassert>
-#include <ciso646>
-#include <string>
-
-namespace redis {
-	namespace implem {
-		ScanIteratorBaseClass::ScanIteratorBaseClass (Command* parCommand) :
-			ScanIteratorBaseClass(parCommand, boost::string_ref())
-		{
-		}
-
-		ScanIteratorBaseClass::ScanIteratorBaseClass (Command* parCommand, boost::string_ref parMatchPattern) :
-			m_command(parCommand),
-			m_match_pattern(parMatchPattern)
-		{
-			assert(m_command);
-			assert(m_command->is_connected());
-		}
-
-		bool ScanIteratorBaseClass::is_connected() const {
-			return m_command and m_command->is_connected();
-		}
-
-		Reply ScanIteratorBaseClass::run (const char* parCommand, long long parScanContext, std::size_t parCount) {
-			const auto scan_context = dhandy::lexical_cast<std::string>(parScanContext);
-			const auto count_hint = dhandy::lexical_cast<std::string>(parCount);
-			if (m_match_pattern.empty())
-				return m_command->run(parCommand, scan_context, "COUNT", count_hint);
-			else
-				return m_command->run(parCommand, scan_context, "MATCH", m_match_pattern, "COUNT", count_hint);
-		}
-
-		Reply ScanIteratorBaseClass::run (const char* parCommand, const boost::string_ref& parParameter, long long parScanContext, std::size_t parCount) {
-			const auto scan_context = dhandy::lexical_cast<std::string>(parScanContext);
-			const auto count_hint = dhandy::lexical_cast<std::string>(parCount);
-			if (m_match_pattern.empty())
-				return m_command->run(parCommand, parParameter, scan_context, "COUNT", count_hint);
-			else
-				return m_command->run(parCommand, parParameter, scan_context, "MATCH", m_match_pattern, "COUNT", count_hint);
-		}
-	} //namespace implem
-} //namespace redis
diff --git a/src/incredis/scan_iterator.hpp b/src/incredis/scan_iterator.hpp
deleted file mode 100644
index bf2e202..0000000
--- a/src/incredis/scan_iterator.hpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id774125B851514A26BD7C2AD1D804D732
-#define id774125B851514A26BD7C2AD1D804D732
-
-#include "reply.hpp"
-#include "duckhandy/has_method.hpp"
-#include "enum.h"
-#include <boost/iterator/iterator_facade.hpp>
-#include <type_traits>
-#include <vector>
-#include <cstddef>
-#include <boost/utility/string_ref.hpp>
-
-namespace redis {
-	template <typename ValueFetch>
-	class ScanIterator;
-
-	class Command;
-
-	namespace implem {
-		template <typename ValueFetch>
-		using ScanIteratorBaseIterator = boost::iterator_facade<ScanIterator<ValueFetch>, const typename ValueFetch::value_type, boost::forward_traversal_tag>;
-
-		class ScanIteratorBaseClass {
-		protected:
-			explicit ScanIteratorBaseClass ( Command* parCommand );
-			ScanIteratorBaseClass ( Command* parCommand, boost::string_ref parMatchPattern );
-			~ScanIteratorBaseClass ( void ) noexcept = default;
-
-			bool is_connected ( void ) const;
-			Reply run ( const char* parCommand, long long parScanContext, std::size_t parCount );
-			Reply run ( const char* parCommand, const boost::string_ref& parParameter, long long parScanContext, std::size_t parCount );
-
-			bool is_equal ( const ScanIteratorBaseClass& parOther ) const { return m_command == parOther.m_command; }
-
-		private:
-			Command* m_command;
-			boost::string_ref m_match_pattern;
-		};
-	} //namespace implem
-
-	BETTER_ENUM(ScanCommands, char,
-		SCAN, SSCAN, ZSCAN, HSCAN
-	);
-
-	template <typename ValueFetch>
-	class ScanIterator : private implem::ScanIteratorBaseClass, public implem::ScanIteratorBaseIterator<ValueFetch>, private ValueFetch {
-		friend class boost::iterator_core_access;
-		typedef implem::ScanIteratorBaseIterator<ValueFetch> base_iterator;
-		define_has_method(scan_target, ScanTarget);
-	public:
-		typedef typename base_iterator::difference_type difference_type;
-		typedef typename base_iterator::value_type value_type;
-		typedef typename base_iterator::pointer pointer;
-		typedef typename base_iterator::reference reference;
-		typedef typename base_iterator::iterator_category iterator_category;
-
-		template <typename Dummy=ValueFetch, typename=typename std::enable_if<not HasScanTargetMethod<Dummy>::value>::type>
-		ScanIterator ( Command* parCommand, bool parEnd, boost::string_ref parMatchPattern=boost::string_ref() );
-		template <typename Dummy=ValueFetch, typename=typename std::enable_if<HasScanTargetMethod<Dummy>::value>::type>
-		ScanIterator ( Command* parCommand, boost::string_ref parKey, bool parEnd, boost::string_ref parMatchPattern=boost::string_ref() );
-
-	private:
-		template <typename T>
-		Reply forward_scan_command ( typename std::enable_if<HasScanTargetMethod<T>::value, long long>::type parContext );
-		template <typename T>
-		Reply forward_scan_command ( typename std::enable_if<not HasScanTargetMethod<T>::value, long long>::type parContext );
-		bool is_end ( void ) const;
-
-		void increment ( void );
-		bool equal ( const ScanIterator& parOther ) const;
-		const value_type& dereference ( void ) const;
-
-		std::vector<value_type> m_reply;
-		long long m_scan_context;
-		std::size_t m_curr_index;
-	};
-
-	template <typename T>
-	struct ScanSingleValues {
-		typedef T value_type;
-
-		static constexpr const char* command ( void ) { return "SCAN"; }
-		static constexpr const std::size_t step = 1;
-		static constexpr const std::size_t work_count = 10;
-
-		static const T& make_value ( const Reply* parItem );
-	};
-
-	template <typename T>
-	struct ScanSingleValuesInKey {
-		typedef T value_type;
-
-		explicit ScanSingleValuesInKey ( boost::string_ref parScanTarget ) : m_scan_target(parScanTarget) {}
-
-		static constexpr const char* command ( void ) { return "SSCAN"; }
-		static constexpr const std::size_t step = 1;
-		static constexpr const std::size_t work_count = 10;
-
-		static const T& make_value ( const Reply* parItem );
-		boost::string_ref scan_target ( void ) const { return m_scan_target; }
-
-	private:
-		boost::string_ref m_scan_target;
-	};
-
-	template <typename P, char Command, typename A=decltype(P().first), typename B=decltype(P().second)>
-	struct ScanPairs {
-		static_assert(Command == ScanCommands::HSCAN or Command == ScanCommands::ZSCAN, "Invalid scan command chosen");
-		typedef P value_type;
-
-		explicit ScanPairs ( boost::string_ref parScanTarget ) : m_scan_target(parScanTarget) {}
-
-		static constexpr const char* command ( void ) { return ScanCommands::_from_integral(Command)._to_string(); }
-		static constexpr const std::size_t step = 2;
-		static constexpr const std::size_t work_count = 10;
-
-		static value_type make_value ( const Reply* parItem );
-		boost::string_ref scan_target ( void ) const { return m_scan_target; }
-
-	private:
-		boost::string_ref m_scan_target;
-	};
-} //namespace redis
-
-#include "scan_iterator.inl"
-
-#endif
diff --git a/src/incredis/scan_iterator.inl b/src/incredis/scan_iterator.inl
deleted file mode 100644
index 2dcc424..0000000
--- a/src/incredis/scan_iterator.inl
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "command.hpp"
-#include <cassert>
-#include <ciso646>
-
-namespace redis {
-	namespace implem {
-	} //namespace implem
-
-	template <typename ValueFetch>
-	template <typename Dummy, typename>
-	ScanIterator<ValueFetch>::ScanIterator (Command* parCommand, bool parEnd, boost::string_ref parMatchPattern) :
-		implem::ScanIteratorBaseClass(parCommand, parMatchPattern),
-		implem::ScanIteratorBaseIterator<ValueFetch>(),
-		ValueFetch(),
-		m_reply(),
-		m_scan_context(0),
-		m_curr_index(0)
-	{
-		if (not parEnd) {
-			m_curr_index = 1; //Some arbitrary value so is_end()==false
-			assert(not is_end());
-			this->increment();
-		}
-		else {
-			assert(is_end());
-		}
-	}
-
-	template <typename ValueFetch>
-	template <typename Dummy, typename>
-	ScanIterator<ValueFetch>::ScanIterator (Command* parCommand, boost::string_ref parKey, bool parEnd, boost::string_ref parMatchPattern) :
-		implem::ScanIteratorBaseClass(parCommand, parMatchPattern),
-		implem::ScanIteratorBaseIterator<ValueFetch>(),
-		ValueFetch(parKey),
-		m_reply(),
-		m_scan_context(0),
-		m_curr_index(0)
-	{
-		if (not parEnd) {
-			m_curr_index = 1; //Some arbitrary value so is_end()==false
-			assert(not is_end());
-			this->increment();
-		}
-		else {
-			assert(is_end());
-		}
-	}
-
-	template <typename ValueFetch>
-	bool ScanIterator<ValueFetch>::is_end() const {
-		return not m_curr_index and m_reply.empty() and not m_scan_context;
-	}
-
-	template <typename ValueFetch>
-	void ScanIterator<ValueFetch>::increment() {
-		assert(not is_end());
-		static_assert(ValueFetch::step > 0, "Can't have an increase step of 0");
-
-		if (m_curr_index + 1 < m_reply.size()) {
-			++m_curr_index;
-		}
-		else if (m_curr_index + 1 == m_reply.size() and not m_scan_context)	{
-			m_reply.clear();
-			m_curr_index = 0;
-		}
-		else {
-			std::vector<Reply> array_reply;
-			long long new_context = m_scan_context;
-
-			do {
-				auto whole_reply = this->forward_scan_command<ValueFetch>(new_context);
-
-				array_reply = get_array(whole_reply);
-				assert(2 == array_reply.size());
-				assert(array_reply.size() % ValueFetch::step == 0);
-				new_context = get_integer_autoconv_if_str(array_reply[0]);
-			} while (new_context and get_array(array_reply[1]).empty());
-
-			const auto variant_array = get_array(array_reply[1]);
-			assert(variant_array.size() % ValueFetch::step == 0);
-			const std::size_t expected_reply_count = variant_array.size() / ValueFetch::step;
-			m_reply.clear();
-			m_reply.reserve(expected_reply_count);
-			for (std::size_t z = 0; z < variant_array.size(); z += ValueFetch::step) {
-				m_reply.push_back(ValueFetch::make_value(variant_array.data() + z));
-			}
-			assert(expected_reply_count == m_reply.size());
-			m_scan_context = new_context;
-			m_curr_index = 0;
-		}
-	}
-
-	template <typename ValueFetch>
-	bool ScanIterator<ValueFetch>::equal (const ScanIterator& parOther) const {
-		return
-			(&parOther == this) or
-			(is_end() and parOther.is_end()) or
-			(
-				not (is_end() or parOther.is_end()) and
-				implem::ScanIteratorBaseClass::is_equal(parOther) and
-				(m_scan_context == parOther.m_scan_context) and
-				(m_curr_index == parOther.m_curr_index) and
-				(m_reply.size() == parOther.m_reply.size())
-			);
-	}
-
-	template <typename ValueFetch>
-	auto ScanIterator<ValueFetch>::dereference() const -> const value_type& {
-		assert(not m_reply.empty());
-		assert(m_curr_index < m_reply.size());
-
-		return m_reply[m_curr_index];
-	}
-
-	template <typename ValueFetch>
-	template <typename T>
-	Reply ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<HasScanTargetMethod<T>::value, long long>::type parContext) {
-		return implem::ScanIteratorBaseClass::run(T::command(), T::scan_target(), parContext, T::work_count);
-	}
-
-	template <typename ValueFetch>
-	template <typename T>
-	Reply ScanIterator<ValueFetch>::forward_scan_command (typename std::enable_if<not HasScanTargetMethod<T>::value, long long>::type parContext) {
-		return implem::ScanIteratorBaseClass::run(T::command(), parContext, T::work_count);
-	}
-
-	template <typename T>
-	auto ScanSingleValues<T>::make_value (const Reply* parItem) -> const value_type& {
-		assert(parItem);
-		return get<T>(*parItem);
-	}
-
-	template <typename T>
-	auto ScanSingleValuesInKey<T>::make_value (const Reply* parItem) -> const value_type& {
-		assert(parItem);
-		return get<T>(*parItem);
-	}
-
-	template <typename P, char Command, typename A, typename B>
-	auto ScanPairs<P, Command, A, B>::make_value (const Reply* parItem) -> value_type {
-		assert(parItem);
-		return value_type(get<A>(parItem[0]), get<B>(parItem[1]));
-	}
-} //namespace redis
diff --git a/src/incredis/script.cpp b/src/incredis/script.cpp
deleted file mode 100644
index d88ec39..0000000
--- a/src/incredis/script.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "script.hpp"
-
-namespace redis {
-	Script::Script() :
-		m_sha1(),
-		m_manager(nullptr)
-	{
-	}
-
-	Script::Script (boost::string_ref parSha1, ScriptManager& parManager) :
-		m_sha1(parSha1),
-		m_manager(&parManager)
-	{
-	}
-} //namespace redis
diff --git a/src/incredis/script.hpp b/src/incredis/script.hpp
deleted file mode 100644
index 79b8fff..0000000
--- a/src/incredis/script.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id5B30CDA57F894CD6888093B64F9433DA
-#define id5B30CDA57F894CD6888093B64F9433DA
-
-#include "batch.hpp"
-#include "duckhandy/lexical_cast.hpp"
-#include "duckhandy/sequence_bt.hpp"
-#include <boost/utility/string_ref.hpp>
-#include <tuple>
-#include <cassert>
-#include <ciso646>
-
-namespace redis {
-	class ScriptManager;
-
-	class Script {
-	public:
-		Script ( void );
-		Script ( Script&& ) = default;
-		Script ( boost::string_ref parSha1, ScriptManager& parManager );
-		~Script ( void ) noexcept = default;
-
-		template <typename... Keys, typename... Values>
-		void run ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues );
-
-		Script& operator= ( Script&& ) = default;
-
-	private:
-		template <typename... Keys, typename... Values, std::size_t... KeyIndices, std::size_t... ValueIndices>
-		void run_with_indices ( Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dhandy::bt::index_seq<KeyIndices...>, dhandy::bt::index_seq<ValueIndices...> );
-
-		boost::string_ref m_sha1;
-		ScriptManager* m_manager;
-	};
-
-	template <typename... Keys, typename... Values>
-	void Script::run (Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues) {
-		this->run_with_indices(
-			parBatch,
-			parKeys,
-			parValues,
-			::dhandy::bt::index_range<0, sizeof...(Keys)>(),
-			::dhandy::bt::index_range<0, sizeof...(Values)>()
-		);
-	}
-
-	template <typename... Keys, typename... Values, std::size_t... KeyIndices, std::size_t... ValueIndices>
-	void Script::run_with_indices (Batch& parBatch, const std::tuple<Keys...>& parKeys, const std::tuple<Values...>& parValues, dhandy::bt::index_seq<KeyIndices...>, dhandy::bt::index_seq<ValueIndices...>) {
-		static_assert(sizeof...(Keys) == sizeof...(KeyIndices), "Wrong index count");
-		static_assert(sizeof...(Values) == sizeof...(ValueIndices), "Wrong value count");
-		static_assert(sizeof...(Keys) == std::tuple_size<std::tuple<Keys...>>::value, "Wrong key count");
-		static_assert(sizeof...(Values) == std::tuple_size<std::tuple<Values...>>::value, "Wrong value count");
-
-		assert(not m_sha1.empty());
-		assert(m_manager);
-
-		parBatch.run(
-			"EVALSHA",
-			m_sha1,
-			dhandy::lexical_cast<std::string>(sizeof...(Keys)),
-			std::get<KeyIndices>(parKeys)...,
-			std::get<ValueIndices>(parValues)...
-		);
-	}
-} //namespace redis
-
-#endif
diff --git a/src/incredis/script_manager.cpp b/src/incredis/script_manager.cpp
deleted file mode 100644
index fba9f87..0000000
--- a/src/incredis/script_manager.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "script_manager.hpp"
-#include "duckhandy/lexical_cast.hpp"
-#include "command.hpp"
-#include <cassert>
-#if defined(MAKE_SHA1_WITH_CRYPTOPP)
-#	include <crypto++/sha.h>
-#endif
-
-namespace redis {
-	namespace {
-#if defined(MAKE_SHA1_WITH_CRYPTOPP)
-		struct LuaScriptHash {
-			union {
-				struct {
-					uint64_t part_a, part_b;
-					uint32_t part_c;
-				};
-				uint8_t raw_bytes[20];
-			};
-		};
-#endif
-	} //unnamed namespace
-
-	ScriptManager::ScriptManager (Command* parCommand) :
-		m_command(parCommand)
-	{
-		assert(m_command);
-	}
-
-#if defined(MAKE_SHA1_WITH_CRYPTOPP)
-	boost::string_ref ScriptManager::add_lua_script_ifn (const std::string& parScript) {
-		assert(m_command->is_connected());
-
-		if (parScript.empty())
-			return boost::string_ref();
-
-		using dhandy::lexical_cast;
-
-		static_assert(20 == CryptoPP::SHA1::DIGESTSIZE, "Unexpected SHA1 digest size");
-		static_assert(sizeof(LuaScriptHash) >= CryptoPP::SHA1::DIGESTSIZE, "Wrong SHA1 struct size");
-		static_assert(Sha1Array().size() == CryptoPP::SHA1::DIGESTSIZE * 2, "Wrong array size");
-
-		LuaScriptHash digest;
-		CryptoPP::SHA1().CalculateDigest(digest.raw_bytes, reinterpret_cast<const uint8_t*>(parScript.data()), parScript.size());
-		//TODO: change when lexical_cast will support arrays
-		auto sha1_str_parta = lexical_cast<std::string, dhandy::tags::hexl>(__builtin_bswap64(digest.part_a));
-		auto sha1_str_partb = lexical_cast<std::string, dhandy::tags::hexl>(__builtin_bswap64(digest.part_b));
-		auto sha1_str_partc = lexical_cast<std::string, dhandy::tags::hexl>(__builtin_bswap32(digest.part_c));
-		const std::string sha1_str =
-			std::string(sizeof(digest.part_a) * 2 - sha1_str_parta.size(), '0') + sha1_str_parta +
-			std::string(sizeof(digest.part_b) * 2 - sha1_str_partb.size(), '0') + sha1_str_partb +
-			std::string(sizeof(digest.part_c) * 2 - sha1_str_partc.size(), '0') + sha1_str_partc
-		;
-		Sha1Array sha1_array;
-		assert(sha1_str.size() == sha1_array.size());
-		std::copy(sha1_str.begin(), sha1_str.end(), sha1_array.begin());
-
-		auto it_found = m_known_hashes.find(sha1_array);
-		const bool was_present = (m_known_hashes.end() != it_found);
-		if (was_present) {
-			return boost::string_ref(it_found->data(), it_found->size());
-		}
-
-		auto reply = m_command->run("SCRIPT", "LOAD", parScript);
-		assert(not was_present);
-
-		assert(get_string(reply) == sha1_str);
-		const auto it_inserted = m_known_hashes.insert(it_found, sha1_array);
-		(void)reply;
-
-		return boost::string_ref(it_inserted->data(), it_inserted->size());
-	}
-#else
-	boost::string_ref ScriptManager::add_lua_script_ifn (const std::string& parScript) {
-		assert(m_command->is_connected());
-
-		auto it_found = m_known_scripts.find(parScript);
-		const bool was_present = (m_known_scripts.end() != it_found);
-		if (was_present) {
-			return boost::string_ref(it_found->second.data(), it_found->second.size());
-		}
-
-		auto reply = m_command->run("SCRIPT", "LOAD", parScript);
-		assert(not was_present);
-
-		const auto sha1_str = get_string(reply);
-		Sha1Array sha1_array;
-		std::copy(sha1_str.begin(), sha1_str.end(), sha1_array.begin());
-		auto it_inserted = m_known_scripts.insert(it_found, std::make_pair(parScript, sha1_array));
-
-		return boost::string_ref(it_inserted->second.data(), it_inserted->second.size());
-	}
-#endif
-} //namespace redis
diff --git a/src/incredis/script_manager.hpp b/src/incredis/script_manager.hpp
deleted file mode 100644
index e9a8065..0000000
--- a/src/incredis/script_manager.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2015, 2016, Michele Santullo
- * This file is part of "dindexer".
- *
- * "dindexer" is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * "dindexer" 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef id8E124FF76DF449CDB8FBA806F8EF4E78
-#define id8E124FF76DF449CDB8FBA806F8EF4E78
-
-#include "incredisConfig.h"
-#if defined(WITH_CRYPTOPP)
-#	define MAKE_SHA1_WITH_CRYPTOPP
-#endif
-#include <boost/utility/string_ref.hpp>
-#if defined(MAKE_SHA1_WITH_CRYPTOPP)
-#	include <set>
-#else
-#	include <map>
-#endif
-#include <string>
-#include <array>
-#include <boost/utility/string_ref.hpp>
-
-namespace redis {
-	class Command;
-
-	class ScriptManager {
-	public:
-		explicit ScriptManager ( Command* parCommand );
-
-		boost::string_ref submit_lua_script ( const std::string& parScript );
-
-	private:
-		using Sha1Array = std::array<char, 40>;
-
-		boost::string_ref add_lua_script_ifn ( const std::string& parScript );
-
-		Command* const m_command;
-#if defined(MAKE_SHA1_WITH_CRYPTOPP)
-		std::set<Sha1Array> m_known_hashes;
-#else
-		std::map<std::string, Sha1Array> m_known_scripts;
-#endif
-	};
-
-	inline boost::string_ref ScriptManager::submit_lua_script (const std::string& parScript) {
-		return add_lua_script_ifn(parScript);
-	}
-} //namespace redis
-
-#endif

From 6478b45dbf421f8d8d0a08bfbf02fd0ef3726d97 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 14 Jul 2016 17:31:56 +0100
Subject: [PATCH 162/170] Updated submodules

---
 lib/duckhandy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/duckhandy b/lib/duckhandy
index 0da25f9..f59d379 160000
--- a/lib/duckhandy
+++ b/lib/duckhandy
@@ -1 +1 @@
-Subproject commit 0da25f9094c08ccb1312e502e020db6a68504d34
+Subproject commit f59d37913a0fb37af53af39a43c44ae9be39d697

From f96fa212d61094352cc9c032e8897f4dc8737ddf Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 14 Jul 2016 18:04:25 +0100
Subject: [PATCH 163/170] Remove Sprout - it's not used by this project
 anymore.

duckhandy still uses it, and it pulls it in by itself.
---
 .gitmodules | 3 ---
 lib/sprout  | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 lib/sprout

diff --git a/.gitmodules b/.gitmodules
index 5340279..dfd4a5f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "lib/better-enums"]
 	path = lib/better-enums
 	url = https://github.com/aantron/better-enums
-[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
diff --git a/lib/sprout b/lib/sprout
deleted file mode 160000
index fea5e75..0000000
--- a/lib/sprout
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fea5e752bda763c27ecd6f84531cdd0b4f82399d

From e5814a5575cf21112d4910dbb311082b049060f9 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Thu, 14 Jul 2016 18:13:30 +0100
Subject: [PATCH 164/170] Buildfix in redis backend

---
 lib/incredis                         | 2 +-
 src/backends/redis/backend_redis.hpp | 4 ++--
 src/backends/redis/delete.cpp        | 2 +-
 src/backends/redis/find.cpp          | 2 +-
 src/backends/redis/tag.cpp           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/incredis b/lib/incredis
index 6aad99c..8860dc0 160000
--- a/lib/incredis
+++ b/lib/incredis
@@ -1 +1 @@
-Subproject commit 6aad99c0f460da5c09b719f6112ab38e4fea2ce7
+Subproject commit 8860dc06209b44c2237b1d0a014fef9b6a6e398c
diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp
index 3c93bda..7e13626 100644
--- a/src/backends/redis/backend_redis.hpp
+++ b/src/backends/redis/backend_redis.hpp
@@ -19,8 +19,8 @@
 #define idB2F92EE07A004D5293FD0657EEE8F75B
 
 #include "backends/db_backend.hpp"
-#include "incredis.hpp"
-#include "script.hpp"
+#include "incredis/incredis.hpp"
+#include "incredis/script.hpp"
 #include "dindexer-core/searchpaths.hpp"
 #include <string>
 #include <cstdint>
diff --git a/src/backends/redis/delete.cpp b/src/backends/redis/delete.cpp
index 3631117..7eab682 100644
--- a/src/backends/redis/delete.cpp
+++ b/src/backends/redis/delete.cpp
@@ -17,7 +17,7 @@
 
 #include "delete.hpp"
 #include "tag.hpp"
-#include "incredis.hpp"
+#include "incredis/incredis.hpp"
 #include "duckhandy/lexical_cast.hpp"
 #include "duckhandy/sequence_bt.hpp"
 #include "dindexerConfig.h"
diff --git a/src/backends/redis/find.cpp b/src/backends/redis/find.cpp
index b111c0d..4483517 100644
--- a/src/backends/redis/find.cpp
+++ b/src/backends/redis/find.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "find.hpp"
-#include "incredis.hpp"
+#include "incredis/incredis.hpp"
 #include "duckhandy/lexical_cast.hpp"
 #include "dindexerConfig.h"
 #include "dindexer-core/split_tags.hpp"
diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp
index 9d823ba..d416db2 100644
--- a/src/backends/redis/tag.cpp
+++ b/src/backends/redis/tag.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "tag.hpp"
-#include "incredis.hpp"
+#include "incredis/incredis.hpp"
 #include "dindexerConfig.h"
 #include "duckhandy/lexical_cast.hpp"
 #include "dindexer-core/split_tags.hpp"

From 5ddd8d94081cb1794e997d4d40251aeebf2896b4 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 15 Jul 2016 14:55:33 +0100
Subject: [PATCH 165/170] Update submodules

---
 lib/duckhandy | 2 +-
 lib/incredis  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/duckhandy b/lib/duckhandy
index f59d379..acdb592 160000
--- a/lib/duckhandy
+++ b/lib/duckhandy
@@ -1 +1 @@
-Subproject commit f59d37913a0fb37af53af39a43c44ae9be39d697
+Subproject commit acdb592d89ab81df674f39b98d727837ea7c1251
diff --git a/lib/incredis b/lib/incredis
index 8860dc0..7a93e96 160000
--- a/lib/incredis
+++ b/lib/incredis
@@ -1 +1 @@
-Subproject commit 8860dc06209b44c2237b1d0a014fef9b6a6e398c
+Subproject commit 7a93e9667f6b8d3e92c8eae395b47bcfb98acd41

From 29c6e084b33c50ca659e11d7fc7aa03f3c610c2e Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 15 Jul 2016 15:00:54 +0100
Subject: [PATCH 166/170] Update submodules

---
 lib/duckhandy | 2 +-
 lib/incredis  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/duckhandy b/lib/duckhandy
index acdb592..bbe0326 160000
--- a/lib/duckhandy
+++ b/lib/duckhandy
@@ -1 +1 @@
-Subproject commit acdb592d89ab81df674f39b98d727837ea7c1251
+Subproject commit bbe0326a580ff28758f9ecb8a18fdaf519bb231f
diff --git a/lib/incredis b/lib/incredis
index 7a93e96..4472263 160000
--- a/lib/incredis
+++ b/lib/incredis
@@ -1 +1 @@
-Subproject commit 7a93e9667f6b8d3e92c8eae395b47bcfb98acd41
+Subproject commit 447226378a2c50e5ed1665189aba61692c59c86e

From b021c3608088c377d2a3fcc59f18a6178c90f9f0 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 15 Jul 2016 15:11:45 +0100
Subject: [PATCH 167/170] Update submodules

---
 lib/duckhandy | 2 +-
 lib/incredis  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/duckhandy b/lib/duckhandy
index bbe0326..9587e0e 160000
--- a/lib/duckhandy
+++ b/lib/duckhandy
@@ -1 +1 @@
-Subproject commit bbe0326a580ff28758f9ecb8a18fdaf519bb231f
+Subproject commit 9587e0e7a19275c462e22b044e9511bac9597605
diff --git a/lib/incredis b/lib/incredis
index 4472263..144394e 160000
--- a/lib/incredis
+++ b/lib/incredis
@@ -1 +1 @@
-Subproject commit 447226378a2c50e5ed1665189aba61692c59c86e
+Subproject commit 144394e4f016a4758db58f26219b79495442dff0

From 45ff635ee14bf3a20766e385c7130f4d8921fdd3 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 15 Jul 2016 15:17:55 +0100
Subject: [PATCH 168/170] Update list of submodules to be ignored by flat_git

---
 flat_git.yml | 3 +++
 lib/incredis | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 flat_git.yml

diff --git a/flat_git.yml b/flat_git.yml
new file mode 100644
index 0000000..bf79c81
--- /dev/null
+++ b/flat_git.yml
@@ -0,0 +1,3 @@
+inplace_submodules:
+    - pbl
+    - better-enums
diff --git a/lib/incredis b/lib/incredis
index 144394e..94fa688 160000
--- a/lib/incredis
+++ b/lib/incredis
@@ -1 +1 @@
-Subproject commit 144394e4f016a4758db58f26219b79495442dff0
+Subproject commit 94fa688c1784b49689c9a057566bf281016c1634

From 7804fbccbcd56b9898c87b9868fe88e8b71be076 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 15 Jul 2016 15:23:38 +0100
Subject: [PATCH 169/170] Import flat_git tool

---
 tools/flat_git.rb | 152 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100755 tools/flat_git.rb

diff --git a/tools/flat_git.rb b/tools/flat_git.rb
new file mode 100755
index 0000000..442eb39
--- /dev/null
+++ b/tools/flat_git.rb
@@ -0,0 +1,152 @@
+#!/usr/bin/env ruby
+
+require 'shellwords'
+require 'pathname'
+require 'yaml'
+
+GIT="git"
+
+SubmoduleInfo = Struct.new(:path, :url, :status, :name, :hash)
+
+def call_git(parTokens, parCaptureStdout=true, work_dir: nil)
+	git_c_param = ""
+	if work_dir then
+		raise ScriptError, "Tainted path received in call_git() function" if work_dir.tainted?
+		git_c_param = " -C #{work_dir}"
+	end
+
+	command_line = ""
+	if parTokens.is_a?String then
+		raise ScriptError, "Tainted token received in call_git() function" if parTokens.tainted?
+		command_line = parTokens
+	elsif parTokens.is_a?Array then
+		parTokens.each do |tok,idx|
+			raise ScriptError, "Tainted token at index #{idx} received in call_git() function" if tok.tainted?
+		end
+		command_line = parTokens.join(" ")
+	else
+		raise ScriptError, "Invalid parTokens received in call_git() function"
+	end
+
+	if parCaptureStdout then
+		return `#{GIT}#{git_c_param} #{command_line}`.chomp
+	else
+		return Kernel.system("#{GIT}#{git_c_param} #{command_line}")
+	end
+end
+
+def is_absolute_url?(parUrl)
+	return not(/^\.{1,2}\// =~ parUrl)
+end
+
+def sanitized(parString)
+	retval = Shellwords.escape(parString)
+	retval.untaint
+	return retval
+end
+
+def current_remote_url()
+	current_branch = call_git(["rev-parse", "--abbrev-ref", "HEAD"])
+	current_remote = call_git(["config", "branch.#{sanitized(current_branch)}.remote"])
+	remote_url = call_git(["config", "remote.#{sanitized(current_remote)}.url"])
+	return remote_url
+end
+
+def submodules_info(parBaseRemoteUrl)
+	regex_submodule = /^submodule\.(.+?)\.([^.]+)$/
+	submodules = Hash.new{ |hash, key| hash[key] = SubmoduleInfo.new }
+	call_git(["config", "--file", ".gitmodules", "--name-only", "--list"]).lines.map(&:chomp).each do |line|
+		m = regex_submodule.match(line)
+		next if m.nil?
+
+		new_value = call_git(["config", "--file", ".gitmodules", sanitized(line)])
+		case m[2]
+		when "url" then
+			submodules[m[1]].url = is_absolute_url?(new_value) ? new_value : File.join(parBaseRemoteUrl, new_value)
+			submodules[m[1]].name = File.basename(new_value, ".git")
+		when "path" then
+			submodules[m[1]].path = new_value
+		end
+	end
+
+	regex_status = /^(.)([0-9a-fA-F]{40})\s+(.+?)(?:\s+\(.+\))?$/
+	call_git(["submodule", "status"]).lines.map(&:chomp).each do |line|
+		m = regex_status.match(line)
+		next if m.nil?
+
+		submodules[m[3]].status = m[1]
+		submodules[m[3]].hash = m[2]
+	end
+	return submodules
+end
+
+def is_inside_git_repo(parPath)
+	reply = call_git("rev-parse --is-inside-work-tree 2> /dev/null || echo false", work_dir: parPath)
+	return "true" == reply
+end
+
+class FlatGit
+	def initialize(parCloneDir)
+		unless File.exists?(parCloneDir) && File.directory?(parCloneDir) then
+			raise ArgumentError, "Specified path doesn't exist or is not a valid directory"
+		end
+
+		if is_inside_git_repo(sanitized(parCloneDir)) then
+			raise ArgumentError, "Specified path is invalid because it appears to be inside a git repository"
+		end
+
+		@clone_dir_abs = Pathname.new(parCloneDir).realpath
+		@clone_dir = parCloneDir
+	end
+
+	def clone_submodules()
+		inplace_submodules = if File.file?("flat_git.yml") then
+			local_settings = YAML.load_file("flat_git.yml")
+			lst = local_settings["inplace_submodules"]
+			lst = [lst] if lst.is_a?(String)
+			lst.is_a?(Array) && lst || Array.new
+		else
+			Array.new
+		end
+
+		submodules_info(current_remote_url()).each_value do |submod|
+			next unless submod.status == "-"
+
+			guessed_clone_dir = File.join(@clone_dir, submod.name)
+			abs_guessed_clone_dir = File.join(@clone_dir_abs, submod.name)
+			if inplace_submodules.include?(submod.name) then
+				success = call_git(["submodule", "update", "--init", sanitized(submod.path)], false)
+				return false unless success
+			else
+				if !File.exists?(guessed_clone_dir) || Dir.entries(guessed_clone_dir).empty? then
+					success = call_git(["clone", sanitized(submod.url)], false, work_dir: sanitized(@clone_dir_abs))
+					return false unless success
+
+					if File.exists?(abs_guessed_clone_dir) && File.directory?(abs_guessed_clone_dir) then
+						call_git(["config", "core.worktree", ".."], work_dir: sanitized(abs_guessed_clone_dir))
+						call_git(["reset", "--hard", sanitized(submod.hash)], work_dir: sanitized(abs_guessed_clone_dir))
+
+						Dir.chdir(abs_guessed_clone_dir) do |path|
+							if File.file?(".gitmodules") then
+								success = clone_submodules()
+								return false unless success
+							end
+						end
+					else
+						raise RuntimeError, "Unable to guess where git just cloned the repo"
+					end
+				end
+				call_git(["submodule", "init", sanitized(submod.path)])
+				File.open(File.join(submod.path, ".git"), 'w') {|file| file.puts("gitdir: #{File.join(abs_guessed_clone_dir, ".git")}")}
+			end
+		end
+		return true
+	end
+end
+
+unless ARGV.length == 1 then
+	$stderr.puts "Wrong number of arguments"
+	exit 2
+end
+
+exit FlatGit.new(ARGV[0]).clone_submodules() ? 1 : 0

From 062b927d392297b0869a067583b4ea2b775cdf9a Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 15 Jul 2016 15:47:21 +0100
Subject: [PATCH 170/170] Add unlicense license to flat_git.

---
 cmake/Modules/shared_git_project.cmake | 25 ++++++++++++++++++++++
 tools/flat_git.rb                      | 29 +++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/cmake/Modules/shared_git_project.cmake b/cmake/Modules/shared_git_project.cmake
index 74c92af..54463ef 100644
--- a/cmake/Modules/shared_git_project.cmake
+++ b/cmake/Modules/shared_git_project.cmake
@@ -1,3 +1,28 @@
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# For more information, please refer to <http://unlicense.org/>
+
 cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR)
 
 function (add_shared_git_project SUBMODULE_PATH)
diff --git a/tools/flat_git.rb b/tools/flat_git.rb
index 442eb39..6f1e2f9 100755
--- a/tools/flat_git.rb
+++ b/tools/flat_git.rb
@@ -1,5 +1,32 @@
 #!/usr/bin/env ruby
 
+=begin
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>
+=end
+
 require 'shellwords'
 require 'pathname'
 require 'yaml'
@@ -149,4 +176,4 @@ unless ARGV.length == 1 then
 	exit 2
 end
 
-exit FlatGit.new(ARGV[0]).clone_submodules() ? 1 : 0
+exit(FlatGit.new(ARGV[0]).clone_submodules() ? 1 : 0)