From 4781a1b34fd53edcd74a9d4431c4ccfce505455f Mon Sep 17 00:00:00 2001 From: klemek Date: Sun, 8 Nov 2026 00:20:51 +0100 Subject: [PATCH] feat: sentences only mode --- README.md | 8 +++++--- src/glsl_glyphs/__main__.py | 8 +++++--- src/glsl_glyphs/params.py | 8 +++++++- src/glsl_glyphs/reader.py | 4 ++++ 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c0339ce..6529084 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ ## Usage ```txt -usage: glsl-glyphs [-h] -i INPUT_FILE [-n NAME] [-o OUTPUT_FILE] [-g NAMES_FILE] [-s SETS_FILE] [-f | --functions | --no-functions] - [--sentences-input SENTENCES_FILE] [--sentences-output OUTPUT_FILE] [-v | --verbose | --no-verbose] - [-q | --quiet | --no-quiet] +usage: glsl-glyphs [-h] [-i INPUT_FILE] [-n NAME] [-o OUTPUT_FILE] [-g NAMES_FILE] [-s SETS_FILE] [-f | --functions | --no-functions] + [--sentences-input SENTENCES_FILE] [--sentences-output OUTPUT_FILE] [--sentences-only | --no-sentences-only] + [-v | --verbose | --no-verbose] [-q | --quiet | --no-quiet] options: -h, --help show this help message and exit @@ -27,6 +27,8 @@ options: generate sentences from file and names --sentences-output OUTPUT_FILE output sentences glsl file (default: build/{name}_sentences.glsl) + --sentences-only, --no-sentences-only + generate only sentences from names (does not read input image) -v, --verbose, --no-verbose more verbose logging -q, --quiet, --no-quiet diff --git a/src/glsl_glyphs/__main__.py b/src/glsl_glyphs/__main__.py index dae43a1..d46f107 100644 --- a/src/glsl_glyphs/__main__.py +++ b/src/glsl_glyphs/__main__.py @@ -13,9 +13,11 @@ def main() -> int: setup_logs(params) logging.getLogger().info("%s %s", PKG_NAME, PKG_VERSION) - glyphs, sets, sentences = Reader(params).read() - - Generator(params).generate_glsl_glyphs(glyphs, sets) + if not params.sentences_only: + glyphs, sets, sentences = Reader(params).read() + Generator(params).generate_glsl_glyphs(glyphs, sets) + else: + sentences = Reader(params).read_sentences() if len(sentences): Generator(params).generate_glsl_sentences(sentences) diff --git a/src/glsl_glyphs/params.py b/src/glsl_glyphs/params.py index 89bb439..7246af6 100644 --- a/src/glsl_glyphs/params.py +++ b/src/glsl_glyphs/params.py @@ -15,6 +15,7 @@ class Parameters: functions: bool = False source_sentences_path: str | None = None target_sentences_path: str | None = None + sentences_only: bool = False verbose: bool = False quiet: bool = False @@ -32,7 +33,6 @@ def parse_parameters(args: typing.Sequence[str]) -> Parameters: parser.add_argument( "-i", "--input", - required=True, metavar="INPUT_FILE", dest="source_image_path", help="png 8x8 glyph map", @@ -85,6 +85,12 @@ def parse_parameters(args: typing.Sequence[str]) -> Parameters: dest="target_sentences_path", help="output sentences glsl file (default: build/{name}_sentences.glsl)", ) + parser.add_argument( + "--sentences-only", + action=argparse.BooleanOptionalAction, + default=default_values.verbose, + help="generate only sentences from names (does not read input image)", + ) parser.add_argument( "-v", "--verbose", diff --git a/src/glsl_glyphs/reader.py b/src/glsl_glyphs/reader.py index 2794c05..f0a3f90 100644 --- a/src/glsl_glyphs/reader.py +++ b/src/glsl_glyphs/reader.py @@ -42,6 +42,10 @@ class Reader: return glyphs, sets, sentences + def read_sentences(self) -> list[Sentence]: + names = self.__read_names() + return self.__read_sentences(names) + def __read_image(self) -> list[Glyph]: try: img = Image.open(self.source_image_path).convert("1")