improve expand_zip

Author: cghielmini

util/utils.py

@@ -301,7 +301,6 @@ def expand_zip(zipped, fof_type=None, member_ids=None, member_type=None):
     expanded = []
 
     for items in zipped:
-
         try:
             file_info = FileInfo(items[0])
             file_type = getattr(file_info, "type", None)
@@ -319,18 +318,24 @@ def expand_zip(zipped, fof_type=None, member_ids=None, member_type=None):
         member_values_expanded = []
 
         if file_type is FileType.STATS and member_type_list:
-            for m_id in member_values:
-                for m_type in member_type_list:
-                    member_values_expanded.append(f"{m_type}_{m_id}")
+            if member_values:
+
+                for m_id in member_values:
+                    for m_type in member_type_list:
+                        member_values_expanded.append(f"{m_type}_{m_id}")
+            else:
+
+                member_values_expanded = member_type_list.copy()
         else:
-            member_values_expanded = member_values.copy()
+            member_values_expanded = member_values.copy() or member_type_list.copy()
 
         for fof_val in fof_values:
             for member_val in member_values_expanded:
                 formatted = [
                     item.format(
                         fof_type=fof_val or "{fof_type}",
                         member_id=member_val or "{member_id}",
+                        member_type="{member_type}",
                     )
                     for item in items
                 ]