MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[filescanner] Do not process parent directories on inotify callback

Browse Source
This commit is contained in:
chme 2016-01-29 19:29:02 +01:00
parent 9197f0f64b
commit dcfec5c1d4
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/filescanner.c
View File

@ -23,6 +23,7 @@
# include <config.h> # include <config.h>
#endif #endif
#include <libgen.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -1411,6 +1412,28 @@ watches_clear(uint32_t wd, char *path)
return 0; return 0;
} }
static int
get_parent_dir_id(const char *path)
{
char *pathcopy;
char *parent_dir;
char virtual_path[PATH_MAX];
int parent_id;
int ret;
pathcopy = strdup(path);
parent_dir = dirname(pathcopy);
ret = create_virtual_path(parent_dir, virtual_path, sizeof(virtual_path));
if (ret == 0)
parent_id = db_directory_id_byvirtualpath(virtual_path);
else
parent_id = 0;
free(pathcopy);
return parent_id;
}
/* Thread: scan */ /* Thread: scan */
static void static void
process_inotify_dir(struct watch_info *wi, char *path, struct inotify_event *ie) process_inotify_dir(struct watch_info *wi, char *path, struct inotify_event *ie)
@ -1543,8 +1566,7 @@ process_inotify_dir(struct watch_info *wi, char *path, struct inotify_event *ie)
if (ie->mask & IN_CREATE) if (ie->mask & IN_CREATE)
{ {
parent_id = process_parent_directories(path); parent_id = get_parent_dir_id(path);
process_directories(path, parent_id, flags); process_directories(path, parent_id, flags);
if (dirstack) if (dirstack)
@ -1741,7 +1763,7 @@ process_inotify_file(struct watch_info *wi, char *path, struct inotify_event *ie
if (check_speciallib(path, "audiobooks")) if (check_speciallib(path, "audiobooks"))
type |= F_SCAN_TYPE_AUDIOBOOK; type |= F_SCAN_TYPE_AUDIOBOOK;
dir_id = process_parent_directories(file); dir_id = get_parent_dir_id(file);
if (S_ISREG(sb.st_mode)) if (S_ISREG(sb.st_mode))
{ {