MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-10 05:08:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

[filescanner] attempt at fixing compile errors on freebsd after the

Browse Source 
introduction of the directories table
This commit is contained in:
chme 2016-01-30 06:55:15 +01:00
parent 8600c21424
commit cd5462e241
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/filescanner.c
View File

@ -1908,6 +1908,7 @@ kqueue_cb(int fd, short event, void *arg)
int w_len; int w_len;
int need_rescan; int need_rescan;
int ret; int ret;
int parent_id;
ts.tv_sec = 0; ts.tv_sec = 0;
ts.tv_nsec = 0; ts.tv_nsec = 0;
@ -1970,6 +1971,7 @@ kqueue_cb(int fd, short event, void *arg)
/* Disable files */ /* Disable files */
db_file_disable_bymatch(wi.path, "", 0); db_file_disable_bymatch(wi.path, "", 0);
db_pl_disable_bymatch(wi.path, "", 0); db_pl_disable_bymatch(wi.path, "", 0);
db_directory_disable_bymatch(wi.path, "", 0);
if (kev.flags & EV_ERROR) if (kev.flags & EV_ERROR)
{ {
@ -2052,17 +2054,21 @@ kqueue_cb(int fd, short event, void *arg)
} }
if (need_rescan) if (need_rescan)
push_dir(&rescan, wi.path); {
parent_id = get_parent_dir_id(wi.path);
push_dir(&rescan, wi.path, parent_id);
}
} }
free(wi.path); free(wi.path);
} }
while ((path = pop_dir(&rescan))) while ((d = pop_dir(&rescan)))
{ {
process_directories(path, 0); process_directories(path, 0, d->parent_id);
free(path); free(d->path);
free(d);
if (rescan) if (rescan)
DPRINTF(E_LOG, L_SCAN, "WARNING: unhandled leftover directories\n"); DPRINTF(E_LOG, L_SCAN, "WARNING: unhandled leftover directories\n");