From 6132f895f5844e85719d7e4b2ae92a5fda31848f Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 26 Feb 2025 17:14:34 -0800 Subject: [PATCH] trim again --- {{cookiecutter.out_dir}}/.vars | 2 +- {{cookiecutter.out_dir}}/_macros.jinja2 | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/{{cookiecutter.out_dir}}/.vars b/{{cookiecutter.out_dir}}/.vars index ef60fab..cbb3258 100644 --- a/{{cookiecutter.out_dir}}/.vars +++ b/{{cookiecutter.out_dir}}/.vars @@ -5,4 +5,4 @@ {% import "_macros.jinja2" as macros %} {% set min_sdk_version = macros.get_value(cookiecutter.pyproject, "tool.flet.android.min_sdk_version") %} -min_sdk_version: {{ min_sdk_version }} \ No newline at end of file +min_sdk_version: {{ min_sdk_version | trim }} \ No newline at end of file diff --git a/{{cookiecutter.out_dir}}/_macros.jinja2 b/{{cookiecutter.out_dir}}/_macros.jinja2 index 992af78..9c75688 100644 --- a/{{cookiecutter.out_dir}}/_macros.jinja2 +++ b/{{cookiecutter.out_dir}}/_macros.jinja2 @@ -1,16 +1,16 @@ {# _macros.jinja2 #} -{% macro get_value(dict, path) -%} +{% macro get_value(dict, path) %} {# Split the path into keys #} {% set keys = path.split('.') %} - {% if keys and dict is mapping and keys[0] in dict -%} + {% if keys and dict is mapping and keys[0] in dict %} {% set next_value = dict[keys[0]] %} - {% if keys | length == 1 -%} - {{ next_value | string | trim }} - {%- else -%} - {{ get_value(next_value, keys[1:] | join('.')) | string | trim }} - {%- endif %} - {%- else -%} + {% if keys | length == 1 %} + {{ next_value }} + {% else %} + {{ get_value(next_value, keys[1:] | join('.')) }} + {% endif %} + {% else %} {{ none }} - {%- endif %} -{%- endmacro %} \ No newline at end of file + {% endif %} +{% endmacro %} \ No newline at end of file