Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Recurse m4a atoms to search for ilst #625

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Recurse m4a atoms to search for ilst #625

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
348b7a0
Recurse m4a atoms to search for ilst
sezanzeb Aug 13, 2023
638751c
return early when children are None
sezanzeb Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions mutagen/mp4/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,17 +340,30 @@ def __init__(self, *args, **kwargs):
if args or kwargs:
self.load(*args, **kwargs)

def load(self, atoms, fileobj):
try:
path = atoms.path(b"moov", b"udta", b"meta", b"ilst")
except KeyError as key:
raise MP4MetadataError(key)
def load(self, atoms: Atoms, fileobj):
for atom in atoms.atoms:
if atom.children is not None:
self._recurse_atom(atom, fileobj)

free = _find_padding(path)
self._padding = free.datalength if free is not None else 0
def _recurse_atom(self, parent: Atom, fileobj):
"""Recursively search for an ilst atom to read metadata from.

ilst = path[-1]
for atom in ilst.children:
Recursing helps if the mp4/m4a container didn't store metadata correctly,
which is usually expected at moov.udta.meta.ilst"""
if parent.children is None:
return

if parent.name != b"ilst":
for atom in parent.children:
if parent.name == b"meta" and atom.name == b"ilst":
free = _find_padding([parent, atom])
self._padding = free.datalength if free is not None else 0

if atom.children is not None and atom.name != 'ilst':
self._recurse_atom(atom, fileobj)
return

for atom in parent.children:
ok, data = atom.read(fileobj)
if not ok:
raise MP4MetadataError("Not enough data")
Expand Down
Loading