MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[spotify] Remove "Spotify saved" playlist 

This special playlist was previously required to keep track of saved
albums tracks to avoid purging them after a rescan, since then the
rescan logic was changed to use the Spotify web api and this playlist
has no use anymore.
This commit is contained in:
chme 2022-05-28 06:44:03 +02:00
parent efb9ba7767
commit 9340443a3b
1 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/library/spotify_webapi.c
View File

@ -138,8 +138,6 @@ static pthread_mutex_t token_lck;
// The base playlist id for all Spotify playlists in the db // The base playlist id for all Spotify playlists in the db
static int spotify_base_plid; static int spotify_base_plid;
// The base playlist id for Spotify saved tracks in the db
static int spotify_saved_plid;
// Flag to avoid triggering playlist change events while the (re)scan is running // Flag to avoid triggering playlist change events while the (re)scan is running
static bool scanning; static bool scanning;
@ -1602,7 +1600,6 @@ saved_album_add(json_object *item, int index, int total, enum spotify_request_ty
int track_count; int track_count;
int dir_id; int dir_id;
int i; int i;
int ret;
if (!json_object_object_get_ex(item, "album", &jsonalbum)) if (!json_object_object_get_ex(item, "album", &jsonalbum))
{ {
@ -1641,10 +1638,7 @@ saved_album_add(json_object *item, int index, int total, enum spotify_request_ty
parse_metadata_track(jsontrack, &track, 0); parse_metadata_track(jsontrack, &track, 0);
track.mtime = album.mtime; track.mtime = album.mtime;
ret = track_add(&track, &album, NULL, dir_id, request_type); track_add(&track, &album, NULL, dir_id, request_type);
if (ret == 0 && spotify_saved_plid)
db_pl_add_item_bypath(spotify_saved_plid, track.uri);
} }
db_transaction_end(); db_transaction_end();
@ -1679,7 +1673,6 @@ saved_episodes_add(json_object *item, int index, int total, enum spotify_request
struct spotify_album *show = arg; struct spotify_album *show = arg;
struct spotify_track episode; struct spotify_track episode;
int dir_id; int dir_id;
int ret;
DPRINTF(E_DBG, L_SPOTIFY, "saved_episodes_add: %s\n", json_object_to_json_string(item)); DPRINTF(E_DBG, L_SPOTIFY, "saved_episodes_add: %s\n", json_object_to_json_string(item));
@ -1689,10 +1682,7 @@ saved_episodes_add(json_object *item, int index, int total, enum spotify_request
// Get or create the directory structure for this album // Get or create the directory structure for this album
dir_id = prepare_directories(show->artist, show->name); dir_id = prepare_directories(show->artist, show->name);
ret = track_add(&episode, show, NULL, dir_id, request_type); track_add(&episode, show, NULL, dir_id, request_type);
if (ret == 0 && spotify_saved_plid)
db_pl_add_item_bypath(spotify_saved_plid, episode.uri);
return 0; return 0;
} }
@ -1881,30 +1871,6 @@ scan_playlists(enum spotify_request_type request_type)
return ret; return ret;
} }
static void
create_saved_tracks_playlist(void)
{
struct playlist_info pli =
{
.path = strdup("spotify:savedtracks"),
.title = strdup("Spotify Saved"),
.virtual_path = strdup("/spotify:/Spotify Saved"),
.type = PL_PLAIN,
.parent_id = spotify_base_plid,
.directory_id = DIR_SPOTIFY,
.scan_kind = SCAN_KIND_SPOTIFY,
};
spotify_saved_plid = playlist_add_or_update(&pli);
if (spotify_saved_plid < 0)
{
DPRINTF(E_LOG, L_SPOTIFY, "Error adding playlist for saved tracks\n");
spotify_saved_plid = 0;
}
free_pli(&pli, 1);
}
/* /*
* Add or update playlist folder for all spotify playlists (if enabled in config) * Add or update playlist folder for all spotify playlists (if enabled in config)
*/ */
@ -1956,7 +1922,6 @@ scan(enum spotify_request_type request_type)
db_directory_enable_bypath("/spotify:"); db_directory_enable_bypath("/spotify:");
create_base_playlist(); create_base_playlist();
create_saved_tracks_playlist();
scan_saved_albums(request_type); scan_saved_albums(request_type);
scan_playlists(request_type); scan_playlists(request_type);
spotify_status_get(&sp_status); spotify_status_get(&sp_status);
@ -1988,8 +1953,6 @@ initscan(void)
return 0; return 0;
} }
spotify_saved_plid = 0;
/* /*
* Check that the playback Spotify backend can log in, so we don't add tracks * Check that the playback Spotify backend can log in, so we don't add tracks
* to the library that can't be played. * to the library that can't be played.