Skip to content

Commit

Permalink
updater: improve file already exists logic
Browse files Browse the repository at this point in the history
  • Loading branch information
PeratX committed Apr 13, 2022
1 parent a5902bb commit 3ea089d
Showing 1 changed file with 18 additions and 7 deletions.
25 changes: 18 additions & 7 deletions src/main/java/org/itxtech/mcl/module/builtin/Updater.java
Expand Up @@ -76,18 +76,21 @@ public void load() {
}

public void check(MclPackage pack) throws Exception {
// "Verifying \"" + pack.id + "\" version " + pack.version
loader.logger.info(Ansi.ansi()
var baseInfo = Ansi.ansi()
.a("Verifying ")
.fgBrightYellow()
.a("\"").a(pack.id).a("\"").reset()
.a(" v").fgBrightYellow().a(pack.version)
);
.a("\"").a(pack.id).a("\"");
if (!"".equals(pack.version)) {
baseInfo = baseInfo.reset().a(" v").fgBrightYellow().a(pack.version);
}
loader.logger.info(baseInfo);
var update = loader.cli.hasOption("u");
var force = pack.isVersionLocked();
var down = false;
if (!Utility.checkLocalFile(pack)) {
loader.logger.error("\"" + pack.id + "\" is corrupted.");
if (!"".equals(pack.version)) {
loader.logger.error("\"" + pack.id + "\" is corrupted.");
}
down = true;
}
var ver = "";
Expand Down Expand Up @@ -138,7 +141,15 @@ public void check(MclPackage pack) throws Exception {
showNotice = true;
}
if (down) {
downloadFile(pack, info);
loader.logger.info(Ansi.ansi()
.a("Updating ")
.fgBrightYellow()
.a("\"").a(pack.id).a("\"").reset()
.a(" to v").fgBrightYellow().a(pack.version)
);
if (!Utility.checkLocalFile(pack)) {
downloadFile(pack, info);
}
if (!Utility.checkLocalFile(pack)) {
loader.logger.error(Ansi.ansi()
.fgBrightRed()
Expand Down

0 comments on commit 3ea089d

Please sign in to comment.