Fix multiple profile playlists/favourites/goals

src/DBProfile.cpp

@@ -156,7 +156,7 @@ void DBProfile::LoadPlayLists(SQLite::Database* db)
 		"INNER JOIN songs ON songs.id = charts.songid "
 		"INNER JOIN chartkeys ON charts.chartkeyid = chartkeys.id "
 		"ORDER BY playlists.name, chartkeys.chartkey, chartplaylists.rate");
-	auto& pls = SONGMAN->allplaylists;
+	auto& pls = loadingProfile->allplaylists;
 
 	Playlist *tmp;
 
@@ -653,9 +653,9 @@ void DBProfile::SavePlayLists(SQLite::Database* db, const Profile* profile) cons
 		"CONSTRAINT fk_courserunid FOREIGN KEY (courserunid) REFERENCES courseruns(id))");
 
 
-	auto& pls = SONGMAN->allplaylists;
+	auto& pls = profile->allplaylists;
 	if (!pls.empty()) {
-		FOREACHM(string, Playlist, pls, pl)
+		FOREACHM_CONST(string, Playlist, pls, pl)
 		{
 			if (pl->first != "" && pl->first != "Favorites")
 			{

src/MusicWheel.cpp

@@ -280,7 +280,7 @@ bool MusicWheel::SelectSong( const Song *p )
 			SetOpenSection( from[i]->m_sText );
 
 			// skip any playlist groups
-			if (!SONGMAN->allplaylists.count(GetExpandedSectionName()))
+			if (!SONGMAN->GetPlaylists().count(GetExpandedSectionName()))
 				break;
 		}
 	}

src/Profile.h

@@ -14,13 +14,15 @@
 #include "LuaReference.h"
 #include "XMLProfile.h"
 #include "DBProfile.h"
+#include "SongManager.h"
 #include "arch/LoadingWindow/LoadingWindow.h"
 
 #include <unordered_map>
 
 class XNode;
 struct lua_State;
 class Character;
+struct Playlist;
 
 // Current file versions
 extern const RString STATS_XML;
@@ -186,6 +188,8 @@ class Profile
 	ProfileType m_Type{ProfileType_Normal};
 	// Profiles of the same type and priority are sorted by dir name.
 	int m_ListPriority{0};
+	// Profile Playlists
+	map<string, Playlist> allplaylists;
 
 	// Editable data
 	RString m_sDisplayName;

src/ScreenGameplay.cpp

@@ -790,7 +790,7 @@ void ScreenGameplay::InitSongQueues()
 		FOREACH_EnabledPlayerInfo(m_vPlayerInfo, pi)
 			pi->m_vpStepsQueue.clear();
 
-		Playlist& pl = SONGMAN->allplaylists[SONGMAN->playlistcourse];
+		Playlist& pl = SONGMAN->GetPlaylists()[SONGMAN->playlistcourse];
 		FOREACH(Chart, pl.chartlist, ch) {
 			m_apSongsQueue.emplace_back(ch->songptr);
 			FOREACH_EnabledPlayerInfo(m_vPlayerInfo, pi)
@@ -2260,7 +2260,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 		MESSAGEMAN->Broadcast(msg);
 
 		if (GAMESTATE->IsPlaylistCourse()) {
-			SONGMAN->allplaylists[SONGMAN->playlistcourse].courseruns.emplace_back(playlistscorekeys);
+			SONGMAN->GetPlaylists()[SONGMAN->playlistcourse].courseruns.emplace_back(playlistscorekeys);
 		}
 
 		TweenOffScreen();

src/ScreenSelectMusic.cpp

@@ -229,6 +229,9 @@ void ScreenSelectMusic::BeginScreen()
 	g_ScreenStartedLoadingAt.Touch();
 	m_timerIdleComment.GetDeltaTime();
 
+
+	SONGMAN->MakeSongGroupsFromPlaylists();
+	SONGMAN->SetFavoritedStatus(PROFILEMAN->GetProfile(PLAYER_1)->FavoritedCharts);
 	if (CommonMetrics::AUTO_SET_STYLE)
 	{
 		GAMESTATE->SetCompatibleStylesForPlayers();
@@ -477,6 +480,8 @@ bool ScreenSelectMusic::Input(const InputEventPlus &input)
 				if (!fav_me_biatch->IsFavorited()) {
 					fav_me_biatch->SetFavorited(true);
 					pProfile->AddToFavorites(GAMESTATE->m_pCurSteps[PLAYER_1]->GetChartKey());
+					pProfile->allplaylists.erase("Favorites");
+					SONGMAN->MakePlaylistFromFavorites(pProfile->FavoritedCharts, pProfile->allplaylists);
 				}
 				else {
 					fav_me_biatch->SetFavorited(false);
@@ -541,10 +546,10 @@ bool ScreenSelectMusic::Input(const InputEventPlus &input)
 		}
 		else if (bHoldingCtrl && c == 'A' && m_MusicWheel.IsSettled() && input.type == IET_FIRST_PRESS)
 		{
-			if (SONGMAN->allplaylists.empty())
+			if (SONGMAN->GetPlaylists().empty())
 				return true;
 
-			SONGMAN->allplaylists[SONGMAN->activeplaylist].AddChart(GAMESTATE->m_pCurSteps[PLAYER_1]->GetChartKey());
+			SONGMAN->GetPlaylists()[SONGMAN->activeplaylist].AddChart(GAMESTATE->m_pCurSteps[PLAYER_1]->GetChartKey());
 			MESSAGEMAN->Broadcast("DisplaySinglePlaylist");
 			SCREENMAN->SystemMessage(ssprintf("Added chart: %s to playlist: %s", GAMESTATE->m_pCurSong->GetDisplayMainTitle().c_str(), SONGMAN->activeplaylist.c_str()));
 			return true;
@@ -1176,7 +1181,7 @@ void ScreenSelectMusic::HandleScreenMessage(const ScreenMessage SM)
 		Playlist pl;
 		pl.name = ScreenTextEntry::s_sLastAnswer;
 		if (pl.name != "") {
-			SONGMAN->allplaylists.emplace(pl.name, pl);
+			SONGMAN->GetPlaylists().emplace(pl.name, pl);
 			SONGMAN->activeplaylist = pl.name;
 			Message msg("DisplayAll");
 			MESSAGEMAN->Broadcast(msg);
@@ -1825,7 +1830,7 @@ class LunaScreenSelectMusic : public Luna<ScreenSelectMusic>
 	static int StartPlaylistAsCourse(T* p, lua_State *L)
 	{
 		string name = SArg(1);
-		Playlist& pl = SONGMAN->allplaylists[name];
+		Playlist& pl = SONGMAN->GetPlaylists()[name];
 
 		// don't allow empty playlists to be started as a course
 		if (pl.chartlist.empty())

src/SongManager.cpp

@@ -363,8 +363,11 @@ void Playlist::LoadFromNode(const XNode* node) {
 	}
 }
 
-void SongManager::MakeSongGroupsFromPlaylists() {
-	for (auto& p : allplaylists) {
+void SongManager::MakeSongGroupsFromPlaylists(map<string, Playlist>& playlists) {
+	for(auto& plName : playlistGroups)
+		groupderps.erase(plName);
+	playlistGroups.clear();
+	for (auto& p : playlists) {
 		vector<Song*> playlistgroup;
 		for (auto& n : p.second.chartlist)
 			if (n.loaded)
@@ -373,6 +376,7 @@ void SongManager::MakeSongGroupsFromPlaylists() {
 		groupderps.erase(p.first);
 		groupderps[p.first] = playlistgroup;
 		SongUtil::SortSongPointerArrayByTitle(groupderps[p.first]);
+		playlistGroups.emplace_back(p.first);
 	}
 }
 
@@ -399,18 +403,18 @@ vector<string> Playlist::GetKeys() {
 	return o;
 }
 
-void SongManager::DeletePlaylist(const string& pl) {
-	allplaylists.erase(pl);
+void SongManager::DeletePlaylist(const string& pl, map<string, Playlist> &playlists) {
+	playlists.erase(pl);
 
 	// stuff gets weird if all playlists have been deleted and a chart is added - mina
-	if(allplaylists.size() > 0)
-		activeplaylist = allplaylists.begin()->first;
+	if(playlists.size() > 0)
+		activeplaylist = playlists.begin()->first;
 
 	// clear out the entry for the music wheel as well or it'll crash -mina
 	groupderps.erase(pl);
 }
 
-void SongManager::MakePlaylistFromFavorites(set<string>& favs) {
+void SongManager::MakePlaylistFromFavorites(set<string>& favs, map<string, Playlist>& playlists) {
 	Playlist pl;
 	pl.name = "Favorites";
 	for (auto& n : favs)
@@ -421,7 +425,7 @@ void SongManager::MakePlaylistFromFavorites(set<string>& favs) {
 		if (!pl.chartlist[i].loaded)
 			pl.DeleteChart(i);
 
-	allplaylists.emplace("Favorites", pl);
+	playlists.emplace("Favorites", pl);
 }
 
 string SongManager::ReconcileBustedKeys(const string& ck) {
@@ -706,10 +710,13 @@ bool SongManager::IsGroupNeverCached(const RString& group) const
 }
 
 void SongManager::SetFavoritedStatus(set<string>& favs) {
-	FOREACH(Song*, m_pSongs, song)
+	FOREACH(Song*, m_pSongs, song) {
+		bool fav = false;
 		FOREACH_CONST(Steps*, (*song)->GetAllSteps(), steps)
-		if (favs.count((*steps)->GetChartKey()))
-			(*song)->SetFavorited(true);
+			if (favs.count((*steps)->GetChartKey()))
+				fav = true;
+		(*song)->SetFavorited(fav);
+	}
 }
 
 void SongManager::SetPermaMirroredStatus(set<string>& pmir) {
@@ -764,11 +771,11 @@ bool SongManager::DoesSongGroupExist( const RString &sSongGroup ) const
 	return find( m_sSongGroupNames.begin(), m_sSongGroupNames.end(), sSongGroup ) != m_sSongGroupNames.end();
 }
 
-RageColor SongManager::GetSongGroupColor( const RString &sSongGroup ) const
+RageColor SongManager::GetSongGroupColor( const RString &sSongGroup, map<string, Playlist>& playlists) const
 {
 	for( unsigned i=0; i<m_sSongGroupNames.size(); i++ )
 	{
-		if( m_sSongGroupNames[i] == sSongGroup || allplaylists.count(sSongGroup))
+		if( m_sSongGroupNames[i] == sSongGroup || playlists.count(sSongGroup))
 		{
 			return SONG_GROUP_COLOR.GetValue( i%NUM_SONG_GROUP_COLORS );
 		}
@@ -948,6 +955,11 @@ void SongManager::Invalidate( const Song *pStaleSong )
 	UpdateShuffled();
 }
 
+map<string, Playlist>& SongManager::GetPlaylists()
+{
+	return PROFILEMAN->GetProfile(PLAYER_1)->allplaylists;
+}
+
 void SongManager::SetPreferences()
 {
 }
@@ -1447,7 +1459,7 @@ class LunaSongManager: public Luna<SongManager>
 
 	static int GetActivePlaylist(T* p, lua_State *L)
 	{
-		p->allplaylists[p->activeplaylist].PushSelf(L);
+		p->GetPlaylists()[p->activeplaylist].PushSelf(L);
 		return 1;
 	}
 
@@ -1467,7 +1479,7 @@ class LunaSongManager: public Luna<SongManager>
 	{
 		int idx = 1;
 		lua_newtable(L);
-		FOREACHM(string, Playlist, p->allplaylists, pl) {
+		FOREACHM(string, Playlist, p->GetPlaylists(), pl) {
 			pl->second.PushSelf(L);
 			lua_rawseti(L, -2, idx);
 			++idx;

src/SongManager.h

@@ -7,6 +7,7 @@ class Style;
 class Steps;
 class PlayerOptions;
 struct lua_State;
+struct GoalsForChart;
 
 #include "RageTypes.h"
 #include "GameConstantsAndTypes.h"
@@ -83,7 +84,7 @@ class SongManager
 	void Cleanup();
 
 	void Invalidate( const Song *pStaleSong );
-
+	static map<string, Playlist>& GetPlaylists();
 	void SetPreferences();
 	void SaveEnabledSongsToPref();
 	void LoadEnabledSongsFromPref();
@@ -107,7 +108,7 @@ class SongManager
 	void GetSongGroupNames( vector<RString> &AddTo ) const;
 	const vector<RString>& GetSongGroupNames() const;
 	bool DoesSongGroupExist( const RString &sSongGroup ) const;
-	RageColor GetSongGroupColor( const RString &sSongGroupName ) const;
+	RageColor GetSongGroupColor( const RString &sSongGroupName, map<string, Playlist>& playlists = GetPlaylists()) const;
 	RageColor GetSongColor( const Song* pSong ) const;
 
 	// temporary solution to reorganizing the entire songid/stepsid system - mina
@@ -182,16 +183,16 @@ class SongManager
 	// Lua
 	void PushSelf( lua_State *L );
 
-	map<string, Playlist> allplaylists;
 	string activeplaylist = "";
 	string playlistcourse = "";
 	string ReconcileBustedKeys(const string& ck);
 	map<string, string> keyconversionmap;
-	void MakeSongGroupsFromPlaylists();
-	void DeletePlaylist(const string& ck);
-	void MakePlaylistFromFavorites(set<string>& favs);
+	void MakeSongGroupsFromPlaylists(map<string, Playlist>& playlists = GetPlaylists());
+	void DeletePlaylist(const string& ck, map<string, Playlist>& playlists = GetPlaylists());
+	void MakePlaylistFromFavorites(set<string>& favs, map<string, Playlist>& playlists = GetPlaylists());
 
 	map<string, vector<Song*>> groupderps;
+	vector<string> playlistGroups; // To delete from groupderps when rebuilding playlist groups
 protected:
 	void LoadStepManiaSongDir( RString sDir, LoadingWindow *ld );
 	void LoadDWISongDir( const RString &sDir );

src/XMLProfile.cpp

@@ -444,8 +444,8 @@ XNode* XMLProfile::SavePlaylistsCreateNode(const Profile* profile) const {
 	CHECKPOINT_M("Saving the playlists node.");
 
 	XNode* playlists = new XNode("Playlists");
-	auto& pls = SONGMAN->allplaylists;
-	FOREACHM(string, Playlist, pls, i)
+	auto& pls = profile->allplaylists;
+	FOREACHM_CONST(string, Playlist, pls, i)
 		if (i->first != "" && i->first != "Favorites")
 			playlists->AppendChild(i->second.CreateNode());
 	return playlists;
@@ -458,7 +458,7 @@ void XMLProfile::LoadFavoritesFromNode(const XNode *pNode) {
 		loadingProfile->FavoritedCharts.emplace(SONGMAN->ReconcileBustedKeys(ck->GetName()));
 
 	SONGMAN->SetFavoritedStatus(loadingProfile->FavoritedCharts);
-	SONGMAN->MakePlaylistFromFavorites(loadingProfile->FavoritedCharts);
+	SONGMAN->MakePlaylistFromFavorites(loadingProfile->FavoritedCharts, loadingProfile->allplaylists);
 }
 
 void XMLProfile::LoadPermaMirrorFromNode(const XNode *pNode) {
@@ -493,7 +493,7 @@ void XMLProfile::LoadScoreGoalsFromNode(const XNode *pNode) {
 void XMLProfile::LoadPlaylistsFromNode(const XNode *pNode) {
 	CHECKPOINT_M("Loading the playlists node.");
 
-	auto& pls = SONGMAN->allplaylists;
+	auto& pls = loadingProfile->allplaylists;
 	FOREACH_CONST_Child(pNode, pl) {
 		Playlist tmp;
 		tmp.LoadFromNode(pl);
@@ -1146,7 +1146,7 @@ XNode *XMLProfile::SaveEttXmlCreateNode(const Profile* profile) const
 	if (!profile->PermaMirrorCharts.empty())
 		xml->AppendChild(SavePermaMirrorCreateNode(profile));
 
-	if (!SONGMAN->allplaylists.empty())
+	if (!loadingProfile->allplaylists.empty())
 		xml->AppendChild(SavePlaylistsCreateNode(profile));
 
 	if (!profile->goalmap.empty())