From 2c78d4a09dfd55eab76368eba24b57c5fffa2e42 Mon Sep 17 00:00:00 2001
From: Jamie Hardt <jamiehardt@me.com>
Date: Fri, 18 Nov 2022 18:33:51 -0800
Subject: [PATCH] Directive implementation

---
 ptulsconv/docparser/tag_compiler.py             | 17 +++++++++++++----
 .../docparser/tagged_string_parser_visitor.py   |  9 ++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ptulsconv/docparser/tag_compiler.py b/ptulsconv/docparser/tag_compiler.py
index 5f30fc2..6ae0bde 100644
--- a/ptulsconv/docparser/tag_compiler.py
+++ b/ptulsconv/docparser/tag_compiler.py
@@ -61,10 +61,11 @@ class TagCompiler:
 
     def compile_events(self) -> Iterator[Event]:
         step0 = self.parse_data()
-        step1 = self.apply_appends(step0)
-        step2 = self.collect_time_spans(step1)
-        step3 = self.apply_tags(step2)
-        for datum in step3:
+        step1 = self.filter_out_directives(step0)
+        step2 = self.apply_appends(step1)
+        step3 = self.collect_time_spans(step2)
+        step4 = self.apply_tags(step3)
+        for datum in step4:
             yield Event(clip_name=datum[0], track_name=datum[1], session_name=datum[2],
                         tags=datum[3], start=datum[4], finish=datum[5])
 
@@ -77,6 +78,14 @@ class TagCompiler:
 
         return retval
 
+    def filter_out_directives(self, clips : Iterator[Intermediate]) -> Iterator[Intermediate]:
+        for clip in clips:
+            if clip.clip_tag_mode == 'Directive':
+                continue
+            else:
+                yield clip
+
+
     @staticmethod
     def _coalesce_tags(clip_tags: dict, track_tags: dict,
                        track_comment_tags: dict,
diff --git a/ptulsconv/docparser/tagged_string_parser_visitor.py b/ptulsconv/docparser/tagged_string_parser_visitor.py
index 5f12cd5..d1d5385 100644
--- a/ptulsconv/docparser/tagged_string_parser_visitor.py
+++ b/ptulsconv/docparser/tagged_string_parser_visitor.py
@@ -1,5 +1,5 @@
 from parsimonious import NodeVisitor, Grammar
-from typing import Dict, Optional
+from typing import Dict, Union
 from enum import Enum
 
 
@@ -7,6 +7,7 @@ class TagPreModes(Enum):
     NORMAL = 'Normal'
     APPEND = 'Append'
     TIMESPAN = 'Timespan'
+    DIRECTIVE = 'Directive'
 
 
 tag_grammar = Grammar(
@@ -23,7 +24,7 @@ tag_grammar = Grammar(
     tag_junk       = word word_sep?
     word           = ~r"[^ \[\{\$][^ ]*"
     word_sep       = ~r" +"
-    modifier       = ("@" / "&" / "!") word_sep?
+    modifier       = ("@" / "&" /"!") word_sep?
     """
 )
 
@@ -51,7 +52,7 @@ class TagListVisitor(NodeVisitor):
         modifier_opt, line_opt, _, tag_list_opt = visited_children
 
         return TaggedStringResult(content=next(iter(line_opt), None),
-                                  tag_dict=next(iter(tag_list_opt), dict()),
+                                    tag_dict=next(iter(tag_list_opt), dict()),
                                   mode=TagPreModes(next(iter(modifier_opt), 'Normal'))
                                   )
 
@@ -65,6 +66,8 @@ class TagListVisitor(NodeVisitor):
             return TagPreModes.TIMESPAN
         elif node.text.startswith('&'):
             return TagPreModes.APPEND
+        elif node.text.startswith('!'):
+            return TagPreModes.DIRECTIVE
         else:
             return TagPreModes.NORMAL