Add recursive font search in a directory

DEVSIX-3137

Author: Fedorov Alexandr

io/src/main/java/com/itextpdf/io/font/FontProgramFactory.java

@@ -443,6 +443,17 @@ public static int registerFontDirectory(String dir) {
         return fontRegisterProvider.registerFontDirectory(dir);
     }
 
+
+    /**
+     * Register all the fonts in a directory recursively.
+     *
+     * @param dir the directory
+     * @return the number of fonts registered
+     */
+    public static int registerFontDirectoryRecursively(String dir) {
+        return fontRegisterProvider.registerFontDirectory(dir, true);
+    }
+
     /**
      * Register fonts in some probable directories. It usually works in Windows,
      * Linux and Solaris.

io/src/test/java/com/itextpdf/io/font/FontProgramTest.java

@@ -29,6 +29,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.ExtendedITextTest;
 
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Tag;
 import java.io.IOException;
@@ -38,6 +39,13 @@ This file is part of the iText (R) project.
 public class FontProgramTest extends ExtendedITextTest {
     private static final String notExistingFont = "some-font.ttf";
 
+    @BeforeEach
+    public void clearFonts(){
+        FontProgramFactory.clearRegisteredFonts();
+        FontProgramFactory.clearRegisteredFontFamilies();
+        FontCache.clearSavedFonts();
+    }
+
     @Test
     public void exceptionMessageTest() throws IOException {
         Exception e = Assertions.assertThrows(java.io.IOException.class,
@@ -72,6 +80,15 @@ public void registerDirectoryType1Test() throws IOException {
         FontProgramFactory.registerFontDirectory("./src/test/resources/com/itextpdf/io/font/type1/");
         FontProgram computerModern = FontProgramFactory.createRegisteredFont("computer modern");
         FontProgram cmr10 = FontProgramFactory.createRegisteredFont("cmr10");
+        Assertions.assertNull(computerModern);
+        Assertions.assertNull(cmr10);
+    }
+
+    @Test
+    public void registerDirectoryType1RecursivelyTest() throws IOException {
+        FontProgramFactory.registerFontDirectoryRecursively("./src/test/resources/com/itextpdf/io/font/type1/");
+        FontProgram computerModern = FontProgramFactory.createRegisteredFont("computer modern");
+        FontProgram cmr10 = FontProgramFactory.createRegisteredFont("cmr10");
         Assertions.assertNotNull(computerModern);
         Assertions.assertNotNull(cmr10);
     }

io/src/test/resources/com/itextpdf/io/font/type1/cmr10.afm renamed to io/src/test/resources/com/itextpdf/io/font/type1/testPackage/cmr10.afm

@@ -425,6 +425,7 @@ public static PdfType3Font createType3Font(PdfDocument document, String fontName
      * @see PdfFontFactory#register(String, String)
      * @see PdfFontFactory#registerFamily(String, String, String)
      * @see PdfFontFactory#registerDirectory(String)
+     * @see PdfFontFactory#registerDirectoryRecursively(String)
      * @see PdfFontFactory#registerSystemDirectories()
      * @see PdfFontFactory#getRegisteredFamilies()
      * @see PdfFontFactory#getRegisteredFonts()
@@ -453,6 +454,7 @@ public static PdfFont createRegisteredFont(String fontName, String encoding,
      * @see PdfFontFactory#register(String, String)
      * @see PdfFontFactory#registerFamily(String, String, String)
      * @see PdfFontFactory#registerDirectory(String)
+     * @see PdfFontFactory#registerDirectoryRecursively(String)
      * @see PdfFontFactory#registerSystemDirectories()
      * @see PdfFontFactory#getRegisteredFamilies()
      * @see PdfFontFactory#getRegisteredFonts()
@@ -479,6 +481,7 @@ public static PdfFont createRegisteredFont(String fontName, String encoding,
      * @see PdfFontFactory#register(String, String)
      * @see PdfFontFactory#registerFamily(String, String, String)
      * @see PdfFontFactory#registerDirectory(String)
+     * @see PdfFontFactory#registerDirectoryRecursively(String)
      * @see PdfFontFactory#registerSystemDirectories()
      * @see PdfFontFactory#getRegisteredFamilies()
      * @see PdfFontFactory#getRegisteredFonts()
@@ -506,6 +509,7 @@ public static PdfFont createRegisteredFont(String fontName, String encoding,
      * @see PdfFontFactory#register(String, String)
      * @see PdfFontFactory#registerFamily(String, String, String)
      * @see PdfFontFactory#registerDirectory(String)
+     * @see PdfFontFactory#registerDirectoryRecursively(String)
      * @see PdfFontFactory#registerSystemDirectories()
      * @see PdfFontFactory#getRegisteredFamilies()
      * @see PdfFontFactory#getRegisteredFonts()
@@ -527,6 +531,7 @@ public static PdfFont createRegisteredFont(String fontName, String encoding,
      * @see PdfFontFactory#register(String, String)
      * @see PdfFontFactory#registerFamily(String, String, String)
      * @see PdfFontFactory#registerDirectory(String)
+     * @see PdfFontFactory#registerDirectoryRecursively(String)
      * @see PdfFontFactory#registerSystemDirectories()
      * @see PdfFontFactory#getRegisteredFamilies()
      * @see PdfFontFactory#getRegisteredFonts()
@@ -546,6 +551,7 @@ public static PdfFont createRegisteredFont(String fontName, String encoding) thr
      * @see PdfFontFactory#register(String, String)
      * @see PdfFontFactory#registerFamily(String, String, String)
      * @see PdfFontFactory#registerDirectory(String)
+     * @see PdfFontFactory#registerDirectoryRecursively(String)
      * @see PdfFontFactory#registerSystemDirectories()
      * @see PdfFontFactory#getRegisteredFamilies()
      * @see PdfFontFactory#getRegisteredFonts()
@@ -596,6 +602,17 @@ public static int registerDirectory(String dirPath) {
         return FontProgramFactory.registerFontDirectory(dirPath);
     }
 
+
+    /**
+     * Registers all the fonts in a directory recursively.
+     *
+     * @param dirPath the directory path to be registered as a font directory path
+     * @return the number of fonts registered
+     */
+    public static int registerDirectoryRecursively(String dirPath) {
+        return FontProgramFactory.registerFontDirectoryRecursively(dirPath);
+    }
+
     /**
      * Register fonts in some probable directories. It usually works in Windows,
      * Linux and Solaris.

io/src/test/resources/com/itextpdf/io/font/type1/cmr10.pfb renamed to io/src/test/resources/com/itextpdf/io/font/type1/testPackage/cmr10.pfb

@@ -1922,6 +1922,17 @@ public void testFontDirectoryRegister() throws IOException {
         pdfDoc.close();
     }
 
+    @Test
+    public void fontDirectoryRegisterRecursivelyTest() throws IOException {
+        PdfFontFactory.registerDirectoryRecursively(sourceFolder);
+        for (String name : PdfFontFactory.getRegisteredFonts()) {
+            PdfFont pdfFont = PdfFontFactory.createRegisteredFont(name);
+            if (pdfFont == null) {
+                Assertions.assertTrue(false, "Font {" + name + "} can't be empty");
+            }
+        }
+    }
+
     @Test
     public void fontRegisterTest() throws IOException {
         FontProgramFactory.registerFont(fontsFolder + "NotoSerif-Regular_v1.7.ttf", "notoSerifRegular");