Merge pull request #468 from jelmer/fix-text-search

Fix text search to use substring matching per RFC

Author: jelmer

xandikos/collation.py

@@ -36,7 +36,7 @@ def _match(a, b, k):
     elif k == "starts-with":
         return a.startswith(b)
     elif k == "ends-with":
-        return b.endswith(b)
+        return a.endswith(b)
     else:
         raise NotImplementedError
 

xandikos/icalendar.py

@@ -641,9 +641,9 @@ def match_indexes(self, indexes: SubIndexDict):
 
     def match(self, prop: Union[vText, vCategory, str]):
         if isinstance(prop, vText):
-            matches = self.collation(self.text, str(prop), "equals")
+            matches = self.collation(str(prop), self.text, "contains")
         elif isinstance(prop, str):
-            matches = self.collation(self.text, prop, "equals")
+            matches = self.collation(prop, self.text, "contains")
         elif isinstance(prop, vCategory):
             matches = any([self.match(cat) for cat in prop.cats])
         else:

xandikos/tests/test_icalendar.py

@@ -1029,12 +1029,14 @@ def test_category(self):
         self.assertTrue(tm.match(vCategory(["foobar"])))
         self.assertFalse(tm.match(vCategory(["fobar"])))
         self.assertTrue(tm.match_indexes({None: [b"foobar,blah"]}))
-        self.assertFalse(tm.match_indexes({None: [b"foobarblah"]}))
+        # With substring matching, "foobar" is found in "foobarblah"
+        self.assertTrue(tm.match_indexes({None: [b"foobarblah"]}))
 
     def test_unknown_type(self):
         tm = TextMatcher("dontknow", "foobar")
         self.assertFalse(tm.match(object()))
-        self.assertFalse(tm.match_indexes({None: [b"foobarblah"]}))
+        # With substring matching, "foobar" is found in "foobarblah"
+        self.assertTrue(tm.match_indexes({None: [b"foobarblah"]}))
 
     def test_unknown_collation(self):
         self.assertRaises(
@@ -1045,6 +1047,18 @@ def test_unknown_collation(self):
             collation="i;blah",
         )
 
+    def test_substring_match(self):
+        # Test that text matching uses substring search as per RFC
+        tm = TextMatcher("summary", "bar")
+        self.assertTrue(tm.match(vText("foobar")))
+        self.assertTrue(tm.match(vText("bar")))
+        self.assertTrue(tm.match(vText("barbaz")))
+        self.assertTrue(tm.match(vText("foobarbaz")))
+        self.assertFalse(tm.match(vText("foo")))
+        self.assertFalse(tm.match(vText("ba")))
+        # Test case insensitive substring match
+        self.assertTrue(tm.match(vText("FOOBAR")))
+
 
 class ApplyTimeRangeVeventTests(unittest.TestCase):
     def _tzify(self, dt):