Fix #514

[rrzaripov]

This PR will fix the issue with observing on directory in recursive mode. When directory be moved, then new events for child directories and files still report old path.
This PR needs code review, I think this patch may to be done in more intelligent or elegant way.
Tests will be added in near time.

[BoboTiG]

Thanks @rrzaripov!
Do you are working on adding tests?

[BoboTiG]

Also, we should check this is fixed for all patforms.

[pablomartinezm]

There's a potential error using 'in' and 'startswith'. Figure out a folder system like this:

My folder:
a/
a/b
a/bb

Action

1. Move /a/b to /a/c

My virtual folder after action:
a/
a/c
a/cb

You should at least append the system separator at the end of the move_src_path to be sure that you are comparing the path:

if _path.startswith(move_src_path + os.path.sep):

[rrzaripov]

@pablomartinezm good catch! I start rework this ASAP.

[BoboTiG]

Thanks you @rrzaripov. Just few adjusments proposed :)

[rrzaripov]

@BoboTiG I'm reworked PR, your suggestions applied, thank you! I'm sorry, your suggestions from code review not included as additional commit, my mistake, just first time work with code review on github.

[BoboTiG]

Thanks @rrzaripov, I will merge it later in the day :)

[BoboTiG]

🤔 The test passes without the patch applied. Something is missing perhaps?

[rrzaripov]

@BoboTiG I have stuck with this. When similar test scenario running from console (as bash script), I get expected fail. When test running using pytest result is unexpectedly success. I'm still trying understand what going on, but this make me crazy.

Bash script

(venv) root@debian-9:/home/vagrant/watchdog# cat test.sh
python3 ./test.py > /tmp/log.txt &
p=$!
sleep 3

mkdir A
mkdir A/B
mv A A2
touch A2/B/example.txt

sleep 3
kill -KILL $p

cat /tmp/log.txt
rm -rf A2

Output

2019-06-11 16:00:33 - Created directory: ./A
2019-06-11 16:00:33 - Modified directory: .
2019-06-11 16:00:33 - Created directory: ./A/B
2019-06-11 16:00:33 - Modified directory: ./A
2019-06-11 16:00:34 - Moved directory: from ./A to ./A2
2019-06-11 16:00:34 - Modified directory: .
2019-06-11 16:00:34 - Moved directory: from ./A/B to ./A2/B
2019-06-11 16:00:34 - Moved file: from ./A/B/example.txt to ./A2/B/example.txt
2019-06-11 16:00:34 - Created file: ./A/B/example.txt
2019-06-11 16:00:34 - Modified directory: ./A/B
2019-06-11 16:00:34 - Modified file: ./A/B/example.txt

[BoboTiG]

With my new suggestions, the test is failing. do you think it is more correct like that?

[rrzaripov]

@BoboTiG I'm reworked test and added separate test for Windows, because events sets very different in comparison with Linux. While testing, two interesting things was discovered.

1. In Linux sometimes DirModifiedEvent event is catched. Need to investigate when this occuring and, possible increase timeout to make this test more simple and robust.
2. In Windows DirCreatedEvent event emitted twice while created subdirectory B. I think this is a bug, and I will to investigate.

[rrzaripov]

@BoboTiG tests passed, PR ready to merge:-)

[BoboTiG]

Thank you very much @rrzaripov!