Add dalamud beta config keys

src/XIVLauncher.Core/Components/MainPage/MainPage.cs

@@ -129,7 +129,7 @@
                 return;
             }
 
             if (Repository.Ffxiv.GetVer(App.Settings.GamePath) == Constants.BASE_GAME_VERSION &&
                 App.Settings.IsUidCacheEnabled == true)
             {
                 App.ShowMessageBlocking(
@@ -167,8 +167,9 @@
         if (action == LoginAction.Fake)
         {
             IGameRunner gameRunner;
+            // FIXME: Should we really be passing a null DalamudLauncher to both of these?
             if (Environment.OSVersion.Platform == PlatformID.Win32NT)
-                gameRunner = new WindowsGameRunner(null, false, Program.DalamudUpdater.Runtime);
+                gameRunner = new WindowsGameRunner(null, false);
             else
                 gameRunner = new UnixGameRunner(Program.CompatibilityTools, null, false);
 
@@ -534,7 +535,7 @@
         switch (Environment.OSVersion.Platform)
         {
             case PlatformID.Win32NT:
-                dalamudRunner = new WindowsDalamudRunner();
+                dalamudRunner = new WindowsDalamudRunner(Program.DalamudUpdater.Runtime);
                 dalamudCompatCheck = new WindowsDalamudCompatibilityCheck();
                 break;
 
@@ -550,7 +551,7 @@
         Troubleshooting.LogTroubleshooting();
 
         var dalamudLauncher = new DalamudLauncher(dalamudRunner, Program.DalamudUpdater,
             App.Settings.DalamudLoadMethod.GetValueOrDefault(DalamudLoadMethod.DllInject), App.Settings.GamePath,
             App.Storage.Root, App.Storage.GetFolder("logs"), App.Settings.ClientLanguage ?? ClientLanguage.English,
             App.Settings.DalamudLoadDelay, false, noPlugins, noThird, Troubleshooting.GetTroubleshootingJson());
 
@@ -658,7 +659,7 @@
 
         if (Environment.OSVersion.Platform == PlatformID.Win32NT)
         {
-            runner = new WindowsGameRunner(dalamudLauncher, dalamudOk, Program.DalamudUpdater.Runtime);
+            runner = new WindowsGameRunner(dalamudLauncher, dalamudOk);
         }
         else if (Environment.OSVersion.Platform == PlatformID.Unix)
         {
@@ -672,7 +673,7 @@
                 else if (!File.Exists(Path.Combine(App.Settings.WineBinaryPath, "wine64")))
                     throw new InvalidOperationException("Custom wine binary path is invalid: no wine64 found at that location.\n" +
                                                         "Check path carefully for typos: " + App.Settings.WineBinaryPath);
-                
+
                 Log.Information("Using Custom Wine: " + App.Settings.WineBinaryPath);
             }
             else
@@ -729,8 +730,8 @@
 
         // We won't do any sanity checks here anymore, since that should be handled in StartLogin
         var launchedProcess = App.Launcher.LaunchGame(runner,
             loginResult.UniqueId,
             loginResult.OauthLogin.Region,
             loginResult.OauthLogin.MaxExpansion,
             isSteam,
             gameArgs,
@@ -872,7 +873,7 @@
 
         Debug.Assert(loginResult.PendingPatches != null, "loginResult.PendingPatches != null ASSERTION FAILED");
 
         return TryHandlePatchAsync(Repository.Ffxiv, loginResult.PendingPatches, loginResult.UniqueId);
     }
 
     private async Task<bool> TryHandlePatchAsync(Repository repository, PatchListEntry[] pendingPatches, string sid)
@@ -896,7 +897,7 @@
             return false;
         }
 
-        using var installer = new PatchInstaller(App.Settings.KeepPatches ?? false);
+        using var installer = new PatchInstaller(App.Settings.GamePath, App.Settings.KeepPatches ?? false);
         Program.Patcher = new PatchManager(App.Settings.PatchAcquisitionMethod ?? AcquisitionMethod.Aria, App.Settings.PatchSpeedLimit, repository, pendingPatches, App.Settings.GamePath,
             App.Settings.PatchPath, installer, App.Launcher, sid);
         Program.Patcher.OnFail += PatcherOnFail;
@@ -932,8 +933,8 @@
                     Thread.Sleep(30);
 
                     App.LoadingPage.Line2 = string.Format(Strings.WorkingOnStatus, Program.Patcher.CurrentInstallIndex, Program.Patcher.Downloads.Count);
-                    App.LoadingPage.Line3 = string.Format(Strings.LeftToDownloadStatus, ApiHelpers.BytesToString(Program.Patcher.AllDownloadsLength < 0 ? 0 : Program.Patcher.AllDownloadsLength),
-                        ApiHelpers.BytesToString(Program.Patcher.Speeds.Sum()));
+                    App.LoadingPage.Line3 = string.Format(Strings.LeftToDownloadStatus, MathHelpers.BytesToString(Program.Patcher.AllDownloadsLength < 0 ? 0 : Program.Patcher.AllDownloadsLength),
+                        MathHelpers.BytesToString(Program.Patcher.Speeds.Sum()));
 
                     App.LoadingPage.Progress = Program.Patcher.CurrentInstallIndex / (float)Program.Patcher.Downloads.Count;
                 }
@@ -963,19 +964,19 @@
                 case NotEnoughSpaceException.SpaceKind.Patches:
                     App.ShowMessageBlocking(
                         string.Format(Strings.NotEnoughSpacePatchesError,
-                            ApiHelpers.BytesToString(sex.BytesRequired), ApiHelpers.BytesToString(sex.BytesFree)), Strings.XIVLauncherError);
+                            MathHelpers.BytesToString(sex.BytesRequired), MathHelpers.BytesToString(sex.BytesFree)), Strings.XIVLauncherError);
                     break;
 
                 case NotEnoughSpaceException.SpaceKind.AllPatches:
                     App.ShowMessageBlocking(
                         string.Format(Strings.NotEnoughSpaceAllPatchesError,
-                            ApiHelpers.BytesToString(sex.BytesRequired), ApiHelpers.BytesToString(sex.BytesFree)), Strings.XIVLauncherError);
+                            MathHelpers.BytesToString(sex.BytesRequired), MathHelpers.BytesToString(sex.BytesFree)), Strings.XIVLauncherError);
                     break;
 
                 case NotEnoughSpaceException.SpaceKind.Game:
                     App.ShowMessageBlocking(
                         string.Format(Strings.NotEnoughSpaceGameError,
-                            ApiHelpers.BytesToString(sex.BytesRequired), ApiHelpers.BytesToString(sex.BytesFree)), Strings.XIVLauncherError);
+                            MathHelpers.BytesToString(sex.BytesRequired), MathHelpers.BytesToString(sex.BytesFree)), Strings.XIVLauncherError);
                     break;
 
                 default:
