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

[directories/spotify] Init db with disabled spotify-root-directory and

Browse Source 
enable only on successful login to spotify
This commit is contained in:
chme 2016-01-30 07:27:20 +01:00
parent cd5462e241
commit 491bf54fdb
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/db.c
View File

@ -3784,6 +3784,21 @@ db_directory_enable_bycookie(uint32_t cookie, char *path)
#undef Q_TMPL
}
int
db_directory_enable_bypath(char *path)
{
#define Q_TMPL "UPDATE directories SET disabled = 0 WHERE virtual_path = %Q;"
char *query;
int ret;
query = sqlite3_mprintf(Q_TMPL, path);
ret = db_query_run(query, 1, 0);
return ((ret < 0) ? -1 : sqlite3_changes(hdl));
#undef Q_TMPL
}
/* Remotes */
static int
@ -3873,11 +3888,13 @@ db_pairing_fetch_byguid(struct pairing_info *pi)
void
db_spotify_purge(void)
{
char *queries[3] =
char *queries[5] =
{
"DELETE FROM files WHERE path LIKE 'spotify:%%';",
"DELETE FROM playlistitems WHERE filepath LIKE 'spotify:%%';",
"DELETE FROM playlists WHERE path LIKE 'spotify:%%';",
"DELETE FROM directories WHERE virtual_path LIKE '/spotify:/%%';",
"UPDATE directories SET disabled = 4294967296 WHERE virtual_path = '/spotify:';",
};
int i;
int ret;
@ -4975,7 +4992,7 @@ db_perthread_deinit(void)
" VALUES (3, '/http:', 0, 0, 1);"
#define Q_DIR4 \
"INSERT INTO directories (id, virtual_path, db_timestamp, disabled, parent_id)" \
" VALUES (4, '/spotify:', 0, 0, 1);"
" VALUES (4, '/spotify:', 0, 4294967296, 1);"
/* Rule of thumb: Will the current version of forked-daapd work with the new
* version of the database? If yes, then it is a minor upgrade, if no, then it

3
src/db.h
View File

@ -598,6 +598,9 @@ db_directory_disable_bymatch(char *path, char *strip, uint32_t cookie);
int
db_directory_enable_bycookie(uint32_t cookie, char *path);
int
db_directory_enable_bypath(char *path);
/* Remotes */
int
db_pairing_add(struct pairing_info *pi);

2
src/db_upgrade.c
View File

@ -1202,7 +1202,7 @@ static const struct db_upgrade_query db_upgrade_v1801_queries[] =
" VALUES (3, '/http:', 0, 0, 1);"
#define U_V1900_INSERT_DIR4 \
"INSERT INTO directories (id, virtual_path, db_timestamp, disabled, parent_id)" \
" VALUES (4, '/spotify:', 0, 0, 1);"
" VALUES (4, '/spotify:', 0, 4294967296, 1);"
#define U_V1900_SCVER_MAJOR \
"UPDATE admin SET value = '19' WHERE key = 'schema_version_major';"

2
src/spotify.c
View File

@ -1417,6 +1417,8 @@ logged_in(sp_session *sess, sp_error error)
DPRINTF(E_LOG, L_SPOTIFY, "Login to Spotify succeeded. Reloading playlists.\n");
db_directory_enable_bypath("/spotify:");
pl = fptr_sp_session_starred_create(sess);
fptr_sp_playlist_add_callbacks(pl, &pl_callbacks, NULL);