oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

InotifyUpdate: move functions into the WatchDirectory class

Browse Source
This commit is contained in:
Max Kellermann 2014-02-07 22:24:26 +01:00
parent 05ee057db5
commit 25aa17ad89
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/db/update/InotifyUpdate.cxx
View File

@ -62,6 +62,12 @@ struct WatchDirectory {
WatchDirectory(const WatchDirectory &) = delete; WatchDirectory(const WatchDirectory &) = delete;
WatchDirectory &operator=(const WatchDirectory &) = delete; WatchDirectory &operator=(const WatchDirectory &) = delete;
gcc_pure
unsigned GetDepth() const;
gcc_pure
AllocatedPath GetUriFS() const;
}; };
static InotifySource *inotify_source; static InotifySource *inotify_source;
@ -127,17 +133,17 @@ remove_watch_directory(WatchDirectory *directory)
}); });
} }
static AllocatedPath AllocatedPath
watch_directory_get_uri_fs(const WatchDirectory *directory) WatchDirectory::GetUriFS() const
{ {
if (directory->parent == nullptr) if (parent == nullptr)
return AllocatedPath::Null(); return AllocatedPath::Null();
const auto uri = watch_directory_get_uri_fs(directory->parent); const auto uri = parent->GetUriFS();
if (uri.IsNull()) if (uri.IsNull())
return directory->name; return name;
return AllocatedPath::Build(uri, directory->name); return AllocatedPath::Build(uri, name);
} }
/* we don't look at "." / ".." nor files with newlines in their name */ /* we don't look at "." / ".." nor files with newlines in their name */
@ -221,11 +227,10 @@ recursive_watch_subdirectories(WatchDirectory *directory,
} }
gcc_pure gcc_pure
static unsigned unsigned
watch_directory_depth(const WatchDirectory *d) WatchDirectory::GetDepth() const
{ {
assert(d != nullptr); const WatchDirectory *d = this;
unsigned depth = 0; unsigned depth = 0;
while ((d = d->parent) != nullptr) while ((d = d->parent) != nullptr)
++depth; ++depth;
@ -245,7 +250,7 @@ mpd_inotify_callback(int wd, unsigned mask,
if (directory == nullptr) if (directory == nullptr)
return; return;
const auto uri_fs = watch_directory_get_uri_fs(directory); const auto uri_fs = directory->GetUriFS();
if ((mask & (IN_DELETE_SELF|IN_MOVE_SELF)) != 0) { if ((mask & (IN_DELETE_SELF|IN_MOVE_SELF)) != 0) {
remove_watch_directory(directory); remove_watch_directory(directory);
@ -263,13 +268,13 @@ mpd_inotify_callback(int wd, unsigned mask,
: AllocatedPath::Build(root, uri_fs.c_str()); : AllocatedPath::Build(root, uri_fs.c_str());
recursive_watch_subdirectories(directory, path_fs, recursive_watch_subdirectories(directory, path_fs,
watch_directory_depth(directory)); directory->GetDepth());
} }
if ((mask & (IN_CLOSE_WRITE|IN_MOVE|IN_DELETE)) != 0 || if ((mask & (IN_CLOSE_WRITE|IN_MOVE|IN_DELETE)) != 0 ||
/* at the maximum depth, we watch out for newly created /* at the maximum depth, we watch out for newly created
directories */ directories */
(watch_directory_depth(directory) == inotify_max_depth && (directory->GetDepth() == inotify_max_depth &&
(mask & (IN_CREATE|IN_ISDIR)) == (IN_CREATE|IN_ISDIR))) { (mask & (IN_CREATE|IN_ISDIR)) == (IN_CREATE|IN_ISDIR))) {
/* a file was changed, or a directory was /* a file was changed, or a directory was
moved/deleted: queue a database update */ moved/deleted: queue a database update */