Skip to content

Commit 00fec07

Browse files
RealMangorageRealMangorage
committed
Updated to wait for 30s before starting...
1 parent bf40a97 commit 00fec07

File tree

3 files changed

+28
-23
lines changed

3 files changed

+28
-23
lines changed

‎src/main/java/org/mangorage/installer/Installer.java‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import joptsimple.OptionSet;
77
import joptsimple.OptionSpec;
88
import joptsimple.util.PathConverter;
9+
import org.mangorage.installer.core.LogUtil;
910
import org.mangorage.installer.core.UpdateChecker;
1011
import org.mangorage.installer.core.data.*;
1112
import java.io.*;
@@ -29,9 +30,11 @@ public class Installer {
2930
private static final String DEPENDENCIES_PATH = "installer-data/dependencies.json";
3031
private static final Path LIBRARIES_PATH = Path.of("libraries/").toAbsolutePath();
3132

32-
public static void main(String[] args) {
33-
org.mangorage.installer.core.LogUtil.println("Starting Installer...");
34-
org.mangorage.installer.core.LogUtil.println("Arguments Supplied: " + Arrays.toString(args));
33+
public static void main(String[] args) throws InterruptedException {
34+
LogUtil.println("Starting Installer in 30 seconds...");
35+
LogUtil.println("Arguments Supplied: " + Arrays.toString(args));
36+
37+
Thread.sleep(30_000); // Sleep for 30 seconds
3538

3639
OptionParser parser = new OptionParser();
3740
parser.allowsUnrecognizedOptions();
@@ -65,10 +68,10 @@ public static void main(String[] args) {
6568
handleDependencies(dependencies);
6669

6770
if (options.has("launch")) {
68-
org.mangorage.installer.core.LogUtil.println("Finished running installer...");
71+
LogUtil.println("Finished running installer...");
6972
launchJar(jars, args);
7073
} else {
71-
org.mangorage.installer.core.LogUtil.println("Finished running installer...");
74+
LogUtil.println("Finished running installer...");
7275
System.exit(0);
7376
}
7477
}
@@ -81,7 +84,7 @@ private static List<File> getManualJars(OptionSet options, OptionSpec<Path> manu
8184
}
8285

8386
private static List<File> processPackages(final boolean checkUpdates, final int updateFreq) {
84-
org.mangorage.installer.core.LogUtil.println("Processing installer/packages.json");
87+
LogUtil.println("Processing installer/packages.json");
8588
File file = new File("installer/packages.json");
8689
if (!file.exists()) throw new IllegalStateException("packages.json not found!");
8790

@@ -136,7 +139,7 @@ private static File handleDependency(Dependency dependency, Map<String, String>
136139
return new File(destination, dependency.target());
137140
}
138141

139-
org.mangorage.installer.core.LogUtil.println("Installing/updating " + dependency.target());
142+
LogUtil.println("Installing/updating " + dependency.target());
140143
return Util.downloadTo(maven, latestVersion, destination + "/" + dependency.target());
141144
}
142145

@@ -145,13 +148,13 @@ private static String fetchLatestVersion(Maven maven, String defaultVersion) {
145148
try {
146149
return Util.parseLatestVersion(future.get(10, TimeUnit.SECONDS), defaultVersion);
147150
} catch (Exception e) {
148-
org.mangorage.installer.core.LogUtil.println("Failed to get metadata, using default version: " + defaultVersion);
151+
LogUtil.println("Failed to get metadata, using default version: " + defaultVersion);
149152
return defaultVersion;
150153
}
151154
}
152155

153156
private static List<Dependency> extractDependencies(List<File> jars) {
154-
org.mangorage.installer.core.LogUtil.println("Extracting dependencies from JARs");
157+
LogUtil.println("Extracting dependencies from JARs");
155158
List<Dependency> dependencies = new ArrayList<>();
156159

157160
for (File jar : jars) {
@@ -161,7 +164,7 @@ private static List<Dependency> extractDependencies(List<File> jars) {
161164
try (var reader = new InputStreamReader(jarFile.getInputStream(entry))) {
162165
List<Dependency> extracted = GSON.fromJson(reader, Dependencies.class).dependencies();
163166
dependencies.addAll(extracted);
164-
extracted.forEach(dep -> org.mangorage.installer.core.LogUtil.println("Found dependency: " + dep));
167+
extracted.forEach(dep -> LogUtil.println("Found dependency: " + dep));
165168
}
166169
}
167170
} catch (IOException e) {
@@ -172,8 +175,8 @@ private static List<Dependency> extractDependencies(List<File> jars) {
172175
}
173176

174177
private static void handleDependencies(List<Dependency> dependencies) {
175-
org.mangorage.installer.core.LogUtil.println("Handling dependencies...");
176-
org.mangorage.installer.core.LogUtil.println("Skipping dependencies already present...");
178+
LogUtil.println("Handling dependencies...");
179+
LogUtil.println("Skipping dependencies already present...");
177180
Set<String> installedJars = new HashSet<>();
178181
List<File> existingJars = getExistingLibraryJars();
179182

@@ -182,7 +185,7 @@ private static void handleDependencies(List<Dependency> dependencies) {
182185
if (!existingJars.contains(new File(LIBRARIES_PATH.toString(), dep.target()))) {
183186
Util.installUrl(dep.getDownloadURL(), LIBRARIES_PATH.toString(), true);
184187
} else {
185-
org.mangorage.installer.core.LogUtil.println("Skipped -> " + dep.target());
188+
LogUtil.println("Skipped -> " + dep.target());
186189
}
187190
}
188191

@@ -197,7 +200,7 @@ private static List<File> getExistingLibraryJars() {
197200
private static void deleteUnusedDependencies(List<File> existingJars, Set<String> installedJars) {
198201
existingJars.forEach(file -> {
199202
if (!installedJars.contains(file.getName())) {
200-
org.mangorage.installer.core.LogUtil.println("Deleting unused dependency: " + file.getName());
203+
LogUtil.println("Deleting unused dependency: " + file.getName());
201204
file.delete();
202205
}
203206
});
@@ -209,7 +212,7 @@ public static String findMainClass(File file) {
209212
if (manifest != null) {
210213
String mainClass = manifest.getMainAttributes().getValue("Main-Class");
211214
if (mainClass != null) {
212-
org.mangorage.installer.core.LogUtil.println("Found Main-Class: " + mainClass);
215+
LogUtil.println("Found Main-Class: " + mainClass);
213216
return mainClass;
214217
}
215218
}
@@ -220,12 +223,12 @@ public static String findMainClass(File file) {
220223
}
221224

222225
public static void launchJar(List<File> jars, String[] args) {
223-
org.mangorage.installer.core.LogUtil.println("Attempting to launch....");
226+
LogUtil.println("Attempting to launch....");
224227
File bootJar = new File("boot/boot.jar");
225228
String mainClass = findMainClass(bootJar);
226229

227230
if (mainClass.isEmpty()) {
228-
org.mangorage.installer.core.LogUtil.println("Could not find Valid Launch File from List of Jars...");
231+
LogUtil.println("Could not find Valid Launch File from List of Jars...");
229232
return;
230233
}
231234

‎src/main/java/org/mangorage/installer/core/UpdateChecker.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
public final class UpdateChecker extends TimerTask {
1313
public static void startChecker(final Packages packages, final int freq) {
14-
org.mangorage.installer.core.LogUtil.println("Starting Update Checker... Checks every " + freq + "ms");
14+
LogUtil.println("Starting Update Checker... Checks every " + freq + "ms");
1515
new UpdateChecker(packages, freq);
1616
}
1717

@@ -26,7 +26,7 @@ public static void startChecker(final Packages packages, final int freq) {
2626
}
2727

2828
void start(final int freq) {
29-
org.mangorage.installer.core.LogUtil.println("Started Update Checker.");
29+
LogUtil.println("Started Update Checker.");
3030
packages
3131
.packages()
3232
.stream()
@@ -52,7 +52,7 @@ public void run() {
5252
final var lastCheckedUpdatedTime = lastUpdated.get(dependency.target());
5353
if (lastCheckedUpdatedTime != null) {
5454
if (!lastCheckedUpdatedTime.matches(lastUpdatedTime)) {
55-
org.mangorage.installer.core.LogUtil.println("Exiting... Found update for " + dependency.target());
55+
LogUtil.println("Exiting... Found update for " + dependency.target());
5656
System.exit(0);
5757
}
5858
}

‎src/main/java/org/mangorage/installer/core/data/Util.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
package org.mangorage.installer.core.data;
2424

25+
import org.mangorage.installer.core.LogUtil;
26+
2527
import java.io.BufferedReader;
2628
import java.io.File;
2729
import java.io.IOException;
@@ -71,7 +73,7 @@ public static String getLastUpdated(String xmlContent) {
7173

7274
public static String downloadMetadata(Maven maven) {
7375
String url = maven.repository() + "/" + maven.groupId().replace(".", "/") + "/" + maven.artifactId() + "/maven-metadata.xml";
74-
org.mangorage.installer.core.LogUtil.println("Downloading Metadata from %s".formatted(url));
76+
LogUtil.println("Downloading Metadata from %s".formatted(url));
7577
try {
7678
return convertInputStreamToString(new URL(url).openStream());
7779
} catch (IOException e) {
@@ -117,13 +119,13 @@ public static void installUrl(String url, String destinationPath, boolean resolv
117119
if (!Files.exists(destination.getParent())) Files.createDirectories(destination.getParent());
118120
Files.copy(inputStream, destination, StandardCopyOption.REPLACE_EXISTING);
119121

120-
org.mangorage.installer.core.LogUtil.println("[INSTALLER] Installation complete. File saved to: " + destination);
122+
LogUtil.println("[INSTALLER] Installation complete. File saved to: " + destination);
121123
} catch (URISyntaxException e) {
122124
throw new RuntimeException(e);
123125
}
124126

125127
} catch (IOException e) {
126-
org.mangorage.installer.core.LogUtil.println(url);
128+
LogUtil.println(url);
127129
throw new IllegalStateException(e);
128130
}
129131
}

0 commit comments

Comments
 (0)