Fix loader bugs, change random2 to avoid restarting during testing

python/PiFinder/catalogs.py

@@ -727,6 +727,15 @@ def set_current_object(self, object_number: int, catalog_code: str = ""):
         logging.debug(
             f"set_current_object: {self.object_tracker=}, {self.designator_tracker=}, {catalog_code=}, {object_number=}, {self.get_current_object()=}"
         )
+
+        # Make sure this catalog is in the designator tracker
+        # if not, add it so it can be set
+        if self.designator_tracker.get(catalog_code) is None:
+            _c = self.catalogs.get_catalog_by_code(catalog_code)
+            self.designator_tracker[catalog_code] = CatalogDesignator(
+                catalog_code, _c.max_sequence
+            )
+
         self.designator_tracker[catalog_code].set_number(
             object_number if object_number else 0
         )

python/PiFinder/obslist.py

@@ -11,7 +11,7 @@
 import os
 from textwrap import dedent
 from PiFinder import utils
-from PiFinder.catalogs import Names
+from PiFinder.catalogs import Names, Catalogs
 
 OBSLIST_DIR = f"{utils.data_dir}/obslists/"
 
@@ -49,7 +49,7 @@ def write_list(catalog_objects, name):
             index_num += 1
 
 
-def resolve_object(catalog_numbers, objects):
+def resolve_object(catalog_numbers, catalogs: Catalogs):
     """
     Takes a list of SkySafari catalog
     numbers and tries to find an object
@@ -65,14 +65,13 @@ def resolve_object(catalog_numbers, objects):
             sequence = None
 
         if sequence is not None:
-            _object = objects.get_object_by_catalog_sequence(catalog, sequence)
+            _object = catalogs.get_object(catalog, sequence)
             if _object:
                 return _object
-    print("Failed")
     return None
 
 
-def read_list(names: Names, name):
+def read_list(catalogs: Catalogs, name):
     """
     Reads a skylist style observing
     list.  Matches against catalogs
@@ -112,7 +111,7 @@ def read_list(names: Names, name):
                     }
 
                 # see if we can resolve an object
-                _object = resolve_object(catalog_numbers, names)
+                _object = resolve_object(catalog_numbers, catalogs)
 
                 if _object:
                     list_catalog.append(_object)

python/PiFinder/ui/locate.py

@@ -89,7 +89,7 @@ def load_list(self, option):
             self.message("No matches")
             return False
 
-        self.ui_state.set_observing_list(_load_results["catalog"])
+        self.ui_state.set_observing_list(_load_results["catalog_objects"])
         self.ui_state.set_active_list_to_observing_list()
         self.target_index = 0
         self.ui_state.set_target(self.ui_state.active_list()[self.target_index])