From 326445e89c4656e1548ae099e97b2d614094bb0a Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Tue, 3 Jan 2023 13:19:40 -0600
Subject: [PATCH] fix: use absolute paths as necessary to mirror input
 directories

---
 bin/get-font-files |  4 +++-
 bin/patch-monolisa | 30 +++++++++++++++++-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/bin/get-font-files b/bin/get-font-files
index d2f237a..da9f108 100755
--- a/bin/get-font-files
+++ b/bin/get-font-files
@@ -3,6 +3,8 @@
 import sys
 from pathlib import Path
 
+EXTS = ["otf", "ttf", "woff", "woff2"]
+
 
 def find_files(search_path, exts=None):
     return (
@@ -18,7 +20,7 @@ def main():
         exit(1)
 
     search_path = Path(sys.argv[1])
-    exts = sys.argv[2].split(",") if len(sys.argv) == 3 else None
+    exts = sys.argv[2].split(",") if len(sys.argv) == 3 else EXTS
 
     for f in find_files(search_path, exts):
         sys.stdout.write(f"-f '{f}' ")
diff --git a/bin/patch-monolisa b/bin/patch-monolisa
index b5e9495..910e5cc 100755
--- a/bin/patch-monolisa
+++ b/bin/patch-monolisa
@@ -10,7 +10,7 @@ import time
 from pathlib import Path
 from typing import List, Set
 
-# EXTS = ["otf", "ttf", "woff", "woff2"]
+FONT_SRC = (Path(__file__).parent.parent / "MonoLisa").absolute()
 
 
 class Color:
@@ -132,9 +132,10 @@ def get_args():
 def patch_single_font(
     font_path: Path, output_dir: Path, fp_args: str, verbose: bool
 ) -> None:
-    display_name = f"{font_path.parent.name}/{font_path.name}"
-    output_path = output_dir / font_path.parent.name.replace("MonoLisa/", "")
-    output_path.mkdir(exist_ok=True)
+    # update display name to full resolved path
+    rel_path = font_path.absolute().relative_to(FONT_SRC)
+    output_path = (output_dir / rel_path).parent
+    output_path.mkdir(exist_ok=True, parents=True)
 
     cmd = [
         "fontforge",
@@ -144,10 +145,12 @@ def patch_single_font(
         "./src/glyphs/",
         "-out",
         f"{output_path}",
-        *fp_args.split(" "),
-        f"{font_path}",
+        f"{font_path.absolute()}",
     ]
 
+    if fp_args:
+        cmd += fp_args.split(" ")
+    
     if verbose:
         echo(f"cmd: {' '.join(cmd)}")
         run_cmd(cmd, font_path, verbose)
@@ -159,19 +162,18 @@ def patch_single_font(
 
             run_cmd(cmd, font_path, verbose)
 
-    echo(f"{display_name} patched!", hue="green")
+    echo(f"{rel_path} patched!", hue="green")
 
 
 def collect_files_by_dir(fontfiles: List[Path]) -> Set[Path]:
-    return set([f.parent for f in fontfiles])
+    return set([f.parent.absolute() for f in fontfiles])
 
 
 def patch_font_dir_docker(
     font_dir_path: Path, output_dir: Path, fp_args: str, verbose: bool
 ) -> None:
-    font_dir_path = font_dir_path.resolve()
-    output_path = (output_dir / font_dir_path.name).resolve()
-    output_path.mkdir(exist_ok=True)
+    output_path = (output_dir / font_dir_path.relative_to(FONT_SRC)).absolute()
+    output_path.mkdir(exist_ok=True, parents=True)
 
     cmd = [
         "docker",
@@ -184,9 +186,11 @@ def patch_font_dir_docker(
         "-u",
         f"{os.getuid()}:{os.getegid()}",
         "nerdfonts/patcher",
-        *fp_args.split(" "),
     ]
 
+    if fp_args:
+        cmd += fp_args.split(" ")
+
     # ignoring the fact that docker exits with code 1
     if verbose:
         echo(f"cmd: {' '.join(cmd)}")
@@ -218,7 +222,7 @@ def main():
     if args.verbose:
         echo(f"Patching the following files")
         for fontfile in args.font_path:
-            sys.stdout.write(f"  {color.cyan}->{color.end} {fontfile}\n")
+            sys.stdout.write(f"  {color.magenta}->{color.end} {fontfile}\n")
     if args.docker:
         echo("==> DOCKER MODE ENABLED")
         for font_dir in collect_files_by_dir(args.font_path):