scanner: Clean up non-destructive rescan

Fix several issues with the non-destructive rescan functionality.
Most of these issues also affected inotify scanning as well.  These
include annoying debug messages, adding album art for files that we
aren't supposed to be scanning anyway, incrementing the UpdateID when no
changes were made to the database, and other smaller issues.
This commit is contained in:
Justin Maggard
2017-08-23 23:43:42 -07:00
parent 9e534c56fd
commit 50b1a2e289
13 changed files with 232 additions and 242 deletions

View File

@ -66,7 +66,7 @@
#endif
#define USE_FORK 1
#define DB_VERSION 10
#define DB_VERSION 11
#ifdef ENABLE_NLS
#define _(string) gettext(string)
@ -193,6 +193,8 @@ extern uint32_t runtime_flags;
#else
#define TIVO_BONJOUR_MASK 0x0000
#endif
#define SCANNING_MASK 0x0100
#define RESCAN_MASK 0x0200
#define SETFLAG(mask) runtime_flags |= mask
#define GETFLAG(mask) (runtime_flags & mask)
@ -229,10 +231,8 @@ extern char db_path[];
extern char log_path[];
extern struct media_dir_s *media_dirs;
extern struct album_art_name_s *album_art_names;
extern short int scanning;
extern volatile short int quitting;
extern volatile uint32_t updateID;
extern const char *force_sort_criteria;
extern short int rescan_db;
#endif