Skip to content

feat(lyrics): lrc.red and Unison sources, one lyrics run per song, version-aware matching - #1370

Merged
A-EDev merged 14 commits into
mainfrom
feat/lyrics-providers
Oct 20, 2026
Merged

A-EDev merged 14 commits into
mainfrom
feat/lyrics-providers

Conversation

@A-EDev

@A-EDev A-EDev commented Oct 20, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • Two new lyrics sources: lrc.red (Apple word-synced lyrics matched by recording, slot 2) and Unison (community lyrics, slot 8). LyricsPlus no longer calls lrc.red behind the scenes.
  • One shared LyricsHelper (Hilt singleton) for the player, the music service and downloads. A song change runs the provider chain once, and the run stops when the song is skipped.
  • The service pre-warm uses the song's real duration instead of 180 s. Music media items now carry MediaMetadata.durationMs.
  • Searches keep "(Live)", "(Remix)", "(Acoustic)" and similar tags, and a result has to be the same version (LyricsMatching).
  • Apple TTML times like 27.395 and 3:12.818 are read correctly. Before, BetterLyrics lyrics were all timed at 0 and skipped as unsynced.
  • A BetterLyrics 401 for a song it has not cached counts as a miss instead of benching the provider for 10 minutes.
  • The helper stops waiting on a provider at its deadline instead of waiting for its blocking request to finish.
  • Paxsenix finds Apple tracks through iTunes Search first, and compares durations in seconds on both sides.
  • Dead LyricsPlus mirrors removed, all providers share one HTTP client, and new providers join a saved order next to their default neighbour.
  • The providers sheet shows a name and a one-line description for each source.
  • One line in the v3.0.1 changelog.

Related issue

Change type

  • Bug fix
  • Feature
  • Refactor or maintenance
  • Build, packaging, or CI
  • Documentation

Validation

  • ./gradlew :app:assembleGithubDebug
  • ./gradlew :app:testGithubDebugUnitTest (680 test classes, all passing)
  • I ran any additional flavor-specific build or test tasks affected by this change. (:app:compileFossDebugKotlin, ktlintCheck)
  • I manually tested the affected behavior on an Android device or emulator.

Test device and Android version: POCO X6 Pro 5G, Android 16. Seven songs from a cold lyrics cache (studio, live, feat., Japanese, Arabic): one provider run per song change, lrc.red word sync for アイドル, a live track kept off the studio lyrics, BetterLyrics still answering after an uncached song, and the providers sheet with the new switches saving.

Screenshots or recordings

Risk and compatibility

  • New preference keys lyrics_provider_enabled_lrcred and lyrics_provider_enabled_unison, both default on. No migration needed.

  • Network: lrc.red and Unison are each one request only when the providers above them miss. The duplicate provider chain per song is gone.

  • No Room schema change.

  • The change does not introduce secrets, private data, or unexpected telemetry.

  • New user-facing text uses Android string resources.

  • Dependency and lockfile changes are intentional and limited to this PR.

  • Room schema changes include the required version bump and migration, or this PR does not change the Room schema.

  • Breaking changes and upgrade steps are clearly documented.

Copilot AI balanced review requested due to automatic review settings October 20, 2026 08:24

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

An organization owner can choose the repository organization as the billing source for reviews requested by members with a paid Copilot license. Learn about Copilot code review billing.

@github-actions github-actions Bot added player Video and audio playback ui Compose UI, theming, or Material 3 surfaces labels Oct 20, 2026
@A-EDev
A-EDev merged commit a45ad8b into main Oct 20, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

player Video and audio playback ui Compose UI, theming, or Material 3 surfaces

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants