lyz/org-rw
1
0
Fork 0
forked from kenkeiras/org-rw
Code Pull Requests Actions Activity

Complete initial step of conversion of notes.

Browse Source
This commit is contained in:
Sergio Martínez Portela 2021-08-30 00:09:52 +02:00
parent fdd532e424
commit bd31c67eea
1 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
org_rw/org_rw.py
View File

@ -97,6 +97,7 @@ CodeSnippet = collections.namedtuple("CodeSnippet", ("name", "content", "result"
# Groupings # Groupings
NON_FINISHED_GROUPS = (type(None), dom.ListGroupNode) NON_FINISHED_GROUPS = (type(None), dom.ListGroupNode)
FREE_GROUPS = (dom.CodeBlock,)
def get_tokens(value): def get_tokens(value):
@ -283,9 +284,21 @@ class Headline:
current_node = None current_node = None
for line in sorted(everything, key=get_line): for line in sorted(everything, key=get_line):
# print("#-", current_node) print("#-", current_node)
# print("=>", line) print("=>", line)
if isinstance(line, Property): if isinstance(current_node, dom.CodeBlock):
if (
isinstance(line, DelimiterLine)
and line.delimiter_type == DelimiterLineType.END_SRC
):
current_node = None
else:
current_node.append(line)
elif isinstance(line, Property):
if type(current_node) in NON_FINISHED_GROUPS:
current_node = dom.PropertyDrawerNode()
tree.append(current_node)
assert isinstance(current_node, dom.PropertyDrawerNode) assert isinstance(current_node, dom.PropertyDrawerNode)
current_node.append(dom.PropertyNode(line.key, line.value)) current_node.append(dom.PropertyNode(line.key, line.value))
@ -295,6 +308,8 @@ class Headline:
elif isinstance(current_node, dom.LogbookDrawerNode): elif isinstance(current_node, dom.LogbookDrawerNode):
current_node.append(dom.Text(line)) current_node.append(dom.Text(line))
else: else:
if type(current_node) not in NON_FINISHED_GROUPS:
print("Parent: {}\nValue: {}".format(current_node, line))
assert type(current_node) in NON_FINISHED_GROUPS assert type(current_node) in NON_FINISHED_GROUPS
current_node = None current_node = None
tree.append(dom.Text(line)) tree.append(dom.Text(line))
@ -303,6 +318,8 @@ class Headline:
if current_node is None: if current_node is None:
current_node = dom.ListGroupNode() current_node = dom.ListGroupNode()
tree.append(current_node) tree.append(current_node)
if not isinstance(current_node, dom.ListGroupNode):
print("Parent: {}\nValue: {}".format(current_node, line))
assert isinstance(current_node, dom.ListGroupNode) assert isinstance(current_node, dom.ListGroupNode)
current_node.append(dom.ListItem(line)) current_node.append(dom.ListItem(line))
@ -314,12 +331,15 @@ class Headline:
current_node = dom.CodeBlock(line) current_node = dom.CodeBlock(line)
current_node.append(current_node) current_node.append(current_node)
elif ( elif isinstance(line, Keyword):
isinstance(line, DelimiterLine) logging.warning("Keywords not implemented on `as_dom()`")
and line.delimiter_type == DelimiterLineType.END_SRC
): # elif (
assert isinstance(current_node, dom.BlockNode) # isinstance(line, DelimiterLine)
current_node = None # and line.delimiter_type == DelimiterLineType.END_SRC
# ):
# assert isinstance(current_node, dom.BlockNode)
# current_node = None
elif ( elif (
isinstance(line, tuple) isinstance(line, tuple)
@ -1705,28 +1725,28 @@ class OrgDocReader:
else: else:
self.headline_hierarchy[-1]["keywords"].append(kw) self.headline_hierarchy[-1]["keywords"].append(kw)
def add_raw_line(self, linenum: int, line: str) -> int: def add_raw_line(self, linenum: int, line: str):
raw = RawLine(linenum, line) raw = RawLine(linenum, line)
if len(self.headline_hierarchy) == 0: if len(self.headline_hierarchy) == 0:
self.contents.append(raw) self.contents.append(raw)
else: else:
self.headline_hierarchy[-1]["contents"].append(raw) self.headline_hierarchy[-1]["contents"].append(raw)
def add_begin_src_line(self, linenum: int, match: re.Match) -> int: def add_begin_src_line(self, linenum: int, match: re.Match):
line = DelimiterLine(linenum, match.group(0), DelimiterLineType.BEGIN_SRC) line = DelimiterLine(linenum, match.group(0), DelimiterLineType.BEGIN_SRC)
if len(self.headline_hierarchy) == 0: if len(self.headline_hierarchy) == 0:
self.delimiters.append(line) self.delimiters.append(line)
else: else:
self.headline_hierarchy[-1]["delimiters"].append(line) self.headline_hierarchy[-1]["delimiters"].append(line)
def add_end_src_line(self, linenum: int, match: re.Match) -> int: def add_end_src_line(self, linenum: int, match: re.Match):
line = DelimiterLine(linenum, match.group(0), DelimiterLineType.END_SRC) line = DelimiterLine(linenum, match.group(0), DelimiterLineType.END_SRC)
if len(self.headline_hierarchy) == 0: if len(self.headline_hierarchy) == 0:
self.delimiters.append(line) self.delimiters.append(line)
else: else:
self.headline_hierarchy[-1]["delimiters"].append(line) self.headline_hierarchy[-1]["delimiters"].append(line)
def add_property_drawer_line(self, linenum: int, line: str, match: re.Match) -> int: def add_property_drawer_line(self, linenum: int, line: str, match: re.Match):
if len(self.headline_hierarchy) == 0: if len(self.headline_hierarchy) == 0:
self.current_drawer = self.properties self.current_drawer = self.properties
self.structural.append((linenum, line)) self.structural.append((linenum, line))
@ -1734,16 +1754,19 @@ class OrgDocReader:
self.current_drawer = self.headline_hierarchy[-1]["properties"] self.current_drawer = self.headline_hierarchy[-1]["properties"]
self.headline_hierarchy[-1]["structural"].append((linenum, line)) self.headline_hierarchy[-1]["structural"].append((linenum, line))
def add_results_drawer_line(self, linenum: int, line: str, match: re.Match) -> int: def add_results_drawer_line(self, linenum: int, line: str, match: re.Match):
self.current_drawer = self.headline_hierarchy[-1]["results"] self.current_drawer = self.headline_hierarchy[-1]["results"]
self.headline_hierarchy[-1]["structural"].append((linenum, line)) self.headline_hierarchy[-1]["structural"].append((linenum, line))
def add_logbook_drawer_line(self, linenum: int, line: str, match: re.Match) -> int: def add_logbook_drawer_line(self, linenum: int, line: str, match: re.Match):
self.current_drawer = self.headline_hierarchy[-1]["logbook"] self.current_drawer = self.headline_hierarchy[-1]["logbook"]
self.headline_hierarchy[-1]["structural"].append((linenum, line)) self.headline_hierarchy[-1]["structural"].append((linenum, line))
def add_drawer_end_line(self, linenum: int, line: str, match: re.Match) -> int: def add_drawer_end_line(self, linenum: int, line: str, match: re.Match):
self.current_drawer = None self.current_drawer = None
if len(self.headline_hierarchy) == 0:
self.structural.append((linenum, line))
else:
self.headline_hierarchy[-1]["structural"].append((linenum, line)) self.headline_hierarchy[-1]["structural"].append((linenum, line))
def add_node_properties_line(self, linenum: int, match: re.Match) -> int: def add_node_properties_line(self, linenum: int, match: re.Match) -> int:
@ -1755,7 +1778,7 @@ class OrgDocReader:
try: try:
self.current_drawer.append(Property(linenum, match, key, value, None)) self.current_drawer.append(Property(linenum, match, key, value, None))
except: except Exception:
if "current_drawer" not in dir(self): # Throw a better error on this case if "current_drawer" not in dir(self): # Throw a better error on this case
raise Exception( raise Exception(
"Found properties before :PROPERTIES: line. Error on Org file?" "Found properties before :PROPERTIES: line. Error on Org file?"
@ -1767,6 +1790,7 @@ class OrgDocReader:
lines = s.split("\n") lines = s.split("\n")
line_count = len(lines) line_count = len(lines)
reader = enumerate(lines) reader = enumerate(lines)
in_drawer = False
for lnum, line in reader: for lnum, line in reader:
linenum = lnum + 1 linenum = lnum + 1