| -rw-r--r-- | libopie2/opiecore/ofilenotify.cpp | 15 | ||||
| -rw-r--r-- | libopie2/opiecore/ofilenotify.h | 10 |
2 files changed, 23 insertions, 2 deletions
diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp index de4c63b..270570e 100644 --- a/libopie2/opiecore/ofilenotify.cpp +++ b/libopie2/opiecore/ofilenotify.cpp @@ -200,10 +200,18 @@ bool OFileNotification::hasChanged() struct stat newstat; ::memset( &newstat, 0, sizeof newstat ); - ::stat( _path, &newstat ); + int result = ::stat( _path, &newstat ); // may fail if file has been renamed or deleted. that doesn't matter :) + qDebug( "result of newstat call is %d (%s=%d)", result, strerror( errno ), errno ); 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 ); + qDebug( "stat.ctime = %0lx, newstat.ctime = %0lx", (long)_stat.st_ctime, (long)newstat.st_ctime ); + + if ( !c && (_type & (Delete|Rename)) && (long)newstat.st_atime == 0 && (long)newstat.st_mtime == 0 && (long)newstat.st_ctime == 0) + { + qDebug( "OFileNotification::hasChanged(): file has been deleted or renamed" ); + c = true; + } if ( !c && (_type & Access) && (long)_stat.st_atime < (long)newstat.st_atime ) { qDebug( "OFileNotification::hasChanged(): atime changed" ); @@ -214,6 +222,11 @@ bool OFileNotification::hasChanged() qDebug( "OFileNotification::hasChanged(): mtime changed" ); c = true; } + if ( !c && (_type & Attrib) && (long)_stat.st_ctime < (long)newstat.st_ctime ) + { + qDebug( "OFileNotification::hasChanged(): ctime changed" ); + c = true; + } return c; } diff --git a/libopie2/opiecore/ofilenotify.h b/libopie2/opiecore/ofilenotify.h index 5315896..13b5a6b 100644 --- a/libopie2/opiecore/ofilenotify.h +++ b/libopie2/opiecore/ofilenotify.h @@ -76,7 +76,7 @@ class OFileNotification : public QObject protected: bool activate(); - bool hasChanged(); + virtual bool hasChanged(); static bool registerSignalHandler(); static void unregisterSignalHandler(); static void __signalHandler( int sig, siginfo_t *si, void *data ); @@ -90,6 +90,14 @@ class OFileNotification : public QObject struct stat _stat; }; + +class ODirectoryNotification : public OFileNotification +{ + public: + virtual bool hasChanged() { return true; }; +}; + + } } |