first sketch at ODirNotification class

2 files changed, 31 insertions, 10 deletions

diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp
index efd041a..11d4f87 100644
--- a/libopie2/opiecore/ofilenotify.cpp
+++ b/libopie2/opiecore/ofilenotify.cpp
@@ -84,35 +84,35 @@ int OFileNotification::watch( const QString& path, bool sshot, OFileNotification
     struct stat s;
     if ( ::stat( (const char*) path, &s ) == -1 )
     {
         qWarning( "OFileNotification::watch(): Can't watch '%s': %s.", (const char*) path, strerror( errno ) );
         return -1;
     }
     if ( !S_ISREG( s.st_mode ) )
     {
         qWarning( "OFileNotification::watch(): Can't watch '%s': %s.", (const char*) path, "not a regular file" );
         return -1;
     }
 
-    if ( notification_list.isEmpty() )
-    {
-        OFileNotification::registerEventHandler();
-    }
-
     return startWatching( path, sshot, type );
 }
 
 
 int OFileNotification::startWatching( const QString& path, bool sshot, OFileNotificationType type )
 {
+    if ( notification_list.isEmpty() )
+    {
+        OFileNotification::registerEventHandler();
+    }
+
     struct inotify_watch_request iwr;
     ::memset( &iwr, 0, sizeof iwr );
     iwr.name = const_cast<char*>( (const char*) path );
     iwr.mask = type;
 
     _wd = ::ioctl( OFileNotification::_fd, INOTIFY_WATCH, &iwr );
 
     if ( _wd < 0 )
     {
         qWarning( "OFileNotification::watch(): inotify can't watch '%s': %s.", (const char*) path, strerror( errno ) );
         return -1;
     }
@@ -246,18 +246,33 @@ ODirNotification::ODirNotification( QObject* parent, const char* name )
 }
 
 
 ODirNotification::~ODirNotification()
 {
     qDebug( "ODirNotification::~ODirNotification()" );
 }
 
 
 int ODirNotification::watch( const QString& path, bool sshot, OFileNotificationType type, int recurse )
 {
     qDebug( "ODirNotification::watch( %s, %d, 0x%08x, %d )", (const char*) path, sshot, type, recurse );
-    return 0;
-}
 
+    if ( recurse == 0 )
+    {
+        OFileNotification* fn = new OFileNotification( this, "ODirNotification delegate" );
+        int result = fn->startWatching( path, sshot, type );
+        if ( result != -1 )
+        {
+            connect( fn, SIGNAL( triggered( const QString& ) ), this, SIGNAL( triggered( const QString& ) ) );
+            return result;
+        }
+    }
+    else
+    {
+        qDebug( "ODirNotification::watch(), recursion not yet implemented... :)" );
+        return -1;
+    }
 }
 
-}
\ No newline at end of file
+} // namespace Ui
+
+} // namespace Opie
diff --git a/libopie2/opiecore/ofilenotify.h b/libopie2/opiecore/ofilenotify.h
index 41ba84d..3eb917e 100644
--- a/libopie2/opiecore/ofilenotify.h
+++ b/libopie2/opiecore/ofilenotify.h
@@ -120,31 +120,31 @@ class OFileNotification : public QObject
      *  bother with a timerEvent or to create a local QTimer object.
      *
      *  Example:
      *  <pre>
      *
      *     #include <opie2/oapplication.h>
      *     #include <opie2/ofilenotify.h>
      *     using namespace Opie::Core;
      *
      *     int main( int argc, char **argv )
      *     {
      *         OApplication a( argc, argv, "File Notification Example" );
-     *         OFileNotification::singleShot( "/tmp/quit", &a, SLOT(quit()), Create );
+     *         OFileNotification::singleShot( "/tmp/quit", &a, SLOT(quit()), Access );
      *         ... // create and show your widgets
      *         return a.exec();
      *     }
      *  </pre>
      *
-     * This sample program automatically terminates when the file "/tmp/quit" has been created.
+     * This sample program automatically terminates when the file "/tmp/quit" has been accessed.
      *
      *
      * The @a receiver is the receiving object and the @a member is the slot.
      **/
     static bool singleShot( const QString& path, QObject* receiver, const char* member, OFileNotificationType type = Modify );
     /**
      * Starts to watch for @a type changes to @a path. Set @a sshot to True if you want to be notified only once.
      * Note that in that case it may be more convenient to use @ref OFileNotification::singleShot() then.
      **/
     int watch( const QString& path, bool sshot = false, OFileNotificationType type = Modify );
     /**
      * Stop watching for file events.
@@ -213,20 +213,26 @@ class ODirNotification : public QObject
 {
   Q_OBJECT
 
   public:
     ODirNotification( QObject* parent = 0, const char* name = 0 );
     ~ODirNotification();
     /**
      * Starts to watch for @a type changes to @a path. Recurse @a recurse levels down the filesystem tree,
      * use 0 for no recursion and -1 for unlimited recursion.
      * Set @a sshot to True if you want to be notified only once.
      **/
     int watch( const QString& path, bool sshot = false, OFileNotificationType type = Modify, int recurse = 0 );
+
+  signals:
+    /**
+     * This signal is emitted if an event happens of the specified type happens to the directory being watched.
+     **/
+    void triggered( const QString& name );
 };
 
 
 }
 }
 
 #endif