mirror of
https://github.com/daylinmorgan/monolisa-nerdfont-patch.git
synced 2024-12-22 06:50:44 -06:00
fix: use absolute paths as necessary to mirror input directories
This commit is contained in:
parent
8882d9c50d
commit
326445e89c
2 changed files with 20 additions and 14 deletions
|
@ -3,6 +3,8 @@
|
||||||
import sys
|
import sys
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
EXTS = ["otf", "ttf", "woff", "woff2"]
|
||||||
|
|
||||||
|
|
||||||
def find_files(search_path, exts=None):
|
def find_files(search_path, exts=None):
|
||||||
return (
|
return (
|
||||||
|
@ -18,7 +20,7 @@ def main():
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
search_path = Path(sys.argv[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):
|
for f in find_files(search_path, exts):
|
||||||
sys.stdout.write(f"-f '{f}' ")
|
sys.stdout.write(f"-f '{f}' ")
|
||||||
|
|
|
@ -10,7 +10,7 @@ import time
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import List, Set
|
from typing import List, Set
|
||||||
|
|
||||||
# EXTS = ["otf", "ttf", "woff", "woff2"]
|
FONT_SRC = (Path(__file__).parent.parent / "MonoLisa").absolute()
|
||||||
|
|
||||||
|
|
||||||
class Color:
|
class Color:
|
||||||
|
@ -132,9 +132,10 @@ def get_args():
|
||||||
def patch_single_font(
|
def patch_single_font(
|
||||||
font_path: Path, output_dir: Path, fp_args: str, verbose: bool
|
font_path: Path, output_dir: Path, fp_args: str, verbose: bool
|
||||||
) -> None:
|
) -> None:
|
||||||
display_name = f"{font_path.parent.name}/{font_path.name}"
|
# update display name to full resolved path
|
||||||
output_path = output_dir / font_path.parent.name.replace("MonoLisa/", "")
|
rel_path = font_path.absolute().relative_to(FONT_SRC)
|
||||||
output_path.mkdir(exist_ok=True)
|
output_path = (output_dir / rel_path).parent
|
||||||
|
output_path.mkdir(exist_ok=True, parents=True)
|
||||||
|
|
||||||
cmd = [
|
cmd = [
|
||||||
"fontforge",
|
"fontforge",
|
||||||
|
@ -144,10 +145,12 @@ def patch_single_font(
|
||||||
"./src/glyphs/",
|
"./src/glyphs/",
|
||||||
"-out",
|
"-out",
|
||||||
f"{output_path}",
|
f"{output_path}",
|
||||||
*fp_args.split(" "),
|
f"{font_path.absolute()}",
|
||||||
f"{font_path}",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if fp_args:
|
||||||
|
cmd += fp_args.split(" ")
|
||||||
|
|
||||||
if verbose:
|
if verbose:
|
||||||
echo(f"cmd: {' '.join(cmd)}")
|
echo(f"cmd: {' '.join(cmd)}")
|
||||||
run_cmd(cmd, font_path, verbose)
|
run_cmd(cmd, font_path, verbose)
|
||||||
|
@ -159,19 +162,18 @@ def patch_single_font(
|
||||||
|
|
||||||
run_cmd(cmd, font_path, verbose)
|
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]:
|
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(
|
def patch_font_dir_docker(
|
||||||
font_dir_path: Path, output_dir: Path, fp_args: str, verbose: bool
|
font_dir_path: Path, output_dir: Path, fp_args: str, verbose: bool
|
||||||
) -> None:
|
) -> None:
|
||||||
font_dir_path = font_dir_path.resolve()
|
output_path = (output_dir / font_dir_path.relative_to(FONT_SRC)).absolute()
|
||||||
output_path = (output_dir / font_dir_path.name).resolve()
|
output_path.mkdir(exist_ok=True, parents=True)
|
||||||
output_path.mkdir(exist_ok=True)
|
|
||||||
|
|
||||||
cmd = [
|
cmd = [
|
||||||
"docker",
|
"docker",
|
||||||
|
@ -184,9 +186,11 @@ def patch_font_dir_docker(
|
||||||
"-u",
|
"-u",
|
||||||
f"{os.getuid()}:{os.getegid()}",
|
f"{os.getuid()}:{os.getegid()}",
|
||||||
"nerdfonts/patcher",
|
"nerdfonts/patcher",
|
||||||
*fp_args.split(" "),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if fp_args:
|
||||||
|
cmd += fp_args.split(" ")
|
||||||
|
|
||||||
# ignoring the fact that docker exits with code 1
|
# ignoring the fact that docker exits with code 1
|
||||||
if verbose:
|
if verbose:
|
||||||
echo(f"cmd: {' '.join(cmd)}")
|
echo(f"cmd: {' '.join(cmd)}")
|
||||||
|
@ -218,7 +222,7 @@ def main():
|
||||||
if args.verbose:
|
if args.verbose:
|
||||||
echo(f"Patching the following files")
|
echo(f"Patching the following files")
|
||||||
for fontfile in args.font_path:
|
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:
|
if args.docker:
|
||||||
echo("==> DOCKER MODE ENABLED")
|
echo("==> DOCKER MODE ENABLED")
|
||||||
for font_dir in collect_files_by_dir(args.font_path):
|
for font_dir in collect_files_by_dir(args.font_path):
|
||||||
|
|
Loading…
Reference in a new issue