perf: change newest uid after updating

AuroraZiling · Jul 10, 2024 · 59b52e8 · 59b52e8
1 parent 7383e2f
commit 59b52e8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/Hollow/App.axaml.cs b/Hollow/App.axaml.cs
@@ -36,6 +36,7 @@ public override void Initialize()
         AvaloniaXamlLoader.Load(this);
         _provider = ConfigureServices();
 
+        //TODO: Platform specific
         Environment.SetEnvironmentVariable("WEBVIEW2_USER_DATA_FOLDER", AppInfo.CachesDir);
         AvaloniaWebViewBuilder.Initialize(default);
     }

diff --git a/Hollow/Services/GachaService/GachaService.cs b/Hollow/Services/GachaService/GachaService.cs
@@ -12,6 +12,7 @@
 using Hollow.Helpers;
 using Hollow.Models;
 using Hollow.Services.ConfigurationService;
+using Serilog;
 
 namespace Hollow.Services.GachaService;
 
@@ -181,8 +182,9 @@ public Response<string> TryGetAuthKey()
             return authKey;
         }
 
-        var targetGachaLogUrl = authKey.Data;
-        return new Response<string> (true) {Data = targetGachaLogUrl.Split("&authkey=")[1].Split("&")[0]};
+        var targetGachaLogUrl = authKey.Data.Split("&authkey=")[1].Split("&")[0];
+        Log.Information("Get authKey: {0}", targetGachaLogUrl);
+        return new Response<string> (true) {Data = targetGachaLogUrl};
     }
 
     private Response<string> GetAuthKeyFromFile(string dataPath)

diff --git a/Hollow/ViewModels/Pages/SignalSearchViewModel.cs b/Hollow/ViewModels/Pages/SignalSearchViewModel.cs
@@ -42,7 +42,7 @@ public void Navigated()
     [ObservableProperty] private bool _controlEnabled = true;
 
     [ObservableProperty] private ObservableCollection<string> _uidList = [];
-    [ObservableProperty] private string _selectedUid = "";
+    [ObservableProperty] private string? _selectedUid;
 
     private Dictionary<string, GachaRecords>? _gachaRecords;
     private Dictionary<string, AnalyzedGachaRecords>? _analyzedGachaRecords;
@@ -74,7 +74,7 @@ private void RemoveCoverage()
         ControlEnabled = true;
     }
 
-    private async Task LoadGachaRecords()
+    private async Task LoadGachaRecords(string? updatedUid = null)
     {
         IntoCoverage();
 
@@ -88,7 +88,6 @@ private async Task LoadGachaRecords()
             ControlEnabled = true;
             return;
         }
-        await Task.Delay(100);
 
         // Analyze
         GetGachaLogShortMessage = Lang.SignalSearch_LoadGachaRecords_Analyze;
@@ -97,8 +96,8 @@ private async Task LoadGachaRecords()
             item => GachaAnalyser.FromGachaRecords(item.Value));
 
         UidList = new ObservableCollection<string>(_gachaRecords!.Keys);
-        SelectedUid = UidList[0];
-        SelectedAnalyzedGachaRecords = _analyzedGachaRecords[UidList[0]];
+        SelectedUid = UidList.FirstOrDefault(uid => uid == updatedUid) ?? UidList.First();
+        SelectedAnalyzedGachaRecords = _analyzedGachaRecords[SelectedUid];
         await Task.Delay(100);
 
         RemoveCoverage();
@@ -107,7 +106,10 @@ private async Task LoadGachaRecords()
     [RelayCommand]
     private void ChangeUid()
     {
-        SelectedAnalyzedGachaRecords = _analyzedGachaRecords![SelectedUid];
+        if (SelectedUid != null && _analyzedGachaRecords!.TryGetValue(SelectedUid, out var value))
+        {
+            SelectedAnalyzedGachaRecords = value;
+        }
     }
 
     [RelayCommand]
@@ -148,7 +150,7 @@ private async Task UpdateByWebCaches()
         var gachaRecord = await _gachaService.TryGetGachaLogs(authKey.Data, gachaProgress);
 
         await File.WriteAllTextAsync(Path.Combine(AppInfo.GachaRecordsDir, $"{gachaRecord.Data.Info.Uid}.json"), JsonSerializer.Serialize(gachaRecord.Data, new JsonSerializerOptions { WriteIndented = true, Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping }));
-        await LoadGachaRecords();
+        await LoadGachaRecords(gachaRecord.Data.Info.Uid);
         RemoveCoverage();
     }
 }
diff --git a/Hollow/Views/Pages/SignalSearch.axaml b/Hollow/Views/Pages/SignalSearch.axaml
@@ -28,7 +28,7 @@
                 Spacing="15"
                 VerticalAlignment="Center">
                 <ComboBox
-                    IsVisible="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}"
+                    IsVisible="{Binding UidList.Count}"
                     ItemsSource="{Binding UidList}"
                     Name="UidComboBox"
                     SelectedItem="{Binding SelectedUid, Mode=TwoWay}"