author | mickeyl <mickeyl> | 2004-04-19 13:56:14 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-19 13:56:14 (UTC) |
commit | 13b62b4e8c613b9f876bd70d519a2a85186dba7a (patch) (side-by-side diff) | |
tree | c52e051c23dca89efc3bb3e468f9033d342f15e8 /libopie2 | |
parent | 2add0a39efab1af658ab3515090b31fba30df0d5 (diff) | |
download | opie-13b62b4e8c613b9f876bd70d519a2a85186dba7a.zip opie-13b62b4e8c613b9f876bd70d519a2a85186dba7a.tar.gz opie-13b62b4e8c613b9f876bd70d519a2a85186dba7a.tar.bz2 |
First milestone reached:
File notification now works for Access and Modify of existing files.
Next milestone: Rename and Attrib on existing files.
-rw-r--r-- | libopie2/opiecore/ofilenotify.cpp | 102 | ||||
-rw-r--r-- | libopie2/opiecore/ofilenotify.h | 4 |
2 files changed, 93 insertions, 13 deletions
diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp index bcfb1aa..de4c63b 100644 --- a/libopie2/opiecore/ofilenotify.cpp +++ b/libopie2/opiecore/ofilenotify.cpp @@ -41,4 +41,5 @@ using namespace Opie::Core; #include <sys/types.h> #include <sys/stat.h> +#include <assert.h> #include <fcntl.h> #include <string.h> @@ -75,6 +76,35 @@ int OFileNotification::start( const QString& path, bool sshot, OFileNotification _fd = 0; if ( _active ) stop(); + QString dirpath; - int fd = ::open( (const char*) path, O_RDONLY ); + // check if path exists and whether it is a file or a directory, if it exists at all + int result = ::stat( (const char*) path, &_stat ); + if ( result == -1 ) + { + qWarning( "OFileNotification::start(): Can't stat '%s': %s.", (const char*) path, strerror( errno ) ); + return -1; + } + + // if it is not a directory, we need to find out in which directory the file is + bool isDirectory = S_ISDIR( _stat.st_mode ); + if ( !isDirectory ) + { + int slashpos; + slashpos = path.findRev( '/' ); + if ( slashpos > 0 ) + { + _path = path; + dirpath = path.left( slashpos ); + } + } + else /* isDirectory */ + { + qWarning( "FIXME FIXME FIXME = Directory Notification Not Yet Implemented!" ); + _path = path; + dirpath = path; + assert( 0 ); + } + + int fd = ::open( (const char*) dirpath, O_RDONLY ); if ( fd != -1 ) { @@ -83,8 +113,9 @@ int OFileNotification::start( const QString& path, bool sshot, OFileNotification OFileNotification::registerSignalHandler(); } - int result = ::fcntl( fd, F_SETSIG, SIGRTMIN ); + + result = ::fcntl( fd, F_SETSIG, SIGRTMIN ); if ( result == -1 ) { - qWarning( "OFileNotification::start(): Can't subscribe to '%s': %s.", (const char*) path, strerror( errno ) ); + qWarning( "OFileNotification::start(): Can't subscribe to '%s': %s.", (const char*) dirpath, strerror( errno ) ); return -1; } @@ -93,17 +124,19 @@ int OFileNotification::start( const QString& path, bool sshot, OFileNotification if ( result == -1 ) { - qWarning( "OFileNotification::start(): Can't subscribe to '%s': %s.", (const char*) path, strerror( errno ) ); + qWarning( "OFileNotification::start(): Can't subscribe to '%s': %s.", (const char*) dirpath, strerror( errno ) ); return -1; } - qDebug( "OFileNotification::start(): Subscribed for changes to %s (fd = %d, mask = 0x%0x)", (const char*) path, fd, type ); + qDebug( "OFileNotification::start(): Subscribed for changes to %s (fd = %d, mask = 0x%0x)", (const char*) dirpath, fd, type ); notification_list.insert( fd, this ); _type = type; - _path = path; _fd = fd; + _active = true; + ::memset( &_stat, 0, sizeof _stat ); + ::stat( _path, &_stat ); return fd; } else { - qWarning( "OFileNotification::start(): Error with path '%s': %s.", (const char*) path, strerror( errno ) ); + qWarning( "OFileNotification::start(): Error with path '%s': %s.", (const char*) dirpath, strerror( errno ) ); return -1; } @@ -142,4 +175,5 @@ QString OFileNotification::path() const } + int OFileNotification::fileno() const { @@ -147,8 +181,40 @@ int OFileNotification::fileno() const } -void OFileNotification::activate() + +bool OFileNotification::activate() { - emit triggered(); - _signal.activate(); + if ( hasChanged() ) + { + emit triggered(); + _signal.activate(); + return true; + } + else + return false; +} + + +bool OFileNotification::hasChanged() +{ + bool c = false; + + struct stat newstat; + ::memset( &newstat, 0, sizeof newstat ); + ::stat( _path, &newstat ); + + qDebug( "stat.atime = %0lx, newstat.atime = %0lx", (long)_stat.st_atime, (long)newstat.st_atime ); + qDebug( "stat.mtime = %0lx, newstat.mtime = %0lx", (long)_stat.st_mtime, (long)newstat.st_mtime ); + if ( !c && (_type & Access) && (long)_stat.st_atime < (long)newstat.st_atime ) + { + qDebug( "OFileNotification::hasChanged(): atime changed" ); + c = true; + } + if ( !c && (_type & Modify) && (long)_stat.st_mtime < (long)newstat.st_mtime ) + { + qDebug( "OFileNotification::hasChanged(): mtime changed" ); + c = true; + } + + return c; } @@ -169,5 +235,18 @@ void OFileNotification::__signalHandler( int sig, siginfo_t *si, void *data ) if ( fn ) { - fn->activate(); + // check if it really was the file (dnotify triggers on directory granularity, not file granularity) + if ( !fn->activate() ) + { + qDebug( "OFileNotification::__signalHandler(): false alarm ;) Restarting the trigger (if it was single)..." ); + if ( !(fn->type() & Multi ) ) + { + int result = ::fcntl( fn->fileno(), F_NOTIFY, fn->type() ); + if ( result == -1 ) + { + qWarning( "OFileNotification::__signalHandler(): Can't restart the trigger: %s.", strerror( errno ) ); + } + } + return; + } #if 1 if ( !(fn->type() & Multi) ) @@ -210,5 +289,4 @@ void OFileNotification::unregisterSignalHandler() ::sigemptyset( &act.sa_mask ); if ( ::sigaction( SIGRTMIN, &act, NULL ) == -1 ) - if ( ::sigaction( SIGRTMIN, &act, NULL ) == -1 ) { qWarning( "OFileNotification::unregisterSignalHandler(): couldn't deregister signal handler: %s", strerror( errno ) ); diff --git a/libopie2/opiecore/ofilenotify.h b/libopie2/opiecore/ofilenotify.h index 3bc141d..5315896 100644 --- a/libopie2/opiecore/ofilenotify.h +++ b/libopie2/opiecore/ofilenotify.h @@ -76,5 +76,6 @@ class OFileNotification : public QObject protected: - void activate(); + bool activate(); + bool hasChanged(); static bool registerSignalHandler(); static void unregisterSignalHandler(); @@ -87,4 +88,5 @@ class OFileNotification : public QObject int _fd; bool _active; + struct stat _stat; }; |