Contribution by MD Nauta, Feature Request #2603, Adds ChangedSince filter for all records. Tweaked time match a little, and text

svn: r11605

src/Filters/Rules/Event/Makefile.am

@@ -3,6 +3,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Event
 
 pkgdata_PYTHON = \
+	_ChangedSince.py\
 	_MatchesFilter.py\
 	_EventPrivate.py\
 	_HasNoteRegexp.py\

src/Filters/Rules/Event/_ChangedSince.py

@@ -0,0 +1,26 @@
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules._ChangedSinceBase import ChangedSinceBase
+
+#-------------------------------------------------------------------------
+#
+# ChangedSince
+#
+#-------------------------------------------------------------------------
+class ChangedSince(ChangedSinceBase):
+    """Rule that checks for an event changed since a specific time."""
+
+    name        = _('Events changed before <date time>')
+    description = _("Matches event records changed before a specified "
+                    "date/time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
+                    "date/time is given")

src/Filters/Rules/Event/__init__.py

@@ -43,6 +43,7 @@ from _MatchesPersonFilter import MatchesPersonFilter
 from _MatchesSourceFilter import MatchesSourceFilter
 from _HasAttribute import HasAttribute
 from _HasData import HasData
+from _ChangedSince import ChangedSince
 
 editor_rule_list = [
     AllEvents,
@@ -62,4 +63,5 @@ editor_rule_list = [
     MatchesSourceFilter,
     HasAttribute,
     HasData,
+    ChangedSince
 ]

src/Filters/Rules/Family/Makefile.am

@@ -4,6 +4,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Family
 
 pkgdata_PYTHON = \
 	_AllFamilies.py\
+	_ChangedSince.py\
 	_FamilyPrivate.py\
 	_HasEvent.py\
 	_HasAttribute.py\

src/Filters/Rules/Family/_ChangedSince.py

@@ -0,0 +1,26 @@
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules._ChangedSinceBase import ChangedSinceBase
+
+#-------------------------------------------------------------------------
+#
+# ChangedSince
+#
+#-------------------------------------------------------------------------
+class ChangedSince(ChangedSinceBase):
+    """Rule that checks for families changed since a specific time."""
+
+    name        = _('Families changed before <date time>')
+    description = _("Matches family records changed before a specified "
+                    "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
+                    "date-time is given")

src/Filters/Rules/Family/__init__.py

@@ -55,6 +55,7 @@ from _MotherHasNameOf import MotherHasNameOf
 from _MotherHasIdOf import MotherHasIdOf
 from _ChildHasNameOf import ChildHasNameOf
 from _ChildHasIdOf import ChildHasIdOf
+from _ChangedSince import ChangedSince
 
 editor_rule_list = [
     AllFamilies,
@@ -80,4 +81,5 @@ editor_rule_list = [
     MotherHasIdOf,
     ChildHasNameOf,
     ChildHasIdOf,
+    ChangedSince,
 ]

src/Filters/Rules/Makefile.am

@@ -5,6 +5,7 @@ SUBDIRS = Person Family Event Place Source MediaObject Repository Note
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules
 
 pkgdata_PYTHON = \
+	_ChangedSinceBase.py\
 	_Everything.py\
 	_HasEventBase.py\
 	_HasAttributeBase.py\

src/Filters/Rules/MediaObject/Makefile.am

@@ -4,6 +4,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/MediaObject
 
 pkgdata_PYTHON = \
 	_AllMedia.py\
+	_ChangedSince.py\
 	_HasIdOf.py\
 	_HasMedia.py\
 	_HasNoteMatchingSubstringOf.py\

src/Filters/Rules/MediaObject/_ChangedSince.py

@@ -0,0 +1,26 @@
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules._ChangedSinceBase import ChangedSinceBase
+
+#-------------------------------------------------------------------------
+#
+# ChangedSince
+#
+#-------------------------------------------------------------------------
+class ChangedSince(ChangedSinceBase):
+    """Rule that checks for media objects changed since a specific time"""
+
+    name        = _('Media objects changed before <date time>')
+    description = _("Matches media objects changed before a specified "
+                    "date:time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
+                    "date:time is given")

src/Filters/Rules/MediaObject/__init__.py

@@ -34,6 +34,7 @@ from _MediaPrivate import MediaPrivate
 from _MatchesFilter import MatchesFilter
 from _HasMedia import HasMedia
 from _HasAttribute import HasAttribute
+from _ChangedSince import ChangedSince
 
 editor_rule_list = [
     AllMedia,
@@ -45,4 +46,5 @@ editor_rule_list = [
     MediaPrivate,
     MatchesFilter,
     HasAttribute,
+    ChangedSince,
 ]

src/Filters/Rules/Note/Makefile.am

@@ -4,6 +4,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Note
 
 pkgdata_PYTHON = \
 	_AllNotes.py\
+	_ChangedSince.py\
 	_HasIdOf.py\
 	_HasMarkerOf.py\
 	_MatchesSubstringOf.py\

src/Filters/Rules/Note/_ChangedSince.py

@@ -0,0 +1,26 @@
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules._ChangedSinceBase import ChangedSinceBase
+
+#-------------------------------------------------------------------------
+#
+# ChangedSince
+#
+#-------------------------------------------------------------------------
+class ChangedSince(ChangedSinceBase):
+    """Rule that checks for notes changed since a specific time."""
+
+    name        = _('Notes changed before <date time>')
+    description = _("Matches note records changed since a specified "
+                    "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
+                    "date-time is given")

src/Filters/Rules/Note/__init__.py

@@ -35,6 +35,7 @@ from _HasReferenceCountOf import HasReferenceCountOf
 from _NotePrivate import NotePrivate
 from _MatchesFilter import MatchesFilter
 from _HasNote import HasNote
+from _ChangedSince import ChangedSince
 
 editor_rule_list = [
     AllNotes,
@@ -47,4 +48,5 @@ editor_rule_list = [
     HasReferenceCountOf,
     NotePrivate,
     MatchesFilter,
+    ChangedSince,
 ]

src/Filters/Rules/Person/Makefile.am

@@ -3,6 +3,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Person
 
 pkgdata_PYTHON = \
+	_ChangedSince.py\
 	_Disconnected.py \
 	_Everyone.py \
 	_FamilyWithIncompleteEvent.py \

src/Filters/Rules/Person/_ChangedSince.py

@@ -0,0 +1,26 @@
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules._ChangedSinceBase import ChangedSinceBase
+
+#-------------------------------------------------------------------------
+#
+# ChangedSince
+#
+#-------------------------------------------------------------------------
+class ChangedSince(ChangedSinceBase):
+    """Rule that checks for persons changed since a specific time."""
+
+    name = _('Persons changed after <date time>')
+    description = _("Matches person records changed after a specified "
+                    "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
+                    "date-time is given")

src/Filters/Rules/Person/__init__.py

@@ -98,7 +98,7 @@ from _SearchName import SearchName
 from _RegExpName import RegExpName
 from _MatchIdOf import MatchIdOf
 from _RegExpIdOf import RegExpIdOf
-
+from _ChangedSince import ChangedSince
 
 #-------------------------------------------------------------------------
 #
@@ -168,5 +168,6 @@ editor_rule_list = [
     HasNoteMatchingSubstringOf,
     RegExpIdOf,
     Disconnected,
+    ChangedSince,
 ]
 

src/Filters/Rules/Place/Makefile.am

@@ -4,6 +4,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Place
 
 pkgdata_PYTHON = \
 	_AllPlaces.py\
+	_ChangedSince.py\
 	_HasIdOf.py\
 	_HasNoLatOrLon.py\
 	_InLatLonNeighborhood.py\

src/Filters/Rules/Place/_ChangedSince.py

@@ -0,0 +1,26 @@
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules._ChangedSinceBase import ChangedSinceBase
+
+#-------------------------------------------------------------------------
+#
+# ChangedSince
+#
+#-------------------------------------------------------------------------
+class ChangedSince(ChangedSinceBase):
+    """Rules that checks for places changed since a specific time."""
+
+    name    = ('Places changed after <date time>')
+    description = _("Matches place records changed after a specified "
+                    "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
+                    "date-time is given")

src/Filters/Rules/Place/__init__.py

@@ -39,6 +39,7 @@ from _HasPlace import HasPlace
 from _HasNoLatOrLon import HasNoLatOrLon
 from _InLatLonNeighborhood import InLatLonNeighborhood
 from _MatchesEventFilter import MatchesEventFilter
+from _ChangedSince import ChangedSince
 
 editor_rule_list = [
     AllPlaces,
@@ -55,4 +56,5 @@ editor_rule_list = [
     HasNoLatOrLon,
     InLatLonNeighborhood,
     MatchesEventFilter,
+    ChangedSince,
 ]

src/Filters/Rules/Repository/Makefile.am

@@ -4,6 +4,7 @@ pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Repository
 
 pkgdata_PYTHON = \
 	_AllRepos.py\
+	_ChangedSince.py\
 	_HasIdOf.py\
 	_HasNoteMatchingSubstringOf.py\
 	_HasNoteRegexp.py\

src/Filters/Rules/Repository/_ChangedSince.py

@@ -0,0 +1,26 @@
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules._ChangedSinceBase import ChangedSinceBase
+
+#-------------------------------------------------------------------------
+#
+# ChangedSince
+#
+#-------------------------------------------------------------------------
+class ChangedSince(ChangedSinceBase):
+    """Rule that checks for repositories changed since a specific time."""
+
+    name        = _('Repositories changed after <date time>')
+    description = _("Matches repository records changed after a specified "
+                    "date/time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
+                    "date/time is given")

src/Filters/Rules/Repository/__init__.py

@@ -33,6 +33,7 @@ from _HasReferenceCountOf import HasReferenceCountOf
 from _RepoPrivate import RepoPrivate
 from _MatchesFilter import MatchesFilter
 from _HasRepo import HasRepo
+from _ChangedSince import ChangedSince
 
 editor_rule_list = [
     AllRepos,
@@ -43,4 +44,5 @@ editor_rule_list = [
     HasReferenceCountOf,
     RepoPrivate,
     MatchesFilter,
+    ChangedSince,
 ]

src/Filters/Rules/Source/Makefile.am

@@ -3,6 +3,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@/Filters/Rules/Source
 
 pkgdata_PYTHON = \
+	_ChangedSince.py\
 	_MatchesFilter.py\
 	_SourcePrivate.py\
 	_RegExpIdOf.py\

src/Filters/Rules/Source/_ChangedSince.py

@@ -0,0 +1,26 @@
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules._ChangedSinceBase import ChangedSinceBase
+
+#-------------------------------------------------------------------------
+#
+# ChangedSince
+#
+#-------------------------------------------------------------------------
+class ChangedSince(ChangedSinceBase):
+    """Rule that checks for sources changed since a specific time."""
+
+    name    = _('Sources changed after <date time>')
+    description = _("Matches source records changed after a specified "
+                    "date-time (yyyy-mm-dd hh:mm:ss) or in the range, if a second "
+                    "date-time is given")

src/Filters/Rules/Source/__init__.py

@@ -36,6 +36,7 @@ from _HasReferenceCountOf import HasReferenceCountOf
 from _SourcePrivate import SourcePrivate
 from _MatchesFilter import MatchesFilter
 from _HasSource import HasSource
+from _ChangedSince import ChangedSince
 
 editor_rule_list = [
     AllSources,
@@ -48,4 +49,5 @@ editor_rule_list = [
     HasReferenceCountOf,
     SourcePrivate,
     MatchesFilter,
+    ChangedSince,
 ]

src/Filters/Rules/_ChangedSinceBase.py

@@ -0,0 +1,82 @@
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gettext import gettext as _
+import re
+import time
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules import Rule
+
+#-------------------------------------------------------------------------
+#
+# ChangedSince
+#
+#-------------------------------------------------------------------------
+class ChangedSinceBase(Rule):
+    """
+    Rule that checks for primary objects changed since a specific time.
+    """
+
+    labels      = [ _('Changed after:'), _('but before:') ]
+    name        = _('Objects changed after <date time>')
+    description = _("Matches object records changed after a specified "
+                    "date/time (yyyy-mm-dd hh:mm:ss) or in range, if a second "
+                    "date/time is given")
+    category    = _('General filters')
+
+    def add_time(self, date):
+        if re.search("\d.*\s+\d{1,2}:\d{2}:\d{2}", date):
+            return date
+        elif re.search("\d.*\s+\d{1,2}:\d{2}", date):
+            return date + ":00"
+        elif re.search("\d.*\s+\d{1,2}", date):
+            return date + ":00:00"
+        elif re.search("\d{4}-\d{1,2}-\d{1,2}", date):
+            return date + " 00:00:00"
+        elif re.search("\d{4}-\d{1,2}", date):
+            return date + "-01 00:00:00"
+        elif re.search("\d{4}", date):
+            return date + "-01-01 00:00:00"
+        else:
+            return date
+
+    def time_str_to_sec(self, time_str):
+        time_sec = None
+        iso_date_time = self.add_time(time_str)
+        try:
+            time_tup = time.strptime(iso_date_time, "%Y-%m-%d %H:%M:%S")
+            time_sec = time.mktime(time_tup)
+        except ValueError:
+            from QuestionDialog import WarningDialog
+            WarningDialog(_("Wrong format of date-time"),
+                _("Only date-times in the iso format of yyyy-mm-dd "
+                  "hh:mm:ss, where the time part is optional, are "
+                  "accepted. %s does not satisfy.") % iso_date_time)
+        return time_sec
+
+    def prepare(self, db):
+        self.since = None
+        self.before = None
+        if self.list[0]:
+            self.since = self.time_str_to_sec(self.list[0])
+        if self.list[1]:
+            self.before = self.time_str_to_sec(self.list[1])
+
+    def apply(self, db, obj):
+        obj_time = obj.get_change_time()
+        if self.since:
+            if obj_time < self.since:
+                return False
+            if self.before:
+                return obj_time < self.before
+            return True
+        if self.before:
+            return obj_time < self.before
+        return False

src/Filters/Rules/__init__.py

@@ -34,6 +34,7 @@ from Filters.Rules._IsPrivate import IsPrivate
 from Filters.Rules._HasTextMatchingSubstringOf import HasTextMatchingSubstringOf
 from Filters.Rules._HasTextMatchingRegexpOf import HasTextMatchingRegexpOf
 from Filters.Rules._MatchesFilterBase import MatchesFilterBase
+from Filters.Rules._ChangedSinceBase import ChangedSinceBase
 
 from Filters.Rules import (Person, Family, Event, Source, Place, MediaObject, 
                            Repository, Note)