Tidy up a little

hawkeye116477 · Jan 25, 2024 · bff1c79 · bff1c79
1 parent f56c558
commit bff1c79
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 47 deletions.
diff --git a/src/LegendaryDlcManager.xaml.cs b/src/LegendaryDlcManager.xaml.cs
@@ -208,16 +208,6 @@ private async void InstallBtn_Click(object sender, RoutedEventArgs e)
  }
  if (tasks.Count > 0)
  {
- var messagesSettings = LegendaryMessagesSettings.LoadSettings();
- if (!messagesSettings.DontShowDownloadManagerWhatsUpMsg)
- {
- var result = MessageCheckBoxDialog.ShowMessage("", ResourceProvider.GetString(LOC.LegendaryDownloadManagerWhatsUp), ResourceProvider.GetString(LOC.Legendary3P_PlayniteDontShowAgainTitle), MessageBoxButton.OK, MessageBoxImage.Information);
- if (result.CheckboxChecked)
- {
- messagesSettings.DontShowDownloadManagerWhatsUpMsg = true;
- LegendaryMessagesSettings.SaveSettings(messagesSettings);
- }
- }
  await downloadManager.EnqueueMultipleJobs(tasks);
  }
  }

diff --git a/src/LegendaryDownloadManager.xaml.cs b/src/LegendaryDownloadManager.xaml.cs
@@ -123,8 +123,26 @@ public async void DoNextJobInQueue(object _, PropertyChangedEventArgs arg)
  }
  }
 
- public async Task EnqueueMultipleJobs(List<DownloadManagerData.Download> downloadManagerDataList)
+ public void DisplayGreeting()
  {
+ var messagesSettings = LegendaryMessagesSettings.LoadSettings();
+ if (!messagesSettings.DontShowDownloadManagerWhatsUpMsg)
+ {
+ var result = MessageCheckBoxDialog.ShowMessage("", ResourceProvider.GetString(LOC.LegendaryDownloadManagerWhatsUp), ResourceProvider.GetString(LOC.Legendary3P_PlayniteDontShowAgainTitle), MessageBoxButton.OK, MessageBoxImage.Information);
+ if (result.CheckboxChecked)
+ {
+ messagesSettings.DontShowDownloadManagerWhatsUpMsg = true;
+ LegendaryMessagesSettings.SaveSettings(messagesSettings);
+ }
+ }
+ }
+
+ public async Task EnqueueMultipleJobs(List<DownloadManagerData.Download> downloadManagerDataList, bool silently = false)
+ {
+ if (!silently)
+ {
+ DisplayGreeting();
+ }
  foreach (var downloadJob in downloadManagerDataList)
  {
  var wantedItem = downloadManagerData.downloads.FirstOrDefault(item => item.gameID == downloadJob.gameID);
@@ -154,6 +172,7 @@ public async Task EnqueueMultipleJobs(List<DownloadManagerData.Download> downloa
 
  public async Task EnqueueJob(string gameID, string gameTitle, string downloadSize, string installSize, DownloadProperties downloadProperties)
  {
+ DisplayGreeting();
  var wantedItem = downloadManagerData.downloads.FirstOrDefault(item => item.gameID == gameID);
  if (wantedItem == null)
  {

diff --git a/src/LegendaryGameController.cs b/src/LegendaryGameController.cs
@@ -537,20 +537,7 @@ public async Task UpdateGame(Dictionary<string, Installed> gamesToUpdate, string
  }
  if (updateTasks.Count > 0)
  {
- if (!silently)
- {
- var messagesSettings = LegendaryMessagesSettings.LoadSettings();
- if (!messagesSettings.DontShowDownloadManagerWhatsUpMsg)
- {
- var result = MessageCheckBoxDialog.ShowMessage("", ResourceProvider.GetString(LOC.LegendaryDownloadManagerWhatsUp), ResourceProvider.GetString(LOC.Legendary3P_PlayniteDontShowAgainTitle), MessageBoxButton.OK, MessageBoxImage.Information);
- if (result.CheckboxChecked)
- {
- messagesSettings.DontShowDownloadManagerWhatsUpMsg = true;
- LegendaryMessagesSettings.SaveSettings(messagesSettings);
- }
- }
- }
- await downloadManager.EnqueueMultipleJobs(updateTasks);
+ await downloadManager.EnqueueMultipleJobs(updateTasks, silently);
  }
  }
  }

diff --git a/src/LegendaryGameInstaller.xaml.cs b/src/LegendaryGameInstaller.xaml.cs
@@ -119,17 +119,6 @@ private async void InstallBtn_Click(object sender, RoutedEventArgs e)
  }
  else
  {
- var messagesSettings = LegendaryMessagesSettings.LoadSettings();
- if (!messagesSettings.DontShowDownloadManagerWhatsUpMsg)
- {
- var result = MessageCheckBoxDialog.ShowMessage("", ResourceProvider.GetString(LOC.LegendaryDownloadManagerWhatsUp), ResourceProvider.GetString(LOC.Legendary3P_PlayniteDontShowAgainTitle), MessageBoxButton.OK, MessageBoxImage.Information);
- if (result.CheckboxChecked)
- {
- messagesSettings.DontShowDownloadManagerWhatsUpMsg = true;
- LegendaryMessagesSettings.SaveSettings(messagesSettings);
- }
- }
-
  DownloadProperties downloadProperties = new DownloadProperties()
  {
  installPath = installPath,
@@ -574,17 +563,6 @@ private async void RepairBtn_Click(object sender, RoutedEventArgs e)
  }
  else
  {
- var messagesSettings = LegendaryMessagesSettings.LoadSettings();
- if (!messagesSettings.DontShowDownloadManagerWhatsUpMsg)
- {
- var result = MessageCheckBoxDialog.ShowMessage("", ResourceProvider.GetString(LOC.LegendaryDownloadManagerWhatsUp), ResourceProvider.GetString(LOC.Legendary3P_PlayniteDontShowAgainTitle), MessageBoxButton.OK, MessageBoxImage.Information);
- if (result.CheckboxChecked)
- {
- messagesSettings.DontShowDownloadManagerWhatsUpMsg = true;
- LegendaryMessagesSettings.SaveSettings(messagesSettings);
- }
- }
-
  DownloadProperties downloadProperties = new DownloadProperties()
  {
  installPath = "",