AniOni now checks watched directories on startup.

diff --git a/anioni/anioni.cpp b/anioni/anioni.cpp
index 1c76fda4188c94d3ee2a4ba01af6863d3044b8ca..a5eecfd42383959328af8fe32a7c20953ad7d707 100644 (file)
--- 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 4a493778c44894655426f128b8f4a77721b16060..a668f64cf4588d92c2c108d302c72f372e087b64 100644 (file)
--- 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 0f96becdd4980844c1b89409b9fd0667fca07e2c..fd2f3503c9ff27c60e6856871a237a4a23ee6795 100644 (file)
--- 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 (file)
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 9fd40868085bc38e6387b5d2de84887323c49734..513e918fca3562389684602e6bf15d556bb8b7bf 100644 (file)
--- 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 854bc43b011fe3c820a9bf063fddefb6fb55fcdd..31213cf8df40741db0f5b0f1ffbe47fea44b9b48 100644 (file)
--- 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 f427ed0e98c8b52a2d5639e075e2f95882d114f3..3e351595ce1e5870003bfcd8579817b3b7740829 100644 (file)
--- 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);