summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--examples/opiecore/onotifydemo/onotifydemo.cpp14
-rw-r--r--examples/opiecore/onotifydemo/onotifydemo.h2
-rw-r--r--libopie2/opiecore/ofilenotify.cpp122
-rw-r--r--libopie2/opiecore/ofilenotify.h63
4 files changed, 163 insertions, 38 deletions
diff --git a/examples/opiecore/onotifydemo/onotifydemo.cpp b/examples/opiecore/onotifydemo/onotifydemo.cpp
index 2beda2a..e147c6a 100644
--- a/examples/opiecore/onotifydemo/onotifydemo.cpp
+++ b/examples/opiecore/onotifydemo/onotifydemo.cpp
@@ -100,20 +100,22 @@ DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2
{
if ( !multi )
{
- success = OFileNotification::singleShot( filename, this, SLOT( unnamedTrigger() ), (OFileNotificationType) fntype );
+ success = OFileNotification::singleShot( filename, this, SLOT(unnamedTrigger()), (OFileNotificationType) fntype );
}
else
{
OFileNotification* fn = new OFileNotification();
success = fn->watch( filename, false, (OFileNotificationType) fntype );
- connect( fn, SIGNAL( triggered( const QString& ) ), this, SLOT( namedTrigger( const QString& ) ) );
- }
+ connect( fn, SIGNAL(triggered(const QString&,unsigned int,const QString&)),
+ this, SLOT(namedTrigger(const QString&,unsigned int,const QString&)) );
+ }
}
else if ( QFileInfo( filename ).isDir() )
{
ODirNotification* dn = new ODirNotification();
success = dn->watch( filename, !multi, (OFileNotificationType) fntype );
- connect( dn, SIGNAL( triggered( const QString& ) ), this, SLOT( namedTrigger( const QString& ) ) );
+ connect( dn, SIGNAL(triggered(const QString&,unsigned int,const QString&)),
+ this, SLOT(namedTrigger(const QString&,unsigned int,const QString&)) );
}
else
{
@@ -162,9 +164,9 @@ DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2
owarn << "DemoApp::singleShotStrigger() : F I R E !!!!!" << oendl;
}
- void DemoApp::namedTrigger( const QString& path )
+ void DemoApp::namedTrigger( const QString& path, unsigned int type, const QString& name )
{
- owarn << "DemoApp::named trigger = " << path << " : F I R E !!!!!" << oendl;
+ owarn << "DemoApp::named trigger = ( " << path << ", " << type << ", " << name << " ) : F I R E !!!!!" << oendl;
}
int main( int argc, char** argv )
diff --git a/examples/opiecore/onotifydemo/onotifydemo.h b/examples/opiecore/onotifydemo/onotifydemo.h
index f6ac5ea..20019e4 100644
--- a/examples/opiecore/onotifydemo/onotifydemo.h
+++ b/examples/opiecore/onotifydemo/onotifydemo.h
@@ -20,7 +20,7 @@ public slots:
void addMulti();
void delTrigger();
void unnamedTrigger();
- void namedTrigger( const QString& name );
+ void namedTrigger( const QString&, unsigned int, const QString& );
private:
Opie::Ui::OListView* l;
diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp
index 11d4f87..4264327 100644
--- a/libopie2/opiecore/ofilenotify.cpp
+++ b/libopie2/opiecore/ofilenotify.cpp
@@ -58,6 +58,24 @@ int OFileNotification::_fd = -1;
namespace Opie {
namespace Core {
+//=================================================================================================
+// OFileNotificationEvent
+//=================================================================================================
+OFileNotificationEvent::OFileNotificationEvent( OFileNotification* parent, int wd, unsigned int mask, unsigned int cookie, const QString& name )
+ :_parent( parent ), _wd( wd ), _mask( mask ), _cookie( cookie ), _name( name )
+{
+ qDebug( "OFileNotificationEvent()" );
+}
+
+
+OFileNotificationEvent::~OFileNotificationEvent()
+{
+ qDebug( "~OFileNotificationEvent()" );
+}
+
+//=================================================================================================
+// OFileNotification
+//=================================================================================================
OFileNotification::OFileNotification( QObject* parent, const char* name )
:QObject( parent, name ), _active( false ), _multi( true )
{
@@ -152,11 +170,38 @@ QString OFileNotification::path() const
}
-bool OFileNotification::activate()
+bool OFileNotification::activate( const OFileNotificationEvent* e )
{
- emit triggered( _path );
+ qDebug( "OFileNotification::activate(): e = ( %s, %d, 0x%08x, %d, %s )", (const char*) _path, e->descriptor(), e->mask(), e->cookie(), (const char*) e->name() );
+
+ // dumb signal
_signal.activate();
+
+ // generic signal
+ emit triggered( _path, e->mask(), e->name() );
+
+ // specialized signals
+ switch ( e->mask() )
+ {
+ case Access: emit accessed( _path ); break;
+ case Modify: emit modified( _path ); break;
+ case Attrib: emit attributed( _path); break;
+ case CloseWrite: emit closed( _path, true ); break;
+ case CloseNoWrite: emit closed( _path, false ); break;
+ case Open: emit opened( _path ); break;
+ case MovedFrom: emit movedFrom( _path, e->name() ); break;
+ case MovedTo: emit movedTo( _path, e->name() ); break;
+ case DeleteSubdir: emit deletedSubdir( _path, e->name() ); break;
+ case DeleteFile: emit deletedFile( _path, e->name() ); break;
+ case CreateSubdir: emit createdSubdir( _path, e->name() ); break;
+ case CreateFile: emit createdFile( _path, e->name() ); break;
+ case DeleteSelf: emit deleted( _path ); break;
+ case Unmount: emit unmounted( _path ); break;
+ default: assert( 0 );
+ }
+
if ( !_multi ) stop();
+
return true;
}
@@ -171,7 +216,7 @@ bool OFileNotification::singleShot( const QString& path, QObject* receiver, cons
void OFileNotification::inotifyEventHandler()
{
- qWarning( "OFileNotification::__eventHandler(): reached." );
+ qDebug( "OFileNotification::inotifyEventHandler(): reached." );
char buffer[16384];
size_t buffer_i;
@@ -188,26 +233,16 @@ void OFileNotification::inotifyEventHandler()
buffer_i = 0;
while ( buffer_i < r )
{
- /* Parse events and queue them ! */
- pevent = (struct inotify_event *)&buffer[buffer_i];
- event_size = sizeof(struct inotify_event) + pevent->len;
- qDebug( "pevent->len = %d\n", pevent->len);
-
- OFileNotification* fn = notification_list[ pevent->wd ];
- if ( fn )
- fn->activate();
- else
- assert( false );
-
- //event = malloc(event_size);
- //memmove(event, pevent, event_size);
- //queue_enqueue(event, q);
- buffer_i += event_size;
- count++;
+ pevent = (struct inotify_event *)&buffer[buffer_i];
+ event_size = sizeof(struct inotify_event) + pevent->len;
+ OFileNotificationEvent* e = new OFileNotificationEvent( notification_list[ pevent->wd ], pevent->wd, pevent->mask,
+ pevent->cookie, pevent->len ? pevent->name : 0 );
+ e->activate();
+ buffer_i += event_size;
+ count++;
}
- qDebug( "received %d events...", count );
- return;
+ qDebug( "OFileNotification::inotifyEventHandler(): processed %d events", count );
}
@@ -262,17 +297,54 @@ int ODirNotification::watch( const QString& path, bool sshot, OFileNotificationT
int result = fn->startWatching( path, sshot, type );
if ( result != -1 )
{
- connect( fn, SIGNAL( triggered( const QString& ) ), this, SIGNAL( triggered( const QString& ) ) );
- return result;
+ connect( fn, SIGNAL( triggered( const QString&, unsigned int, const QString& ) ), this, SIGNAL( triggered( const QString&, unsigned int, const QString& ) ) );
+ connect( fn, SIGNAL( accessed( const QString& ) ), this, SIGNAL( accessed( const QString& ) ) );
+ connect( fn, SIGNAL( modified( const QString& ) ), this, SIGNAL( modified( const QString& ) ) );
+ connect( fn, SIGNAL( attributed( const QString& ) ), this, SIGNAL( attributed( const QString& ) ) );
+ connect( fn, SIGNAL( closed( const QString&, bool ) ), this, SIGNAL( closed( const QString&, bool ) ) );
+ connect( fn, SIGNAL( opened( const QString& ) ), this, SIGNAL( opened( const QString& ) ) );
+ connect( fn, SIGNAL( movedTo( const QString&, const QString& ) ), this, SIGNAL( movedTo( const QString&, const QString& ) ) );
+ connect( fn, SIGNAL( movedFrom( const QString&, const QString& ) ), this, SIGNAL( movedFrom( const QString&, const QString& ) ) );
+ connect( fn, SIGNAL( deletedSubdir( const QString&, const QString& ) ), this, SIGNAL( deletedSubdir( const QString&, const QString& ) ) );
+ connect( fn, SIGNAL( deletedFile( const QString&, const QString& ) ), this, SIGNAL( deletedFile( const QString&, const QString& ) ) );;
+ connect( fn, SIGNAL( createdSubdir( const QString&, const QString& ) ), this, SIGNAL( createdSubdir( const QString&, const QString& ) ) );
+ connect( fn, SIGNAL( createdFile( const QString&, const QString& ) ), this, SIGNAL( createdFile( const QString&, const QString& ) ) );
+ connect( fn, SIGNAL( deleted( const QString& ) ), this, SIGNAL( deleted( const QString& ) ) );
+ connect( fn, SIGNAL( unmounted( const QString& ) ), this, SIGNAL( unmounted( const QString& ) ) );
}
+ return result;
}
else
{
- qDebug( "ODirNotification::watch(), recursion not yet implemented... :)" );
- return -1;
+
+ return 1;
}
}
+
+// void ODirNotification::subdirCreated( const QString& name )
+
+
+/*
+ Love-Trowbridge recursive directory scanning algorithm:
+
+ Step 1. Start at initial directory foo. Add watch.
+
+ Step 2. Setup handlers for watch created in Step 1.
+ Specifically, ensure that a directory created
+ in foo will result in a handled CREATE_SUBDIR
+ event.
+
+ Step 3. Read the contents of foo.
+
+ Step 4. For each subdirectory of foo read in step 3, repeat
+ step 1.
+
+ Step 5. For any CREATE_SUBDIR event on bar, if a watch is
+ not yet created on bar, repeat step 1 on bar.
+*/
+
+
} // namespace Ui
} // namespace Opie
diff --git a/libopie2/opiecore/ofilenotify.h b/libopie2/opiecore/ofilenotify.h
index 3eb917e..5bbf421 100644
--- a/libopie2/opiecore/ofilenotify.h
+++ b/libopie2/opiecore/ofilenotify.h
@@ -42,6 +42,8 @@ _;:,     .>    :=|. This program is free software; you can
namespace Opie {
namespace Core {
+class OFileNotificationEvent;
+
/*======================================================================================
* OFileNotificationType
*======================================================================================*/
@@ -168,13 +170,23 @@ class OFileNotification : public QObject
int startWatching( const QString& path, bool sshot = false, OFileNotificationType type = Modify );
signals:
- /**
- * This signal is emitted if an event happens of the specified type happens to the file being watched.
- **/
- void triggered( const QString& name );
+ void triggered( const QString&, unsigned int, const QString& );
+ void accessed( const QString& );
+ void modified( const QString& );
+ void attributed( const QString& );
+ void closed( const QString&, bool );
+ void opened( const QString& );
+ void movedTo( const QString&, const QString& );
+ void movedFrom( const QString&, const QString& );
+ void deletedSubdir( const QString&, const QString& );
+ void deletedFile( const QString&, const QString& );
+ void createdSubdir( const QString&, const QString& );
+ void createdFile( const QString&, const QString& );
+ void deleted( const QString& );
+ void unmounted( const QString& );
protected:
- bool activate();
+ bool activate( const OFileNotificationEvent* e );
private slots:
void inotifyEventHandler();
@@ -191,6 +203,8 @@ class OFileNotification : public QObject
static QSocketNotifier* _sn;
int _wd; // inotify watch descriptor
static int _fd; // inotify device descriptor
+
+ friend class OFileNotificationEvent;
};
/*======================================================================================
@@ -227,7 +241,44 @@ class ODirNotification : public QObject
/**
* This signal is emitted if an event happens of the specified type happens to the directory being watched.
**/
- void triggered( const QString& name );
+ void triggered( const QString&, unsigned int, const QString& );
+ void accessed( const QString& );
+ void modified( const QString& );
+ void attributed( const QString& );
+ void closed( const QString&, bool );
+ void opened( const QString& );
+ void movedTo( const QString&, const QString& );
+ void movedFrom( const QString&, const QString& );
+ void deletedSubdir( const QString&, const QString& );
+ void deletedFile( const QString&, const QString& );
+ void createdSubdir( const QString&, const QString& );
+ void createdFile( const QString&, const QString& );
+ void deleted( const QString& );
+ void unmounted( const QString& );
+};
+
+/*======================================================================================
+ * OFileNotificationEvent
+ *======================================================================================*/
+
+class OFileNotificationEvent
+{
+ public:
+ OFileNotificationEvent( OFileNotification* parent, int wd, unsigned int mask, unsigned int cookie, const QString& name );
+ ~OFileNotificationEvent();
+ OFileNotification* parent() const { return _parent; };
+ int descriptor() const { return _wd; };
+ unsigned int mask() const { return _mask; };
+ unsigned int cookie() const { return _cookie; };
+ QString name() const { return _name; };
+ void activate() { _parent->activate( this ); };
+
+ private:
+ OFileNotification* _parent;
+ int _wd;
+ unsigned int _mask;
+ unsigned int _cookie;
+ QString _name;
};