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

Test and implement org-use-tag-inheritance.

Browse Source
This commit is contained in:
Sergio Martínez Portela 2024-09-01 23:51:10 +02:00
parent 92078617fc
commit d4b0d0301f
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org_rw/org_rw.py
View File

@ -754,7 +754,14 @@ class Headline:
@property @property
def tags(self) -> list[str]: def tags(self) -> list[str]:
parent_tags = self.parent.tags parent_tags = self.parent.tags
if self.doc.environment.get('org-tags-exclude-from-inheritance'): if self.doc.environment.get('org-use-tag-inheritance'):
accepted_tags = []
for tag in self.doc.environment.get('org-use-tag-inheritance'):
if tag in parent_tags:
accepted_tags.append(tag)
parent_tags = accepted_tags
elif self.doc.environment.get('org-tags-exclude-from-inheritance'):
for tag in self.doc.environment.get('org-tags-exclude-from-inheritance'): for tag in self.doc.environment.get('org-tags-exclude-from-inheritance'):
if tag in parent_tags: if tag in parent_tags:
parent_tags.remove(tag) parent_tags.remove(tag)

22
tests/test_org.py
View File

@ -910,7 +910,7 @@ class TestSerde(unittest.TestCase):
with open(os.path.join(DIR, "13-tags.org")) as f: with open(os.path.join(DIR, "13-tags.org")) as f:
orig = f.read() orig = f.read()
doc = loads(orig, { doc = loads(orig, {
'org-tags-exclude-from-inheritance': ('h1tag', 'otherh2tag') 'org-tags-exclude-from-inheritance': ('h1tag', 'otherh2tag'),
}) })
self.assertEqual(doc.tags, ['filetag']) self.assertEqual(doc.tags, ['filetag'])
@ -925,6 +925,26 @@ class TestSerde(unittest.TestCase):
h1_2_h2 = h1_2.children[0] h1_2_h2 = h1_2.children[0]
self.assertEqual(sorted(h1_2_h2.tags), ['filetag', 'otherh1tag', 'otherh2tag']) self.assertEqual(sorted(h1_2_h2.tags), ['filetag', 'otherh1tag', 'otherh2tag'])
def test_select_tags_to_inheritance_property_read_13(self):
with open(os.path.join(DIR, "13-tags.org")) as f:
orig = f.read()
doc = loads(orig, {
'org-tags-exclude-from-inheritance': ('h1tag', 'otherh2tag'),
'org-use-tag-inheritance': ('h1tag',),
})
self.assertEqual(doc.tags, ['filetag'])
h1_1, h1_2 = doc.getTopHeadlines()
self.assertEqual(sorted(h1_1.tags), ['h1tag'])
self.assertEqual(sorted(h1_2.tags), ['otherh1tag'])
h1_1_h2 = h1_1.children[0]
self.assertEqual(sorted(h1_1_h2.tags), ['h1tag', 'h2tag'])
h1_2_h2 = h1_2.children[0]
self.assertEqual(sorted(h1_2_h2.tags), ['otherh2tag'])
def print_tree(tree, indentation=0, headline=None): def print_tree(tree, indentation=0, headline=None):
for element in tree: for element in tree:
print(" " * indentation * 2, "EL:", element) print(" " * indentation * 2, "EL:", element)