summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-20 14:34:17 (UTC)
committer mickeyl <mickeyl>2004-04-20 14:34:17 (UTC)
commit3fb65729e122d85a27b2a6194f96e37eaed3edd1 (patch) (side-by-side diff)
tree6168c3efa9a41dc5d56669ce0f36f58196b3dabb
parentccba33667c0152cb58a6d0502170b388889571c9 (diff)
downloadopie-3fb65729e122d85a27b2a6194f96e37eaed3edd1.zip
opie-3fb65729e122d85a27b2a6194f96e37eaed3edd1.tar.gz
opie-3fb65729e122d85a27b2a6194f96e37eaed3edd1.tar.bz2
2nd milestone reached: Notification now works with deleted, renamed, and
inode-modified files. Next milestone: Make it work for files which are not yet there (DN_CREATE)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/ofilenotify.cpp15
-rw-r--r--libopie2/opiecore/ofilenotify.h10
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
@@ -197,26 +197,39 @@ bool OFileNotification::activate()
bool OFileNotification::hasChanged()
{
bool c = false;
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" );
c = true;
}
if ( !c && (_type & Modify) && (long)_stat.st_mtime < (long)newstat.st_mtime )
{
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;
}
void OFileNotification::singleShot( const QString& path, QObject* receiver, const char* member, OFileNotificationType type )
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
@@ -73,13 +73,13 @@ class OFileNotification : public QObject
signals:
void triggered();
protected:
bool activate();
- bool hasChanged();
+ virtual bool hasChanged();
static bool registerSignalHandler();
static void unregisterSignalHandler();
static void __signalHandler( int sig, siginfo_t *si, void *data );
private:
QString _path;
@@ -87,11 +87,19 @@ class OFileNotification : public QObject
QSignal _signal;
int _fd;
bool _active;
struct stat _stat;
};
+
+class ODirectoryNotification : public OFileNotification
+{
+ public:
+ virtual bool hasChanged() { return true; };
+};
+
+
}
}
#endif