From ebfa941a4f8faf2e494dc165473c8b55ee847233 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sat, 26 Jun 2021 10:27:32 +0100 Subject: [PATCH] Fixed some file separators. --- src/main/java/org/qortal/api/resource/WebsiteResource.java | 2 +- src/main/java/org/qortal/storage/DataFile.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/qortal/api/resource/WebsiteResource.java b/src/main/java/org/qortal/api/resource/WebsiteResource.java index 60d56bd6..c6a10ec7 100644 --- a/src/main/java/org/qortal/api/resource/WebsiteResource.java +++ b/src/main/java/org/qortal/api/resource/WebsiteResource.java @@ -337,7 +337,7 @@ public class WebsiteResource { if (link != null) { link = this.removeQuotes(link); if (this.isRelativeLink(link)) { - String slash = (link.startsWith("/") ? "" : File.separator); + String slash = (link.startsWith("/") ? "" : "/"); String modifiedLink = "url('" + "/site/" + resourceId + slash + link + "')"; element.attr("style", parts[0] + modifiedLink + parts2[1]); } diff --git a/src/main/java/org/qortal/storage/DataFile.java b/src/main/java/org/qortal/storage/DataFile.java index 9fa222d3..1e2eb4e5 100644 --- a/src/main/java/org/qortal/storage/DataFile.java +++ b/src/main/java/org/qortal/storage/DataFile.java @@ -133,7 +133,7 @@ public class DataFile { public static String getOutputFilePath(String base58Digest, boolean createDirectories) { String base58DigestFirst2Chars = base58Digest.substring(0, Math.min(base58Digest.length(), 2)); String base58DigestNext2Chars = base58Digest.substring(2, Math.min(base58Digest.length(), 4)); - String outputDirectory = String.format("%s/%s/%s", Settings.getInstance().getDataPath(), base58DigestFirst2Chars, base58DigestNext2Chars); + String outputDirectory = Settings.getInstance().getDataPath() + File.separator + base58DigestFirst2Chars + File.separator + base58DigestNext2Chars; Path outputDirectoryPath = Paths.get(outputDirectory); if (createDirectories) { @@ -143,7 +143,7 @@ public class DataFile { throw new IllegalStateException("Unable to create data subdirectory"); } } - return String.format("%s/%s", outputDirectory, base58Digest); + return outputDirectory + base58Digest; } public ValidationResult isValid() {