Skip to content

Commit 11ad09c

Browse files
committed
jenc extension handling, unit test
1 parent 46b38a2 commit 11ad09c

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

app/src/main/java/net/gsantner/opoc/util/GsFileUtils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,8 @@ public static String getFilenameWithoutExtension(final File file) {
728728
return getNameWithoutExtension(file.getName());
729729
}
730730

731-
public static String getNameWithoutExtension(final String fileName) {
731+
public static String getNameWithoutExtension(String fileName) {
732+
fileName = fileName.replace(".jenc", "");
732733
final int doti = fileName.lastIndexOf(".");
733734
return (doti < 0) ? fileName : fileName.substring(0, doti);
734735
}
@@ -740,6 +741,7 @@ public static String getFilenameExtension(final File file) {
740741
/// Get the file extension of the file, with dot
741742
/// @return "" -> "", "index" -> "", "index.html" -> ".html", "my.website.html" -> ".html"
742743
public static String getFilenameExtension(String name) {
744+
name = name.replace(".jenc", "");
743745
return name.contains(".") ? name.replaceAll(".*?(\\.[^.]+)$", "$1") : "";
744746
}
745747

app/src/test/java/net/gsantner/opoc/util/GsFileUtilsTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public void getFilenameExtension() {
1717
assertEquals("", GsFileUtils.getFilenameExtension(""));
1818
assertEquals("", GsFileUtils.getFilenameExtension("index"));
1919
assertEquals(".md", GsFileUtils.getFilenameExtension("hello.md"));
20+
assertEquals(".md", GsFileUtils.getFilenameExtension("hello.md.jenc"));
2021
assertEquals(".html", GsFileUtils.getFilenameExtension("hello.html"));
2122
assertEquals(".html", GsFileUtils.getFilenameExtension("my.cool.website.html"));
2223
}
@@ -25,6 +26,7 @@ public void getFilenameExtension() {
2526
public void getNameWithoutExtension() {
2627
assertEquals("", GsFileUtils.getNameWithoutExtension(""));
2728
assertEquals("index", GsFileUtils.getNameWithoutExtension("index"));
29+
assertEquals("hello", GsFileUtils.getNameWithoutExtension("hello.md.jenc"));
2830
assertEquals("hello", GsFileUtils.getNameWithoutExtension("hello.md"));
2931
assertEquals("hello", GsFileUtils.getNameWithoutExtension("hello.html"));
3032
assertEquals("my.cool.website", GsFileUtils.getNameWithoutExtension("my.cool.website.html"));

0 commit comments

Comments
 (0)