AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed some file separators.

Browse Source
This commit is contained in:
CalDescent 2021-06-26 10:27:32 +01:00
parent 47c70eea9e
commit ebfa941a4f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/api/resource/WebsiteResource.java
View File

@ -337,7 +337,7 @@ public class WebsiteResource {
if (link != null) { if (link != null) {
link = this.removeQuotes(link); link = this.removeQuotes(link);
if (this.isRelativeLink(link)) { if (this.isRelativeLink(link)) {
String slash = (link.startsWith("/") ? "" : File.separator); String slash = (link.startsWith("/") ? "" : "/");
String modifiedLink = "url('" + "/site/" + resourceId + slash + link + "')"; String modifiedLink = "url('" + "/site/" + resourceId + slash + link + "')";
element.attr("style", parts[0] + modifiedLink + parts2[1]); element.attr("style", parts[0] + modifiedLink + parts2[1]);
} }

4
src/main/java/org/qortal/storage/DataFile.java
View File

@ -133,7 +133,7 @@ public class DataFile {
public static String getOutputFilePath(String base58Digest, boolean createDirectories) { public static String getOutputFilePath(String base58Digest, boolean createDirectories) {
String base58DigestFirst2Chars = base58Digest.substring(0, Math.min(base58Digest.length(), 2)); String base58DigestFirst2Chars = base58Digest.substring(0, Math.min(base58Digest.length(), 2));
String base58DigestNext2Chars = base58Digest.substring(2, Math.min(base58Digest.length(), 4)); 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); Path outputDirectoryPath = Paths.get(outputDirectory);
if (createDirectories) { if (createDirectories) {
@ -143,7 +143,7 @@ public class DataFile {
throw new IllegalStateException("Unable to create data subdirectory"); throw new IllegalStateException("Unable to create data subdirectory");
} }
} }
return String.format("%s/%s", outputDirectory, base58Digest); return outputDirectory + base58Digest;
} }
public ValidationResult isValid() { public ValidationResult isValid() {