Merge into develop

Merge into develop

Author: Yelo420

gamevault/Helper/Integrations/SaveGameHelper.cs

@@ -95,7 +95,13 @@ internal async Task<bool> RestoreBackup(int gameId, string installationDir)
                             Process process = new Process();
                             ProcessShepherd.Instance.AddProcess(process);
                             process.StartInfo = CreateProcessHeader();
-                            process.StartInfo.Arguments = $"--config {AppFilePath.CloudSaveConfigDir} restore --force --path \"{extractFolder}\"";
+                            //process.StartInfo.Arguments = $"--config {AppFilePath.CloudSaveConfigDir} restore --force --path \"{extractFolder}\"";
+                            process.StartInfo.ArgumentList.Add("--config");
+                            process.StartInfo.ArgumentList.Add(AppFilePath.CloudSaveConfigDir);
+                            process.StartInfo.ArgumentList.Add("restore");
+                            process.StartInfo.ArgumentList.Add("--force");
+                            process.StartInfo.ArgumentList.Add("--path");
+                            process.StartInfo.ArgumentList.Add(extractFolder);
                             process.Start();
                             process.WaitForExit();
                             ProcessShepherd.Instance.RemoveProcess(process);
@@ -167,20 +173,20 @@ internal async Task BackupSaveGamesFromIds(List<int> gameIds)
         }
         internal async Task<bool> BackupSaveGame(int gameId)
         {
-            if (!SettingsViewModel.Instance.License.IsActive())
+            if (!SettingsViewModel.Instance.CloudSaves || !SettingsViewModel.Instance.License.IsActive())
                 return false;
 
             var installedGame = InstallViewModel.Instance?.InstalledGames?.FirstOrDefault(g => g.Key?.ID == gameId);
             string gameMetadataTitle = installedGame?.Key?.Metadata?.Title ?? "";
             string installationDir = installedGame?.Value ?? "";
             if (gameMetadataTitle != "" && installationDir != "")
             {
+                PrepareConfigFile(installedGame?.Value!, Path.Combine(AppFilePath.CloudSaveConfigDir, "config.yaml"));
                 string title = await SearchForLudusaviGameTitle(gameMetadataTitle);
                 if (string.IsNullOrEmpty(title))
                     return false;
                 string tempFolder = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
                 Directory.CreateDirectory(tempFolder);
-                PrepareConfigFile(installedGame?.Value!, Path.Combine(AppFilePath.CloudSaveConfigDir, "config.yaml"));
                 await CreateBackup(title, tempFolder);
                 string archive = Path.Combine(tempFolder, "backup.zip");
                 if (Directory.GetFiles(tempFolder, "mapping.yaml", SearchOption.AllDirectories).Length == 0)
@@ -266,7 +272,13 @@ internal async Task<string> SearchForLudusaviGameTitle(string title)
                 Process process = new Process();
                 ProcessShepherd.Instance.AddProcess(process);
                 process.StartInfo = CreateProcessHeader(true);
-                process.StartInfo.Arguments = $"find \"{title}\" --fuzzy --api";//--normalized
+                //process.StartInfo.Arguments = $"find \"{title}\" --fuzzy --api";//--normalized
+                process.StartInfo.ArgumentList.Add("--config");
+                process.StartInfo.ArgumentList.Add(AppFilePath.CloudSaveConfigDir);
+                process.StartInfo.ArgumentList.Add("find");
+                process.StartInfo.ArgumentList.Add(title);
+                process.StartInfo.ArgumentList.Add("--fuzzy");
+                process.StartInfo.ArgumentList.Add("--api");
                 process.EnableRaisingEvents = true;
 
                 List<string> output = new List<string>();
@@ -302,7 +314,17 @@ await Task.Run(() =>
                Process process = new Process();
                ProcessShepherd.Instance.AddProcess(process);
                process.StartInfo = CreateProcessHeader();
-               process.StartInfo.Arguments = $"--config {AppFilePath.CloudSaveConfigDir} backup --force --format \"zip\" --path \"{tempFolder}\" \"{lunusaviTitle}\"";
+               //process.StartInfo.Arguments = $"--config {AppFilePath.CloudSaveConfigDir} backup --force --format \"zip\" --path \"{tempFolder}\" \"{lunusaviTitle}\"";
+               process.StartInfo.ArgumentList.Add("--config");
+               process.StartInfo.ArgumentList.Add(AppFilePath.CloudSaveConfigDir);
+               process.StartInfo.ArgumentList.Add("backup");
+               process.StartInfo.ArgumentList.Add("--force");
+               process.StartInfo.ArgumentList.Add("--format");
+               process.StartInfo.ArgumentList.Add("zip");
+               process.StartInfo.ArgumentList.Add("--path");
+               process.StartInfo.ArgumentList.Add(tempFolder);
+               process.StartInfo.ArgumentList.Add(lunusaviTitle);
+
                process.Start();
                process.WaitForExit();
                ProcessShepherd.Instance.RemoveProcess(process);

gamevault/UserControls/GameViewUserControl.xaml.cs

@@ -24,6 +24,7 @@
 using System.Windows.Input;
 using System.Windows.Markup;
 using System.Windows.Navigation;
+using Windows.Gaming.Input;
 using YoutubeExplode;
 using YoutubeExplode.Videos.Streams;
 
@@ -163,6 +164,7 @@ private async void UserControl_Loaded(object sender, RoutedEventArgs e)
                 {
                     try
                     {
+                        SaveGameHelper.Instance.PrepareConfigFile("", Path.Combine(AppFilePath.CloudSaveConfigDir, "config.yaml"));
                         ViewModel.CloudSaveMatchTitle = await SaveGameHelper.Instance.SearchForLudusaviGameTitle(ViewModel?.Game?.Metadata?.Title);
                     }
                     catch { }
@@ -447,7 +449,7 @@ private async void RestoreCloudSaves_Click(object sender, RoutedEventArgs e)
                 if (success)
                 {
                     MainWindowViewModel.Instance.AppBarText = "Successfully synchronized the cloud save";
-                }              
+                }
             }
             catch
             {
@@ -488,6 +490,6 @@ private void PrepareMarkdownElements()
         }
 
         #endregion
-        
+
     }
 }