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

Fixup init-rescan

Browse Source
This commit is contained in:
ejurgensen 2014-05-13 22:14:19 +02:00
parent c1be585469
commit 6b0c5997bf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/filescanner.c
View File

@ -71,6 +71,7 @@
#define F_SCAN_BULK (1 << 0) #define F_SCAN_BULK (1 << 0)
#define F_SCAN_RESCAN (1 << 1) #define F_SCAN_RESCAN (1 << 1)
#define F_SCAN_FAST (1 << 2) #define F_SCAN_FAST (1 << 2)
#define F_SCAN_MOVED (1 << 3)
struct deferred_pl { struct deferred_pl {
char *path; char *path;
@ -710,6 +711,9 @@ process_file(char *file, time_t mtime, off_t size, int type, int flags)
else else
{ {
DPRINTF(E_LOG, L_SCAN, "Forcing startup rescan, found init-rescan file: %s\n", file); DPRINTF(E_LOG, L_SCAN, "Forcing startup rescan, found init-rescan file: %s\n", file);
inofd_event_unset(); // Clears all inotify watches
inofd_event_set();
bulk_scan(F_SCAN_BULK | F_SCAN_RESCAN); bulk_scan(F_SCAN_BULK | F_SCAN_RESCAN);
return; return;
@ -896,7 +900,7 @@ process_directory(char *path, int flags)
return; return;
} }
if (!(flags & F_SCAN_RESCAN)) if (!(flags & F_SCAN_MOVED))
{ {
wi.cookie = 0; wi.cookie = 0;
wi.path = path; wi.path = path;
@ -1198,7 +1202,7 @@ process_inotify_dir(struct watch_info *wi, char *path, struct inotify_event *ie)
db_pl_enable_bycookie(ie->cookie, path); db_pl_enable_bycookie(ie->cookie, path);
/* We'll rescan the directory tree to update playlists */ /* We'll rescan the directory tree to update playlists */
flags |= F_SCAN_RESCAN; flags |= F_SCAN_MOVED;
} }
ie->mask |= IN_CREATE; ie->mask |= IN_CREATE;