MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-27 15:45:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[db] Orphan nested playlists if parent is deleted/cleared

Browse Source 
Also align db_pl_delete_bypath with db_pl_delete by making it a wrapper.
This commit is contained in:
ejurgensen 2020-02-08 13:41:26 +01:00
parent 84aced0a3d
commit 541a1a6701
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/db.c
View File

@ -3557,13 +3557,17 @@ db_pl_add_item_byid(int plid, int fileid)
void void
db_pl_clear_items(int id) db_pl_clear_items(int id)
{ {
#define Q_TMPL "DELETE FROM playlistitems WHERE playlistid = %d;" #define Q_TMPL_ITEMS "DELETE FROM playlistitems WHERE playlistid = %d;"
#define Q_TMPL_NESTED "UPDATE playlists SET parent_id = 0 WHERE parent_id = %d;"
char *query; char *query;
query = sqlite3_mprintf(Q_TMPL, id); query = sqlite3_mprintf(Q_TMPL_ITEMS, id);
db_query_run(query, 1, 0); db_query_run(query, 1, 0);
#undef Q_TMPL
query = sqlite3_mprintf(Q_TMPL_NESTED, id);
db_query_run(query, 1, 0);
#undef Q_TMPL_NESTED
#undef Q_TMPL_ITEMS
} }
void void
@ -3588,23 +3592,30 @@ db_pl_delete(int id)
void void
db_pl_delete_bypath(const char *path) db_pl_delete_bypath(const char *path)
{ {
int i; struct query_params qp;
struct db_playlist_info dbpli;
int32_t id;
int ret; int ret;
char *query;
char *queries_tmpl[] =
{
"DELETE FROM playlistitems WHERE playlistid IN (SELECT id FROM playlists WHERE path = '%q');",
"DELETE FROM playlists WHERE path = '%q';",
};
for (i = 0; i < (sizeof(queries_tmpl) / sizeof(queries_tmpl[0])); i++) memset(&qp, 0, sizeof(struct query_params));
{
query = sqlite3_mprintf(queries_tmpl[i], path);
ret = db_query_run(query, 1, 0); qp.type = Q_PL;
if (ret == 0) qp.filter = db_mprintf("path = '%q'", path);
DPRINTF(E_DBG, L_DB, "Purged %d rows\n", sqlite3_changes(hdl));
ret = db_query_start(&qp);
if (ret < 0)
return;
while (((ret = db_query_fetch_pl(&qp, &dbpli)) == 0) && (dbpli.id))
{
if (safe_atoi32(dbpli.id, &id) != 0)
continue;
db_pl_delete(id);
} }
db_query_end(&qp);
free_query_params(&qp, 1);
} }
void void