MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add option to trigger startup scan, rename force-rescan and better cleanup in full rescan

This commit is contained in:
ejurgensen 2014-05-11 23:55:18 +02:00
parent 0aa8416a21
commit 851b57017d
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/filescanner.c
View File

@ -61,6 +61,7 @@
#include "conffile.h" #include "conffile.h"
#include "misc.h" #include "misc.h"
#include "remote_pairing.h" #include "remote_pairing.h"
#include "player.h"
#ifdef HAVE_SPOTIFY_H #ifdef HAVE_SPOTIFY_H
# include "spotify.h" # include "spotify.h"
@ -684,19 +685,36 @@ process_file(char *file, time_t mtime, off_t size, int type, int flags)
return; return;
} }
#endif #endif
else if (strcmp(ext, ".force-rescan") == 0) else if (strcmp(ext, ".full-rescan") == 0)
{ {
if (flags & F_SCAN_BULK) if (flags & F_SCAN_BULK)
return; return;
else else
{ {
DPRINTF(E_LOG, L_SCAN, "Forcing full rescan, found force-rescan file: %s\n", file); DPRINTF(E_LOG, L_SCAN, "Forcing full rescan, found full-rescan file: %s\n", file);
player_playback_stop();
player_queue_clear();
inofd_event_unset(); // Clears all inotify watches inofd_event_unset(); // Clears all inotify watches
db_purge_all(); // Clears files, playlists, playlistitems, inotify and groups db_purge_all(); // Clears files, playlists, playlistitems, inotify and groups
inofd_event_set(); inofd_event_set();
bulk_scan(F_SCAN_BULK); bulk_scan(F_SCAN_BULK);
return;
}
}
else if (strcmp(ext, ".init-rescan") == 0)
{
if (flags & F_SCAN_BULK)
return;
else
{
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);
return; return;
} }
} }