Skip to content

fix isValidImageFilename #597

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

Open
wants to merge 3 commits into
base: release_2.0.x
Choose a base branch
from
Open

fix isValidImageFilename #597

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d8d50f
fix isValidImageFilename throwing IllegalArgumentException when Strin…
Sep 10, 2023
554075c
Merge branch 'release_2.0.x' into bugfix-isValidImageFilename
annguyen1291 Jan 30, 2024
0ac04fc
Update Commons.java
annguyen1291 Jan 30, 2024
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
19 changes: 19 additions & 0 deletions API/src/main/java/org/sikuli/script/support/Commons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
import java.nio.file.*;
import java.nio.file.FileSystem;
import java.security.CodeSource;
import java.util.List;
import java.util.*;
Expand Down Expand Up @@ -1435,6 +1436,24 @@ public static File asFile(Object path, String option) {
//</editor-fold>

//<editor-fold desc="20 library handling">
public static boolean isValidImageFilename(String fname) {
String validEndings = ".png.jpg.jpeg";
String ending = "";
try {
ending = FilenameUtils.getExtension(fname);
} catch(IllegalArgumentException e) {
return false;
}
return !ending.isEmpty() && validEndings.contains(ending.toLowerCase());
}

public static String getValidImageFilename(String fname) {
if (isValidImageFilename(fname)) {
return fname;
}
return fname + ".png";
}

public static String jnaPathAdd(String sFolder) {
String jnaPath = System.getProperty("jna.library.path");
if (null == jnaPath) {
Expand Down