feat: Free Trial mode checkbox for Steam

goaaats · goaaats · commit a9ecfeddbdab · 2022-03-09T21:18:23.000+01:00
diff --git a/src/XIVLauncher.Common/Constants.cs b/src/XIVLauncher.Common/Constants.cs
@@ -6,6 +6,9 @@ public static class Constants
     {
         public const string BASE_GAME_VERSION = "2012.01.01.0000.0000";
 
+        public const uint STEAM_APP_ID = 39210;
+        public const uint STEAM_FT_APP_ID = 312060;
+
         public static string PatcherUserAgent => GetPatcherUserAgent(Util.GetPlatform());
 
         private static string GetPatcherUserAgent(Platform platform)
diff --git a/src/XIVLauncher.Common/Dalamud/AssetManager.cs b/src/XIVLauncher.Common/Dalamud/AssetManager.cs
@@ -88,7 +88,7 @@ public static bool TryEnsureAssets(DirectoryInfo baseDir, out DirectoryInfo asse
 
                         try
                         {
-                            File.Copy(filePath, filePathDev);
+                            File.Copy(filePath, filePathDev, true);
                         }
                         catch
                         {
diff --git a/src/XIVLauncher.Common/Game/Launcher.cs b/src/XIVLauncher.Common/Game/Launcher.cs
@@ -41,8 +41,6 @@ public Launcher(ISteam steam, IUniqueIdCache uniqueIdCache, ISettings settings)
         private const string USER_AGENT_TEMPLATE = "SQEXAuthor/2.0.0(Windows 6.2; ja-jp; {0})";
         private readonly string _userAgent = GenerateUserAgent();
 
-        public const int STEAM_APP_ID = 39210;
-
         private static readonly string[] FilesToHash =
         {
             "ffxivboot.exe",
@@ -71,7 +69,7 @@ public class LoginResult
             public string UniqueId { get; set; }
         }
 
-        public async Task<LoginResult> Login(string userName, string password, string otp, bool isSteamServiceAccount, bool useCache, DirectoryInfo gamePath, bool forceBaseVersion)
+        public async Task<LoginResult> Login(string userName, string password, string otp, bool isSteamServiceAccount, bool useCache, DirectoryInfo gamePath, bool forceBaseVersion, bool isFt)
         {
             string uid;
             PatchListEntry[] pendingPatches = null;
@@ -90,7 +88,7 @@ public async Task<LoginResult> Login(string userName, string password, string ot
                 {
                     if (!this.steam.IsValid)
                     {
-                        this.steam.Initialize(STEAM_APP_ID);
+                        this.steam.Initialize(isFt ? Constants.STEAM_FT_APP_ID : Constants.STEAM_APP_ID);
                     }
                 }
                 catch (Exception ex)
diff --git a/src/XIVLauncher.Common/Util.cs b/src/XIVLauncher.Common/Util.cs
@@ -64,9 +64,11 @@ public static long GetUnixMillis()
             return (long)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds;
         }
 
+        public static FileInfo GetOfficialLauncherPath(DirectoryInfo gamePath) => new(Path.Combine(gamePath.FullName, "boot", "ffxivboot.exe"));
+
         public static void StartOfficialLauncher(DirectoryInfo gamePath, bool isSteam)
         {
-            Process.Start(Path.Combine(gamePath.FullName, "boot", "ffxivboot.exe"), isSteam ? "-issteam" : string.Empty);
+            Process.Start(GetOfficialLauncherPath(gamePath).FullName, isSteam ? "-issteam" : string.Empty);
         }
 
         public static string BytesToString(double byteCount) => BytesToString(Convert.ToInt64(Math.Floor(byteCount)));
diff --git a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs
@@ -63,7 +63,7 @@ public async Task Login(string username, string password, bool isOtp, bool isSte
         if (otp == null)
             return;
 
-        var loginResult = await Program.Launcher.Login(username, password, otp, isSteam, true, Program.Config.GamePath, false).ConfigureAwait(true);
+        var loginResult = await Program.Launcher.Login(username, password, otp, isSteam, true, Program.Config.GamePath, false, false).ConfigureAwait(true);
 
         if (loginResult.State != Launcher.LoginState.Ok)
         {
diff --git a/src/XIVLauncher/Settings/ILauncherSettingsV3.cs b/src/XIVLauncher/Settings/ILauncherSettingsV3.cs
@@ -39,6 +39,7 @@ public interface ILauncherSettingsV3
         int? VersionUpgradeLevel { get; set; }
         bool? TreatNonZeroExitCodeAsFailure { get; set; }
         bool? ExitLauncherAfterGameExit { get; set; }
+        bool? IsFt { get; set; }
 
         #endregion
     }
diff --git a/src/XIVLauncher/Windows/CustomMessageBox.xaml.cs b/src/XIVLauncher/Windows/CustomMessageBox.xaml.cs
@@ -12,10 +12,10 @@
 using MaterialDesignThemes.Wpf;
 using Serilog;
 using XIVLauncher.Common;
-using XIVLauncher.Common.Game;
 using XIVLauncher.Support;
 using XIVLauncher.Windows.ViewModel;
 using XIVLauncher.Xaml;
+using Constants = XIVLauncher.Common.Constants;
 
 namespace XIVLauncher.Windows
 {
@@ -195,6 +195,12 @@ private void Button3_Click(object sender, RoutedEventArgs e)
 
         private void OfficialLauncherButton_Click(object sender, RoutedEventArgs e)
         {
+            if (!Util.GetOfficialLauncherPath(App.Settings.GamePath).Exists)
+            {
+                CustomMessageBox.Show(Loc.Localize("RunOfficialLauncherNotPresentError", "You don't have a FFXIV game installation set up. XIVLauncher can't start the official launcher."), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
             switch (Builder
                     .NewFrom(Loc.Localize("RunOfficialLauncherConfirmSteam", "Do you have your game account associated with a Steam account? If so, Steam must be installed to continue."))
                     .WithImage(MessageBoxImage.Question)
@@ -208,7 +214,7 @@ private void OfficialLauncherButton_Click(object sender, RoutedEventArgs e)
                     {
                         if (!steam.IsValid)
                         {
-                            steam.Initialize(Launcher.STEAM_APP_ID);
+                            steam.Initialize(App.Settings.IsFt.GetValueOrDefault(false) ? Constants.STEAM_FT_APP_ID : Constants.STEAM_APP_ID);
                         }
 
                         Thread.Sleep(5000);
diff --git a/src/XIVLauncher/Windows/MainWindow.xaml.cs b/src/XIVLauncher/Windows/MainWindow.xaml.cs
@@ -185,6 +185,8 @@ private void SetDefaults()
             App.Settings.TreatNonZeroExitCodeAsFailure ??= false;
             App.Settings.ExitLauncherAfterGameExit ??= true;
 
+            App.Settings.IsFt ??= false;
+
             var versionLevel = App.Settings.VersionUpgradeLevel.GetValueOrDefault(0);
 
             while (versionLevel < CURRENT_VERSION_LEVEL)
diff --git a/src/XIVLauncher/Windows/SettingsControl.xaml b/src/XIVLauncher/Windows/SettingsControl.xaml
@@ -338,6 +338,9 @@
                             <CheckBox x:Name="TreatNonZeroExitCodeAsFailureCheckbox"
                                           Content="{Binding TreatNonZeroExitCodeAsFailureLoc}"
                                           HorizontalAlignment="Left" Margin="0,0,0,7" Foreground="DarkGray" />
+                            <CheckBox x:Name="IsFreeTrialCheckbox"
+                                      Content="{Binding IsFreeTrialLoc}"
+                                      HorizontalAlignment="Left" Margin="0,0,0,7" Foreground="DarkGray" />
                         </StackPanel>
 
                         <Image Source="pack://application:,,,/Resources/logo.png" Width="200"
diff --git a/src/XIVLauncher/Windows/SettingsControl.xaml.cs b/src/XIVLauncher/Windows/SettingsControl.xaml.cs
@@ -100,6 +100,8 @@ public void ReloadSettings()
             var val = (decimal) App.Settings.SpeedLimitBytes / BYTES_TO_MB;
 
             SpeedLimiterUpDown.Value = val;
+
+            IsFreeTrialCheckbox.IsChecked = App.Settings.IsFt;
         }
 
         private void AcceptButton_Click(object sender, RoutedEventArgs e)
@@ -150,6 +152,8 @@ private void AcceptButton_Click(object sender, RoutedEventArgs e)
 
             App.Settings.SpeedLimitBytes = (long) (SpeedLimiterUpDown.Value * BYTES_TO_MB);
 
+            App.Settings.IsFt = this.IsFreeTrialCheckbox.IsChecked == true;
+
             Transitioner.MoveNextCommand.Execute(null, null);
         }
 
diff --git a/src/XIVLauncher/Windows/ViewModel/MainWindowViewModel.cs b/src/XIVLauncher/Windows/ViewModel/MainWindowViewModel.cs
@@ -301,9 +301,9 @@ private void ShowInternetError()
                 var gamePath = App.Settings.GamePath;
 
                 if (action == AfterLoginAction.Repair)
-                    return await this.Launcher.Login(username, password, otp, isSteam, false, gamePath, true);
+                    return await this.Launcher.Login(username, password, otp, isSteam, false, gamePath, true, App.Settings.IsFt.GetValueOrDefault(false));
                 else
-                    return await this.Launcher.Login(username, password, otp, isSteam, enableUidCache, gamePath, false);
+                    return await this.Launcher.Login(username, password, otp, isSteam, enableUidCache, gamePath, false, App.Settings.IsFt.GetValueOrDefault(false));
             }
             catch (Exception ex)
             {
diff --git a/src/XIVLauncher/Windows/ViewModel/SettingsControlViewModel.cs b/src/XIVLauncher/Windows/ViewModel/SettingsControlViewModel.cs
@@ -157,6 +157,7 @@ private void SetupLoc()
             EnableEncryptionLoc = Loc.Localize("EnableEncryption", "Enable encrypting arguments to the client");
             ExitLauncherAfterGameExitLoc = Loc.Localize("ExitLauncherAfterGameExitLoc", "Exit XIVLauncher after game exit");
             TreatNonZeroExitCodeAsFailureLoc = Loc.Localize("TreatNonZeroExitCodeAsFailureLoc", "Treat non-zero game exit code as failure");
+            IsFreeTrialLoc = Loc.Localize("IsFreeTrial", "Start in free trial mode");
         }
 
         public string OpenPluginsFolderLoc { get; private set; }
@@ -236,5 +237,6 @@ private void SetupLoc()
         public string EnableEncryptionLoc { get; private set; }
         public string ExitLauncherAfterGameExitLoc { get; private set; }
         public string TreatNonZeroExitCodeAsFailureLoc { get; private set; }
+        public string IsFreeTrialLoc { get; private set; }
     }
 }
diff --git a/src/XIVLauncher/XIVLauncher.csproj b/src/XIVLauncher/XIVLauncher.csproj
@@ -52,7 +52,6 @@
     <Resource Remove="Resources\CHANGELOG.txt" />
     <Resource Remove="Resources\COPYING.aria2" />
     <Resource Remove="Resources\LICENSE.txt" />
-    <None Remove="steam_appid.txt" />
   </ItemGroup>
 
   <ItemGroup>
@@ -68,9 +67,6 @@
     <Content Include="Resources\LICENSE.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="steam_appid.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/XIVLauncher/steam_appid.txt b/src/XIVLauncher/steam_appid.txt

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@ public static class Constants`
`6`	`6`	`{`
`7`	`7`	`public const string BASE_GAME_VERSION = "2012.01.01.0000.0000";`
`8`	`8`
	`9`	`+ public const uint STEAM_APP_ID = 39210;`
	`10`	`+ public const uint STEAM_FT_APP_ID = 312060;`
	`11`	`+`
`9`	`12`	`public static string PatcherUserAgent => GetPatcherUserAgent(Util.GetPlatform());`
`10`	`13`
`11`	`14`	`private static string GetPatcherUserAgent(Platform platform)`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public static bool TryEnsureAssets(DirectoryInfo baseDir, out DirectoryInfo asse`
`88`	`88`
`89`	`89`	`try`
`90`	`90`	`{`
`91`		`- File.Copy(filePath, filePathDev);`
	`91`	`+ File.Copy(filePath, filePathDev, true);`
`92`	`92`	`}`
`93`	`93`	`catch`
`94`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,6 @@ public Launcher(ISteam steam, IUniqueIdCache uniqueIdCache, ISettings settings)`
`41`	`41`	`private const string USER_AGENT_TEMPLATE = "SQEXAuthor/2.0.0(Windows 6.2; ja-jp; {0})";`
`42`	`42`	`private readonly string _userAgent = GenerateUserAgent();`
`43`	`43`
`44`		`- public const int STEAM_APP_ID = 39210;`
`45`		`-`
`46`	`44`	`private static readonly string[] FilesToHash =`
`47`	`45`	`{`
`48`	`46`	`"ffxivboot.exe",`
`@@ -71,7 +69,7 @@ public class LoginResult`
`71`	`69`	`public string UniqueId { get; set; }`
`72`	`70`	`}`
`73`	`71`
`74`		`- public async Task<LoginResult> Login(string userName, string password, string otp, bool isSteamServiceAccount, bool useCache, DirectoryInfo gamePath, bool forceBaseVersion)`
	`72`	`+ public async Task<LoginResult> Login(string userName, string password, string otp, bool isSteamServiceAccount, bool useCache, DirectoryInfo gamePath, bool forceBaseVersion, bool isFt)`
`75`	`73`	`{`
`76`	`74`	`string uid;`
`77`	`75`	`PatchListEntry[] pendingPatches = null;`
`@@ -90,7 +88,7 @@ public async Task<LoginResult> Login(string userName, string password, string ot`
`90`	`88`	`{`
`91`	`89`	`if (!this.steam.IsValid)`
`92`	`90`	`{`
`93`		`- this.steam.Initialize(STEAM_APP_ID);`
	`91`	`+ this.steam.Initialize(isFt ? Constants.STEAM_FT_APP_ID : Constants.STEAM_APP_ID);`
`94`	`92`	`}`
`95`	`93`	`}`
`96`	`94`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,11 @@ public static long GetUnixMillis()`
`64`	`64`	`return (long)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds;`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ public static FileInfo GetOfficialLauncherPath(DirectoryInfo gamePath) => new(Path.Combine(gamePath.FullName, "boot", "ffxivboot.exe"));`
	`68`	`+`
`67`	`69`	`public static void StartOfficialLauncher(DirectoryInfo gamePath, bool isSteam)`
`68`	`70`	`{`
`69`		`- Process.Start(Path.Combine(gamePath.FullName, "boot", "ffxivboot.exe"), isSteam ? "-issteam" : string.Empty);`
	`71`	`+ Process.Start(GetOfficialLauncherPath(gamePath).FullName, isSteam ? "-issteam" : string.Empty);`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`public static string BytesToString(double byteCount) => BytesToString(Convert.ToInt64(Math.Floor(byteCount)));`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public async Task Login(string username, string password, bool isOtp, bool isSte`
`63`	`63`	`if (otp == null)`
`64`	`64`	`return;`
`65`	`65`
`66`		`- var loginResult = await Program.Launcher.Login(username, password, otp, isSteam, true, Program.Config.GamePath, false).ConfigureAwait(true);`
	`66`	`+ var loginResult = await Program.Launcher.Login(username, password, otp, isSteam, true, Program.Config.GamePath, false, false).ConfigureAwait(true);`
`67`	`67`
`68`	`68`	`if (loginResult.State != Launcher.LoginState.Ok)`
`69`	`69`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ public interface ILauncherSettingsV3`
`39`	`39`	`int? VersionUpgradeLevel { get; set; }`
`40`	`40`	`bool? TreatNonZeroExitCodeAsFailure { get; set; }`
`41`	`41`	`bool? ExitLauncherAfterGameExit { get; set; }`
	`42`	`+ bool? IsFt { get; set; }`
`42`	`43`
`43`	`44`	`#endregion`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@`
`12`	`12`	`using MaterialDesignThemes.Wpf;`
`13`	`13`	`using Serilog;`
`14`	`14`	`using XIVLauncher.Common;`
`15`		`-using XIVLauncher.Common.Game;`
`16`	`15`	`using XIVLauncher.Support;`
`17`	`16`	`using XIVLauncher.Windows.ViewModel;`
`18`	`17`	`using XIVLauncher.Xaml;`
	`18`	`+using Constants = XIVLauncher.Common.Constants;`
`19`	`19`
`20`	`20`	`namespace XIVLauncher.Windows`
`21`	`21`	`{`
`@@ -195,6 +195,12 @@ private void Button3_Click(object sender, RoutedEventArgs e)`
`195`	`195`
`196`	`196`	`private void OfficialLauncherButton_Click(object sender, RoutedEventArgs e)`
`197`	`197`	`{`
	`198`	`+ if (!Util.GetOfficialLauncherPath(App.Settings.GamePath).Exists)`
	`199`	`+ {`
	`200`	`+ CustomMessageBox.Show(Loc.Localize("RunOfficialLauncherNotPresentError", "You don't have a FFXIV game installation set up. XIVLauncher can't start the official launcher."), "Error", MessageBoxButton.OK, MessageBoxImage.Error);`
	`201`	`+ return;`
	`202`	`+ }`
	`203`	`+`
`198`	`204`	`switch (Builder`
`199`	`205`	`.NewFrom(Loc.Localize("RunOfficialLauncherConfirmSteam", "Do you have your game account associated with a Steam account? If so, Steam must be installed to continue."))`
`200`	`206`	`.WithImage(MessageBoxImage.Question)`
`@@ -208,7 +214,7 @@ private void OfficialLauncherButton_Click(object sender, RoutedEventArgs e)`
`208`	`214`	`{`
`209`	`215`	`if (!steam.IsValid)`
`210`	`216`	`{`
`211`		`- steam.Initialize(Launcher.STEAM_APP_ID);`
	`217`	`+ steam.Initialize(App.Settings.IsFt.GetValueOrDefault(false) ? Constants.STEAM_FT_APP_ID : Constants.STEAM_APP_ID);`
`212`	`218`	`}`
`213`	`219`
`214`	`220`	`Thread.Sleep(5000);`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,8 @@ public void ReloadSettings()`
`100`	`100`	`var val = (decimal) App.Settings.SpeedLimitBytes / BYTES_TO_MB;`
`101`	`101`
`102`	`102`	`SpeedLimiterUpDown.Value = val;`
	`103`	`+`
	`104`	`+ IsFreeTrialCheckbox.IsChecked = App.Settings.IsFt;`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`private void AcceptButton_Click(object sender, RoutedEventArgs e)`
`@@ -150,6 +152,8 @@ private void AcceptButton_Click(object sender, RoutedEventArgs e)`
`150`	`152`
`151`	`153`	`App.Settings.SpeedLimitBytes = (long) (SpeedLimiterUpDown.Value * BYTES_TO_MB);`
`152`	`154`
	`155`	`+ App.Settings.IsFt = this.IsFreeTrialCheckbox.IsChecked == true;`
	`156`	`+`
`153`	`157`	`Transitioner.MoveNextCommand.Execute(null, null);`
`154`	`158`	`}`
`155`	`159`
Original file line number	Diff line number	Diff line change
`@@ -301,9 +301,9 @@ private void ShowInternetError()`
`301`	`301`	`var gamePath = App.Settings.GamePath;`
`302`	`302`
`303`	`303`	`if (action == AfterLoginAction.Repair)`
`304`		`- return await this.Launcher.Login(username, password, otp, isSteam, false, gamePath, true);`
	`304`	`+ return await this.Launcher.Login(username, password, otp, isSteam, false, gamePath, true, App.Settings.IsFt.GetValueOrDefault(false));`
`305`	`305`	`else`
`306`		`- return await this.Launcher.Login(username, password, otp, isSteam, enableUidCache, gamePath, false);`
	`306`	`+ return await this.Launcher.Login(username, password, otp, isSteam, enableUidCache, gamePath, false, App.Settings.IsFt.GetValueOrDefault(false));`
`307`	`307`	`}`
`308`	`308`	`catch (Exception ex)`
`309`	`309`	`{`
Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ private void SetupLoc()`
`157`	`157`	`EnableEncryptionLoc = Loc.Localize("EnableEncryption", "Enable encrypting arguments to the client");`
`158`	`158`	`ExitLauncherAfterGameExitLoc = Loc.Localize("ExitLauncherAfterGameExitLoc", "Exit XIVLauncher after game exit");`
`159`	`159`	`TreatNonZeroExitCodeAsFailureLoc = Loc.Localize("TreatNonZeroExitCodeAsFailureLoc", "Treat non-zero game exit code as failure");`
	`160`	`+ IsFreeTrialLoc = Loc.Localize("IsFreeTrial", "Start in free trial mode");`
`160`	`161`	`}`
`161`	`162`
`162`	`163`	`public string OpenPluginsFolderLoc { get; private set; }`
`@@ -236,5 +237,6 @@ private void SetupLoc()`
`236`	`237`	`public string EnableEncryptionLoc { get; private set; }`
`237`	`238`	`public string ExitLauncherAfterGameExitLoc { get; private set; }`
`238`	`239`	`public string TreatNonZeroExitCodeAsFailureLoc { get; private set; }`
	`240`	`+ public string IsFreeTrialLoc { get; private set; }`
`239`	`241`	`}`
`240`	`242`	`}`