Fix some bugs. Also, make sure to actually use the sorted table when composing the table with only the last builds. Finally, add resorting for an output that is sorted alphabetically by 'for' architecture

Author: Caspar van Leeuwen

eessi_bot_event_handler.py

@@ -599,7 +599,7 @@ def handle_bot_command_status(self, event_info, bot_command):
             dates = status_table['date']
             timestamps = []
             for date in dates:
-                date_object = datetime.datetime.strptime(date, "%b %d %X %Z %Y")
+                date_object = datetime.strptime(date, "%b %d %X %Z %Y")
                 timestamps.append(int(date_object.timestamp()))
             status_table['timestamp'] = timestamps
 
@@ -609,16 +609,23 @@ def handle_bot_command_status(self, event_info, bot_command):
             sorted_indices.reverse()
             # Apply the sorted indices to get a sorted table
             sorted_table = {key: [status_table[key][i] for i in sorted_indices] for key in status_table}
+            self.log(f"Sorted status table: {sorted_table}")
 
             # Keep only the first entry for each 'for arch', as that is now the newest
             status_table_last = {'on arch': [], 'for arch': [], 'for repo': [], 'date': [], 'status': [], 'url': [], 'result': []}
-            for x in range(0, len(status_table['date'])):
-                if status_table['for arch'][x] not in status_table_last['for arch']:
+            for x in range(0, len(sorted_table['date'])):
+                if sorted_table['for arch'][x] not in status_table_last['for arch']:
+                    self.log(f"arch: {sorted_table['for arch'][x]} not yet in status_table_last")
                     for key in status_table_last:
-                        status_table_last[key].append(status_table[key][x])
+                        self.log(f"Adding to '{key}' and the value {sorted_table[key][x]}")
+                        status_table_last[key].append(sorted_table[key][x])
+
+            # Re-sort, now only on 'for arch', for nicer viewing
+            sorted_indices = sorted(range(len(status_table_last['for arch'])), key=lambda x: status_table_last['for arch'][x])
+            sorted_table_last = {key: [status_table_last[key][i] for i in sorted_indices] for key in status_table_last}
 
             # overwrite the original status_table
-            status_table = status_table_last
+            status_table = sorted_table_last
 
         comment_status = ''
         comment_status += "\nThis is the status of all the `bot: build` commands:"