MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-05 02:38:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add support for disabled files and playlists

Browse Source
This commit is contained in:
Julien BLACHE 2009-06-10 15:23:02 +02:00
parent 177fb35d81
commit bfa2488343
2 changed files with 58 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/db.c
View File

@ -117,6 +117,7 @@ static struct col_type_map pli_cols_map[] =
{ pli_offsetof(items), DB_TYPE_INT }, { pli_offsetof(items), DB_TYPE_INT },
{ pli_offsetof(query), DB_TYPE_STRING }, { pli_offsetof(query), DB_TYPE_STRING },
{ pli_offsetof(db_timestamp), DB_TYPE_INT }, { pli_offsetof(db_timestamp), DB_TYPE_INT },
{ pli_offsetof(disabled), DB_TYPE_INT },
{ pli_offsetof(path), DB_TYPE_STRING }, { pli_offsetof(path), DB_TYPE_STRING },
{ pli_offsetof(index), DB_TYPE_INT }, { pli_offsetof(index), DB_TYPE_INT },
}; };
@ -187,6 +188,7 @@ static ssize_t dbpli_cols_map[] =
dbpli_offsetof(items), dbpli_offsetof(items),
dbpli_offsetof(query), dbpli_offsetof(query),
dbpli_offsetof(db_timestamp), dbpli_offsetof(db_timestamp),
dbpli_offsetof(disabled),
dbpli_offsetof(path), dbpli_offsetof(path),
dbpli_offsetof(index), dbpli_offsetof(index),
}; };
@ -418,9 +420,9 @@ db_build_query_items(struct query_params *qp, char **q)
int ret; int ret;
if (qp->filter) if (qp->filter)
count = sqlite3_mprintf("SELECT COUNT(*) FROM songs WHERE %s;", qp->filter); count = sqlite3_mprintf("SELECT COUNT(*) FROM songs WHERE disabled = 0 AND %s;", qp->filter);
else else
count = sqlite3_mprintf("SELECT COUNT(*) FROM songs;"); count = sqlite3_mprintf("SELECT COUNT(*) FROM songs WHERE disabled = 0;");
if (!count) if (!count)
{ {
@ -441,13 +443,13 @@ db_build_query_items(struct query_params *qp, char **q)
return -1; return -1;
if (idx && qp->filter) if (idx && qp->filter)
query = sqlite3_mprintf("SELECT * FROM songs WHERE %s %s;", qp->filter, idx); query = sqlite3_mprintf("SELECT * FROM songs WHERE disabled = 0 AND %s %s;", qp->filter, idx);
else if (idx) else if (idx)
query = sqlite3_mprintf("SELECT * FROM songs %s;", idx); query = sqlite3_mprintf("SELECT * FROM songs WHERE disabled = 0 %s;", idx);
else if (qp->filter) else if (qp->filter)
query = sqlite3_mprintf("SELECT * FROM songs WHERE %s;", qp->filter); query = sqlite3_mprintf("SELECT * FROM songs WHERE disabled = 0 AND %s;", qp->filter);
else else
query = sqlite3_mprintf("SELECT * FROM songs;"); query = sqlite3_mprintf("SELECT * FROM songs WHERE disabled = 0;");
if (!query) if (!query)
{ {
@ -467,7 +469,7 @@ db_build_query_pls(struct query_params *qp, char **q)
char *idx; char *idx;
int ret; int ret;
qp->results = db_query_get_count("SELECT COUNT(*) FROM playlists;"); qp->results = db_query_get_count("SELECT COUNT(*) FROM playlists WHERE disabled = 0;");
if (qp->results < 0) if (qp->results < 0)
return -1; return -1;
@ -477,9 +479,9 @@ db_build_query_pls(struct query_params *qp, char **q)
return -1; return -1;
if (idx) if (idx)
query = sqlite3_mprintf("SELECT * FROM playlists %s;", idx); query = sqlite3_mprintf("SELECT * FROM playlists WHERE disabled = 0 %s;", idx);
else else
query = sqlite3_mprintf("SELECT * FROM playlists;"); query = sqlite3_mprintf("SELECT * FROM playlists WHERE disabled = 0;");
if (!query) if (!query)
{ {
@ -509,18 +511,18 @@ db_build_query_plitems(struct query_params *qp, char **q)
if (qp->pl_id == 1) if (qp->pl_id == 1)
{ {
if (qp->filter) if (qp->filter)
count = sqlite3_mprintf("SELECT COUNT(*) FROM songs WHERE %s;", qp->filter); count = sqlite3_mprintf("SELECT COUNT(*) FROM songs WHERE disabled = 0 AND %s;", qp->filter);
else else
count = sqlite3_mprintf("SELECT COUNT(*) FROM songs;"); count = sqlite3_mprintf("SELECT COUNT(*) FROM songs WHERE disabled = 0;");
} }
else else
{ {
if (qp->filter) if (qp->filter)
count = sqlite3_mprintf("SELECT COUNT(*) FROM songs JOIN playlistitems ON songs.id = playlistitems.songid" count = sqlite3_mprintf("SELECT COUNT(*) FROM songs JOIN playlistitems ON songs.id = playlistitems.songid"
" WHERE playlistitems.playlistid = %d AND %s;", qp->pl_id, qp->filter); " WHERE playlistitems.playlistid = %d AND songs.disabled = 0 AND %s;", qp->pl_id, qp->filter);
else else
count = sqlite3_mprintf("SELECT COUNT(*) FROM songs JOIN playlistitems ON songs.id = playlistitems.songid" count = sqlite3_mprintf("SELECT COUNT(*) FROM songs JOIN playlistitems ON songs.id = playlistitems.songid"
" WHERE playlistitems.playlistid = %d;", qp->pl_id); " WHERE playlistitems.playlistid = %d AND songs.disabled = 0;", qp->pl_id);
} }
if (!count) if (!count)
@ -543,19 +545,19 @@ db_build_query_plitems(struct query_params *qp, char **q)
if (idx && qp->filter) if (idx && qp->filter)
query = sqlite3_mprintf("SELECT songs.* FROM songs JOIN playlistitems ON songs.id = playlistitems.songid" query = sqlite3_mprintf("SELECT songs.* FROM songs JOIN playlistitems ON songs.id = playlistitems.songid"
" WHERE playlistitems.playlistid = %d AND %s ORDER BY playlistitems.id ASC %s;", " WHERE playlistitems.playlistid = %d AND songs.disabled = 0 AND %s ORDER BY playlistitems.id ASC %s;",
qp->pl_id, qp->filter, idx); qp->pl_id, qp->filter, idx);
else if (idx) else if (idx)
query = sqlite3_mprintf("SELECT songs.* FROM songs JOIN playlistitems ON songs.id = playlistitems.songid" query = sqlite3_mprintf("SELECT songs.* FROM songs JOIN playlistitems ON songs.id = playlistitems.songid"
" WHERE playlistitems.playlistid = %d ORDER BY playlistitems.id ASC %s;", " WHERE playlistitems.playlistid = %d AND songs.disabled = 0 ORDER BY playlistitems.id ASC %s;",
qp->pl_id, idx); qp->pl_id, idx);
else if (qp->filter) else if (qp->filter)
query = sqlite3_mprintf("SELECT songs.* FROM songs JOIN playlistitems ON songs.id = playlistitems.songid" query = sqlite3_mprintf("SELECT songs.* FROM songs JOIN playlistitems ON songs.id = playlistitems.songid"
" WHERE playlistitems.playlistid = %d AND %s ORDER BY playlistitems.id ASC;", " WHERE playlistitems.playlistid = %d AND songs.disabled = 0 AND %s ORDER BY playlistitems.id ASC;",
qp->pl_id, qp->filter); qp->pl_id, qp->filter);
else else
query = sqlite3_mprintf("SELECT songs.* FROM songs JOIN playlistitems ON songs.id = playlistitems.songid" query = sqlite3_mprintf("SELECT songs.* FROM songs JOIN playlistitems ON songs.id = playlistitems.songid"
" WHERE playlistitems.playlistid = %d ORDER BY playlistitems.id ASC;", " WHERE playlistitems.playlistid = %d AND songs.disabled = 0 ORDER BY playlistitems.id ASC;",
qp->pl_id); qp->pl_id);
if (!query) if (!query)
@ -578,9 +580,11 @@ db_build_query_browse(struct query_params *qp, char *field, char **q)
int ret; int ret;
if (qp->filter) if (qp->filter)
count = sqlite3_mprintf("SELECT COUNT(DISTINCT %s) FROM songs WHERE data_kind = 0 AND %s != '' AND %s;", field, field, qp->filter); count = sqlite3_mprintf("SELECT COUNT(DISTINCT %s) FROM songs WHERE data_kind = 0 AND disabled = 0 AND %s != '' AND %s;",
field, field, qp->filter);
else else
count = sqlite3_mprintf("SELECT COUNT(DISTINCT %s) FROM songs WHERE data_kind = 0 AND %s != '';", field, field); count = sqlite3_mprintf("SELECT COUNT(DISTINCT %s) FROM songs WHERE data_kind = 0 AND disabled = 0 AND %s != '';",
field, field);
if (!count) if (!count)
{ {
@ -601,16 +605,16 @@ db_build_query_browse(struct query_params *qp, char *field, char **q)
return -1; return -1;
if (idx && qp->filter) if (idx && qp->filter)
query = sqlite3_mprintf("SELECT DISTINCT %s FROM songs WHERE data_kind = 0 AND %s != ''" query = sqlite3_mprintf("SELECT DISTINCT %s FROM songs WHERE data_kind = 0 AND disabled = 0 AND %s != ''"
" AND %s %s;", field, field, qp->filter, idx); " AND %s %s;", field, field, qp->filter, idx);
else if (idx) else if (idx)
query = sqlite3_mprintf("SELECT DISTINCT %s FROM songs WHERE data_kind = 0 AND %s != ''" query = sqlite3_mprintf("SELECT DISTINCT %s FROM songs WHERE data_kind = 0 AND disabled = 0 AND %s != ''"
" %s;", field, field, idx); " %s;", field, field, idx);
else if (qp->filter) else if (qp->filter)
query = sqlite3_mprintf("SELECT DISTINCT %s FROM songs WHERE data_kind = 0 AND %s != ''" query = sqlite3_mprintf("SELECT DISTINCT %s FROM songs WHERE data_kind = 0 AND disabled = 0 AND %s != ''"
" AND %s;", field, field, qp->filter); " AND %s;", field, field, qp->filter);
else else
query = sqlite3_mprintf("SELECT DISTINCT %s FROM songs WHERE data_kind = 0 AND %s != ''", query = sqlite3_mprintf("SELECT DISTINCT %s FROM songs WHERE data_kind = 0 AND disabled = 0 AND %s != ''",
field, field); field, field);
if (!query) if (!query)
@ -846,7 +850,7 @@ db_query_fetch_string(struct query_params *qp, char **string)
int int
db_files_get_count(int *count) db_files_get_count(int *count)
{ {
char *query = "SELECT COUNT(*) FROM songs;"; char *query = "SELECT COUNT(*) FROM songs WHERE disabled = 0;";
sqlite3_stmt *stmt; sqlite3_stmt *stmt;
int ret; int ret;
@ -908,7 +912,7 @@ db_file_inc_playcount(int id)
void void
db_file_ping(int id) db_file_ping(int id)
{ {
#define Q_TMPL "UPDATE songs SET db_timestamp = %" PRIi64 " WHERE id = %d;" #define Q_TMPL "UPDATE songs SET db_timestamp = %" PRIi64 ", disabled = 0 WHERE id = %d;"
char *query; char *query;
char *errmsg; char *errmsg;
int ret; int ret;
@ -937,7 +941,7 @@ db_file_ping(int id)
int int
db_file_id_bypath(char *path, int *id) db_file_id_bypath(char *path, int *id)
{ {
#define Q_TMPL "SELECT id FROM songs WHERE path = '%q';" #define Q_TMPL "SELECT id FROM songs WHERE disabled = 0 AND path = '%q';"
char *query; char *query;
sqlite3_stmt *stmt; sqlite3_stmt *stmt;
int ret; int ret;
@ -994,6 +998,7 @@ db_file_fetch_byquery(char *query)
uint32_t *ival; uint32_t *ival;
uint64_t *i64val; uint64_t *i64val;
char **strval; char **strval;
uint64_t disabled;
int i; int i;
int ret; int ret;
@ -1058,6 +1063,12 @@ db_file_fetch_byquery(char *query)
case DB_TYPE_INT: case DB_TYPE_INT:
ival = (uint32_t *) ((char *)mfi + mfi_cols_map[i].offset); ival = (uint32_t *) ((char *)mfi + mfi_cols_map[i].offset);
if (mfi_cols_map[i].offset == mfi_offsetof(disabled))
{
disabled = sqlite3_column_int64(stmt, i);
*ival = (disabled != 0);
}
else
*ival = sqlite3_column_int(stmt, i); *ival = sqlite3_column_int(stmt, i);
break; break;
@ -1213,7 +1224,7 @@ db_file_update(struct media_file_info *mfi)
" year = %d, track = %d, total_tracks = %d, disc = %d, total_discs = %d, bpm = %d," \ " year = %d, track = %d, total_tracks = %d, disc = %d, total_discs = %d, bpm = %d," \
" compilation = %d, rating = %d, data_kind = %d, item_kind = %d," \ " compilation = %d, rating = %d, data_kind = %d, item_kind = %d," \
" description = %Q, time_modified = %" PRIi64 "," \ " description = %Q, time_modified = %" PRIi64 "," \
" db_timestamp = %" PRIi64 ", disabled = %d, sample_count = %d," \ " db_timestamp = %" PRIi64 ", sample_count = %d," \
" force_update = %d, codectype = %Q, idx = %d, has_video = %d," \ " force_update = %d, codectype = %Q, idx = %d, has_video = %d," \
" bits_per_sample = %d, album_artist = %Q WHERE id = %d;" " bits_per_sample = %d, album_artist = %Q WHERE id = %d;"
char *query; char *query;
@ -1238,7 +1249,7 @@ db_file_update(struct media_file_info *mfi)
mfi->year, mfi->track, mfi->total_tracks, mfi->disc, mfi->total_discs, mfi->bpm, mfi->year, mfi->track, mfi->total_tracks, mfi->disc, mfi->total_discs, mfi->bpm,
mfi->compilation, mfi->rating, mfi->data_kind, mfi->item_kind, mfi->compilation, mfi->rating, mfi->data_kind, mfi->item_kind,
mfi->description, (int64_t)mfi->time_modified, mfi->description, (int64_t)mfi->time_modified,
(int64_t)mfi->db_timestamp, mfi->disabled, mfi->sample_count, (int64_t)mfi->db_timestamp, mfi->sample_count,
mfi->force_update, mfi->codectype, mfi->index, mfi->has_video, mfi->force_update, mfi->codectype, mfi->index, mfi->has_video,
mfi->bits_per_sample, mfi->album_artist, mfi->id); mfi->bits_per_sample, mfi->album_artist, mfi->id);
@ -1273,7 +1284,7 @@ db_file_update(struct media_file_info *mfi)
int int
db_pl_get_count(int *count) db_pl_get_count(int *count)
{ {
char *query = "SELECT COUNT(*) FROM playlists;"; char *query = "SELECT COUNT(*) FROM playlists WHERE disabled = 0;";
sqlite3_stmt *stmt; sqlite3_stmt *stmt;
int ret; int ret;
@ -1306,7 +1317,7 @@ db_pl_get_count(int *count)
void void
db_pl_ping(int id) db_pl_ping(int id)
{ {
#define Q_TMPL "UPDATE playlists SET db_timestamp = %" PRIi64 " WHERE id = %d;" #define Q_TMPL "UPDATE playlists SET db_timestamp = %" PRIi64 ", disabled = 0 WHERE id = %d;"
char *query; char *query;
char *errmsg; char *errmsg;
int ret; int ret;
@ -1341,6 +1352,7 @@ db_pl_fetch_byquery(char *query)
char *cval; char *cval;
uint32_t *ival; uint32_t *ival;
char **strval; char **strval;
uint64_t disabled;
int i; int i;
int ret; int ret;
@ -1398,6 +1410,12 @@ db_pl_fetch_byquery(char *query)
case DB_TYPE_INT: case DB_TYPE_INT:
ival = (uint32_t *) ((char *)pli + pli_cols_map[i].offset); ival = (uint32_t *) ((char *)pli + pli_cols_map[i].offset);
if (pli_cols_map[i].offset == pli_offsetof(disabled))
{
disabled = sqlite3_column_int64(stmt, i);
*ival = (disabled != 0);
}
else
*ival = sqlite3_column_int(stmt, i); *ival = sqlite3_column_int(stmt, i);
break; break;
@ -1464,8 +1482,8 @@ int
db_pl_add(char *title, char *path, int *id) db_pl_add(char *title, char *path, int *id)
{ {
#define QDUP_TMPL "SELECT COUNT(*) FROM playlists WHERE title = '%q' OR path = '%q';" #define QDUP_TMPL "SELECT COUNT(*) FROM playlists WHERE title = '%q' OR path = '%q';"
#define QADD_TMPL "INSERT INTO playlists (title, type, items, query, db_timestamp, path, idx)" \ #define QADD_TMPL "INSERT INTO playlists (title, type, items, query, db_timestamp, disabled, path, idx)" \
" VALUES ('%q', 0, 0, NULL, %" PRIi64 ", '%q', 0);" " VALUES ('%q', 0, 0, NULL, %" PRIi64 ", 0, '%q', 0);"
char *query; char *query;
char *errmsg; char *errmsg;
sqlite3_stmt *stmt; sqlite3_stmt *stmt;
@ -1669,7 +1687,8 @@ void
db_pl_update(int id) db_pl_update(int id)
{ {
#define QPL1_TMPL "UPDATE playlists SET items = %d WHERE id = 1;" #define QPL1_TMPL "UPDATE playlists SET items = %d WHERE id = 1;"
#define Q_TMPL "UPDATE playlists SET items = (SELECT COUNT(*) FROM playlistitems WHERE playlistid = %d) WHERE id = %d;" #define Q_TMPL "UPDATE playlists SET items = (SELECT COUNT(*) FROM playlistitems JOIN songs" \
" ON playlistitems.songid = songs.id WHERE songs.disabled = 0 AND playlistitems.playlistid = %d) WHERE id = %d;"
char *query; char *query;
char *errmsg; char *errmsg;
int nsongs; int nsongs;
@ -1886,6 +1905,7 @@ db_perthread_deinit(void)
" items INTEGER NOT NULL," \ " items INTEGER NOT NULL," \
" query VARCHAR(1024)," \ " query VARCHAR(1024)," \
" db_timestamp INTEGER NOT NULL," \ " db_timestamp INTEGER NOT NULL," \
" disabled INTEGER DEFAULT 0," \
" path VARCHAR(4096)," \ " path VARCHAR(4096)," \
" idx INTEGER NOT NULL" \ " idx INTEGER NOT NULL" \
");" ");"
@ -2083,7 +2103,7 @@ db_init(void)
db_perthread_deinit(); db_perthread_deinit();
DPRINTF(E_INFO, L_DB, "Database OK with %d files and %d playlists\n", files, pls); DPRINTF(E_INFO, L_DB, "Database OK with %d active files and %d active playlists\n", files, pls);
return 0; return 0;
} }

2
src/db.h
View File

@ -112,6 +112,7 @@ struct playlist_info {
uint32_t items; /* number of items (mimc) */ uint32_t items; /* number of items (mimc) */
char *query; /* where clause if type 1 (MSPS) */ char *query; /* where clause if type 1 (MSPS) */
uint32_t db_timestamp; /* time last updated */ uint32_t db_timestamp; /* time last updated */
uint32_t disabled;
char *path; /* path of underlying playlist */ char *path; /* path of underlying playlist */
uint32_t index; /* index of playlist for paths with multiple playlists */ uint32_t index; /* index of playlist for paths with multiple playlists */
}; };
@ -123,6 +124,7 @@ struct db_playlist_info {
char *items; char *items;
char *query; char *query;
char *db_timestamp; char *db_timestamp;
char *disabled;
char *path; char *path;
char *index; char *index;
}; };