Refactor of caching & data storage part 14 #118

core/utils.py

@@ -84,23 +84,29 @@ def get_callsign_object_from_pyhamtools_callinfo(callsign, callinfo):
     """Utility function to take the data provided by a PyHamTools CallInfo object and populate our own Callsign data
     object from it"""
 
-    home_call = callinfo.get_homecall(callsign)
-    data = callinfo.get_all()
+    try:
+        home_call = callinfo.get_homecall(callsign)
+        data = callinfo.get_all(callsign)
 
-    country = data["country"] if "country" in data else None
-    dxcc_id = data["adif"] if "adif" in data else None
-    continent = data["continent"] if "continent" in data else None
-    cq_zone = data["cqz"] if "cqz" in data else None
-    itu_zone = data["ituz"] if "ituz" in data else None
-    lat = float(data["latitude"]) if "latitude" in data else None
-    lon = float(data["longitude"]) if "longitude" in data else None
+        country = data["country"] if "country" in data else None
+        dxcc_id = data["adif"] if "adif" in data else None
+        continent = data["continent"] if "continent" in data else None
+        cq_zone = data["cqz"] if "cqz" in data else None
+        itu_zone = data["ituz"] if "ituz" in data else None
+        lat = float(data["latitude"]) if "latitude" in data else None
+        lon = float(data["longitude"]) if "longitude" in data else None
 
-    return Callsign(call=callsign,
-                    home_call=home_call,
-                    country=country,
-                    dxcc_id=dxcc_id,
-                    continent=continent,
-                    cq_zone=cq_zone,
-                    itu_zone=itu_zone,
-                    latitude=lat,
-                    longitude=lon)
+        return Callsign(call=callsign,
+                        home_call=home_call,
+                        country=country,
+                        dxcc_id=dxcc_id,
+                        continent=continent,
+                        cq_zone=cq_zone,
+                        itu_zone=itu_zone,
+                        latitude=lat,
+                        longitude=lon,
+                        location_source="DXCC")
+
+    except ValueError:
+        # Unknown callsign, can't look anything up, return a Callsign object with basic data so that gets cached
+        return Callsign(call=callsign)