Merge pull request #219 from DennisvHest/development

1.6.2

MapMaven.Core/Services/Interfaces/IPlaylistService.cs

@@ -14,6 +14,7 @@ public interface IPlaylistService
         IObservable<IEnumerable<Playlist>> Playlists { get; }
         BehaviorSubject<Playlist> SelectedPlaylist { get; }
         IObservable<PlaylistTree<Playlist>> PlaylistTree { get; }
+        IObservable<Dictionary<string, Playlist[]>> MapsInPlaylistsByHash { get; }
 
         Task<Playlist> AddLivePlaylist(EditLivePlaylistModel editPlaylistModel);
         Task AddMapsToPlaylist(IEnumerable<Map> maps, Playlist playlist, bool loadPlaylists = true);

MapMaven.Core/Services/PlaylistService.cs

@@ -8,7 +8,6 @@
 using MapMaven.Core.Models.LivePlaylists;
 using MapMaven.Core.Models.Data;
 using MapMaven.Core.Services.Interfaces;
-using MapMaven.Core.Extensions;
 using MapMaven.Core.Models.Data.Playlists;
 using BeatSaberPlaylistsLib;
 using MapMaven.Core.Models;
@@ -26,6 +25,10 @@ public class PlaylistService : IPlaylistService
 
         public IObservable<PlaylistTree<Playlist>> PlaylistTree { get; private set; }
         public IObservable<IEnumerable<Playlist>> Playlists { get; private set; }
+
+        public readonly BehaviorSubject<Dictionary<string, Playlist[]>> _mapsInPlaylistsByHash = new(new());
+        public IObservable<Dictionary<string, Playlist[]>> MapsInPlaylistsByHash => _mapsInPlaylistsByHash;
+
         public BehaviorSubject<Playlist?> SelectedPlaylist { get; private set; } = new(null);
 
         private readonly BehaviorSubject<bool> _creatingPlaylist = new(false);
@@ -60,6 +63,16 @@ public PlaylistService(IBeatSaberDataService beatSaberDataService, BeatSaberFile
                     return x.playlists.FirstOrDefault(p => p.PlaylistFilePath == x.selectedPlaylistFilePath);
                 })
                 .Subscribe(SelectedPlaylist.OnNext); // Subscribing here because of weird behavior with multiple subscriptions triggering multiple reruns of this observable.
+
+            Playlists.Subscribe(playlists =>
+            {
+                var mapsInPlaylistsByHash = playlists.SelectMany(p => p.Maps.Select(m => new { Map = m, Playlist = p }))
+                    .Where(x => x.Map.Hash is not null)
+                    .GroupBy(x => x.Map.Hash)
+                    .ToDictionary(g => g.Key, g => g.Select(x => x.Playlist).Distinct().ToArray());
+
+                _mapsInPlaylistsByHash.OnNext(mapsInPlaylistsByHash);
+            });
         }
 
         private PlaylistFolder<Playlist> MapIPlaylistsToPlaylistsInFolder(PlaylistFolder<IPlaylist> folder)

MapMaven/Components/Maps/MapBrowserRow.razor

@@ -19,9 +19,9 @@
         }
     </CellTemplate>
 </TemplateColumn>
-<TemplateColumn T="Map" Sortable="false" CellClass="pl-0" CellStyle="width: 50px; position: relative;">
+<TemplateColumn T="Map" Sortable="false" CellClass="px-0" CellStyle="width: 50px; position: relative;">
     <CellTemplate>
-        <div>
+        <div class="d-flex">
             <div class="d-flex flex-column">
                 <MudTooltip Text="Play song preview" ShowOnFocus="false">
                     <SongPlaybackButton Map="context.Item"></SongPlaybackButton>
@@ -30,6 +30,9 @@
                     <MudIconButton Icon="@Icons.Material.Filled.Info" Class="pb-0 pt-1 no-hover-background" Variant="Variant.Text" Size="Size.Medium" OnClick="() => OpenDetails(context.Item)" />
                 </MudTooltip>
             </div>
+            <div class="d-flex flex-column justify-center">
+                <MapInPlaylistIndicator MapHash="@context.Item.Hash"></MapInPlaylistIndicator>
+            </div>
         </div>
     </CellTemplate>
 </TemplateColumn>

MapMaven/Components/Maps/MapBrowserRow.razor.cs

