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

improvements for first installation

Browse Source
This commit is contained in:
Pascal
2024-10-13 11:54:36 +02:00
parent 334b9583c6
commit 8fae2a2c9d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ModpackUpdater.Manager/ModpackInstaller.cs
View File

@@ -65,6 +65,8 @@ public class ModpackInstaller(ModpackConfig updateConfig, ModpackInfo modpackInf
// Check install actions // Check install actions
if (!exists) if (!exists)
{ {
result.IsInstalled = false;
if (installInfos is not null && installInfos.IsPublic && installInfos.Actions.Count != 0) if (installInfos is not null && installInfos.IsPublic && installInfos.Actions.Count != 0)
{ {
var actions = installInfos.Actions.Where(n => n.Side.IsSide(options.Side) && (!n.IsExtra || options.IncludeExtras)); var actions = installInfos.Actions.Where(n => n.Side.IsSide(options.Side) && (!n.IsExtra || options.IncludeExtras));
@@ -81,19 +83,17 @@ public class ModpackInstaller(ModpackConfig updateConfig, ModpackInfo modpackInf
} }
// Check update actions // Check update actions
if (exists || options.AllowUpdaterAfterInstall) if (!result.HasError && (exists || options.AllowUpdaterAfterInstall))
{ {
updateInfos = await DownloadUpdateInfos(); updateInfos = await DownloadUpdateInfos();
if (updateInfos is not null && updateInfos.Updates.Count != 0) if (updateInfos is not null && updateInfos.Updates.Count != 0)
{ {
var updatesOrderes = updateInfos.Updates.Where(n => n.IsPublic || options.IncludeNonPublic).OrderByDescending(n => n.Version); var updatesOrderes = updateInfos.Updates.Where(n => n.IsPublic || options.IncludeNonPublic).OrderByDescending(n => n.Version);
result.LatestVersion = updatesOrderes.First().Version;
result.IsInstalled = true;
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 > curVersion)
{ {
@@ -111,6 +111,9 @@ public class ModpackInstaller(ModpackConfig updateConfig, ModpackInfo modpackInf
result.Actions.InsertRange(actionsZeroIndex, actionsToAdd); result.Actions.InsertRange(actionsZeroIndex, actionsToAdd);
if (result.LatestVersion < checkingVersion.Version)
result.LatestVersion = checkingVersion.Version;
checkingVersionIndex += 1; checkingVersionIndex += 1;
checkingVersion = updatesOrderes.ElementAtOrDefault(checkingVersionIndex); checkingVersion = updatesOrderes.ElementAtOrDefault(checkingVersionIndex);
} }