@@ -1045,13 +1046,13 @@
                     // TODO: show more progress info here
                     case PatchVerifier.VerifyState.DownloadMeta:
                         this.App.LoadingPage.Line2 = $"{verify.CurrentFile}";
-                        this.App.LoadingPage.Line3 = $"{Math.Min(verify.PatchSetIndex + 1, verify.PatchSetCount)}/{verify.PatchSetCount} - {ApiHelpers.BytesToString(verify.Progress)}/{ApiHelpers.BytesToString(verify.Total)}";
+                        this.App.LoadingPage.Line3 = $"{Math.Min(verify.PatchSetIndex + 1, verify.PatchSetCount)}/{verify.PatchSetCount} - {MathHelpers.BytesToString(verify.Progress)}/{MathHelpers.BytesToString(verify.Total)}";
                         this.App.LoadingPage.Progress = (float)(verify.Total != 0 ? (float)verify.Progress / (float)verify.Total : 0.0);
                         break;
 
                     case PatchVerifier.VerifyState.VerifyAndRepair:
                         this.App.LoadingPage.Line2 = $"{verify.CurrentFile}";
-                        this.App.LoadingPage.Line3 = $"{Math.Min(verify.PatchSetIndex + 1, verify.PatchSetCount)}/{verify.PatchSetCount} - {Math.Min(verify.TaskIndex + 1, verify.TaskCount)}/{verify.TaskCount} - {ApiHelpers.BytesToString(verify.Progress)}/{ApiHelpers.BytesToString(verify.Total)}";
+                        this.App.LoadingPage.Line3 = $"{Math.Min(verify.PatchSetIndex + 1, verify.PatchSetCount)}/{verify.PatchSetCount} - {Math.Min(verify.TaskIndex + 1, verify.TaskCount)}/{verify.TaskCount} - {MathHelpers.BytesToString(verify.Progress)}/{MathHelpers.BytesToString(verify.Total)}";
                         this.App.LoadingPage.Progress = (float)(verify.Total != 0 ? (float)verify.Progress / (float)verify.Total : 0);
                         break;
 