@@ -45,7 +45,11 @@ protected override void OnInitialized()
 
         async Task OpenAddMapToPlaylistDialog(Map map)
         {
-            var dialog = await DialogService.ShowAsync<PlaylistSelector>("Add map to playlist", new DialogOptions
+            var dialog = await DialogService.ShowAsync<PlaylistSelector>("Add map to playlist", new DialogParameters
+            {
+                { nameof(PlaylistSelector.MapToAddHash), map.Hash }
+            },
+            new DialogOptions
             {
                 MaxWidth = MaxWidth.ExtraSmall,
                 FullWidth = true,

MapMaven/Components/Maps/MapInPlaylistIndicator.razor

@@ -0,0 +1,51 @@
+@inherits ReactiveComponent
+
+@{
+    var specificPlaylistContainsMap = PlaylistsContainingMapHash.Contains(SpecificPlaylist);
+    var showIcon = SpecificPlaylist is null && PlaylistsContainingMapHash.Any() || specificPlaylistContainsMap;
+
+    if (showIcon)
+    {
+        string tooltip;
+
+        if (specificPlaylistContainsMap)
+        {
+            tooltip = "Playlist already contains this map";
+        }
+        else
+        {
+            tooltip = $"In playlists:  {string.Join(", ", PlaylistsContainingMapHash.Select(p => p.Title))}";
+        }
+
+        <MudTooltip Text="@tooltip" RootClass="d-flex">
+            <MudIcon Icon="@Icons.Material.Filled.PlaylistAddCheckCircle" Style="opacity: 0.4" />
+        </MudTooltip>
+    }
+}
+
+@code {
+    [Inject]
+    IPlaylistService PlaylistService { get; set; }
+
+    [Parameter]
+    public string MapHash { get; set; }
+
+    [Parameter]
+    public Playlist? SpecificPlaylist { get; set; }
+
+    Playlist[] PlaylistsContainingMapHash = [];
+
+    protected override void OnInitialized()
+    {
+        SubscribeAndBind(PlaylistService.MapsInPlaylistsByHash, mapsInPlaylistsByHash =>
+        {
+            if (MapHash is null || !mapsInPlaylistsByHash.ContainsKey(MapHash))
+            {
+                PlaylistsContainingMapHash = Array.Empty<Playlist>();
+                return;
+            }
+
+            PlaylistsContainingMapHash = mapsInPlaylistsByHash[MapHash];
+        });
+    }
+}

MapMaven/Components/Playlists/PlaylistSelector.razor

@@ -29,7 +29,7 @@
             </MudMenu>
         </div>
         <MudTreeView T="Playlist" @ref="PlaylistTreeView" SelectedValueChanged="OnPlaylistSelect" Color="Color.Primary" ExpandOnClick="true" AutoExpand="true">
-            <PlaylistTreeViewFolder Folder="PlaylistTree.RootPlaylistFolder" Expanded="!string.IsNullOrEmpty(PlaylistSearchText)" />
+            <PlaylistTreeViewFolder Folder="PlaylistTree.RootPlaylistFolder" Expanded="!string.IsNullOrEmpty(PlaylistSearchText)" MapToAddHash="@MapToAddHash" />
         </MudTreeView>
     </DialogContent>
 </MudDialog>

MapMaven/Components/Playlists/PlaylistSelector.razor.cs

@@ -17,6 +17,9 @@ public partial class PlaylistSelector
         [Parameter]
         public bool SaveNewPlaylistOnSubmit { get; set; } = true;
 
+        [Parameter]
+        public string MapToAddHash { get; set; }
+
         [Inject]
         IPlaylistService PlaylistService { get; set; }
 

MapMaven/Components/Playlists/PlaylistTreeViewFolder.razor

@@ -23,7 +23,7 @@
                 </div>
             </BodyContent>
             <ChildContent>
-                <PlaylistTreeViewFolder Folder="playlistFolder" Expanded="Expanded"></PlaylistTreeViewFolder>
+                <PlaylistTreeViewFolder Folder="playlistFolder" Expanded="Expanded" MapToAddHash="@MapToAddHash"></PlaylistTreeViewFolder>
             </ChildContent>
         </MudTreeViewItem>
     }
@@ -41,8 +41,9 @@
                         </span>
                     </MudTooltip>
 
-
                     <div class="d-flex align-center ml-auto">
+                        <MapInPlaylistIndicator MapHash="@MapToAddHash" SpecificPlaylist="playlistNode.Playlist" />
+
                         @if (playlistNode.Playlist.IsLivePlaylist)
                         {
                             <MudTooltip Text="Live playlist" Color="Color.Info" RootClass="d-flex">

MapMaven/Components/Playlists/PlaylistTreeViewFolder.razor.cs

@@ -26,6 +26,9 @@ public partial class PlaylistTreeViewFolder
         [Parameter]
         public PlaylistFolder<Playlist> Folder { get; set; }
 
+        [Parameter]
+        public string MapToAddHash { get; set; }
+
         [Parameter]
         public bool Expanded { get; set; }