Skip to content

Retry installation after setup correction #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tosox merged 1 commit into from
May 2, 2026
Merged

Retry installation after setup correction #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 38 additions & 5 deletions src/main/java/de/tosox/zonerelay/application/InstallCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.Stream;

@Singleton
public class InstallCoordinator {
Expand All @@ -51,6 +53,7 @@ public class InstallCoordinator {
private final DownloadsManifestStore manifestStore;
private final ModlistHashUpdater modlistHashUpdater;
private final ModlistSetupUpdater modlistSetupUpdater;
private final ModlistRepository modlistRepository;

private final AtomicBoolean isInstalling = new AtomicBoolean(false);

Expand All @@ -67,7 +70,8 @@ public InstallCoordinator(@Named("file") Logger fileLogger, @Named("ui") Logger
SplashImageCopier splashImageCopier, ShortcutCreator shortcutCreator,
InstallProgressStore progressStore, AppPaths paths,
UserSettings userSettings, DownloadsManifestStore manifestStore,
ModlistHashUpdater modlistHashUpdater, ModlistSetupUpdater modlistSetupUpdater) {
ModlistHashUpdater modlistHashUpdater, ModlistSetupUpdater modlistSetupUpdater,
ModlistRepository modlistRepository) {
this.fileLogger = fileLogger;
this.uiLogger = uiLogger;
this.localizer = localizer;
Expand All @@ -82,6 +86,7 @@ public InstallCoordinator(@Named("file") Logger fileLogger, @Named("ui") Logger
this.manifestStore = manifestStore;
this.modlistHashUpdater = modlistHashUpdater;
this.modlistSetupUpdater = modlistSetupUpdater;
this.modlistRepository = modlistRepository;
}

public void startInstallation(ModlistConfig config, boolean fullInstall, String resumeFromId) {
Expand Down Expand Up @@ -200,12 +205,11 @@ private void installEntries(List<? extends ModEntry> entries, boolean fullInstal

try {
findInstaller(entry).install(entry, archive, currentProgressListener);
manifestStore.recordInstall(mod.getId(), result.computedHash());
} catch (SetupPathMissingException e) {
setupFailures.add(new SetupFailure(mod.getName(), mod.getId(), e.getMissingPaths()));
fileLogger.warn("Setup path(s) missing for %s: %s", mod.getName(), e.getMissingPaths());
}

manifestStore.recordInstall(mod.getId(), result.computedHash());
applyArchiveCleanup(result, previousEntry);
} else {
findInstaller(entry).install(entry, null, currentProgressListener);
Expand Down Expand Up @@ -339,13 +343,42 @@ private void presentSetupFailureSummary(List<SetupFailure> failures) {
pathFields.forEach((oldPath, field) -> modCorrections.put(oldPath, field.getText().trim()));
corrections.put(modId, modCorrections);
});
new Thread(() -> modlistSetupUpdater.updateSetup(paths.getModlistYaml(), corrections),
"modlist-setup-update").start();
new Thread(() -> {
modlistSetupUpdater.updateSetup(paths.getModlistYaml(), corrections);
retrySetupFailures(failures);
}, "modlist-setup-update").start();
break;
}
});
}

private void retrySetupFailures(List<SetupFailure> failures) {
try {
ModlistConfig updated = modlistRepository.load(paths.getModlistYaml());
Set<String> failedIds = failures.stream()
.map(SetupFailure::modId)
.collect(Collectors.toSet());

Stream.concat(updated.getMods().stream(), updated.getPatches().stream())
.filter(mod -> failedIds.contains(mod.getId()))
.forEach(mod -> {
uiLogger.info(localizer.translate("MSG_TITLE_CONFIGENTRY", mod.getName()));
fileLogger.info("Retrying setup for: %s", mod.getId());
try {
DownloadResult result = archiveDownloader.download(
mod.getUrl(), mod.getId(), mod.getHash(),
paths.getDownloadsDir().toFile(), false, currentProgressListener);
findInstaller(mod).install(mod, result.archive(), currentProgressListener);
manifestStore.recordInstall(mod.getId(), result.computedHash());
} catch (Exception e) {
fileLogger.error("Retry failed for %s: %s", mod.getName(), e.getMessage());
}
});
} catch (Exception e) {
fileLogger.error("Failed to retry setup failures: %s", e.getMessage());
}
}

private void setupMo2Environment(ModlistConfig config) {
uiLogger.info(localizer.translate("MSG_CREATE_CUSTOM_PROFILE"));
fileLogger.info("Setting up MO2 profile");
Expand Down
Loading