Fix but in frontmatter and content extraction.

Author: anaulin

pytest.ini

@@ -1,4 +1,4 @@
 [pytest]
-addopts = "-v"
+addopts = "-vv"
 filterwarnings =
     ignore::DeprecationWarning:invoke.*:

tasks/entry.py

@@ -4,15 +4,23 @@
 import re
 import toml
 
-RE_TOML_SEPARATOR = r"\+\+\+"
+TOML_SEPARATOR = "+++"
+
+
+def get_file_as_str(filename):
+    """Returns the content of the filename as a string."""
+    with open(filename, 'r') as file:
+        return file.read()
 
 
 def get_toml_and_content(filename):
     """Returns a tuple with the entry TOML frontmatter and the markdown content."""
-    with open(filename, 'r') as file:
-        file_str = file.read()
-        splits = re.split(RE_TOML_SEPARATOR, file_str)
-        return (toml.loads(splits[1].strip()), splits[2])
+    file_str = get_file_as_str(filename)
+    front_start = file_str.index(TOML_SEPARATOR) + len(TOML_SEPARATOR)
+    frontmatter_end = file_str.index(TOML_SEPARATOR, front_start)
+    toml_str = file_str[front_start:frontmatter_end]
+    content_str = file_str[frontmatter_end + len(TOML_SEPARATOR):]
+    return (toml.loads(toml_str), content_str)
 
 
 def get_toml(filename):

tests/test_entry.md

@@ -11,4 +11,12 @@ Some content.
 
 ## A section in the content
 
+Content that looks like frontmatter:
+```
++++
+but this is
+not really frontmatter
++++
+```
+
 More content.

tests/test_entry.py

@@ -6,6 +6,23 @@
 
 TEST_ENTRY = os.path.join(os.path.dirname(__file__), "test_entry.md")
 
+TEST_ENTRY_CONTENT = """
+
+Some content.
+
+## A section in the content
+
+Content that looks like frontmatter:
+```
++++
+but this is
+not really frontmatter
++++
+```
+
+More content.
+"""
+
 
 def test_get_toml_and_content():
     (toml, content) = entry.get_toml_and_content(TEST_ENTRY)
@@ -14,7 +31,7 @@ def test_get_toml_and_content():
         'tags': ["books", "stuff"],
         'book': {'title': 'The Sorcerer of the Wildeeps', 'rating': 4}
     }
-    assert content == "\n\nSome content.\n\n## A section in the content\n\nMore content.\n"
+    assert content == TEST_ENTRY_CONTENT
 
 
 def test_get_toml():