Skip to content

Bug Fix - Overlays install once again #206

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
Phergus merged 1 commit into from
Jul 23, 2021
Merged

Bug Fix - Overlays install once again #206

Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ dependencies {

// Other public libs
implementation(group = "commons-io", name = "commons-io", version = "2.10.0")
// *** NOTE: Do not upgrade org.reflections to 0.9.12 as this causes TokenTool to fail during startup
implementation(group = "org.reflections", name = "reflections", version = "0.9.11")
implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
}

Expand Down
1 change: 0 additions & 1 deletion src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
requires imageio.psd;
requires org.apache.logging.log4j;
requires jai.imageio.jpeg2000;
requires reflections;
requires org.apache.commons.io;
requires org.apache.pdfbox;
requires sentry;
Expand Down
25 changes: 15 additions & 10 deletions src/main/java/net/rptools/tokentool/AppSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.lang.module.ResolvedModule;
import java.nio.charset.Charset;
import java.util.Collection;
import java.util.Set;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javafx.application.Platform;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
Expand All @@ -32,8 +33,6 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
import org.reflections.Reflections;
import org.reflections.scanners.ResourcesScanner;

/** Executes only the first time the application is run. */
public class AppSetup {
Expand Down Expand Up @@ -135,11 +134,17 @@ public static int installNewOverlays(String currentVersion) throws IOException {
overlayDir.mkdirs();
int overlaysInstalled = 0;

// Copy default overlays from resources
Reflections reflections = new Reflections(DEFAULT_OVERLAYS, new ResourcesScanner());
Set<String> resourcePathSet = reflections.getResources(Pattern.compile(".*"));

for (String resourcePath : resourcePathSet) {
// Get list of overlays from src/main/resources
Set<String> moduleResourceSet = ModuleLayer.boot().configuration().modules()
.stream()
.map(ResolvedModule::reference)
.filter(it -> it.descriptor().name().equals("net.rptools.tokentool"))
.findFirst().get().open()
.list()
.filter(it -> it.startsWith(DEFAULT_OVERLAYS) && !it.endsWith("/"))
.collect(Collectors.toSet());

for (String resourcePath : moduleResourceSet) {
String resourceName = resourcePath.substring(DEFAULT_OVERLAYS.length());
InputStream resourceAsStream = AppSetup.class.getResourceAsStream("/" + resourcePath);

Expand Down Expand Up @@ -209,11 +214,11 @@ private static boolean isNewerVersion(String version, String installedVersion) {
return false;
}

String[] versions = version.indexOf(".") > 0 ? version.split("\\.") : new String[] {version};
String[] versions = version.indexOf(".") > 0 ? version.split("\\.") : new String[]{version};
String[] installedVersions =
installedVersion.indexOf(".") > 0
? installedVersion.split("\\.")
: new String[] {installedVersion};
: new String[]{installedVersion};

int i = 0;
try {
Expand Down