Add cloud sync to per game settings - part 2

* Manual sync * Improve appearance
hawkeye116477 · Jan 10, 2024 · 2d9ebec · 2d9ebec
1 parent 433655e
commit 2d9ebec
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 31 deletions.
diff --git a/src/Enums/CloudSyncAction.cs b/src/Enums/CloudSyncAction.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LegendaryLibraryNS.Enums
+{
+    public enum CloudSyncAction
+    {
+        Download,
+        Upload,
+        ForceDownload,
+        ForceUpload
+    }
+}
diff --git a/src/LegendaryCloud.cs b/src/LegendaryCloud.cs
@@ -1,5 +1,6 @@
 using CliWrap;
 using CliWrap.EventStream;
+using LegendaryLibraryNS.Enums;
 using LegendaryLibraryNS.Models;
 using Playnite.Common;
 using Playnite.SDK;
@@ -123,7 +124,7 @@ public static string CalculateGameSavesPath(string gameName, string gameID, stri
         }
 
 
-        public static void SyncGameSaves(string gameName, string gameID, string gameInstallDir, bool download)
+        public static void SyncGameSaves(string gameName, string gameID, string gameInstallDir, CloudSyncAction cloudSyncAction, bool manualSync = false)
         {
             var cloudSyncEnabled = LegendaryLibrary.GetSettings().SyncGameSaves;
             var gamesSettings = LegendaryGameSettingsView.LoadSavedGamesSettings();
@@ -136,10 +137,14 @@ public static void SyncGameSaves(string gameName, string gameID, string gameInst
             {
                 cloudSyncEnabled = (bool)gameSettings.AutoSyncSaves;
             }
+            if (manualSync)
+            {
+                cloudSyncEnabled = true;
+            }
             if (cloudSyncEnabled)
             {
                 var cloudSaveFolder = CalculateGameSavesPath(gameName, gameID, gameInstallDir);
-                if (gameSettings?.CloudSaveFolder != "")
+                if (!gameSettings.CloudSaveFolder.IsNullOrEmpty())
                 {
                     cloudSaveFolder = gameSettings.CloudSaveFolder;
                 }
@@ -154,14 +159,26 @@ public static void SyncGameSaves(string gameName, string gameID, string gameInst
                         {
                             a.ProgressMaxValue = 100;
                             a.CurrentProgressValue = 0;
+                            var cloudArgs = new List<string>();
+                            cloudArgs.AddRange(new[] { "-y", "sync-saves", gameID });
                             var skippedActivity = "--skip-upload";
-                            if (download == false)
+                            if (cloudSyncAction == CloudSyncAction.Upload || cloudSyncAction == CloudSyncAction.ForceUpload)
                             {
                                 skippedActivity = "--skip-download";
                             }
+                            cloudArgs.Add(skippedActivity);
+                            if (cloudSyncAction == CloudSyncAction.ForceDownload)
+                            {
+                                cloudArgs.Add("--force-download");
+                            }
+                            else if (cloudSyncAction == CloudSyncAction.ForceUpload)
+                            {
+                                cloudArgs.Add("--force-upload");
+                            }
+                            cloudArgs.AddRange(new[] { "--save-path", cloudSaveFolder });
                             var cmd = Cli.Wrap(LegendaryLauncher.ClientExecPath)
                                          .WithEnvironmentVariables(LegendaryLauncher.DefaultEnvironmentVariables)
-                                         .WithArguments(new[] { "-y", "sync-saves", gameID, skippedActivity, "--save-path", cloudSaveFolder });
+                                         .WithArguments(cloudArgs);
                             await foreach (var cmdEvent in cmd.ListenAsync())
                             {
                                 switch (cmdEvent)

diff --git a/src/LegendaryGameSettingsView.xaml b/src/LegendaryGameSettingsView.xaml
@@ -59,30 +59,38 @@
             </TabItem>
             <TabItem Header="{DynamicResource LOCLegendaryCloudSaves}">
                 <StackPanel Margin="10">
-                    <Grid x:Name="CloudSavesGrid" Visibility="Visible">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition></RowDefinition>
-                            <RowDefinition></RowDefinition>
-                            <RowDefinition></RowDefinition>
-                            <RowDefinition></RowDefinition>
-                            <RowDefinition></RowDefinition>
-                        </Grid.RowDefinitions>
-                        <CheckBox Name="AutoSyncChk" Content="{DynamicResource LOCLegendaryAutoSyncSaves}" Margin="0,0,0,5" Grid.Column="0" Grid.Row="0" Click="AutoSyncChk_Click"></CheckBox>
-                        <TextBlock Text="{DynamicResource LOCLegendarySavePath}" Grid.Column="0" Grid.Row="1"
-                               Margin="0,0,0,5" VerticalAlignment="Center" HorizontalAlignment="Left">
-                        </TextBlock>
-                        <TextBox x:Name="SelectedSavePathTxt" 
-                             Grid.Row="1" Grid.Column="1" Margin="0,0,0,5" VerticalAlignment="Center"/>
-                        <Button Name="ChooseSavePathBtn"
-                            Margin="5,0,0,5" Content="&#xec5b;" FontFamily="{DynamicResource FontIcoFont}" Grid.Row="1" Grid.Column="2"
-                            ToolTip="{DynamicResource LOCLegendary3P_PlayniteSelectDirectoryTooltip}" VerticalAlignment="Center" Click="ChooseSavePathBtn_Click"/>
-                        <Button Name="CalculatePathBtn" Margin="5,0,0,5" Grid.Row="2" Grid.Column="0" VerticalAlignment="Bottom" HorizontalAlignment="Left" Content="{DynamicResource LOCLegendaryCalculatePath}" FontFamily="{DynamicResource FontIcoFont}" Click="CalculatePathBtn_Click"/>
-                    </Grid>
+                    <StackPanel x:Name="CloudSavesSP">
+                        <CheckBox Name="AutoSyncChk" Content="{DynamicResource LOCLegendaryAutoSyncSaves}" Margin="0,0,0,5" Click="AutoSyncChk_Click"></CheckBox>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition></RowDefinition>
+                                <RowDefinition></RowDefinition>
+                                <RowDefinition></RowDefinition>
+                                <RowDefinition></RowDefinition>
+                                <RowDefinition></RowDefinition>
+                            </Grid.RowDefinitions>
+                            <TextBlock Text="{DynamicResource LOCLegendarySavePath}" Grid.Column="0" Grid.Row="1" 
+                               Margin="0,0,10,5" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                            <TextBox x:Name="SelectedSavePathTxt" Grid.Row="1" Grid.Column="1" Margin="0,0,0,5" VerticalAlignment="Center" HorizontalAlignment="Stretch"/>
+                            <Button Name="ChooseSavePathBtn"
+                                Margin="5,0,0,5" Content="&#xec5b;" FontFamily="{DynamicResource FontIcoFont}" Grid.Row="1" Grid.Column="2"
+                                ToolTip="{DynamicResource LOCLegendary3P_PlayniteSelectDirectoryTooltip}" VerticalAlignment="Center" Click="ChooseSavePathBtn_Click"/>
+                            <Button Name="CalculatePathBtn" Margin="5,0,0,5" Grid.Row="1" Grid.Column="3" 
+                                VerticalAlignment="Center" HorizontalAlignment="Left" 
+                                Content="&#xef85;" ToolTip="{DynamicResource LOCLegendaryCalculatePath}" FontFamily="{DynamicResource FontIcoFont}" Click="CalculatePathBtn_Click"/>
+                        </Grid>
+                        <StackPanel Orientation="Horizontal" Margin="0,10,0,5">
+                            <TextBlock Text="{DynamicResource LOCLegendaryManualSyncSaves}" Margin="0,0,10,0" VerticalAlignment="Center"/>
+                            <ComboBox x:Name="ManualSyncSavesCBo" DisplayMemberPath="Value" SelectedValuePath="Key" VerticalAlignment="Center" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Margin="0,0,10,0" HorizontalAlignment="Left"/>
+                            <Button x:Name="SyncBtn" Content="{DynamicResource LOCLegendarySync}" HorizontalAlignment="Left" Margin="0" Click="SyncBtn_Click"></Button>
+                        </StackPanel>
+                    </StackPanel>
                     <TextBlock Text="{DynamicResource LOCLegendaryCloudSavesNotSupported}" Name="CloudSavesNotSupportedTB" Visibility="Collapsed"></TextBlock>
                 </StackPanel>
             </TabItem>

diff --git a/src/LegendaryGameSettingsView.xaml.cs b/src/LegendaryGameSettingsView.xaml.cs
@@ -9,6 +9,7 @@
 using Playnite.Common;
 using Playnite.SDK;
 using Playnite.SDK.Models;
+using LegendaryLibraryNS.Enums;
 
 namespace LegendaryLibraryNS
 {
@@ -143,10 +144,22 @@ private void LegendaryGameSettingsViewUC_Loaded(object sender, RoutedEventArgs e
                     EnableOfflineModeChk.IsEnabled = true;
                 }
             }
+            var cloudSyncActions = new Dictionary<CloudSyncAction, string>
+            {
+                { CloudSyncAction.Download, ResourceProvider.GetString(LOC.LegendaryDownload) },
+                { CloudSyncAction.Upload, ResourceProvider.GetString(LOC.LegendaryUpload) },
+                { CloudSyncAction.ForceDownload, ResourceProvider.GetString(LOC.LegendaryForceDownload) },
+                { CloudSyncAction.ForceUpload, ResourceProvider.GetString(LOC.LegendaryForceUpload) }
+            };
+            ManualSyncSavesCBo.ItemsSource = cloudSyncActions;
+            ManualSyncSavesCBo.SelectedIndex = 0;
+
+
+
             cloudPath = LegendaryCloud.CalculateGameSavesPath(Game.Name, Game.GameId, Game.InstallDirectory);
             if (cloudPath.IsNullOrEmpty())
             {
-                CloudSavesGrid.Visibility = Visibility.Collapsed;
+                CloudSavesSP.Visibility = Visibility.Collapsed;
                 CloudSavesNotSupportedTB.Visibility = Visibility.Visible;
             }
         }
@@ -187,5 +200,15 @@ private void AutoSyncChk_Click(object sender, RoutedEventArgs e)
                 playniteAPI.Dialogs.ShowMessage(ResourceProvider.GetString(LOC.LegendarySyncGameSavesWarn), "", MessageBoxButton.OK, MessageBoxImage.Warning);
             }
         }
+
+        private void SyncBtn_Click(object sender, RoutedEventArgs e)
+        {
+            var result = playniteAPI.Dialogs.ShowMessage(ResourceProvider.GetString(LOC.LegendaryCloudSaveConfirm), ResourceProvider.GetString(LOC.LegendaryCloudSaves), MessageBoxButton.YesNo, MessageBoxImage.Question);
+            if (result == MessageBoxResult.Yes)
+            {
+                CloudSyncAction selectedCloudSyncAction = (CloudSyncAction)ManualSyncSavesCBo.SelectedValue;
+                LegendaryCloud.SyncGameSaves(Game.Name, GameID, Game.InstallDirectory, selectedCloudSyncAction, true);
+            }
+        }
     }
 }
diff --git a/src/LegendaryLibrary.cs b/src/LegendaryLibrary.cs
@@ -354,12 +354,12 @@ public void MigrateOnlineGames()
 
         public override void OnGameStarting(OnGameStartingEventArgs args)
         {
-            LegendaryCloud.SyncGameSaves(args.Game.Name, args.Game.GameId, args.Game.InstallDirectory, true);
+            LegendaryCloud.SyncGameSaves(args.Game.Name, args.Game.GameId, args.Game.InstallDirectory, CloudSyncAction.Download);
         }
 
         public override void OnGameStopped(OnGameStoppedEventArgs args)
         {
-            LegendaryCloud.SyncGameSaves(args.Game.Name, args.Game.GameId, args.Game.InstallDirectory, false);
+            LegendaryCloud.SyncGameSaves(args.Game.Name, args.Game.GameId, args.Game.InstallDirectory, CloudSyncAction.Upload);
         }
 
         public override IEnumerable<SidebarItem> GetSidebarItems()

diff --git a/src/LegendaryLibrary.csproj b/src/LegendaryLibrary.csproj
@@ -157,6 +157,7 @@
   <ItemGroup>
     <Compile Include="Converters\DownloadStatusEnumToStringConverter.cs" />
     <Compile Include="Enums\ClearCacheTime.cs" />
+    <Compile Include="Enums\CloudSyncAction.cs" />
     <Compile Include="Enums\DownloadAction.cs" />
     <Compile Include="Enums\DownloadCompleteAction.cs" />
     <Compile Include="Enums\DownloadStatus.cs" />

diff --git a/src/Localization/en_US.xaml b/src/Localization/en_US.xaml
@@ -100,4 +100,11 @@
   <sys:String x:Key="LOCLegendaryAutoSyncSaves">Sync saves to the cloud</sys:String>
   <sys:String x:Key="LOCLegendaryCalculatePath">Calculate path</sys:String>
   <sys:String x:Key="LOCLegendaryCloudSavesNotSupported">This game doesn't support cloud saves.</sys:String>
+  <sys:String x:Key="LOCLegendaryManualSyncSaves">Manual sync saves</sys:String>
+  <sys:String x:Key="LOCLegendarySync">Sync</sys:String>
+  <sys:String x:Key="LOCLegendaryDownload">Download</sys:String>
+  <sys:String x:Key="LOCLegendaryUpload">Upload</sys:String>
+  <sys:String x:Key="LOCLegendaryForceDownload">Force download</sys:String>
+  <sys:String x:Key="LOCLegendaryForceUpload">Force upload</sys:String>
+  <sys:String x:Key="LOCLegendaryCloudSaveConfirm">Cloud saves feature is experimental. It's recommended to backup game saves in case something goes wrong. Are you sure you want to continue?</sys:String>
 </ResourceDictionary>
diff --git a/src/LocalizationKeys.cs b/src/LocalizationKeys.cs
@@ -601,5 +601,33 @@ public static class LOC
         /// This game doesn't support cloud saves.
         /// </summary>
         public const string LegendaryCloudSavesNotSupported = "LOCLegendaryCloudSavesNotSupported";
+        /// <summary>
+        /// Manual sync saves
+        /// </summary>
+        public const string LegendaryManualSyncSaves = "LOCLegendaryManualSyncSaves";
+        /// <summary>
+        /// Sync
+        /// </summary>
+        public const string LegendarySync = "LOCLegendarySync";
+        /// <summary>
+        /// Download
+        /// </summary>
+        public const string LegendaryDownload = "LOCLegendaryDownload";
+        /// <summary>
+        /// Upload
+        /// </summary>
+        public const string LegendaryUpload = "LOCLegendaryUpload";
+        /// <summary>
+        /// Force download
+        /// </summary>
+        public const string LegendaryForceDownload = "LOCLegendaryForceDownload";
+        /// <summary>
+        /// Force upload
+        /// </summary>
+        public const string LegendaryForceUpload = "LOCLegendaryForceUpload";
+        /// <summary>
+        /// Cloud saves feature is experimental. It's recommended to backup game saves in case something goes wrong. Are you sure you want to continue?
+        /// </summary>
+        public const string LegendaryCloudSaveConfirm = "LOCLegendaryCloudSaveConfirm";
     }
 }