scripts/xls_to_doc.py: better handle common attributes

Instead of using self.props plus an ingore_fields, create
a list of values to be updated and use it everywhere, as it
helps being consistent along the script about what fields
should be updated.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Acked-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>

1 files changed, 20 insertions, 7 deletions

diff --git a/scripts/xls_to_doc.py b/scripts/xls_to_doc.py
index 03feae583..60f7536c8 100755
--- a/scripts/xls_to_doc.py
+++ b/scripts/xls_to_doc.py
@@ -31,9 +31,10 @@ class FillTests(TestList):
     def __init__(self, config_path, verbose):
         self.tests = {}
         self.spreadsheet_data = {}
-        self.ignore_fields = []
         self.verbose = verbose
 
+        self.update_fields = []
+
         # Read current documentation
         TestList.__init__(self, config_path)
 
@@ -78,7 +79,9 @@ class FillTests(TestList):
             if "sublevel" in item["_properties_"]:
                 update = item["_properties_"].get("update-from-file")
                 if update:
-                    self.ignore_fields.append(field)
+                    continue
+
+            self.update_fields.append(field)
 
     def add_field(self, dic, field, value):
         """
@@ -276,8 +279,22 @@ class FillTests(TestList):
 
             test_nr = self.tests[testname]["Test"]
 
+            # Update common fields
             doc_content = self.orig_doc[test_nr]
+            fields = set(self.doc[test_nr].keys()) | set(doc_content.keys())
+
+            for field in sorted(fields):
+                if field not in self.update_fields:
+                    continue
+
+                value = self.doc[test_nr].get(field, "")
+                doc_value = doc_content.get(field, "")
 
+                if doc_value == value:
+                    continue
+
+
+            # Update subtest fields
             for subtest, subtest_content in sorted(self.tests[testname]["subtests"].items()):
                 if "line" not in subtest_content:
                     print(f"Warning: didn't find where {subtest} is documented.")
@@ -298,11 +315,7 @@ class FillTests(TestList):
                 fields = set(subtest_content.keys()) | set(doc_content.keys())
 
                 for field in sorted(fields):
-                    if field not in self.props:
-                        continue
-
-                    if args.ignore_lists:
-                        if field in self.ignore_fields:
+                    if field not in self.update_fields:
                             continue
 
                     value = subtest_content.get(field, "")