Fixed some bugs regarding to the new setting implementation

AlexanderDotH · Apr 25, 2023 · d5f064f · d5f064f
1 parent 08b779e
commit d5f064f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/OpenLyricsClient/Backend/Collector/Token/Provider/Musixmatch/MusixmatchTokenCollector.cs b/OpenLyricsClient/Backend/Collector/Token/Provider/Musixmatch/MusixmatchTokenCollector.cs
@@ -83,6 +83,8 @@ public async Task<MusixMatchToken> GetToken()
                 return null;
 
             MusixMatchToken token = tokens[new Random().Next(0, tokens.Count)];
+
+            Core.INSTANCE.SettingsHandler.Settings<TokenSection>()?.RemoveUsage(token);
             token.Usage--;
 
             if (token.Usage <= 0)

diff --git a/OpenLyricsClient/Backend/Handler/Services/Services/Spotify/SpotifyService.cs b/OpenLyricsClient/Backend/Handler/Services/Services/Spotify/SpotifyService.cs
@@ -48,7 +48,7 @@ private async Task RefreshToken()
                 await this._refreshTokenSuspensionToken.WaitForRelease();
                 await Task.Delay(1000);
 
-                if (IsConnected())
+                if (!IsConnected())
                     continue;
 
                 long now = DateTimeOffset.Now.ToUnixTimeMilliseconds();

diff --git a/OpenLyricsClient/Backend/Settings/Sections/Tokens/TokenSection.cs b/OpenLyricsClient/Backend/Settings/Sections/Tokens/TokenSection.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using DevBase.Api.Serializer;
@@ -63,6 +64,28 @@ public async Task RemoveToken(MusixMatchToken token)
 
         await SetValue("Tokens", tokens);
     }
+
+    public async Task RemoveUsage(MusixMatchToken token)
+    {
+        List<MusixMatchToken> tokens = GetValue<List<MusixMatchToken>>("Tokens");
+
+        for (int i = 0; i < tokens.Capacity; i++)
+        {
+            MusixMatchToken currentToken = tokens[i];
+            if (currentToken.Token.SequenceEqual(token.Token))
+            {
+                MusixMatchToken newToken = new MusixMatchToken
+                {
+                    Token = currentToken.Token,
+                    ExpirationDate = currentToken.ExpirationDate,
+                    Usage = (short)(currentToken.Usage - 1)
+                };
+
+                await RemoveToken(token);
+                await AddToken(newToken);
+            }
+        }
+    }
 
     public T GetValue<T>(string field)
     {

diff --git a/OpenLyricsClient/Frontend/Models/Elements/NoteAnimation.cs b/OpenLyricsClient/Frontend/Models/Elements/NoteAnimation.cs
@@ -129,7 +129,7 @@ public override void Render(DrawingContext context)
         {
             double realSize = (this.GetBounds("♪").Width * 3) + (3 * 8) + 8;
 
-            if (Core.INSTANCE.SettingsHandler.Settings<SpotifySection>()?.GetValue<EnumLyricsDisplayMode>("Selection Mode") == EnumLyricsDisplayMode.FADE)
+            if (Core.INSTANCE.SettingsHandler.Settings<LyricsSection>()?.GetValue<EnumLyricsDisplayMode>("Selection Mode") == EnumLyricsDisplayMode.FADE)
             {
                 this._viewbox.IsVisible = false;
                 this._border.Width = 0;

diff --git a/OpenLyricsClient/Frontend/Models/Pages/LyricsPageViewModel.cs b/OpenLyricsClient/Frontend/Models/Pages/LyricsPageViewModel.cs
@@ -169,7 +169,7 @@ public string Artists
 
     public bool AiBadge
     {
-        get => Core.INSTANCE?.SongHandler?.CurrentSong?.Lyrics?.LyricProvider.SequenceEqual("OpenLyricsClient") == true;
+        get => Core.INSTANCE?.SongHandler?.CurrentSong?.Lyrics?.LyricProvider?.SequenceEqual("OpenLyricsClient") == true;
     }
 
     public string Artists