fix a couple of issues with OFileNotification, seems to work with single and multiple file notifications now

add a named trigger

2 files changed, 84 insertions, 13 deletions

diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp
index c221e58..efd041a 100644
--- a/libopie2/opiecore/ofilenotify.cpp
+++ b/libopie2/opiecore/ofilenotify.cpp
@@ -82,4 +82,15 @@ int OFileNotification::watch( const QString& path, bool sshot, OFileNotification
 {
-    if ( QFile::exists( path ) )
+    // check if path exists and is a regular file
+    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() )
@@ -89,2 +100,8 @@ int OFileNotification::watch( const QString& path, bool sshot, OFileNotification
 
+    return startWatching( path, sshot, type );
+}
+
+
+int OFileNotification::startWatching( const QString& path, bool sshot, OFileNotificationType type )
+{
         struct inotify_watch_request iwr;
@@ -103,2 +120,3 @@ int OFileNotification::watch( const QString& path, bool sshot, OFileNotification
         notification_list.insert( _wd, this );
+    _path = path;
         _multi = !sshot;
@@ -109,8 +127,2 @@ int OFileNotification::watch( const QString& path, bool sshot, OFileNotification
     }
-    else
-    {
-        qWarning( "OFileNotification::watch(): Can't watch '%s': %s.", (const char*) path, strerror( errno ) );
-        return -1;
-    }
-}
 
@@ -144,3 +156,3 @@ bool OFileNotification::activate()
 {
-    emit triggered();
+    emit triggered( _path );
     _signal.activate();
@@ -151,3 +163,3 @@ bool OFileNotification::activate()
 
-void OFileNotification::singleShot( const QString& path, QObject* receiver, const char* member, OFileNotificationType type )
+bool OFileNotification::singleShot( const QString& path, QObject* receiver, const char* member, OFileNotificationType type )
 {
@@ -155,3 +167,3 @@ void OFileNotification::singleShot( const QString& path, QObject* receiver, cons
     ofn->_signal.connect( receiver, member );
-    ofn->watch( path, true, type );
+    return ofn->watch( path, true, type ) != -1;
 }
@@ -220,2 +232,3 @@ void OFileNotification::unregisterEventHandler()
 {
+    if ( _sn ) delete _sn;
     if ( OFileNotification::_fd )
@@ -225,4 +238,26 @@ void OFileNotification::unregisterEventHandler()
 
+//=================================================================================================
+// ODirNotification
+//=================================================================================================
+ODirNotification::ODirNotification( QObject* parent, const char* name )
+                  :QObject( parent, name )
+{
+    qDebug( "ODirNotification::ODirNotification()" );
+}
+
+
+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;
 }
+
+}
+
 }
diff --git a/libopie2/opiecore/ofilenotify.h b/libopie2/opiecore/ofilenotify.h
index ea525e9..41ba84d 100644
--- a/libopie2/opiecore/ofilenotify.h
+++ b/libopie2/opiecore/ofilenotify.h
@@ -100,3 +100,3 @@ enum OFileNotificationType
  * This class allows to watch for events happening to files.
- * It uses the inotify kernel interface
+ * It uses the inotify linux (2.6.x) kernel interface.
  *
@@ -142,3 +142,3 @@ class OFileNotification : public QObject
      **/
-    static void singleShot( const QString& path, QObject* receiver, const char* member, OFileNotificationType type = Modify );
+    static bool singleShot( const QString& path, QObject* receiver, const char* member, OFileNotificationType type = Modify );
     /**
@@ -164,2 +164,6 @@ class OFileNotification : public QObject
     bool isActive() const;
+    /**
+      * @internal
+      */
+    int startWatching( const QString& path, bool sshot = false, OFileNotificationType type = Modify );
 
@@ -169,3 +173,3 @@ class OFileNotification : public QObject
      **/
-    void triggered();
+    void triggered( const QString& name );
 
@@ -191,2 +195,34 @@ class OFileNotification : public QObject
 
+/*======================================================================================
+ * ODirNotification
+ *======================================================================================*/
+
+/**
+ * @brief Represents a directory notification
+ *
+ * This class allows to watch for events happening to directories
+ * It uses the OFileNotification class
+ *
+ * @see http://www.kernel.org/pub/linux/kernel/people/rml/inotify/
+ *
+ * @author Michael 'Mickey' Lauer <mickey@vanille.de>
+ *
+ **/
+
+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 );
+};
+
+
 }