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

Fixing some warnings

Browse Source
This commit is contained in:
Jamie Hardt
2023-11-05 19:40:17 -08:00
parent 0933c7f580
commit e41eadad95
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wavinfo/riff_parser.py
View File

@@ -12,17 +12,6 @@ class WavInfoEOFError(EOFError):
class ListChunkDescriptor(namedtuple('ListChunkDescriptor', 'signature children')): class ListChunkDescriptor(namedtuple('ListChunkDescriptor', 'signature children')):
pass pass
# def find(self, chunk_path):
# if len(chunk_path) > 1:
# for chunk in self.children:
# if type(chunk) is ListChunkDescriptor and \
# chunk.signature is chunk_path[0]:
# return chunk.find(chunk_path[1:])
# else:
# for chunk in self.children:
# if type(chunk) is ChunkDescriptor and \
# chunk.ident is chunk_path[0]:
# return chunk
class ChunkDescriptor(namedtuple('ChunkDescriptor', 'ident start length rf64_context')): class ChunkDescriptor(namedtuple('ChunkDescriptor', 'ident start length rf64_context')):
@@ -59,6 +48,7 @@ def parse_chunk(stream, rf64_context=None):
if rf64_context is None and ident in {b'RF64', b'BW64'}: if rf64_context is None and ident in {b'RF64', b'BW64'}:
rf64_context = parse_rf64(stream=stream, signature=ident) rf64_context = parse_rf64(stream=stream, signature=ident)
assert rf64_context is not None
data_size = rf64_context.bigchunk_table[ident] data_size = rf64_context.bigchunk_table[ident]
displacement = data_size displacement = data_size
@@ -66,8 +56,11 @@ def parse_chunk(stream, rf64_context=None):
displacement += 1 displacement += 1
if ident in {b'RIFF', b'LIST', b'RF64', b'BW64'}: if ident in {b'RIFF', b'LIST', b'RF64', b'BW64'}:
return parse_list_chunk(stream=stream, length=data_size, rf64_context=rf64_context) return parse_list_chunk(stream=stream, length=data_size,
rf64_context=rf64_context)
else: else:
data_start = stream.tell() data_start = stream.tell()
stream.seek(displacement, 1) stream.seek(displacement, 1)
return ChunkDescriptor(ident=ident, start=data_start, length=data_size, rf64_context=rf64_context) return ChunkDescriptor(ident=ident, start=data_start, length=data_size,
rf64_context=rf64_context)

5
wavinfo/wave_reader.py
View File

@@ -19,7 +19,8 @@ WavDataDescriptor = namedtuple('WavDataDescriptor', 'byte_count frame_count')
#: The format of the audio samples. #: The format of the audio samples.
WavAudioFormat = namedtuple('WavAudioFormat', WavAudioFormat = namedtuple('WavAudioFormat',
'audio_format channel_count sample_rate byte_rate block_align bits_per_sample') ['audio_format', 'channel_count', 'sample_rate',
'byte_rate', 'block_align', 'bits_per_sample'])
class WavInfoReader: class WavInfoReader:
@@ -80,7 +81,7 @@ class WavInfoReader:
absolute_path = os.path.abspath(path) absolute_path = os.path.abspath(path)
#: `file://` url for the file. #: `file://` url for the file.
self.url: pathlib.Path = pathlib.Path(absolute_path).as_uri() self.url: str = pathlib.Path(absolute_path).as_uri()
self.path = absolute_path self.path = absolute_path