Skip to content

fix reporting symlink path types #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DanielCodesphere wants to merge 2 commits into
base: release
Choose a base branch
from
Open

fix reporting symlink path types #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a0392b
fix reporting symlink path types
DanielCodesphere May 20, 2025
4e27ed1
Merge branch 'release' into symlink-fix
DanielCodesphere May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions include/wtr/watcher.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,10 +1478,13 @@ inline auto parse_ev = [](
using ev_et = enum ev::effect_type;
auto pathof = [&](inotify_event const* const m)
{ return known_pathof_wd_or_default(dm, m->wd) / m->name; };
auto in_path = pathof(in);
auto pt = in->mask & IN_ISDIR ? ev_pt::dir
: is_symlink(in_path) ? ev_pt::sym_link
: ev_pt::file;
auto calc_pt =
[&](uint32_t ev_mask, std::filesystem::path const& ev_path) -> ev_pt
{
return ev_mask & IN_ISDIR ? ev_pt::dir
: is_symlink(ev_path) ? ev_pt::sym_link
: ev_pt::file;
};
auto et = in->mask & IN_CREATE ? ev_et::create
: in->mask & IN_DELETE ? ev_et::destroy
: in->mask & IN_MOVE ? ev_et::rename
Expand All @@ -1492,9 +1495,16 @@ inline auto parse_ev = [](
auto isfromto = [](auto* a, auto* b) -> bool
{ return (a->mask & IN_MOVED_FROM) && (b->mask & IN_MOVED_TO); };
auto one = [&](auto* next) -> parsed
{ return {ev(in_path, et, pt), next}; };
{
auto in_path = pathof(in);
return {ev(in_path, et, calc_pt(in->mask, in_path)), next};
};
auto assoc = [&](auto* a, auto* b) -> parsed
{ return {ev(ev(pathof(a), et, pt), ev(pathof(b), et, pt)), peek(b, tail)}; };
{
auto b_path = pathof(b);
auto pt_b = calc_pt(b->mask, b_path);
return {ev(ev(pathof(a), et, pt_b), ev(b_path, et, pt_b)), peek(b, tail)};
};
auto next = peek(in, tail);
return ! isassoc(in, next) ? one(next)
: isfromto(in, next) ? assoc(in, next)
Expand Down