incorrect path for file modification event after directory move

[timbertson]

incorrect path for file modification event after directory move

[timbertson]

I've done some digging, the reason no directory move is happening is that in InotifyEmitter.queue_events, inotify.read_events() returns the MOVED_FROM event the first time it is called, and the MOVED_TO event the next time it is called. Because the events don't arrive together, moved_from_events is empty (it gets reset every time the function is called) and the KeyError is raised, causing a silent failure.

Presumably read_events is expected to return both events at once. But I've got pretty consistent behaviour.

Could moved_from_events be made slightly more long-lived? Or is the cookie not a very unique key?

[timbertson]

This patch (https://gist.github.com/763397) seems to fix the directory move not appearing in the log (moved_from_events is persisted until a set of events is received which doesn't contain any move operations), but the path name is still being reported incorrectly.

Looks like it's coming from the _path_for_wd dictionary, which is not updated on a directory move.

[timbertson]

I've pushed a commit to my fork ( https://github.com/gfxmonk/watchdog/commit/167e700b9e81143c7ddff6dac04bbaba515a1ef0 ) which fixes both of these problems. It might not be the way you would prefer to fix it though (its's not exactly elegant), so feel free to disregard it ;)

[gorakhargosh]

Can you please send a pull request?

[gorakhargosh]

I've cherry picked the changes and they should be available in git HEAD.
Could you please check whether these changes work for you and then
close this issue if it is fixed? I've also added you to the AUTHORS list.
Thank you. =)

[timbertson]

Yep, cheers - all fixed. Sorry about the formatting, I have vim configured for tabs so I think the conversion was not so great ;)

[kudraw]

This fix is actually committed into the master branch? Because I've found a problem, this is the scenario:

watchdog listens on folder A, my program will mirror copies on folder B (and do some other processing things, like image processing).

To test the program I've created a script that does the following things:

1. copy a folder F with images and sub-folder S in A
2. rename F to N
3. delete N

All this actions need to be performed also on the mirror directory B.

The first two points seems to works, at the point 3, the program begin to delete files in B/N, but when try to delete files in B/N/S it will show error because try to delete B/F/S that of course doesn't exists more.

I hope that the problem is clear, in case I just try to explain better :).

Thanks!

[kudraw]

PS: the test is done under Arch Linux with kernel 3.4.4, using python 2.7.