Skip to content

Fix: Handle non-UTF8 .lrc files gracefully to prevent playback blocking #2640

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

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix: Handle non-UTF8 .lrc files gracefully to prevent playback blocking #2640

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions music_assistant/providers/filesystem_local/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,8 +995,15 @@ async def _parse_track(
assert file_item.ext is not None # for type checking
lrc_path = f"{file_item.absolute_path.removesuffix(file_item.ext)}lrc"
if await self.exists(lrc_path):
async with aiofiles.open(lrc_path) as lrc_file:
track.metadata.lrc_lyrics = await lrc_file.read()
try:
async with aiofiles.open(lrc_path, encoding="utf-8") as lrc_file:
track.metadata.lrc_lyrics = await lrc_file.read()
except Exception as err:
self.logger.warning(
"Failed to read lyrics file %s: %s",
lrc_path,
str(err),
)

return track

Expand Down
Loading