Fix bugs

- crash in connections when active records have a "duration" field
- inconsistency in the org list with the selected org

spydertop/columns.py

@@ -387,11 +387,13 @@ def format_environ(_m, _pr, _r, p):
     (
         "DURATION",
         lambda m, c: pretty_time(m.timestamp - c["valid_from"])
-        if "duration" not in c or c["valid_to"] > m.timestamp
+        if "duration" not in c or "valid_to" not in c or c["valid_to"] > m.timestamp
         else pretty_time(c["duration"]),
         "<",
         9,
-        lambda m, c: c.get("duration", m.timestamp - c["valid_from"]),
+        lambda m, c: m.timestamp - c["valid_from"]
+        if "duration" not in c or "valid_to" not in c or c["valid_to"] > m.timestamp
+        else c["duration"],
         True,
     ),
     (

spydertop/screens/config.py

@@ -252,22 +252,20 @@ def load_orgs():
                 if len(self.cache["orgs"]) == 1:
                     self.set_org(self.cache["orgs"][0])
                 if len(self.cache["orgs"]) > 1:
+                    orgs = sorted(
+                        self.cache["orgs"],
+                        key=lambda o: o.get("total_sources", 0),
+                        reverse=True,
+                    )
+
                     if self.config.org is None:
                         index = 0
                     else:
                         try:
-                            index = [o["uid"] for o in self.cache["orgs"]].index(
-                                self.config.org
-                            )
+                            index = [o["uid"] for o in orgs].index(self.config.org)
                         except ValueError:
                             index = 0
 
-                    orgs = sorted(
-                        self.cache["orgs"],
-                        key=lambda o: o.get("total_sources", 0),
-                        reverse=True,
-                    )
-
                     self.build_question(
                         "Please select an organization",
                         [

spydertop/utils.py

@@ -42,8 +42,7 @@ def pretty_time(time: float) -> str:
                 return f"{microseconds}μs"
             return f"{milliseconds}ms"
         return f"{minutes}:{seconds:02d}.{centiseconds:02d}"
-    else:
-        return f"${{6}}{hours}h${{7}}{minutes:02d}:{seconds:02d}"
+    return f"${{6}}{hours}h${{7}}{minutes:02d}:{seconds:02d}"
 
 
 def pretty_datetime(d_time: datetime) -> str: