From cf8fc3d6bf29fba32135805272fd3ac99feffe3d Mon Sep 17 00:00:00 2001
From: lahm86 <33758420+lahm86@users.noreply.github.com>
Date: Mon, 24 Mar 2025 21:16:26 +0000
Subject: [PATCH] tools/installer: migrate TR1X installer
This migrates the TR1X installer to use the new common library.
---
justfile | 6 +-
tools/installer/TR1X_Installer/App.xaml | 4 +
tools/installer/TR1X_Installer/App.xaml.cs | 22 ++
.../Installers/CDRomInstallSource.cs | 11 +-
.../Installers/GOGInstallSource.cs | 26 +-
.../Installers/SteamInstallSource.cs | 3 +-
.../Installers/TR1XInstallSource.cs | 14 +-
.../Installers/TombATIInstallSource.cs | 9 +-
.../TR1X_Installer}/Resources/CDRom.png | Bin
.../TR1X_Installer}/Resources/GOG.png | Bin
.../TR1X_Installer/Resources/Lang/en.json | 12 +
.../TR1X_Installer}/Resources/Steam.png | Bin
.../TR1X_Installer}/Resources/TR1X.png | Bin
.../TR1X_Installer}/Resources/TombATI.png | Bin
.../TR1X_Installer/Resources/const.json | 4 +
.../TR1X_Installer}/Resources/icon.ico | Bin
.../TR1X_Installer}/Resources/release.zip | Bin
.../TR1X_Installer}/Resources/side1.jpg | Bin
.../TR1X_Installer}/Resources/side2.jpg | Bin
.../TR1X_Installer}/Resources/side3.jpg | Bin
.../TR1X_Installer}/Resources/side4.jpg | Bin
.../TR1X_Installer/TR1X_Installer.csproj | 56 +++++
tools/installer/TRX_InstallerLib.sln | 6 +
.../Controls/InstallStepControl.xaml.cs | 3 +-
.../TRX_InstallerLib/Models/InstallStep.cs | 1 -
.../TRX_InstallerLib/Models/Logger.cs | 2 +-
.../TRX_InstallerLib/TRX_InstallerLib.csproj | 16 +-
tools/tr1/docker/installer/entrypoint.sh | 4 +-
tools/tr1/installer/.gitignore | 3 -
tools/tr1/installer/Installer/App.xaml | 8 -
tools/tr1/installer/Installer/App.xaml.cs | 12 -
.../Installer/Controls/FinishStepControl.xaml | 34 ---
.../Controls/FinishStepControl.xaml.cs | 11 -
.../Controls/InstallSettingsStepControl.xaml | 153 -----------
.../InstallSettingsStepControl.xaml.cs | 11 -
.../Controls/InstallSourceControl.xaml | 65 -----
.../Controls/InstallSourceControl.xaml.cs | 11 -
.../Controls/InstallStepControl.xaml | 44 ----
.../Controls/InstallStepControl.xaml.cs | 41 ---
.../Installer/Controls/MainWindow.xaml | 96 -------
.../Installer/Controls/MainWindow.xaml.cs | 13 -
.../Installer/Controls/SourceStepControl.xaml | 65 -----
.../Controls/SourceStepControl.xaml.cs | 11 -
.../tr1/installer/Installer/Installer.csproj | 92 -------
.../Installer/Installers/BaseInstallSource.cs | 43 ----
.../Installer/Installers/IInstallSource.cs | 31 ---
.../Installer/Installers/InstallExecutor.cs | 106 --------
.../Installer/Installers/InstallProgress.cs | 9 -
.../Installer/Installers/InstallUtils.cs | 235 -----------------
.../Installer/Models/FinishSettings.cs | 33 ---
.../installer/Installer/Models/FinishStep.cs | 14 --
tools/tr1/installer/Installer/Models/IStep.cs | 10 -
.../Installer/Models/InstallSettings.cs | 139 ----------
.../Installer/Models/InstallSettingsStep.cs | 40 ---
.../Models/InstallSourceViewModel.cs | 66 -----
.../installer/Installer/Models/InstallStep.cs | 119 ---------
.../tr1/installer/Installer/Models/Logger.cs | 23 --
.../Installer/Models/MainWindowViewModel.cs | 167 ------------
.../installer/Installer/Models/SourceStep.cs | 70 ------
.../installer/Installer/Models/UBPackType.cs | 7 -
.../installer/Installer/Resources/Styles.xaml | 31 ---
.../Installer/Resources/side4.old.jpg | Bin 51427 -> 0 bytes
.../Utils/BaseNotifyPropertyChanged.cs | 14 --
.../Installer/Utils/BinaryReaderExtensions.cs | 30 ---
.../Utils/BoolToVisibilityConverter.cs | 29 ---
.../Installer/Utils/ComparisonConverter.cs | 18 --
.../Utils/ConditionalMarkupConverter.cs | 27 --
.../tr1/installer/Installer/Utils/CueFile.cs | 92 -------
.../tr1/installer/Installer/Utils/CueTrack.cs | 232 -----------------
.../installer/Installer/Utils/FileBrowser.cs | 21 --
.../Installer/Utils/HttpProgressClient.cs | 52 ----
.../installer/Installer/Utils/RelayCommand.cs | 102 --------
.../Installer/Utils/ShortcutUtils.cs | 237 ------------------
tools/tr1/installer/TR1X_Installer.sln | 25 --
74 files changed, 147 insertions(+), 2744 deletions(-)
create mode 100644 tools/installer/TR1X_Installer/App.xaml
create mode 100644 tools/installer/TR1X_Installer/App.xaml.cs
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Installers/CDRomInstallSource.cs (87%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Installers/GOGInstallSource.cs (81%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Installers/SteamInstallSource.cs (91%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Installers/TR1XInstallSource.cs (83%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Installers/TombATIInstallSource.cs (89%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Resources/CDRom.png (100%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Resources/GOG.png (100%)
create mode 100644 tools/installer/TR1X_Installer/Resources/Lang/en.json
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Resources/Steam.png (100%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Resources/TR1X.png (100%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Resources/TombATI.png (100%)
create mode 100644 tools/installer/TR1X_Installer/Resources/const.json
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Resources/icon.ico (100%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Resources/release.zip (100%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Resources/side1.jpg (100%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Resources/side2.jpg (100%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Resources/side3.jpg (100%)
rename tools/{tr1/installer/Installer => installer/TR1X_Installer}/Resources/side4.jpg (100%)
create mode 100644 tools/installer/TR1X_Installer/TR1X_Installer.csproj
delete mode 100644 tools/tr1/installer/.gitignore
delete mode 100644 tools/tr1/installer/Installer/App.xaml
delete mode 100644 tools/tr1/installer/Installer/App.xaml.cs
delete mode 100644 tools/tr1/installer/Installer/Controls/FinishStepControl.xaml
delete mode 100644 tools/tr1/installer/Installer/Controls/FinishStepControl.xaml.cs
delete mode 100644 tools/tr1/installer/Installer/Controls/InstallSettingsStepControl.xaml
delete mode 100644 tools/tr1/installer/Installer/Controls/InstallSettingsStepControl.xaml.cs
delete mode 100644 tools/tr1/installer/Installer/Controls/InstallSourceControl.xaml
delete mode 100644 tools/tr1/installer/Installer/Controls/InstallSourceControl.xaml.cs
delete mode 100644 tools/tr1/installer/Installer/Controls/InstallStepControl.xaml
delete mode 100644 tools/tr1/installer/Installer/Controls/InstallStepControl.xaml.cs
delete mode 100644 tools/tr1/installer/Installer/Controls/MainWindow.xaml
delete mode 100644 tools/tr1/installer/Installer/Controls/MainWindow.xaml.cs
delete mode 100644 tools/tr1/installer/Installer/Controls/SourceStepControl.xaml
delete mode 100644 tools/tr1/installer/Installer/Controls/SourceStepControl.xaml.cs
delete mode 100644 tools/tr1/installer/Installer/Installer.csproj
delete mode 100644 tools/tr1/installer/Installer/Installers/BaseInstallSource.cs
delete mode 100644 tools/tr1/installer/Installer/Installers/IInstallSource.cs
delete mode 100644 tools/tr1/installer/Installer/Installers/InstallExecutor.cs
delete mode 100644 tools/tr1/installer/Installer/Installers/InstallProgress.cs
delete mode 100644 tools/tr1/installer/Installer/Installers/InstallUtils.cs
delete mode 100644 tools/tr1/installer/Installer/Models/FinishSettings.cs
delete mode 100644 tools/tr1/installer/Installer/Models/FinishStep.cs
delete mode 100644 tools/tr1/installer/Installer/Models/IStep.cs
delete mode 100644 tools/tr1/installer/Installer/Models/InstallSettings.cs
delete mode 100644 tools/tr1/installer/Installer/Models/InstallSettingsStep.cs
delete mode 100644 tools/tr1/installer/Installer/Models/InstallSourceViewModel.cs
delete mode 100644 tools/tr1/installer/Installer/Models/InstallStep.cs
delete mode 100644 tools/tr1/installer/Installer/Models/Logger.cs
delete mode 100644 tools/tr1/installer/Installer/Models/MainWindowViewModel.cs
delete mode 100644 tools/tr1/installer/Installer/Models/SourceStep.cs
delete mode 100644 tools/tr1/installer/Installer/Models/UBPackType.cs
delete mode 100644 tools/tr1/installer/Installer/Resources/Styles.xaml
delete mode 100644 tools/tr1/installer/Installer/Resources/side4.old.jpg
delete mode 100644 tools/tr1/installer/Installer/Utils/BaseNotifyPropertyChanged.cs
delete mode 100644 tools/tr1/installer/Installer/Utils/BinaryReaderExtensions.cs
delete mode 100644 tools/tr1/installer/Installer/Utils/BoolToVisibilityConverter.cs
delete mode 100644 tools/tr1/installer/Installer/Utils/ComparisonConverter.cs
delete mode 100644 tools/tr1/installer/Installer/Utils/ConditionalMarkupConverter.cs
delete mode 100644 tools/tr1/installer/Installer/Utils/CueFile.cs
delete mode 100644 tools/tr1/installer/Installer/Utils/CueTrack.cs
delete mode 100644 tools/tr1/installer/Installer/Utils/FileBrowser.cs
delete mode 100644 tools/tr1/installer/Installer/Utils/HttpProgressClient.cs
delete mode 100644 tools/tr1/installer/Installer/Utils/RelayCommand.cs
delete mode 100644 tools/tr1/installer/Installer/Utils/ShortcutUtils.cs
delete mode 100644 tools/tr1/installer/TR1X_Installer.sln
diff --git a/justfile b/justfile
index 485fc5b7f..20f2a5bf8 100644
--- a/justfile
+++ b/justfile
@@ -55,11 +55,11 @@ tr1-build-win-installer: (tr1-image-win-installer "0") (_docker_run "r
tr1-package-linux target='release': (tr1-build-linux target) (_docker_run "rrdash/tr1x-linux" "package")
tr1-package-win target='release': (tr1-build-win target) (_docker_run "rrdash/tr1x" "package")
tr1-package-win-all target='release': (tr1-build-win target) (tr1-build-win-config) (_docker_run "rrdash/tr1x" "package")
-tr1-package-win-installer target='release': (tr1-build-win target) (tr1-build-win-config) (_docker_run "rrdash/tr1x" "package" "-o" "tools/tr1/installer/Installer/Resources/release.zip") (tr1-build-win-installer)
+tr1-package-win-installer target='release': (tr1-build-win target) (tr1-build-win-config) (_docker_run "rrdash/tr1x" "package" "-o" "tools/installer/TR1X_Installer/Resources/release.zip") (tr1-build-win-installer)
#!/bin/sh
- git checkout "tools/tr1/installer/Installer/Resources/release.zip"
+ git checkout "tools/installer/TR1X_Installer/Resources/release.zip"
exe_name=TR1X-$(tools/get_version 1)-Installer.exe
- cp tools/tr1/installer/out/TR1X_Installer.exe "${exe_name}"
+ cp tools/installer/out/TR1X_Installer.exe "${exe_name}"
echo "Created ${exe_name}"
tr2-image-linux force="1": (_docker_build "tools/tr2/docker/game-linux/Dockerfile" "rrdash/tr2x-linux" force)
diff --git a/tools/installer/TR1X_Installer/App.xaml b/tools/installer/TR1X_Installer/App.xaml
new file mode 100644
index 000000000..ebf518429
--- /dev/null
+++ b/tools/installer/TR1X_Installer/App.xaml
@@ -0,0 +1,4 @@
+
diff --git a/tools/installer/TR1X_Installer/App.xaml.cs b/tools/installer/TR1X_Installer/App.xaml.cs
new file mode 100644
index 000000000..05615d2ef
--- /dev/null
+++ b/tools/installer/TR1X_Installer/App.xaml.cs
@@ -0,0 +1,22 @@
+using System.Windows;
+using TR1X_Installer.Installers;
+using TRX_InstallerLib.Controls;
+using TRX_InstallerLib.Installers;
+
+namespace TR1X_Installer;
+
+public partial class App : Application
+{
+ public App()
+ {
+ Current.MainWindow = new TRXInstallWindow(new List
+ {
+ new SteamInstallSource(),
+ new GOGInstallSource(),
+ new TombATIInstallSource(),
+ new CDRomInstallSource(),
+ new TR1XInstallSource(),
+ });
+ Current.MainWindow.Show();
+ }
+}
diff --git a/tools/tr1/installer/Installer/Installers/CDRomInstallSource.cs b/tools/installer/TR1X_Installer/Installers/CDRomInstallSource.cs
similarity index 87%
rename from tools/tr1/installer/Installer/Installers/CDRomInstallSource.cs
rename to tools/installer/TR1X_Installer/Installers/CDRomInstallSource.cs
index 9080bdfcc..9d94d9e8b 100644
--- a/tools/tr1/installer/Installer/Installers/CDRomInstallSource.cs
+++ b/tools/installer/TR1X_Installer/Installers/CDRomInstallSource.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using TRX_InstallerLib.Installers;
+using TRX_InstallerLib.Utils;
-namespace Installer.Installers;
+namespace TR1X_Installer.Installers;
public class CDRomInstallSource : BaseInstallSource
{
@@ -47,7 +46,7 @@ public class CDRomInstallSource : BaseInstallSource
return true;
}
- public override bool IsDownloadingUnfinishedBusinessNeeded(string sourceDirectory)
+ public override bool IsDownloadingExpansionNeeded(string sourceDirectory)
{
return true;
}
diff --git a/tools/tr1/installer/Installer/Installers/GOGInstallSource.cs b/tools/installer/TR1X_Installer/Installers/GOGInstallSource.cs
similarity index 81%
rename from tools/tr1/installer/Installer/Installers/GOGInstallSource.cs
rename to tools/installer/TR1X_Installer/Installers/GOGInstallSource.cs
index 7c0f5dd5f..e56b2ca10 100644
--- a/tools/tr1/installer/Installer/Installers/GOGInstallSource.cs
+++ b/tools/installer/TR1X_Installer/Installers/GOGInstallSource.cs
@@ -1,15 +1,13 @@
using DiscUtils.Iso9660;
using DiscUtils.Streams;
-using Installer.Utils;
using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
using System.IO;
-using System.Linq;
using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using TRX_InstallerLib.Installers;
+using TRX_InstallerLib.Models;
+using TRX_InstallerLib.Utils;
-namespace Installer.Installers;
+namespace TR1X_Installer.Installers;
public class GOGInstallSource : BaseInstallSource
{
@@ -50,7 +48,7 @@ public class GOGInstallSource : BaseInstallSource
}
catch (Exception e)
{
- throw new ApplicationException($"Could not read CUE {cuePath}:\n{e.Message}");
+ throw new ApplicationException(string.Format(Language.Instance.Controls!["progress_cue_failure"], cuePath, e.Message));
}
try
@@ -60,7 +58,7 @@ public class GOGInstallSource : BaseInstallSource
}
catch (Exception e)
{
- throw new ApplicationException($"Could not convert BIN to ISO: {e.Message}");
+ throw new ApplicationException(string.Format(Language.Instance.Controls!["progress_converting_bin_failure"], e.Message));
}
try
@@ -73,14 +71,14 @@ public class GOGInstallSource : BaseInstallSource
{
MaximumValue = 1,
CurrentValue = 0,
- Description = "Scanning the source directory",
+ Description = Language.Instance.Controls!["progress_scanning_source"],
});
var filesToExtract = GetFilesToExtract(reader.Root);
progress.Report(new InstallProgress
{
MaximumValue = filesToExtract.Count(),
CurrentValue = 0,
- Description = "Preparing to extract the ISO",
+ Description = Language.Instance.Controls!["progress_preparing_extract"],
});
foreach (var path in filesToExtract)
{
@@ -90,7 +88,7 @@ public class GOGInstallSource : BaseInstallSource
Directory.CreateDirectory(Path.GetDirectoryName(targetPath)!);
using SparseStream sourceStream = reader.OpenFile(path, FileMode.Open, FileAccess.Read);
- var readAllByte = new Byte[sourceStream.Length];
+ var readAllByte = new byte[sourceStream.Length];
sourceStream.Read(readAllByte, 0, readAllByte.Length);
using FileStream targetStream = new(targetPath, FileMode.Create);
@@ -102,13 +100,13 @@ public class GOGInstallSource : BaseInstallSource
{
MaximumValue = filesToExtract.Count(),
CurrentValue = ++currentProgress,
- Description = $"Extracting {path}",
+ Description = string.Format(Language.Instance.Controls!["progress_extracting"], path)
});
}
}
catch (Exception e)
{
- throw new ApplicationException($"Could not open converted ISO: {e.Message}");
+ throw new ApplicationException(string.Format(Language.Instance.Controls!["progress_converting_iso_failure"], e.Message));
}
File.Delete(isoPath);
@@ -121,7 +119,7 @@ public class GOGInstallSource : BaseInstallSource
return true;
}
- public override bool IsDownloadingUnfinishedBusinessNeeded(string sourceDirectory)
+ public override bool IsDownloadingExpansionNeeded(string sourceDirectory)
{
return true;
}
diff --git a/tools/tr1/installer/Installer/Installers/SteamInstallSource.cs b/tools/installer/TR1X_Installer/Installers/SteamInstallSource.cs
similarity index 91%
rename from tools/tr1/installer/Installer/Installers/SteamInstallSource.cs
rename to tools/installer/TR1X_Installer/Installers/SteamInstallSource.cs
index b2c8017ba..03a12edbe 100644
--- a/tools/tr1/installer/Installer/Installers/SteamInstallSource.cs
+++ b/tools/installer/TR1X_Installer/Installers/SteamInstallSource.cs
@@ -1,8 +1,7 @@
using Microsoft.Win32;
-using System.Collections.Generic;
using System.IO;
-namespace Installer.Installers;
+namespace TR1X_Installer.Installers;
public class SteamInstallSource : GOGInstallSource
{
diff --git a/tools/tr1/installer/Installer/Installers/TR1XInstallSource.cs b/tools/installer/TR1X_Installer/Installers/TR1XInstallSource.cs
similarity index 83%
rename from tools/tr1/installer/Installer/Installers/TR1XInstallSource.cs
rename to tools/installer/TR1X_Installer/Installers/TR1XInstallSource.cs
index c91d38945..2ea7f6d94 100644
--- a/tools/tr1/installer/Installer/Installers/TR1XInstallSource.cs
+++ b/tools/installer/TR1X_Installer/Installers/TR1XInstallSource.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
using System.IO;
using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using TRX_InstallerLib.Installers;
+using TRX_InstallerLib.Utils;
-namespace Installer.Installers;
+namespace TR1X_Installer.Installers;
public class TR1XInstallSource : BaseInstallSource
{
@@ -27,10 +26,7 @@ public class TR1XInstallSource : BaseInstallSource
public override string SuggestedInstallationDirectory
{
- get
- {
- return InstallUtils.GetPreviousInstallationPath() ?? base.SuggestedInstallationDirectory;
- }
+ get => InstallUtils.GetPreviousInstallationPath() ?? base.SuggestedInstallationDirectory;
}
public override bool IsImportingSavesSupported => true;
@@ -57,7 +53,7 @@ public class TR1XInstallSource : BaseInstallSource
return !Directory.Exists(Path.Combine(sourceDirectory, "music"));
}
- public override bool IsDownloadingUnfinishedBusinessNeeded(string sourceDirectory)
+ public override bool IsDownloadingExpansionNeeded(string sourceDirectory)
{
return !File.Exists(Path.Combine(sourceDirectory, "data", "cat.phd"));
}
diff --git a/tools/tr1/installer/Installer/Installers/TombATIInstallSource.cs b/tools/installer/TR1X_Installer/Installers/TombATIInstallSource.cs
similarity index 89%
rename from tools/tr1/installer/Installer/Installers/TombATIInstallSource.cs
rename to tools/installer/TR1X_Installer/Installers/TombATIInstallSource.cs
index f668465bb..7d1cc8335 100644
--- a/tools/tr1/installer/Installer/Installers/TombATIInstallSource.cs
+++ b/tools/installer/TR1X_Installer/Installers/TombATIInstallSource.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
using System.IO;
using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using TRX_InstallerLib.Installers;
+using TRX_InstallerLib.Utils;
-namespace Installer.Installers;
+namespace TR1X_Installer.Installers;
public class TombATIInstallSource : BaseInstallSource
{
@@ -48,7 +47,7 @@ public class TombATIInstallSource : BaseInstallSource
return !Directory.Exists(Path.Combine(sourceDirectory, "music"));
}
- public override bool IsDownloadingUnfinishedBusinessNeeded(string sourceDirectory)
+ public override bool IsDownloadingExpansionNeeded(string sourceDirectory)
{
return !File.Exists(Path.Combine(sourceDirectory, "data", "cat.phd"));
}
diff --git a/tools/tr1/installer/Installer/Resources/CDRom.png b/tools/installer/TR1X_Installer/Resources/CDRom.png
similarity index 100%
rename from tools/tr1/installer/Installer/Resources/CDRom.png
rename to tools/installer/TR1X_Installer/Resources/CDRom.png
diff --git a/tools/tr1/installer/Installer/Resources/GOG.png b/tools/installer/TR1X_Installer/Resources/GOG.png
similarity index 100%
rename from tools/tr1/installer/Installer/Resources/GOG.png
rename to tools/installer/TR1X_Installer/Resources/GOG.png
diff --git a/tools/installer/TR1X_Installer/Resources/Lang/en.json b/tools/installer/TR1X_Installer/Resources/Lang/en.json
new file mode 100644
index 000000000..5eec7f72f
--- /dev/null
+++ b/tools/installer/TR1X_Installer/Resources/Lang/en.json
@@ -0,0 +1,12 @@
+{
+ "Controls": {
+ "window_title_main": "TR1X Installer",
+ "step_source_content": "TR1X requires original game files to run.\nPlease choose the source location where to install the data files from.\nIf you're upgrading an existing installation, please choose TR1X.",
+ "step_settings_music_content": "Neither the Steam nor GOG versions of the game ship with the full soundtrack found on the PlayStation or Saturn retail releases. This option lets you download the missing tracks automatically (164 MB). The legality of these files is disputable; the most legal way to import the music to PC is to rip the audio tracks yourself from a physical PlayStation or Saturn disc.",
+ "step_settings_expansion_heading": "Download Unfinished Business expansion pack",
+ "step_settings_expansion_content": "The Unfinished Business expansion pack was made freeware. However, the Steam and GOG versions do not ship it. This option lets you download the expansion files automatically (6 MB).",
+ "step_settings_expansion_music": "Fan-made edition (includes music triggers)",
+ "step_settings_expansion_vanilla": "Original edition (does not include music triggers)",
+ "step_settings_saves_content": "Imports existing savegame files. Only TombATI and TR1X savegame format is supported at this time."
+ }
+}
diff --git a/tools/tr1/installer/Installer/Resources/Steam.png b/tools/installer/TR1X_Installer/Resources/Steam.png
similarity index 100%
rename from tools/tr1/installer/Installer/Resources/Steam.png
rename to tools/installer/TR1X_Installer/Resources/Steam.png
diff --git a/tools/tr1/installer/Installer/Resources/TR1X.png b/tools/installer/TR1X_Installer/Resources/TR1X.png
similarity index 100%
rename from tools/tr1/installer/Installer/Resources/TR1X.png
rename to tools/installer/TR1X_Installer/Resources/TR1X.png
diff --git a/tools/tr1/installer/Installer/Resources/TombATI.png b/tools/installer/TR1X_Installer/Resources/TombATI.png
similarity index 100%
rename from tools/tr1/installer/Installer/Resources/TombATI.png
rename to tools/installer/TR1X_Installer/Resources/TombATI.png
diff --git a/tools/installer/TR1X_Installer/Resources/const.json b/tools/installer/TR1X_Installer/Resources/const.json
new file mode 100644
index 000000000..65b48f7f1
--- /dev/null
+++ b/tools/installer/TR1X_Installer/Resources/const.json
@@ -0,0 +1,4 @@
+{
+ "Game": "TR1X",
+ "AllowExpansionTypeSelection": true
+}
diff --git a/tools/tr1/installer/Installer/Resources/icon.ico b/tools/installer/TR1X_Installer/Resources/icon.ico
similarity index 100%
rename from tools/tr1/installer/Installer/Resources/icon.ico
rename to tools/installer/TR1X_Installer/Resources/icon.ico
diff --git a/tools/tr1/installer/Installer/Resources/release.zip b/tools/installer/TR1X_Installer/Resources/release.zip
similarity index 100%
rename from tools/tr1/installer/Installer/Resources/release.zip
rename to tools/installer/TR1X_Installer/Resources/release.zip
diff --git a/tools/tr1/installer/Installer/Resources/side1.jpg b/tools/installer/TR1X_Installer/Resources/side1.jpg
similarity index 100%
rename from tools/tr1/installer/Installer/Resources/side1.jpg
rename to tools/installer/TR1X_Installer/Resources/side1.jpg
diff --git a/tools/tr1/installer/Installer/Resources/side2.jpg b/tools/installer/TR1X_Installer/Resources/side2.jpg
similarity index 100%
rename from tools/tr1/installer/Installer/Resources/side2.jpg
rename to tools/installer/TR1X_Installer/Resources/side2.jpg
diff --git a/tools/tr1/installer/Installer/Resources/side3.jpg b/tools/installer/TR1X_Installer/Resources/side3.jpg
similarity index 100%
rename from tools/tr1/installer/Installer/Resources/side3.jpg
rename to tools/installer/TR1X_Installer/Resources/side3.jpg
diff --git a/tools/tr1/installer/Installer/Resources/side4.jpg b/tools/installer/TR1X_Installer/Resources/side4.jpg
similarity index 100%
rename from tools/tr1/installer/Installer/Resources/side4.jpg
rename to tools/installer/TR1X_Installer/Resources/side4.jpg
diff --git a/tools/installer/TR1X_Installer/TR1X_Installer.csproj b/tools/installer/TR1X_Installer/TR1X_Installer.csproj
new file mode 100644
index 000000000..cb8b6781e
--- /dev/null
+++ b/tools/installer/TR1X_Installer/TR1X_Installer.csproj
@@ -0,0 +1,56 @@
+
+
+ WinExe
+ net6.0-windows
+ enable
+ enable
+ true
+ false
+
+ true
+ TR1X_Installer
+ True
+ true
+ true
+ false
+ true
+ false
+ false
+ win-x64
+ Resources\icon.ico
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tools/installer/TRX_InstallerLib.sln b/tools/installer/TRX_InstallerLib.sln
index 087f2e568..c48ed6325 100644
--- a/tools/installer/TRX_InstallerLib.sln
+++ b/tools/installer/TRX_InstallerLib.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.11.35219.272
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TRX_InstallerLib", "TRX_InstallerLib\TRX_InstallerLib.csproj", "{27F08E8C-2910-4682-B8BC-96ED4C1ECE54}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TR1X_Installer", "TR1X_Installer\TR1X_Installer.csproj", "{5B32640D-3997-472F-A1BA-FCE4128E0688}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
{27F08E8C-2910-4682-B8BC-96ED4C1ECE54}.Debug|Any CPU.Build.0 = Debug|Any CPU
{27F08E8C-2910-4682-B8BC-96ED4C1ECE54}.Release|Any CPU.ActiveCfg = Release|Any CPU
{27F08E8C-2910-4682-B8BC-96ED4C1ECE54}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5B32640D-3997-472F-A1BA-FCE4128E0688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5B32640D-3997-472F-A1BA-FCE4128E0688}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5B32640D-3997-472F-A1BA-FCE4128E0688}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5B32640D-3997-472F-A1BA-FCE4128E0688}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/tools/installer/TRX_InstallerLib/Controls/InstallStepControl.xaml.cs b/tools/installer/TRX_InstallerLib/Controls/InstallStepControl.xaml.cs
index 1dca0228e..55cd53812 100644
--- a/tools/installer/TRX_InstallerLib/Controls/InstallStepControl.xaml.cs
+++ b/tools/installer/TRX_InstallerLib/Controls/InstallStepControl.xaml.cs
@@ -1,5 +1,4 @@
-using Installer.Models;
-using System.Windows;
+using System.Windows;
using TRX_InstallerLib.Models;
using WC = System.Windows.Controls;
diff --git a/tools/installer/TRX_InstallerLib/Models/InstallStep.cs b/tools/installer/TRX_InstallerLib/Models/InstallStep.cs
index 3ebadfbca..175fa1b60 100644
--- a/tools/installer/TRX_InstallerLib/Models/InstallStep.cs
+++ b/tools/installer/TRX_InstallerLib/Models/InstallStep.cs
@@ -1,4 +1,3 @@
-using Installer.Models;
using TRX_InstallerLib.Installers;
using TRX_InstallerLib.Utils;
diff --git a/tools/installer/TRX_InstallerLib/Models/Logger.cs b/tools/installer/TRX_InstallerLib/Models/Logger.cs
index 0c25c9318..3a3a7b622 100644
--- a/tools/installer/TRX_InstallerLib/Models/Logger.cs
+++ b/tools/installer/TRX_InstallerLib/Models/Logger.cs
@@ -1,4 +1,4 @@
-namespace Installer.Models;
+namespace TRX_InstallerLib.Models;
public class LogEventArgs
{
diff --git a/tools/installer/TRX_InstallerLib/TRX_InstallerLib.csproj b/tools/installer/TRX_InstallerLib/TRX_InstallerLib.csproj
index 238366c20..478161f7d 100644
--- a/tools/installer/TRX_InstallerLib/TRX_InstallerLib.csproj
+++ b/tools/installer/TRX_InstallerLib/TRX_InstallerLib.csproj
@@ -6,21 +6,23 @@
true
enable
false
+ true
+
+
+
+
+
-
-
-
-
-
-
-
+
MSBuild:Compile
+
+
diff --git a/tools/tr1/docker/installer/entrypoint.sh b/tools/tr1/docker/installer/entrypoint.sh
index fdd1be54f..45126b19f 100755
--- a/tools/tr1/docker/installer/entrypoint.sh
+++ b/tools/tr1/docker/installer/entrypoint.sh
@@ -2,11 +2,11 @@
set -x
set -e
-cd /app/tools/tr1/installer/
+cd /app/tools/installer/
export DOTNET_CLI_HOME="/tmp/DOTNET_CLI_HOME"
shopt -s globstar
rm -rf **/bin **/obj **/out/*
dotnet restore
-dotnet publish -c Release -o out
+dotnet publish TR1X_Installer -c Release -o out
diff --git a/tools/tr1/installer/.gitignore b/tools/tr1/installer/.gitignore
deleted file mode 100644
index e76c073eb..000000000
--- a/tools/tr1/installer/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/
-obj/
-out/
diff --git a/tools/tr1/installer/Installer/App.xaml b/tools/tr1/installer/Installer/App.xaml
deleted file mode 100644
index 72af0457e..000000000
--- a/tools/tr1/installer/Installer/App.xaml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
diff --git a/tools/tr1/installer/Installer/App.xaml.cs b/tools/tr1/installer/Installer/App.xaml.cs
deleted file mode 100644
index 88e5206ff..000000000
--- a/tools/tr1/installer/Installer/App.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Windows;
-
-namespace Installer
-{
- public partial class App : Application
- {
- public App()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/tools/tr1/installer/Installer/Controls/FinishStepControl.xaml b/tools/tr1/installer/Installer/Controls/FinishStepControl.xaml
deleted file mode 100644
index ca8905a79..000000000
--- a/tools/tr1/installer/Installer/Controls/FinishStepControl.xaml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- Step 4: Done
-
-
-
- Installation complete. To configure more advanced features, you can edit the JSON files in the cfg/ directory with a text editor.
-
-
-
- Happy raiding :)
-
-
-
-
-
-
diff --git a/tools/tr1/installer/Installer/Controls/FinishStepControl.xaml.cs b/tools/tr1/installer/Installer/Controls/FinishStepControl.xaml.cs
deleted file mode 100644
index 4e49298de..000000000
--- a/tools/tr1/installer/Installer/Controls/FinishStepControl.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Windows.Controls;
-
-namespace Installer.Controls;
-
-public partial class FinishStepControl : UserControl
-{
- public FinishStepControl()
- {
- InitializeComponent();
- }
-}
diff --git a/tools/tr1/installer/Installer/Controls/InstallSettingsStepControl.xaml b/tools/tr1/installer/Installer/Controls/InstallSettingsStepControl.xaml
deleted file mode 100644
index 55d1bc9af..000000000
--- a/tools/tr1/installer/Installer/Controls/InstallSettingsStepControl.xaml
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Step 2: Installation options
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Download music tracks
-
-
-
- Neither the Steam nor GOG versions of the game ship with the
- full soundtrack found on the PlayStation or Saturn retail
- releases. This option lets you download the missing tracks
- automatically (164 MB). The legality of these files is
- disputable; the most legal way to import the music to PC is to
- rip the audio tracks yourself from a physical PlayStation or
- Saturn disc.
-
-
-
-
-
-
-
-
-
-
- Download Unfinished Business expansion pack
-
-
-
- The Unfinished Business expansion pack was made freeware. However, the Steam and GOG versions do not ship it. This option lets you download the expansion files automatically (6 MB).
-
-
-
-
-
-
-
-
-
- Import saves
-
-
- Imports existing savegame files. Only TombATI and TR1X savegame format is supported at this time.
-
-
-
-
-
- Create desktop shortcut
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/tr1/installer/Installer/Controls/InstallSettingsStepControl.xaml.cs b/tools/tr1/installer/Installer/Controls/InstallSettingsStepControl.xaml.cs
deleted file mode 100644
index e5e8e90d6..000000000
--- a/tools/tr1/installer/Installer/Controls/InstallSettingsStepControl.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Windows.Controls;
-
-namespace Installer.Controls;
-
-public partial class InstallSettingsStepControl : UserControl
-{
- public InstallSettingsStepControl()
- {
- InitializeComponent();
- }
-}
diff --git a/tools/tr1/installer/Installer/Controls/InstallSourceControl.xaml b/tools/tr1/installer/Installer/Controls/InstallSourceControl.xaml
deleted file mode 100644
index 05dd8a5f0..000000000
--- a/tools/tr1/installer/Installer/Controls/InstallSourceControl.xaml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- (change)
-
-
-
-
diff --git a/tools/tr1/installer/Installer/Controls/InstallSourceControl.xaml.cs b/tools/tr1/installer/Installer/Controls/InstallSourceControl.xaml.cs
deleted file mode 100644
index 368f9e18c..000000000
--- a/tools/tr1/installer/Installer/Controls/InstallSourceControl.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Windows.Controls;
-
-namespace Installer.Controls;
-
-public partial class InstallSourceControl : UserControl
-{
- public InstallSourceControl()
- {
- InitializeComponent();
- }
-}
diff --git a/tools/tr1/installer/Installer/Controls/InstallStepControl.xaml b/tools/tr1/installer/Installer/Controls/InstallStepControl.xaml
deleted file mode 100644
index d7f95f304..000000000
--- a/tools/tr1/installer/Installer/Controls/InstallStepControl.xaml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Step 3: Installing
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/tr1/installer/Installer/Controls/InstallStepControl.xaml.cs b/tools/tr1/installer/Installer/Controls/InstallStepControl.xaml.cs
deleted file mode 100644
index 4394d278f..000000000
--- a/tools/tr1/installer/Installer/Controls/InstallStepControl.xaml.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Installer.Models;
-using System;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Installer.Controls;
-
-public partial class InstallStepControl : UserControl
-{
- public InstallStepControl()
- {
- InitializeComponent();
- DataContextChanged += (object sender, DependencyPropertyChangedEventArgs e) =>
- {
- var dataContext = DataContext as InstallStep;
- if (dataContext is not null)
- {
- string? lastMessage = null;
- dataContext.Logger.LogEvent += (object sender, LogEventArgs e) =>
- {
- if (e.Message != lastMessage)
- {
- lastMessage = e.Message;
- AppendMessage(e.Message);
- }
- };
- }
- };
- }
-
- private void AppendMessage(string message)
- {
- logTextBox.Dispatcher.Invoke(() =>
- {
- logTextBox.AppendText(message + Environment.NewLine);
- logTextBox.Focus();
- logTextBox.CaretIndex = logTextBox.Text.Length;
- logTextBox.ScrollToEnd();
- });
- }
-}
diff --git a/tools/tr1/installer/Installer/Controls/MainWindow.xaml b/tools/tr1/installer/Installer/Controls/MainWindow.xaml
deleted file mode 100644
index e88531475..000000000
--- a/tools/tr1/installer/Installer/Controls/MainWindow.xaml
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/tr1/installer/Installer/Controls/MainWindow.xaml.cs b/tools/tr1/installer/Installer/Controls/MainWindow.xaml.cs
deleted file mode 100644
index 7f7e94437..000000000
--- a/tools/tr1/installer/Installer/Controls/MainWindow.xaml.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Installer.Models;
-using System.Windows;
-
-namespace Installer;
-
-public partial class MainWindow : Window
-{
- public MainWindow()
- {
- InitializeComponent();
- DataContext = new MainWindowViewModel();
- }
-}
diff --git a/tools/tr1/installer/Installer/Controls/SourceStepControl.xaml b/tools/tr1/installer/Installer/Controls/SourceStepControl.xaml
deleted file mode 100644
index 5870cd50b..000000000
--- a/tools/tr1/installer/Installer/Controls/SourceStepControl.xaml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Step 1: Choose installation source
-
-
-
- TR1X requires original game files to run.
-
- Please choose the source location where to install the data files from.
-
- If you're upgrading an existing installation, please choose TR1X.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/tr1/installer/Installer/Controls/SourceStepControl.xaml.cs b/tools/tr1/installer/Installer/Controls/SourceStepControl.xaml.cs
deleted file mode 100644
index 5c6de8758..000000000
--- a/tools/tr1/installer/Installer/Controls/SourceStepControl.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Windows.Controls;
-
-namespace Installer.Controls;
-
-public partial class SourceStepControl : UserControl
-{
- public SourceStepControl()
- {
- InitializeComponent();
- }
-}
diff --git a/tools/tr1/installer/Installer/Installer.csproj b/tools/tr1/installer/Installer/Installer.csproj
deleted file mode 100644
index e83bd6332..000000000
--- a/tools/tr1/installer/Installer/Installer.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
- WinExe
- net6.0-windows
- enable
- true
- true
-
- true
- TR1X_Installer
- 10.0
- false
- false
-
- true
- true
- false
- true
- false
- false
- win-x64
- Resources\icon.ico
-
-
-
-
-
- Designer
-
-
- %(Filename)
- Code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- MSBuild:Compile
-
-
-
-
-
-
-
-
-
diff --git a/tools/tr1/installer/Installer/Installers/BaseInstallSource.cs b/tools/tr1/installer/Installer/Installers/BaseInstallSource.cs
deleted file mode 100644
index 73f63b50b..000000000
--- a/tools/tr1/installer/Installer/Installers/BaseInstallSource.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace Installer.Installers;
-
-public abstract class BaseInstallSource : IInstallSource
-{
- public abstract IEnumerable DirectoriesToTry { get; }
-
- public virtual string ImageSource
- {
- get
- {
- return $"pack://application:,,,/TR1X_Installer;component/Resources/{SourceName}.png";
- }
- }
-
- public abstract bool IsImportingSavesSupported { get; }
- public abstract string SourceName { get; }
-
- public virtual string SuggestedInstallationDirectory
- {
- get
- {
- return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "TR1X");
- }
- }
-
- public abstract Task CopyOriginalGameFiles(
- string sourceDirectory,
- string targetDirectory,
- IProgress progress,
- bool importSaves
- );
-
- public abstract bool IsDownloadingMusicNeeded(string sourceDirectory);
-
- public abstract bool IsDownloadingUnfinishedBusinessNeeded(string sourceDirectory);
-
- public abstract bool IsGameFound(string sourceDirectory);
-}
diff --git a/tools/tr1/installer/Installer/Installers/IInstallSource.cs b/tools/tr1/installer/Installer/Installers/IInstallSource.cs
deleted file mode 100644
index a40afaea4..000000000
--- a/tools/tr1/installer/Installer/Installers/IInstallSource.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Installer.Installers;
-
-public interface IInstallSource
-{
- public IEnumerable DirectoriesToTry { get; }
-
- public string ImageSource { get; }
-
- public string SourceName { get; }
-
- public string SuggestedInstallationDirectory { get; }
-
- public Task CopyOriginalGameFiles(
- string sourceDirectory,
- string targetDirectory,
- IProgress progress,
- bool importSaves
- );
-
- bool IsDownloadingMusicNeeded(string sourceDirectory);
-
- bool IsDownloadingUnfinishedBusinessNeeded(string sourceDirectory);
-
- public bool IsGameFound(string sourceDirectory);
-
- bool IsImportingSavesSupported { get; }
-};
diff --git a/tools/tr1/installer/Installer/Installers/InstallExecutor.cs b/tools/tr1/installer/Installer/Installers/InstallExecutor.cs
deleted file mode 100644
index 2e4756d52..000000000
--- a/tools/tr1/installer/Installer/Installers/InstallExecutor.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using Installer.Models;
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-
-namespace Installer.Installers;
-
-public class InstallExecutor
-{
- private static readonly string _resourceBaseURL = "https://lostartefacts.dev/aux/tr1x";
-
- public InstallExecutor(InstallSettings settings)
- {
- _settings = settings;
- }
-
- public IInstallSource? InstallSource
- {
- get
- {
- return _settings.InstallSource;
- }
- }
-
- public async Task ExecuteInstall(IProgress progress)
- {
- if (_settings.SourceDirectory is null)
- {
- throw new NullReferenceException();
- }
- if (_settings.TargetDirectory is null)
- {
- throw new NullReferenceException();
- }
-
- await CopyOriginalGameFiles(_settings.SourceDirectory, _settings.TargetDirectory, progress);
- await CopyTR1XFiles(_settings.TargetDirectory, progress);
- if (_settings.DownloadMusic)
- {
- await DownloadMusicFiles(_settings.TargetDirectory, progress);
- }
-
- if (_settings.DownloadUnfinishedBusiness)
- {
- await DownloadUnfinishedBusinessFiles(_settings.TargetDirectory, _settings.UnfinishedBusinessType, progress);
- }
- if (_settings.CreateDesktopShortcut)
- {
- CreateDesktopShortcut(_settings.TargetDirectory);
- }
-
- progress.Report(new InstallProgress { Description = "Finished", Finished = true });
- }
-
- protected async Task CopyOriginalGameFiles(string sourceDirectory, string targetDirectory, IProgress progress)
- {
- if (_settings.InstallSource is null)
- {
- throw new NullReferenceException();
- }
- await _settings.InstallSource.CopyOriginalGameFiles(sourceDirectory, targetDirectory, progress, _settings.ImportSaves);
- }
-
- protected static async Task CopyTR1XFiles(string targetDirectory, IProgress progress)
- {
- InstallUtils.StoreInstallationPath(targetDirectory);
-
- progress.Report(new InstallProgress
- {
- CurrentValue = 0,
- MaximumValue = 1,
- Description = "Opening embedded ZIP",
- });
-
- var assembly = Assembly.GetExecutingAssembly();
- var resourceName = assembly.GetManifestResourceNames().Where(n => n.EndsWith("release.zip")).First();
- using var stream = assembly.GetManifestResourceStream(resourceName)
- ?? throw new ApplicationException($"Could not open embedded ZIP.");
- await InstallUtils.ExtractZip(stream, targetDirectory, progress, overwrite: true);
- }
-
- protected static void CreateDesktopShortcut(string targetDirectory)
- {
- InstallUtils.CreateDesktopShortcut("TR1X", Path.Combine(targetDirectory, "TR1X.exe"));
- if (File.Exists(Path.Combine(targetDirectory, "data", "cat.phd")))
- {
- InstallUtils.CreateDesktopShortcut("TR1X - UB", Path.Combine(targetDirectory, "TR1X.exe"), new[] { "-gold" });
- }
- }
-
- protected static async Task DownloadMusicFiles(string targetDirectory, IProgress progress)
- {
- await InstallUtils.DownloadZip($"{_resourceBaseURL}/music.zip", targetDirectory, progress);
- }
-
- protected static async Task DownloadUnfinishedBusinessFiles(string targetDirectory, UBPackType type, IProgress progress)
- {
- await InstallUtils.DownloadZip(
- $"{_resourceBaseURL}/trub-{type.ToString().ToLower()}.zip",
- targetDirectory, progress);
- }
-
- private readonly InstallSettings _settings;
-}
diff --git a/tools/tr1/installer/Installer/Installers/InstallProgress.cs b/tools/tr1/installer/Installer/Installers/InstallProgress.cs
deleted file mode 100644
index 05dfb0b14..000000000
--- a/tools/tr1/installer/Installer/Installers/InstallProgress.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Installer.Installers;
-
-public class InstallProgress
-{
- public int? CurrentValue { get; set; }
- public string? Description { get; set; }
- public bool Finished { get; set; }
- public int? MaximumValue { get; set; }
-}
diff --git a/tools/tr1/installer/Installer/Installers/InstallUtils.cs b/tools/tr1/installer/Installer/Installers/InstallUtils.cs
deleted file mode 100644
index 39ef101d4..000000000
--- a/tools/tr1/installer/Installer/Installers/InstallUtils.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-using Installer.Utils;
-using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace Installer.Installers;
-
-public static class InstallUtils
-{
- private static readonly string _legacyStorageKey = @"Software\Tomb1Main";
- private static readonly string _registryStorageKey = @"Software\TR1X";
-
- public static async Task CopyDirectoryTree(
- string sourceDirectory,
- string targetDirectory,
- IProgress progress,
- Func? filterCallback = null,
- Func? overwriteCallback = null
- )
- {
- try
- {
- progress.Report(new InstallProgress { Description = "Scanning directory" });
- var files = Directory.GetFiles(sourceDirectory, "*", SearchOption.AllDirectories);
- var currentProgress = 0;
- var maximumProgress = files.Length;
- foreach (var sourcePath in files)
- {
- if (filterCallback is not null && !filterCallback(sourcePath))
- {
- continue;
- }
- var relPath = Path.GetRelativePath(sourceDirectory, sourcePath);
- var targetPath = Path.Combine(targetDirectory, relPath);
- var isSamePath = string.Equals(Path.GetFullPath(sourcePath), Path.GetFullPath(targetPath), StringComparison.OrdinalIgnoreCase);
- if (!File.Exists(targetPath) || (overwriteCallback is not null && overwriteCallback(sourcePath)) && !isSamePath)
- {
- progress.Report(new InstallProgress
- {
- CurrentValue = currentProgress,
- MaximumValue = maximumProgress,
- Description = $"Copying {relPath}",
- });
- Directory.CreateDirectory(Path.GetDirectoryName(targetPath)!);
- await Task.Run(() => File.Copy(sourcePath, targetPath, true));
- }
- else
- {
- progress.Report(new InstallProgress
- {
- CurrentValue = currentProgress,
- MaximumValue = maximumProgress,
- Description = $"Copying {relPath} - skipped",
- });
- }
-
- currentProgress++;
- }
- }
- catch (Exception e)
- {
- throw new ApplicationException($"Could not extract ZIP:\n{e.Message}");
- }
- }
-
- public static void CreateDesktopShortcut(string name, string targetPath, string[]? args = null)
- {
- var shortcutPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory), $"{name}.lnk");
- ShortcutUtils.CreateShortcut(shortcutPath, targetPath, "Tomb Raider I: Community Edition", args);
- }
-
- public static async Task DownloadFile(string url, IProgress progress)
- {
- HttpProgressClient wc = new();
- progress.Report(new InstallProgress { Description = $"Initializing download of {url}" });
- wc.DownloadProgressChanged += (totalBytesToReceive, bytesReceived) =>
- {
- progress.Report(new InstallProgress
- {
- CurrentValue = (int)bytesReceived,
- MaximumValue = (int)totalBytesToReceive,
- Description = $"Downloading {url}",
- });
- };
- return await wc.DownloadDataTaskAsync(new Uri(url));
- }
-
- public static async Task DownloadZip(
- string url,
- string targetDirectory,
- IProgress progress
- )
- {
- var response = await DownloadFile(url, progress);
- using var stream = new MemoryStream(response);
- await ExtractZip(stream, targetDirectory, progress);
- }
-
- public static async Task ExtractZip(
- Stream stream,
- string targetDirectory,
- IProgress progress,
- Func? filterCallback = null,
- bool overwrite = false
- )
- {
- try
- {
- using var zip = new ZipArchive(stream);
- progress.Report(new InstallProgress
- {
- Description = "Scanning embedded ZIP",
- });
- var currentProgress = 0;
- var maximumProgress = zip.Entries.Count;
- foreach (var entry in zip.Entries)
- {
- if (new Regex(@"[\\/]$").IsMatch(entry.FullName))
- {
- continue;
- }
- if (filterCallback is not null && !filterCallback(entry.FullName))
- {
- continue;
- }
- var targetPath = Path.Combine(
- targetDirectory,
- new Regex(@"[\\/]").Replace(entry.FullName, Path.DirectorySeparatorChar.ToString()));
-
- if (!File.Exists(targetPath) || overwrite)
- {
- progress.Report(new InstallProgress
- {
- CurrentValue = currentProgress,
- MaximumValue = maximumProgress,
- Description = $"Extracting {entry.FullName}",
- });
-
- Directory.CreateDirectory(Path.GetDirectoryName(targetPath)!);
- await Task.Run(() => entry.ExtractToFile(targetPath, true));
- }
- else
- {
- progress.Report(new InstallProgress
- {
- CurrentValue = currentProgress,
- MaximumValue = maximumProgress,
- Description = $"Extracting {entry.FullName} - skipped",
- });
- }
-
- currentProgress++;
- }
- }
- catch (Exception e)
- {
- throw new ApplicationException($"Could not extract ZIP:\n{e.Message}");
- }
- }
-
- public static IEnumerable GetDesktopShortcutDirectories()
- {
- foreach (
- var shortcutPath in Directory.EnumerateFiles(
- Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory), "*.lnk"
- )
- )
- {
- string? lnkPath;
- try
- {
- lnkPath = ShortcutUtils.GetLnkTargetPath(shortcutPath);
- }
- catch (Exception)
- {
- continue;
- }
- if (lnkPath is not null)
- {
- var dirName = Path.GetDirectoryName(lnkPath);
- if (dirName is not null)
- {
- yield return dirName;
- }
- }
- }
- }
-
- public static void StoreInstallationPath(string installPath)
- {
- RenameLegacyStorage();
- using var key = Registry.CurrentUser.CreateSubKey(_registryStorageKey);
- key?.SetValue("InstallPath", installPath);
- }
-
- public static string? GetPreviousInstallationPath()
- {
- RenameLegacyStorage();
- using var key = Registry.CurrentUser.OpenSubKey(_registryStorageKey);
- return key?.GetValue("InstallPath")?.ToString();
- }
-
- private static void RenameLegacyStorage()
- {
- // Added in #1411 - to be removed in the future.
- using var legacyKey = Registry.CurrentUser.OpenSubKey(_legacyStorageKey);
- if (legacyKey is null)
- {
- return;
- }
-
- using var currentKey = Registry.CurrentUser.OpenSubKey(_registryStorageKey);
- if (currentKey is not null)
- {
- return;
- }
-
- using var destinationKey = Registry.CurrentUser.CreateSubKey(_registryStorageKey);
- foreach (string valueName in legacyKey.GetValueNames())
- {
- object? objValue = legacyKey.GetValue(valueName);
- if (objValue is not null)
- {
- RegistryValueKind valueKind = legacyKey.GetValueKind(valueName);
- destinationKey.SetValue(valueName, objValue, valueKind);
- }
- }
-
- Registry.CurrentUser.DeleteSubKey(_legacyStorageKey);
- }
-}
diff --git a/tools/tr1/installer/Installer/Models/FinishSettings.cs b/tools/tr1/installer/Installer/Models/FinishSettings.cs
deleted file mode 100644
index 0b20ccceb..000000000
--- a/tools/tr1/installer/Installer/Models/FinishSettings.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace Installer.Models;
-
-public class FinishSettings : BaseNotifyPropertyChanged
-{
- public bool LaunchGame
- {
- get => _launchGame;
- set
- {
- if (value != _launchGame)
- {
- _launchGame = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- public bool OpenGameDirectory
- {
- get => _openGameDirectory;
- set
- {
- if (value != _openGameDirectory)
- {
- _openGameDirectory = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- private bool _launchGame = false;
- private bool _openGameDirectory = true;
-}
diff --git a/tools/tr1/installer/Installer/Models/FinishStep.cs b/tools/tr1/installer/Installer/Models/FinishStep.cs
deleted file mode 100644
index 5d67a3940..000000000
--- a/tools/tr1/installer/Installer/Models/FinishStep.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Installer.Models;
-
-public class FinishStep : BaseNotifyPropertyChanged, IStep
-{
- public FinishStep(FinishSettings finishSettings)
- {
- FinishSettings = finishSettings;
- }
-
- public bool CanProceedToNextStep => false;
- public bool CanProceedToPreviousStep => false;
- public FinishSettings FinishSettings { get; }
- public string SidebarImage => "pack://application:,,,/TR1X_Installer;component/Resources/side4.jpg";
-}
diff --git a/tools/tr1/installer/Installer/Models/IStep.cs b/tools/tr1/installer/Installer/Models/IStep.cs
deleted file mode 100644
index 3df5ed90c..000000000
--- a/tools/tr1/installer/Installer/Models/IStep.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.ComponentModel;
-
-namespace Installer.Models;
-
-public interface IStep : INotifyPropertyChanged
-{
- bool CanProceedToNextStep { get; }
- bool CanProceedToPreviousStep { get; }
- string SidebarImage { get; }
-}
diff --git a/tools/tr1/installer/Installer/Models/InstallSettings.cs b/tools/tr1/installer/Installer/Models/InstallSettings.cs
deleted file mode 100644
index 58e423d2c..000000000
--- a/tools/tr1/installer/Installer/Models/InstallSettings.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using Installer.Installers;
-
-namespace Installer.Models;
-
-public class InstallSettings : BaseNotifyPropertyChanged
-{
- public bool CreateDesktopShortcut
- {
- get => _createDesktopShortcut;
- set
- {
- if (value != _createDesktopShortcut)
- {
- _createDesktopShortcut = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- public bool DownloadMusic
- {
- get => _downloadMusic;
- set
- {
- if (value != _downloadMusic)
- {
- _downloadMusic = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- public bool DownloadUnfinishedBusiness
- {
- get => _downloadUnfinishedBusiness;
- set
- {
- if (value != _downloadUnfinishedBusiness)
- {
- _downloadUnfinishedBusiness = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- public UBPackType UnfinishedBusinessType
- {
- get => _unfinishedBusinessType;
- set
- {
- if (value != _unfinishedBusinessType)
- {
- _unfinishedBusinessType = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- public bool ImportSaves
- {
- get => _importSaves;
- set
- {
- if (value != _importSaves)
- {
- _importSaves = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- public IInstallSource? InstallSource
- {
- get => _installSource;
- set
- {
- if (value != _installSource)
- {
- _installSource = value;
- DownloadMusic = SourceDirectory is not null && (_installSource?.IsDownloadingMusicNeeded(SourceDirectory) ?? false);
- DownloadUnfinishedBusiness = SourceDirectory is not null && (_installSource?.IsDownloadingUnfinishedBusinessNeeded(SourceDirectory) ?? false);
- ImportSaves = _installSource?.IsImportingSavesSupported ?? false;
- TargetDirectory = _installSource?.SuggestedInstallationDirectory;
- NotifyPropertyChanged();
- }
- }
- }
-
- public bool IsDownloadingMusicNeeded
- {
- get
- {
- return SourceDirectory is not null && (InstallSource?.IsDownloadingMusicNeeded(SourceDirectory) ?? false);
- }
- }
-
- public bool IsDownloadingUnfinishedBusinessNeeded
- {
- get
- {
- return SourceDirectory is not null && (InstallSource?.IsDownloadingUnfinishedBusinessNeeded(SourceDirectory) ?? false);
- }
- }
-
- public string? SourceDirectory
- {
- get => _sourceDirectory;
- set
- {
- if (value != _sourceDirectory)
- {
- _sourceDirectory = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- public string? TargetDirectory
- {
- get => _targetDirectory;
- set
- {
- if (value != _targetDirectory)
- {
- _targetDirectory = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- private bool _createDesktopShortcut = true;
- private bool _downloadMusic;
- private bool _downloadUnfinishedBusiness;
- private UBPackType _unfinishedBusinessType;
- private bool _importSaves;
- private IInstallSource? _installSource;
- private string? _sourceDirectory;
- private string? _targetDirectory;
-}
diff --git a/tools/tr1/installer/Installer/Models/InstallSettingsStep.cs b/tools/tr1/installer/Installer/Models/InstallSettingsStep.cs
deleted file mode 100644
index 68a842c7a..000000000
--- a/tools/tr1/installer/Installer/Models/InstallSettingsStep.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Installer.Utils;
-using System.Windows.Input;
-
-namespace Installer.Models;
-
-public class InstallSettingsStep : BaseNotifyPropertyChanged, IStep
-{
- public InstallSettingsStep(InstallSettings installSettings)
- {
- InstallSettings = installSettings;
- InstallSettings.PropertyChanged += (sender, e) =>
- {
- NotifyPropertyChanged(nameof(CanProceedToNextStep));
- };
- }
-
- public bool CanProceedToNextStep => InstallSettings.TargetDirectory != null;
- public bool CanProceedToPreviousStep => true;
-
- public ICommand ChooseLocationCommand
- {
- get
- {
- return _chooseLocationCommand ??= new RelayCommand(ChooseLocation);
- }
- }
-
- public InstallSettings InstallSettings { get; }
- public string SidebarImage => "pack://application:,,,/TR1X_Installer;component/Resources/side2.jpg";
- private RelayCommand? _chooseLocationCommand;
-
- private void ChooseLocation()
- {
- var result = FileBrowser.Browse(InstallSettings.TargetDirectory);
- if (result is not null)
- {
- InstallSettings.TargetDirectory = result;
- }
- }
-}
diff --git a/tools/tr1/installer/Installer/Models/InstallSourceViewModel.cs b/tools/tr1/installer/Installer/Models/InstallSourceViewModel.cs
deleted file mode 100644
index 160f486ad..000000000
--- a/tools/tr1/installer/Installer/Models/InstallSourceViewModel.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using Installer.Installers;
-using Installer.Utils;
-using System.Windows.Input;
-
-namespace Installer.Models;
-
-public class InstallSourceViewModel : BaseNotifyPropertyChanged
-{
- public InstallSourceViewModel(IInstallSource source)
- {
- InstallSource = source;
-
- foreach (var directory in source.DirectoriesToTry)
- {
- if (InstallSource.IsGameFound(directory))
- {
- SourceDirectory = directory;
- break;
- }
- }
- }
-
- public ICommand ChooseLocationCommand
- {
- get
- {
- return _chooseLocationCommand ??= new RelayCommand(ChooseLocation);
- }
- }
-
- public IInstallSource InstallSource { get; private set; }
-
- public bool IsAvailable
- {
- get
- {
- return SourceDirectory != null && InstallSource.IsGameFound(SourceDirectory);
- }
- }
-
- public string? SourceDirectory
- {
- get => _sourceDirectory;
- set
- {
- if (value != _sourceDirectory)
- {
- _sourceDirectory = value;
- NotifyPropertyChanged();
- NotifyPropertyChanged(nameof(IsAvailable));
- }
- }
- }
-
- private RelayCommand? _chooseLocationCommand;
- private string? _sourceDirectory;
-
- private void ChooseLocation()
- {
- var result = FileBrowser.Browse(SourceDirectory);
- if (result is not null)
- {
- SourceDirectory = result;
- }
- }
-}
diff --git a/tools/tr1/installer/Installer/Models/InstallStep.cs b/tools/tr1/installer/Installer/Models/InstallStep.cs
deleted file mode 100644
index aa42941df..000000000
--- a/tools/tr1/installer/Installer/Models/InstallStep.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using Installer.Installers;
-using System;
-using System.Threading.Tasks;
-
-namespace Installer.Models;
-
-public class InstallStep : BaseNotifyPropertyChanged, IStep
-{
- public InstallStep(InstallSettings installSettings)
- {
- Logger = new Logger();
- InstallSettings = installSettings;
- }
-
- public bool CanProceedToNextStep
- {
- get => _canProceedToNextStep;
- set
- {
- if (value != _canProceedToNextStep)
- {
- _canProceedToNextStep = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- public bool CanProceedToPreviousStep => false;
-
- public int CurrentProgress
- {
- get { return _currentProgress; }
- set
- {
- if (value != _currentProgress)
- {
- _currentProgress = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- public string? Description
- {
- get => _description;
- set
- {
- if (value != _description)
- {
- _description = value;
- NotifyPropertyChanged();
- }
- }
- }
-
- public InstallSettings InstallSettings { get; }
- public Logger Logger { get; }
-
- public int MaximumProgress
- {
- get { return _maximumProgress; }
- set
- {
- if (value != _maximumProgress)
- {
- _maximumProgress = value;
- NotifyPropertyChanged();
- NotifyPropertyChanged(nameof(CanProceedToNextStep));
- }
- }
- }
-
- public string SidebarImage => "pack://application:,,,/TR1X_Installer;component/Resources/side3.jpg";
-
- public void RunInstall()
- {
- var progress = new Progress();
- progress.ProgressChanged += (sender, progress) =>
- {
- if (progress.CurrentValue is not null && progress.MaximumValue is not null)
- {
- CurrentProgress = progress.CurrentValue.Value;
- MaximumProgress = progress.MaximumValue.Value;
- }
- else
- {
- CurrentProgress = progress.Finished ? 1 : 0;
- MaximumProgress = 1;
- }
- Description = progress.Description;
- if (progress.Description is not null)
- {
- Logger.RaiseLogEvent(progress.Description);
- }
- if (progress.Finished)
- {
- CanProceedToNextStep = true;
- }
- };
-
- Task.Run(async () =>
- {
- try
- {
- var executor = new InstallExecutor(InstallSettings);
- await executor.ExecuteInstall(progress);
- }
- catch (Exception ex)
- {
- Logger.RaiseLogEvent(ex.ToString());
- }
- });
- }
-
- private bool _canProceedToNextStep;
- private int _currentProgress = 0;
- private string? _description;
- private int _maximumProgress = 1;
-}
diff --git a/tools/tr1/installer/Installer/Models/Logger.cs b/tools/tr1/installer/Installer/Models/Logger.cs
deleted file mode 100644
index 0c25c9318..000000000
--- a/tools/tr1/installer/Installer/Models/Logger.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Installer.Models;
-
-public class LogEventArgs
-{
- public LogEventArgs(string message)
- {
- Message = message;
- }
-
- public string Message { get; }
-}
-
-public class Logger
-{
- public delegate void LogEventHandler(object sender, LogEventArgs e);
-
- public event LogEventHandler? LogEvent;
-
- public void RaiseLogEvent(string message)
- {
- LogEvent?.Invoke(this, new LogEventArgs(message));
- }
-}
diff --git a/tools/tr1/installer/Installer/Models/MainWindowViewModel.cs b/tools/tr1/installer/Installer/Models/MainWindowViewModel.cs
deleted file mode 100644
index 5dff1aad7..000000000
--- a/tools/tr1/installer/Installer/Models/MainWindowViewModel.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using Installer.Utils;
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Windows;
-using System.Windows.Input;
-
-namespace Installer.Models;
-
-public class MainWindowViewModel : BaseNotifyPropertyChanged
-{
- public MainWindowViewModel()
- {
- _sourceStep = new SourceStep();
- _currentStep = _sourceStep;
- _installSettings = new InstallSettings();
- }
-
- public ICommand CloseWindowCommand
- {
- get
- {
- return _closeWindowCommand ??= new RelayCommand(CloseWindow);
- }
- }
-
- public IStep CurrentStep
- {
- get { return _currentStep; }
- set
- {
- _currentStep = value;
- _goToPreviousStepCommand?.RaiseCanExecuteChanged();
- _goToNextStepCommand?.RaiseCanExecuteChanged();
- _currentStep.PropertyChanged += (sender, e) =>
- {
- _goToPreviousStepCommand?.RaiseCanExecuteChanged();
- _goToNextStepCommand?.RaiseCanExecuteChanged();
- };
- NotifyPropertyChanged();
- NotifyPropertyChanged(nameof(IsFinalStep));
- }
- }
-
- public ICommand GoToNextStepCommand
- {
- get
- {
- return _goToNextStepCommand ??= new RelayCommand(GoToNextStep, CanGoToNextStep);
- }
- }
-
- public ICommand GoToPreviousStepCommand
- {
- get
- {
- return _goToPreviousStepCommand ??= new RelayCommand(GoToPreviousStep, CanGoToPreviousStep);
- }
- }
-
- public bool IsFinalStep
- {
- get
- {
- return CurrentStep is FinishStep;
- }
- }
-
- public bool IsSidebarVisible
- {
- get
- {
- return WindowWidth >= 500;
- }
- }
-
- public int WindowWidth
- {
- get => _windowWidth;
- set
- {
- if (value != _windowWidth)
- {
- _windowWidth = value;
- NotifyPropertyChanged(nameof(IsSidebarVisible));
- }
- }
- }
-
- private const bool _autoFinishInstallStep = false;
-
- private RelayCommand? _closeWindowCommand;
-
- private IStep _currentStep;
- private FinishSettings? _finishSettings;
- private RelayCommand? _goToNextStepCommand;
- private RelayCommand? _goToPreviousStepCommand;
- private readonly InstallSettings _installSettings;
- private readonly IStep _sourceStep;
- private int _windowWidth;
-
- private bool CanGoToNextStep()
- {
- return CurrentStep.CanProceedToNextStep;
- }
-
- private bool CanGoToPreviousStep()
- {
- return CurrentStep.CanProceedToPreviousStep;
- }
-
- private void CloseWindow(Window? window)
- {
- if (_finishSettings is not null && _finishSettings.LaunchGame)
- {
- if (_installSettings.TargetDirectory is null)
- {
- throw new NullReferenceException();
- }
- Process.Start(Path.Combine(_installSettings.TargetDirectory, "TR1X.exe"));
- }
- if (_finishSettings is not null && _finishSettings.OpenGameDirectory)
- {
- if (_installSettings.TargetDirectory is null)
- {
- throw new NullReferenceException();
- }
- Process.Start("explorer.exe", _installSettings.TargetDirectory);
- }
- window?.Close();
- }
-
- private void GoToNextStep()
- {
- if (CurrentStep is SourceStep sourceStep)
- {
- var installSource = sourceStep.SelectedInstallationSource!.InstallSource;
- _installSettings.InstallSource = installSource;
- _installSettings.SourceDirectory = sourceStep.SelectedInstallationSource.SourceDirectory;
- CurrentStep = new InstallSettingsStep(_installSettings);
- }
- else if (CurrentStep is InstallSettingsStep targetStep)
- {
- var installStep = new InstallStep(targetStep.InstallSettings);
- installStep.RunInstall();
- installStep.PropertyChanged += (sender, e) =>
- {
- if (_autoFinishInstallStep && installStep.CanProceedToNextStep)
- {
- _finishSettings = new FinishSettings();
- CurrentStep = new FinishStep(_finishSettings);
- }
- };
- CurrentStep = installStep;
- }
- else if (CurrentStep is InstallStep)
- {
- _finishSettings = new FinishSettings();
- CurrentStep = new FinishStep(_finishSettings);
- }
- }
-
- private void GoToPreviousStep()
- {
- CurrentStep = _sourceStep;
- }
-}
diff --git a/tools/tr1/installer/Installer/Models/SourceStep.cs b/tools/tr1/installer/Installer/Models/SourceStep.cs
deleted file mode 100644
index 62af17cb7..000000000
--- a/tools/tr1/installer/Installer/Models/SourceStep.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Installer.Installers;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-namespace Installer.Models;
-
-public class SourceStep : BaseNotifyPropertyChanged, IStep
-{
- public SourceStep()
- {
- InstallationSources = new ObservableCollection
- {
- // NOTE: the order also decides which installation source will be selected by default
- new(new SteamInstallSource()),
- new(new GOGInstallSource()),
- new(new TombATIInstallSource()),
- new(new TR1XInstallSource()),
- new(new CDRomInstallSource()),
- };
-
- foreach (var installationSource in InstallationSources)
- {
- installationSource.PropertyChanged += (sender, e) =>
- {
- NotifyPropertyChanged(nameof(InstallationSources));
- if (installationSource == selectedInstallationSource)
- {
- NotifyPropertyChanged(nameof(SelectedInstallationSource));
- }
- };
- }
-
- foreach (var source in InstallationSources)
- {
- if (source.IsAvailable)
- {
- // TR1X comes last and always trumps any other installation source
- SelectedInstallationSource = source;
- }
- }
- }
-
- public bool CanProceedToNextStep
- {
- get
- {
- return SelectedInstallationSource != null && SelectedInstallationSource.IsAvailable;
- }
- }
-
- public bool CanProceedToPreviousStep => false;
- public IEnumerable InstallationSources { get; private set; }
-
- public InstallSourceViewModel? SelectedInstallationSource
- {
- get => selectedInstallationSource;
- set
- {
- if (value != selectedInstallationSource)
- {
- selectedInstallationSource = value;
- NotifyPropertyChanged();
- NotifyPropertyChanged(nameof(CanProceedToNextStep));
- }
- }
- }
-
- public string SidebarImage => "pack://application:,,,/TR1X_Installer;component/Resources/side1.jpg";
- private InstallSourceViewModel? selectedInstallationSource;
-}
diff --git a/tools/tr1/installer/Installer/Models/UBPackType.cs b/tools/tr1/installer/Installer/Models/UBPackType.cs
deleted file mode 100644
index 57502ce0b..000000000
--- a/tools/tr1/installer/Installer/Models/UBPackType.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Installer.Models;
-
-public enum UBPackType
-{
- Music,
- Vanilla,
-}
diff --git a/tools/tr1/installer/Installer/Resources/Styles.xaml b/tools/tr1/installer/Installer/Resources/Styles.xaml
deleted file mode 100644
index 5e0ab611d..000000000
--- a/tools/tr1/installer/Installer/Resources/Styles.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/tr1/installer/Installer/Resources/side4.old.jpg b/tools/tr1/installer/Installer/Resources/side4.old.jpg
deleted file mode 100644
index 8af6d1e7d1a757e59afefa55cba585ebc59ce341..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 51427
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