mirror of
https://github.com/iluvcapra/wavinfo.git
synced 2026-10-02 01:37:22 +00:00
Ruff: Fixed C408 and C417
This commit is contained in:
+1
-12
@@ -69,19 +69,8 @@ ignore = [
|
|||||||
'UP022', # Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
|
'UP022', # Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE`
|
||||||
'SIM115', # Use a context manager for opening files
|
'SIM115', # Use a context manager for opening files
|
||||||
'UP031', #Use format specifiers instead of percent format
|
'UP031', #Use format specifiers instead of percent format
|
||||||
'C408', # Unnecessary `dict()` call (rewrite as a literal)
|
# 'C408', # Unnecessary `dict()` call (rewrite as a literal)
|
||||||
# 'C417' # Unnecessary `map()` usage (rewrite using a generator expression)
|
# 'C417' # Unnecessary `map()` usage (rewrite using a generator expression)
|
||||||
]
|
]
|
||||||
|
|
||||||
# [tool.pylint]
|
|
||||||
# max-line-length = 88
|
|
||||||
# disable = [
|
|
||||||
# "C0103", # (invalid-name)
|
|
||||||
# "C0114", # (missing-module-docstring)
|
|
||||||
# "C0115", # (missing-class-docstring)
|
|
||||||
# "C0116", # (missing-function-docstring)
|
|
||||||
# "R0903", # (too-few-public-methods)
|
|
||||||
# "R0913", # (too-many-arguments)
|
|
||||||
# "W0105", # (pointless-string-statement)
|
|
||||||
# ]
|
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ class WavADMReader:
|
|||||||
Read the ADM `audioProgramme` data structure and some of its reference
|
Read the ADM `audioProgramme` data structure and some of its reference
|
||||||
properties.
|
properties.
|
||||||
"""
|
"""
|
||||||
ret_dict = dict()
|
ret_dict = {}
|
||||||
|
|
||||||
nsmap = self.axml.getroot().nsmap
|
nsmap = self.axml.getroot().nsmap
|
||||||
|
|
||||||
@@ -71,7 +71,7 @@ class WavADMReader:
|
|||||||
ret_dict["contents"] = []
|
ret_dict["contents"] = []
|
||||||
|
|
||||||
for content_ref in program.findall("audioContentIDRef", namespaces=nsmap):
|
for content_ref in program.findall("audioContentIDRef", namespaces=nsmap):
|
||||||
content_dict = dict()
|
content_dict = {}
|
||||||
content_dict["content_id"] = cid = content_ref.text
|
content_dict["content_id"] = cid = content_ref.text
|
||||||
content = afext.find(
|
content = afext.find(
|
||||||
"audioContent[@audioContentID='%s']" % cid, namespaces=nsmap
|
"audioContent[@audioContentID='%s']" % cid, namespaces=nsmap
|
||||||
@@ -80,7 +80,7 @@ class WavADMReader:
|
|||||||
content_dict["objects"] = []
|
content_dict["objects"] = []
|
||||||
|
|
||||||
for object_ref in content.findall("audioObjectIDRef", namespaces=nsmap):
|
for object_ref in content.findall("audioObjectIDRef", namespaces=nsmap):
|
||||||
object_dict = dict()
|
object_dict = {}
|
||||||
object_dict["object_id"] = oid = object_ref.text
|
object_dict["object_id"] = oid = object_ref.text
|
||||||
object = afext.find(
|
object = afext.find(
|
||||||
"audioObject[@audioObjectID='%s']" % oid, namespaces=nsmap
|
"audioObject[@audioObjectID='%s']" % oid, namespaces=nsmap
|
||||||
@@ -206,7 +206,7 @@ class WavADMReader:
|
|||||||
rd.update(self.track_info(channel_uid_rec.track_index))
|
rd.update(self.track_info(channel_uid_rec.track_index))
|
||||||
return rd
|
return rd
|
||||||
|
|
||||||
return dict(
|
return {
|
||||||
channel_entries=[make_entry(z) for z in self.channel_uids],
|
'channel_entries': [make_entry(z) for z in self.channel_uids],
|
||||||
programme=self.programme(),
|
'programme': self.programme(),
|
||||||
)
|
}
|
||||||
|
|||||||
@@ -176,13 +176,15 @@ class RangeLabel(NamedTuple):
|
|||||||
parsed = unpack(leader_struct_fmt, data[0 : calcsize(leader_struct_fmt)])
|
parsed = unpack(leader_struct_fmt, data[0 : calcsize(leader_struct_fmt)])
|
||||||
text_data = data[calcsize(leader_struct_fmt) :]
|
text_data = data[calcsize(leader_struct_fmt) :]
|
||||||
|
|
||||||
|
purpose_str = parsed[2].decode('ascii')
|
||||||
|
|
||||||
if data[6] != 0:
|
if data[6] != 0:
|
||||||
fallback_encoding = f"cp{data[6]}"
|
fallback_encoding = f"cp{data[6]}"
|
||||||
|
|
||||||
return cls(
|
return cls(
|
||||||
name=parsed[0],
|
name=parsed[0],
|
||||||
length=parsed[1],
|
length=parsed[1],
|
||||||
purpose=parsed[2],
|
purpose=purpose_str,
|
||||||
country=parsed[3],
|
country=parsed[3],
|
||||||
language=parsed[4],
|
language=parsed[4],
|
||||||
dialect=parsed[5],
|
dialect=parsed[5],
|
||||||
@@ -282,10 +284,10 @@ class WavCuesReader:
|
|||||||
return next((r.length for r in self.ranges if r.name == cue_ident), None)
|
return next((r.length for r in self.ranges if r.name == cue_ident), None)
|
||||||
|
|
||||||
def to_dict(self) -> Dict[str, Any]:
|
def to_dict(self) -> Dict[str, Any]:
|
||||||
retval = dict()
|
retval = {}
|
||||||
|
|
||||||
for n, t in self.each_cue():
|
for n, t in self.each_cue():
|
||||||
retval[n] = dict()
|
retval[n] = {}
|
||||||
retval[n]["frame"] = t
|
retval[n]["frame"] = t
|
||||||
label, note = self.label_and_note(n)
|
label, note = self.label_and_note(n)
|
||||||
r = self.range(n)
|
r = self.range(n)
|
||||||
|
|||||||
@@ -687,4 +687,4 @@ class WavDolbyMetadataReader:
|
|||||||
atmos = [asdict(x) for x in self.dolby_atmos()]
|
atmos = [asdict(x) for x in self.dolby_atmos()]
|
||||||
# atmos_sup = map(lambda x: asdict(x), self.dolby_atmos_supplemental())
|
# atmos_sup = map(lambda x: asdict(x), self.dolby_atmos_supplemental())
|
||||||
|
|
||||||
return dict(dolby_digital_plus=list(ddp), dolby_atmos=list(atmos))
|
return {'dolby_digital_plus': ddp, 'dolby_atmos': atmos}
|
||||||
|
|||||||
Reference in New Issue
Block a user