Merge pull request #76 from univ-of-utah-marriott-library-apple/the_big_array_fix

The big array fix

Author: magnusviri

jamf/convert.py

@@ -31,14 +31,23 @@ def etree_to_dict(elem):
     children = list(elem)
     if children:
         defd = defaultdict(list)
-        for dct in map(etree_to_dict, children):
+        has_size = False
+        for child in children:
+            if child.tag == "size":
+                has_size = True
+            dct = etree_to_dict(child)
             for key, val in dct.items():
                 defd[key].append(val)
-        result = {
-            elem.tag: {
-                key: val[0] if len(val) == 1 else val for key, val in defd.items()
-            }
-        }
+        result = {}
+        for key, val in defd.items():
+            print(f"{key}, {val[0]}, {type(val[0])}, {has_size}")
+            is_array = len(val) > 1 or ( has_size and type(val[0]) is dict )
+            if not elem.tag in result:
+                result[elem.tag] = {}
+            if is_array:
+                result[elem.tag][key] = val
+            else:
+                result[elem.tag][key] = val[0]
     elif elem.text:
         result[elem.tag] = elem.text.strip()
     return result
@@ -68,7 +77,6 @@ def dict_to_xml(data):
     else:
         # string, boolean, integers, floats, etc
         xml_str = xml.sax.saxutils.escape(f"{data}")
-
     return xml_str
 
 

jamf/records.py

@@ -518,7 +518,7 @@ def get_path(self, path):
     def force_array(self, parent, child_name):
         _data = parent[child_name]
         if "size" in parent:
-            if int(parent["size"]) > 1:
+            if int(parent["size"]) > 0:
                 return _data
         else:
             if type(_data) is list:
@@ -644,10 +644,7 @@ def refresh(self):
                 self._names = {}
                 self._jamf_ids = {}
             elif p3 in self.data:  # e.g. category
-                if self.data["size"] == "1":
-                    records = [self.data[p3]]
-                else:
-                    records = self.data[p3]
+                records = self.data[p3]
                 for d in records:
                     c = self.singular_class(d[id1], d["name"])  # e.g. id1 = "id"
                     c.plural_class = self.cls
@@ -1434,10 +1431,7 @@ def promote_update_during(self):
         if "package" not in self.data["package_configuration"]["packages"]:
             print(f"{self.name} has no package to update.")
             return True
-        if int(self.data["package_configuration"]["packages"]["size"]) > 1:
-            my_packages = self.data["package_configuration"]["packages"]["package"]
-        else:
-            my_packages = [self.data["package_configuration"]["packages"]["package"]]
+        my_packages = self.data["package_configuration"]["packages"]["package"]
 
         all_packages = jamf_records(Packages)
         print(self.name)