WIP. Database updater now has its own namespace and dedicated directory

test/CheckDatabaseBasics.cpp

@@ -4,6 +4,7 @@
 #include "database/DatabaseHandler.hpp"
 
 #include "database/FileTypes.hpp"
+#include "database/MediaDirectory.hpp"
 
 int main(void)
 {
@@ -13,7 +14,7 @@ int main(void)
 		boost::filesystem::remove("test2.db");
 
 		// Set up the long living database session
-		DatabaseHandler database("test2.db");
+		Database::Handler database("test2.db");
 
 		Wt::Dbo::Transaction transaction(database.getSession());
 
@@ -70,6 +71,11 @@ int main(void)
 			std::cout << "Parent's = " << path->getParent()->getPath() << std::endl;
 		}
 
+		// Update last update
+		Database::MediaDirectorySettings::pointer settings = Database::MediaDirectorySettings::get(database.getSession());
+		settings.modify()->setLastUpdate(boost::posix_time::second_clock::local_time());
+
+		std::cout << "last update = " << settings->getLastUpdated() << std::endl;
 
 		// make some empty root dirs
 

test/DatabaseIntegrity.cpp

@@ -15,7 +15,7 @@ int main(void)
 		std::cout << "Starting test!" << std::endl;
 
 		// Set up the long living database session
-		DatabaseHandler database("test.db");
+		Database::Handler database("test.db");
 
 		Wt::Dbo::Transaction transaction(database.getSession());
 

test/Makefile.am

@@ -36,8 +36,7 @@ remote_SOURCES = \
 	$(top_srcdir)/database/DatabaseHandler.cpp		\
 	$(top_srcdir)/database/SqlQuery.cpp		\
 	$(top_srcdir)/database/Path.cpp				\
-	$(top_srcdir)/database/Video.cpp			\
-	$(top_srcdir)/database/Checksum.cpp
+	$(top_srcdir)/database/Video.cpp
 
 remote_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir) -I$(top_srcdir)/remote -I$(top_srcdir)/boost
 
@@ -50,8 +49,7 @@ database_integrity_SOURCES = \
 	$(top_srcdir)/database/DatabaseHandler.cpp	\
 	$(top_srcdir)/database/SqlQuery.cpp		\
 	$(top_srcdir)/database/Path.cpp			\
-	$(top_srcdir)/database/Video.cpp			\
-	$(top_srcdir)/database/Checksum.cpp
+	$(top_srcdir)/database/Video.cpp
 
 database_integrity_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir)
 
@@ -62,10 +60,10 @@ database_basics_SOURCES = \
 	$(top_srcdir)/database/Release.cpp	\
 	$(top_srcdir)/database/Track.cpp	\
 	$(top_srcdir)/database/DatabaseHandler.cpp	\
+	$(top_srcdir)/database/MediaDirectory.cpp	\
 	$(top_srcdir)/database/SqlQuery.cpp		\
 	$(top_srcdir)/database/Path.cpp			\
-	$(top_srcdir)/database/Video.cpp			\
-	$(top_srcdir)/database/Checksum.cpp
+	$(top_srcdir)/database/Video.cpp
 
 database_basics_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir)
 

test/RemoteClientServer.cpp

@@ -651,6 +651,7 @@ int main()
 {
 	try {
 		bool extendedTests = true;
+		bool writeCovers = false;
 
 		std::cout << "Running test... extendedTests = " << std::boolalpha << extendedTests << std::endl;
 
@@ -709,13 +710,16 @@ int main()
 				std::vector<Cover> coverArts;
 				client.getCoverRelease(coverArts, release.id);
 
-				boost::filesystem::create_directory("cover");
-				BOOST_FOREACH(const Cover coverArt, coverArts)
+				if (writeCovers)
 				{
-					std::ostringstream oss; oss << "cover/" << release.id << "." << release.name << ".jpeg";
-					std::ofstream out(oss.str().c_str());
-					BOOST_FOREACH(unsigned char c, coverArt.data)
-						out.put(c);
+					boost::filesystem::create_directory("cover");
+					BOOST_FOREACH(const Cover coverArt, coverArts)
+					{
+						std::ostringstream oss; oss << "cover/" << release.id << "." << release.name << ".jpeg";
+						std::ofstream out(oss.str().c_str());
+						BOOST_FOREACH(unsigned char c, coverArt.data)
+							out.put(c);
+					}
 				}
 
 				std::cout << "Release '" << release << "', spotted " << coverArts.size() << " covers!" << std::endl;

test/TestDatabase.cpp

@@ -3,7 +3,7 @@
 
 namespace TestDatabase {
 
-DatabaseHandler* create()
+	Database::Handler* create()
 {
 
 	boost::filesystem::path p ("test_db");
@@ -11,7 +11,7 @@ DatabaseHandler* create()
 	// Remove previous db
 //	boost::filesystem::remove(p);
 
-	DatabaseHandler* db = new DatabaseHandler(p);
+	Database::Handler* db = new Database::Handler(p);
 
 
 	// Populate DB

test/TestDatabase.hpp

@@ -3,6 +3,6 @@
 
 namespace TestDatabase {
 
-	DatabaseHandler* create();
+	Database::Handler* create();
 
 } // namespace TestDatabase