Skip to content

Fix album art on Music Assistant 2.10+ #99

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
lotooo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix album art on Music Assistant 2.10+ #99

Show file tree
Hide file tree
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
10 changes: 8 additions & 2 deletions lib/providers/music_assistant_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2915,7 +2915,10 @@ class MusicAssistantProvider with ChangeNotifier {
if (baseUrl.endsWith('/')) {
baseUrl = baseUrl.substring(0, baseUrl.length - 1);
}
finalImageUrl = '$baseUrl/imageproxy?$queryString';
// Keep the original path: on MA 2.10+ it carries the proxy id
final imgPath = imgUri.path.isEmpty ? '/imageproxy' : imgUri.path;
finalImageUrl =
queryString.isEmpty ? '$baseUrl$imgPath' : '$baseUrl$imgPath?$queryString';
} catch (e) {
// Use original URL
}
Expand Down Expand Up @@ -3155,7 +3158,10 @@ class MusicAssistantProvider with ChangeNotifier {
if (baseUrl.endsWith('/')) {
baseUrl = baseUrl.substring(0, baseUrl.length - 1);
}
imageUrl = '$baseUrl/imageproxy?$queryString';
// Keep the original path: on MA 2.10+ it carries the proxy id
final imgPath = imgUri.path.isEmpty ? '/imageproxy' : imgUri.path;
imageUrl =
queryString.isEmpty ? '$baseUrl$imgPath' : '$baseUrl$imgPath?$queryString';
} catch (e) {
if (imageUrl != null && imageUrl.startsWith('http://')) {
imageUrl = imageUrl.replaceFirst('http://', 'https://');
Expand Down
21 changes: 20 additions & 1 deletion lib/services/music_assistant_api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3250,6 +3250,18 @@ class MusicAssistantAPI {
return streamUrl;
}

// MA only accepts a fixed set of imageproxy sizes, so round up to the
// nearest supported one rather than letting the request 400 (0 = original).
static const _imageProxySizes = [80, 160, 256, 512, 1024];

int _imageProxySize(int size) {
if (size <= 0) return 0;
for (final supported in _imageProxySizes) {
if (size <= supported) return supported;
}
return _imageProxySizes.last;
}

// Get image URL
String? getImageUrl(MediaItem item, {int size = 256}) {
// Images are in metadata.images as an array
Expand Down Expand Up @@ -3315,8 +3327,15 @@ class MusicAssistantAPI {
baseUrl = '${uri.scheme}://${uri.host}:${uri.port}';
}

// MA 2.10 replaced the path+provider query form with /imageproxy/<proxy_id>
// and dropped the old one, so prefer proxy_id whenever the server sends it.
final proxyId = selectedImage['proxy_id'] as String?;
if (proxyId != null && proxyId.isNotEmpty) {
return '$baseUrl/imageproxy/$proxyId?size=${_imageProxySize(size)}&fmt=jpeg';
}

final provider = selectedImage['provider'] as String?;
// Use the imageproxy endpoint
// Pre-2.10 servers don't expose proxy_id; fall back to the legacy endpoint
return '$baseUrl/imageproxy?provider=${Uri.encodeComponent(provider ?? "")}&size=$size&fmt=jpeg&path=${Uri.encodeComponent(imagePath)}';
}

Expand Down