debian-packages/eventcore
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix watching symlinked paths with FSEvents.

Browse source 
The events reported always use the canonical path, which broke the relative path logic. TO counter this, the canonical path is now determined explicitly.
This commit is contained in:
Sönke Ludwig 2020-05-27 17:56:28 +02:00
parent a77f626b97
commit 9120982bed
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
source/eventcore/drivers/posix/watchers.d
View file

@ -228,14 +228,30 @@ final class FSEventsEventDriverWatchers(Events : EventDriverEvents) : EventDrive
final override WatcherID watchDirectory(string path, bool recursive, FileChangesCallback on_change) final override WatcherID watchDirectory(string path, bool recursive, FileChangesCallback on_change)
@trusted { @trusted {
import std.path : absolutePath; import std.file : isSymlink, readLink;
import std.path : absolutePath, buildPath, buildNormalizedPath, dirName, pathSplitter;
FSEventStreamContext ctx; FSEventStreamContext ctx;
ctx.info = () @trusted { return cast(void*)this; } (); ctx.info = () @trusted { return cast(void*)this; } ();
static string resolveSymlinks(string path)
{
string res;
foreach (ps; path.pathSplitter) {
if (!res.length) res = ps;
else res = buildPath(res, ps);
if (isSymlink(res)) {
res = readLink(res).absolutePath(dirName(res));
}
}
return res.buildNormalizedPath;
}
string abspath; string abspath;
try abspath = absolutePath(path); try abspath = resolveSymlinks(absolutePath(path));
catch (Exception e) assert(false, e.msg); catch (Exception e) {
return WatcherID.invalid;
}
if (m_handleCounter == 0) { if (m_handleCounter == 0) {
m_handleCounter++; m_handleCounter++;