Skip to content

Commit

Permalink
fix(#59): allow spaces in sanitizeFleName
Browse files Browse the repository at this point in the history
  • Loading branch information
DropSnorz committed Jan 10, 2021
1 parent 90456d8 commit 78ce7a1
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,9 @@ public static String convertPath(String path) {
return path.replace("\\", "/");
}

public static boolean isFilenameValid(String fileName) {

return fileName != null && !fileName.equals("") && fileName.matches("[-_.A-Za-z0-9]*");
}

public static String sanitizeFileName(String fileName) {

return fileName.replaceAll("[^-_.A-Za-z0-9]", "");
return fileName.replaceAll("[^-_.A-Za-z0-9 ]", "").trim().replaceAll("\\s+"," ");

}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.owlplug.core.utils;

import static org.junit.Assert.assertEquals;

import org.junit.Test;

public class FileUtilsTest {

@Test
public void testSanitizeFileNameWithRegularsChars() {
String sanitizedFileName = FileUtils.sanitizeFileName("File-name0_.test");
assertEquals("File-name0_.test", sanitizedFileName);
}

@Test
public void testSanitizeFileNameWithExtraSpaces() {
String sanitizedFileName = FileUtils.sanitizeFileName(" file name ");
assertEquals("file name", sanitizedFileName);
}

@Test
public void testSanitizeFileNameWithWhitespacesChars() {
String sanitizedFileName = FileUtils.sanitizeFileName("\tfile\n\nname");
assertEquals("filename", sanitizedFileName);
}

@Test
public void testSanitizeFileNameWithIllegalChars() {
String sanitizedFileName = FileUtils.sanitizeFileName("fi/len%am[e]");
assertEquals("filename", sanitizedFileName);
}

}

0 comments on commit 78ce7a1

Please sign in to comment.