Clean out old Favorites filter code.

halsafar · Jul 11, 2022 · b812441 · b812441
1 parent 43e8486
commit b812441
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/SongBrowserPlugin/Configuration/SongFilterMode.cs b/SongBrowserPlugin/Configuration/SongFilterMode.cs
@@ -4,7 +4,6 @@ namespace SongBrowser.Configuration
     public enum SongFilterMode
     {
         None,
-        Favorites,
         Playlist,
         Search,
         Ranked,
@@ -18,7 +17,9 @@ public enum SongFilterMode
         Expert,
         ExpertPlus,
         // For other mods that extend SongBrowser
-        Custom
+        Custom,
+        // Deprecated
+        Favorites
     }
 
     static class SongFilterModeMethods

diff --git a/SongBrowserPlugin/DataAccess/SongBrowserModel.cs b/SongBrowserPlugin/DataAccess/SongBrowserModel.cs
@@ -289,9 +289,6 @@ public void ProcessSongList(IAnnotatedBeatmapLevelCollection selectedBeatmapColl
                     case SongFilterMode.ExpertPlus:
                         filteredSongs = FilterDifficulty(filteredSongs, (BeatmapDifficulty)Enum.Parse(typeof(BeatmapDifficulty), kvp.Key.ToString()));
                         break;
-                    case SongFilterMode.Favorites:
-                        filteredSongs = FilterFavorites(filteredSongs);
-                        break;
                     case SongFilterMode.Search:
                         filteredSongs = FilterSearch(filteredSongs);
                         break;
@@ -425,7 +422,7 @@ public void ProcessSongList(IAnnotatedBeatmapLevelCollection selectedBeatmapColl
             }
 
             Plugin.Log.Debug("Creating filtered level pack...");
-            BeatmapLevelPack levelPack = new BeatmapLevelPack(SongBrowserModel.FilteredSongsCollectionName, packName, selectedBeatmapCollection.collectionName, coverImage, smallCoverImage, new BeatmapLevelCollection(sortedSongs.ToArray()));
+            BeatmapLevelPack levelPack = new BeatmapLevelPack(SongBrowserModel.FilteredSongsCollectionName, packName, packName, coverImage, smallCoverImage, new BeatmapLevelCollection(sortedSongs.ToArray()));
 
             Plugin.Log.Debug("Acquiring necessary fields to call SetData(pack)...");
             LevelCollectionNavigationController lcnvc = navController.GetField<LevelCollectionNavigationController, LevelSelectionNavigationController>("_levelCollectionNavigationController");
@@ -449,17 +446,6 @@ public void ProcessSongList(IAnnotatedBeatmapLevelCollection selectedBeatmapColl
             //_sortedSongs.ForEach(x => Plugin.Log.Debug(x.levelID));
         }
 
-        /// <summary>
-        /// Filter songs based on playerdata favorites.
-        /// </summary>
-        private List<IPreviewBeatmapLevel> FilterFavorites(List<IPreviewBeatmapLevel> levels)
-        {
-            Plugin.Log.Info("Filtering song list as favorites playlist...");
-
-            PlayerDataModel playerData = Resources.FindObjectsOfTypeAll<PlayerDataModel>().FirstOrDefault();
-            return levels.Where(x => playerData.playerData.favoritesLevelIds.Contains(x.levelID)).ToList();
-        }
-
         /// <summary>
         /// Filter for a search query.
         /// </summary>