From: APTX <marek321@gmail.com>
Date: Tue, 23 Apr 2013 21:15:45 +0000 (+0200)
Subject: AniOni now checks watched directories on startup.
X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=aa535013f95971f46b67cac08daa14a8b37868a4;p=localmylist.git

AniOni now checks watched directories on startup.
---

diff --git a/anioni/anioni.cpp b/anioni/anioni.cpp
index 1c76fda..a5eecfd 100644
--- a/anioni/anioni.cpp
+++ b/anioni/anioni.cpp
@@ -2,6 +2,7 @@
 
 #include <LocalMyList/MyList>
 #include <LocalMyList/Settings>
+#include <LocalMyList/DirectoryWatcher>
 #ifndef LOCALMYLIST_NO_ANIDBUDPCLIENT
 #	include <LocalMyList/RequestHandler>
 #	include <AniDBUdpClient/Client>
@@ -128,6 +129,7 @@ void AniOni::start()
 	if (watchDirectories)
 	{
 		LocalMyList::instance()->setupDirectoryWatcher();
+		LocalMyList::instance()->directoryWatcher()->checkWatchedDirectories();
 	}
 
 	if (!(runUdpClient || runRenameHandler || watchDirectories))
diff --git a/localmylist/directorywatcher.cpp b/localmylist/directorywatcher.cpp
index 4a49377..a668f64 100644
--- a/localmylist/directorywatcher.cpp
+++ b/localmylist/directorywatcher.cpp
@@ -79,4 +79,10 @@ void DirectoryWatcher::watchedDirectoryChanged(const QString &path)
 	previousEntries.insert(path, currentSet);
 }
 
+void DirectoryWatcher::checkWatchedDirectories()
+{
+	for (const QString &dir : watcher->directories())
+		watchedDirectoryChanged(dir);
+}
+
 } // namespace LocalMyList
diff --git a/localmylist/directorywatcher.h b/localmylist/directorywatcher.h
index 0f96bec..fd2f350 100644
--- a/localmylist/directorywatcher.h
+++ b/localmylist/directorywatcher.h
@@ -21,12 +21,14 @@ public:
 	~DirectoryWatcher();
 
 signals:
-	
+
 public slots:
 	void setWatchedDirectories();
 
 	void watchedDirectoryChanged(const QString &path);
 
+	void checkWatchedDirectories();
+
 private:
 	Database *db;
 	Settings *settings;
diff --git a/localmylist/include/LocalMyList/DirectoryWatcher b/localmylist/include/LocalMyList/DirectoryWatcher
new file mode 100644
index 0000000..f7b72b9
--- /dev/null
+++ b/localmylist/include/LocalMyList/DirectoryWatcher
@@ -0,0 +1,2 @@
+#include "../../directorywatcher.h"
+
diff --git a/localmylist/localmylist.pro b/localmylist/localmylist.pro
index 9fd4086..513e918 100644
--- a/localmylist/localmylist.pro
+++ b/localmylist/localmylist.pro
@@ -75,7 +75,9 @@ CONV_HEADERS += \
 	include/LocalMyList/MyListNode \
 	include/LocalMyList/Settings \
 	include/LocalMyList/UnknownFileLookupTask \
-	include/LocalMyList/FileLocationCheckTask
+	include/LocalMyList/FileLocationCheckTask \
+	include/LocalMyList/RequestHandler \
+	include/LocalMyList/DirectoryWatcher
 
 !noscript {
 	QT *= script
diff --git a/localmylist/mylist.cpp b/localmylist/mylist.cpp
index 854bc43..31213cf 100644
--- a/localmylist/mylist.cpp
+++ b/localmylist/mylist.cpp
@@ -96,6 +96,11 @@ RequestHandler *MyList::requestHandler() const
 	return m_requestHandler;
 }
 
+DirectoryWatcher *MyList::directoryWatcher() const
+{
+	return m_directoryWatcher;
+}
+
 // -------
 
 void MyList::markWatched(int fid, QDateTime when)
diff --git a/localmylist/mylist.h b/localmylist/mylist.h
index f427ed0..3e35159 100644
--- a/localmylist/mylist.h
+++ b/localmylist/mylist.h
@@ -37,6 +37,7 @@ public:
 	LocalMyList::Database *database() const;
 	LocalMyList::Settings *settings() const;
 	LocalMyList::RequestHandler *requestHandler() const;
+	LocalMyList::DirectoryWatcher *directoryWatcher() const;
 
 	QString hostName() const;
 	void setHostName(QString name);