2 Commits
v0.3 ... v0.4

Author SHA1 Message Date
Jamie Hardt
cc76223cbc Tweaked tests to catch my previous error
Also nudged version number
2018-12-01 12:48:41 -08:00
Jamie Hardt
966f8c1ca4 Fixed another audio channel parsing bug 2018-12-01 12:46:10 -08:00
4 changed files with 11 additions and 8 deletions

View File

@@ -117,11 +117,7 @@ class CmxChannelMap:
self.a4 = ext.audio4 self.a4 = ext.audio4
def __repr__(self): def __repr__(self):
return "CmxChannelMap(v="+ self.v.__repr__( ) + \ return f"CmxChannelMap(v={self.v}, audio_channels={self._audio_channel_set})"
",a1=" + self.a1.__repr__() + \
",a2=" + self.a2.__repr__() + \
",a3=" + self.a3.__repr__() + \
",a4=" + self.a4.__repr__() +")"
def parse_cmx3600(file): def parse_cmx3600(file):
@@ -153,7 +149,7 @@ def event_list(title, parser):
events_result.append(event_t) events_result.append(event_t)
raw_event = parser.current_token raw_event = parser.current_token
channels = CmxChannelMap({}) channels = CmxChannelMap(v=False, audio_channels=set([]))
channels.appendEvent(raw_event.channels) channels.appendEvent(raw_event.channels)
this_event = {'title': title, 'number': raw_event.event, 'clip_name': None , this_event = {'title': title, 'number': raw_event.event, 'clip_name': None ,

View File

@@ -4,7 +4,7 @@ with open("README.md", "r") as fh:
long_description = fh.read() long_description = fh.read()
setup(name='pycmx', setup(name='pycmx',
version='0.3', version='0.4',
author='Jamie Hardt', author='Jamie Hardt',
author_email='jamiehardt@me.com', author_email='jamiehardt@me.com',
description='CMX 3600 Edit Decision List Parser', description='CMX 3600 Edit Decision List Parser',

Binary file not shown.

View File

@@ -23,5 +23,12 @@ class TestParse(TestCase):
self.assertTrue(events[0].channels.a2) self.assertTrue(events[0].channels.a2)
self.assertFalse(events[0].channels.a1) self.assertFalse(events[0].channels.a1)
self.assertTrue(events[2].channels.get_audio_channel(7)) self.assertTrue(events[2].channels.get_audio_channel(7))
self.assertFalse(events[2].channels.get_audio_channel(1))
self.assertFalse(events[2].channels.get_audio_channel(2))
self.assertFalse(events[2].channels.get_audio_channel(3))
self.assertFalse(events[2].channels.get_audio_channel(4))
self.assertFalse(events[2].channels.get_audio_channel(10))
self.assertFalse(events[2].channels.get_audio_channel(11))
self.assertFalse(events[2].channels.get_audio_channel(12))
self.assertFalse(events[2].channels.get_audio_channel(13))