author | mickeyl <mickeyl> | 2005-06-02 10:38:42 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-02 10:38:42 (UTC) |
commit | 9d6c759ac1adc5cb654bb3ada6b1d64cddc7217d (patch) (unidiff) | |
tree | 05f7572469fe6c5721b44ed64796bd1104ea3525 /libopie2/opiecore/linux/ofilenotify.cpp | |
parent | b30f28de8d5fa29001bc73a0a0e56ef653f1269f (diff) | |
download | opie-9d6c759ac1adc5cb654bb3ada6b1d64cddc7217d.zip opie-9d6c759ac1adc5cb654bb3ada6b1d64cddc7217d.tar.gz opie-9d6c759ac1adc5cb654bb3ada6b1d64cddc7217d.tar.bz2 |
more work on recursive watches
Diffstat (limited to 'libopie2/opiecore/linux/ofilenotify.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiecore/linux/ofilenotify.cpp | 79 |
1 files changed, 53 insertions, 26 deletions
diff --git a/libopie2/opiecore/linux/ofilenotify.cpp b/libopie2/opiecore/linux/ofilenotify.cpp index 3096f7e..a7820ee 100644 --- a/libopie2/opiecore/linux/ofilenotify.cpp +++ b/libopie2/opiecore/linux/ofilenotify.cpp | |||
@@ -227,4 +227,10 @@ QString OFileNotification::path() const | |||
227 | 227 | ||
228 | 228 | ||
229 | bool OFileNotification::isSingleShot() const | ||
230 | { | ||
231 | return !_multi; | ||
232 | } | ||
233 | |||
234 | |||
229 | bool OFileNotification::activate( const OFileNotificationEvent* e ) | 235 | bool OFileNotification::activate( const OFileNotificationEvent* e ) |
230 | { | 236 | { |
@@ -332,5 +338,5 @@ void OFileNotification::unregisterEventHandler() | |||
332 | //================================================================================================= | 338 | //================================================================================================= |
333 | ODirNotification::ODirNotification( QObject* parent, const char* name ) | 339 | ODirNotification::ODirNotification( QObject* parent, const char* name ) |
334 | :QObject( parent, name ) | 340 | :QObject( parent, name ), _topfilenotification( 0 ), _type( Nothing ), _depth( -123 ) |
335 | { | 341 | { |
336 | qDebug( "ODirNotification::ODirNotification()" ); | 342 | qDebug( "ODirNotification::ODirNotification()" ); |
@@ -343,13 +349,37 @@ ODirNotification::~ODirNotification() | |||
343 | } | 349 | } |
344 | 350 | ||
351 | /* | ||
352 | Love-Trowbridge recursive directory scanning algorithm: | ||
353 | |||
354 | Step 1. Start at initial directory foo. Add watch. | ||
355 | |||
356 | Step 2. Setup handlers for watch created in Step 1. | ||
357 | Specifically, ensure that a directory created | ||
358 | in foo will result in a handled CREATE_SUBDIR | ||
359 | event. | ||
360 | |||
361 | Step 3. Read the contents of foo. | ||
362 | |||
363 | Step 4. For each subdirectory of foo read in step 3, repeat | ||
364 | step 1. | ||
365 | |||
366 | Step 5. For any CREATE_SUBDIR event on bar, if a watch is | ||
367 | not yet created on bar, repeat step 1 on bar. | ||
368 | */ | ||
345 | 369 | ||
346 | int ODirNotification::watch( const QString& path, bool sshot, OFileNotificationType type, int recurse ) | 370 | int ODirNotification::watch( const QString& path, bool sshot, OFileNotificationType type, int recurse ) |
347 | { | 371 | { |
348 | qDebug( "ODirNotification::watch( %s, %d, 0x%08x, %d )", (const char*) path, sshot, type, recurse ); | 372 | if ( _type == Nothing ) _type = type; // only set it once - for the top level call |
349 | 373 | OFileNotificationType subtype = ( recurse != 0 ) ? (OFileNotificationType) int( _type | CreateSubdir ) : _type; | |
374 | qDebug( "ODirNotification::watch( %s, %d, 0x%08x, %d )", (const char*) path, sshot, subtype, recurse ); | ||
350 | OFileNotification* fn = new OFileNotification( this, "ODirNotification delegate" ); | 375 | OFileNotification* fn = new OFileNotification( this, "ODirNotification delegate" ); |
351 | int result = fn->startWatching( path, sshot, type ); | 376 | |
377 | int result = fn->startWatching( path, sshot, subtype ); | ||
352 | if ( result != -1 ) | 378 | if ( result != -1 ) |
353 | { | 379 | { |
380 | |||
381 | if ( !_topfilenotification ) _topfilenotification = fn; // only set it once - for the top level call | ||
382 | if ( _depth == -123 ) _depth = recurse; // only set it once - for the top level call | ||
383 | |||
354 | connect( fn, SIGNAL( triggered( const QString&, unsigned int, const QString& ) ), this, SIGNAL( triggered( const QString&, unsigned int, const QString& ) ) ); | 384 | connect( fn, SIGNAL( triggered( const QString&, unsigned int, const QString& ) ), this, SIGNAL( triggered( const QString&, unsigned int, const QString& ) ) ); |
355 | connect( fn, SIGNAL( accessed( const QString& ) ), this, SIGNAL( accessed( const QString& ) ) ); | 385 | connect( fn, SIGNAL( accessed( const QString& ) ), this, SIGNAL( accessed( const QString& ) ) ); |
@@ -367,6 +397,8 @@ int ODirNotification::watch( const QString& path, bool sshot, OFileNotificationT | |||
367 | connect( fn, SIGNAL( unmounted( const QString& ) ), this, SIGNAL( unmounted( const QString& ) ) ); | 397 | connect( fn, SIGNAL( unmounted( const QString& ) ), this, SIGNAL( unmounted( const QString& ) ) ); |
368 | 398 | ||
369 | if ( recurse ) | 399 | if ( recurse != 0 ) |
370 | { | 400 | { |
401 | connect( fn, SIGNAL( createdSubdir( const QString&, const QString& ) ), this, SLOT( subdirCreated( const QString&, const QString& ) ) ); | ||
402 | |||
371 | QDir directory( path ); | 403 | QDir directory( path ); |
372 | QStringList subdirs = directory.entryList( QDir::Dirs ); | 404 | QStringList subdirs = directory.entryList( QDir::Dirs ); |
@@ -376,5 +408,5 @@ int ODirNotification::watch( const QString& path, bool sshot, OFileNotificationT | |||
376 | if ( (*it) == "." || (*it) == ".." ) continue; | 408 | if ( (*it) == "." || (*it) == ".." ) continue; |
377 | QString subpath = QString( "%1/%2" ).arg( path ).arg( *it ); | 409 | QString subpath = QString( "%1/%2" ).arg( path ).arg( *it ); |
378 | int subresult = watch( subpath, sshot, type, recurse-1 ); | 410 | int subresult = watch( subpath, sshot, subtype, recurse-1 ); |
379 | if ( subresult == -1 ) | 411 | if ( subresult == -1 ) |
380 | { | 412 | { |
@@ -384,5 +416,4 @@ int ODirNotification::watch( const QString& path, bool sshot, OFileNotificationT | |||
384 | } | 416 | } |
385 | } | 417 | } |
386 | //connect( fn, SIGNAL( triggered( const QString&, unsigned int, const QString& ) ), this, SIGNAL( triggered( const QString&, unsigned int, const QString& ) ) ); | ||
387 | } | 418 | } |
388 | else return -1; | 419 | else return -1; |
@@ -390,25 +421,21 @@ int ODirNotification::watch( const QString& path, bool sshot, OFileNotificationT | |||
390 | 421 | ||
391 | 422 | ||
392 | // void ODirNotification::subdirCreated( const QString& name ) | 423 | void ODirNotification::subdirCreated( const QString& dir, const QString& subdir ) |
393 | 424 | { | |
394 | 425 | qDebug( "*** ODirNotification::subdirCreated '%s/%s'", (const char*) dir, (const char*) subdir ); | |
395 | /* | 426 | QString newdir = dir; |
396 | Love-Trowbridge recursive directory scanning algorithm: | 427 | if ( newdir.startsWith( _topfilenotification->path() ) ) |
397 | 428 | { | |
398 | Step 1. Start at initial directory foo. Add watch. | 429 | newdir.replace( _topfilenotification->path(), "" ); |
399 | 430 | int level = newdir.contains( '/' ); | |
400 | Step 2. Setup handlers for watch created in Step 1. | 431 | qDebug( "*** dirpart = '%s' ==> level = %d", (const char*) newdir, level ); |
401 | Specifically, ensure that a directory created | ||
402 | in foo will result in a handled CREATE_SUBDIR | ||
403 | event. | ||
404 | |||
405 | Step 3. Read the contents of foo. | ||
406 | 432 | ||
407 | Step 4. For each subdirectory of foo read in step 3, repeat | 433 | if ( _depth == -1 || _depth > level ) |
408 | step 1. | 434 | { |
435 | watch( QString( "%1/%2" ).arg( dir ).arg( subdir ), _topfilenotification->isSingleShot(), _topfilenotification->type(), _depth == -1 ? -1 : _depth-level-1 ); | ||
436 | } | ||
409 | 437 | ||
410 | Step 5. For any CREATE_SUBDIR event on bar, if a watch is | 438 | } |
411 | not yet created on bar, repeat step 1 on bar. | 439 | } |
412 | */ | ||
413 | 440 | ||
414 | 441 | ||