Skip to content
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

Jump to bottom

ERAttachment name with currency error #941

Merged
merged 3 commits into from
Jan 16, 2022
Merged

ERAttachment name with currency error #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8304804
Escape currency symbol while evaluating regex for template replacement
luizalfredo23 Mar 1, 2021
f4f7a1a
Use java method that already return literal pattern
luizalfredo23 Mar 1, 2021
db44d68
Comment lines that were previously commented
luizalfredo23 Mar 2, 2021
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
11 changes: 8 additions & 3 deletions ...ks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERAttachmentProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,14 @@ protected static String _parsePathTemplate(ERAttachment attachment, String templ
hashPathBuffer.append(filenameHash.charAt(1));
hashPathBuffer.append('/');
hashPathBuffer.append(filenameHash.charAt(2));
//hashPathBuffer.append('/');
//hashPathBuffer.append(filenameHash.substring(3));
// hashPathBuffer.append('/');
// hashPathBuffer.append(filenameHash.substring(3));
parsedPath = parsedPath.replaceAll(ERAttachmentProcessor.HASH_VARIABLE, hashPathBuffer.toString());

parsedPath = parsedPath.replaceAll(ERAttachmentProcessor.UUID_VARIABLE, UUID.randomUUID().toString());

parsedPath = parsedPath.replaceAll(ERAttachmentProcessor.FILE_NAME_VARIABLE, recommendedFileName);
parsedPath = parsedPath.replaceAll(ERAttachmentProcessor.FILE_NAME_VARIABLE, escapeCurrencyOf(recommendedFileName));

parsedPath = parsedPath.replaceAll(ERAttachmentProcessor.PK_VARIABLE, attachment.primaryKeyInTransaction());
return parsedPath;
}
Expand Down Expand Up @@ -462,4 +463,8 @@ public String getRecommendedFileName() {
return _recommendedFileName;
}
}

static String escapeCurrencyOf(String text) {
return text.replaceAll("\\$", "\\\\\\$");
}
}
9 changes: 6 additions & 3 deletions ...usinessLogic/ERAttachment/Sources/er/attachment/processors/ERFileAttachmentProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package er.attachment.processors;

import static java.util.regex.Pattern.quote;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
Expand Down Expand Up @@ -88,11 +90,12 @@ else if (!webPath.startsWith("/")) {
File actualFilesystemPath = ERXFileUtilities.reserveUniqueFile(desiredFilesystemPath, overwrite);

ERXFileUtilities.copyFileToFile(uploadedFile, actualFilesystemPath, pendingDelete, true);

String desiredFileName = escapeCurrencyOf(desiredFilesystemPath.getName());
String actualFileName = escapeCurrencyOf(actualFilesystemPath.getName());

String desiredFileName = desiredFilesystemPath.getName();
String actualFileName = actualFilesystemPath.getName();
// in case the name was not unique and changed, we need to update webPath ...
webPath = webPath.replaceAll("\\Q" + desiredFileName + "\\E$", actualFileName);
webPath = webPath.replaceAll(quote(desiredFileName), actualFileName);

attachment.setWebPath(webPath);
attachment.setFilesystemPath(actualFilesystemPath.getAbsolutePath());
Expand Down