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

[db] Extract function to fix queue position values

Browse Source
This commit is contained in:
chme 2017-02-04 07:12:53 +01:00 committed by ejurgensen
parent 1c8263224e
commit d293356d8b
1 changed files with 49 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/db.c
View File

@ -4711,6 +4711,53 @@ db_queue_fetch_prev(uint32_t item_id, char shuffle)
return db_queue_fetch_byposrelativetoitem(-1, item_id, shuffle); return db_queue_fetch_byposrelativetoitem(-1, item_id, shuffle);
} }
static int
queue_fix_pos(enum sort_type sort)
{
#define Q_TMPL "UPDATE queue SET %q = %d WHERE id = %d;"
struct query_params query_params;
struct db_queue_item queue_item;
char *query;
int pos;
int ret;
memset(&query_params, 0, sizeof(struct query_params));
query_params.sort = sort;
ret = queue_enum_start(&query_params);
if (ret < 0)
{
return -1;
}
pos = 0;
while ((ret = queue_enum_fetch(&query_params, &queue_item, 0)) == 0 && (queue_item.id > 0))
{
if (queue_item.pos != pos)
{
if (sort == S_SHUFFLE_POS)
query = sqlite3_mprintf(Q_TMPL, "shuffle_pos", pos, queue_item.id);
else
query = sqlite3_mprintf(Q_TMPL, "pos", pos, queue_item.id);
ret = db_query_run(query, 1, 0);
if (ret < 0)
{
DPRINTF(E_LOG, L_DB, "Failed to update item with item-id: %d\n", queue_item.id);
break;
}
}
pos++;
}
db_query_end(&query_params);
return ret;
#undef Q_TMPL
}
/* /*
* Remove files that are disabled or non existant in the library and repair ordering of * Remove files that are disabled or non existant in the library and repair ordering of
* the queue (shuffle and normal) * the queue (shuffle and normal)
@ -4719,13 +4766,7 @@ int
db_queue_cleanup() db_queue_cleanup()
{ {
#define Q_TMPL "DELETE FROM queue WHERE NOT file_id IN (SELECT id from files WHERE disabled = 0);" #define Q_TMPL "DELETE FROM queue WHERE NOT file_id IN (SELECT id from files WHERE disabled = 0);"
#define Q_TMPL_UPDATE "UPDATE queue SET pos = %d WHERE id = %d;"
#define Q_TMPL_UPDATE_SHUFFLE "UPDATE queue SET shuffle_pos = %d WHERE id = %d;"
struct query_params query_params;
struct db_queue_item queue_item;
char *query;
int pos;
int deleted; int deleted;
int ret; int ret;
@ -4747,34 +4788,7 @@ db_queue_cleanup()
} }
// Update position of normal queue // Update position of normal queue
memset(&query_params, 0, sizeof(struct query_params)); ret = queue_fix_pos(S_POS);
ret = queue_enum_start(&query_params);
if (ret < 0)
{
db_transaction_rollback();
return -1;
}
pos = 0;
while ((ret = queue_enum_fetch(&query_params, &queue_item, 0)) == 0 && (queue_item.id > 0))
{
if (queue_item.pos != pos)
{
query = sqlite3_mprintf(Q_TMPL_UPDATE, pos, queue_item.id);
ret = db_query_run(query, 1, 0);
if (ret < 0)
{
DPRINTF(E_LOG, L_DB, "Failed to update item with item-id: %d\n", queue_item.id);
break;
}
}
pos++;
}
db_query_end(&query_params);
if (ret < 0) if (ret < 0)
{ {
db_transaction_rollback(); db_transaction_rollback();
@ -4782,35 +4796,7 @@ db_queue_cleanup()
} }
// Update position of shuffle queue // Update position of shuffle queue
memset(&query_params, 0, sizeof(struct query_params)); ret = queue_fix_pos(S_SHUFFLE_POS);
query_params.sort = S_SHUFFLE_POS;
ret = queue_enum_start(&query_params);
if (ret < 0)
{
db_transaction_rollback();
return -1;
}
pos = 0;
while ((ret = queue_enum_fetch(&query_params, &queue_item, 0)) == 0 && (queue_item.id > 0))
{
if (queue_item.shuffle_pos != pos)
{
query = sqlite3_mprintf(Q_TMPL_UPDATE_SHUFFLE, pos, queue_item.id);
ret = db_query_run(query, 1, 0);
if (ret < 0)
{
DPRINTF(E_LOG, L_DB, "Failed to update item with item-id: %d\n", queue_item.id);
break;
}
}
pos++;
}
db_query_end(&query_params);
if (ret < 0) if (ret < 0)
{ {
db_transaction_rollback(); db_transaction_rollback();
@ -4822,8 +4808,6 @@ db_queue_cleanup()
return 0; return 0;
#undef Q_TMPL_UPDATE_SHUFFLE
#undef Q_TMPL_UPDATE
#undef Q_TMPL #undef Q_TMPL
} }