From f004036e8e7137f26d8720e48c6f0c5bad79840e Mon Sep 17 00:00:00 2001 From: Alexandre Marcireau Date: Sat, 6 May 2023 09:13:43 +1000 Subject: [PATCH] Several minor fixes --- charidotella/__init__.py | 2 +- charidotella/tasks/spectrogram.py | 2 +- charidotella/version.py | 2 +- command_line_tools | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charidotella/__init__.py b/charidotella/__init__.py index 2730859..009f089 100644 --- a/charidotella/__init__.py +++ b/charidotella/__init__.py @@ -332,7 +332,7 @@ def run_generators(configuration: dict[str, typing.Any]): ) paths = [ path.resolve() - for path in pathlib.Path(".").rglob(args.glob) + for path in pathlib.Path(".").glob(args.glob) if path.is_file() and path.suffix == ".es" ] paths.sort(key=lambda path: (path.stem, path.parent)) diff --git a/charidotella/tasks/spectrogram.py b/charidotella/tasks/spectrogram.py index 600e209..9d8b649 100644 --- a/charidotella/tasks/spectrogram.py +++ b/charidotella/tasks/spectrogram.py @@ -17,7 +17,7 @@ def run( str(importlib.resources.files("charidotella").joinpath("assets/spectrogram")), str(input), str(output), - str(output.with_suffix(".json")), + str((output.parent / output.stem).with_suffix(".json")), f"--begin={begin}", f"--end={end}", f"--tau={parameters['tau']}", diff --git a/charidotella/version.py b/charidotella/version.py index 4802e90..6849410 100644 --- a/charidotella/version.py +++ b/charidotella/version.py @@ -1 +1 @@ -__version__ = "1.0" +__version__ = "1.1.0" diff --git a/command_line_tools b/command_line_tools index acbf7a6..97375b1 160000 --- a/command_line_tools +++ b/command_line_tools @@ -1 +1 @@ -Subproject commit acbf7a6643001f6c487198212fd9ac26a0be2f1d +Subproject commit 97375b121bdfd34bffa48a6f41258f1b6fba198e