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

Cleaned up some wavereader code

Browse Source
This commit is contained in:
Jamie Hardt
2022-11-23 18:57:35 -08:00
parent 12eff79e5f
commit c26942db04
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wavinfo/wave_reader.py
View File

@@ -155,7 +155,7 @@ class WavInfoReader:
""" """
scopes = ('fmt', 'data', 'ixml', 'bext', 'info') scopes = ('fmt', 'data', 'ixml', 'bext', 'info', 'adm')
for scope in scopes: for scope in scopes:
if scope in ['fmt', 'data']: if scope in ['fmt', 'data']:
@@ -163,20 +163,10 @@ class WavInfoReader:
for field in attr._fields: for field in attr._fields:
yield scope, field, attr.__getattribute__(field) yield scope, field, attr.__getattribute__(field)
if scope in ['bext']: else:
bext_dict = self.bext.to_dict() if self.bext else {} dict = self.__getattribute__(scope).to_dict() if self.__getattribute__(scope) else {}
for key in bext_dict.keys(): for key in dict.keys():
yield 'bext', key, bext_dict[key] yield scope, key, dict[key]
if scope in ['info']:
info_dict = self.info.to_dict() if self.info else {}
for key in info_dict.keys():
yield 'info', key, info_dict[key]
if scope in ['ixml']:
ixml_dict = self.ixml.to_dict() if self.ixml else {}
for key in ixml_dict.keys():
yield 'ixml', key, ixml_dict[key]
def __repr__(self): def __repr__(self):