src/XIVLauncher.Core/Configuration/ILauncherConfig.cs

@@ -11,8 +11,6 @@ public interface ILauncherConfig
 {
     public bool? CompletedFts { get; set; }
 
-    public bool? DoVersionCheck { get; set; }
-
     public float? FontPxSize { get; set; }
 
     public string? CurrentAccountId { get; set; }
@@ -98,6 +96,8 @@ public interface ILauncherConfig
     public DalamudLoadMethod? DalamudLoadMethod { get; set; }
     public bool? DalamudManualInjectionEnabled { get; set; }
     public DirectoryInfo? DalamudManualInjectPath { get; set; }
+    public string? DalamudBetaKind { get; set; }
+    public string? DalamudBetaKey { get; set; }
 
     public int DalamudLoadDelay { get; set; }
 

src/XIVLauncher.Core/Program.cs

@@ -109,7 +109,6 @@ private static void LoadConfig(Storage storage)
         Config.DpiAwareness ??= DpiAwareness.Unaware;
         Config.IsAutologin ??= false;
         Config.CompletedFts ??= false;
-        Config.DoVersionCheck ??= true;
         Config.FontPxSize ??= 22.0f;
 
         Config.IsEncryptArgs ??= true;
@@ -169,7 +168,7 @@ private static DalamudUpdater CreateDalamudUpdater()
         {
             runnerOverride = new FileInfo(Path.Combine(Config.DalamudManualInjectPath.FullName, DALAMUD_INJECTOR_NAME));
         }
-        return new DalamudUpdater(storage.GetFolder("dalamud"), storage.GetFolder("runtime"), storage.GetFolder("dalamudAssets"), storage.Root, null, null)
+        return new DalamudUpdater(storage.GetFolder("dalamud"), storage.GetFolder("runtime"), storage.GetFolder("dalamudAssets"), null, null)
         {
             Overlay = DalamudLoadInfo,
             RunnerOverride = runnerOverride
@@ -251,7 +250,7 @@ private static void Main(string[] args)
         // Manual or auto injection setup.
         DalamudLoadInfo = new DalamudOverlayInfoProxy();
         DalamudUpdater = CreateDalamudUpdater();
-        DalamudUpdater.Run();
+        DalamudUpdater.Run(Config.DalamudBetaKind, Config.DalamudBetaKind);
 
         CreateCompatToolsInstance();
 
@@ -317,17 +316,10 @@ private static void Main(string[] args)
         guiBindings.Dispose();
         commandList.Dispose();
         graphicsDevice.Dispose();
-
         HttpClient.Dispose();
-
         if (Patcher is not null)
         {
-            Patcher.CancelAllDownloads();
-            Task.Run(async () =>
-            {
-                await PatchManager.UnInitializeAcquisition().ConfigureAwait(false);
-                Environment.Exit(0);
-            });
+            Patcher.StartCancellation();
         }
     }
 
@@ -418,7 +410,7 @@ public static void ClearPlugins(bool tsbutton = false)
         {
             DalamudLoadInfo = new DalamudOverlayInfoProxy();
             DalamudUpdater = CreateDalamudUpdater();
-            DalamudUpdater.Run();
+            DalamudUpdater.Run(Config.DalamudBetaKind, Config.DalamudBetaKey);
         }
     }
 

