Check the handle is valid before trying to get the raw data

Author: stevenyoungs

gramps/plugins/lib/libmixin.py

@@ -62,7 +62,13 @@ class DbMixin:
     """
 
     def __find_primary_from_handle(
-        self, handle, transaction, class_type, get_raw_obj_data, add_func
+        self,
+        handle,
+        transaction,
+        class_type,
+        has_obj_handle,
+        get_raw_obj_data,
+        add_func,
     ):
         """
         Find a primary object of class_type in the database from the passed
@@ -77,8 +83,8 @@ def __find_primary_from_handle(
         obj = class_type()
         handle = str(handle)
         new = True
-        raw = get_raw_obj_data(handle)
-        if raw is not None:
+        if has_obj_handle(handle):
+            raw = get_raw_obj_data(handle)
             obj = data_to_object(raw)
             # references create object with id None before object is really made
             if obj.gramps_id is not None:
@@ -89,7 +95,13 @@ def __find_primary_from_handle(
         return obj, new
 
     def __find_table_from_handle(
-        self, handle, transaction, class_type, get_raw_obj_data, add_func
+        self,
+        handle,
+        transaction,
+        class_type,
+        has_obj_handle,
+        get_raw_obj_data,
+        add_func,
     ):
         """
         Find a table object of class_type in the database from the passed
@@ -103,8 +115,8 @@ def __find_table_from_handle(
         """
         obj = class_type()
         handle = str(handle)
-        raw = get_raw_obj_data(handle)
-        if raw is not None:
+        if has_obj_handle(handle):
+            raw = get_raw_obj_data(handle)
             obj = data_to_object(raw)
             return obj, False
         else:
@@ -154,7 +166,12 @@ def find_person_from_handle(self, handle, transaction):
         @rtype: tuple
         """
         return self.__find_primary_from_handle(
-            handle, transaction, Person, self.get_raw_person_data, self.add_person
+            handle,
+            transaction,
+            Person,
+            self.has_person_handle,
+            self.get_raw_person_data,
+            self.add_person,
         )
 
     def find_source_from_handle(self, handle, transaction):
@@ -168,7 +185,12 @@ def find_source_from_handle(self, handle, transaction):
         @rtype: tuple
         """
         return self.__find_primary_from_handle(
-            handle, transaction, Source, self.get_raw_source_data, self.add_source
+            handle,
+            transaction,
+            Source,
+            self.has_source_handle,
+            self.get_raw_source_data,
+            self.add_source,
         )
 
     def find_event_from_handle(self, handle, transaction):
@@ -182,7 +204,12 @@ def find_event_from_handle(self, handle, transaction):
         @rtype: tuple
         """
         return self.__find_primary_from_handle(
-            handle, transaction, Event, self.get_raw_event_data, self.add_event
+            handle,
+            transaction,
+            Event,
+            self.has_event_handle,
+            self.get_raw_event_data,
+            self.add_event,
         )
 
     def find_object_from_handle(self, handle, transaction):
@@ -196,7 +223,12 @@ def find_object_from_handle(self, handle, transaction):
         @rtype: tuple
         """
         return self.__find_primary_from_handle(
-            handle, transaction, Media, self.get_raw_object_data, self.add_object
+            handle,
+            transaction,
+            Media,
+            self.has_object_handle,
+            self.get_raw_object_data,
+            self.add_object,
         )
 
     def find_place_from_handle(self, handle, transaction):
@@ -210,7 +242,12 @@ def find_place_from_handle(self, handle, transaction):
         @rtype: tuple
         """
         return self.__find_primary_from_handle(
-            handle, transaction, Place, self.get_raw_place_data, self.add_place
+            handle,
+            transaction,
+            Place,
+            self.has_place_handle,
+            self.get_raw_place_data,
+            self.add_place,
         )
 
     def find_family_from_handle(self, handle, transaction):
@@ -224,7 +261,12 @@ def find_family_from_handle(self, handle, transaction):
         @rtype: tuple
         """
         return self.__find_primary_from_handle(
-            handle, transaction, Family, self.get_raw_family_data, self.add_family
+            handle,
+            transaction,
+            Family,
+            self.has_family_handle,
+            self.get_raw_family_data,
+            self.add_family,
         )
 
     def find_repository_from_handle(self, handle, transaction):
@@ -241,6 +283,7 @@ def find_repository_from_handle(self, handle, transaction):
             handle,
             transaction,
             Repository,
+            self.has_repository_handle,
             self.get_raw_repository_data,
             self.add_repository,
         )
@@ -256,7 +299,12 @@ def find_note_from_handle(self, handle, transaction):
         @rtype: tuple
         """
         return self.__find_primary_from_handle(
-            handle, transaction, Note, self.get_raw_note_data, self.add_note
+            handle,
+            transaction,
+            Note,
+            self.has_note_handle,
+            self.get_raw_note_data,
+            self.add_note,
         )
 
     def find_tag_from_handle(self, handle, transaction):
@@ -270,7 +318,12 @@ def find_tag_from_handle(self, handle, transaction):
         @rtype: tuple
         """
         return self.__find_table_from_handle(
-            handle, transaction, Tag, self.get_raw_tag_data, self.add_tag
+            handle,
+            transaction,
+            Tag,
+            self.has_tag_handle,
+            self.get_raw_tag_data,
+            self.add_tag,
         )
 
     def check_person_from_handle(self, handle, transaction, set_gid=True):