storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scanner: Add non-destructive update rescan

Browse Source 
New functionality, based on Shrimpkin's patch #145 on SF.
This commit is contained in:
Justin Maggard
2017-05-04 23:29:59 -07:00
parent 5450ac486e
commit 49aa42d893
8 changed files with 177 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
scanner.c
View File

@ -46,6 +46,7 @@
#include "albumart.h"
#include "containers.h"
#include "log.h"
#include "monitor.h"
#if SCANDIR_CONST
typedef const struct dirent scan_filter;
@ -837,6 +838,68 @@ _notify_stop(void)
#endif
}
/* rescan functions added by shrimpkin@sourceforge.net */
static int
cb_orphans(void *args, int argc, char **argv, char **azColName)
{
const char *path = argv[0];
const char *mime = argv[1];
/* If we can't access the path, remove it */
if (access(path, R_OK) != 0)
{
DPRINTF(E_DEBUG, L_SCANNER, "Removing %s [%s]\n", path, mime ? "file" : "dir");
if (mime)
monitor_remove_file(path);
else
monitor_remove_directory(0, path);
}
return 0;
}
void
start_rescan(void)
{
struct media_dir_s *media_path;
char *esc_name = NULL;
char *zErrMsg;
const char *sql_files = "SELECT path, mime FROM details WHERE path NOT NULL AND mime IS NOT NULL;";
const char *sql_dir = "SELECT path, mime FROM details WHERE path NOT NULL AND mime IS NULL;";
int ret;
DPRINTF(E_INFO, L_SCANNER, "Starting rescan\n");
/* Find and remove any dead directory links */
ret = sqlite3_exec(db, sql_dir, cb_orphans, NULL, &zErrMsg);
if (ret != SQLITE_OK)
{
DPRINTF(E_MAXDEBUG, L_SCANNER, "SQL error: %s\nBAD SQL: %s\n", zErrMsg, sql_dir);
sqlite3_free(zErrMsg);
}
/* Find and remove any dead file links */
ret = sqlite3_exec(db, sql_files, cb_orphans, NULL, &zErrMsg);
if (ret != SQLITE_OK)
{
DPRINTF(E_MAXDEBUG, L_SCANNER, "SQL error: %s\nBAD SQL: %s\n", zErrMsg, sql_files);
sqlite3_free(zErrMsg);
}
/* Rescan media_paths for new and/or modified files */
for (media_path = media_dirs; media_path != NULL; media_path = media_path->next)
{
char path[MAXPATHLEN], buf[MAXPATHLEN];
strncpyt(path, media_path->path, sizeof(path));
strncpyt(buf, media_path->path, sizeof(buf));
esc_name = escape_tag(basename(buf), 1);
monitor_insert_directory(0, esc_name, path);
free(esc_name);
}
DPRINTF(E_INFO, L_SCANNER, "Rescan completed\n");
}
/* end rescan functions */
void
start_scanner()
{
@ -845,12 +908,17 @@ start_scanner()
if (setpriority(PRIO_PROCESS, 0, 15) == -1)
DPRINTF(E_WARN, L_INOTIFY, "Failed to reduce scanner thread priority\n");
_notify_start();
setlocale(LC_COLLATE, "");
av_register_all();
av_log_set_level(AV_LOG_PANIC);
if( rescan_db )
{
start_rescan();
return;
}
_notify_start();
for( media_path = media_dirs; media_path != NULL; media_path = media_path->next )
{
int64_t id;