fix: Fix icon async problems

Author: SamHou0

VNGod/Resource/Strings/Strings.zh-CN.resx

@@ -332,6 +332,6 @@
     <value>确定要删除选定的本地游戏吗？这个操作无法撤销。</value>
   </data>
   <data name="WebDAVNotEnabledWarn" xml:space="preserve">
-    <value>没有启用 WebDAV</value>
+    <value>没有启用 WebDAV。</value>
   </data>
 </root>

VNGod/Utils/IconHelper.cs

@@ -12,7 +12,7 @@ namespace VNGod.Utils
 {
     internal static class IconHelper
     {
-        public static async void GetIcons(Repo repo)
+        public static async Task GetIcons(Repo repo)
         {
             foreach (var game in repo)
             {

VNGod/View/GameStorageWindow.xaml.cs

@@ -76,7 +76,7 @@ private async void DownloadButton_Click(object sender, RoutedEventArgs e)
                 // Load the metadata on disk
                 FileHelper.ReadRepoMetadata(games);
                 // Read icons from executable
-                IconHelper.GetIcons(games);
+                await IconHelper.GetIcons(games);
             }
             else
             {

VNGod/View/MainWindow.xaml.cs

@@ -33,10 +33,10 @@ public MainWindow()
             timer.Tick += Timer_Tick;
         }
         #region Tools
-        private void InitializeGameRepo(string repoPath)
+        private async Task InitializeGameRepoAsync(string repoPath)
         {
             Resources["gameRepo"] = FileHelper.InitializeRepo(repoPath);
-            IconHelper.GetIcons(GetRepo());
+            await IconHelper.GetIcons(GetRepo());
             EnableGlobalButtons(true);
         }
         private Repo GetRepo()
@@ -146,11 +146,11 @@ private async Task SyncGameSaveAsync()
             syncButton.IsEnabled = true;
         }
         #endregion
-        private void RescanButton_Click(object sender, RoutedEventArgs e)
+        private async void RescanButton_Click(object sender, RoutedEventArgs e)
         {
             EnableGlobalButtons(false);
             FileHelper.ScanGames(GetRepo());
-            IconHelper.GetIcons(GetRepo());
+            await IconHelper.GetIcons(GetRepo());
             EnableGlobalButtons(true);
         }
 
@@ -276,7 +276,7 @@ private async void SyncButton_Click(object sender, RoutedEventArgs e)
         }
 
 
-        private void RepoButton_Click(object sender, RoutedEventArgs e)
+        private async void RepoButton_Click(object sender, RoutedEventArgs e)
         {
             OpenFolderDialog openFolderDialog = new()
             {
@@ -292,8 +292,8 @@ private void RepoButton_Click(object sender, RoutedEventArgs e)
                     gameStorageWindow.Close();
                     gameStorageWindow = null;
                 }
-                InitializeGameRepo(openFolderDialog.FolderName);
-                SaveAndSync(false).Wait();
+                await InitializeGameRepoAsync(openFolderDialog.FolderName);
+                await SaveAndSync(false);
                 // Save repo path to settings
                 Settings.Default.Repo = openFolderDialog.FolderName;
                 Settings.Default.Save();
@@ -308,7 +308,7 @@ private async void Window_IsVisibleChanged(object sender, DependencyPropertyChan
                 string repoPath = Settings.Default.Repo;
                 if (!string.IsNullOrWhiteSpace(repoPath) && Directory.Exists(repoPath))
                 {
-                    InitializeGameRepo(repoPath);
+                    await InitializeGameRepoAsync(repoPath);
                     // Local may be missing, pull remote changes first
                     if (await WebDAVHelper.InitializeClient())
                     {
@@ -319,7 +319,7 @@ private async void Window_IsVisibleChanged(object sender, DependencyPropertyChan
                         Growl.Warning(Strings.WebDAVInitFailed);
                     }
                 }
-                GetIconButton_Click(this, new());
+                await UpdateIconsAsync();
                 firstLaunch = false;
             }
             if (IsVisible == true)
@@ -337,10 +337,15 @@ private void IgnoreGameItem_Click(object sender, RoutedEventArgs e)
             FileHelper.AddGameIgnore(repo, GetCurrentGame());
             repo.Remove(GetCurrentGame());
         }
-        private void GetIconButton_Click(object sender, RoutedEventArgs e)
+        private async void GetIconButton_Click(object sender, RoutedEventArgs e)
+        {
+            await UpdateIconsAsync();
+        }
+
+        private async Task UpdateIconsAsync()
         {
             gameList.IsEnabled = false;
-            IconHelper.GetIcons(GetRepo());
+            await IconHelper.GetIcons(GetRepo());
             gameList.IsEnabled = true;
         }
 

VNGod/View/SettingsWindow.xaml.cs

@@ -23,7 +23,6 @@ public SettingsWindow()
             webDavUsernameTextBox.Text = Settings.Default.WebDAVUsername;
             webDavPasswordBox.Password = Settings.Default.WebDAVPassword;
             bangumiTokenTextBox.Text = Settings.Default.BgmToken;
-            vndbTokenTextBox.Text = Settings.Default.VNDBToken;
             versionBlock.Text = "Version " + Assembly.GetExecutingAssembly()
             .GetCustomAttribute<AssemblyInformationalVersionAttribute>()
             ?.InformationalVersion;
@@ -45,7 +44,6 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
             Settings.Default.WebDAVPassword = webDavPasswordBox.Password;
             // Tokens
             Settings.Default.BgmToken = bangumiTokenTextBox.Text;
-            Settings.Default.VNDBToken = vndbTokenTextBox.Text;
             Settings.Default.Save();
         }
         private void OpenLogButton_Click(object sender, RoutedEventArgs e)