jamie/wavinfo
1
0
Fork 0
mirror of https://github.com/iluvcapra/wavinfo.git synced 2026-01-02 09:50:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Another test file, more jupyter experiments

Browse Source
This commit is contained in:
Jamie Hardt
2018-12-31 16:43:26 -08:00
parent 0e21053d4e
commit c45b00828a
4 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wavinfo/wave_parser.py
View File

@@ -3,9 +3,9 @@ import struct
from collections import namedtuple
ListChunkDescriptor = namedtuple('ListChunk' , 'signature children')
ListChunkDescriptor = namedtuple('ListChunkDescriptor' , 'signature children')
class ChunkDescriptor(namedtuple('Chunk', 'ident start length') ):
class ChunkDescriptor(namedtuple('ChunkDescriptor', 'ident start length') ):
def read_data(self, from_stream):
from_stream.seek(self.start)
return from_stream.read(self.length)

8
wavinfo/wave_reader.py
View File

@@ -2,7 +2,7 @@ import struct
from collections import namedtuple
from .wave_parser import parse_chunk
from .wave_parser import parse_chunk, ChunkDescriptor, ListChunkDescriptor
from .wave_ixml_reader import WavIXMLFormat
WavDataDescriptor = namedtuple('WavDataDescriptor','byte_count frame_count')
@@ -37,10 +37,12 @@ class WavInfoReader():
def _find_chunk_data(self, ident, from_stream, default_none=False):
chunk_descriptor = None
top_chunks = (chunk for chunk in self.main_list if type(chunk) is ChunkDescriptor)
if default_none:
chunk_descriptor =next((chunk for chunk in self.main_list if chunk.ident == ident),None)
chunk_descriptor = next((chunk for chunk in top_chunks if chunk.ident == ident),None)
else:
chunk_descriptor = next((chunk for chunk in self.main_list if chunk.ident == ident))
chunk_descriptor = next((chunk for chunk in top_chunks if chunk.ident == ident))
if chunk_descriptor:
return chunk_descriptor.read_data(from_stream)