From cada155b8e8a18214f512efebe8236aeb8a1f5f0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 14 Mar 2023 15:24:55 +0100 Subject: [PATCH] prep v0.3.1 --- CHANGELOG.md | 4 ++++ fsfwgen/__init__.py | 4 ++-- fsfwgen/returnvalues/returnvalues_parser.py | 13 +++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b62c126..26ff94e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). # [unreleased] +# [v0.3.1] + +- Sorted returnvalue export by raw returnvalue. + # [v0.3.0] - Description parser is now more generic and parses a list of meta informations. diff --git a/fsfwgen/__init__.py b/fsfwgen/__init__.py index 0c3d023..005bfab 100644 --- a/fsfwgen/__init__.py +++ b/fsfwgen/__init__.py @@ -1,5 +1,5 @@ -__version__ = "0.3.0" +__version__ = "0.3.1" VERSION_MAJOR = 0 VERSION_MINOR = 3 -VERSION_REVISION = 0 +VERSION_REVISION = 1 diff --git a/fsfwgen/returnvalues/returnvalues_parser.py b/fsfwgen/returnvalues/returnvalues_parser.py index 4e22dd4..02a8485 100644 --- a/fsfwgen/returnvalues/returnvalues_parser.py +++ b/fsfwgen/returnvalues/returnvalues_parser.py @@ -461,16 +461,17 @@ class ReturnValueParser(FileParser): f"Full ID (hex){column_sep} Name{column_sep} Description{column_sep} " f"Unique ID{column_sep} Subsytem Name{column_sep} File Path\n" ) - for entry in list_of_entries.items(): + for k, entry in sorted(list_of_entries.items()): + # entry: tuple if column_sep == ";": - entry[1].description = entry[1].description.replace(";", ",") + entry.description = entry.description.replace(";", ",") elif column_sep == ",": # Quote the description - entry[1].description = f'"{entry[1].description}"' + entry.description = f'"{entry.description}"' out.write( - f"{entry[0]:#06x}{column_sep}{entry[1].name}{column_sep}{entry[1].description}" - f"{column_sep}{entry[1].unique_id}{column_sep}{entry[1].subsystem_name}" - f"{column_sep}{entry[1].file_name.as_posix()}\n" + f"{k:#06x}{column_sep}{entry.name}{column_sep}{entry.description}" + f"{column_sep}{entry.unique_id}{column_sep}{entry.subsystem_name}" + f"{column_sep}{entry.file_name.as_posix()}\n" ) def build_checked_string(