fix moved directory not being watched

[sebastiantoh]

Fixes #491

The bug was introduced in 65d6d91#diff-9663de7aadbfa93d9f87e8c0dc5c94855e59fff314c091caa5478b666e404983R258-R264, which calls add_watch_by_event only if the trackers matched.

Prior to 65d6d91, add_watch_by_event was called so long as the event.mask.contains(EventMask::MOVED_TO) regardless of whether the trackers matched

notify/notify/src/inotify.rs

Lines 252 to 303 in 29376ad

	if event.mask.contains(EventMask::MOVED_TO) {
	if let Some(e) = self.rename_event.take() {
	if e.tracker() == Some(event.cookie as usize) {
	self.event_handler.handle_event(Ok(e.clone()));
	evs.push(
	Event::new(EventKind::Modify(ModifyKind::Name(
	RenameMode::To,
	)))
	.set_tracker(event.cookie as usize)
	.add_some_path(path.clone()),
	);
	evs.push(
	Event::new(EventKind::Modify(ModifyKind::Name(
	RenameMode::Both,
	)))
	.set_tracker(event.cookie as usize)
	.add_some_path(e.paths.first().cloned())
	.add_some_path(path.clone()),
	);
	} else {
	// TODO should it be rename?
	evs.push(
	Event::new(EventKind::Create(
	if event.mask.contains(EventMask::ISDIR) {
	CreateKind::Folder
	} else {
	CreateKind::File
	},
	))
	.add_some_path(path.clone()),
	);
	}
	} else {
	// TODO should it be rename?
	evs.push(
	Event::new(EventKind::Create(
	if event.mask.contains(EventMask::ISDIR) {
	CreateKind::Folder
	} else {
	CreateKind::File
	},
	))
	.add_some_path(path.clone()),
	);
	}
	add_watch_by_event(
	&path,
	&event,
	&self.watches,
	&mut add_watches,
	);
	}

[0xpr03]

Hmm just to confirm: This doesn't change the emitted events ?

cc @dfaust

[0xpr03]

Besides that: Thanks for investing the time to bisect and fix this!

[dfaust]

Thanks @sebastiantoh!
I can confirm the fix.

@0xpr03: No, it only fixes the bug.