LITW-Refined/minecraft-modpack-updater
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more logging

Browse Source
This commit is contained in:
Pascal
2024-12-05 07:22:01 +01:00
parent 3e1ab72162
commit 3b79335e85
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ModpackUpdater.Apps.Client/Program.cs
View File

@@ -12,9 +12,12 @@ namespace ModpackUpdater.Apps.Client;
public static class Program public static class Program
{ {
private static readonly SettingsManager settingsManager; private static readonly SettingsManager settingsManager;
private static readonly ILogger log = new ConsoleLogger();
public static ISettings Settings => settingsManager.Instance; public static ISettings Settings => settingsManager.Instance;
public static ILogger Log => log;
[DllImport("kernel32.dll")] [DllImport("kernel32.dll")]
static extern nint GetConsoleWindow(); static extern nint GetConsoleWindow();
@@ -100,21 +103,21 @@ public static class Program
// Check for update // Check for update
var installer = new ModpackInstaller(config, info) var installer = new ModpackInstaller(config, info)
{ {
Log = new ConsoleLogger(), Log = Log,
}; };
var result = installer.Check(updateOptions).Result; var result = installer.Check(updateOptions).Result;
if (!silent && !updateOptions.NoUpdate && new AppUpdater().Check().Result) if (!silent && !updateOptions.NoUpdate && new AppUpdater().Check().Result)
Console.WriteLine("A new version is available!"); Log.Info("A new version is available!");
if (result.HasUpdates) if (result.HasUpdates)
{ {
var success = installer.Install(result).Result; var success = installer.Install(result).Result;
if (!silent) if (!silent)
Console.WriteLine($"Installation {(success ?? false ? "completed successfully" : "failed")}!"); Log.Info($"Installation {(success ?? false ? "completed successfully" : "failed")}!");
} }
else if (!silent) else if (!silent)
Console.WriteLine("No updates available"); Log.Info("No updates available");
} }
private static string CheckModpackConfigUrl(string configUrl, ModpackInfo info) private static string CheckModpackConfigUrl(string configUrl, ModpackInfo info)

8
ModpackUpdater.Manager/ModpackInstaller.cs
View File

@@ -62,8 +62,7 @@ public class ModpackInstaller(ModpackConfig updateConfig, ModpackInfo modpackInf
} }
installInfos = await DownloadInstallInfos(); installInfos = await DownloadInstallInfos();
result.CurrentVersion = modpackInfo.Version ?? installInfos.Version; result.CurrentVersion = modpackInfo.Version ?? new Version("0.0.0.0");
var curVersion = result.CurrentVersion;
// Check install actions // Check install actions
if (!exists) if (!exists)
@@ -77,7 +76,7 @@ public class ModpackInstaller(ModpackConfig updateConfig, ModpackInfo modpackInf
{ {
result.Actions.AddRange(actions); result.Actions.AddRange(actions);
result.LatestVersion = installInfos.Version; result.LatestVersion = installInfos.Version;
curVersion = installInfos.Version; result.CurrentVersion = installInfos.Version;
} }
} }
@@ -96,9 +95,8 @@ public class ModpackInstaller(ModpackConfig updateConfig, ModpackInfo modpackInf
var checkingVersionIndex = 0; var checkingVersionIndex = 0;
var checkingVersion = updatesOrderes.ElementAtOrDefault(checkingVersionIndex); var checkingVersion = updatesOrderes.ElementAtOrDefault(checkingVersionIndex);
var actionsZeroIndex = result.Actions.Count; // Ensure we insert update actions behind install actions var actionsZeroIndex = result.Actions.Count; // Ensure we insert update actions behind install actions
result.IsInstalled = true;
while (checkingVersion is not null && checkingVersion.Version > curVersion) while (checkingVersion is not null && checkingVersion.Version > result.CurrentVersion)
{ {
var actionsToAdd = new List<UpdateAction>(); var actionsToAdd = new List<UpdateAction>();