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

[db] Only trigger the library update callback, if a query changed at

Browse Source 
least one row
This commit is contained in:
chme 2017-11-12 10:46:05 +01:00
parent 1cdb9f450d
commit 4fe4bee809
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/db.c
View File

@ -1499,6 +1499,7 @@ static int
db_query_run(char *query, int free, int library_update) db_query_run(char *query, int free, int library_update)
{ {
char *errmsg; char *errmsg;
int changes = 0;
int ret; int ret;
if (!query) if (!query)
@ -1516,6 +1517,8 @@ db_query_run(char *query, int free, int library_update)
ret = db_exec(query, &errmsg); ret = db_exec(query, &errmsg);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
DPRINTF(E_LOG, L_DB, "Error '%s' while runnning '%s'\n", errmsg, query); DPRINTF(E_LOG, L_DB, "Error '%s' while runnning '%s'\n", errmsg, query);
else
changes = sqlite3_changes(hdl);
sqlite3_free(errmsg); sqlite3_free(errmsg);
@ -1524,7 +1527,7 @@ db_query_run(char *query, int free, int library_update)
cache_daap_resume(); cache_daap_resume();
if (library_update) if (library_update && changes > 0)
library_update_trigger(); library_update_trigger();
return ((ret != SQLITE_OK) ? -1 : 0); return ((ret != SQLITE_OK) ? -1 : 0);
@ -3678,7 +3681,7 @@ db_pairing_fetch_byguid(struct pairing_info *pi)
void void
db_spotify_purge(void) db_spotify_purge(void)
{ {
#define Q_TMPL "UPDATE directories SET disabled = %" PRIi64 " WHERE virtual_path = '/spotify:';" #define Q_TMPL "UPDATE directories SET disabled = %" PRIi64 " WHERE virtual_path = '/spotify:' AND disabled <> %" PRIi64 ";"
char *queries[4] = char *queries[4] =
{ {
"DELETE FROM files WHERE path LIKE 'spotify:%%';", "DELETE FROM files WHERE path LIKE 'spotify:%%';",
@ -3699,7 +3702,7 @@ db_spotify_purge(void)
} }
// Disable the spotify directory by setting 'disabled' to INOTIFY_FAKE_COOKIE value // Disable the spotify directory by setting 'disabled' to INOTIFY_FAKE_COOKIE value
query = sqlite3_mprintf(Q_TMPL, INOTIFY_FAKE_COOKIE); query = sqlite3_mprintf(Q_TMPL, INOTIFY_FAKE_COOKIE, INOTIFY_FAKE_COOKIE);
if (!query) if (!query)
{ {
DPRINTF(E_LOG, L_DB, "Out of memory for query string\n"); DPRINTF(E_LOG, L_DB, "Out of memory for query string\n");