diff --git a/lib/fonts/easy/font1.ttf b/lib/fonts/easy/font1.ttf deleted file mode 100644 index 4e4d0bb..0000000 Binary files a/lib/fonts/easy/font1.ttf and /dev/null differ diff --git a/lib/fonts/easy/font10.ttf b/lib/fonts/easy/font10.ttf deleted file mode 100644 index f73338f..0000000 Binary files a/lib/fonts/easy/font10.ttf and /dev/null differ diff --git a/lib/fonts/easy/font11.ttf b/lib/fonts/easy/font11.ttf deleted file mode 100644 index 57d3261..0000000 Binary files a/lib/fonts/easy/font11.ttf and /dev/null differ diff --git a/lib/fonts/easy/font12.ttf b/lib/fonts/easy/font12.ttf deleted file mode 100644 index 9fd7db6..0000000 Binary files a/lib/fonts/easy/font12.ttf and /dev/null differ diff --git a/lib/fonts/easy/font13.ttf b/lib/fonts/easy/font13.ttf deleted file mode 100644 index 7034910..0000000 Binary files a/lib/fonts/easy/font13.ttf and /dev/null differ diff --git a/lib/fonts/easy/font2.ttf b/lib/fonts/easy/font2.ttf deleted file mode 100644 index 4223d87..0000000 Binary files a/lib/fonts/easy/font2.ttf and /dev/null differ diff --git a/lib/fonts/easy/font3.ttf b/lib/fonts/easy/font3.ttf deleted file mode 100644 index 04b6343..0000000 Binary files a/lib/fonts/easy/font3.ttf and /dev/null differ diff --git a/lib/fonts/easy/font4.ttf b/lib/fonts/easy/font4.ttf deleted file mode 100644 index 9e83eb2..0000000 Binary files a/lib/fonts/easy/font4.ttf and /dev/null differ diff --git a/lib/fonts/easy/font5.ttf b/lib/fonts/easy/font5.ttf deleted file mode 100644 index 582207e..0000000 Binary files a/lib/fonts/easy/font5.ttf and /dev/null differ diff --git a/lib/fonts/easy/font6.ttf b/lib/fonts/easy/font6.ttf deleted file mode 100644 index 713fd93..0000000 Binary files a/lib/fonts/easy/font6.ttf and /dev/null differ diff --git a/lib/fonts/easy/font7.ttf b/lib/fonts/easy/font7.ttf deleted file mode 100644 index 917b80d..0000000 Binary files a/lib/fonts/easy/font7.ttf and /dev/null differ diff --git a/lib/fonts/easy/font8.ttf b/lib/fonts/easy/font8.ttf deleted file mode 100644 index c57ce67..0000000 Binary files a/lib/fonts/easy/font8.ttf and /dev/null differ diff --git a/lib/fonts/easy/font9.ttf b/lib/fonts/easy/font9.ttf deleted file mode 100644 index 47129b1..0000000 Binary files a/lib/fonts/easy/font9.ttf and /dev/null differ diff --git a/lib/fonts/hard/font1.ttf b/lib/fonts/hard/font1.ttf deleted file mode 100644 index acbece3..0000000 Binary files a/lib/fonts/hard/font1.ttf and /dev/null differ diff --git a/lib/fonts/hard/font2.ttf b/lib/fonts/hard/font2.ttf deleted file mode 100644 index d683481..0000000 Binary files a/lib/fonts/hard/font2.ttf and /dev/null differ diff --git a/lib/fonts/hard/font3.ttf b/lib/fonts/hard/font3.ttf deleted file mode 100644 index 8c804c3..0000000 Binary files a/lib/fonts/hard/font3.ttf and /dev/null differ diff --git a/lib/fonts/hard/font4.ttf b/lib/fonts/hard/font4.ttf deleted file mode 100644 index acd8f5d..0000000 Binary files a/lib/fonts/hard/font4.ttf and /dev/null differ diff --git a/lib/fonts/hard/font5.ttf b/lib/fonts/hard/font5.ttf deleted file mode 100644 index e68b709..0000000 Binary files a/lib/fonts/hard/font5.ttf and /dev/null differ diff --git a/lib/fonts/medium/font1.ttf b/lib/fonts/medium/font1.ttf deleted file mode 100644 index 8fdfed2..0000000 Binary files a/lib/fonts/medium/font1.ttf and /dev/null differ diff --git a/lib/fonts/medium/font10.ttf b/lib/fonts/medium/font10.ttf deleted file mode 100644 index c223040..0000000 Binary files a/lib/fonts/medium/font10.ttf and /dev/null differ diff --git a/lib/fonts/medium/font11.ttf b/lib/fonts/medium/font11.ttf deleted file mode 100644 index 8fdfed2..0000000 Binary files a/lib/fonts/medium/font11.ttf and /dev/null differ diff --git a/lib/fonts/medium/font12.ttf b/lib/fonts/medium/font12.ttf deleted file mode 100644 index 2e3b6a3..0000000 Binary files a/lib/fonts/medium/font12.ttf and /dev/null differ diff --git a/lib/fonts/medium/font13.ttf b/lib/fonts/medium/font13.ttf deleted file mode 100644 index 8fdfed2..0000000 Binary files a/lib/fonts/medium/font13.ttf and /dev/null differ diff --git a/lib/fonts/medium/font14.ttf b/lib/fonts/medium/font14.ttf deleted file mode 100644 index 70d9250..0000000 Binary files a/lib/fonts/medium/font14.ttf and /dev/null differ diff --git a/lib/fonts/medium/font2.ttf b/lib/fonts/medium/font2.ttf deleted file mode 100644 index ff3533a..0000000 Binary files a/lib/fonts/medium/font2.ttf and /dev/null differ diff --git a/lib/fonts/medium/font3.ttf b/lib/fonts/medium/font3.ttf deleted file mode 100644 index 8ab0b0e..0000000 Binary files a/lib/fonts/medium/font3.ttf and /dev/null differ diff --git a/lib/fonts/medium/font4.ttf b/lib/fonts/medium/font4.ttf deleted file mode 100644 index 8838073..0000000 Binary files a/lib/fonts/medium/font4.ttf and /dev/null differ diff --git a/lib/fonts/medium/font5.ttf b/lib/fonts/medium/font5.ttf deleted file mode 100644 index 46fcc85..0000000 Binary files a/lib/fonts/medium/font5.ttf and /dev/null differ diff --git a/lib/fonts/medium/font6.ttf b/lib/fonts/medium/font6.ttf deleted file mode 100644 index 96c9a52..0000000 Binary files a/lib/fonts/medium/font6.ttf and /dev/null differ diff --git a/lib/fonts/medium/font7.ttf b/lib/fonts/medium/font7.ttf deleted file mode 100644 index 8fdfed2..0000000 Binary files a/lib/fonts/medium/font7.ttf and /dev/null differ diff --git a/lib/fonts/medium/font8.ttf b/lib/fonts/medium/font8.ttf deleted file mode 100644 index ce7937e..0000000 Binary files a/lib/fonts/medium/font8.ttf and /dev/null differ diff --git a/lib/fonts/medium/font9.ttf b/lib/fonts/medium/font9.ttf deleted file mode 100644 index e9f3881..0000000 Binary files a/lib/fonts/medium/font9.ttf and /dev/null differ diff --git a/src/main/java/lc/FontFunCaptcha.java b/src/main/java/lc/FontFunCaptcha.java index 0b59e4f..3603b23 100644 --- a/src/main/java/lc/FontFunCaptcha.java +++ b/src/main/java/lc/FontFunCaptcha.java @@ -5,10 +5,7 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.File; -import java.nio.file.Paths; -import java.nio.file.Path; -import java.nio.file.Files; -import java.util.stream.Stream; +import java.io.FilenameFilter; public class FontFunCaptcha implements ChallengeProvider{ @@ -16,17 +13,24 @@ public class FontFunCaptcha implements ChallengeProvider{ return "FontFunCaptcha"; } - private int noOfFiles(String path,String level){ - try(Stream files = Files.list(Paths.get(path+level))){ - return (short)files.count()-1; - } catch (Exception e){ - e.printStackTrace(); - } - return 0; + private String getFontName(String path, String level){ + File file = new File(path+level+"/"); + FilenameFilter txtFileFilter = new FilenameFilter() { + @Override + public boolean accept(File dir, String name) + { + if(name.endsWith(".ttf")) + return true; + else + return false; + } + }; + File[] files = file.listFiles(txtFileFilter); + return path+level.toLowerCase()+"/"+files[HelperFunctions.randomNumber(0,files.length-1)].getName(); } - private Font loadCustomFont(String level, String path){ - String fontName = path+level.toLowerCase()+"/font"+HelperFunctions.randomNumber(1,noOfFiles(path,level))+".ttf"; + private Font loadCustomFont(String level, String path) { + String fontName = getFontName(path,level); try{ Font font = Font.createFont(Font.TRUETYPE_FONT, new File(fontName)); font = font.deriveFont(Font.PLAIN, 48f);