Add optimization to HasIdOf rules

Author: dsblank

gramps/gen/filters/rules/_hasgrampsid.py

@@ -41,7 +41,8 @@
 # Typing modules
 #
 # -------------------------------------------------------------------------
-from ...lib.primaryobj import PrimaryObject
+from typing import Set
+from ...types import PrimaryObjectHandle, PrimaryObject
 from ...db import Database
 
 
@@ -57,10 +58,14 @@ class HasGrampsId(Rule):
     name = "Object with <Id>"
     description = "Matches objects with a specified Gramps ID"
     category = _("General filters")
+    selected_handles: Set[PrimaryObjectHandle] = set([])
 
     def apply_to_one(self, db: Database, obj: PrimaryObject) -> bool:
         """
         apply the rule on the obj.
         return true if the rule passes, false otherwise.
         """
-        return obj.gramps_id == self.list[0]
+        return obj.handle in self.selected_handles
+
+    def reset(self):
+        self.selected_handles.clear()

gramps/gen/filters/rules/citation/_hasidof.py

@@ -25,6 +25,7 @@
 #
 # -------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
+from ....db import Database
 
 _ = glocale.translation.gettext
 
@@ -46,3 +47,10 @@ class HasIdOf(HasGrampsId):
 
     name = _("Citation with <Id>")
     description = _("Matches a citation with a specified Gramps ID")
+
+    def prepare(self, db: Database, user):
+        data = db._get_raw_citation_from_id_data(self.list[0])
+        if data:
+            self.selected_handles = set([data.handle])
+        else:
+            self.selected_handles = set([])

gramps/gen/filters/rules/event/_hasidof.py

@@ -24,6 +24,7 @@
 #
 # -------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
+from ....db import Database
 
 _ = glocale.translation.gettext
 
@@ -45,3 +46,10 @@ class HasIdOf(HasGrampsId):
 
     name = _("Event with <Id>")
     description = _("Matches an event with a specified Gramps ID")
+
+    def prepare(self, db: Database, user):
+        data = db._get_raw_event_from_id_data(self.list[0])
+        if data:
+            self.selected_handles = set([data.handle])
+        else:
+            self.selected_handles = set([])

gramps/gen/filters/rules/family/_hasidof.py

@@ -24,6 +24,7 @@
 #
 # -------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
+from ....db import Database
 
 _ = glocale.translation.gettext
 
@@ -45,3 +46,10 @@ class HasIdOf(HasGrampsId):
 
     name = _("Family with <Id>")
     description = _("Matches a family with a specified Gramps ID")
+
+    def prepare(self, db: Database, user):
+        data = db._get_raw_family_from_id_data(self.list[0])
+        if data:
+            self.selected_handles = set([data.handle])
+        else:
+            self.selected_handles = set([])

gramps/gen/filters/rules/media/_hasidof.py

@@ -24,6 +24,7 @@
 #
 # -------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
+from ....db import Database
 
 _ = glocale.translation.gettext
 
@@ -45,3 +46,10 @@ class HasIdOf(HasGrampsId):
 
     name = _("Media object with <Id>")
     description = _("Matches a media object with a specified Gramps ID")
+
+    def prepare(self, db: Database, user):
+        data = db._get_raw_media_from_id_data(self.list[0])
+        if data:
+            self.selected_handles = set([data.handle])
+        else:
+            self.selected_handles = set([])

gramps/gen/filters/rules/note/_hasidof.py

@@ -24,6 +24,7 @@
 #
 # -------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
+from ....db import Database
 
 _ = glocale.translation.gettext
 
@@ -45,3 +46,10 @@ class HasIdOf(HasGrampsId):
 
     name = _("Note with <Id>")
     description = _("Matches a note with a specified Gramps ID")
+
+    def prepare(self, db: Database, user):
+        data = db._get_raw_note_from_id_data(self.list[0])
+        if data:
+            self.selected_handles = set([data.handle])
+        else:
+            self.selected_handles = set([])

gramps/gen/filters/rules/person/_hasidof.py

@@ -24,6 +24,7 @@
 #
 # -------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
+from ....db import Database
 
 _ = glocale.translation.gettext
 
@@ -45,3 +46,10 @@ class HasIdOf(HasGrampsId):
 
     name = _("Person with <Id>")
     description = _("Matches person with a specified Gramps ID")
+
+    def prepare(self, db: Database, user):
+        data = db._get_raw_person_from_id_data(self.list[0])
+        if data:
+            self.selected_handles = set([data.handle])
+        else:
+            self.selected_handles = set([])

gramps/gen/filters/rules/place/_hasidof.py

@@ -24,6 +24,7 @@
 #
 # -------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
+from ....db import Database
 
 _ = glocale.translation.gettext
 
@@ -45,3 +46,10 @@ class HasIdOf(HasGrampsId):
 
     name = _("Place with <Id>")
     description = _("Matches a place with a specified Gramps ID")
+
+    def prepare(self, db: Database, user):
+        data = db._get_raw_place_from_id_data(self.list[0])
+        if data:
+            self.selected_handles = set([data.handle])
+        else:
+            self.selected_handles = set([])

gramps/gen/filters/rules/repository/_hasidof.py

@@ -24,6 +24,7 @@
 #
 # -------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
+from ....db import Database
 
 _ = glocale.translation.gettext
 
@@ -45,3 +46,10 @@ class HasIdOf(HasGrampsId):
 
     name = _("Repository with <Id>")
     description = _("Matches a repository with a specified Gramps ID")
+
+    def prepare(self, db: Database, user):
+        data = db._get_raw_repository_from_id_data(self.list[0])
+        if data:
+            self.selected_handles = set([data.handle])
+        else:
+            self.selected_handles = set([])

gramps/gen/filters/rules/source/_hasidof.py

@@ -24,6 +24,7 @@
 #
 # -------------------------------------------------------------------------
 from ....const import GRAMPS_LOCALE as glocale
+from ....db import Database
 
 _ = glocale.translation.gettext
 
@@ -45,3 +46,10 @@ class HasIdOf(HasGrampsId):
 
     name = _("Source with <Id>")
     description = _("Matches a source with a specified Gramps ID")
+
+    def prepare(self, db: Database, user):
+        data = db._get_raw_source_from_id_data(self.list[0])
+        if data:
+            self.selected_handles = set([data.handle])
+        else:
+            self.selected_handles = set([])