jamie/ptulsconv
1
0
Fork 0
mirror of https://github.com/iluvcapra/ptulsconv.git synced 2025-12-31 08:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added exception handling when tags are badly formed, better reporting

Browse Source
This commit is contained in:
Jamie Hardt
2019-10-09 10:07:34 -07:00
parent 0b9fc00672
commit fcfe02ecdc
1 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ptulsconv/transformations.py
View File

@@ -1,6 +1,9 @@
from . import broadcast_timecode from . import broadcast_timecode
from parsimonious import Grammar, NodeVisitor from parsimonious import Grammar, NodeVisitor
from parsimonious.exceptions import IncompleteParseError
import math import math
import sys
class Transformation: class Transformation:
def transform(self, input_dict) -> dict: def transform(self, input_dict) -> dict:
@@ -22,7 +25,6 @@ class TimecodeInterpreter(Transformation):
retval['tracks'] = self.convert_tracks(input_dict['tracks'], timecode_rate=rate, retval['tracks'] = self.convert_tracks(input_dict['tracks'], timecode_rate=rate,
drop_frame=retval['header']['timecode_drop_frame']) drop_frame=retval['header']['timecode_drop_frame'])
for marker in retval['markers']: for marker in retval['markers']:
marker['location_decoded'] = self.convert_time(marker['location'], rate, marker['location_decoded'] = self.convert_time(marker['location'], rate,
drop_frame=retval['header']['timecode_drop_frame']) drop_frame=retval['header']['timecode_drop_frame'])
@@ -64,11 +66,11 @@ class TagInterpreter(Transformation):
tag_list = tag* tag_list = tag*
tag = key_tag / short_tag / full_text_tag / tag_junk tag = key_tag / short_tag / full_text_tag / tag_junk
key_tag = "[" key "]" word_sep? key_tag = "[" key "]" word_sep?
short_tag = "$" key "=" word short_tag = "$" key "=" word word_sep?
full_text_tag = "{" key "=" value "}" word_sep? full_text_tag = "{" key "=" value "}" word_sep?
key = ~"[A-Za-z][A-Za-z0-9_]*" key = ~"[A-Za-z][A-Za-z0-9_]*"
value = ~"[^}]+" value = ~"[^}]+"
tag_junk = (word word_sep)* tag_junk = word word_sep?
word = ~"[^ \[\{\$][^ ]*" word = ~"[^ \[\{\$][^ ]*"
word_sep = ~" +" word_sep = ~" +"
modifier = ("@" / "&") word_sep? modifier = ("@" / "&") word_sep?
@@ -98,6 +100,7 @@ class TagInterpreter(Transformation):
def visit_tag_list(self, _, visited_children): def visit_tag_list(self, _, visited_children):
retdict = dict() retdict = dict()
for child in visited_children: for child in visited_children:
if child[0] is not None:
k, v = child[0] k, v = child[0]
retdict[k] = v retdict[k] = v
return retdict return retdict
@@ -111,6 +114,9 @@ class TagInterpreter(Transformation):
def visit_full_text_tag(self, _, children): def visit_full_text_tag(self, _, children):
return children[1].text, children[3].text return children[1].text, children[3].text
def visit_tag_junk(self, node, _):
return None
def generic_visit(self, node, visited_children): def generic_visit(self, node, visited_children):
return visited_children or node return visited_children or node
@@ -122,15 +128,15 @@ class TagInterpreter(Transformation):
transformed = list() transformed = list()
timespan_rules = list() timespan_rules = list()
title_tags = self.parse_tags(input_dict['header']['session_name']) title_tags = self.parse_tags(input_dict['header']['session_name'], "<Session Name>")
markers = sorted(input_dict['markers'], key=lambda m: m['location_decoded']['frame_count']) markers = sorted(input_dict['markers'], key=lambda m: m['location_decoded']['frame_count'])
for track in input_dict['tracks']: for track in input_dict['tracks']:
if 'Muted' in track['state'] and self.ignore_muted: if 'Muted' in track['state'] and self.ignore_muted:
continue continue
track_tags = self.parse_tags(track['name']) track_tags = self.parse_tags(track['name'], "<Track %s>" % (track['name']))
comment_tags = self.parse_tags(track['comments']) comment_tags = self.parse_tags(track['comments'], "<Track %s>" % (track['name']))
track_context_tags = track_tags['tags'] track_context_tags = track_tags['tags']
track_context_tags.update(comment_tags['tags']) track_context_tags.update(comment_tags['tags'])
@@ -138,7 +144,8 @@ class TagInterpreter(Transformation):
if clip['state'] == 'Muted' and self.ignore_muted: if clip['state'] == 'Muted' and self.ignore_muted:
continue continue
clip_tags = self.parse_tags(clip['clip_name']) clip_tags = self.parse_tags(clip['clip_name'],
"<Track %s/Clip event number %i at %s>" % (track['name'], clip['event'], clip['start_time']))
clip_start = clip['start_time_decoded']['frame_count'] clip_start = clip['start_time_decoded']['frame_count']
if clip_tags['mode'] == 'Normal': if clip_tags['mode'] == 'Normal':
event = dict() event = dict()
@@ -158,7 +165,8 @@ class TagInterpreter(Transformation):
event['PT.Clip.Start_Frames'] = clip_start event['PT.Clip.Start_Frames'] = clip_start
event['PT.Clip.Finish_Frames'] = clip['end_time_decoded']['frame_count'] event['PT.Clip.Finish_Frames'] = clip['end_time_decoded']['frame_count']
event['PT.Clip.Start_Seconds'] = clip_start / input_dict['header']['timecode_format'] event['PT.Clip.Start_Seconds'] = clip_start / input_dict['header']['timecode_format']
event['PT.Clip.Finish_Seconds'] = clip['end_time_decoded']['frame_count'] / input_dict['header']['timecode_format'] event['PT.Clip.Finish_Seconds'] = clip['end_time_decoded']['frame_count'] / input_dict['header'][
'timecode_format']
transformed.append(event) transformed.append(event)
elif clip_tags['mode'] == 'Append': elif clip_tags['mode'] == 'Append':
@@ -189,8 +197,8 @@ class TagInterpreter(Transformation):
retval = dict() retval = dict()
for marker in markers: for marker in markers:
marker_name_tags = self.parse_tags(marker['name']) marker_name_tags = self.parse_tags(marker['name'], "Marker %i" % (marker['number']))
marker_comment_tags = self.parse_tags(marker['comments']) marker_comment_tags = self.parse_tags(marker['comments'], "Marker %i" % (marker['number']))
effective_tags = marker_name_tags['tags'] effective_tags = marker_name_tags['tags']
effective_tags.update(marker_comment_tags['tags']) effective_tags.update(marker_comment_tags['tags'])
@@ -200,9 +208,20 @@ class TagInterpreter(Transformation):
break break
return retval return retval
def parse_tags(self, source): def parse_tags(self, source, context_str=None):
try:
parse_tree = self.tag_grammar.parse(source) parse_tree = self.tag_grammar.parse(source)
return self.visitor.visit(parse_tree) return self.visitor.visit(parse_tree)
except IncompleteParseError as e:
if context_str is not None:
print("Error reading tags in: ", context_str, file=sys.stderr)
trimmed_source = source[:e.pos]
parse_tree = self.tag_grammar.parse(trimmed_source)
return self.visitor.visit(parse_tree)
class SubclipOfSequence(Transformation): class SubclipOfSequence(Transformation):
@@ -224,5 +243,3 @@ class SubclipOfSequence(Transformation):
out_events.append(e) out_events.append(e)
return dict(events=out_events) return dict(events=out_events)