Add --font_dir argument

Author: Belval

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 python:
-  - "3.5"
+  - "3.6"
 install:
   - pip install -r requirements-hw.txt
   - pip install codecov

README.md

@@ -31,6 +31,7 @@ docker run -v /output/path/:/app/out/ -t belval/trdg:latest trdg [args]
 The path (`/output/path/`) must be absolute.
 
 ## New
+- Add `--font_dir` argument to specify the fonts to use
 - Add `--output_mask` to output character-level mask for each image
 - Add `--character_spacing` to control space between characters (in pixels)
 - Add python module

tests.py

@@ -803,6 +803,33 @@ def test_personalfont_unlocated(self):
         self.assertTrue(len(os.listdir("tests/out/")) == 0)
         empty_directory("tests/out/")
 
+    def test_personalfont_directory(self):
+        args = [
+            "python3", "run.py",
+            "--font_dir",
+            "fonts/latin/",
+            "-c",
+            "1",
+            "--output_dir",
+            "../tests/out/",
+        ]
+        subprocess.Popen(args, cwd="trdg/").wait()
+        self.assertTrue(len(os.listdir("tests/out/")) == 1)
+        empty_directory("tests/out/")
+
+    def test_personalfont_directory_unlocated(self):
+        args = [
+            "python3", "run.py",
+            "--font_dir",
+            "fonts/void/",
+            "-c",
+            "1",
+            "--output_dir",
+            "../tests/out/",
+        ]
+        subprocess.Popen(args, cwd="trdg/").wait()
+        self.assertTrue(len(os.listdir("tests/out/")) == 0)
+        empty_directory("tests/out/")
 
 #    def test_word_count(self):
 #        args = ['python3', 'run.py', '-c', '1', '-w', '5']

trdg/generators/from_strings.py

@@ -94,4 +94,4 @@ def next(self):
                 self.output_mask,
             ),
             self.strings[(self.generated_count - 1) % len(self.strings)],
-        )
+        )

trdg/run.py

@@ -275,6 +275,9 @@ def parse_arguments():
     parser.add_argument(
         "-ft", "--font", type=str, nargs="?", help="Define font to be used"
     )
+    parser.add_argument(
+        "-fd", "--font_dir", type=str, nargs="?", help="Define a font directory to be used"
+    )
     parser.add_argument(
         "-ca",
         "--case",
@@ -304,13 +307,19 @@ def main():
     lang_dict = load_dict(args.language)
 
     # Create font (path) list
-    if not args.font:
-        fonts = load_fonts(args.language)
-    else:
+    if args.font_dir:
+        fonts = [
+            os.path.join(args.font_dir, p)
+            for p in os.listdir(args.font_dir)
+            if os.path.splitext(p)[1] == ".ttf"
+        ]
+    elif args.font:
         if os.path.isfile(args.font):
             fonts = [args.font]
         else:
             sys.exit("Cannot open font")
+    else:
+        fonts = load_fonts(args.language)
 
     # Creating synthetic sentences (or word)
     strings = []