From 5832ca3374dc9c92a43295027f60bf00ccd9bb1e Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Mon, 16 May 2016 09:59:10 +0200
Subject: [PATCH] Move split_tags to common lib.

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

diff --git a/src/tag/split_tags.hpp b/include/dindexer-common/split_tags.hpp
similarity index 96%
rename from src/tag/split_tags.hpp
rename to include/dindexer-common/split_tags.hpp
index 15a2695..149cc25 100644
--- a/src/tag/split_tags.hpp
+++ b/include/dindexer-common/split_tags.hpp
@@ -23,8 +23,8 @@
 #include <boost/utility/string_ref.hpp>
 #include "helpers/compatibility.h"
 
-namespace din {
+namespace dinlib {
 	std::vector<boost::string_ref> split_tags ( const std::string& parCommaSeparatedList ) a_pure;
-} //namespace din
+} //namespace dinlib
 
 #endif
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 555b42f..316497a 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -8,6 +8,7 @@ add_library(${PROJECT_NAME}
 	validationerror.cpp
 	common_info.cpp
 	readline_wrapper.cpp
+	split_tags.cpp
 )
 
 target_include_directories(${PROJECT_NAME}
diff --git a/src/tag/split_tags.cpp b/src/common/split_tags.cpp
similarity index 96%
rename from src/tag/split_tags.cpp
rename to src/common/split_tags.cpp
index 71fa5c3..4ba7275 100644
--- a/src/tag/split_tags.cpp
+++ b/src/common/split_tags.cpp
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "split_tags.hpp"
+#include "dindexer-common/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 din {
+namespace dinlib {
 	std::vector<boost::string_ref> split_tags (const std::string& parCommaSeparatedList) {
 		using OutRange = boost::iterator_range<std::string::const_iterator>;
 		using boost::token_finder;
@@ -48,4 +48,4 @@ namespace din {
 				filtered([](const string_ref& r){return not r.empty();})
 		);
 	}
-} //namespace din
+} //namespace dinlib
diff --git a/src/tag/CMakeLists.txt b/src/tag/CMakeLists.txt
index a65598d..bc29328 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
-	split_tags.cpp
 	tag_postgres.cpp
 )
 
diff --git a/src/tag/main.cpp b/src/tag/main.cpp
index cb3aec8..4686153 100644
--- a/src/tag/main.cpp
+++ b/src/tag/main.cpp
@@ -19,7 +19,7 @@
 #include "dindexer-common/settings.hpp"
 #include "dindexerConfig.h"
 #include "tag_postgres.hpp"
-#include "split_tags.hpp"
+#include "dindexer-common/split_tags.hpp"
 #include <iostream>
 #include <ciso646>
 
@@ -60,7 +60,7 @@ int main (int parArgc, char* parArgv[]) {
 	}
 
 	const auto master_tags_string = vm["tags"].as<std::string>();
-	std::vector<boost::string_ref> tags = din::split_tags(master_tags_string);
+	std::vector<boost::string_ref> tags = dinlib::split_tags(master_tags_string);
 
 	din::tag_files(settings.db, ids, tags);
 	return 0;
diff --git a/test/unit_cli/CMakeLists.txt b/test/unit_cli/CMakeLists.txt
index da1cb19..1109d81 100644
--- a/test/unit_cli/CMakeLists.txt
+++ b/test/unit_cli/CMakeLists.txt
@@ -4,7 +4,6 @@ add_executable(${PROJECT_NAME}
 	${CMAKE_SOURCE_DIR}/src/main/damerau_levenshtein.c
 	${CMAKE_SOURCE_DIR}/src/main/utf8_ops.c
 	test_damerau_levenshtein.cpp
-	${CMAKE_SOURCE_DIR}/src/tag/split_tags.cpp
 	test_tag_splitting.cpp
 )
 
diff --git a/test/unit_cli/test_tag_splitting.cpp b/test/unit_cli/test_tag_splitting.cpp
index 3964af3..08066f6 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 "tag/split_tags.hpp"
+#include "dindexer-common/split_tags.hpp"
 
 TEST(cli_main, split_tags) {
-	using din::split_tags;
+	using dinlib::split_tags;
 
 	{
 		const std::string test_tags = "tag1,tag2";