Merge pull request #56 from pavel-zhur/feature/chords-fix

Feature/chords fix

Author: pavel-zhur

HarmonyDB and OneShelf.sln

@@ -209,9 +209,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OneShelf.Videos", "OneShelf
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OneShelf.Videos.App", "OneShelf.Videos\OneShelf.Videos.App\OneShelf.Videos.App.csproj", "{99134E7C-CE2F-4641-A9E3-B961F76307F0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneShelf.Videos.Database", "OneShelf.Videos\OneShelf.Videos.Database\OneShelf.Videos.Database.csproj", "{D702C117-2C9A-44E0-B428-30371616FBAE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OneShelf.Videos.Database", "OneShelf.Videos\OneShelf.Videos.Database\OneShelf.Videos.Database.csproj", "{D702C117-2C9A-44E0-B428-30371616FBAE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneShelf.Videos.BusinessLogic", "OneShelf.Videos\OneShelf.Videos.BusinessLogic\OneShelf.Videos.BusinessLogic.csproj", "{76A8BAAB-7065-45F8-82E8-E188D4C27EB3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OneShelf.Videos.BusinessLogic", "OneShelf.Videos\OneShelf.Videos.BusinessLogic\OneShelf.Videos.BusinessLogic.csproj", "{76A8BAAB-7065-45F8-82E8-E188D4C27EB3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

HarmonyDB.Common/HarmonyDB.Common.Representations.OneShelf/NodeHtml.cs

@@ -1,5 +1,6 @@
 using System.Text;
 using System.Text.Json.Serialization;
+using OneShelf.Common;
 
 namespace HarmonyDB.Common.Representations.OneShelf;
 
@@ -177,4 +178,24 @@ internal override void AppendHtmlTo(StringBuilder builder, RepresentationSetting
     {
 	    return TraverseAll().Count();
     }
+
+    public void Fix0_Compress()
+    {
+        foreach (var nodeCollectionBase in TraverseAll().Select(x => x.element).OfType<NodeCollectionBase>().ToList())
+        {
+            var newChildren = nodeCollectionBase.Children.ToChunks(x => x.NodeText != null)
+                .SelectMany(c =>
+                    !c.criterium
+                        ? c.chunk
+                        : new NodeText(string.Join(string.Empty, c.chunk.Select(x => x.NodeText!.Text))).AsChild()
+                            .Once())
+                .ToList();
+
+            if (newChildren.Count != nodeCollectionBase.Children.Count)
+            {
+                nodeCollectionBase.Children.Clear();
+                nodeCollectionBase.Children.AddRange(newChildren);
+            }
+        }
+    }
 }

HarmonyDB.Index/HarmonyDB.Index.Api/Functions/V1/GetSongs.cs

@@ -35,6 +35,7 @@ async Task<List<Chords>> Process(int sourceIndex, IReadOnlyCollection<string> ex
                     .Where(x => externalIds.Contains(x.Key) && x.Key == x.Value.ExternalId && sourceIndex == _downstreamApiClient.GetDownstreamSourceIndexBySourceKey(x.Value.Source))
                     .Select(x =>
                     {
+                        x.Value.Output.Fix0_Compress();
                         x.Value.Source = _downstreamApiClient.GetSourceTitle(x.Value.Source);
                         return x.Value;
                     })

HarmonyDB.Index/HarmonyDB.Index.Api/Services/CommonExecutions.cs

@@ -55,6 +55,7 @@ public async Task<GetSongResponse> GetSong(string externalId)
         var sourceIndex = _downstreamApiClient.GetDownstreamSourceIndexByExternalId(externalId);
         var getSongResponse = await _downstreamApiClient.V1GetSong(sourceIndex, externalId);
         getSongResponse.Song.Source = _downstreamApiClient.GetSourceTitle(getSongResponse.Song.Source);
+        getSongResponse.Song.Output.Fix0_Compress();
         return getSongResponse;
     }
 }

OneShelf.Frontend/OneShelf.Frontend.Web/IndexedDb/IndexedItem.cs

@@ -1,13 +1,8 @@
-using DnetIndexedDb;
-
-namespace OneShelf.Frontend.Web.IndexedDb;
+namespace OneShelf.Frontend.Web.IndexedDb;
 
 public class IndexedItem
 {
-    [IndexDbKey]
     public required string Key { get; init; }
 
-    public required int Version { get; init; }
-
     public required string Contents { get; init; }
 }

OneShelf.Frontend/OneShelf.Frontend.Web/IndexedDb/IndexedItemKey.cs

@@ -0,0 +1,8 @@
+namespace OneShelf.Frontend.Web.IndexedDb;
+
+public enum IndexedItemType
+{
+    Chords,
+    Search,
+    Progression,
+}

OneShelf.Frontend/OneShelf.Frontend.Web/IndexedDb/IndexedItemType.cs

@@ -5,6 +5,7 @@
 @inject CollectionNavigation CollectionNavigation
 @inject CollectionIndexProvider CollectionIndexProvider
 @inject IllustrationsProvider IllustrationsProvider
+@inject ChordsCacheLoader ChordsCacheLoader
 
 <PageTitle>Один Шкаф</PageTitle>
 
@@ -111,6 +112,7 @@ else
         {
             CollectionIndexProvider.MightSync();
             IllustrationsProvider.MaybeInit();
+            ChordsCacheLoader.StartDelayed();
         }
 
         return base.OnAfterRenderAsync(firstRender);

OneShelf.Frontend/OneShelf.Frontend.Web/IndexedDb/MyIndexedDb.cs

@@ -46,11 +46,11 @@ else
     }
     <div>
         <span>Люблю:</span>
-        <input type="radio" name="alteration" id="preferSharp" value="@NoteAlteration.Sharp" checked="@(_preferences.Alteration == NoteAlteration.Sharp)" @onchange="e => SetAlteration(NoteAlteration.Sharp)"/>
+        <input type="radio" name="alteration" id="preferSharp" value="@NoteAlteration.Sharp" checked="@(_preferences.Alteration == NoteAlteration.Sharp)" @onchange="() => SetAlteration(NoteAlteration.Sharp)"/>
         <label for="preferSharp">###</label>
-        <input type="radio" name="alteration" id="preferFlat" value="@NoteAlteration.Flat" checked="@(_preferences.Alteration == NoteAlteration.Flat)" @onchange="e => SetAlteration(NoteAlteration.Flat)"/>
+        <input type="radio" name="alteration" id="preferFlat" value="@NoteAlteration.Flat" checked="@(_preferences.Alteration == NoteAlteration.Flat)" @onchange="() => SetAlteration(NoteAlteration.Flat)"/>
         <label for="preferFlat">bbb</label>
-        <input type="radio" name="alteration" id="preferNone" value="null" checked="@(_preferences.Alteration == null)" @onchange="e => SetAlteration(null)"/>
+        <input type="radio" name="alteration" id="preferNone" value="null" checked="@(_preferences.Alteration == null)" @onchange="() => SetAlteration(null)"/>
         <label for="preferNone">Что есть, то есть</label>
     </div>
     <div>

OneShelf.Frontend/OneShelf.Frontend.Web/OneShelf.Frontend.Web.csproj

@@ -2,6 +2,16 @@
 
 <h1>Один шкаф</h1>
 
+<h3>Версия 1.1</h3>
+
+<div>
+    <p>1 октября 2024.</p>
+    <ul>
+        <li>Исправлено офлайн-хранилище аккордов.</li>
+        <li>Автоскачивание аккордов через полминуты после инициализации.</li>
+    </ul>
+</div>
+
 <h3>Версия 1.0</h3>
 
 <div>

OneShelf.Frontend/OneShelf.Frontend.Web/Pages/Index.razor

@@ -1,9 +1,6 @@
 using System.Text.Json.Serialization;
 using BlazorApplicationInsights;
 using Blazored.LocalStorage;
-using DnetIndexedDb;
-using DnetIndexedDb.Fluent;
-using DnetIndexedDb.Models;
 using HarmonyDB.Index.Analysis;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
@@ -14,6 +11,7 @@
 using OneShelf.Frontend.Web.Interop;
 using OneShelf.Frontend.Web.Models;
 using OneShelf.Frontend.Web.Services;
+using SpawnDev.BlazorJS;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
@@ -48,21 +46,9 @@
     .AddBlazorApplicationInsights(config =>
     {
         config.ConnectionString = builder.Configuration.GetSection(nameof(FrontendOptions)).Get<FrontendOptions>()!.AppInsightsConnectionString;
-    });
-
-builder.Services
-    .AddIndexedDbDatabase<MyIndexedDb>(options =>
-    {
-        var model = new IndexedDbDatabaseModel()
-            .WithName("OneShelfDatabase")
-            .WithVersion(6)
-            .WithModelId(0);
-
-        model.AddStore<IndexedItem>();
-        model.AddStore<IndexedItemKey>();
-
-        options.UseDatabase(model);
-    }, ServiceLifetime.Singleton);
+    })
+    .AddTransient<MyIndexedDb>()
+    .AddBlazorJSRuntime();
 
 var host = builder.Build();
 

OneShelf.Frontend/OneShelf.Frontend.Web/Pages/Print.razor

@@ -93,10 +93,13 @@ public virtual void Dispose()
 
     private async void Go(CancellationToken token)
     {
+        Logger.LogInformation("Chords loading started.");
+
         try
         {
             await Work(token);
             OnProgressChanged(null);
+            Logger.LogInformation("Chords loading finished successfully.");
         }
         catch (TaskCanceledException)
         {

OneShelf.Frontend/OneShelf.Frontend.Web/Pages/ReleaseNotes.razor

@@ -4,6 +4,8 @@ namespace OneShelf.Frontend.Web.Services;
 
 public class ChordsCacheLoader : CacheLoaderBase
 {
+    private static readonly TimeSpan FirstDelay = TimeSpan.FromSeconds(20);
+
     private readonly CollectionIndexProvider _collectionIndexProvider;
     private readonly DataProvider _dataProvider;
     private readonly Api _api;
@@ -65,4 +67,10 @@ protected override async Task Work(CancellationToken token)
             await Task.Delay(300, token);
         }
     }
+
+    public async void StartDelayed()
+    {
+        await Task.Delay(FirstDelay);
+        Start();
+    }
 }