mirror of
https://github.com/iluvcapra/pycmx.git
synced 2026-01-02 09:50:55 +00:00
Parsing now returns objects, not dictionaries
This commit is contained in:
@@ -81,6 +81,12 @@ def parse_cmx3600(file):
|
|||||||
title = parser.current_token.title
|
title = parser.current_token.title
|
||||||
return event_list(title, parser)
|
return event_list(title, parser)
|
||||||
|
|
||||||
|
|
||||||
|
CmxEvent = namedtuple('CmxEvent',['title','number','clip_name',
|
||||||
|
'source_name','channels','source_start','source_finish','record_start',
|
||||||
|
'record_finish','fcm_drop'])
|
||||||
|
|
||||||
|
|
||||||
def event_list(title, parser):
|
def event_list(title, parser):
|
||||||
state = {"fcm_drop" : False}
|
state = {"fcm_drop" : False}
|
||||||
|
|
||||||
@@ -92,7 +98,8 @@ def event_list(title, parser):
|
|||||||
state['fcm_drop'] = parser.current_token.drop
|
state['fcm_drop'] = parser.current_token.drop
|
||||||
elif parser.accept('Event'):
|
elif parser.accept('Event'):
|
||||||
if this_event != None:
|
if this_event != None:
|
||||||
events_result.append(this_event)
|
event_t = CmxEvent(**this_event)
|
||||||
|
events_result.append(event_t)
|
||||||
|
|
||||||
raw_event = parser.current_token
|
raw_event = parser.current_token
|
||||||
channels = CmxChannelMap()
|
channels = CmxChannelMap()
|
||||||
@@ -118,7 +125,8 @@ def event_list(title, parser):
|
|||||||
parser.next_token()
|
parser.next_token()
|
||||||
|
|
||||||
if this_event != None:
|
if this_event != None:
|
||||||
events_result.append(this_event)
|
event_t = CmxEvent(**this_event)
|
||||||
|
events_result.append(event_t)
|
||||||
|
|
||||||
return events_result
|
return events_result
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user