author | mickeyl <mickeyl> | 2005-05-07 00:55:52 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-05-07 00:55:52 (UTC) |
commit | 21a9e96cebeb6e729d129cd75544ac54ae4d09f4 (patch) (unidiff) | |
tree | 0b5737e5c9b0df8306f3faf5f30fd442ce0bc7c9 /libopie2 | |
parent | 852f6cf4ff1c4010f998ee8cd68936e38001f032 (diff) | |
download | opie-21a9e96cebeb6e729d129cd75544ac54ae4d09f4.zip opie-21a9e96cebeb6e729d129cd75544ac54ae4d09f4.tar.gz opie-21a9e96cebeb6e729d129cd75544ac54ae4d09f4.tar.bz2 |
introduce OFileNotifyEvent and add more signals
-rw-r--r-- | libopie2/opiecore/ofilenotify.cpp | 122 | ||||
-rw-r--r-- | libopie2/opiecore/ofilenotify.h | 63 |
2 files changed, 154 insertions, 31 deletions
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 | |||
@@ -59,4 +59,22 @@ namespace Opie { | |||
59 | namespace Core { | 59 | namespace Core { |
60 | 60 | ||
61 | //================================================================================================= | ||
62 | // OFileNotificationEvent | ||
63 | //================================================================================================= | ||
64 | OFileNotificationEvent::OFileNotificationEvent( OFileNotification* parent, int wd, unsigned int mask, unsigned int cookie, const QString& name ) | ||
65 | :_parent( parent ), _wd( wd ), _mask( mask ), _cookie( cookie ), _name( name ) | ||
66 | { | ||
67 | qDebug( "OFileNotificationEvent()" ); | ||
68 | } | ||
69 | |||
70 | |||
71 | OFileNotificationEvent::~OFileNotificationEvent() | ||
72 | { | ||
73 | qDebug( "~OFileNotificationEvent()" ); | ||
74 | } | ||
75 | |||
76 | //================================================================================================= | ||
77 | // OFileNotification | ||
78 | //================================================================================================= | ||
61 | OFileNotification::OFileNotification( QObject* parent, const char* name ) | 79 | OFileNotification::OFileNotification( QObject* parent, const char* name ) |
62 | :QObject( parent, name ), _active( false ), _multi( true ) | 80 | :QObject( parent, name ), _active( false ), _multi( true ) |
@@ -153,9 +171,36 @@ QString OFileNotification::path() const | |||
153 | 171 | ||
154 | 172 | ||
155 | bool OFileNotification::activate() | 173 | bool OFileNotification::activate( const OFileNotificationEvent* e ) |
156 | { | 174 | { |
157 | emit triggered( _path ); | 175 | qDebug( "OFileNotification::activate(): e = ( %s, %d, 0x%08x, %d, %s )", (const char*) _path, e->descriptor(), e->mask(), e->cookie(), (const char*) e->name() ); |
176 | |||
177 | // dumb signal | ||
158 | _signal.activate(); | 178 | _signal.activate(); |
179 | |||
180 | // generic signal | ||
181 | emit triggered( _path, e->mask(), e->name() ); | ||
182 | |||
183 | // specialized signals | ||
184 | switch ( e->mask() ) | ||
185 | { | ||
186 | case Access: emit accessed( _path ); break; | ||
187 | case Modify: emit modified( _path ); break; | ||
188 | case Attrib: emit attributed( _path); break; | ||
189 | case CloseWrite: emit closed( _path, true ); break; | ||
190 | case CloseNoWrite: emit closed( _path, false ); break; | ||
191 | case Open: emit opened( _path ); break; | ||
192 | case MovedFrom: emit movedFrom( _path, e->name() ); break; | ||
193 | case MovedTo: emit movedTo( _path, e->name() ); break; | ||
194 | case DeleteSubdir: emit deletedSubdir( _path, e->name() ); break; | ||
195 | case DeleteFile: emit deletedFile( _path, e->name() ); break; | ||
196 | case CreateSubdir: emit createdSubdir( _path, e->name() ); break; | ||
197 | case CreateFile: emit createdFile( _path, e->name() ); break; | ||
198 | case DeleteSelf: emit deleted( _path ); break; | ||
199 | case Unmount: emit unmounted( _path ); break; | ||
200 | default: assert( 0 ); | ||
201 | } | ||
202 | |||
159 | if ( !_multi ) stop(); | 203 | if ( !_multi ) stop(); |
204 | |||
160 | return true; | 205 | return true; |
161 | } | 206 | } |
@@ -172,5 +217,5 @@ bool OFileNotification::singleShot( const QString& path, QObject* receiver, cons | |||
172 | void OFileNotification::inotifyEventHandler() | 217 | void OFileNotification::inotifyEventHandler() |
173 | { | 218 | { |
174 | qWarning( "OFileNotification::__eventHandler(): reached." ); | 219 | qDebug( "OFileNotification::inotifyEventHandler(): reached." ); |
175 | 220 | ||
176 | char buffer[16384]; | 221 | char buffer[16384]; |
@@ -189,24 +234,14 @@ void OFileNotification::inotifyEventHandler() | |||
189 | while ( buffer_i < r ) | 234 | while ( buffer_i < r ) |
190 | { | 235 | { |
191 | /* Parse events and queue them ! */ | 236 | pevent = (struct inotify_event *)&buffer[buffer_i]; |
192 | pevent = (struct inotify_event *)&buffer[buffer_i]; | 237 | event_size = sizeof(struct inotify_event) + pevent->len; |
193 | event_size = sizeof(struct inotify_event) + pevent->len; | 238 | OFileNotificationEvent* e = new OFileNotificationEvent( notification_list[ pevent->wd ], pevent->wd, pevent->mask, |
194 | qDebug( "pevent->len = %d\n", pevent->len); | 239 | pevent->cookie, pevent->len ? pevent->name : 0 ); |
195 | 240 | e->activate(); | |
196 | OFileNotification* fn = notification_list[ pevent->wd ]; | 241 | buffer_i += event_size; |
197 | if ( fn ) | 242 | count++; |
198 | fn->activate(); | ||
199 | else | ||
200 | assert( false ); | ||
201 | |||
202 | //event = malloc(event_size); | ||
203 | //memmove(event, pevent, event_size); | ||
204 | //queue_enqueue(event, q); | ||
205 | buffer_i += event_size; | ||
206 | count++; | ||
207 | } | 243 | } |
208 | 244 | ||
209 | qDebug( "received %d events...", count ); | 245 | qDebug( "OFileNotification::inotifyEventHandler(): processed %d events", count ); |
210 | return; | ||
211 | } | 246 | } |
212 | 247 | ||
@@ -263,15 +298,52 @@ int ODirNotification::watch( const QString& path, bool sshot, OFileNotificationT | |||
263 | if ( result != -1 ) | 298 | if ( result != -1 ) |
264 | { | 299 | { |
265 | connect( fn, SIGNAL( triggered( const QString& ) ), this, SIGNAL( triggered( const QString& ) ) ); | 300 | connect( fn, SIGNAL( triggered( const QString&, unsigned int, const QString& ) ), this, SIGNAL( triggered( const QString&, unsigned int, const QString& ) ) ); |
266 | return result; | 301 | connect( fn, SIGNAL( accessed( const QString& ) ), this, SIGNAL( accessed( const QString& ) ) ); |
302 | connect( fn, SIGNAL( modified( const QString& ) ), this, SIGNAL( modified( const QString& ) ) ); | ||
303 | connect( fn, SIGNAL( attributed( const QString& ) ), this, SIGNAL( attributed( const QString& ) ) ); | ||
304 | connect( fn, SIGNAL( closed( const QString&, bool ) ), this, SIGNAL( closed( const QString&, bool ) ) ); | ||
305 | connect( fn, SIGNAL( opened( const QString& ) ), this, SIGNAL( opened( const QString& ) ) ); | ||
306 | connect( fn, SIGNAL( movedTo( const QString&, const QString& ) ), this, SIGNAL( movedTo( const QString&, const QString& ) ) ); | ||
307 | connect( fn, SIGNAL( movedFrom( const QString&, const QString& ) ), this, SIGNAL( movedFrom( const QString&, const QString& ) ) ); | ||
308 | connect( fn, SIGNAL( deletedSubdir( const QString&, const QString& ) ), this, SIGNAL( deletedSubdir( const QString&, const QString& ) ) ); | ||
309 | connect( fn, SIGNAL( deletedFile( const QString&, const QString& ) ), this, SIGNAL( deletedFile( const QString&, const QString& ) ) );; | ||
310 | connect( fn, SIGNAL( createdSubdir( const QString&, const QString& ) ), this, SIGNAL( createdSubdir( const QString&, const QString& ) ) ); | ||
311 | connect( fn, SIGNAL( createdFile( const QString&, const QString& ) ), this, SIGNAL( createdFile( const QString&, const QString& ) ) ); | ||
312 | connect( fn, SIGNAL( deleted( const QString& ) ), this, SIGNAL( deleted( const QString& ) ) ); | ||
313 | connect( fn, SIGNAL( unmounted( const QString& ) ), this, SIGNAL( unmounted( const QString& ) ) ); | ||
267 | } | 314 | } |
315 | return result; | ||
268 | } | 316 | } |
269 | else | 317 | else |
270 | { | 318 | { |
271 | qDebug( "ODirNotification::watch(), recursion not yet implemented... :)" ); | 319 | |
272 | return -1; | 320 | return 1; |
273 | } | 321 | } |
274 | } | 322 | } |
275 | 323 | ||
324 | |||
325 | // void ODirNotification::subdirCreated( const QString& name ) | ||
326 | |||
327 | |||
328 | /* | ||
329 | Love-Trowbridge recursive directory scanning algorithm: | ||
330 | |||
331 | Step 1. Start at initial directory foo. Add watch. | ||
332 | |||
333 | Step 2. Setup handlers for watch created in Step 1. | ||
334 | Specifically, ensure that a directory created | ||
335 | in foo will result in a handled CREATE_SUBDIR | ||
336 | event. | ||
337 | |||
338 | Step 3. Read the contents of foo. | ||
339 | |||
340 | Step 4. For each subdirectory of foo read in step 3, repeat | ||
341 | step 1. | ||
342 | |||
343 | Step 5. For any CREATE_SUBDIR event on bar, if a watch is | ||
344 | not yet created on bar, repeat step 1 on bar. | ||
345 | */ | ||
346 | |||
347 | |||
276 | } // namespace Ui | 348 | } // namespace Ui |
277 | 349 | ||
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 | |||
@@ -43,4 +43,6 @@ namespace Opie { | |||
43 | namespace Core { | 43 | namespace Core { |
44 | 44 | ||
45 | class OFileNotificationEvent; | ||
46 | |||
45 | /*====================================================================================== | 47 | /*====================================================================================== |
46 | * OFileNotificationType | 48 | * OFileNotificationType |
@@ -169,11 +171,21 @@ class OFileNotification : public QObject | |||
169 | 171 | ||
170 | signals: | 172 | signals: |
171 | /** | 173 | void triggered( const QString&, unsigned int, const QString& ); |
172 | * This signal is emitted if an event happens of the specified type happens to the file being watched. | 174 | void accessed( const QString& ); |
173 | **/ | 175 | void modified( const QString& ); |
174 | void triggered( const QString& name ); | 176 | void attributed( const QString& ); |
177 | void closed( const QString&, bool ); | ||
178 | void opened( const QString& ); | ||
179 | void movedTo( const QString&, const QString& ); | ||
180 | void movedFrom( const QString&, const QString& ); | ||
181 | void deletedSubdir( const QString&, const QString& ); | ||
182 | void deletedFile( const QString&, const QString& ); | ||
183 | void createdSubdir( const QString&, const QString& ); | ||
184 | void createdFile( const QString&, const QString& ); | ||
185 | void deleted( const QString& ); | ||
186 | void unmounted( const QString& ); | ||
175 | 187 | ||
176 | protected: | 188 | protected: |
177 | bool activate(); | 189 | bool activate( const OFileNotificationEvent* e ); |
178 | 190 | ||
179 | private slots: | 191 | private slots: |
@@ -192,4 +204,6 @@ class OFileNotification : public QObject | |||
192 | int _wd; // inotify watch descriptor | 204 | int _wd; // inotify watch descriptor |
193 | static int _fd; // inotify device descriptor | 205 | static int _fd; // inotify device descriptor |
206 | |||
207 | friend class OFileNotificationEvent; | ||
194 | }; | 208 | }; |
195 | 209 | ||
@@ -228,5 +242,42 @@ class ODirNotification : public QObject | |||
228 | * This signal is emitted if an event happens of the specified type happens to the directory being watched. | 242 | * This signal is emitted if an event happens of the specified type happens to the directory being watched. |
229 | **/ | 243 | **/ |
230 | void triggered( const QString& name ); | 244 | void triggered( const QString&, unsigned int, const QString& ); |
245 | void accessed( const QString& ); | ||
246 | void modified( const QString& ); | ||
247 | void attributed( const QString& ); | ||
248 | void closed( const QString&, bool ); | ||
249 | void opened( const QString& ); | ||
250 | void movedTo( const QString&, const QString& ); | ||
251 | void movedFrom( const QString&, const QString& ); | ||
252 | void deletedSubdir( const QString&, const QString& ); | ||
253 | void deletedFile( const QString&, const QString& ); | ||
254 | void createdSubdir( const QString&, const QString& ); | ||
255 | void createdFile( const QString&, const QString& ); | ||
256 | void deleted( const QString& ); | ||
257 | void unmounted( const QString& ); | ||
258 | }; | ||
259 | |||
260 | /*====================================================================================== | ||
261 | * OFileNotificationEvent | ||
262 | *======================================================================================*/ | ||
263 | |||
264 | class OFileNotificationEvent | ||
265 | { | ||
266 | public: | ||
267 | OFileNotificationEvent( OFileNotification* parent, int wd, unsigned int mask, unsigned int cookie, const QString& name ); | ||
268 | ~OFileNotificationEvent(); | ||
269 | OFileNotification* parent() const { return _parent; }; | ||
270 | int descriptor() const { return _wd; }; | ||
271 | unsigned int mask() const { return _mask; }; | ||
272 | unsigned int cookie() const { return _cookie; }; | ||
273 | QString name() const { return _name; }; | ||
274 | void activate() { _parent->activate( this ); }; | ||
275 | |||
276 | private: | ||
277 | OFileNotification* _parent; | ||
278 | int _wd; | ||
279 | unsigned int _mask; | ||
280 | unsigned int _cookie; | ||
281 | QString _name; | ||
231 | }; | 282 | }; |
232 | 283 | ||