Merge branch 'add_all_module_db' into 'master'

ADD: ascii printing of all modules

See merge request Pmodules/Pmodules_tools!15
This commit is contained in:
2023-02-22 13:43:38 +00:00
2 changed files with 19 additions and 6 deletions

View File

@ -12,8 +12,6 @@ endif::[]
== News == News
TBW
== New/Changed/Removed Modules == New/Changed/Removed Modules
=== New Modules === New Modules
@ -23,6 +21,11 @@ include::new_modules.adoc[]
include::changed_modules.adoc[] include::changed_modules.adoc[]
=== Removed Modules === Deleted Modules
include::deleted_modules.adoc[] include::deleted_modules.adoc[]
[%collapsible]
== All Modules
include::all_modules.adoc[]

View File

@ -98,7 +98,7 @@ def db_check_diff(current_pmodule_state, Pmodules_db_path, Pmodules_states):
current_pmodule_state, old_pmodule_state, Pmodules_states, Pmodules_db_path current_pmodule_state, old_pmodule_state, Pmodules_states, Pmodules_db_path
) )
else: else:
print_to_asciidoc([], [], [], Pmodules_db_path) print_to_asciidoc([], [], [], [], Pmodules_db_path)
# There is no database available or there are differences with the old pmodule state, writing current state. # There is no database available or there are differences with the old pmodule state, writing current state.
if no_current_db or compare_states_sha( if no_current_db or compare_states_sha(
@ -108,8 +108,13 @@ def db_check_diff(current_pmodule_state, Pmodules_db_path, Pmodules_states):
def print_to_asciidoc( def print_to_asciidoc(
new_module_list, deleted_module_list, changed_module_list, Pmodules_db_path all_module_list,
new_module_list,
deleted_module_list,
changed_module_list,
Pmodules_db_path,
): ):
asciidoc_json_dump(all_module_list, "all", 1, Pmodules_db_path)
asciidoc_json_dump(new_module_list, "new", 1, Pmodules_db_path) asciidoc_json_dump(new_module_list, "new", 1, Pmodules_db_path)
asciidoc_json_dump(deleted_module_list, "deleted", 1, Pmodules_db_path) asciidoc_json_dump(deleted_module_list, "deleted", 1, Pmodules_db_path)
asciidoc_json_dump(changed_module_list, "changed", 2, Pmodules_db_path) asciidoc_json_dump(changed_module_list, "changed", 2, Pmodules_db_path)
@ -122,6 +127,7 @@ def print_pmodules_differences(
current_db = set(" ".join(i.split()) for i in current_pmodule_state.splitlines()) current_db = set(" ".join(i.split()) for i in current_pmodule_state.splitlines())
old_db = set(" ".join(i.split()) for i in old_pmodule_state.splitlines()) old_db = set(" ".join(i.split()) for i in old_pmodule_state.splitlines())
all_module_list = list(current_db)
new_module_list = list(current_db - old_db) new_module_list = list(current_db - old_db)
deleted_module_list = list(old_db - current_db) deleted_module_list = list(old_db - current_db)
changed_module_list = [] changed_module_list = []
@ -157,7 +163,11 @@ def print_pmodules_differences(
) )
print_to_asciidoc( print_to_asciidoc(
new_module_list, deleted_module_list, changed_module_list, Pmodules_db_path all_module_list,
new_module_list,
deleted_module_list,
changed_module_list,
Pmodules_db_path,
) )