accept activities starting with '#'

projecthamster · Nov 19, 2019 · 03288b1 · 03288b1
1 parent c3da6a2
commit 03288b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/hamster/lib/__init__.py b/src/hamster/lib/__init__.py
@@ -337,15 +337,21 @@ def parse_fact(text, phase=None, res=None, date=None):
             if not m:
                 break
             tag = m.group(1)
-            tags.append(tag)
             # strip the matched string (including #)
+            backup_text = remaining_text
             remaining_text = remaining_text[:m.start()]
+            # empty remaining text means that activity is starting with a '#'
+            if remaining_text:
+                tags.append(tag)
+            else:
+                remaining_text = backup_text
+                break
         # put tags back in input order
         res["tags"] = list(reversed(tags))
         return parse_fact(remaining_text, "activity", res, date)
 
     if "activity" in phases:
-        activity = re.split("[@|#|,]", text, 1)[0]
+        activity = re.split("[@|,]", text, 1)[0]
         if looks_like_time(activity):
             # want meaningful activities
             return res

diff --git a/tests/stuff_test.py b/tests/stuff_test.py
@@ -82,8 +82,8 @@ def test_description(self):
 
     def test_tags(self):
         # plain activity name
-        activity = Fact.parse("case, with added #de description #and, #some #tägs")
-        self.assertEqual(activity.activity, "case")
+        activity = Fact.parse("#case, with added #de description #and, #some #tägs")
+        self.assertEqual(activity.activity, "#case")
         self.assertEqual(activity.description, "with added #de description")
         self.assertEqual(set(activity.tags), set(["and", "some", "tägs"]))
         assert not activity.category