Skip to content

Commit 3f211a9

Browse files
committed
Dev: ra
1 parent dd8e4e4 commit 3f211a9

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

crmsh/ra.py

+14-9
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,12 @@ def params(self):
428428
"longdesc": get_nodes_text(param, "longdesc")
429429
}
430430

431-
# Sort the dictionary by required and then alphabetically
432431
items = list(params_dict.items())
433-
items.sort(key=lambda x: (x[1]["required"] != "1", x[0]))
432+
# Sort the dictionary by:
433+
# 1. Required parameters first
434+
# 2. Alphabetically by name
435+
# 3. Deprecated parameters last
436+
items.sort(key=lambda x: (x[1]["deprecated"] == "1", x[1]["required"] != "1", x[0]))
434437
params_dict = dict(items)
435438

436439
return cache.store(ident, params_dict)
@@ -766,6 +769,13 @@ def format_parameter(self, name: str, parameter_dict: dict) -> str:
766769

767770
def format_header(name: str, parameter_dict: dict) -> str:
768771
header_str = f"{name}"
772+
if parameter_dict.get("required") == "1":
773+
header_str += "*"
774+
if parameter_dict.get("deprecated") == "1":
775+
header_str += " (deprecated)"
776+
obsoletes = parameter_dict.get("obsoletes")
777+
if obsoletes:
778+
header_str += f" (obsoletes: {obsoletes})"
769779

770780
typ, default = parameter_dict.get("type"), parameter_dict.get("default")
771781
if typ and default:
@@ -774,18 +784,13 @@ def format_header(name: str, parameter_dict: dict) -> str:
774784
header_str += f" ({typ}):"
775785

776786
attr_str_map = {
777-
"required": "Required",
778787
"advanced": "Advanced Use Only",
779-
"generated": "Automatically generated by pacemaker",
780-
"deprecated": "Deprecated"
788+
"generated": "Automatically generated by pacemaker"
781789
}
782790
attr_str_list = [
783791
desc for attr, desc in attr_str_map.items()
784792
if parameter_dict.get(attr) == "1"
785793
]
786-
obsoletes = parameter_dict.get("obsoletes")
787-
if obsoletes:
788-
attr_str_list.append(f"Obsoletes {obsoletes}")
789794
if attr_str_list:
790795
header_str += f" *** {'; '.join(attr_str_list)} ***"
791796

@@ -836,7 +841,7 @@ def meta_parameters(self) -> str:
836841
if res:
837842
parameter_str_list.append(res)
838843
if parameter_str_list:
839-
return "## Parameters (type, [default]):\n\n" + '\n'.join(parameter_str_list)
844+
return "## Parameters (*: required, []: default):\n\n" + '\n'.join(parameter_str_list)
840845

841846
def meta_actions(self):
842847
def meta_action_head(n):

0 commit comments

Comments
 (0)