.gitea/workflows/tests.yaml

@@ -9,8 +9,8 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v3
       - run: apt-get update && apt-get install -y python3-pip
-      - run: pip install -e .
+      - run: pip install --break-system-package -e .
-      - run: pip install pytest
+      - run: pip install --break-system-package pytest
       - run: pytest
 
   mypy:
@@ -19,8 +19,8 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v3
       - run: apt-get update && apt-get install -y python3-pip
-      - run: pip install -e .
+      - run: pip install --break-system-package -e .
-      - run: pip install mypy
+      - run: pip install --break-system-package mypy
       - run: mypy org_rw --check-untyped-defs
 
   style-formatting:
@@ -29,8 +29,8 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v3
       - run: apt-get update && apt-get install -y python3-pip
-      - run: pip install -e .
+      - run: pip install --break-system-package -e .
-      - run: pip install black
+      - run: pip install --break-system-package black
       - run: black --check .
 
   style-sorted-imports:
@@ -39,8 +39,8 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@v3
       - run: apt-get update && apt-get install -y python3-pip
-      - run: pip install -e .
+      - run: pip install --break-system-package -e .
-      - run: pip install isort
+      - run: pip install --break-system-package isort
       - run: isort --profile black --check .
 
   stability-extra-test:
@@ -49,5 +49,5 @@ jobs:
     - name: Check out repository code
       uses: actions/checkout@v3
     - run: apt-get update && apt-get install -y git-core python3-pip
-    - run: pip install -e .
+    - run: pip install --break-system-package -e .
     - run: bash extra-tests/check_all.sh

org_rw/dom.py

@@ -24,6 +24,14 @@ class ResultsDrawerNode(DrawerNode):
         return "<Results: {}>".format(len(self.children))
 
 
+class GenericDrawerNode(DrawerNode):
+    def __init__(self, drawer_name):
+        self.drawer_name = drawer_name
+
+    def __repr__(self):
+        return "<Drawer{}: {}>".format(self.drawer_name, len(self.children))
+
+
 class PropertyNode:
     def __init__(self, key, value):
         self.key = key
@@ -62,12 +70,18 @@ class TableSeparatorRow:
     def __init__(self, orig=None):
         self.orig = orig
 
+    def get_raw(self):
+        return get_raw_contents(self.orig)
+
 
 class TableRow:
     def __init__(self, cells, orig=None):
         self.cells = cells
         self.orig = orig
 
+    def get_raw(self):
+        return get_raw_contents(self.orig)
+
 
 class Text:
     def __init__(self, content):

org_rw/org_rw.py

@@ -122,6 +122,7 @@ NON_FINISHED_GROUPS = (
     dom.ListGroupNode,
     dom.ResultsDrawerNode,
     dom.PropertyDrawerNode,
+    dom.GenericDrawerNode,
 )
 FREE_GROUPS = (dom.CodeBlock,)
 
@@ -414,6 +415,7 @@ class Headline:
                 if (
                     isinstance(line, DelimiterLine)
                     and line.delimiter_type == DelimiterLineType.END_BLOCK
+                    and line.type_data.subtype == current_node.header.type_data.subtype
                 ):
 
                     start = current_node.header.linenum
@@ -636,6 +638,13 @@ class Headline:
                     assert current_node is None
                     current_node = dom.ResultsDrawerNode()
 
+                    # TODO: Allow indentation of these blocks inside others
+                    indentation_tree = [current_node]
+                    tree.append(current_node)
+                elif content.strip().startswith(":") and content.strip().endswith(":"):
+                    assert current_node is None
+                    current_node = dom.GenericDrawerNode(content.strip().strip(":"))
+
                     # TODO: Allow indentation of these blocks inside others
                     indentation_tree = [current_node]
                     tree.append(current_node)
@@ -864,9 +873,24 @@ class Headline:
                 yield from get_links_from_content(item.content)
 
     def get_lines_between(self, start, end):
-        for line in self.contents:
+        # @TODO: Generalize for other line types too.
+        everything = (
+            []
+            # + self.keywords
+            + self.contents
+            # + self.list_items
+            # + self.table_rows
+            # + self.properties
+            # + self.structural
+            + self.delimiters
+        )
+
+        for line in everything:
             if start <= line.linenum < end:
+                if "get_raw" in dir(line):
                     yield "".join(line.get_raw())
+                else:
+                    yield line.line
 
     def get_contents(self, format):
         if format == "raw":
@@ -2307,6 +2331,7 @@ class OrgDoc:
         list_items,
         structural,
         properties,
+        delimiters,
         environment=BASE_ENVIRONMENT,
     ):
         self.todo_keywords = [HeadlineState(name=kw) for kw in DEFAULT_TODO_KEYWORDS]
@@ -2336,6 +2361,7 @@ class OrgDoc:
         self.list_items: List[ListItem] = list_items
         self.structural: List = structural
         self.properties: List = properties
+        self.delimiters: List = delimiters
         self._path = None
         self.headlines: List[Headline] = list(
             map(lambda hl: parse_headline(hl, self, self), headlines)
@@ -2500,6 +2526,9 @@ class OrgDoc:
         for struct in self.structural:
             lines.append(dump_structural(struct))
 
+        for content in self.delimiters:
+            lines.append(dump_delimiters(content))
+
         for kw in self.keywords:
             lines.append(dump_kw(kw))
 
@@ -2537,6 +2566,7 @@ class OrgDocReader:
             self.list_items,
             self.structural,
             self.properties,
+            self.delimiters,
             self.environment,
         )
 

org_rw/utils.py

@@ -9,6 +9,7 @@ from .org_rw import (
     ListItem,
     RawLine,
     Strike,
+    TableRow,
     Text,
     Underlined,
     Verbatim,
@@ -50,6 +51,8 @@ def get_raw_contents(doc) -> str:
         return doc.get_raw()
     if isinstance(doc, ListItem):
         return dump_contents(doc)[1]
+    if isinstance(doc, TableRow):
+        return dump_contents(doc)[1]
     print("Unhandled type: " + str(doc))
     raise NotImplementedError("Unhandled type: " + str(doc))