From 579a565e22ff0e9b555c1b714a60bd3f017cc036 Mon Sep 17 00:00:00 2001
From: emeric <emeric@nas>
Date: Fri, 4 Jul 2014 12:15:57 +0200
Subject: [PATCH] WIP. Adding audio stats when refreshing database, and use it
 to refresh database lastUpdated entry

---
 database-updater/DatabaseUpdater.cpp | 30 +++++++++++++++++++---------
 database-updater/DatabaseUpdater.hpp | 30 ++++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/database-updater/DatabaseUpdater.cpp b/database-updater/DatabaseUpdater.cpp
index 74549089..b5547182 100644
--- a/database-updater/DatabaseUpdater.cpp
+++ b/database-updater/DatabaseUpdater.cpp
@@ -25,7 +25,7 @@ Updater::Updater(boost::filesystem::path dbPath, MetaData::Parser& parser)
 void
 Updater::process(void)
 {
-	removeMissingAudioFiles();
+	removeMissingAudioFiles(_result.audioStats);
 	// TODO video files
 
 	Wt::Dbo::Transaction transaction(_db.getSession());
@@ -36,17 +36,24 @@ Updater::process(void)
 	{
 		switch (directory->getType()) {
 			case MediaDirectory::Audio:
-				refreshAudioDirectory(directory->getPath());
+				refreshAudioDirectory(directory->getPath(), _result.audioStats);
 				break;
 			case MediaDirectory::Video:
 				refreshVideoDirectory(directory->getPath());
 				break;
 		}
 	}
+
+
+	if (_result.audioStats.nbChanges() + _result.videoStats.nbChanges() > 0)
+	{
+		Database::MediaDirectorySettings::pointer settings = Database::MediaDirectorySettings::get(_db.getSession());
+		settings.modify()->setLastUpdate(boost::posix_time::second_clock::local_time());
+	}
 }
 
 void
-Updater::processAudioFile( const boost::filesystem::path& file)
+Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats)
 {
 	try {
 
@@ -99,8 +106,10 @@ Updater::processAudioFile( const boost::filesystem::path& file)
 			std::cerr << "Skipped '" << file << "' (duration null!)" << std::endl;
 
 			// If Track exists here, delete it!
-			if (track)
+			if (track) {
 				track.remove();
+				stats.nbRemoved++;
+			}
 		}
 
 		std::string title;
@@ -172,10 +181,12 @@ Updater::processAudioFile( const boost::filesystem::path& file)
 			// Create a new song
 			track = Track::create(_db.getSession(), file, artist, release);
 			std::cout << "Adding '" << file << "'" << std::endl;
+			stats.nbAdded++;
 		}
 		else
 		{
 			std::cout << "Updating '" << file << "'" << std::endl;
+			stats.nbModified++;
 		}
 
 		assert(track);
@@ -222,7 +233,7 @@ Updater::processAudioFile( const boost::filesystem::path& file)
 
 
 void
-Updater::refreshAudioDirectory( const boost::filesystem::path& p)
+Updater::refreshAudioDirectory( const boost::filesystem::path& p, Stats& stats)
 {
 	std::cout << "Refreshing audio directory " << p << std::endl;
 	if (boost::filesystem::exists(p) && boost::filesystem::is_directory(p)) {
@@ -238,10 +249,10 @@ Updater::refreshAudioDirectory( const boost::filesystem::path& p)
 
 			try {
 				if (boost::filesystem::is_directory(file)) {
-					refreshAudioDirectory( file );
+					refreshAudioDirectory( file, stats );
 				}
 				else if (boost::filesystem::is_regular(file)) {
-					processAudioFile( file );
+					processAudioFile( file, stats );
 				}
 				else {
 					std::cout << "Skipped '" << file << "' (not regular)" << std::endl;
@@ -256,7 +267,7 @@ Updater::refreshAudioDirectory( const boost::filesystem::path& p)
 }
 
 void
-Updater::removeMissingAudioFiles( void )
+Updater::removeMissingAudioFiles( Stats& stats )
 {
 	std::cerr << "Removing missing files..." << std::endl;
 	Wt::Dbo::Transaction transaction(_db.getSession());
@@ -272,13 +283,14 @@ Updater::removeMissingAudioFiles( void )
 			|| !boost::filesystem::is_regular( p ) )
 		{
 			(*i).remove();
+			stats.nbRemoved++;
 			std::cerr << "Removing file '" << p << "'" << std::endl;
 		}
 	}
 
 	transaction.commit();
 
-	std::cerr << "Refrshing missing files done!" << std::endl;
+	std::cerr << "Refreshing missing files done!" << std::endl;
 }
 
 Path::pointer
diff --git a/database-updater/DatabaseUpdater.hpp b/database-updater/DatabaseUpdater.hpp
index 3b1bf3fe..e3fff663 100644
--- a/database-updater/DatabaseUpdater.hpp
+++ b/database-updater/DatabaseUpdater.hpp
@@ -14,13 +14,33 @@ class Updater
 {
 	public:
 
+		struct Stats
+		{
+			std::size_t	nbAdded;
+			std::size_t	nbRemoved;
+			std::size_t	nbModified;
+			Stats() : nbAdded(0), nbRemoved(0), nbModified(0) {}
+
+			std::size_t nbChanges() const { return nbAdded + nbRemoved + nbModified;}
+		};
+
+		struct Result
+		{
+			Stats	audioStats;
+			Stats	videoStats;
+		};
+
 		Updater(boost::filesystem::path db, MetaData::Parser& parser);
 
 		// Update database
+		// TODO add a callback to get notifed once finished
 		void process();
 
+		const Result& getResult(void) const { return _result; }
+
 	private:
 
+
 //		void refresh(const WatchedDirectory& directory);
 
 		// Video
@@ -28,15 +48,17 @@ class Updater
 		void processVideoFile( const boost::filesystem::path& file);
 
 		// Audio
-		void removeMissingAudioFiles( void );
-		void refreshAudioDirectory( const boost::filesystem::path& directory);
-		void processAudioFile( const boost::filesystem::path& file);
+		void removeMissingAudioFiles( Stats& stats );
+		void refreshAudioDirectory( const boost::filesystem::path& directory, Stats& stats);
+		void processAudioFile( const boost::filesystem::path& file, Stats& stats);
 
 		Database::Path::pointer getAddPath(const boost::filesystem::path& path);
 
 		Database::Handler	_db;
 
-		MetaData::Parser&		_metadataParser;
+		MetaData::Parser&	_metadataParser;
+
+		Result			_result;	// update results
 }; // class Updater
 
 } // DatabaseUpdater