diff --git a/FirebaseKaraoke/FirebaseController.cs b/FirebaseKaraoke/FirebaseController.cs index 6e52eca..7e748ec 100644 --- a/FirebaseKaraoke/FirebaseController.cs +++ b/FirebaseKaraoke/FirebaseController.cs @@ -39,9 +39,9 @@ namespace KaraokePlayer.Classes { get { return string.Format("controllers/{0}/player/queue/0/", this.Id); } } - private string FavoritesPath + private string MostPlayedPath { - get { return string.Format("controllers/{0}/favorites/", this.Id); } + get { return string.Format("controllers/{0}/mostPlayed/", this.Id); } } public string Id { get; set; } @@ -119,7 +119,7 @@ namespace KaraokePlayer.Classes { CurrentSong = item.Song; _songChanged(new ControllerSongChangedEventArgs(item.Song)); - UpdateFavorites(item.Song); + UpdateMostPlayed(item.Song); } } @@ -134,33 +134,33 @@ namespace KaraokePlayer.Classes _stateChanged(new ControllerStateChangedEventArgs(newstate)); } - private void UpdateFavorites(Song song) + private void UpdateMostPlayed(Song song) { - //get favorites - FavoriteSong favorite = null; - List favorites = _client.Get(FavoritesPath).ResultAs>(); - if (favorites == null) favorites = new List(); + //get MostPlayed + MostPlayedSong mostPlayed = null; + List mostPlays = _client.Get(MostPlayedPath).ResultAs>(); + if (mostPlays == null) mostPlays = new List(); //unique song is based on the path - favorite = favorites.SingleOrDefault(f => f.Path == song.Path); - if (favorite == null) + mostPlayed = mostPlays.SingleOrDefault(f => f.Path == song.Path); + if (mostPlayed == null) { - favorite = new FavoriteSong(); - favorite.Artist = song.Artist; - favorite.Title = song.Title; - favorite.Genre = song.Genre; - favorite.Path = song.Path; - favorite.Year = song.Year; - favorite.Count = 1; - favorites.Add(favorite); + mostPlayed = new MostPlayedSong(); + mostPlayed.Artist = song.Artist; + mostPlayed.Title = song.Title; + mostPlayed.Genre = song.Genre; + mostPlayed.Path = song.Path; + mostPlayed.Year = song.Year; + mostPlayed.Count = 1; + mostPlays.Add(mostPlayed); } else { - favorite.Count += 1; + mostPlayed.Count += 1; } //take the top 100 songs - var top100 = favorites.OrderByDescending(f => f.Count).Take(100); - _client.Set(FavoritesPath, top100); + var top100 = mostPlays.OrderByDescending(f => f.Count).Take(100); + _client.Set(MostPlayedPath, top100); } } diff --git a/Herse.Models/Herse.Models.csproj b/Herse.Models/Herse.Models.csproj index f60ee6b..47564ed 100644 --- a/Herse.Models/Herse.Models.csproj +++ b/Herse.Models/Herse.Models.csproj @@ -44,7 +44,7 @@ - + diff --git a/Herse.Models/FavoriteSong.cs b/Herse.Models/MostPlayedSong.cs similarity index 86% rename from Herse.Models/FavoriteSong.cs rename to Herse.Models/MostPlayedSong.cs index df2eb01..af42dd3 100644 --- a/Herse.Models/FavoriteSong.cs +++ b/Herse.Models/MostPlayedSong.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace Herse.Models { - public class FavoriteSong : Song + public class MostPlayedSong : Song { [JsonProperty("count")] public int Count { get; set; }