kenkeiras/org-rw
1
0
Fork 1
Code Issues 3 Pull Requests 1 Actions Releases Wiki Activity

Handle :RESULTS: drawer, and data inside :LOGBOOK:

Browse Source
This commit is contained in:
Sergio Martínez Portela 2022-05-16 23:17:28 +02:00
parent c87a50f365
commit 63bb1e67e0
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org_rw/dom.py
View File

@ -17,7 +17,18 @@ class LogbookDrawerNode:
self.children.append(child) self.children.append(child)
def __repr__(self): def __repr__(self):
return "<Properties: {}>".format(len(self.children)) return "<LogBook: {}>".format(len(self.children))
class ResultsDrawerNode:
def __init__(self):
self.children = []
def append(self, child):
self.children.append(child)
def __repr__(self):
return "<Results: {}>".format(len(self.children))
class PropertyNode: class PropertyNode:

27
org_rw/org_rw.py
View File

@ -98,7 +98,7 @@ RESULTS_DRAWER_RE = re.compile(r"^\s*:results:\s*$", re.I)
CodeSnippet = collections.namedtuple("CodeSnippet", ("name", "content", "result")) CodeSnippet = collections.namedtuple("CodeSnippet", ("name", "content", "result"))
# Groupings # Groupings
NON_FINISHED_GROUPS = (type(None), dom.ListGroupNode) NON_FINISHED_GROUPS = (type(None), dom.ListGroupNode, dom.ResultsDrawerNode, dom.PropertyDrawerNode)
FREE_GROUPS = (dom.CodeBlock,) FREE_GROUPS = (dom.CodeBlock,)
@ -181,9 +181,9 @@ def text_to_dom(tokens, item):
in_description = False in_description = False
link_value = [] link_value = []
link_description = [] link_description = []
contents = [] contents = []
for tok in tokens: for tok in tokens:
if isinstance(tok, LinkToken): if isinstance(tok, LinkToken):
if tok.tok_type == LinkTokenType.OPEN_LINK: if tok.tok_type == LinkTokenType.OPEN_LINK:
@ -362,7 +362,7 @@ class Headline:
current_node.append(dom.Text(line)) current_node.append(dom.Text(line))
else: else:
if type(current_node) not in NON_FINISHED_GROUPS: if type(current_node) not in NON_FINISHED_GROUPS:
assert type(current_node) in NON_FINISHED_GROUPS raise NotImplementedError('Not implemented node type: {}'.format(current_node))
current_node = None current_node = None
contents = [] contents = []
tree.append(dom.Text(text_to_dom(line.contents, line))) tree.append(dom.Text(text_to_dom(line.contents, line)))
@ -373,7 +373,9 @@ class Headline:
tree.append(current_node) tree.append(current_node)
indentation_tree = [current_node] indentation_tree = [current_node]
if not isinstance(current_node, dom.ListGroupNode): if not isinstance(current_node, dom.ListGroupNode):
assert isinstance(current_node, dom.ListGroupNode) if not isinstance(current_node, dom.ListGroupNode):
logging.warning("Expected a {}, found: {} on line {}".format(dom.ListGroupNode, current_node, line.linenum))
# This can happen. Frequently inside a LogDrawer
if len(indentation_tree) > 0 and ( if len(indentation_tree) > 0 and (
(len(indentation_tree[-1].children) > 0) (len(indentation_tree[-1].children) > 0)
@ -447,10 +449,21 @@ class Headline:
current_node = dom.LogbookDrawerNode() current_node = dom.LogbookDrawerNode()
tree.append(current_node) tree.append(current_node)
elif content.strip().upper() == ":END:": elif content.strip().upper() == ":END:":
assert isinstance( if current_node is None:
logging.warning('Finished node (:END:) with no known starter')
elif not (isinstance(
current_node, dom.PropertyDrawerNode current_node, dom.PropertyDrawerNode
) or isinstance(current_node, dom.LogbookDrawerNode) ) or isinstance(
current_node, dom.LogbookDrawerNode
) or isinstance(
current_node, dom.ResultsDrawerNode
)):
raise Exception('Unexpected node: {}'.format(current_node))
current_node = None current_node = None
elif content.strip().upper() == ":RESULTS:":
assert current_node is None
current_node = dom.ResultsDrawerNode()
tree.append(current_node)
else: else:
raise Exception("Unknown structural line: {}".format(line)) raise Exception("Unknown structural line: {}".format(line))
else: else: