Move scan's core code into new machinery lib.

CMakeLists.txt

@@ -52,6 +52,7 @@ target_include_directories(${bare_name}-inc
 #Libraries
 add_subdirectory(src/pq)
 add_subdirectory(src/common)
+add_subdirectory(src/machinery)
 
 #Actions
 add_subdirectory(src/main)

src/machinery/CMakeLists.txt

@@ -0,0 +1,38 @@
+project(${bare_name}-machinery CXX C)
+
+include(WithMediaAutodetect)
+find_package(Magic REQUIRED)
+
+add_library(${PROJECT_NAME} SHARED
+	indexer.cpp
+	pathname.cpp
+	tiger.c
+	tiger.cpp
+	mimetype.cpp
+	filesearcher.cpp
+	discinfo.cpp
+	mediatype.cpp
+)
+
+#target_include_directories(${PROJECT_NAME}
+#)
+target_include_directories(${PROJECT_NAME}
+	PRIVATE ${MAGIC_INCLUDE_DIR}
+)
+
+target_link_libraries(${PROJECT_NAME}
+	PRIVATE ${bare_name}-if
+	PRIVATE ${MAGIC_LIBRARIES}
+)
+
+if (DINDEXER_WITH_MEDIA_AUTODETECT)
+	target_include_directories(${PROJECT_NAME} SYSTEM
+		PRIVATE ${BLKID_INCLUDE_DIRS}
+	)
+	target_link_libraries(${PROJECT_NAME}
+		PRIVATE ${BLKID_LIBRARIES}
+	)
+	target_compile_definitions(${PROJECT_NAME}
+		PRIVATE WITH_MEDIA_AUTODETECT
+	)
+endif()

src/machinery/filesearcher.cpp

@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "filesearcher.hpp"
+#include "dindexer-machinery/filesearcher.hpp"
 
 #if !defined(_XOPEN_SOURCE)
 #define _XOPEN_SOURCE 500

src/machinery/indexer.cpp

@@ -15,13 +15,13 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "indexer.hpp"
+#include "dindexer-machinery/indexer.hpp"
 #include "pathname.hpp"
-#include "tiger.hpp"
+#include "dindexer-machinery/tiger.hpp"
 #include "dindexer-common/settings.hpp"
-#include "filestats.hpp"
+#include "dindexer-machinery/filestats.hpp"
 #include "mimetype.hpp"
-#include "recorddata.hpp"
+#include "dindexer-machinery/recorddata.hpp"
 #include <algorithm>
 #include <functional>
 #include <stdexcept>

src/machinery/mediatype.cpp

@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mediatype.hpp"
+#include "dindexer-machinery/mediatype.hpp"
 #include "pathname.hpp"
 #include "discinfo.hpp"
 #include <utility>

src/machinery/tiger.cpp

@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tiger.hpp"
+#include "dindexer-machinery/tiger.hpp"
 #include <fstream>
 #include <cstdint>
 #include <memory>

src/scan/CMakeLists.txt

@@ -1,33 +1,21 @@
-project(${bare_name}-scan CXX C)
+project(${bare_name}-scan CXX)
 
 include(WithMediaAutodetect)
-find_package(Magic REQUIRED)
 
 add_executable(${PROJECT_NAME}
 	main.cpp
-	filesearcher.cpp
-	pathname.cpp
-	indexer.cpp
-	tiger.c
-	tiger.cpp
 	dbbackend.cpp
 	commandline.cpp
-	discinfo.cpp
-	mediatype.cpp
-	mimetype.cpp
 )
 
 target_include_directories(${PROJECT_NAME}
 	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
-target_include_directories(${PROJECT_NAME}
-	PRIVATE ${MAGIC_INCLUDE_DIR}
-)
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
-	PRIVATE ${MAGIC_LIBRARIES}
+	PRIVATE ${bare_name}-machinery
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")
@@ -36,12 +24,6 @@ target_compile_definitions(${PROJECT_NAME}
 )
 
 if (DINDEXER_WITH_MEDIA_AUTODETECT)
-	target_include_directories(${PROJECT_NAME} SYSTEM
-		PRIVATE ${BLKID_INCLUDE_DIRS}
-	)
-	target_link_libraries(${PROJECT_NAME}
-		PRIVATE ${BLKID_LIBRARIES}
-	)
 	target_compile_definitions(${PROJECT_NAME}
 		PRIVATE WITH_MEDIA_AUTODETECT
 	)

src/scan/commandline.hpp

@@ -19,7 +19,7 @@
 #define id1B7A42F6E46547A6AB0F914E2A91399F
 
 #include <boost/program_options/variables_map.hpp>
-#include "mediatype.hpp"
+#include "dindexer-machinery/mediatype.hpp"
 
 namespace din {
 	bool parse_commandline ( int parArgc, char* parArgv[], boost::program_options::variables_map& parVarMap );

src/scan/dbbackend.cpp

@@ -18,7 +18,7 @@
 #include "dbbackend.hpp"
 #include "pq/connection.hpp"
 #include "dindexer-common/settings.hpp"
-#include "recorddata.hpp"
+#include "dindexer-machinery/recorddata.hpp"
 #include <string>
 #include <sstream>
 #include <utility>

src/scan/main.cpp

@@ -19,10 +19,10 @@
 #	undef WITH_PROGRESS_FEEDBACK
 #endif
 
-#include "recorddata.hpp"
+#include "dindexer-machinery/recorddata.hpp"
 #include "dindexerConfig.h"
-#include "filesearcher.hpp"
-#include "indexer.hpp"
+#include "dindexer-machinery/filesearcher.hpp"
+#include "dindexer-machinery/indexer.hpp"
 #include "dindexer-common/settings.hpp"
 #include "commandline.hpp"
 #include "dbbackend.hpp"