src/XIVLauncher.Core/XIVLauncher.Core.csproj

@@ -68,10 +68,10 @@
         <PackageReference Include="Config.Net" Version="4.19.0" />
         <PackageReference Include="ImGui.NET" Version="1.87.2" />
         <PackageReference Include="KeySharp" Version="1.0.5" />
-        <PackageReference Include="Serilog" Version="2.12.0" />
-        <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
-        <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+        <PackageReference Include="Serilog" Version="4.3.0" />
+        <PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+        <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
         <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
         <PackageReference Include="Veldrid" Version="4.9.0" />
         <PackageReference Include="Veldrid.ImageSharp" Version="4.9.0" />
@@ -93,22 +93,26 @@
         <EmbeddedResource Include="Shaders/Metal/imgui-frag.metallib"
             LogicalName="imgui-frag.metallib" />
         <EmbeddedResource Update="Resources\Localization\Strings.resx">
-          <Generator>ResXFileCodeGenerator</Generator>
-          <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Strings.Designer.cs</LastGenOutput>
         </EmbeddedResource>
     </ItemGroup>
 
     <ItemGroup>
-        <EmbeddedResource Include="Resources/fonts/FontAwesome5FreeSolid.otf" LogicalName="FontAwesome5FreeSolid.otf" />
-        <EmbeddedResource Include="Resources/fonts/NotoSansCJKjp-Regular.otf" LogicalName="NotoSansCJKjp-Regular.otf" />
+        <EmbeddedResource Include="Resources/fonts/FontAwesome5FreeSolid.otf"
+            LogicalName="FontAwesome5FreeSolid.otf" />
+        <EmbeddedResource Include="Resources/fonts/NotoSansCJKjp-Regular.otf"
+            LogicalName="NotoSansCJKjp-Regular.otf" />
 
         <EmbeddedResource Include="Resources/logo.png" LogicalName="logo.png" />
 
         <EmbeddedResource Include="Resources/bg_logo.png" LogicalName="bg_logo.png" />
 
         <EmbeddedResource Include="Resources/steamdeck_fts.png" LogicalName="steamdeck_fts.png" />
-        <EmbeddedResource Include="Resources/steamdeck_fterror.png" LogicalName="steamdeck_fterror.png" />
-        <EmbeddedResource Include="Resources/steamdeck_switchprompt.png" LogicalName="steamdeck_switchprompt.png" />
+        <EmbeddedResource Include="Resources/steamdeck_fterror.png"
+            LogicalName="steamdeck_fterror.png" />
+        <EmbeddedResource Include="Resources/steamdeck_switchprompt.png"
+            LogicalName="steamdeck_switchprompt.png" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(RuntimeIdentifier)' == 'win10-x64'">
@@ -119,11 +123,11 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Compile Update="Resources\Localization\Strings.Designer.cs">
-        <DesignTime>True</DesignTime>
-        <AutoGen>True</AutoGen>
-        <DependentUpon>Strings.resx</DependentUpon>
-      </Compile>
+        <Compile Update="Resources\Localization\Strings.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Strings.resx</DependentUpon>
+        </Compile>
     </ItemGroup>
 
     <!-- Git -->
@@ -170,4 +174,4 @@
             AssemblyAttributes="@(AssemblyAttributes)" />
     </Target>
 
-</Project>
+</Project>