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

Always rescan directories to update playlists

Browse Source
This commit is contained in:
Julien BLACHE 2009-06-11 19:11:03 +02:00
parent 538d81b402
commit c918c5c689
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

@ -47,6 +47,7 @@
#define F_SCAN_BULK (1 << 0) #define F_SCAN_BULK (1 << 0)
#define F_SCAN_RESCAN (1 << 1)
struct deferred_pl { struct deferred_pl {
char *path; char *path;
@ -538,7 +539,8 @@ process_directory(int libidx, char *path, int flags)
wi.cookie = 0; wi.cookie = 0;
wi.path = path; wi.path = path;
db_watch_add(&wi); if (!(flags & F_SCAN_RESCAN))
db_watch_add(&wi);
} }
/* Thread: scan */ /* Thread: scan */
@ -659,6 +661,7 @@ process_inotify_dir(struct watch_info *wi, char *path, struct inotify_event *ie)
{ {
struct watch_enum we; struct watch_enum we;
uint32_t rm_wd; uint32_t rm_wd;
int flags = 0;
int ret; int ret;
DPRINTF(E_DBG, L_SCAN, "Directory event: 0x%x, cookie 0x%x, wd %d\n", ie->mask, ie->cookie, wi->wd); DPRINTF(E_DBG, L_SCAN, "Directory event: 0x%x, cookie 0x%x, wd %d\n", ie->mask, ie->cookie, wi->wd);
@ -746,14 +749,17 @@ process_inotify_dir(struct watch_info *wi, char *path, struct inotify_event *ie)
db_watch_move_bycookie(ie->cookie, path); db_watch_move_bycookie(ie->cookie, path);
db_file_enable_bycookie(ie->cookie, path); db_file_enable_bycookie(ie->cookie, path);
db_pl_enable_bycookie(ie->cookie, path); db_pl_enable_bycookie(ie->cookie, path);
/* We'll rescan the directory tree to update playlists */
flags |= F_SCAN_RESCAN;
} }
else
ie->mask |= IN_CREATE; ie->mask |= IN_CREATE;
} }
if (ie->mask & IN_CREATE) if (ie->mask & IN_CREATE)
{ {
process_directories(wi->libidx, path, 0); process_directories(wi->libidx, path, flags);
if (dirstack) if (dirstack)
DPRINTF(E_LOG, L_SCAN, "WARNING: unhandled leftover directories\n"); DPRINTF(E_LOG, L_SCAN, "WARNING: unhandled leftover directories\n");