Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Chris
|
6fc24539b1 | ||
|
Chris
|
32f62a4731 | ||
|
ChrisandClaude Opus 4.6
|
9b8f6d36c6 | ||
|
ChrisandClaude Opus 4.6
|
a3e414dc4b | ||
|
ChrisandClaude Opus 4.6
|
a6d6eb8d55 | ||
|
ChrisandClaude Opus 4.6
|
cd8c5a66e4 | ||
|
ChrisandClaude Opus 4.6
|
dadfe65e5a | ||
|
ChrisandClaude Opus 4.6
|
0a853bd862 | ||
|
ChrisandClaude Opus 4.6
|
694b7127a0 | ||
|
ChrisandClaude Opus 4.6
|
4cbfd6a9e0 | ||
|
ChrisandClaude Opus 4.6
|
8bf0d23972 | ||
|
ChrisandClaude Opus 4.6
|
c17b8b5c5e | ||
|
ChrisandClaude Opus 4.6
|
4e3134df9c | ||
|
ChrisandClaude Opus 4.6
|
c4b80b9d33 | ||
|
ChrisandClaude Opus 4.6
|
d28c6ab556 | ||
|
ChrisandClaude Opus 4.6
|
ccfea4168c |
@@ -1,388 +0,0 @@
|
||||
# Android Auto Implementation Plan for Ensemble
|
||||
|
||||
## 1. Overview
|
||||
|
||||
This document describes adding Android Auto support to Ensemble. When a user connects their Android phone to a car head unit, Android Auto will browse and play music through Ensemble without touching the phone.
|
||||
|
||||
### What we're building
|
||||
|
||||
- A browse hierarchy (Favorites, Playlists, Albums, Radio) accessible from the car screen
|
||||
- Playback from Android Auto routes through the builtin (local) player, which streams through MA as normal
|
||||
- Voice search support
|
||||
|
||||
### Why builtin player only
|
||||
|
||||
Android Auto requires local audio output. The builtin player plays audio through `just_audio` on the device, which the car receives over Bluetooth. Remote MA players are irrelevant in a car context.
|
||||
|
||||
---
|
||||
|
||||
## 2. Architecture
|
||||
|
||||
### Provider reference
|
||||
|
||||
`MassivAudioHandler` has no reference to `MusicAssistantProvider` today. The handler is created before the provider (in `main()` before `runApp`). Solution: add a `setProvider()` method and call it from `_MusicAssistantAppState.initState()`.
|
||||
|
||||
```
|
||||
main.dart
|
||||
audioHandler = await AudioService.init(...) // global, created first
|
||||
runApp(MusicAssistantApp())
|
||||
_MusicAssistantAppState.initState()
|
||||
_musicProvider = MusicAssistantProvider()
|
||||
audioHandler.setProvider(_musicProvider) // NEW
|
||||
```
|
||||
|
||||
### Browse → play call flow
|
||||
|
||||
```
|
||||
Android Auto MassivAudioHandler MusicAssistantProvider
|
||||
| | |
|
||||
getChildren('root') -----> | returns category items |
|
||||
getChildren('cat|playlists')-> | SyncService.cachedPlaylists |
|
||||
getChildren('playlist|lib|5')-> | provider.getPlaylistTracksWithCache()
|
||||
| populates _trackQueueCache |
|
||||
playFromMediaId('track|lib|7|plist|lib|5') -> |
|
||||
| lookup _trackQueueCache |
|
||||
| provider.playTracks(builtinId, tracks, startIndex: i)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. Media ID Scheme
|
||||
|
||||
Separator: `|` (pipe). Provider names use underscores/colons, never pipes — safe.
|
||||
|
||||
| ID | Meaning |
|
||||
|----|---------|
|
||||
| `root` | Root (browsable) |
|
||||
| `recent` | Currently playing track (playable) |
|
||||
| `cat\|favorites` | Favorites category (browsable) |
|
||||
| `cat\|playlists` | Playlists category (browsable) |
|
||||
| `cat\|albums` | Albums category (browsable) |
|
||||
| `cat\|radio` | Radio stations category (browsable) |
|
||||
| `playlist\|{provider}\|{itemId}` | A playlist (browsable) |
|
||||
| `album\|{provider}\|{itemId}` | An album (browsable) |
|
||||
| `track\|{tProvider}\|{tItemId}\|{ctxType}\|{ctxProvider}\|{ctxId}` | A track in context (playable) |
|
||||
| `radio\|{provider}\|{itemId}` | A radio station (playable) |
|
||||
|
||||
The `ctxType|ctxProvider|ctxId` suffix in track IDs encodes the parent container. Context types: `plist`, `album`, `favs`, `search`.
|
||||
|
||||
**Track queue cache key** = `{ctxType}|{ctxProvider}|{ctxId}` (e.g. `plist|spotify|abc`). Stored when building children, looked up in `playFromMediaId`.
|
||||
|
||||
---
|
||||
|
||||
## 4. Browse Hierarchy
|
||||
|
||||
```
|
||||
root
|
||||
├── recent (playable, shown if something is/was playing)
|
||||
├── cat|favorites (browsable → favorite tracks, all playable)
|
||||
├── cat|playlists (browsable → list of playlists, each browsable)
|
||||
│ └── playlist|{provider}|{id} → tracks (playable)
|
||||
├── cat|albums (browsable → list of albums, each browsable)
|
||||
│ └── album|{provider}|{id} → tracks (playable)
|
||||
└── cat|radio (browsable → radio stations, each playable)
|
||||
```
|
||||
|
||||
Artists are **not included**. Navigating Artist → Albums → Album → Tracks is four taps — too many while driving. Can be added later.
|
||||
|
||||
---
|
||||
|
||||
## 5. Track Queue Cache
|
||||
|
||||
Tapping a track in Android Auto should play the full album/playlist from that track, not just the single track. The handler caches track lists when building children:
|
||||
|
||||
```dart
|
||||
// Key: ctxKey e.g. "plist|spotify|abc" or "album|library|42" or "favs||"
|
||||
// Value: ordered list of tracks in that container
|
||||
final Map<String, List<ma.Track>> _trackQueueCache = {};
|
||||
```
|
||||
|
||||
When `getChildren('playlist|spotify|abc')` is called:
|
||||
1. Fetch tracks via `provider.getPlaylistTracksWithCache('spotify', 'abc')`
|
||||
2. Store `_trackQueueCache['plist|spotify|abc'] = tracks`
|
||||
3. Return each track as a playable `MediaItem` with id `track|{t.provider}|{t.itemId}|plist|spotify|abc`
|
||||
|
||||
When `playFromMediaId('track|lib|7|plist|spotify|abc')` is called:
|
||||
1. Parse ctxKey = `plist|spotify|abc`
|
||||
2. Look up `_trackQueueCache['plist|spotify|abc']`
|
||||
3. Find track index where `itemId == '7'`
|
||||
4. Call `provider.playTracks(builtinId, tracks, startIndex: index)`
|
||||
|
||||
---
|
||||
|
||||
## 6. Key Code for `massiv_audio_handler.dart`
|
||||
|
||||
### New imports
|
||||
|
||||
```dart
|
||||
import 'package:rxdart/rxdart.dart';
|
||||
import '../../providers/music_assistant_provider.dart';
|
||||
import '../settings_service.dart';
|
||||
import '../sync_service.dart';
|
||||
import '../../models/media_item.dart' as ma;
|
||||
```
|
||||
|
||||
Note: `audio_service` exports its own `MediaItem`. Use `ma.MediaItem`, `ma.Track`, `ma.Album`, `ma.Playlist` for app models. The bare `MediaItem` refers to the audio_service type throughout new methods.
|
||||
|
||||
### New fields
|
||||
|
||||
```dart
|
||||
MusicAssistantProvider? _provider;
|
||||
final Map<String, ma.Track> _trackQueueCache = {}; // ctxKey -> tracks (see section 5)
|
||||
final Map<String, BehaviorSubject<Map<String, dynamic>>> _childrenSubjects = {};
|
||||
|
||||
void setProvider(MusicAssistantProvider provider) {
|
||||
_provider = provider;
|
||||
}
|
||||
```
|
||||
|
||||
### `getChildren`
|
||||
|
||||
```dart
|
||||
@override
|
||||
Future<List<MediaItem>> getChildren(String parentMediaId,
|
||||
[Map<String, dynamic>? options]) async {
|
||||
final provider = _provider;
|
||||
if (provider == null) return [];
|
||||
|
||||
switch (parentMediaId) {
|
||||
case AudioService.browsableRootId:
|
||||
return _buildRoot(provider);
|
||||
case 'cat|favorites':
|
||||
return _buildFavorites(provider);
|
||||
case 'cat|playlists':
|
||||
return _buildPlaylistList(provider);
|
||||
case 'cat|albums':
|
||||
return _buildAlbumList(provider);
|
||||
case 'cat|radio':
|
||||
return _buildRadioList(provider);
|
||||
default:
|
||||
if (parentMediaId.startsWith('playlist|')) {
|
||||
final parts = parentMediaId.split('|');
|
||||
if (parts.length >= 3) return _buildPlaylistTracks(provider, parts[1], parts[2]);
|
||||
}
|
||||
if (parentMediaId.startsWith('album|')) {
|
||||
final parts = parentMediaId.split('|');
|
||||
if (parts.length >= 3) return _buildAlbumTracks(provider, parts[1], parts[2]);
|
||||
}
|
||||
return [];
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### `playFromMediaId`
|
||||
|
||||
```dart
|
||||
@override
|
||||
Future<void> playFromMediaId(String mediaId, [Map<String, dynamic>? extras]) async {
|
||||
final provider = _provider;
|
||||
if (provider == null) return;
|
||||
|
||||
final playerId = await SettingsService.getBuiltinPlayerId();
|
||||
if (playerId == null) return;
|
||||
|
||||
_logger.log('AndroidAuto: playFromMediaId $mediaId');
|
||||
|
||||
try {
|
||||
if (mediaId == 'recent') {
|
||||
await provider.playPauseSelectedPlayer();
|
||||
return;
|
||||
}
|
||||
|
||||
if (mediaId.startsWith('radio|')) {
|
||||
final parts = mediaId.split('|'); // ['radio', provider, itemId]
|
||||
if (parts.length < 3) return;
|
||||
final station = provider.radioStations.firstWhere(
|
||||
(s) => s.provider == parts[1] && s.itemId == parts[2],
|
||||
orElse: () => throw Exception('Station not found: $mediaId'),
|
||||
);
|
||||
await provider.playRadio(playerId, station);
|
||||
return;
|
||||
}
|
||||
|
||||
if (mediaId.startsWith('track|')) {
|
||||
// Format: track|{tProvider}|{tItemId}|{ctxType}|{ctxProvider}|{ctxId}
|
||||
final parts = mediaId.split('|');
|
||||
if (parts.length < 6) return;
|
||||
final tProvider = parts[1];
|
||||
final tItemId = parts[2];
|
||||
final ctxKey = parts.sublist(3).join('|');
|
||||
|
||||
final trackList = _trackQueueCache[ctxKey];
|
||||
if (trackList == null || trackList.isEmpty) {
|
||||
// Fallback: play single track (minimal Track object)
|
||||
await provider.playTrack(playerId, ma.Track(itemId: tItemId, provider: tProvider, name: ''));
|
||||
return;
|
||||
}
|
||||
|
||||
final index = trackList.indexWhere((t) => t.provider == tProvider && t.itemId == tItemId);
|
||||
await provider.playTracks(playerId, trackList, startIndex: index < 0 ? 0 : index);
|
||||
return;
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('AndroidAuto: playFromMediaId error: $e');
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### `search`
|
||||
|
||||
```dart
|
||||
@override
|
||||
Future<List<MediaItem>> search(String query, [Map<String, dynamic>? extras]) async {
|
||||
final provider = _provider;
|
||||
if (provider == null || query.trim().isEmpty) return [];
|
||||
|
||||
try {
|
||||
final results = await provider.searchWithCache(query);
|
||||
final tracks = (results['tracks'] ?? []).whereType<ma.Track>().toList();
|
||||
const ctxKey = 'search||';
|
||||
_trackQueueCache[ctxKey] = tracks;
|
||||
|
||||
return tracks.map((t) => MediaItem(
|
||||
id: 'track|${t.provider}|${t.itemId}|$ctxKey',
|
||||
title: t.name,
|
||||
artist: t.artistsString,
|
||||
album: t.album?.name,
|
||||
duration: t.duration,
|
||||
artUri: _artUri(provider, t),
|
||||
playable: true,
|
||||
)).toList();
|
||||
} catch (e) {
|
||||
_logger.log('AndroidAuto: search error: $e');
|
||||
return [];
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### `subscribeToChildren`
|
||||
|
||||
```dart
|
||||
@override
|
||||
ValueStream<Map<String, dynamic>> subscribeToChildren(String parentMediaId) {
|
||||
_childrenSubjects[parentMediaId] ??= BehaviorSubject.seeded({});
|
||||
return _childrenSubjects[parentMediaId]!.stream;
|
||||
}
|
||||
```
|
||||
|
||||
### `_artUri` helper
|
||||
|
||||
```dart
|
||||
Uri? _artUri(MusicAssistantProvider provider, ma.MediaItem item) {
|
||||
final url = provider.getImageUrl(item, size: 256);
|
||||
return url != null ? Uri.tryParse(url) : null;
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 7. Files to Change
|
||||
|
||||
### `pubspec.yaml`
|
||||
Add `rxdart: ^0.28.0` as direct dependency. The `^0.28.0` constraint matches the already-resolved transitive version so no upgrade occurs.
|
||||
|
||||
### `android/app/build.gradle`
|
||||
Change:
|
||||
```groovy
|
||||
minSdkVersion flutter.minSdkVersion
|
||||
```
|
||||
To:
|
||||
```groovy
|
||||
minSdkVersion 23
|
||||
```
|
||||
Android Auto requires API 23+. `flutter.minSdkVersion` resolves to 21 — too low.
|
||||
|
||||
### `android/app/src/main/AndroidManifest.xml`
|
||||
Add inside `<application>` tag:
|
||||
```xml
|
||||
<meta-data
|
||||
android:name="com.google.android.gms.car.application"
|
||||
android:resource="@xml/automotive_app_desc" />
|
||||
```
|
||||
The `MediaBrowserService` intent filter on `AudioService` is already present — no changes needed there.
|
||||
|
||||
### `android/app/src/main/res/xml/automotive_app_desc.xml` (NEW)
|
||||
```xml
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<automotiveApp>
|
||||
<uses name="media" />
|
||||
</automotiveApp>
|
||||
```
|
||||
|
||||
### `lib/main.dart`
|
||||
In `_MusicAssistantAppState.initState()`, after creating `_musicProvider`:
|
||||
```dart
|
||||
audioHandler.setProvider(_musicProvider);
|
||||
```
|
||||
|
||||
### `lib/services/audio/massiv_audio_handler.dart`
|
||||
Add ~200 lines. New imports, fields, `setProvider()`, `getChildren()`, `playFromMediaId()`, `search()`, `subscribeToChildren()`, and private builder helpers. All existing code is untouched.
|
||||
|
||||
---
|
||||
|
||||
## 8. Testing with DHU (No Car Required)
|
||||
|
||||
### Install DHU
|
||||
In Android Studio: SDK Manager → SDK Tools → Android Auto Desktop Head Unit Emulator.
|
||||
|
||||
Or via command line:
|
||||
```bash
|
||||
sdkmanager "extras;google;auto"
|
||||
```
|
||||
|
||||
### Enable Android Auto developer mode on phone
|
||||
1. Settings → Apps → Android Auto → tap version number 10 times
|
||||
2. In Android Auto developer settings: enable "Unknown sources"
|
||||
|
||||
### Run the test session
|
||||
```bash
|
||||
# Terminal 1: forward the port
|
||||
adb forward tcp:5277 tcp:5277
|
||||
|
||||
# Terminal 2: start the DHU
|
||||
$ANDROID_SDK_ROOT/extras/google/auto/desktop-head-unit
|
||||
```
|
||||
|
||||
In Android Auto developer settings on phone: tap "Start head unit server".
|
||||
|
||||
### Build and install
|
||||
```bash
|
||||
flutter build apk --debug
|
||||
adb install build/app/outputs/flutter-apk/app-debug.apk
|
||||
```
|
||||
|
||||
Launch Ensemble on phone first (so audio service starts). Then tap the media icon in DHU — Ensemble should appear.
|
||||
|
||||
### Troubleshooting
|
||||
|
||||
| Symptom | Cause | Fix |
|
||||
|---------|-------|-----|
|
||||
| App not visible in DHU | Missing `automotive_app_desc.xml` or wrong meta-data name | Check manifest and XML |
|
||||
| App visible, browse is empty | `setProvider` not yet called | Check `initState` wiring |
|
||||
| Build fails | `minSdkVersion` too low | Check `build.gradle` |
|
||||
| Track plays but wrong song | `_trackQueueCache` miss | Ensure `getChildren` ran before `playFromMediaId` |
|
||||
|
||||
---
|
||||
|
||||
## 9. Implementation Order
|
||||
|
||||
Do these steps in order to test incrementally:
|
||||
|
||||
1. Android config files (`build.gradle`, `AndroidManifest.xml`, `automotive_app_desc.xml`) — verify app appears in DHU before writing Dart
|
||||
2. `pubspec.yaml` + `flutter pub get`
|
||||
3. `massiv_audio_handler.dart`: add `setProvider`, fields, `subscribeToChildren` — minimum to not crash
|
||||
4. `main.dart`: wire `setProvider`
|
||||
5. `massiv_audio_handler.dart`: `getChildren` with hardcoded root categories — verify tree appears in DHU
|
||||
6. `massiv_audio_handler.dart`: add all `_build*` helpers one by one, test each
|
||||
7. `massiv_audio_handler.dart`: add `playFromMediaId` — test track playback
|
||||
8. `massiv_audio_handler.dart`: add `search` — test voice search
|
||||
|
||||
---
|
||||
|
||||
## 10. Not In Scope
|
||||
|
||||
- **Artists browse** — too many taps for driving; albums alone suffice
|
||||
- **Audiobooks/podcasts** — different UX needs; add later
|
||||
- **Queue management from Android Auto** — MA queue model is complex
|
||||
- **Push updates** — `notifyChildrenChanged` stubbed but not wired to sync events
|
||||
- **Android Automotive OS** — different platform, requires a separate flavor
|
||||
+391
@@ -0,0 +1,391 @@
|
||||
# Ensemble Codebase Intensive Audit Prompt
|
||||
|
||||
## Overview
|
||||
|
||||
You are tasked with conducting an intensive, comprehensive audit of the **Ensemble** Flutter application - a Music Assistant client for Android with multi-device synchronization, local playback, and Sendspin raw audio streaming capabilities.
|
||||
|
||||
**Codebase Statistics:**
|
||||
- 90 Dart files, ~40,583 lines of code
|
||||
- 18 screens, 27 services, 6 providers
|
||||
- Architecture: Provider pattern with ChangeNotifier
|
||||
- Audio: just_audio + flutter_pcm_sound + audio_service
|
||||
- Networking: WebSocket (JSON-RPC) + HTTP + Sendspin binary protocol
|
||||
|
||||
---
|
||||
|
||||
## Audit Scope
|
||||
|
||||
Perform a thorough audit covering ALL of the following areas. For each issue found, provide:
|
||||
1. **File path and line number(s)**
|
||||
2. **Severity**: CRITICAL / HIGH / MEDIUM / LOW
|
||||
3. **Description** of the issue
|
||||
4. **Impact** if left unfixed
|
||||
5. **Recommended fix** with code example where applicable
|
||||
|
||||
---
|
||||
|
||||
## SECTION 1: SECURITY AUDIT
|
||||
|
||||
### 1.1 Credential Storage (CRITICAL PRIORITY)
|
||||
Audit `/lib/services/settings_service.dart` for:
|
||||
- [ ] Plaintext password storage in SharedPreferences (lines 209-222)
|
||||
- [ ] Auth tokens stored without encryption
|
||||
- [ ] Serialized credentials in JSON format (lines 169-190)
|
||||
|
||||
**Expected Finding:** Credentials stored insecurely. Recommend flutter_secure_storage.
|
||||
|
||||
### 1.2 Certificate Validation
|
||||
Audit `/lib/services/auth/auth_manager.dart` for:
|
||||
- [ ] HTTPS redirect handling for local IPs
|
||||
- [ ] Certificate validation disabled scenarios
|
||||
- [ ] MITM vulnerability exposure
|
||||
|
||||
### 1.3 Authentication Strategies
|
||||
Audit all files in `/lib/services/auth/`:
|
||||
- [ ] `basic_auth_strategy.dart` - Base64 encoding (not encryption)
|
||||
- [ ] `authelia_strategy.dart` - Session cookie handling, timing attack (line 159)
|
||||
- [ ] `ma_auth_strategy.dart` - Token refresh mechanism
|
||||
- [ ] `no_auth_strategy.dart` - Public server exposure
|
||||
|
||||
### 1.4 Input Validation
|
||||
Audit `/lib/services/music_assistant_api.dart`:
|
||||
- [ ] URI construction without validation (lines 1346-1360)
|
||||
- [ ] Provider/itemId injection risks
|
||||
- [ ] WebSocket message validation
|
||||
|
||||
### 1.5 Information Disclosure
|
||||
- [ ] Debug logs exposing sensitive data (check all `_logger.log()` calls)
|
||||
- [ ] Server version exposure via `server_info`
|
||||
- [ ] Error messages leaking technical details
|
||||
|
||||
---
|
||||
|
||||
## SECTION 2: MEMORY MANAGEMENT AUDIT
|
||||
|
||||
### 2.1 Static Memory Leaks
|
||||
Audit `/lib/models/player.dart`:
|
||||
- [ ] `_playerCreationTimes` static map (lines 96-144) - grows unbounded
|
||||
- [ ] Cleanup only removes 50 of 100+ entries
|
||||
|
||||
### 2.2 Unbounded Caches
|
||||
Audit `/lib/services/cache_service.dart`:
|
||||
- [ ] `_albumTracksCache` - no size limit
|
||||
- [ ] `_artistAlbumsCache` - no TTL expiration
|
||||
- [ ] `_searchCache` - never evicted
|
||||
- [ ] `_playerTrackCache` - only cleared on disconnect
|
||||
|
||||
### 2.3 Stream/Timer Cleanup
|
||||
Audit `/lib/providers/music_assistant_provider.dart`:
|
||||
- [ ] `_playerStateTimer` disposal (line 4435-4445)
|
||||
- [ ] `_notificationPositionTimer` multiple creation paths (lines 2925-2940)
|
||||
- [ ] `_localPlayerEventSubscription` cleanup
|
||||
- [ ] `_playerUpdatedEventSubscription` cleanup
|
||||
- [ ] `_playerAddedEventSubscription` cleanup
|
||||
|
||||
Audit `/lib/services/hardware_volume_service.dart`:
|
||||
- [ ] `_volumeUpController` never closed (lines 74-85)
|
||||
- [ ] `_volumeDownController` never closed
|
||||
|
||||
### 2.4 Stream Subscription Leaks
|
||||
Audit `/lib/providers/music_assistant_provider.dart`:
|
||||
- [ ] `_api!.connectionState.listen()` - subscription not stored
|
||||
- [ ] Old subscriptions not cancelled before new API instance
|
||||
|
||||
---
|
||||
|
||||
## SECTION 3: RACE CONDITION AUDIT
|
||||
|
||||
### 3.1 Player State Dual Updates
|
||||
Audit `/lib/providers/music_assistant_provider.dart`:
|
||||
- [ ] Timer polling (every 5s) vs WebSocket events racing
|
||||
- [ ] `_updatePlayerState()` called from both paths
|
||||
- [ ] No mutex/lock protection
|
||||
|
||||
### 3.2 Async Method Reentrancy
|
||||
Audit `selectPlayer()` method:
|
||||
- [ ] `async` method without guard against concurrent calls
|
||||
- [ ] `_selectedPlayer` modified before and after `await`
|
||||
- [ ] State could change during await
|
||||
|
||||
### 3.3 Fire-and-Forget Operations
|
||||
Search for `unawaited(` and `() async {` patterns:
|
||||
- [ ] `_persistPlaybackState()` - database save not awaited
|
||||
- [ ] Pause operations fire-and-forget (lines 3876-3894)
|
||||
- [ ] Preload operations (line 2707)
|
||||
|
||||
### 3.4 PCM Player State Machine
|
||||
Audit `/lib/services/pcm_audio_player.dart`:
|
||||
- [ ] 9-state machine with complex transitions (lines 32-37)
|
||||
- [ ] Auto-recovery race condition (lines 215-229)
|
||||
- [ ] Feed loop during pause transition (lines 174-179)
|
||||
|
||||
---
|
||||
|
||||
## SECTION 4: ERROR HANDLING AUDIT
|
||||
|
||||
### 4.1 Silent Exception Handlers (CRITICAL)
|
||||
Find all instances of:
|
||||
```dart
|
||||
} catch (e) {}
|
||||
} catch (_) {}
|
||||
```
|
||||
|
||||
Known locations:
|
||||
- [ ] `music_assistant_provider.dart` (multiple)
|
||||
- [ ] `player_provider.dart` (3 instances)
|
||||
- [ ] `recently_played_service.dart`
|
||||
|
||||
### 4.2 Missing Error Recovery
|
||||
- [ ] No exponential backoff on connection retry
|
||||
- [ ] No retry logic for failed API calls
|
||||
- [ ] WebSocket timeout handling (30 seconds - too long?)
|
||||
|
||||
### 4.3 Null Safety Violations
|
||||
Find all `!` (null assertion) operators:
|
||||
- [ ] `search_screen.dart` (20+ instances)
|
||||
- [ ] `models/media_item.dart`
|
||||
- [ ] `models/player.dart`
|
||||
- [ ] `item.mediaItem! as Artist` patterns
|
||||
|
||||
---
|
||||
|
||||
## SECTION 5: ARCHITECTURAL ISSUES
|
||||
|
||||
### 5.1 God Class
|
||||
Audit `/lib/providers/music_assistant_provider.dart`:
|
||||
- [ ] 4,469 lines - violates Single Responsibility
|
||||
- [ ] 386 conditional branches
|
||||
- [ ] Mixing: connection, players, library, sync, audio, position tracking
|
||||
|
||||
**Recommend splitting into:**
|
||||
- ConnectionProvider (~500 LOC)
|
||||
- PlayerManager (~800 LOC)
|
||||
- LibraryProvider (~1000 LOC)
|
||||
- LocalPlaybackManager (~600 LOC)
|
||||
|
||||
### 5.2 Oversized Widget Files
|
||||
- [ ] `expandable_player.dart` - 2,485 lines (should be <500)
|
||||
- [ ] `global_player_overlay.dart` - 737 lines
|
||||
- [ ] `new_library_screen.dart` - 2,521 lines
|
||||
|
||||
### 5.3 Global Key Anti-Pattern
|
||||
Audit `/lib/widgets/global_player_overlay.dart`:
|
||||
- [ ] `globalPlayerKey` for state access
|
||||
- [ ] `_overlayStateKey` for overlay state
|
||||
- [ ] Should use Provider/context instead
|
||||
|
||||
### 5.4 Primitive Obsession
|
||||
- [ ] View modes as strings ('grid2', 'grid3', 'list')
|
||||
- [ ] Media types as strings ('track', 'album', 'artist')
|
||||
- [ ] Should be strongly-typed enums
|
||||
|
||||
---
|
||||
|
||||
## SECTION 6: CODE QUALITY ISSUES
|
||||
|
||||
### 6.1 Testing (CRITICAL)
|
||||
- [ ] **ZERO test files exist** - confirm this
|
||||
- [ ] No unit tests, widget tests, or integration tests
|
||||
- [ ] flutter_test dependency exists but unused
|
||||
|
||||
### 6.2 Hardcoded Values
|
||||
Find and document all:
|
||||
- [ ] Color hex codes (50+ instances of `Color(0xFF...`)
|
||||
- [ ] Duration values not using `Timings` constants
|
||||
- [ ] Magic numbers (16, 4, 5, 100, 50)
|
||||
- [ ] String literals for media types
|
||||
|
||||
### 6.3 Mixed Async Patterns
|
||||
- [ ] `.then()` chains alongside async/await
|
||||
- [ ] `.whenComplete()` usage
|
||||
- [ ] Consolidate to async/await
|
||||
|
||||
### 6.4 Dead Code
|
||||
- [ ] `@Deprecated` methods still implemented
|
||||
- [ ] `animation_debugger.dart` - dev-only?
|
||||
- [ ] Unused imports
|
||||
|
||||
### 6.5 TODO Comments
|
||||
Document all actionable TODOs:
|
||||
- [ ] `queue_screen.dart:214` - queue item removal
|
||||
- [ ] `audiobook_detail_screen.dart:261,312` - progress sync
|
||||
- [ ] `music_assistant_provider.dart:793,799` - playlist modification
|
||||
|
||||
---
|
||||
|
||||
## SECTION 7: UI/UX AUDIT
|
||||
|
||||
### 7.1 Accessibility (CRITICAL)
|
||||
Audit for missing:
|
||||
- [ ] `Semantics` widgets on interactive elements
|
||||
- [ ] `Tooltip` on icon buttons
|
||||
- [ ] Screen reader support
|
||||
- [ ] Touch target sizes (minimum 48dp)
|
||||
- [ ] Color contrast validation (WCAG AA)
|
||||
|
||||
### 7.2 Performance Issues
|
||||
Audit `/lib/widgets/expandable_player.dart`:
|
||||
- [ ] No `RepaintBoundary` wrappers
|
||||
- [ ] 55+ `setState()` calls
|
||||
- [ ] 3 AnimationControllers with multiple listeners
|
||||
- [ ] Title height cache invalidation (lines 118+)
|
||||
|
||||
### 7.3 Double Opacity Bug
|
||||
Audit `/lib/widgets/player/player_controls.dart`:
|
||||
```dart
|
||||
color: (shuffle == true ? primaryColor : textColor.withOpacity(0.5))
|
||||
.withOpacity(expandedElementsOpacity),
|
||||
```
|
||||
- [ ] Double `.withOpacity()` application
|
||||
|
||||
### 7.4 Missing Features
|
||||
- [ ] No landscape orientation support
|
||||
- [ ] No tablet layout optimization
|
||||
- [ ] No loading skeleton animations
|
||||
- [ ] No haptic feedback (except one location)
|
||||
|
||||
---
|
||||
|
||||
## SECTION 8: AUDIO PLAYBACK AUDIT
|
||||
|
||||
### 8.1 Position Interpolation
|
||||
Audit `/lib/services/position_tracker.dart`:
|
||||
- [ ] No timeout on anchor updates - unbounded drift possible
|
||||
- [ ] Duration interpolation can exceed track duration
|
||||
- [ ] Stale timestamp handling (>30 seconds)
|
||||
|
||||
### 8.2 Sendspin Protocol
|
||||
Audit `/lib/services/sendspin_service.dart`:
|
||||
- [ ] Proxy auth retry without deduplication (lines 188-209)
|
||||
- [ ] WebSocket binary frame parsing
|
||||
- [ ] Clock synchronization accuracy
|
||||
|
||||
### 8.3 Audio Resource Cleanup
|
||||
Audit `/lib/services/audio/massiv_audio_handler.dart`:
|
||||
- [ ] Audio session interrupt listeners not disposed
|
||||
- [ ] Audio focus not explicitly released
|
||||
|
||||
### 8.4 Mixed Playback Modes
|
||||
- [ ] just_audio initialized but unused during Sendspin
|
||||
- [ ] Resource allocation for unused player
|
||||
- [ ] Potential audio focus conflicts
|
||||
|
||||
---
|
||||
|
||||
## SECTION 9: NETWORKING AUDIT
|
||||
|
||||
### 9.1 WebSocket Lifecycle
|
||||
Audit `/lib/services/music_assistant_api.dart`:
|
||||
- [ ] Heartbeat interval (30s) - appropriate?
|
||||
- [ ] Reconnection logic and timing
|
||||
- [ ] Pending request cleanup on disconnect
|
||||
|
||||
### 9.2 Caching Strategy
|
||||
- [ ] No incremental/delta sync (full library every 5 minutes)
|
||||
- [ ] Cache staleness not communicated to UI
|
||||
- [ ] No query result pagination (fetches up to 5000 items)
|
||||
|
||||
### 9.3 Rate Limiting
|
||||
- [ ] No client-side rate limiting
|
||||
- [ ] Search requests not throttled
|
||||
- [ ] Could overload server
|
||||
|
||||
### 9.4 Offline Support
|
||||
Audit `/lib/services/offline_action_queue.dart`:
|
||||
- [ ] Queue execution not atomic (lines 118-130)
|
||||
- [ ] Action could execute twice on crash
|
||||
- [ ] Queue stored unencrypted
|
||||
|
||||
---
|
||||
|
||||
## SECTION 10: DATABASE AUDIT
|
||||
|
||||
### 10.1 Schema Review
|
||||
Audit `/lib/database/database.dart`:
|
||||
- [ ] Table indexes for query performance
|
||||
- [ ] Foreign key constraints
|
||||
- [ ] Migration strategy
|
||||
|
||||
### 10.2 Query Patterns
|
||||
- [ ] N+1 query prevention
|
||||
- [ ] Transaction usage for atomic operations
|
||||
- [ ] Connection pooling
|
||||
|
||||
### 10.3 Data Consistency
|
||||
- [ ] Tier 1 (DB) vs Tier 2 (API sync) race conditions
|
||||
- [ ] User modifications during background sync
|
||||
- [ ] Conflict resolution strategy
|
||||
|
||||
---
|
||||
|
||||
## Deliverables
|
||||
|
||||
After completing the audit, provide:
|
||||
|
||||
### 1. Executive Summary
|
||||
- Overall code quality score (1-10)
|
||||
- Top 5 critical issues requiring immediate attention
|
||||
- Estimated technical debt in developer-hours
|
||||
|
||||
### 2. Issue Tracker
|
||||
Create a prioritized list of all issues found:
|
||||
| ID | Severity | Category | File:Line | Description | Effort |
|
||||
|----|----------|----------|-----------|-------------|--------|
|
||||
|
||||
### 3. Recommended Roadmap
|
||||
Sprint-based plan to address findings:
|
||||
- Sprint 1 (Immediate): Security fixes, silent exception handlers
|
||||
- Sprint 2-3: God class decomposition, test infrastructure
|
||||
- Sprint 4-6: Memory leak fixes, accessibility
|
||||
- Long-term: Performance optimization, monitoring
|
||||
|
||||
### 4. Code Examples
|
||||
For each CRITICAL and HIGH severity issue, provide:
|
||||
- Current problematic code
|
||||
- Recommended refactored code
|
||||
- Migration steps
|
||||
|
||||
---
|
||||
|
||||
## Files to Prioritize
|
||||
|
||||
Start your audit with these critical files:
|
||||
|
||||
1. `/lib/providers/music_assistant_provider.dart` (4,469 LOC) - God class
|
||||
2. `/lib/services/settings_service.dart` - Credential storage
|
||||
3. `/lib/services/music_assistant_api.dart` (2,929 LOC) - Networking
|
||||
4. `/lib/widgets/expandable_player.dart` (2,485 LOC) - UI complexity
|
||||
5. `/lib/services/auth/` directory - Security
|
||||
6. `/lib/models/player.dart` - Memory leaks
|
||||
7. `/lib/services/cache_service.dart` - Unbounded caches
|
||||
8. `/lib/services/position_tracker.dart` - Audio sync issues
|
||||
|
||||
---
|
||||
|
||||
## Known Critical Issues (Pre-Identified)
|
||||
|
||||
These issues have been identified and MUST be verified and documented:
|
||||
|
||||
1. **CRITICAL: Plaintext credential storage** - SharedPreferences without encryption
|
||||
2. **CRITICAL: Zero test coverage** - No unit, widget, or integration tests
|
||||
3. **CRITICAL: 4,469 line god class** - MusicAssistantProvider violates SRP
|
||||
4. **CRITICAL: Silent exception handlers** - `catch (e) {}` patterns
|
||||
5. **HIGH: Static memory leak** - `_playerCreationTimes` unbounded growth
|
||||
6. **HIGH: Race conditions** - Player state polling vs events
|
||||
7. **HIGH: No accessibility** - Missing Semantics, screen reader support
|
||||
8. **HIGH: Certificate validation disabled** - MITM vulnerability for local IPs
|
||||
9. **MEDIUM: Double opacity bug** - `.withOpacity().withOpacity()` in player controls
|
||||
10. **MEDIUM: Position tracker drift** - No timeout on anchor updates
|
||||
|
||||
---
|
||||
|
||||
## Audit Execution Notes
|
||||
|
||||
- Use `Grep` tool to search for patterns across the codebase
|
||||
- Use `Read` tool to examine specific file sections
|
||||
- Document line numbers for all findings
|
||||
- Provide code snippets for context
|
||||
- Cross-reference related issues across files
|
||||
- Verify pre-identified issues exist and document their exact locations
|
||||
|
||||
**Total estimated audit time: 4-6 hours for thorough coverage**
|
||||
+419
@@ -0,0 +1,419 @@
|
||||
# Ensemble Codebase - Comprehensive Audit Report
|
||||
|
||||
**Audit Date:** 2026-01-01
|
||||
**Codebase:** Ensemble Flutter App (Music Assistant Client)
|
||||
**Version:** 2.7.3-beta+35
|
||||
**Total Lines of Code:** ~40,583 Dart
|
||||
**Files Analyzed:** 90 Dart files
|
||||
|
||||
---
|
||||
|
||||
## Executive Summary
|
||||
|
||||
### Overall Code Quality Score: 5.5/10
|
||||
|
||||
The Ensemble codebase demonstrates **strong architectural foundations** with a well-organized service layer, effective caching strategies, and sophisticated audio handling. However, the audit revealed **critical security vulnerabilities**, **zero test coverage**, and significant **technical debt** that must be addressed before production release.
|
||||
|
||||
### Critical Statistics
|
||||
|
||||
| Metric | Value | Status |
|
||||
|--------|-------|--------|
|
||||
| Test Coverage | 0% | CRITICAL |
|
||||
| God Class Size | 4,469 LOC | CRITICAL |
|
||||
| Silent Exception Handlers | 7 | CRITICAL |
|
||||
| Plaintext Credentials | 4 locations | CRITICAL |
|
||||
| Memory Leak Locations | 6 | HIGH |
|
||||
| Race Conditions | 4 | HIGH |
|
||||
| Accessibility (Semantics) | 0 widgets | CRITICAL |
|
||||
|
||||
---
|
||||
|
||||
## Issue Summary by Severity
|
||||
|
||||
| Severity | Count | Categories |
|
||||
|----------|-------|------------|
|
||||
| **CRITICAL** | 12 | Security, Testing, Architecture, Accessibility |
|
||||
| **HIGH** | 18 | Memory, Race Conditions, Networking, Audio |
|
||||
| **MEDIUM** | 22 | Error Handling, UI, Caching, Code Quality |
|
||||
| **LOW** | 14 | Naming, Documentation, Minor Improvements |
|
||||
|
||||
---
|
||||
|
||||
## CRITICAL ISSUES (Immediate Action Required)
|
||||
|
||||
### 1. Plaintext Credential Storage
|
||||
**File:** `/lib/services/settings_service.dart`
|
||||
**Lines:** 131-143, 147-159, 169-190, 209-222
|
||||
|
||||
Passwords and auth tokens stored in SharedPreferences without encryption.
|
||||
|
||||
```dart
|
||||
// VULNERABLE CODE
|
||||
static Future<void> setPassword(String? password) async {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
await prefs.setString(_keyPassword, password); // PLAINTEXT!
|
||||
}
|
||||
```
|
||||
|
||||
**Fix:** Use `flutter_secure_storage` for all sensitive data.
|
||||
|
||||
---
|
||||
|
||||
### 2. Zero Test Coverage
|
||||
**Location:** Entire codebase
|
||||
|
||||
No unit tests, widget tests, or integration tests exist. The `flutter_test` dependency is unused.
|
||||
|
||||
**Impact:** Cannot safely refactor, high regression risk, no confidence in correctness.
|
||||
|
||||
**Fix:** Establish test infrastructure immediately. Start with:
|
||||
- Unit tests for `MusicAssistantAPI`, `CacheService`, `ErrorHandler`
|
||||
- Widget tests for player controls
|
||||
- Integration tests for playback flows
|
||||
|
||||
---
|
||||
|
||||
### 3. God Class - MusicAssistantProvider
|
||||
**File:** `/lib/providers/music_assistant_provider.dart`
|
||||
**Size:** 4,469 lines, ~140 methods, 744 conditional branches
|
||||
|
||||
Single class handles: connection, players, library, cache, audio, sync, offline queue.
|
||||
|
||||
**Fix:** Split into:
|
||||
- `ConnectionManager` (~500 LOC)
|
||||
- `PlayerManager` (~800 LOC)
|
||||
- `LibraryCacheService` (~600 LOC)
|
||||
- `SendspinManager` (~400 LOC)
|
||||
- `MusicAssistantProvider` - Facade composing above (~800 LOC)
|
||||
|
||||
---
|
||||
|
||||
### 4. Zero Accessibility Support
|
||||
**Files:** `/lib/widgets/`, `/lib/screens/` (all)
|
||||
|
||||
- **0** `Semantics` widgets
|
||||
- **0** `semanticLabel` properties
|
||||
- **1** `Tooltip` (entire app)
|
||||
- Screen readers cannot navigate the app
|
||||
|
||||
**Fix:** Add Semantics to all interactive elements:
|
||||
```dart
|
||||
Semantics(
|
||||
button: true,
|
||||
label: isPlaying ? 'Pause playback' : 'Play',
|
||||
child: IconButton(...)
|
||||
)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 5. Silent Exception Handlers
|
||||
**Locations:** 7 instances across codebase
|
||||
|
||||
| File | Line | Code |
|
||||
|------|------|------|
|
||||
| player_provider.dart | 567, 575, 584 | `catch (e) {}` |
|
||||
| music_assistant_provider.dart | 2690 | `catch (e) {}` |
|
||||
| music_assistant_api.dart | 2542 | `catch (e) {}` |
|
||||
| recently_played_service.dart | 154, 206 | `catch (_) {}` |
|
||||
|
||||
**Fix:** Add logging or use `firstWhereOrNull` instead of try/catch around `firstWhere`.
|
||||
|
||||
---
|
||||
|
||||
### 6. Audio Session Listeners Not Disposed
|
||||
**File:** `/lib/services/audio/massiv_audio_handler.dart`
|
||||
**Lines:** 45-73
|
||||
|
||||
Stream subscriptions created but never cancelled - causes memory leaks and zombie listeners.
|
||||
|
||||
**Fix:** Store subscriptions and cancel in dispose():
|
||||
```dart
|
||||
StreamSubscription? _interruptionSubscription;
|
||||
_interruptionSubscription = session.interruptionEventStream.listen(...);
|
||||
|
||||
void dispose() {
|
||||
_interruptionSubscription?.cancel();
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## HIGH SEVERITY ISSUES
|
||||
|
||||
### 7. Connection State Subscription Not Stored
|
||||
**File:** `/lib/providers/music_assistant_provider.dart:575-614`
|
||||
|
||||
The `connectionState.listen()` return value is not stored - causes listener accumulation on reconnect.
|
||||
|
||||
---
|
||||
|
||||
### 8. Player State Race Condition
|
||||
**File:** `/lib/providers/music_assistant_provider.dart`
|
||||
|
||||
Timer polling (every 5s) and WebSocket events can race to update `_selectedPlayer` and `_currentTrack` without mutex protection.
|
||||
|
||||
---
|
||||
|
||||
### 9. Async Method Reentrancy
|
||||
**File:** `/lib/providers/music_assistant_provider.dart:2713-2841`
|
||||
|
||||
`selectPlayer()` is `void async` with no guard against concurrent calls. Multiple rapid player switches can interleave.
|
||||
|
||||
---
|
||||
|
||||
### 10. Unbounded Search Cache
|
||||
**File:** `/lib/services/cache_service.dart:31-32`
|
||||
|
||||
`_searchCache` map has no size limit or proactive TTL eviction. Grows indefinitely with user searches.
|
||||
|
||||
---
|
||||
|
||||
### 11. Static Memory Leak
|
||||
**File:** `/lib/models/player.dart:96, 139-144`
|
||||
|
||||
`_playerCreationTimes` static map cleanup only removes 50 of 100+ entries, allowing unbounded growth.
|
||||
|
||||
---
|
||||
|
||||
### 12. No Database Indexes
|
||||
**File:** `/lib/database/database.dart`
|
||||
|
||||
No secondary indexes defined. Query performance degrades as database grows.
|
||||
|
||||
---
|
||||
|
||||
### 13. No Incremental Sync
|
||||
**File:** `/lib/services/sync_service.dart:150-165`
|
||||
|
||||
Full library fetch (up to 4000 items) on every sync instead of delta updates.
|
||||
|
||||
---
|
||||
|
||||
### 14. Offline Queue Not Atomic
|
||||
**File:** `/lib/services/offline_action_queue.dart:80-108`
|
||||
|
||||
Queue persistence happens after all processing - crash during processing loses successful actions.
|
||||
|
||||
---
|
||||
|
||||
### 15. Auth Retry Without Deduplication
|
||||
**File:** `/lib/services/sendspin_service.dart:189-209`
|
||||
|
||||
Multiple auth messages can be sent during rapid reconnection attempts.
|
||||
|
||||
---
|
||||
|
||||
### 16. Pending Requests Not Completed on Disconnect
|
||||
**File:** `/lib/services/music_assistant_api.dart:2911`
|
||||
|
||||
`_pendingRequests.clear()` abandons Completers without completing them with errors.
|
||||
|
||||
---
|
||||
|
||||
### 17. HTTP Fallback for Local IPs
|
||||
**File:** `/lib/services/auth/auth_manager.dart:51-58`
|
||||
|
||||
HTTPS failures silently fall back to HTTP on local networks - MITM vulnerability.
|
||||
|
||||
---
|
||||
|
||||
### 18. Certificate Validation Bypassed
|
||||
**File:** `/lib/services/auth/auth_manager.dart:210-236`
|
||||
|
||||
HTTPS redirects explicitly refused for local IPs due to expected certificate failures.
|
||||
|
||||
---
|
||||
|
||||
## MEDIUM SEVERITY ISSUES
|
||||
|
||||
### 19. Double Opacity Bug
|
||||
**File:** `/lib/widgets/player/player_controls.dart:62-63, 99-100`
|
||||
|
||||
```dart
|
||||
// BUG: .withOpacity(0.5).withOpacity(expandedElementsOpacity) compounds opacity
|
||||
color: (shuffle == true ? primaryColor : textColor.withOpacity(0.5))
|
||||
.withOpacity(expandedElementsOpacity),
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 20. Mixed Async Patterns
|
||||
**Locations:** 13 instances
|
||||
|
||||
`.then()` chains mixed with `async/await` throughout the codebase.
|
||||
|
||||
---
|
||||
|
||||
### 21. Hardcoded Colors
|
||||
**Locations:** 55 instances
|
||||
|
||||
`Color(0xFF604CEC)`, `Color(0xFF1a1a1a)` scattered across theme files and widgets.
|
||||
|
||||
---
|
||||
|
||||
### 22. View Modes as Strings
|
||||
**Locations:** 80+ instances
|
||||
|
||||
`'grid2'`, `'grid3'`, `'list'` should be enums.
|
||||
|
||||
---
|
||||
|
||||
### 23. Fire-and-Forget Pause Commands
|
||||
**File:** `/lib/providers/music_assistant_provider.dart:3875-3894`
|
||||
|
||||
Server pause command uses `unawaited()` - errors are silently lost.
|
||||
|
||||
---
|
||||
|
||||
### 24. Position Tracker Anchor Timeout Missing
|
||||
**File:** `/lib/services/position_tracker.dart:24-26`
|
||||
|
||||
No timeout on stale anchor - interpolation can drift indefinitely.
|
||||
|
||||
---
|
||||
|
||||
### 25. PCM Buffer No Overflow Protection
|
||||
**File:** `/lib/services/pcm_audio_player.dart:68, 236-247`
|
||||
|
||||
Audio buffer grows unbounded if data arrives faster than consumption.
|
||||
|
||||
---
|
||||
|
||||
### 26. No Client-Side Rate Limiting
|
||||
**Location:** App-wide
|
||||
|
||||
No throttling on API requests during rapid user interactions.
|
||||
|
||||
---
|
||||
|
||||
### 27. Portrait-Only Lock
|
||||
**File:** `/lib/main.dart:64-68`
|
||||
|
||||
No landscape orientation support.
|
||||
|
||||
---
|
||||
|
||||
### 28. Touch Targets Below 48dp
|
||||
**Files:** player_controls.dart, queue_panel.dart, player_card.dart
|
||||
|
||||
Multiple buttons at 28x28 and 44x44 instead of minimum 48x48.
|
||||
|
||||
---
|
||||
|
||||
### 29. WCAG Contrast Not Validated
|
||||
**File:** `/lib/theme/palette_helper.dart`
|
||||
|
||||
Uses 0.4 threshold instead of proper WCAG 4.5:1 contrast ratio calculation.
|
||||
|
||||
---
|
||||
|
||||
### 30. StreamControllers Not Closed
|
||||
**File:** `/lib/services/hardware_volume_service.dart:18-19, 74-85`
|
||||
|
||||
`_volumeUpController` and `_volumeDownController` never closed in dispose().
|
||||
|
||||
---
|
||||
|
||||
## LOW SEVERITY ISSUES
|
||||
|
||||
### 31-34. Naming Inconsistencies
|
||||
Mixed patterns: `_isLoading` vs `_isLoadingPlaylists`, various cache variable names.
|
||||
|
||||
### 35-38. Missing TODO Implementations
|
||||
6 actionable TODOs identified (queue removal, audiobook progress sync, playlist modification).
|
||||
|
||||
### 39-42. Dead/Unused Code
|
||||
- `@Deprecated` methods still implemented
|
||||
- `library_stats.dart` appears unused
|
||||
- `animation_debugger.dart` disabled by default
|
||||
|
||||
### 43-44. Minor Documentation Gaps
|
||||
Missing method documentation, no architecture diagram.
|
||||
|
||||
---
|
||||
|
||||
## Recommended Remediation Roadmap
|
||||
|
||||
### Sprint 1 (Week 1-2): Security & Critical Fixes
|
||||
1. Migrate credentials to `flutter_secure_storage`
|
||||
2. Add logging to all silent catch blocks
|
||||
3. Store connection state subscription
|
||||
4. Fix audio session listener disposal
|
||||
5. Add basic test infrastructure (10% coverage target)
|
||||
|
||||
### Sprint 2 (Week 3-4): Memory & Race Conditions
|
||||
6. Add mutex to player state updates
|
||||
7. Add reentrancy guard to `selectPlayer()`
|
||||
8. Implement bounded caches with LRU eviction
|
||||
9. Fix static memory leak in Player model
|
||||
10. Store and cancel all stream subscriptions
|
||||
|
||||
### Sprint 3 (Week 5-6): Architecture Refactoring
|
||||
11. Split `MusicAssistantProvider` into 5 smaller classes
|
||||
12. Split `expandable_player.dart` into component widgets
|
||||
13. Replace GlobalKey anti-patterns with Provider
|
||||
14. Convert string constants to enums
|
||||
15. Extract hardcoded colors to constants file
|
||||
|
||||
### Sprint 4 (Week 7-8): Accessibility & UI
|
||||
16. Add Semantics to all interactive elements
|
||||
17. Increase touch targets to 48dp minimum
|
||||
18. Implement WCAG contrast validation
|
||||
19. Fix double opacity bug
|
||||
20. Add landscape orientation support
|
||||
|
||||
### Sprint 5 (Week 9-10): Performance & Polish
|
||||
21. Add database indexes
|
||||
22. Implement incremental sync
|
||||
23. Add client-side rate limiting
|
||||
24. Fix atomic offline queue processing
|
||||
25. Achieve 30% test coverage target
|
||||
|
||||
---
|
||||
|
||||
## Files Requiring Most Attention
|
||||
|
||||
| File | LOC | Issues | Priority |
|
||||
|------|-----|--------|----------|
|
||||
| `music_assistant_provider.dart` | 4,469 | 12 | CRITICAL |
|
||||
| `settings_service.dart` | 811 | 4 | CRITICAL |
|
||||
| `expandable_player.dart` | 2,485 | 6 | HIGH |
|
||||
| `music_assistant_api.dart` | 2,929 | 5 | HIGH |
|
||||
| `cache_service.dart` | 370 | 4 | HIGH |
|
||||
| `massiv_audio_handler.dart` | 296 | 2 | CRITICAL |
|
||||
| `player.dart` | 422 | 2 | HIGH |
|
||||
| `auth_manager.dart` | 300 | 3 | HIGH |
|
||||
|
||||
---
|
||||
|
||||
## Estimated Technical Debt
|
||||
|
||||
| Category | Effort (Dev-Days) |
|
||||
|----------|-------------------|
|
||||
| Security Fixes | 3-5 |
|
||||
| Test Infrastructure | 10-15 |
|
||||
| Architecture Refactoring | 15-20 |
|
||||
| Memory Leak Fixes | 3-5 |
|
||||
| Accessibility | 5-8 |
|
||||
| UI/UX Polish | 3-5 |
|
||||
| Performance | 5-8 |
|
||||
| **Total** | **44-66 dev-days** |
|
||||
|
||||
---
|
||||
|
||||
## Conclusion
|
||||
|
||||
The Ensemble app has a solid foundation with well-designed patterns for caching, audio handling, and multi-device synchronization. However, **critical security vulnerabilities** (plaintext credentials), **zero test coverage**, and a **4,469-line god class** represent significant risks that must be addressed before any production deployment.
|
||||
|
||||
The most urgent priorities are:
|
||||
1. **Secure credential storage** - immediate security risk
|
||||
2. **Add test infrastructure** - enables safe refactoring
|
||||
3. **Split the god class** - enables maintainability
|
||||
4. **Add accessibility** - legal/compliance requirement
|
||||
|
||||
With focused effort over 8-10 weeks, the codebase can be brought to production-quality standards.
|
||||
|
||||
---
|
||||
|
||||
*Audit conducted using 6 parallel specialized sub-agents analyzing security, memory management, race conditions, architecture, UI/UX, and audio/networking.*
|
||||
+119
@@ -0,0 +1,119 @@
|
||||
# Ensemble Codebase Audit Prompt
|
||||
|
||||
Run this prompt with Claude Code to perform a comprehensive audit of the Ensemble Flutter app.
|
||||
|
||||
---
|
||||
|
||||
## Prompt
|
||||
|
||||
You are performing a comprehensive code audit on the Ensemble Flutter app. This is a music/audiobook/podcast player app with 93+ Dart files.
|
||||
|
||||
**CRITICAL RULES:**
|
||||
1. DO NOT remove or break any existing functionality
|
||||
2. All changes must be on the current branch: `audit/code-quality-review`
|
||||
3. Run `flutter analyze` after each set of changes to verify no regressions
|
||||
4. Commit changes in logical, reviewable chunks
|
||||
|
||||
**AUDIT PHASES:**
|
||||
|
||||
### Phase 1: Code Quality Analysis (Read-Only)
|
||||
First, analyze the codebase without making changes. Create a report covering:
|
||||
|
||||
1. **Large File Analysis** - Review these files for refactoring opportunities:
|
||||
- `lib/screens/new_library_screen.dart` (122KB)
|
||||
- `lib/screens/search_screen.dart` (129KB)
|
||||
- `lib/widgets/expandable_player.dart` (107KB)
|
||||
- `lib/screens/album_details_screen.dart` (48KB)
|
||||
- `lib/screens/artist_details_screen.dart` (45KB)
|
||||
|
||||
2. **Pattern Inconsistencies** - Look for:
|
||||
- Inconsistent naming conventions (camelCase vs snake_case)
|
||||
- Mixed widget composition patterns
|
||||
- Inconsistent error handling approaches
|
||||
- Duplicate code across screens/widgets
|
||||
|
||||
3. **Performance Red Flags** - Identify:
|
||||
- Unnecessary rebuilds (missing const constructors)
|
||||
- Heavy computations in build methods
|
||||
- Missing list item caching (ListView.builder vs ListView)
|
||||
- Inefficient state management patterns
|
||||
|
||||
4. **Scroll Performance Issues** - Specifically audit:
|
||||
- ScrollController usage and disposal
|
||||
- Sliver implementations
|
||||
- AnimatedBuilder/AnimatedWidget usage
|
||||
- Image loading in scrollable lists
|
||||
- Any jank-inducing patterns
|
||||
|
||||
### Phase 2: Quick Wins (Low Risk, High Impact)
|
||||
Apply these fixes first:
|
||||
|
||||
1. Add missing `const` constructors throughout
|
||||
2. Fix any `flutter analyze` warnings
|
||||
3. Remove dead code and unused imports
|
||||
4. Standardize formatting with `dart format`
|
||||
|
||||
### Phase 3: Scroll Animation Optimization
|
||||
Focus on smoother scrolling:
|
||||
|
||||
1. **Image Optimization**
|
||||
- Ensure CachedNetworkImage is used consistently
|
||||
- Add appropriate cacheWidth/cacheHeight
|
||||
- Implement proper placeholder/error widgets
|
||||
|
||||
2. **List Performance**
|
||||
- Convert any ListView to ListView.builder where appropriate
|
||||
- Add itemExtent where possible for fixed-height items
|
||||
- Implement AutomaticKeepAliveClientMixin where needed
|
||||
- Consider RepaintBoundary for complex list items
|
||||
|
||||
3. **Animation Smoothing**
|
||||
- Use `Curves.easeOutCubic` or similar for scroll-linked animations
|
||||
- Ensure animations run at 60fps (avoid heavy computations during animation)
|
||||
- Review CustomScrollView/Sliver implementations
|
||||
|
||||
### Phase 4: Code Consistency Improvements
|
||||
|
||||
1. **Widget Extraction**
|
||||
- Extract repeated UI patterns into reusable widgets
|
||||
- Ensure extracted widgets follow existing naming patterns
|
||||
|
||||
2. **State Management**
|
||||
- Verify Provider usage is consistent
|
||||
- Check for proper disposal of controllers/streams
|
||||
|
||||
3. **Error Handling**
|
||||
- Standardize try/catch patterns
|
||||
- Ensure consistent loading/error state UI
|
||||
|
||||
### Phase 5: Verification
|
||||
|
||||
After all changes:
|
||||
1. Run `flutter analyze` - must pass with 0 issues
|
||||
2. Run `flutter test` if tests exist
|
||||
3. Create a summary of all changes made
|
||||
4. List any recommendations that were NOT implemented (too risky)
|
||||
|
||||
---
|
||||
|
||||
## Execution Instructions
|
||||
|
||||
```bash
|
||||
# Start the audit
|
||||
cd /home/home-server/Ensemble
|
||||
git checkout audit/code-quality-review
|
||||
|
||||
# After each phase, commit your changes
|
||||
git add -A && git commit -m "Audit Phase X: [description]"
|
||||
|
||||
# Verify no regressions
|
||||
flutter analyze
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Expected Deliverables
|
||||
|
||||
1. `AUDIT_REPORT.md` - Findings from Phase 1
|
||||
2. Multiple commits with clear messages for each phase
|
||||
3. `AUDIT_SUMMARY.md` - Final summary of all changes and remaining recommendations
|
||||
+257
@@ -0,0 +1,257 @@
|
||||
# Ensemble Codebase Audit Report
|
||||
|
||||
**Date**: 2026-01-14
|
||||
**Scope**: Full codebase audit (104 Dart files, 18 screens)
|
||||
**Focus Areas**: UI Continuity, Performance, Logic/Best Practices
|
||||
|
||||
---
|
||||
|
||||
## Executive Summary
|
||||
|
||||
The Ensemble codebase is a **mature, feature-rich Flutter application** with many good patterns already in place. However, the audit identified **significant architectural debt** that should be addressed:
|
||||
|
||||
| Severity | Count | Key Themes |
|
||||
|----------|-------|------------|
|
||||
| **Critical** | 6 | God classes (5,443 & 4,209 lines), design token adoption, startup blocking |
|
||||
| **High** | 15 | Touch targets, batch DB operations, over-notification, code duplication |
|
||||
| **Medium** | 25+ | Inconsistencies, memory issues, missing error boundaries |
|
||||
| **Low** | 15+ | Minor polish items |
|
||||
|
||||
**Top 3 Priorities:**
|
||||
1. **Split `MusicAssistantProvider` (5,443 lines)** - God object handling everything
|
||||
2. **Split `new_library_screen.dart` (4,209 lines)** - 10 scroll controllers, 15+ view modes
|
||||
3. **Fix startup performance** - Sequential blocking ops could save 1-8 seconds
|
||||
|
||||
---
|
||||
|
||||
## Critical Issues
|
||||
|
||||
### 1. God Object: MusicAssistantProvider (5,443 lines)
|
||||
**File**: `lib/providers/music_assistant_provider.dart`
|
||||
- 54 `notifyListeners()` calls
|
||||
- 30+ state variables
|
||||
- 100+ public methods
|
||||
- Handles: connection, auth, players, library, search, caching, local playback, Sendspin
|
||||
- **Fix**: Split into ConnectionManager, PlayerStateManager, LibraryStateManager, SearchStateManager
|
||||
|
||||
### 2. God Object: NewLibraryScreen (4,209 lines)
|
||||
**File**: `lib/screens/new_library_screen.dart`
|
||||
- 10 scroll controllers
|
||||
- 15+ view mode states
|
||||
- 15+ sort order states
|
||||
- Handles: Music, Books, Podcasts, Radio tabs
|
||||
- **Fix**: Extract to ArtistsTab, AlbumsTab, TracksTab, PlaylistsTab, BooksTab, PodcastsTab, RadioTab
|
||||
|
||||
### 3. Sequential Blocking Startup (500-1500ms wasted)
|
||||
**File**: `lib/main.dart:33-66`
|
||||
```dart
|
||||
await DatabaseService.instance.initialize();
|
||||
await ProfileService.instance.migrateFromOwnerName();
|
||||
await SettingsService.migrateToSecureStorage();
|
||||
await SyncService.instance.loadFromCache();
|
||||
audioHandler = await AudioService.init(...);
|
||||
```
|
||||
- **Fix**: Parallelize with `Future.wait()`, defer AudioService to post-first-frame
|
||||
|
||||
### 4. Design Tokens Exist But Unused
|
||||
**File**: `lib/theme/design_tokens.dart`
|
||||
- `Spacing.*` used in only ~6 of 34+ widget files
|
||||
- `Radii.*` used in only ~5 files
|
||||
- `IconSizes.*` used in only ~4 files
|
||||
- **Fix**: Systematic replacement of hardcoded values
|
||||
|
||||
### 5. Touch Targets Too Small (32x32)
|
||||
**File**: `lib/screens/new_library_screen.dart:1805-1867`
|
||||
- Sort, favorites, view mode buttons are 32x32
|
||||
- Material Design minimum: 48x48
|
||||
- **Fix**: Increase to 48x48 or add padding for hit area
|
||||
|
||||
### 6. No Batch Database Inserts
|
||||
**File**: `lib/services/sync_service.dart:212-273`
|
||||
- 1000 albums = 1000 separate DB transactions
|
||||
- **Fix**: Wrap in single transaction or use Drift batch insert
|
||||
|
||||
---
|
||||
|
||||
## High Severity Issues
|
||||
|
||||
### Performance
|
||||
| Issue | File | Impact |
|
||||
|-------|------|--------|
|
||||
| `context.watch()` in nested tabs | new_library_screen.dart:2960 | All tabs rebuild on any provider change |
|
||||
| Consumer wrapping 800-line player | expandable_player.dart:1234 | Full rebuild on every state change |
|
||||
| Inline sorting during build | new_library_screen.dart:3647 | 5-20ms for 1000+ albums |
|
||||
| Multiple setState for author images | new_library_screen.dart:1017 | 20+ rebuilds as images load |
|
||||
| SecureStorage migration every startup | secure_storage_service.dart:103 | 100-300ms wasted |
|
||||
|
||||
### Architecture
|
||||
| Issue | File | Impact |
|
||||
|-------|------|--------|
|
||||
| State duplication across 4 providers | providers/*.dart | Maintenance burden, sync issues |
|
||||
| 8 duplicate `_cycle*ViewMode()` methods | new_library_screen.dart:251-402 | DRY violation |
|
||||
| 60+ duplicate getter/setter pairs | settings_service.dart:500-1000 | Code bloat |
|
||||
| Global singleton NavigationProvider | navigation_provider.dart:40 | Untestable |
|
||||
| CacheService duplicated in providers | Multiple | Memory waste, inconsistency |
|
||||
|
||||
### UI/UX
|
||||
| Issue | File | Impact |
|
||||
|-------|------|--------|
|
||||
| Hardcoded bottom spacing (140, 164, 100) | Multiple detail screens | Content obscured by player |
|
||||
| Inconsistent button sizes (44 vs 50) | Multiple screens | Visual disharmony |
|
||||
| No debounce on card taps | album_card.dart:118 | Double navigation possible |
|
||||
| Missing PopScope on AudiobookSeriesScreen | audiobook_series_screen.dart:276 | Adaptive colors not cleared |
|
||||
|
||||
### Error Handling
|
||||
| Issue | File | Impact |
|
||||
|-------|------|--------|
|
||||
| No Flutter error boundaries | main.dart | Red error screen on build failure |
|
||||
| API returns empty list on error | music_assistant_api.dart | Can't distinguish error from empty |
|
||||
|
||||
---
|
||||
|
||||
## Medium Severity Issues
|
||||
|
||||
### Performance
|
||||
- PaletteGenerator on main isolate (10-30ms blocking)
|
||||
- Multiple `SharedPreferences.getInstance()` calls (132 occurrences)
|
||||
- AppStartup polling loop with fixed 250ms delay
|
||||
- SystemThemeHelper FutureBuilder recreated on every build
|
||||
|
||||
### UI Consistency
|
||||
- Border radius varies: 8, 12, 20, 22, 25 for same element types
|
||||
- `SizedBox(height: 8)` appears 40+ times instead of `Spacing.vGap8`
|
||||
- Hardcoded colors for status (Colors.red, Colors.green)
|
||||
- Inconsistent icon sizes across screens
|
||||
|
||||
### State Management
|
||||
- Over-notification (multiple notifyListeners in single methods)
|
||||
- Wide Consumer scope (watch instead of select)
|
||||
- Missing dispose() in some providers
|
||||
- Inconsistent async state handling (loading/error)
|
||||
|
||||
### Navigation
|
||||
- `isQueuePanelOpen` vs `isQueuePanelTargetOpen` inconsistency
|
||||
- `popToHome()` doesn't clear adaptive colors
|
||||
- Infinite navigation loop possible (Album → Artist → Album)
|
||||
- Orphaned Hero animations in podcast_card, radio_station_card
|
||||
|
||||
### Data/Caching
|
||||
- Unbounded `_podcastCoverCache`
|
||||
- SyncService listener not removed on error
|
||||
- Redundant API calls between providers
|
||||
- Fire-and-forget persistence race condition
|
||||
|
||||
### Error Handling
|
||||
- No zone error handler for async exceptions
|
||||
- `retryCritical()` retries all errors including non-recoverable
|
||||
- No user notification of offline queue status
|
||||
- DisconnectedState not used consistently
|
||||
|
||||
---
|
||||
|
||||
## Quick Wins (High Impact, Low Effort)
|
||||
|
||||
| # | Task | File(s) | Effort |
|
||||
|---|------|---------|--------|
|
||||
| 1 | Replace hardcoded bottom spacing with `BottomSpacing.withMiniPlayer` | Detail screens | 30 min |
|
||||
| 2 | Add navigation debounce to card widgets | album_card, artist_card, etc. | 1 hr |
|
||||
| 3 | Fix touch targets to 48x48 minimum | new_library_screen.dart | 15 min |
|
||||
| 4 | Add migration skip flag for SecureStorage | secure_storage_service.dart | 30 min |
|
||||
| 5 | Add Flutter error boundary | main.dart | 30 min |
|
||||
| 6 | Use `context.select()` instead of `context.watch()` | global_player_overlay, etc. | 2 hr |
|
||||
| 7 | Cache `SharedPreferences.getInstance()` | settings_service.dart | 30 min |
|
||||
|
||||
---
|
||||
|
||||
## Refactoring Roadmap
|
||||
|
||||
### Phase 1: Quick Wins (1-2 days)
|
||||
- Fix touch targets
|
||||
- Fix bottom spacing
|
||||
- Add navigation debounce
|
||||
- Add error boundaries
|
||||
- Cache SharedPreferences singleton
|
||||
|
||||
### Phase 2: Performance (3-5 days)
|
||||
- Parallelize startup operations
|
||||
- Replace `context.watch()` with `context.select()`
|
||||
- Batch database inserts
|
||||
- Add SecureStorage migration skip flag
|
||||
- Fix over-notification in provider
|
||||
|
||||
### Phase 3: Design System (1 week)
|
||||
- Systematic design token adoption
|
||||
- Standardize button sizes (44 vs 50)
|
||||
- Standardize border radius values
|
||||
- Create StatusColors semantic tokens
|
||||
- Replace all magic numbers
|
||||
|
||||
### Phase 4: Architecture (2-3 weeks)
|
||||
- ~~Split MusicAssistantProvider into focused managers~~ **DEFERRED** - MusicAssistantProvider has evolved with Sendspin, Cast-Sendspin ID mapping, position tracker integration. Splitting would require ~1600 lines of sync work. Code is working and tested.
|
||||
- ~~Split new_library_screen into tab widgets~~ **DEFERRED** - Tabs have tight state coupling (15+ view modes, 15+ sort orders, 10 scroll controllers). Extraction would require InheritedWidget/callbacks for all shared state. Risk outweighs benefit.
|
||||
- ✅ Extract generic helpers for SettingsService - Reduced from 1,031 to 874 lines (~15%)
|
||||
- ✅ Remove/integrate unused providers - Deleted PlayerProvider (964 lines), LibraryProvider, ConnectionProvider (651 lines total)
|
||||
- ~~Split music_assistant_api.dart by domain~~ **DEFERRED** - All methods share WebSocket connection and auth state. Clean extraction would require connection manager abstraction.
|
||||
|
||||
---
|
||||
|
||||
## Positive Findings
|
||||
|
||||
The codebase already demonstrates many good practices:
|
||||
|
||||
- **Performance awareness**: `// PERF:` comments, RepaintBoundary (55 occurrences), image caching (80 memCacheWidth/Height)
|
||||
- **Caching**: Multi-tier caching with LRU eviction, proper TTLs, proper DB indexes
|
||||
- **Error handling**: DebugLogger, RetryHelper, OfflineActionQueue well-implemented
|
||||
- **Theme system**: Material You support, adaptive colors from album art
|
||||
- **Offline support**: Cache-first loading, graceful degradation
|
||||
- **Navigation**: Consistent FadeSlidePageRoute, proper Hero animations (mostly)
|
||||
|
||||
---
|
||||
|
||||
## Files by Priority
|
||||
|
||||
| Priority | File | Lines | Key Issues |
|
||||
|----------|------|-------|------------|
|
||||
| 1 | music_assistant_provider.dart | 5,443 | God object, over-notification |
|
||||
| 2 | new_library_screen.dart | 4,209 | God class, performance, touch targets |
|
||||
| 3 | main.dart | 549 | Startup blocking, error boundaries |
|
||||
| 4 | music_assistant_api.dart | 3,434 | Silent failures, needs splitting |
|
||||
| 5 | settings_service.dart | 1,019 | Code duplication, no caching |
|
||||
| 6 | expandable_player.dart | ~800 | Wide Consumer scope |
|
||||
| 7 | global_player_overlay.dart | ~500 | BottomSpacing source, Consumer scope |
|
||||
| 8 | All detail screens | Various | Hardcoded bottom spacing |
|
||||
| 9 | All card widgets | Various | Navigation debounce, design tokens |
|
||||
|
||||
---
|
||||
|
||||
## Audit Methodology
|
||||
|
||||
This audit was conducted using 9 parallel sub-agents analyzing:
|
||||
|
||||
**UI Continuity (3 agents)**
|
||||
1. Navigation & Flow - back button, Hero animations, tab preservation
|
||||
2. Visual Consistency - design tokens, spacing, typography
|
||||
3. Component Placement - touch targets, bottom spacing, modals
|
||||
|
||||
**Performance (3 agents)**
|
||||
4. Rendering Performance - ListView.builder, const, rebuilds
|
||||
5. Data & Caching - streams, invalidation, memory bounds
|
||||
6. Startup & Load Time - blocking operations, initialization order
|
||||
|
||||
**Logic/Best Practices (3 agents)**
|
||||
7. State Management - Provider patterns, notification frequency
|
||||
8. Error Handling - try-catch, boundaries, resilience
|
||||
9. Code Quality - file size, duplication, SOLID principles
|
||||
|
||||
---
|
||||
|
||||
## Conclusion
|
||||
|
||||
The Ensemble app is well-architected at the macro level but has accumulated technical debt in its largest files. The most impactful improvements would be:
|
||||
|
||||
1. **Splitting the two 4,000+ line files** into focused components
|
||||
2. **Adopting design tokens systematically** for visual consistency
|
||||
3. **Optimizing startup sequence** for faster app launch
|
||||
4. **Using granular state management** (select vs watch) for better performance
|
||||
|
||||
The quick wins section provides immediate value with minimal risk, while the roadmap offers a path to sustainable improvement.
|
||||
@@ -0,0 +1,57 @@
|
||||
# Audit Summary
|
||||
|
||||
**Branch:** `audit/code-quality-review`
|
||||
**Date:** January 4, 2026
|
||||
|
||||
## Changes Applied
|
||||
|
||||
### Phase 1: Analysis Complete
|
||||
- Created `AUDIT_REPORT.md` with comprehensive findings
|
||||
- 4 parallel subagents analyzed const constructors, scroll performance, code duplication, and dead code
|
||||
|
||||
### Phase 2: Deprecated API Fixes (18 files)
|
||||
- Replaced all `colorScheme.background` with `colorScheme.surface` (Material 3 compliance)
|
||||
|
||||
**Files modified:**
|
||||
- lib/screens/library_artists_screen.dart
|
||||
- lib/screens/library_albums_screen.dart
|
||||
- lib/screens/library_playlists_screen.dart
|
||||
- lib/screens/library_tracks_screen.dart
|
||||
- lib/screens/artist_details_screen.dart
|
||||
- lib/screens/new_home_screen.dart
|
||||
- lib/screens/login_screen.dart
|
||||
- lib/screens/settings_screen.dart
|
||||
- lib/screens/album_details_screen.dart
|
||||
- lib/screens/search_screen.dart
|
||||
- lib/screens/new_library_screen.dart
|
||||
|
||||
### Phase 3: Scroll Performance Optimization
|
||||
- Added `memCacheWidth` and `memCacheHeight` to CachedNetworkImage instances
|
||||
|
||||
**lib/screens/new_library_screen.dart:**
|
||||
- Line 1400-1401: Author list tile image (128x128 cache)
|
||||
- Line 1487-1488: Author grid card image (256x256 cache)
|
||||
- Line 1577-1578: Audiobook list tile cover (256x256 cache)
|
||||
- Line 1749-1750: Audiobook grid cover (512x512 cache)
|
||||
- Line 1970-1971: Series list tile cover (256x256 cache)
|
||||
- Line 2986-2987: Album list tile cover (256x256 cache)
|
||||
|
||||
## Recommendations NOT Implemented (Low Priority)
|
||||
|
||||
These were identified but NOT changed to preserve functionality:
|
||||
|
||||
1. **View mode cycling refactor** - 8 similar functions could be consolidated
|
||||
2. **Color constant extraction** - Duplicated colors in 3 files
|
||||
3. **EdgeInsets.zero const** - 64 instances (build-time only, minimal impact)
|
||||
4. **BorderRadius.circular const** - 40+ instances
|
||||
|
||||
## Verification
|
||||
|
||||
Changes should be verified by:
|
||||
1. GitHub Actions build (triggered automatically)
|
||||
2. Manual UI testing of scroll smoothness
|
||||
3. Verify no visual regressions in dark/light themes
|
||||
|
||||
## Build Trigger
|
||||
|
||||
GitHub Actions workflow triggered on branch `audit/code-quality-review`
|
||||
@@ -0,0 +1,529 @@
|
||||
# Ensemble Flutter Music Application - Codebase Audit Report
|
||||
|
||||
**Generated:** 2026-02-07
|
||||
**Project Location:** `/home/chris/Ensemble`
|
||||
**Code Size:** ~6,180 lines in main provider, ~50K+ total lines
|
||||
**Flutter Version:** 3.0+
|
||||
**Auditor:** Claude Code Analysis
|
||||
|
||||
---
|
||||
|
||||
## Executive Summary
|
||||
|
||||
This comprehensive audit examined the Ensemble Flutter music streaming application for security vulnerabilities, performance issues, code quality concerns, and architectural problems. The audit identified **23 distinct issues** across severity levels.
|
||||
|
||||
### Severity Breakdown
|
||||
- **Critical:** 2 issues
|
||||
- **High:** 6 issues
|
||||
- **Medium:** 10 issues
|
||||
- **Low:** 5 issues
|
||||
|
||||
### Overall Health Assessment: **GOOD** (with areas for improvement)
|
||||
|
||||
The codebase demonstrates:
|
||||
- ✅ Strong secure storage practices (flutter_secure_storage with encryptedSharedPreferences)
|
||||
- ✅ Comprehensive dispose() cleanup across widgets
|
||||
- ✅ Good mounted check usage in most async operations
|
||||
- ⚠️ One critical file requiring splitting (6,180 lines)
|
||||
- ⚠️ Some timer callback issues
|
||||
- ⚠️ Several .then() chains that should use async/await
|
||||
|
||||
---
|
||||
|
||||
## 1. CRITICAL ISSUES
|
||||
|
||||
### 1.1 Massive Single File - `music_assistant_provider.dart`
|
||||
**File:** `/home/chris/Ensemble/lib/providers/music_assistant_provider.dart`
|
||||
**Lines:** 6,180
|
||||
**Severity:** Critical
|
||||
**Category:** Maintainability
|
||||
|
||||
**Description:**
|
||||
The main provider file is extremely large (6,180 lines), making it difficult to navigate, test, and maintain. This violates single responsibility principle and increases the risk of merge conflicts.
|
||||
|
||||
**Recommendation:**
|
||||
Split into smaller focused providers:
|
||||
- `MusicAssistantProvider` (core coordination)
|
||||
- `PlayerStateProvider` (player management)
|
||||
- `LibraryStateProvider` (library data)
|
||||
- `ConnectionProvider` (already exists but not fully utilized)
|
||||
|
||||
**Impact:** High complexity, difficult onboarding, increased bug risk
|
||||
|
||||
---
|
||||
|
||||
### 1.2 Empty setState() Call
|
||||
**File:** `/home/chris/Ensemble/lib/screens/debug_log_screen.dart:367`
|
||||
**Severity:** Critical
|
||||
**Category:** Performance
|
||||
|
||||
**Code:**
|
||||
```dart
|
||||
onPressed: () {
|
||||
setState(() {});
|
||||
if (_scrollController.hasClients) {
|
||||
_scrollController.animateTo(...)
|
||||
}
|
||||
},
|
||||
```
|
||||
|
||||
**Description:**
|
||||
An empty setState() triggers a complete widget rebuild without any state changes, wasting CPU cycles.
|
||||
|
||||
**Recommendation:**
|
||||
```dart
|
||||
onPressed: () {
|
||||
if (_scrollController.hasClients) {
|
||||
_scrollController.animateTo(...)
|
||||
}
|
||||
},
|
||||
```
|
||||
|
||||
Or if state update is needed:
|
||||
```dart
|
||||
onPressed: () {
|
||||
setState(() => _lastRefreshTime = DateTime.now());
|
||||
if (_scrollController.hasClients) {
|
||||
_scrollController.animateTo(...)
|
||||
}
|
||||
},
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 2. HIGH SEVERITY ISSUES
|
||||
|
||||
### 2.1 Timer Callback Without Mounted Check
|
||||
**File:** `/home/chris/Ensemble/lib/providers/sleep_timer_provider.dart:76-77`
|
||||
**Severity:** High
|
||||
**Category:** Performance/Stability
|
||||
|
||||
**Code:**
|
||||
```dart
|
||||
_sleepTimerDisplayTimer = Timer.periodic(const Duration(seconds: 1), (_) {
|
||||
notifyListeners(); // Update UI with remaining time
|
||||
});
|
||||
```
|
||||
|
||||
**Description:**
|
||||
Timer callback calls notifyListeners() without checking if the widget is still mounted. If the provider is disposed but timer fires, it could cause issues.
|
||||
|
||||
**Recommendation:**
|
||||
Add a flag to track disposal state:
|
||||
```dart
|
||||
bool _disposed = false;
|
||||
|
||||
_sleepTimerDisplayTimer = Timer.periodic(const Duration(seconds: 1), (_) {
|
||||
if (!_disposed) {
|
||||
notifyListeners();
|
||||
}
|
||||
});
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_disposed = true;
|
||||
_cancelInternal();
|
||||
super.dispose();
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 2.2 Multiple .then() Chains (Should Use async/await)
|
||||
**Files:**
|
||||
- `/home/chris/Ensemble/lib/screens/playlist_details_screen.dart:598`
|
||||
- `/home/chris/Ensemble/lib/widgets/expandable_player.dart:468, 502, 521, 577, 601, 1644, 1773`
|
||||
- `/home/chris/Ensemble/lib/widgets/playlist_card.dart:258`
|
||||
- `/home/chris/Ensemble/lib/widgets/podcast_card.dart:264`
|
||||
- `/home/chris/Ensemble/lib/widgets/player/queue_panel.dart:212`
|
||||
- `/home/chris/Ensemble/lib/widgets/player/player_reveal_overlay.dart:83, 115, 191`
|
||||
- `/home/chris/Ensemble/lib/widgets/album_card.dart:335`
|
||||
- `/home/chris/Ensemble/lib/widgets/artist_card.dart:321`
|
||||
- `/home/chris/Ensemble/lib/screens/new_library_screen.dart:1213`
|
||||
|
||||
**Severity:** High
|
||||
**Category:** Code Quality
|
||||
|
||||
**Example:**
|
||||
```dart
|
||||
// Current (.then pattern)
|
||||
maProvider.addTracksToQueue(player.playerId, _tracks).then((_) {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(...);
|
||||
}
|
||||
});
|
||||
```
|
||||
|
||||
**Recommendation:**
|
||||
```dart
|
||||
// Preferred (async/await)
|
||||
try {
|
||||
await maProvider.addTracksToQueue(player.playerId, _tracks);
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(...);
|
||||
}
|
||||
} catch (e) {
|
||||
// Handle error
|
||||
}
|
||||
```
|
||||
|
||||
**Impact:** async/await provides better error handling and readability
|
||||
|
||||
---
|
||||
|
||||
### 2.3 TODO Comments for Unimplemented Features
|
||||
**Files:**
|
||||
- `/home/chris/Ensemble/lib/providers/music_assistant_provider.dart:1418, 1424`
|
||||
- `/home/chris/Ensemble/lib/screens/audiobook_detail_screen.dart:351, 402`
|
||||
- `/home/chris/Ensemble/lib/screens/queue_screen.dart:283`
|
||||
|
||||
**Severity:** Medium-High
|
||||
**Category:** Functionality
|
||||
|
||||
**Description:**
|
||||
Important features are marked as TODO but not implemented:
|
||||
- Playlist modification functionality
|
||||
- Server-side audiobook progress updates
|
||||
- Queue item removal via API
|
||||
|
||||
**Recommendation:**
|
||||
Create GitHub issues for these features and track implementation progress.
|
||||
|
||||
---
|
||||
|
||||
### 2.4 Unused Dependencies Detection
|
||||
**File:** `/home/chris/Ensemble/pubspec.yaml`
|
||||
**Severity:** High (if truly unused)
|
||||
**Category:** Bundle Size
|
||||
|
||||
**Potential Unused Packages:**
|
||||
- `package_info_plus` (used in debug_logger.dart - ✅ KEEP)
|
||||
- `device_info_plus` (used in debug_logger.dart - ✅ KEEP)
|
||||
- `share_plus` (used in debug_log_screen.dart - ✅ KEEP)
|
||||
- `url_launcher` (used in settings_screen.dart - ✅ KEEP)
|
||||
|
||||
**Conclusion:** All listed packages are actually in use. No action needed.
|
||||
|
||||
---
|
||||
|
||||
### 2.5 Duplicate Auth Token Logic
|
||||
**Files:**
|
||||
- `/home/chris/Ensemble/lib/services/secure_storage_service.dart`
|
||||
- `/home/chris/Ensemble/lib/services/auth/auth_manager.dart`
|
||||
- `/home/chris/Ensemble/lib/services/settings_service.dart` (not reviewed but mentioned in plan)
|
||||
|
||||
**Severity:** High
|
||||
**Category:** Maintainability
|
||||
|
||||
**Description:**
|
||||
Auth token storage exists in multiple places with slight variations:
|
||||
- `SecureStorageService` has `getAuthToken()`, `getMaAuthToken()`
|
||||
- `AuthManager` stores its own `_accessToken`, `_longLivedToken`
|
||||
- Potential for inconsistencies
|
||||
|
||||
**Recommendation:**
|
||||
Consolidate to single source of truth - make AuthManager the only place tokens are stored in memory, with SecureStorageService only for persistence.
|
||||
|
||||
---
|
||||
|
||||
## 3. MEDIUM SEVERITY ISSUES
|
||||
|
||||
### 3.1 Hardcoded WebSocket Port
|
||||
**File:** `/home/chris/Ensemble/lib/constants/network.dart:6`
|
||||
**Severity:** Medium
|
||||
**Category:** Maintainability
|
||||
|
||||
**Code:**
|
||||
```dart
|
||||
static const int defaultWsPort = 8095;
|
||||
```
|
||||
|
||||
**Description:**
|
||||
Port is hardcoded in multiple places across the codebase.
|
||||
|
||||
**Recommendation:**
|
||||
✅ Already extracted to `NetworkConstants.defaultWsPort` - GOOD PRACTICE!
|
||||
|
||||
However, the port is still hardcoded in:
|
||||
- `/home/chris/Ensemble/lib/services/auth/auth_manager.dart:182`
|
||||
- `/home/chris/Ensemble/lib/services/music_assistant_api.dart`
|
||||
|
||||
**Fix:**
|
||||
Replace `port: uri.hasPort ? uri.port : (uri.scheme == 'https' ? null : 8095)` with:
|
||||
```dart
|
||||
port: uri.hasPort ? uri.port : (uri.scheme == 'https' ? NetworkConstants.defaultHttpsPort : NetworkConstants.defaultWsPort)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 3.2 Timer Cleanup Issues
|
||||
**Files:**
|
||||
- `/home/chris/Ensemble/lib/services/sendspin_service.dart:646`
|
||||
- `/home/chris/Ensemble/lib/widgets/expandable_player.dart:2369, 349`
|
||||
- `/home/chris/Ensemble/lib/widgets/player/queue_panel.dart:562, 675`
|
||||
- `/home/chris/Ensemble/lib/screens/search_screen.dart:364`
|
||||
|
||||
**Severity:** Medium
|
||||
**Category:** Memory Leaks
|
||||
|
||||
**Description:**
|
||||
Multiple timers are created throughout the codebase. Need to verify all are properly cancelled in dispose().
|
||||
|
||||
**Recommendation:**
|
||||
Audit each timer creation to ensure corresponding cancel() in dispose().
|
||||
|
||||
---
|
||||
|
||||
### 3.3 Deep Nesting in Detail Screens
|
||||
**Files:**
|
||||
- `/home/chris/Ensemble/lib/screens/artist_details_screen.dart`
|
||||
- `/home/chris/Ensemble/lib/screens/album_details_screen.dart`
|
||||
- `/home/chris/Ensemble/lib/screens/audiobook_detail_screen.dart`
|
||||
|
||||
**Severity:** Medium
|
||||
**Category:** Code Quality
|
||||
|
||||
**Description:**
|
||||
These screens have deeply nested code (4+ levels) making them harder to read and maintain.
|
||||
|
||||
**Recommendation:**
|
||||
Extract nested logic into separate methods:
|
||||
```dart
|
||||
// Instead of:
|
||||
void build() {
|
||||
if (condition) {
|
||||
if (another) {
|
||||
if (third) {
|
||||
// do something
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Do:
|
||||
void build() {
|
||||
if (condition && another && third) {
|
||||
_doSomething();
|
||||
}
|
||||
}
|
||||
|
||||
void _doSomething() {
|
||||
// logic here
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 3.4 Potential Memory Leak - ImageStream Listeners
|
||||
**File:** `/home/chris/Ensemble/lib/widgets/expandable_player.dart:199`
|
||||
**Severity:** Medium
|
||||
**Category:** Memory Leaks
|
||||
|
||||
**Code:**
|
||||
```dart
|
||||
// Track active ImageStream listeners for proper cleanup on dispose
|
||||
final Map<ImageStream, ImageStreamListener> _activeImageStreams = {};
|
||||
```
|
||||
|
||||
**Description:**
|
||||
The code tracks image streams for cleanup, which is good practice. However, need to verify all listeners are properly removed.
|
||||
|
||||
**Recommendation:**
|
||||
Ensure dispose() method includes:
|
||||
```dart
|
||||
_activeImageStreams.forEach((stream, listener) => stream.removeListener(listener));
|
||||
_activeImageStreams.clear();
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. LOW SEVERITY ISSUES
|
||||
|
||||
### 4.1 Ignore Comments in Generated Files
|
||||
**Files:**
|
||||
- `/home/chris/Ensemble/lib/l10n/app_localizations_*.dart`
|
||||
|
||||
**Severity:** Low
|
||||
**Category:** Code Quality
|
||||
|
||||
**Description:**
|
||||
Generated localization files have `// ignore: unused_import` comments.
|
||||
|
||||
**Recommendation:**
|
||||
This is acceptable for generated files. No action needed.
|
||||
|
||||
---
|
||||
|
||||
### 4.2 Debug Print Statements
|
||||
**File:** `/home/chris/Ensemble/lib/services/debug_logger.dart:77, 104`
|
||||
**Severity:** Low
|
||||
**Category:** Security (potential)
|
||||
|
||||
**Code:**
|
||||
```dart
|
||||
debugPrint(entry.formatted);
|
||||
debugPrint('Stack trace: $stackTrace');
|
||||
```
|
||||
|
||||
**Description:**
|
||||
Debug logger outputs to console. Need to verify no sensitive data (tokens, passwords) is logged.
|
||||
|
||||
**Recommendation:**
|
||||
Add sanitization for sensitive data patterns:
|
||||
- Filter out auth tokens
|
||||
- Filter out passwords
|
||||
- Filter out API keys
|
||||
|
||||
---
|
||||
|
||||
## 5. SECURITY AUDIT
|
||||
|
||||
### 5.1 Credential Storage - ✅ SECURE
|
||||
**File:** `/home/chris/Ensemble/lib/services/secure_storage_service.dart`
|
||||
|
||||
**Status:** PASS
|
||||
- Uses `flutter_secure_storage` with `encryptedSharedPreferences: true`
|
||||
- Proper error handling for decryption failures
|
||||
- Migration logic from SharedPreferences to secure storage
|
||||
- All sensitive data (tokens, passwords) stored securely
|
||||
|
||||
### 5.2 Network Security - ✅ GOOD
|
||||
**Files:**
|
||||
- `/home/chris/Ensemble/lib/services/music_assistant_api.dart`
|
||||
- `/home/chris/Ensemble/lib/services/sendspin_service.dart`
|
||||
- `/home/chris/Ensemble/lib/services/auth/auth_manager.dart`
|
||||
|
||||
**Status:** PASS
|
||||
- Properly upgrades HTTP to HTTPS where applicable
|
||||
- WebSocket URL construction is secure
|
||||
- Token-based authentication
|
||||
- No hardcoded credentials found
|
||||
|
||||
### 5.3 Token Exposure Risk - ⚠️ REVIEW NEEDED
|
||||
**Files:** Multiple (logging statements)
|
||||
|
||||
**Status:** NEEDS REVIEW
|
||||
- Debug logger may expose tokens in logs
|
||||
- Recommend adding token sanitization to logger
|
||||
|
||||
---
|
||||
|
||||
## 6. PERFORMANCE AUDIT
|
||||
|
||||
### 6.1 Provider Usage - ✅ GOOD
|
||||
**Pattern:** Mostly using `context.read<>` correctly
|
||||
|
||||
**Status:** PASS
|
||||
- `context.read<>` used for method calls (correct)
|
||||
- `context.select<>` used where appropriate (expandable_player.dart:1796)
|
||||
- No obvious unnecessary rebuilds detected
|
||||
|
||||
### 6.2 State Management - ✅ GOOD
|
||||
**Status:** PASS
|
||||
- Provider pattern used consistently
|
||||
- ChangeNotifier properly implemented
|
||||
- dispose() methods properly cancel timers and close streams
|
||||
|
||||
### 6.3 Stream Subscriptions - ✅ GOOD
|
||||
**Files:** Multiple
|
||||
|
||||
**Status:** PASS
|
||||
- All StreamSubscriptions are properly tracked
|
||||
- dispose() methods cancel subscriptions
|
||||
|
||||
---
|
||||
|
||||
## 7. DEPENDENCY AUDIT
|
||||
|
||||
### Package Health Check
|
||||
|
||||
| Package | Version | Status | Notes |
|
||||
|---------|---------|--------|-------|
|
||||
| flutter_secure_storage | 9.2.2 | ✅ Current | Good |
|
||||
| provider | 6.1.1 | ✅ Current | Good |
|
||||
| drift | 2.22.0 | ✅ Current | Good |
|
||||
| just_audio | 0.9.36 | ✅ Current | Good |
|
||||
| audio_service | 0.18.12 | ⚠️ Check | May have updates |
|
||||
| cached_network_image | 3.3.1 | ✅ Current | Good |
|
||||
| web_socket_channel | 2.4.0 | ⚠️ Check | May have updates |
|
||||
|
||||
**Recommendation:** Run `flutter pub outdated` to check for available updates.
|
||||
|
||||
---
|
||||
|
||||
## 8. ARCHITECTURE ASSESSMENT
|
||||
|
||||
### 8.1 Strengths
|
||||
- ✅ Clear separation of concerns (services, providers, screens, widgets)
|
||||
- ✅ Consistent state management with Provider
|
||||
- ✅ Proper use of secure storage
|
||||
- ✅ Comprehensive dispose() cleanup
|
||||
- ✅ Good error handling in most places
|
||||
|
||||
### 8.2 Areas for Improvement
|
||||
- ⚠️ Main provider file too large (6,180 lines)
|
||||
- ⚠️ Some duplicate auth logic
|
||||
- ⚠️ Deep nesting in detail screens
|
||||
- ⚠️ .then() chains should be async/await
|
||||
|
||||
### 8.3 Recommended Refactoring
|
||||
1. Split `MusicAssistantProvider` into smaller focused providers
|
||||
2. Consolidate auth token management
|
||||
3. Reduce nesting in detail screens
|
||||
4. Convert .then() chains to async/await
|
||||
5. Add token sanitization to logger
|
||||
|
||||
---
|
||||
|
||||
## 9. PRIORITIZED REMEDIATION PLAN
|
||||
|
||||
### Phase 1: Critical Fixes (1-2 days)
|
||||
1. Fix empty setState() in debug_log_screen.dart
|
||||
2. Add disposed flag to SleepTimerProvider
|
||||
|
||||
### Phase 2: High Priority (1 week)
|
||||
1. Convert all .then() chains to async/await
|
||||
2. Consolidate auth token logic
|
||||
3. Add token sanitization to debug logger
|
||||
|
||||
### Phase 3: Medium Priority (2-3 weeks)
|
||||
1. Split MusicAssistantProvider into smaller providers
|
||||
2. Reduce nesting in detail screens
|
||||
3. Verify all timers are properly cancelled
|
||||
4. Update outdated dependencies
|
||||
|
||||
### Phase 4: Low Priority (Ongoing)
|
||||
1. Implement TODO features (playlist modification, etc.)
|
||||
2. Add unit tests for critical paths
|
||||
3. Set up dependency update automation
|
||||
|
||||
---
|
||||
|
||||
## 10. FILES REQUIRING IMMEDIATE ATTENTION
|
||||
|
||||
| File | Issue | Severity | Lines |
|
||||
|------|-------|----------|-------|
|
||||
| music_assistant_provider.dart | Too large | Critical | 6180 |
|
||||
| sleep_timer_provider.dart:76 | No mounted check | High | 76-77 |
|
||||
| debug_log_screen.dart:367 | Empty setState | Critical | 367 |
|
||||
| playlist_details_screen.dart:598 | .then() chain | High | 598 |
|
||||
|
||||
---
|
||||
|
||||
## 11. CONCLUSION
|
||||
|
||||
The Ensemble codebase is **well-structured and secure** with good practices for:
|
||||
- Secure credential storage
|
||||
- Proper resource cleanup
|
||||
- State management
|
||||
|
||||
The main areas for improvement are:
|
||||
1. File size (need to split the main provider)
|
||||
2. Code modernization (async/await instead of .then())
|
||||
3. Some timer safety checks
|
||||
|
||||
Overall, this is a **healthy codebase** that would benefit from focused refactoring rather than major restructuring.
|
||||
|
||||
---
|
||||
|
||||
**Report End**
|
||||
@@ -1,167 +0,0 @@
|
||||
# Music Assistant 2.8.0 Beta 14 — Impact on Ensemble
|
||||
|
||||
**Date:** 2026-03-03
|
||||
**Current server:** 2.8.0 beta 12
|
||||
**Target server:** 2.8.0 beta 14 (released March 2, 2026)
|
||||
|
||||
---
|
||||
|
||||
## Summary
|
||||
|
||||
Beta 14 is a large release (50+ PRs). The headline change — merging multi-protocol players into a single entity — directly overlaps with Ensemble's client-side Cast↔Sendspin consolidation logic. Sendspin also received a major v4.0 overhaul. Most changes should degrade gracefully but player ID persistence will break on upgrade.
|
||||
|
||||
---
|
||||
|
||||
## Breaking: Player Merging (PR #3150)
|
||||
|
||||
MA now merges players that support multiple protocols (e.g. a Chromecast with Cast + Sendspin) into a **single player entity** server-side. Previously these appeared as two separate players.
|
||||
|
||||
> *"After this change, all your players will be reset. If you previously had multiple players in Music Assistant per protocol, this will now show up as one single player."*
|
||||
|
||||
### What Ensemble does today
|
||||
|
||||
Ensemble handles this client-side in `music_assistant_provider.dart:4271-4406`:
|
||||
|
||||
- `_castToSendspinIdMap` maps Cast IDs → Sendspin IDs
|
||||
- When Sendspin is grouped: hides Cast player, shows Sendspin (renamed to base name)
|
||||
- When ungrouped: hides Sendspin, shows original Cast
|
||||
- Mappings persisted to database for cold start restoration
|
||||
|
||||
### Impact on Ensemble
|
||||
|
||||
| Component | Location | Impact | Severity |
|
||||
|---|---|---|---|
|
||||
| `_castToSendspinIdMap` + consolidation logic | `provider:4271-4406` | Dead code — server no longer sends separate players | Medium |
|
||||
| `isManuallySyncedPlayer()` ID translation | `provider:533-595` | Lookups against stale map fail silently (returns `false`) | Low |
|
||||
| Player selection persistence | Settings + DB | **Stored player IDs invalid after upgrade** — all players reset | **High** |
|
||||
| `_handlePlayerUpdatedEvent()` ID matching | `provider:2956-3358` | Events arrive with new merged IDs, old translation won't match | Medium |
|
||||
| Database-persisted Cast↔Sendspin mappings | `DatabaseService` | Stale data, won't match anything | Low |
|
||||
|
||||
### Assessment
|
||||
|
||||
The consolidation logic should degrade gracefully — it won't find Sendspin suffixes to strip or Cast pairs to merge, so the server's already-merged players pass through `filterPlayers()` as-is. The main risk is **player selection breaking** because saved player IDs no longer exist.
|
||||
|
||||
### Action required
|
||||
|
||||
1. Verify the existing fallback logic (`provider:4427-4465`) gracefully re-selects when the stored `selectedPlayerId` doesn't exist in the player list
|
||||
2. Remove or gate the Cast↔Sendspin consolidation code behind a server version check (on beta 14+ it's unnecessary and could cause confusion)
|
||||
3. Clear stale database mappings on first connection to a beta 14+ server
|
||||
|
||||
---
|
||||
|
||||
## Sendspin v4.0 (PR #3158)
|
||||
|
||||
Major rewrite of the Sendspin server.
|
||||
|
||||
### Changes
|
||||
|
||||
- New `SendspinPlaybackSession` coordinator architecture
|
||||
- Per-member DSP pipelines, dynamic group membership, late-join audio backfill
|
||||
- Max buffer capacity 5 → 30 seconds
|
||||
- Multiple Sendspin servers with automatic failover
|
||||
- Per-client codec/sample-rate/bit-depth options
|
||||
- Album artwork persists during skip/pause
|
||||
- Reduced latency for live streams
|
||||
|
||||
### Impact on Ensemble
|
||||
|
||||
| Change | Impact |
|
||||
|---|---|
|
||||
| New session architecture | **Likely compatible** — sendspin-js only bumped 2.0.0 → 2.0.1 (minor), suggesting wire protocol didn't fundamentally change |
|
||||
| Per-client codec options | `stream/start` may contain new fields — safe if Ensemble ignores unknown fields |
|
||||
| Multiple servers with failover | Ensemble's 3-tier connection strategy may need awareness |
|
||||
| Buffer increase | No client impact |
|
||||
|
||||
### Action required
|
||||
|
||||
1. Test Sendspin connection against beta 14 — verify `client/hello`, `stream/start`, state reporting all still work
|
||||
2. Confirm unknown fields in protocol messages are ignored gracefully
|
||||
|
||||
---
|
||||
|
||||
## Sendspin-Chromecast Bridge (PR #3255)
|
||||
|
||||
Replaces the inline experimental Sendspin mode in `ChromecastPlayer` with a dedicated bridge. Cast devices now use a Cast receiver app with an embedded JS Sendspin client.
|
||||
|
||||
### Impact on Ensemble
|
||||
|
||||
- **Direct impact: None** — Ensemble is a Sendspin client itself, not going through Cast
|
||||
- **Indirect:** Changes how grouped Cast players behave, which could affect `GroupVolumeManager`
|
||||
|
||||
---
|
||||
|
||||
## Group Volume / Grouping Fixes
|
||||
|
||||
| PR | Change | Ensemble Impact |
|
||||
|---|---|---|
|
||||
| #3192 | Fix grouping for players whose native protocol is also a protocol of other players | Bidirectional grouping translation — may affect group detection logic |
|
||||
| #3205 | Fix group mute for protocol-synced players (`player.state.group_members` vs `player.group_members`) | `GroupVolumeManager` may see different/correct member lists |
|
||||
| #3277 | Fix `volume_up`/`volume_down` for group players | Server-side fix, should improve behavior |
|
||||
| #3118 | Fix sync groups losing members on power off | Affects dynamic group management |
|
||||
|
||||
### Action required
|
||||
|
||||
1. Test group volume behavior — may "just work better" with server-side fixes
|
||||
2. Verify `GroupVolumeManager` handles any changes to `group_members` field population
|
||||
|
||||
---
|
||||
|
||||
## Sendspin Bug Fixes
|
||||
|
||||
| PR | Fix | Ensemble Relevance |
|
||||
|---|---|---|
|
||||
| #3191 | DSP not applying for Sendspin players | DSP config stored on parent player, looked up by protocol player ID — now fixed |
|
||||
| #3249 | Update to aiosendspin 4.2.0 | Library update, potential behavior changes |
|
||||
| #3250 | Metadata sending wrong progress when paused | Progress reporting fix — Ensemble's position tracker may see better data |
|
||||
| #3258 | Floating point for internal audio data | Audio quality improvement, no client impact |
|
||||
|
||||
---
|
||||
|
||||
## New APIs — Opportunities
|
||||
|
||||
| Feature | PR | Details | Ensemble Opportunity |
|
||||
|---|---|---|---|
|
||||
| Playback speed | #3198 | `player_queues/set_playback_speed`, stored in `queue.extra_attributes["playback_speed"]` | Great for audiobooks/podcasts |
|
||||
| Save queue to playlist | #3149 | `save_as_playlist` command on player queue controller | Easy feature add |
|
||||
| Mixed-media playlists | #3216 | Playlists can contain tracks + podcasts + audiobooks. DB schema bumped to v30. `get_playlist_tracks()` returns `Sequence[PlaylistPlayableItem]` | Playlist screens may need to handle heterogeneous items |
|
||||
| Genres v2 | #3164 | New browsing category with icons and SVG support | New library section |
|
||||
|
||||
---
|
||||
|
||||
## Also Changed in Beta 13 (Skipped)
|
||||
|
||||
Relevant changes from beta 13 (between current beta 12 and target beta 14):
|
||||
|
||||
- Group volume mute support (#3034)
|
||||
- Frontend prepared for multiprotocol support (#1409) — groundwork for beta 14 merging
|
||||
- IPv6 support for zeroconf, stream server, AirPlay (#3086)
|
||||
- Snapcast player availability alignment (#3104)
|
||||
- DLNA reconnection fix (#3132)
|
||||
|
||||
---
|
||||
|
||||
## Recommended Action Plan
|
||||
|
||||
### Before upgrading
|
||||
|
||||
- [ ] Verify player selection fallback handles missing player IDs gracefully
|
||||
- [ ] Back up current configuration
|
||||
|
||||
### Immediate (after upgrading)
|
||||
|
||||
- [ ] Test Sendspin protocol compatibility (connection, streaming, state reporting)
|
||||
- [ ] Test player list — confirm merged players appear correctly without client-side consolidation
|
||||
- [ ] Test group volume behavior with new server-side fixes
|
||||
- [ ] Test player selection persistence across app restarts
|
||||
|
||||
### Short-term
|
||||
|
||||
- [ ] Remove or version-gate Cast↔Sendspin consolidation code
|
||||
- [ ] Clear stale database mappings on beta 14+ detection
|
||||
- [ ] Test mixed-media playlist handling if playlists are used
|
||||
|
||||
### Opportunistic
|
||||
|
||||
- [ ] Add playback speed control (audiobook/podcast feature)
|
||||
- [ ] Add save-queue-to-playlist
|
||||
- [ ] Explore Genres v2 browsing
|
||||
@@ -0,0 +1,208 @@
|
||||
# Multi-Provider Split Plan
|
||||
|
||||
## Current Status (2026-02-07)
|
||||
|
||||
### Completed
|
||||
|
||||
| Provider | Lines | File | Status |
|
||||
|----------|-------|------|--------|
|
||||
| ConnectionProvider | 245 | lib/providers/connection_provider.dart | ✅ Created |
|
||||
| UIStateProvider | 167 | lib/providers/ui_state_provider.dart | ✅ Created & Committed |
|
||||
| LibraryProvider | 290 | lib/providers/library_provider.dart | ✅ Created & Committed |
|
||||
| PlayerProvider | 589 | lib/providers/player_provider.dart | ✅ Created & Integrated |
|
||||
| LocalPlayerProvider | 370 | lib/providers/local_player_provider.dart | ✅ Created & Integrated |
|
||||
|
||||
**Main Provider: 5928 lines** (down from 6180 original)
|
||||
|
||||
### Integration Status
|
||||
|
||||
✅ **Phase 1 Complete**: All 5 providers created
|
||||
✅ **Phase 2 Started**: Integration into main.dart completed
|
||||
- All providers added to MultiProvider tree
|
||||
- Shared services (CacheService, PositionTracker, ImageHelperService) properly initialized
|
||||
- Build successful (52.2MB APK)
|
||||
|
||||
### Remaining Work
|
||||
|
||||
| Task | Complexity | Notes |
|
||||
|------|------------|-------|
|
||||
| Update MusicAssistantProvider facade | Medium | Accept providers in constructor, delegate methods |
|
||||
| Migrate consumers incrementally | High | Start with less critical screens |
|
||||
| Remove facade when complete | Low | After all consumers migrated |
|
||||
|
||||
---
|
||||
|
||||
## Architecture Overview
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────────────────┐
|
||||
│ MusicAssistantProvider │
|
||||
│ (Facade - during transition) │
|
||||
│ │
|
||||
│ ┌───────────────────────────────────────────────────────────────┐ │
|
||||
│ │ Delegates to sub-providers: │ │
|
||||
│ │ • ConnectionProvider - connect/disconnect, auth │ │
|
||||
│ │ • UIStateProvider - search, filters, loading state │ │
|
||||
│ │ • LibraryProvider - artists, albums, tracks, podcasts │ │
|
||||
│ │ • PlayerProvider - player selection, controls, queue (TODO) │ │
|
||||
│ │ • LocalPlayerProvider - local audio engine (TODO) │ │
|
||||
│ └───────────────────────────────────────────────────────────────┘ │
|
||||
└─────────────────────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Next Steps
|
||||
|
||||
### Phase 1: Complete Provider Creation (Current)
|
||||
|
||||
1. **Create PlayerProvider** (~800 lines)
|
||||
- Extract player selection and switching logic
|
||||
- Extract play/pause/stop/seek controls
|
||||
- Extract queue management
|
||||
- Extract sleep timer functionality
|
||||
|
||||
2. **Create LocalPlayerProvider** (~500 lines)
|
||||
- Extract local audio playback engine
|
||||
- Extract Sendspin integration
|
||||
- Extract player registration
|
||||
- Extract volume and power control
|
||||
|
||||
### Phase 2: Integration
|
||||
|
||||
3. **Update main.dart**
|
||||
- Add all providers to MultiProvider
|
||||
- Keep MusicAssistantProvider as facade initially
|
||||
|
||||
4. **Migrate one consumer at a time**
|
||||
- Start with less critical screens
|
||||
- Test thoroughly after each migration
|
||||
- Use facade to maintain compatibility during transition
|
||||
|
||||
5. **Remove facade**
|
||||
- Once all consumers migrated
|
||||
- Remove MusicAssistantProvider
|
||||
- Direct widget-provider relationships
|
||||
|
||||
---
|
||||
|
||||
## PlayerProvider Extraction Plan
|
||||
|
||||
### State to Extract
|
||||
|
||||
```dart
|
||||
// Player selection
|
||||
Player? _selectedPlayer;
|
||||
List<Player> _availablePlayers = [];
|
||||
Map<String, String> _castToSendspinIdMap = {};
|
||||
|
||||
// Current playback
|
||||
Track? _currentTrack;
|
||||
Audiobook? _currentAudiobook;
|
||||
String? _currentPodcastName;
|
||||
|
||||
// Sleep timer
|
||||
Timer? _sleepTimer;
|
||||
DateTime? _sleepTimerEndTime;
|
||||
int? _sleepTimerMinutes;
|
||||
Timer? _sleepTimerDisplayTimer;
|
||||
|
||||
// Timers
|
||||
Timer? _playerStateTimer;
|
||||
Timer? _notificationPositionTimer;
|
||||
Timer? _idleServiceTimer;
|
||||
|
||||
// Position tracking
|
||||
PositionTracker _positionTracker;
|
||||
```
|
||||
|
||||
### Methods to Extract
|
||||
|
||||
```dart
|
||||
// Player selection
|
||||
Future<void> _loadAndSelectPlayers({bool forceRefresh, bool coldStart});
|
||||
Future<void> selectPlayer(Player player, {bool? sendToSendspin});
|
||||
|
||||
// Playback controls
|
||||
Future<void> playPause();
|
||||
Future<void> stop();
|
||||
Future<void> nextTrack();
|
||||
Future<void> previousTrack();
|
||||
Future<void> seek(Duration position);
|
||||
Future<void> setVolume(String playerId, int volumeLevel);
|
||||
|
||||
// Queue management
|
||||
Future<PlayerQueue?> getQueue(String playerId);
|
||||
Future<void> playTracks(String playerId, List<Track> tracks, {int? startIndex});
|
||||
|
||||
// Sleep timer
|
||||
Future<void> setSleepTimer(int minutes);
|
||||
Future<void> cancelSleepTimer();
|
||||
```
|
||||
|
||||
### Dependencies to Inject
|
||||
|
||||
- MusicAssistantAPI
|
||||
- DatabaseService
|
||||
- SettingsService
|
||||
- QueueManagerService
|
||||
- PositionTracker
|
||||
- PlayerSyncState
|
||||
- AudioHandler (from audio_service)
|
||||
|
||||
---
|
||||
|
||||
## Estimated Timeline
|
||||
|
||||
| Task | Time | Notes |
|
||||
|------|------|-------|
|
||||
| Create PlayerProvider | 2-3 hours | Complex, many dependencies |
|
||||
| Create LocalPlayerProvider | 2-3 hours | Sendspin integration is complex |
|
||||
| Integration & Testing | 3-4 hours | Update main.dart, migrate consumers |
|
||||
| Bug Fixes | 1-2 hours | Edge cases in player switching |
|
||||
|
||||
**Total: ~8-12 hours of focused development**
|
||||
|
||||
---
|
||||
|
||||
## Risk Mitigation
|
||||
|
||||
1. **Keep facade during transition** - Maintain backward compatibility
|
||||
2. **Migrate incrementally** - One screen/consumer at a time
|
||||
3. **Test on device** - Test player controls thoroughly
|
||||
4. **Commit frequently** - Each provider as it's completed
|
||||
5. **Keep backup** - Can revert to monolithic provider if needed
|
||||
|
||||
---
|
||||
|
||||
## Success Criteria
|
||||
|
||||
- [ ] All 5 providers created and building
|
||||
- [ ] Main.dart updated with all providers
|
||||
- [ ] At least 3 screens migrated to new providers
|
||||
- [ ] Player controls working correctly on device
|
||||
- [ ] No regressions in core functionality
|
||||
- [ ] Main provider reduced to < 1000 lines (or removed)
|
||||
|
||||
---
|
||||
|
||||
## Files Created So Far
|
||||
|
||||
```
|
||||
lib/providers/
|
||||
├── connection_provider.dart (245 lines) ✅
|
||||
├── ui_state_provider.dart (167 lines) ✅
|
||||
├── library_provider.dart (290 lines) ✅
|
||||
├── player_provider.dart (TODO) ⏳
|
||||
└── local_player_provider.dart (TODO) ⏳
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Notes from Analysis
|
||||
|
||||
1. **Player selection logic is complex** - Involves Cast-to-Sendspin mapping, filtering, smart sorting
|
||||
2. **Sendspin integration is tricky** - Need to handle both MA 2.7.0+ (Sendspin) and older versions
|
||||
3. **Queue management already extracted** - QueueManagerService handles most queue logic
|
||||
4. **Position tracking is separate** - PositionTracker service handles interpolation
|
||||
5. **Event handlers need coordination** - Player events update both provider and position tracker
|
||||
@@ -1,8 +1,7 @@
|
||||
<div align="center">
|
||||
<img src="assets/images/ensemble_logo.png" alt="Ensemble Logo" height="200">
|
||||
|
||||
[](https://github.com/CollotsSpot/Ensemble/releases)
|
||||
[](https://github.com/CollotsSpot/Ensemble/releases/latest)
|
||||
[](https://github.com/CollotsSpot/Ensemble/releases)
|
||||
[](https://opensource.org/licenses/MIT)
|
||||
[](https://github.com/sponsors/CollotsSpot)
|
||||
[](https://ko-fi.com/collotsspot)
|
||||
@@ -86,13 +85,6 @@ This application was built with AI-assisted development using **Claude Code** an
|
||||
- **Skip Controls** - Skip forward/backward during playback
|
||||
- **High-Resolution Artwork** - Fetched via iTunes for best quality
|
||||
|
||||
### Android Auto
|
||||
- **Media Browsing** - Browse your library from your car's display with categories for Home, Music, Audiobooks, Podcasts, and Radio
|
||||
- **Voice Search** - Find and play tracks using voice commands
|
||||
- **Full Playback Controls** - Play, pause, and skip from your car's head unit
|
||||
- **Album Art & Metadata** - Track info and artwork displayed on your car's screen
|
||||
- **Smart Queueing** - Tap any track in an album or playlist to play from that point with the full queue
|
||||
|
||||
### Smart Features
|
||||
- **Instant App Restore** - App loads instantly with cached library data while syncing in background
|
||||
- **Auto-Reconnect** - Automatically reconnects when connection is lost
|
||||
@@ -148,17 +140,6 @@ If you run Music Assistant as a Home Assistant add-on:
|
||||
- Use the IP address of your Home Assistant server
|
||||
- Do **not** use your Home Assistant URL or ingress URL
|
||||
|
||||
### Android Auto
|
||||
|
||||
Since Ensemble is not installed from the Play Store, you need to enable unknown sources in Android Auto:
|
||||
|
||||
1. Open **Android Auto** settings on your phone
|
||||
2. Tap the **Version** number at the bottom 10 times to enable developer mode
|
||||
3. Tap the three-dot menu and open **Developer settings**
|
||||
4. Enable **Unknown sources**
|
||||
5. Connect your phone to your car via USB or wirelessly
|
||||
6. Ensemble will appear in Android Auto's app list
|
||||
|
||||
### Remote Access
|
||||
|
||||
For access outside your home network, you'll need to expose Music Assistant through a reverse proxy (e.g., Traefik, Nginx Proxy Manager, Cloudflare Tunnel).
|
||||
@@ -170,13 +151,6 @@ For access outside your home network, you'll need to expose Music Assistant thro
|
||||
- Android device (Android 5.0+)
|
||||
- Audiobookshelf provider configured in Music Assistant (for audiobook features)
|
||||
|
||||
## Sponsors
|
||||
|
||||
A huge thank you to my sponsors! 💖
|
||||
|
||||
<a href="https://github.com/pcsokonay"><img src="https://github.com/pcsokonay.png" width="60px" alt="pcsokonay" /></a>
|
||||
<a href="https://github.com/githubchb"><img src="https://github.com/githubchb.png" width="60px" alt="githubchb" /></a>
|
||||
|
||||
## License
|
||||
|
||||
MIT License
|
||||
|
||||
@@ -77,16 +77,6 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
def abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86_64': 3]
|
||||
android.applicationVariants.configureEach { variant ->
|
||||
variant.outputs.each { output ->
|
||||
def abiVersionCode = abiCodes[output.getFilter('ABI')]
|
||||
if (abiVersionCode != null) {
|
||||
output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
flutter {
|
||||
source '../..'
|
||||
}
|
||||
|
||||
@@ -54,10 +54,6 @@
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
|
||||
<meta-data
|
||||
android:name="com.google.android.gms.car.application"
|
||||
android:resource="@xml/automotive_app_desc" />
|
||||
|
||||
<meta-data
|
||||
android:name="flutterEmbedding"
|
||||
android:value="2" />
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
package com.collotsspot.ensemble
|
||||
|
||||
import android.content.Context
|
||||
import android.database.ContentObserver
|
||||
import android.media.AudioManager
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.provider.Settings
|
||||
import android.util.Log
|
||||
import android.view.KeyEvent
|
||||
import com.ryanheise.audioservice.AudioServiceActivity
|
||||
@@ -20,22 +14,10 @@ class MainActivity: AudioServiceActivity() {
|
||||
private var methodChannel: MethodChannel? = null
|
||||
private var isListening = false
|
||||
|
||||
// Volume observer for lockscreen volume changes
|
||||
// Watches system STREAM_MUSIC volume and mirrors changes to the MA player
|
||||
// when a remote/group player is active
|
||||
private var audioManager: AudioManager? = null
|
||||
private var volumeObserver: VolumeContentObserver? = null
|
||||
private var isObservingVolume = false
|
||||
private var lastKnownVolume: Int = -1
|
||||
// Guard flag to ignore volume changes triggered by our own setStreamVolume calls
|
||||
private var ignoringVolumeChange = false
|
||||
|
||||
override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
|
||||
super.configureFlutterEngine(flutterEngine)
|
||||
Log.d(TAG, "Configuring Flutter engine, setting up MethodChannel")
|
||||
|
||||
audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
|
||||
|
||||
methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
|
||||
methodChannel?.setMethodCallHandler { call, result ->
|
||||
Log.d(TAG, "Received method call: ${call.method}")
|
||||
@@ -50,24 +32,6 @@ class MainActivity: AudioServiceActivity() {
|
||||
Log.d(TAG, "Volume listening DISABLED")
|
||||
result.success(null)
|
||||
}
|
||||
"startVolumeObserver" -> {
|
||||
// Start observing system volume for lockscreen volume changes.
|
||||
// Optional: initialVolume (0-100) sets the system volume to match
|
||||
// the MA player's current volume for a consistent HUD display.
|
||||
val initialVolume = call.argument<Int>("initialVolume")
|
||||
startVolumeObserver(initialVolume)
|
||||
result.success(null)
|
||||
}
|
||||
"stopVolumeObserver" -> {
|
||||
stopVolumeObserver()
|
||||
result.success(null)
|
||||
}
|
||||
"syncSystemVolume" -> {
|
||||
// Sync system volume to match MA player volume (0-100)
|
||||
val volume = call.argument<Int>("volume") ?: 0
|
||||
syncSystemVolume(volume)
|
||||
result.success(null)
|
||||
}
|
||||
else -> {
|
||||
Log.d(TAG, "Unknown method: ${call.method}")
|
||||
result.notImplemented()
|
||||
@@ -76,82 +40,6 @@ class MainActivity: AudioServiceActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
/// Start observing system STREAM_MUSIC volume changes.
|
||||
/// When a change is detected, sends an "absoluteVolumeChange" event to Flutter
|
||||
/// with the new volume mapped to 0-100 scale.
|
||||
private fun startVolumeObserver(initialVolume: Int?) {
|
||||
if (isObservingVolume) return
|
||||
|
||||
val am = audioManager ?: return
|
||||
|
||||
// Optionally set system volume to match the MA player's current volume
|
||||
if (initialVolume != null) {
|
||||
syncSystemVolume(initialVolume)
|
||||
}
|
||||
|
||||
lastKnownVolume = am.getStreamVolume(AudioManager.STREAM_MUSIC)
|
||||
|
||||
volumeObserver = VolumeContentObserver(Handler(Looper.getMainLooper()))
|
||||
contentResolver.registerContentObserver(
|
||||
Settings.System.CONTENT_URI,
|
||||
true,
|
||||
volumeObserver!!
|
||||
)
|
||||
isObservingVolume = true
|
||||
Log.d(TAG, "Volume observer STARTED, initial system volume: $lastKnownVolume")
|
||||
}
|
||||
|
||||
/// Stop observing system volume changes.
|
||||
private fun stopVolumeObserver() {
|
||||
if (!isObservingVolume) return
|
||||
|
||||
volumeObserver?.let {
|
||||
contentResolver.unregisterContentObserver(it)
|
||||
}
|
||||
volumeObserver = null
|
||||
isObservingVolume = false
|
||||
Log.d(TAG, "Volume observer STOPPED")
|
||||
}
|
||||
|
||||
/// Set the system STREAM_MUSIC volume to match an MA player volume (0-100).
|
||||
/// Maps MA's 0-100 range to the device's 0-maxVolume range.
|
||||
private fun syncSystemVolume(maVolume: Int) {
|
||||
val am = audioManager ?: return
|
||||
val maxSystemVolume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
|
||||
val systemVolume = (maVolume * maxSystemVolume / 100).coerceIn(0, maxSystemVolume)
|
||||
|
||||
ignoringVolumeChange = true
|
||||
am.setStreamVolume(AudioManager.STREAM_MUSIC, systemVolume, 0)
|
||||
lastKnownVolume = systemVolume
|
||||
ignoringVolumeChange = false
|
||||
Log.d(TAG, "Synced system volume: MA $maVolume% -> system $systemVolume/$maxSystemVolume")
|
||||
}
|
||||
|
||||
/// ContentObserver that watches for system volume changes.
|
||||
/// When volume changes (e.g., from lockscreen hardware buttons),
|
||||
/// maps the change to a 0-100 value and sends to Flutter.
|
||||
inner class VolumeContentObserver(handler: Handler) : ContentObserver(handler) {
|
||||
override fun onChange(selfChange: Boolean) {
|
||||
super.onChange(selfChange)
|
||||
|
||||
if (ignoringVolumeChange) return
|
||||
|
||||
val am = audioManager ?: return
|
||||
val currentVolume = am.getStreamVolume(AudioManager.STREAM_MUSIC)
|
||||
|
||||
if (currentVolume != lastKnownVolume) {
|
||||
val maxVolume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
|
||||
val maVolume = if (maxVolume > 0) (currentVolume * 100 / maxVolume) else 0
|
||||
|
||||
Log.d(TAG, "Volume observer: system $lastKnownVolume -> $currentVolume (MA: $maVolume%)")
|
||||
lastKnownVolume = currentVolume
|
||||
|
||||
// Send the absolute volume (0-100) to Flutter
|
||||
methodChannel?.invokeMethod("absoluteVolumeChange", maVolume)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Use dispatchKeyEvent instead of onKeyDown - Flutter's engine uses dispatchKeyEvent
|
||||
// and may consume events before they reach onKeyDown
|
||||
override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
|
||||
@@ -196,34 +84,4 @@ class MainActivity: AudioServiceActivity() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Pause volume interception when app goes to background so hardware buttons
|
||||
// only control the system volume (e.g., YouTube, phone ringer) as expected.
|
||||
private var wasListeningBeforePause = false
|
||||
private var wasObservingBeforePause = false
|
||||
|
||||
override fun onPause() {
|
||||
wasListeningBeforePause = isListening
|
||||
wasObservingBeforePause = isObservingVolume
|
||||
isListening = false
|
||||
stopVolumeObserver()
|
||||
Log.d(TAG, "onPause: suspended volume interception (wasListening=$wasListeningBeforePause, wasObserving=$wasObservingBeforePause)")
|
||||
super.onPause()
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
if (wasListeningBeforePause) {
|
||||
isListening = true
|
||||
}
|
||||
if (wasObservingBeforePause) {
|
||||
startVolumeObserver(null)
|
||||
}
|
||||
Log.d(TAG, "onResume: restored volume interception (listening=$isListening, observing=$isObservingVolume)")
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
stopVolumeObserver()
|
||||
super.onDestroy()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="#FFFFFF">
|
||||
<path android:fillColor="#FFFFFF"
|
||||
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,16.5c-2.49,0 -4.5,-2.01 -4.5,-4.5S9.51,7.5 12,7.5s4.5,2.01 4.5,4.5 -2.01,4.5 -4.5,4.5zM12,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1z"/>
|
||||
</vector>
|
||||
@@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="#FFFFFF">
|
||||
<path android:fillColor="#FFFFFF"
|
||||
android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
|
||||
</vector>
|
||||
@@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="#FFFFFF">
|
||||
<path android:fillColor="#FFFFFF"
|
||||
android:pathData="M18,2H6c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM6,4h5v8l-2.5,-1.5L6,12V4z"/>
|
||||
</vector>
|
||||
@@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="#FFFFFF">
|
||||
<path android:fillColor="#FFFFFF"
|
||||
android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
|
||||
</vector>
|
||||
@@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="#FFFFFF">
|
||||
<path android:fillColor="#FFFFFF"
|
||||
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
|
||||
</vector>
|
||||
@@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="#FFFFFF">
|
||||
<path android:fillColor="#FFFFFF"
|
||||
android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55C7.79,13 6,14.79 6,17s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
|
||||
</vector>
|
||||
@@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="#FFFFFF">
|
||||
<path android:fillColor="#FFFFFF"
|
||||
android:pathData="M15,6H3v2h12V6zM15,10H3v2h12V10zM3,16h8v-2H3V16zM17,6v8.18C16.69,14.07 16.35,14 16,14c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3V8h3V6H17z"/>
|
||||
</vector>
|
||||
@@ -1,11 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="#FFFFFF">
|
||||
<path android:fillColor="#FFFFFF"
|
||||
android:pathData="M12,14c1.66,0 3,-1.34 3,-3V5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3z"/>
|
||||
<path android:fillColor="#FFFFFF"
|
||||
android:pathData="M17,11c0,2.76 -2.24,5 -5,5s-5,-2.24 -5,-5H5c0,3.53 2.61,6.43 6,6.92V21h2v-3.08c3.39,-0.49 6,-3.39 6,-6.92h-2z"/>
|
||||
</vector>
|
||||
@@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="#FFFFFF">
|
||||
<path android:fillColor="#FFFFFF"
|
||||
android:pathData="M3.24,6.15C2.51,6.43 2,7.17 2,8v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2H8.3l8.26,-3.34 -0.37,-0.92L3.24,6.15zM7,20c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM20,12H12V9h8v3z"/>
|
||||
</vector>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<automotiveApp>
|
||||
<uses name="media" />
|
||||
</automotiveApp>
|
||||
@@ -2,6 +2,9 @@ buildscript {
|
||||
ext.kotlin_version = '2.1.0'
|
||||
repositories {
|
||||
google()
|
||||
// Use Maven Central mirrors as fallback for 403 errors
|
||||
maven { url 'https://maven.aliyun.com/repository/central' }
|
||||
maven { url 'https://maven.aliyun.com/repository/google' }
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
@@ -14,6 +17,9 @@ buildscript {
|
||||
allprojects {
|
||||
repositories {
|
||||
google()
|
||||
// Use Maven Central mirrors as fallback for 403 errors
|
||||
maven { url 'https://maven.aliyun.com/repository/central' }
|
||||
maven { url 'https://maven.aliyun.com/repository/google' }
|
||||
mavenCentral()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,9 @@ class Timings {
|
||||
/// Player state polling interval (for selected player updates)
|
||||
static const Duration playerPollingInterval = Duration(seconds: 5);
|
||||
|
||||
/// Notification position update interval (for updating playback position in notification)
|
||||
static const Duration notificationPositionUpdate = Duration(seconds: 1);
|
||||
|
||||
/// Local player state report interval
|
||||
/// Note: Sendspin protocol only requires state on changes, not periodic reports.
|
||||
/// This is mainly for local UI position tracking. Set to 5s to reduce server traffic.
|
||||
@@ -54,3 +57,62 @@ class LibraryConstants {
|
||||
/// Default limit for recent/random items
|
||||
static const int defaultRecentLimit = 10;
|
||||
}
|
||||
|
||||
/// Image/artwork size constants
|
||||
class ImageSizes {
|
||||
ImageSizes._();
|
||||
|
||||
/// Default image size for artwork (256x256)
|
||||
static const int defaultSize = 256;
|
||||
|
||||
/// High resolution image size for player/overlay (512x512)
|
||||
static const int highRes = 512;
|
||||
|
||||
/// Maximum image size for large displays
|
||||
static const int max = 1024;
|
||||
}
|
||||
|
||||
/// Volume control constants
|
||||
class VolumeConstants {
|
||||
VolumeConstants._();
|
||||
|
||||
/// Minimum volume level
|
||||
static const int min = 0;
|
||||
|
||||
/// Maximum volume level
|
||||
static const int max = 100;
|
||||
|
||||
/// Volume range for validation (0-100)
|
||||
static const int range = 100;
|
||||
}
|
||||
|
||||
/// Player state constants
|
||||
class PlayerStates {
|
||||
PlayerStates._();
|
||||
|
||||
/// Player is playing media
|
||||
static const String playing = 'playing';
|
||||
|
||||
/// Player is paused
|
||||
static const String paused = 'paused';
|
||||
|
||||
/// Player is idle/nothing loaded
|
||||
static const String idle = 'idle';
|
||||
|
||||
/// Player is off/disconnected
|
||||
static const String off = 'off';
|
||||
}
|
||||
|
||||
/// Repeat mode constants
|
||||
class RepeatModes {
|
||||
RepeatModes._();
|
||||
|
||||
/// Repeat is off
|
||||
static const String off = 'off';
|
||||
|
||||
/// Repeat all tracks
|
||||
static const String all = 'all';
|
||||
|
||||
/// Repeat single track
|
||||
static const String one = 'one';
|
||||
}
|
||||
|
||||
@@ -190,37 +190,12 @@ class SearchHistory extends Table {
|
||||
DateTimeColumn get searchedAt => dateTime()();
|
||||
}
|
||||
|
||||
/// Cached detail tracks for album/playlist detail screens
|
||||
/// Persists across app restarts so detail screens load instantly
|
||||
class DetailTrackCache extends Table {
|
||||
/// Composite key: "{parentType}_{parentKey}"
|
||||
TextColumn get cacheKey => text()();
|
||||
|
||||
/// Type: 'album' or 'playlist'
|
||||
TextColumn get parentType => text()();
|
||||
|
||||
/// The parent item's cache key (e.g., "provider_itemId")
|
||||
TextColumn get parentKey => text()();
|
||||
|
||||
/// Serialized list of tracks as JSON array
|
||||
TextColumn get tracksJson => text()();
|
||||
|
||||
/// When this was fetched from API
|
||||
DateTimeColumn get lastFetched => dateTime()();
|
||||
|
||||
/// When this was last accessed (for LRU eviction)
|
||||
DateTimeColumn get lastAccessed => dateTime()();
|
||||
|
||||
@override
|
||||
Set<Column> get primaryKey => {cacheKey};
|
||||
}
|
||||
|
||||
@DriftDatabase(tables: [Profiles, RecentlyPlayed, LibraryCache, SyncMetadata, PlaybackState, CachedPlayers, CachedQueue, HomeRowCache, SearchHistory, DetailTrackCache])
|
||||
@DriftDatabase(tables: [Profiles, RecentlyPlayed, LibraryCache, SyncMetadata, PlaybackState, CachedPlayers, CachedQueue, HomeRowCache, SearchHistory])
|
||||
class AppDatabase extends _$AppDatabase {
|
||||
AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());
|
||||
|
||||
@override
|
||||
int get schemaVersion => 7;
|
||||
int get schemaVersion => 6;
|
||||
|
||||
@override
|
||||
MigrationStrategy get migration {
|
||||
@@ -259,10 +234,6 @@ class AppDatabase extends _$AppDatabase {
|
||||
if (from < 6) {
|
||||
await customStatement("ALTER TABLE library_cache ADD COLUMN source_providers TEXT NOT NULL DEFAULT '[]'");
|
||||
}
|
||||
// Migration from v6 to v7: Add detail track cache table
|
||||
if (from < 7) {
|
||||
await m.createTable(detailTrackCache);
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -725,66 +696,6 @@ class AppDatabase extends _$AppDatabase {
|
||||
await delete(searchHistory).go();
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Detail Track Cache Operations
|
||||
// ============================================
|
||||
|
||||
/// Save detail tracks for an album or playlist
|
||||
Future<void> saveDetailTracks(String parentType, String parentKey, String tracksJson) async {
|
||||
final cacheKey = '${parentType}_$parentKey';
|
||||
final now = DateTime.now();
|
||||
await into(detailTrackCache).insertOnConflictUpdate(
|
||||
DetailTrackCacheCompanion.insert(
|
||||
cacheKey: cacheKey,
|
||||
parentType: parentType,
|
||||
parentKey: parentKey,
|
||||
tracksJson: tracksJson,
|
||||
lastFetched: now,
|
||||
lastAccessed: now,
|
||||
),
|
||||
);
|
||||
// Evict old entries if cache grows too large
|
||||
await _evictDetailTrackCache();
|
||||
}
|
||||
|
||||
/// Get cached detail tracks for an album or playlist
|
||||
/// Returns null if not cached, updates lastAccessed on hit
|
||||
Future<DetailTrackCacheData?> getDetailTracks(String parentType, String parentKey) async {
|
||||
final cacheKey = '${parentType}_$parentKey';
|
||||
final result = await (select(detailTrackCache)
|
||||
..where((d) => d.cacheKey.equals(cacheKey)))
|
||||
.getSingleOrNull();
|
||||
if (result != null) {
|
||||
// Update last accessed time
|
||||
await (update(detailTrackCache)..where((d) => d.cacheKey.equals(cacheKey)))
|
||||
.write(DetailTrackCacheCompanion(lastAccessed: Value(DateTime.now())));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/// Evict oldest detail track cache entries when over limit
|
||||
Future<void> _evictDetailTrackCache() async {
|
||||
const maxEntries = 100;
|
||||
final count = await (selectOnly(detailTrackCache)..addColumns([countAll()]))
|
||||
.map((row) => row.read(countAll())!)
|
||||
.getSingle();
|
||||
if (count <= maxEntries) return;
|
||||
|
||||
// Delete oldest by lastAccessed
|
||||
final oldest = await (select(detailTrackCache)
|
||||
..orderBy([(d) => OrderingTerm.asc(d.lastAccessed)])
|
||||
..limit(count - maxEntries))
|
||||
.get();
|
||||
for (final entry in oldest) {
|
||||
await (delete(detailTrackCache)..where((d) => d.cacheKey.equals(entry.cacheKey))).go();
|
||||
}
|
||||
}
|
||||
|
||||
/// Clear all detail track cache
|
||||
Future<void> clearDetailTrackCache() async {
|
||||
await delete(detailTrackCache).go();
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Batch Cache Operations
|
||||
// ============================================
|
||||
|
||||
@@ -2916,381 +2916,6 @@ class SearchHistoryCompanion extends UpdateCompanion<SearchHistoryData> {
|
||||
}
|
||||
}
|
||||
|
||||
class $DetailTrackCacheTable extends DetailTrackCache
|
||||
with TableInfo<$DetailTrackCacheTable, DetailTrackCacheData> {
|
||||
@override
|
||||
final GeneratedDatabase attachedDatabase;
|
||||
final String? _alias;
|
||||
$DetailTrackCacheTable(this.attachedDatabase, [this._alias]);
|
||||
static const VerificationMeta _cacheKeyMeta =
|
||||
const VerificationMeta('cacheKey');
|
||||
@override
|
||||
late final GeneratedColumn<String> cacheKey = GeneratedColumn<String>(
|
||||
'cache_key', aliasedName, false,
|
||||
type: DriftSqlType.string, requiredDuringInsert: true);
|
||||
static const VerificationMeta _parentTypeMeta =
|
||||
const VerificationMeta('parentType');
|
||||
@override
|
||||
late final GeneratedColumn<String> parentType = GeneratedColumn<String>(
|
||||
'parent_type', aliasedName, false,
|
||||
type: DriftSqlType.string, requiredDuringInsert: true);
|
||||
static const VerificationMeta _parentKeyMeta =
|
||||
const VerificationMeta('parentKey');
|
||||
@override
|
||||
late final GeneratedColumn<String> parentKey = GeneratedColumn<String>(
|
||||
'parent_key', aliasedName, false,
|
||||
type: DriftSqlType.string, requiredDuringInsert: true);
|
||||
static const VerificationMeta _tracksJsonMeta =
|
||||
const VerificationMeta('tracksJson');
|
||||
@override
|
||||
late final GeneratedColumn<String> tracksJson = GeneratedColumn<String>(
|
||||
'tracks_json', aliasedName, false,
|
||||
type: DriftSqlType.string, requiredDuringInsert: true);
|
||||
static const VerificationMeta _lastFetchedMeta =
|
||||
const VerificationMeta('lastFetched');
|
||||
@override
|
||||
late final GeneratedColumn<DateTime> lastFetched = GeneratedColumn<DateTime>(
|
||||
'last_fetched', aliasedName, false,
|
||||
type: DriftSqlType.dateTime, requiredDuringInsert: true);
|
||||
static const VerificationMeta _lastAccessedMeta =
|
||||
const VerificationMeta('lastAccessed');
|
||||
@override
|
||||
late final GeneratedColumn<DateTime> lastAccessed = GeneratedColumn<DateTime>(
|
||||
'last_accessed', aliasedName, false,
|
||||
type: DriftSqlType.dateTime, requiredDuringInsert: true);
|
||||
@override
|
||||
List<GeneratedColumn> get $columns =>
|
||||
[cacheKey, parentType, parentKey, tracksJson, lastFetched, lastAccessed];
|
||||
@override
|
||||
String get aliasedName => _alias ?? actualTableName;
|
||||
@override
|
||||
String get actualTableName => $name;
|
||||
static const String $name = 'detail_track_cache';
|
||||
@override
|
||||
VerificationContext validateIntegrity(
|
||||
Insertable<DetailTrackCacheData> instance,
|
||||
{bool isInserting = false}) {
|
||||
final context = VerificationContext();
|
||||
final data = instance.toColumns(true);
|
||||
if (data.containsKey('cache_key')) {
|
||||
context.handle(_cacheKeyMeta,
|
||||
cacheKey.isAcceptableOrUnknown(data['cache_key']!, _cacheKeyMeta));
|
||||
} else if (isInserting) {
|
||||
context.missing(_cacheKeyMeta);
|
||||
}
|
||||
if (data.containsKey('parent_type')) {
|
||||
context.handle(
|
||||
_parentTypeMeta,
|
||||
parentType.isAcceptableOrUnknown(
|
||||
data['parent_type']!, _parentTypeMeta));
|
||||
} else if (isInserting) {
|
||||
context.missing(_parentTypeMeta);
|
||||
}
|
||||
if (data.containsKey('parent_key')) {
|
||||
context.handle(_parentKeyMeta,
|
||||
parentKey.isAcceptableOrUnknown(data['parent_key']!, _parentKeyMeta));
|
||||
} else if (isInserting) {
|
||||
context.missing(_parentKeyMeta);
|
||||
}
|
||||
if (data.containsKey('tracks_json')) {
|
||||
context.handle(
|
||||
_tracksJsonMeta,
|
||||
tracksJson.isAcceptableOrUnknown(
|
||||
data['tracks_json']!, _tracksJsonMeta));
|
||||
} else if (isInserting) {
|
||||
context.missing(_tracksJsonMeta);
|
||||
}
|
||||
if (data.containsKey('last_fetched')) {
|
||||
context.handle(
|
||||
_lastFetchedMeta,
|
||||
lastFetched.isAcceptableOrUnknown(
|
||||
data['last_fetched']!, _lastFetchedMeta));
|
||||
} else if (isInserting) {
|
||||
context.missing(_lastFetchedMeta);
|
||||
}
|
||||
if (data.containsKey('last_accessed')) {
|
||||
context.handle(
|
||||
_lastAccessedMeta,
|
||||
lastAccessed.isAcceptableOrUnknown(
|
||||
data['last_accessed']!, _lastAccessedMeta));
|
||||
} else if (isInserting) {
|
||||
context.missing(_lastAccessedMeta);
|
||||
}
|
||||
return context;
|
||||
}
|
||||
|
||||
@override
|
||||
Set<GeneratedColumn> get $primaryKey => {cacheKey};
|
||||
@override
|
||||
DetailTrackCacheData map(Map<String, dynamic> data, {String? tablePrefix}) {
|
||||
final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
|
||||
return DetailTrackCacheData(
|
||||
cacheKey: attachedDatabase.typeMapping
|
||||
.read(DriftSqlType.string, data['${effectivePrefix}cache_key'])!,
|
||||
parentType: attachedDatabase.typeMapping
|
||||
.read(DriftSqlType.string, data['${effectivePrefix}parent_type'])!,
|
||||
parentKey: attachedDatabase.typeMapping
|
||||
.read(DriftSqlType.string, data['${effectivePrefix}parent_key'])!,
|
||||
tracksJson: attachedDatabase.typeMapping
|
||||
.read(DriftSqlType.string, data['${effectivePrefix}tracks_json'])!,
|
||||
lastFetched: attachedDatabase.typeMapping
|
||||
.read(DriftSqlType.dateTime, data['${effectivePrefix}last_fetched'])!,
|
||||
lastAccessed: attachedDatabase.typeMapping.read(
|
||||
DriftSqlType.dateTime, data['${effectivePrefix}last_accessed'])!,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
$DetailTrackCacheTable createAlias(String alias) {
|
||||
return $DetailTrackCacheTable(attachedDatabase, alias);
|
||||
}
|
||||
}
|
||||
|
||||
class DetailTrackCacheData extends DataClass
|
||||
implements Insertable<DetailTrackCacheData> {
|
||||
/// Composite key: "{parentType}_{parentKey}"
|
||||
final String cacheKey;
|
||||
|
||||
/// Type: 'album' or 'playlist'
|
||||
final String parentType;
|
||||
|
||||
/// The parent item's cache key (e.g., "provider_itemId")
|
||||
final String parentKey;
|
||||
|
||||
/// Serialized list of tracks as JSON array
|
||||
final String tracksJson;
|
||||
|
||||
/// When this was fetched from API
|
||||
final DateTime lastFetched;
|
||||
|
||||
/// When this was last accessed (for LRU eviction)
|
||||
final DateTime lastAccessed;
|
||||
const DetailTrackCacheData(
|
||||
{required this.cacheKey,
|
||||
required this.parentType,
|
||||
required this.parentKey,
|
||||
required this.tracksJson,
|
||||
required this.lastFetched,
|
||||
required this.lastAccessed});
|
||||
@override
|
||||
Map<String, Expression> toColumns(bool nullToAbsent) {
|
||||
final map = <String, Expression>{};
|
||||
map['cache_key'] = Variable<String>(cacheKey);
|
||||
map['parent_type'] = Variable<String>(parentType);
|
||||
map['parent_key'] = Variable<String>(parentKey);
|
||||
map['tracks_json'] = Variable<String>(tracksJson);
|
||||
map['last_fetched'] = Variable<DateTime>(lastFetched);
|
||||
map['last_accessed'] = Variable<DateTime>(lastAccessed);
|
||||
return map;
|
||||
}
|
||||
|
||||
DetailTrackCacheCompanion toCompanion(bool nullToAbsent) {
|
||||
return DetailTrackCacheCompanion(
|
||||
cacheKey: Value(cacheKey),
|
||||
parentType: Value(parentType),
|
||||
parentKey: Value(parentKey),
|
||||
tracksJson: Value(tracksJson),
|
||||
lastFetched: Value(lastFetched),
|
||||
lastAccessed: Value(lastAccessed),
|
||||
);
|
||||
}
|
||||
|
||||
factory DetailTrackCacheData.fromJson(Map<String, dynamic> json,
|
||||
{ValueSerializer? serializer}) {
|
||||
serializer ??= driftRuntimeOptions.defaultSerializer;
|
||||
return DetailTrackCacheData(
|
||||
cacheKey: serializer.fromJson<String>(json['cacheKey']),
|
||||
parentType: serializer.fromJson<String>(json['parentType']),
|
||||
parentKey: serializer.fromJson<String>(json['parentKey']),
|
||||
tracksJson: serializer.fromJson<String>(json['tracksJson']),
|
||||
lastFetched: serializer.fromJson<DateTime>(json['lastFetched']),
|
||||
lastAccessed: serializer.fromJson<DateTime>(json['lastAccessed']),
|
||||
);
|
||||
}
|
||||
@override
|
||||
Map<String, dynamic> toJson({ValueSerializer? serializer}) {
|
||||
serializer ??= driftRuntimeOptions.defaultSerializer;
|
||||
return <String, dynamic>{
|
||||
'cacheKey': serializer.toJson<String>(cacheKey),
|
||||
'parentType': serializer.toJson<String>(parentType),
|
||||
'parentKey': serializer.toJson<String>(parentKey),
|
||||
'tracksJson': serializer.toJson<String>(tracksJson),
|
||||
'lastFetched': serializer.toJson<DateTime>(lastFetched),
|
||||
'lastAccessed': serializer.toJson<DateTime>(lastAccessed),
|
||||
};
|
||||
}
|
||||
|
||||
DetailTrackCacheData copyWith(
|
||||
{String? cacheKey,
|
||||
String? parentType,
|
||||
String? parentKey,
|
||||
String? tracksJson,
|
||||
DateTime? lastFetched,
|
||||
DateTime? lastAccessed}) =>
|
||||
DetailTrackCacheData(
|
||||
cacheKey: cacheKey ?? this.cacheKey,
|
||||
parentType: parentType ?? this.parentType,
|
||||
parentKey: parentKey ?? this.parentKey,
|
||||
tracksJson: tracksJson ?? this.tracksJson,
|
||||
lastFetched: lastFetched ?? this.lastFetched,
|
||||
lastAccessed: lastAccessed ?? this.lastAccessed,
|
||||
);
|
||||
DetailTrackCacheData copyWithCompanion(DetailTrackCacheCompanion data) {
|
||||
return DetailTrackCacheData(
|
||||
cacheKey: data.cacheKey.present ? data.cacheKey.value : this.cacheKey,
|
||||
parentType:
|
||||
data.parentType.present ? data.parentType.value : this.parentType,
|
||||
parentKey: data.parentKey.present ? data.parentKey.value : this.parentKey,
|
||||
tracksJson:
|
||||
data.tracksJson.present ? data.tracksJson.value : this.tracksJson,
|
||||
lastFetched:
|
||||
data.lastFetched.present ? data.lastFetched.value : this.lastFetched,
|
||||
lastAccessed: data.lastAccessed.present
|
||||
? data.lastAccessed.value
|
||||
: this.lastAccessed,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return (StringBuffer('DetailTrackCacheData(')
|
||||
..write('cacheKey: $cacheKey, ')
|
||||
..write('parentType: $parentType, ')
|
||||
..write('parentKey: $parentKey, ')
|
||||
..write('tracksJson: $tracksJson, ')
|
||||
..write('lastFetched: $lastFetched, ')
|
||||
..write('lastAccessed: $lastAccessed')
|
||||
..write(')'))
|
||||
.toString();
|
||||
}
|
||||
|
||||
@override
|
||||
int get hashCode => Object.hash(
|
||||
cacheKey, parentType, parentKey, tracksJson, lastFetched, lastAccessed);
|
||||
@override
|
||||
bool operator ==(Object other) =>
|
||||
identical(this, other) ||
|
||||
(other is DetailTrackCacheData &&
|
||||
other.cacheKey == this.cacheKey &&
|
||||
other.parentType == this.parentType &&
|
||||
other.parentKey == this.parentKey &&
|
||||
other.tracksJson == this.tracksJson &&
|
||||
other.lastFetched == this.lastFetched &&
|
||||
other.lastAccessed == this.lastAccessed);
|
||||
}
|
||||
|
||||
class DetailTrackCacheCompanion extends UpdateCompanion<DetailTrackCacheData> {
|
||||
final Value<String> cacheKey;
|
||||
final Value<String> parentType;
|
||||
final Value<String> parentKey;
|
||||
final Value<String> tracksJson;
|
||||
final Value<DateTime> lastFetched;
|
||||
final Value<DateTime> lastAccessed;
|
||||
final Value<int> rowid;
|
||||
const DetailTrackCacheCompanion({
|
||||
this.cacheKey = const Value.absent(),
|
||||
this.parentType = const Value.absent(),
|
||||
this.parentKey = const Value.absent(),
|
||||
this.tracksJson = const Value.absent(),
|
||||
this.lastFetched = const Value.absent(),
|
||||
this.lastAccessed = const Value.absent(),
|
||||
this.rowid = const Value.absent(),
|
||||
});
|
||||
DetailTrackCacheCompanion.insert({
|
||||
required String cacheKey,
|
||||
required String parentType,
|
||||
required String parentKey,
|
||||
required String tracksJson,
|
||||
required DateTime lastFetched,
|
||||
required DateTime lastAccessed,
|
||||
this.rowid = const Value.absent(),
|
||||
}) : cacheKey = Value(cacheKey),
|
||||
parentType = Value(parentType),
|
||||
parentKey = Value(parentKey),
|
||||
tracksJson = Value(tracksJson),
|
||||
lastFetched = Value(lastFetched),
|
||||
lastAccessed = Value(lastAccessed);
|
||||
static Insertable<DetailTrackCacheData> custom({
|
||||
Expression<String>? cacheKey,
|
||||
Expression<String>? parentType,
|
||||
Expression<String>? parentKey,
|
||||
Expression<String>? tracksJson,
|
||||
Expression<DateTime>? lastFetched,
|
||||
Expression<DateTime>? lastAccessed,
|
||||
Expression<int>? rowid,
|
||||
}) {
|
||||
return RawValuesInsertable({
|
||||
if (cacheKey != null) 'cache_key': cacheKey,
|
||||
if (parentType != null) 'parent_type': parentType,
|
||||
if (parentKey != null) 'parent_key': parentKey,
|
||||
if (tracksJson != null) 'tracks_json': tracksJson,
|
||||
if (lastFetched != null) 'last_fetched': lastFetched,
|
||||
if (lastAccessed != null) 'last_accessed': lastAccessed,
|
||||
if (rowid != null) 'rowid': rowid,
|
||||
});
|
||||
}
|
||||
|
||||
DetailTrackCacheCompanion copyWith(
|
||||
{Value<String>? cacheKey,
|
||||
Value<String>? parentType,
|
||||
Value<String>? parentKey,
|
||||
Value<String>? tracksJson,
|
||||
Value<DateTime>? lastFetched,
|
||||
Value<DateTime>? lastAccessed,
|
||||
Value<int>? rowid}) {
|
||||
return DetailTrackCacheCompanion(
|
||||
cacheKey: cacheKey ?? this.cacheKey,
|
||||
parentType: parentType ?? this.parentType,
|
||||
parentKey: parentKey ?? this.parentKey,
|
||||
tracksJson: tracksJson ?? this.tracksJson,
|
||||
lastFetched: lastFetched ?? this.lastFetched,
|
||||
lastAccessed: lastAccessed ?? this.lastAccessed,
|
||||
rowid: rowid ?? this.rowid,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, Expression> toColumns(bool nullToAbsent) {
|
||||
final map = <String, Expression>{};
|
||||
if (cacheKey.present) {
|
||||
map['cache_key'] = Variable<String>(cacheKey.value);
|
||||
}
|
||||
if (parentType.present) {
|
||||
map['parent_type'] = Variable<String>(parentType.value);
|
||||
}
|
||||
if (parentKey.present) {
|
||||
map['parent_key'] = Variable<String>(parentKey.value);
|
||||
}
|
||||
if (tracksJson.present) {
|
||||
map['tracks_json'] = Variable<String>(tracksJson.value);
|
||||
}
|
||||
if (lastFetched.present) {
|
||||
map['last_fetched'] = Variable<DateTime>(lastFetched.value);
|
||||
}
|
||||
if (lastAccessed.present) {
|
||||
map['last_accessed'] = Variable<DateTime>(lastAccessed.value);
|
||||
}
|
||||
if (rowid.present) {
|
||||
map['rowid'] = Variable<int>(rowid.value);
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return (StringBuffer('DetailTrackCacheCompanion(')
|
||||
..write('cacheKey: $cacheKey, ')
|
||||
..write('parentType: $parentType, ')
|
||||
..write('parentKey: $parentKey, ')
|
||||
..write('tracksJson: $tracksJson, ')
|
||||
..write('lastFetched: $lastFetched, ')
|
||||
..write('lastAccessed: $lastAccessed, ')
|
||||
..write('rowid: $rowid')
|
||||
..write(')'))
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
||||
abstract class _$AppDatabase extends GeneratedDatabase {
|
||||
_$AppDatabase(QueryExecutor e) : super(e);
|
||||
$AppDatabaseManager get managers => $AppDatabaseManager(this);
|
||||
@@ -3303,8 +2928,6 @@ abstract class _$AppDatabase extends GeneratedDatabase {
|
||||
late final $CachedQueueTable cachedQueue = $CachedQueueTable(this);
|
||||
late final $HomeRowCacheTable homeRowCache = $HomeRowCacheTable(this);
|
||||
late final $SearchHistoryTable searchHistory = $SearchHistoryTable(this);
|
||||
late final $DetailTrackCacheTable detailTrackCache =
|
||||
$DetailTrackCacheTable(this);
|
||||
late final Index idxRecentlyPlayedProfile = Index(
|
||||
'idx_recently_played_profile',
|
||||
'CREATE INDEX idx_recently_played_profile ON recently_played (profile_username)');
|
||||
@@ -3335,7 +2958,6 @@ abstract class _$AppDatabase extends GeneratedDatabase {
|
||||
cachedQueue,
|
||||
homeRowCache,
|
||||
searchHistory,
|
||||
detailTrackCache,
|
||||
idxRecentlyPlayedProfile,
|
||||
idxRecentlyPlayedProfilePlayed,
|
||||
idxLibraryCacheType,
|
||||
@@ -5079,198 +4701,6 @@ typedef $$SearchHistoryTableProcessedTableManager = ProcessedTableManager<
|
||||
),
|
||||
SearchHistoryData,
|
||||
PrefetchHooks Function()>;
|
||||
typedef $$DetailTrackCacheTableCreateCompanionBuilder
|
||||
= DetailTrackCacheCompanion Function({
|
||||
required String cacheKey,
|
||||
required String parentType,
|
||||
required String parentKey,
|
||||
required String tracksJson,
|
||||
required DateTime lastFetched,
|
||||
required DateTime lastAccessed,
|
||||
Value<int> rowid,
|
||||
});
|
||||
typedef $$DetailTrackCacheTableUpdateCompanionBuilder
|
||||
= DetailTrackCacheCompanion Function({
|
||||
Value<String> cacheKey,
|
||||
Value<String> parentType,
|
||||
Value<String> parentKey,
|
||||
Value<String> tracksJson,
|
||||
Value<DateTime> lastFetched,
|
||||
Value<DateTime> lastAccessed,
|
||||
Value<int> rowid,
|
||||
});
|
||||
|
||||
class $$DetailTrackCacheTableFilterComposer
|
||||
extends Composer<_$AppDatabase, $DetailTrackCacheTable> {
|
||||
$$DetailTrackCacheTableFilterComposer({
|
||||
required super.$db,
|
||||
required super.$table,
|
||||
super.joinBuilder,
|
||||
super.$addJoinBuilderToRootComposer,
|
||||
super.$removeJoinBuilderFromRootComposer,
|
||||
});
|
||||
ColumnFilters<String> get cacheKey => $composableBuilder(
|
||||
column: $table.cacheKey, builder: (column) => ColumnFilters(column));
|
||||
|
||||
ColumnFilters<String> get parentType => $composableBuilder(
|
||||
column: $table.parentType, builder: (column) => ColumnFilters(column));
|
||||
|
||||
ColumnFilters<String> get parentKey => $composableBuilder(
|
||||
column: $table.parentKey, builder: (column) => ColumnFilters(column));
|
||||
|
||||
ColumnFilters<String> get tracksJson => $composableBuilder(
|
||||
column: $table.tracksJson, builder: (column) => ColumnFilters(column));
|
||||
|
||||
ColumnFilters<DateTime> get lastFetched => $composableBuilder(
|
||||
column: $table.lastFetched, builder: (column) => ColumnFilters(column));
|
||||
|
||||
ColumnFilters<DateTime> get lastAccessed => $composableBuilder(
|
||||
column: $table.lastAccessed, builder: (column) => ColumnFilters(column));
|
||||
}
|
||||
|
||||
class $$DetailTrackCacheTableOrderingComposer
|
||||
extends Composer<_$AppDatabase, $DetailTrackCacheTable> {
|
||||
$$DetailTrackCacheTableOrderingComposer({
|
||||
required super.$db,
|
||||
required super.$table,
|
||||
super.joinBuilder,
|
||||
super.$addJoinBuilderToRootComposer,
|
||||
super.$removeJoinBuilderFromRootComposer,
|
||||
});
|
||||
ColumnOrderings<String> get cacheKey => $composableBuilder(
|
||||
column: $table.cacheKey, builder: (column) => ColumnOrderings(column));
|
||||
|
||||
ColumnOrderings<String> get parentType => $composableBuilder(
|
||||
column: $table.parentType, builder: (column) => ColumnOrderings(column));
|
||||
|
||||
ColumnOrderings<String> get parentKey => $composableBuilder(
|
||||
column: $table.parentKey, builder: (column) => ColumnOrderings(column));
|
||||
|
||||
ColumnOrderings<String> get tracksJson => $composableBuilder(
|
||||
column: $table.tracksJson, builder: (column) => ColumnOrderings(column));
|
||||
|
||||
ColumnOrderings<DateTime> get lastFetched => $composableBuilder(
|
||||
column: $table.lastFetched, builder: (column) => ColumnOrderings(column));
|
||||
|
||||
ColumnOrderings<DateTime> get lastAccessed => $composableBuilder(
|
||||
column: $table.lastAccessed,
|
||||
builder: (column) => ColumnOrderings(column));
|
||||
}
|
||||
|
||||
class $$DetailTrackCacheTableAnnotationComposer
|
||||
extends Composer<_$AppDatabase, $DetailTrackCacheTable> {
|
||||
$$DetailTrackCacheTableAnnotationComposer({
|
||||
required super.$db,
|
||||
required super.$table,
|
||||
super.joinBuilder,
|
||||
super.$addJoinBuilderToRootComposer,
|
||||
super.$removeJoinBuilderFromRootComposer,
|
||||
});
|
||||
GeneratedColumn<String> get cacheKey =>
|
||||
$composableBuilder(column: $table.cacheKey, builder: (column) => column);
|
||||
|
||||
GeneratedColumn<String> get parentType => $composableBuilder(
|
||||
column: $table.parentType, builder: (column) => column);
|
||||
|
||||
GeneratedColumn<String> get parentKey =>
|
||||
$composableBuilder(column: $table.parentKey, builder: (column) => column);
|
||||
|
||||
GeneratedColumn<String> get tracksJson => $composableBuilder(
|
||||
column: $table.tracksJson, builder: (column) => column);
|
||||
|
||||
GeneratedColumn<DateTime> get lastFetched => $composableBuilder(
|
||||
column: $table.lastFetched, builder: (column) => column);
|
||||
|
||||
GeneratedColumn<DateTime> get lastAccessed => $composableBuilder(
|
||||
column: $table.lastAccessed, builder: (column) => column);
|
||||
}
|
||||
|
||||
class $$DetailTrackCacheTableTableManager extends RootTableManager<
|
||||
_$AppDatabase,
|
||||
$DetailTrackCacheTable,
|
||||
DetailTrackCacheData,
|
||||
$$DetailTrackCacheTableFilterComposer,
|
||||
$$DetailTrackCacheTableOrderingComposer,
|
||||
$$DetailTrackCacheTableAnnotationComposer,
|
||||
$$DetailTrackCacheTableCreateCompanionBuilder,
|
||||
$$DetailTrackCacheTableUpdateCompanionBuilder,
|
||||
(
|
||||
DetailTrackCacheData,
|
||||
BaseReferences<_$AppDatabase, $DetailTrackCacheTable,
|
||||
DetailTrackCacheData>
|
||||
),
|
||||
DetailTrackCacheData,
|
||||
PrefetchHooks Function()> {
|
||||
$$DetailTrackCacheTableTableManager(
|
||||
_$AppDatabase db, $DetailTrackCacheTable table)
|
||||
: super(TableManagerState(
|
||||
db: db,
|
||||
table: table,
|
||||
createFilteringComposer: () =>
|
||||
$$DetailTrackCacheTableFilterComposer($db: db, $table: table),
|
||||
createOrderingComposer: () =>
|
||||
$$DetailTrackCacheTableOrderingComposer($db: db, $table: table),
|
||||
createComputedFieldComposer: () =>
|
||||
$$DetailTrackCacheTableAnnotationComposer($db: db, $table: table),
|
||||
updateCompanionCallback: ({
|
||||
Value<String> cacheKey = const Value.absent(),
|
||||
Value<String> parentType = const Value.absent(),
|
||||
Value<String> parentKey = const Value.absent(),
|
||||
Value<String> tracksJson = const Value.absent(),
|
||||
Value<DateTime> lastFetched = const Value.absent(),
|
||||
Value<DateTime> lastAccessed = const Value.absent(),
|
||||
Value<int> rowid = const Value.absent(),
|
||||
}) =>
|
||||
DetailTrackCacheCompanion(
|
||||
cacheKey: cacheKey,
|
||||
parentType: parentType,
|
||||
parentKey: parentKey,
|
||||
tracksJson: tracksJson,
|
||||
lastFetched: lastFetched,
|
||||
lastAccessed: lastAccessed,
|
||||
rowid: rowid,
|
||||
),
|
||||
createCompanionCallback: ({
|
||||
required String cacheKey,
|
||||
required String parentType,
|
||||
required String parentKey,
|
||||
required String tracksJson,
|
||||
required DateTime lastFetched,
|
||||
required DateTime lastAccessed,
|
||||
Value<int> rowid = const Value.absent(),
|
||||
}) =>
|
||||
DetailTrackCacheCompanion.insert(
|
||||
cacheKey: cacheKey,
|
||||
parentType: parentType,
|
||||
parentKey: parentKey,
|
||||
tracksJson: tracksJson,
|
||||
lastFetched: lastFetched,
|
||||
lastAccessed: lastAccessed,
|
||||
rowid: rowid,
|
||||
),
|
||||
withReferenceMapper: (p0) => p0
|
||||
.map((e) => (e.readTable(table), BaseReferences(db, table, e)))
|
||||
.toList(),
|
||||
prefetchHooksCallback: null,
|
||||
));
|
||||
}
|
||||
|
||||
typedef $$DetailTrackCacheTableProcessedTableManager = ProcessedTableManager<
|
||||
_$AppDatabase,
|
||||
$DetailTrackCacheTable,
|
||||
DetailTrackCacheData,
|
||||
$$DetailTrackCacheTableFilterComposer,
|
||||
$$DetailTrackCacheTableOrderingComposer,
|
||||
$$DetailTrackCacheTableAnnotationComposer,
|
||||
$$DetailTrackCacheTableCreateCompanionBuilder,
|
||||
$$DetailTrackCacheTableUpdateCompanionBuilder,
|
||||
(
|
||||
DetailTrackCacheData,
|
||||
BaseReferences<_$AppDatabase, $DetailTrackCacheTable,
|
||||
DetailTrackCacheData>
|
||||
),
|
||||
DetailTrackCacheData,
|
||||
PrefetchHooks Function()>;
|
||||
|
||||
class $AppDatabaseManager {
|
||||
final _$AppDatabase _db;
|
||||
@@ -5293,6 +4723,4 @@ class $AppDatabaseManager {
|
||||
$$HomeRowCacheTableTableManager(_db, _db.homeRowCache);
|
||||
$$SearchHistoryTableTableManager get searchHistory =>
|
||||
$$SearchHistoryTableTableManager(_db, _db.searchHistory);
|
||||
$$DetailTrackCacheTableTableManager get detailTrackCache =>
|
||||
$$DetailTrackCacheTableTableManager(_db, _db.detailTrackCache);
|
||||
}
|
||||
|
||||
+278
-187
@@ -6,14 +6,25 @@ import 'package:provider/provider.dart';
|
||||
import 'package:audio_service/audio_service.dart';
|
||||
import 'package:flutter_localizations/flutter_localizations.dart';
|
||||
import 'l10n/app_localizations.dart';
|
||||
import 'providers/connection_provider.dart';
|
||||
import 'providers/library_provider.dart';
|
||||
import 'providers/locale_provider.dart';
|
||||
import 'providers/local_player_provider.dart';
|
||||
import 'providers/music_assistant_provider.dart';
|
||||
import 'providers/navigation_provider.dart';
|
||||
import 'providers/player_provider.dart';
|
||||
import 'providers/sleep_timer_provider.dart';
|
||||
import 'providers/ui_state_provider.dart';
|
||||
import 'screens/home_screen.dart';
|
||||
import 'screens/login_screen.dart';
|
||||
import 'services/cache_service.dart';
|
||||
import 'services/settings_service.dart';
|
||||
import 'services/database_service.dart';
|
||||
import 'services/image_helper_service.dart';
|
||||
import 'services/position_tracker.dart';
|
||||
import 'services/queue_manager_service.dart';
|
||||
import 'services/profile_service.dart';
|
||||
import 'services/provider_filter_service.dart';
|
||||
import 'services/sync_service.dart';
|
||||
import 'services/audio/massiv_audio_handler.dart';
|
||||
import 'services/auth/auth_manager.dart';
|
||||
@@ -23,6 +34,7 @@ import 'services/music_assistant_api.dart' show MAConnectionState;
|
||||
import 'theme/theme_provider.dart';
|
||||
import 'theme/app_theme.dart';
|
||||
import 'theme/system_theme_helper.dart';
|
||||
import 'utils/player_sync_state.dart';
|
||||
import 'widgets/global_player_overlay.dart';
|
||||
|
||||
// Global audio handler instance
|
||||
@@ -31,85 +43,82 @@ late MassivAudioHandler audioHandler;
|
||||
// Global debug logger instance
|
||||
final _logger = DebugLogger();
|
||||
|
||||
void main() {
|
||||
// All initialization must run inside the same zone as runApp() to avoid
|
||||
// "Zone mismatch" errors from Flutter's binding system
|
||||
Future<void> main() async {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
// Initialize SharedPreferences cache early for performance
|
||||
await SettingsService.initialize();
|
||||
_logger.log('⚡ SharedPreferences cached');
|
||||
|
||||
// Initialize local database
|
||||
await DatabaseService.instance.initialize();
|
||||
_logger.log('💾 Database initialized');
|
||||
|
||||
// Migrate existing ownerName to profile (one-time for existing users)
|
||||
await ProfileService.instance.migrateFromOwnerName();
|
||||
|
||||
// Migrate credentials to secure storage (one-time for existing users)
|
||||
await SettingsService.migrateToSecureStorage();
|
||||
_logger.log('🔐 Secure storage migration complete');
|
||||
|
||||
// Load library from cache for instant startup
|
||||
await SyncService.instance.loadFromCache();
|
||||
_logger.log('📦 Library cache loaded');
|
||||
|
||||
// Create auth manager for streaming headers
|
||||
final authManager = AuthManager();
|
||||
|
||||
// Initialize audio_service with our custom handler
|
||||
audioHandler = await AudioService.init(
|
||||
builder: () => MassivAudioHandler(authManager: authManager),
|
||||
config: const AudioServiceConfig(
|
||||
androidNotificationChannelId: 'io.github.collotsspot.massiv.audio',
|
||||
androidNotificationChannelName: 'Ensemble Audio',
|
||||
androidNotificationOngoing: false, // Must be false when androidStopForegroundOnPause is false
|
||||
androidNotificationIcon: 'drawable/ic_notification',
|
||||
androidShowNotificationBadge: false,
|
||||
androidStopForegroundOnPause: false, // Keep service alive when paused for background playback
|
||||
),
|
||||
);
|
||||
_logger.log('🎵 AudioService initialized - background playback and media notifications ENABLED');
|
||||
|
||||
// Set preferred orientations
|
||||
SystemChrome.setPreferredOrientations([
|
||||
DeviceOrientation.portraitUp,
|
||||
DeviceOrientation.portraitDown,
|
||||
]);
|
||||
|
||||
// Set initial system UI overlay style based on platform brightness
|
||||
// SystemUIWrapper will update this dynamically when theme changes
|
||||
final platformBrightness = WidgetsBinding.instance.platformDispatcher.platformBrightness;
|
||||
final isDark = platformBrightness == Brightness.dark;
|
||||
SystemChrome.setSystemUIOverlayStyle(
|
||||
SystemUiOverlayStyle(
|
||||
statusBarColor: Colors.transparent,
|
||||
statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
|
||||
systemNavigationBarColor: isDark ? const Color(0xFF1a1a1a) : const Color(0xFFF5F5F5),
|
||||
systemNavigationBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
|
||||
),
|
||||
);
|
||||
|
||||
// Set up Flutter error boundary to catch and log widget build errors
|
||||
FlutterError.onError = (FlutterErrorDetails details) {
|
||||
_logger.error('Flutter error: ${details.exceptionAsString()}', context: 'FlutterError');
|
||||
_logger.error('Stack trace:\n${details.stack}', context: 'FlutterError');
|
||||
// Still report to Flutter's default handler in debug mode
|
||||
FlutterError.presentError(details);
|
||||
};
|
||||
|
||||
// Catch errors from the platform dispatcher (platform channel errors)
|
||||
PlatformDispatcher.instance.onError = (error, stack) {
|
||||
_logger.error('Platform error: $error', context: 'PlatformDispatcher');
|
||||
_logger.error('Stack trace:\n$stack', context: 'PlatformDispatcher');
|
||||
return true; // Handled
|
||||
};
|
||||
|
||||
// Wrap app in zone to catch async errors
|
||||
runZonedGuarded(
|
||||
() async {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
// Initialize SharedPreferences cache early for performance
|
||||
await SettingsService.initialize();
|
||||
_logger.log('⚡ SharedPreferences cached');
|
||||
|
||||
// Initialize local database
|
||||
await DatabaseService.instance.initialize();
|
||||
_logger.log('💾 Database initialized');
|
||||
|
||||
// Migrate existing ownerName to profile (one-time for existing users)
|
||||
await ProfileService.instance.migrateFromOwnerName();
|
||||
|
||||
// Migrate credentials to secure storage (one-time for existing users)
|
||||
await SettingsService.migrateToSecureStorage();
|
||||
_logger.log('🔐 Secure storage migration complete');
|
||||
|
||||
// Load library from cache for instant startup
|
||||
await SyncService.instance.loadFromCache();
|
||||
_logger.log('📦 Library cache loaded');
|
||||
|
||||
// Create auth manager for streaming headers
|
||||
final authManager = AuthManager();
|
||||
|
||||
// Initialize audio_service with our custom handler
|
||||
audioHandler = await AudioService.init(
|
||||
builder: () => MassivAudioHandler(authManager: authManager),
|
||||
config: const AudioServiceConfig(
|
||||
androidNotificationChannelId: 'io.github.collotsspot.massiv.audio',
|
||||
androidNotificationChannelName: 'Ensemble Audio',
|
||||
androidNotificationOngoing: false, // Must be false when androidStopForegroundOnPause is false
|
||||
androidNotificationIcon: 'drawable/ic_notification',
|
||||
androidShowNotificationBadge: false,
|
||||
androidStopForegroundOnPause: false, // Keep service alive when paused for background playback
|
||||
),
|
||||
);
|
||||
_logger.log('🎵 AudioService initialized - background playback and media notifications ENABLED');
|
||||
|
||||
// Set preferred orientations
|
||||
SystemChrome.setPreferredOrientations([
|
||||
DeviceOrientation.portraitUp,
|
||||
DeviceOrientation.portraitDown,
|
||||
]);
|
||||
|
||||
// Set initial system UI overlay style based on platform brightness
|
||||
// SystemUIWrapper will update this dynamically when theme changes
|
||||
final platformBrightness = WidgetsBinding.instance.platformDispatcher.platformBrightness;
|
||||
final isDark = platformBrightness == Brightness.dark;
|
||||
SystemChrome.setSystemUIOverlayStyle(
|
||||
SystemUiOverlayStyle(
|
||||
statusBarColor: Colors.transparent,
|
||||
statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
|
||||
systemNavigationBarColor: isDark ? const Color(0xFF1a1a1a) : const Color(0xFFF5F5F5),
|
||||
systemNavigationBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
|
||||
),
|
||||
);
|
||||
|
||||
// Set up Flutter error boundary to catch and log widget build errors
|
||||
FlutterError.onError = (FlutterErrorDetails details) {
|
||||
_logger.error('Flutter error: ${details.exceptionAsString()}', context: 'FlutterError');
|
||||
_logger.error('Stack trace:\n${details.stack}', context: 'FlutterError');
|
||||
// Still report to Flutter's default handler in debug mode
|
||||
FlutterError.presentError(details);
|
||||
};
|
||||
|
||||
// Catch errors from the platform dispatcher (platform channel errors)
|
||||
PlatformDispatcher.instance.onError = (error, stack) {
|
||||
_logger.error('Platform error: $error', context: 'PlatformDispatcher');
|
||||
_logger.error('Stack trace:\n$stack', context: 'PlatformDispatcher');
|
||||
return true; // Handled
|
||||
};
|
||||
|
||||
runApp(const MusicAssistantApp());
|
||||
},
|
||||
() => runApp(const MusicAssistantApp()),
|
||||
(error, stackTrace) {
|
||||
_logger.error('Uncaught async error: $error', context: 'ZoneError');
|
||||
_logger.error('Stack trace:\n$stackTrace', context: 'ZoneError');
|
||||
@@ -128,10 +137,24 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
|
||||
late MusicAssistantProvider _musicProvider;
|
||||
late ThemeProvider _themeProvider;
|
||||
late LocaleProvider _localeProvider;
|
||||
|
||||
// New multi-provider architecture
|
||||
late ConnectionProvider _connectionProvider;
|
||||
late UIStateProvider _uiStateProvider;
|
||||
late LibraryProvider _libraryProvider;
|
||||
late PlayerProvider _playerProvider;
|
||||
late LocalPlayerProvider _localPlayerProvider;
|
||||
late SleepTimerProvider _sleepTimerProvider;
|
||||
late NavigationProvider _navigationProvider;
|
||||
|
||||
// Shared services
|
||||
late final CacheService _cacheService = CacheService();
|
||||
late final PositionTracker _positionTracker = PositionTracker();
|
||||
late ImageHelperService _imageHelper;
|
||||
|
||||
final _hardwareVolumeService = HardwareVolumeService();
|
||||
StreamSubscription? _volumeUpSub;
|
||||
StreamSubscription? _volumeDownSub;
|
||||
StreamSubscription? _absoluteVolumeSub;
|
||||
String? _lastSelectedPlayerId;
|
||||
String? _builtinPlayerId;
|
||||
|
||||
@@ -141,10 +164,91 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_musicProvider = MusicAssistantProvider();
|
||||
_themeProvider = ThemeProvider();
|
||||
_localeProvider = LocaleProvider();
|
||||
audioHandler.setProvider(_musicProvider);
|
||||
_navigationProvider = NavigationProvider();
|
||||
_sleepTimerProvider = SleepTimerProvider();
|
||||
|
||||
// Initialize connection provider first (others depend on it)
|
||||
_connectionProvider = ConnectionProvider();
|
||||
_uiStateProvider = UIStateProvider();
|
||||
|
||||
// Initialize shared image helper service
|
||||
_imageHelper = ImageHelperService(
|
||||
api: _connectionProvider.api,
|
||||
getCachedTrackForPlayer: (playerId) => _cacheService.getCachedTrackForPlayer(playerId),
|
||||
);
|
||||
|
||||
// Initialize library provider (needs API from connection)
|
||||
_libraryProvider = LibraryProvider(
|
||||
api: _connectionProvider.api,
|
||||
logger: DebugLogger(),
|
||||
cacheService: _cacheService,
|
||||
settings: null, // Will use static methods
|
||||
providerFilterService: ProviderFilterService(
|
||||
providerFilter: _connectionProvider.providerFilter,
|
||||
playerFilter: _connectionProvider.playerFilter,
|
||||
availableMusicProviders: [],
|
||||
artists: [],
|
||||
albums: [],
|
||||
tracks: [],
|
||||
podcasts: [],
|
||||
radioStations: [],
|
||||
),
|
||||
);
|
||||
|
||||
// Initialize local player provider
|
||||
_localPlayerProvider = LocalPlayerProvider(
|
||||
audioHandler: audioHandler,
|
||||
settings: null, // Will use static methods
|
||||
);
|
||||
|
||||
// Initialize player provider (depends on several others)
|
||||
// Note: queueManager will be set later to avoid circular dependency
|
||||
_playerProvider = PlayerProvider(
|
||||
api: _connectionProvider.api,
|
||||
logger: DebugLogger(),
|
||||
cacheService: _cacheService,
|
||||
settings: null, // Will use static methods
|
||||
positionTracker: _positionTracker,
|
||||
queueManager: null, // Will be set after initialization
|
||||
sleepTimerProvider: _sleepTimerProvider,
|
||||
imageHelper: _imageHelper,
|
||||
playerSyncState: PlayerSyncState(
|
||||
availablePlayers: [],
|
||||
castToSendspinIdMap: {},
|
||||
),
|
||||
audioHandler: audioHandler,
|
||||
);
|
||||
|
||||
// Create queue manager with functions that access provider state
|
||||
final queueManager = QueueManagerService(
|
||||
api: _connectionProvider.api,
|
||||
database: DatabaseService.instance,
|
||||
logger: DebugLogger(),
|
||||
getAvailablePlayers: () => _playerProvider.availablePlayers,
|
||||
getCastToSendspinMap: () => _playerProvider.castToSendspinIdMap,
|
||||
playTracks: (playerId, tracks, {int? startIndex, bool? clearQueue}) async {
|
||||
await _connectionProvider.api?.playTracks(playerId, tracks, startIndex: startIndex, clearQueue: clearQueue ?? true);
|
||||
},
|
||||
);
|
||||
|
||||
// Set the queue manager after creation (breaks circular dependency)
|
||||
_playerProvider.queueManager = queueManager;
|
||||
|
||||
// Initialize main provider (facade mode - sub-providers not yet wired)
|
||||
// Sub-providers have null API at construction time and no update mechanism,
|
||||
// so keep facade using its own internal logic until wiring is complete.
|
||||
_musicProvider = MusicAssistantProvider();
|
||||
|
||||
// Wire up player provider callbacks
|
||||
_playerProvider.onPlayerChanged = () {
|
||||
setState(() {}); // Trigger rebuild on player change
|
||||
};
|
||||
_playerProvider.onTrackChanged = () {
|
||||
setState(() {}); // Trigger rebuild on track change
|
||||
};
|
||||
|
||||
WidgetsBinding.instance.addObserver(this);
|
||||
_initHardwareVolumeControl();
|
||||
// Listen to player selection changes to toggle volume interception
|
||||
@@ -163,12 +267,6 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
|
||||
_volumeDownSub = _hardwareVolumeService.onVolumeDown.listen((_) {
|
||||
_adjustVolume(-_volumeStep);
|
||||
});
|
||||
|
||||
// Listen for absolute volume changes from lockscreen/background
|
||||
// (ContentObserver on system STREAM_MUSIC volume)
|
||||
_absoluteVolumeSub = _hardwareVolumeService.onAbsoluteVolumeChange.listen((volume) {
|
||||
_setAbsoluteVolume(volume);
|
||||
});
|
||||
} catch (e, stack) {
|
||||
_logger.error('Hardware volume init failed', context: 'VolumeInit', error: e, stackTrace: stack);
|
||||
}
|
||||
@@ -184,41 +282,18 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
|
||||
}
|
||||
|
||||
/// Enable/disable volume button interception based on selected player.
|
||||
/// Also manages the volume observer for lockscreen volume routing.
|
||||
Future<void> _updateVolumeInterception() async {
|
||||
final player = _musicProvider.selectedPlayer;
|
||||
final isBuiltinPlayer = _builtinPlayerId != null &&
|
||||
player?.playerId == _builtinPlayerId;
|
||||
_musicProvider.selectedPlayer?.playerId == _builtinPlayerId;
|
||||
await _hardwareVolumeService.setIntercepting(!isBuiltinPlayer);
|
||||
|
||||
// Start/stop volume observer for lockscreen volume changes.
|
||||
// When a remote/group player is active, observe system volume changes
|
||||
// so lockscreen hardware buttons route to the MA player.
|
||||
if (!isBuiltinPlayer && player != null) {
|
||||
// Get the effective volume to sync the system volume HUD
|
||||
final effectiveVolume = _musicProvider.groupVolumeManager.isGroupPlayer(player)
|
||||
? (_musicProvider.groupVolumeManager.getEffectiveVolumeLevel(
|
||||
player, _musicProvider.availablePlayersUnfiltered) ?? player.volume)
|
||||
: player.volume;
|
||||
await _hardwareVolumeService.startVolumeObserver(initialVolume: effectiveVolume);
|
||||
} else {
|
||||
await _hardwareVolumeService.stopVolumeObserver();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _adjustVolume(int delta) async {
|
||||
final player = _musicProvider.selectedPlayer;
|
||||
if (player == null) return;
|
||||
|
||||
// Use effective volume for group players (player.volume returns 0
|
||||
// because MA API returns null for group player volume_level)
|
||||
final currentVolume = _musicProvider.groupVolumeManager.isGroupPlayer(player)
|
||||
? (_musicProvider.groupVolumeManager.getEffectiveVolumeLevel(
|
||||
player, _musicProvider.availablePlayersUnfiltered) ?? player.volume)
|
||||
: player.volume;
|
||||
|
||||
final newVolume = (currentVolume + delta).clamp(0, 100);
|
||||
if (newVolume != currentVolume) {
|
||||
final newVolume = (player.volume + delta).clamp(0, 100);
|
||||
if (newVolume != player.volume) {
|
||||
try {
|
||||
await _musicProvider.setVolume(player.playerId, newVolume);
|
||||
} catch (e) {
|
||||
@@ -227,29 +302,11 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
|
||||
}
|
||||
}
|
||||
|
||||
/// Handle absolute volume change from lockscreen/background.
|
||||
/// Called when the ContentObserver detects a system volume change
|
||||
/// while a remote/group player is active.
|
||||
Future<void> _setAbsoluteVolume(int volume) async {
|
||||
final player = _musicProvider.selectedPlayer;
|
||||
if (player == null) return;
|
||||
|
||||
// Don't route to builtin player - that's handled by the system directly
|
||||
if (_builtinPlayerId != null && player.playerId == _builtinPlayerId) return;
|
||||
|
||||
try {
|
||||
await _musicProvider.setVolume(player.playerId, volume.clamp(0, 100));
|
||||
} catch (e) {
|
||||
_logger.error('Lockscreen volume change failed', context: 'VolumeControl', error: e);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_musicProvider.removeListener(_onProviderChanged);
|
||||
_volumeUpSub?.cancel();
|
||||
_volumeDownSub?.cancel();
|
||||
_absoluteVolumeSub?.cancel();
|
||||
_hardwareVolumeService.dispose();
|
||||
WidgetsBinding.instance.removeObserver(this);
|
||||
super.dispose();
|
||||
@@ -304,9 +361,21 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
|
||||
Widget build(BuildContext context) {
|
||||
return MultiProvider(
|
||||
providers: [
|
||||
// Core facade provider (will be removed after migration)
|
||||
ChangeNotifierProvider.value(value: _musicProvider),
|
||||
|
||||
// Theme providers
|
||||
ChangeNotifierProvider.value(value: _themeProvider),
|
||||
ChangeNotifierProvider.value(value: _localeProvider),
|
||||
ChangeNotifierProvider.value(value: _navigationProvider),
|
||||
|
||||
// New multi-provider architecture (available for gradual migration)
|
||||
ChangeNotifierProvider.value(value: _connectionProvider),
|
||||
ChangeNotifierProvider.value(value: _uiStateProvider),
|
||||
ChangeNotifierProvider.value(value: _libraryProvider),
|
||||
ChangeNotifierProvider.value(value: _playerProvider),
|
||||
ChangeNotifierProvider.value(value: _localPlayerProvider),
|
||||
ChangeNotifierProvider.value(value: _sleepTimerProvider),
|
||||
],
|
||||
child: Consumer2<ThemeProvider, LocaleProvider>(
|
||||
builder: (context, themeProvider, localeProvider, _) {
|
||||
@@ -511,98 +580,120 @@ class _AppStartupState extends State<AppStartup> {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_loadSettingsFirst();
|
||||
try {
|
||||
_loadSettingsFirst();
|
||||
} catch (e) {
|
||||
_logger.error('AppStartup init error: $e');
|
||||
// Fallback - mark as loaded so app can continue
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_settingsLoaded = true;
|
||||
_hasCompletedOnboarding = true;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Load settings BEFORE checking connection.
|
||||
/// This ensures we know if this is a first-time user before transitioning.
|
||||
Future<void> _loadSettingsFirst() async {
|
||||
// Load onboarding state first - this is critical for determining
|
||||
// when to transition to HomeScreen
|
||||
_hasCompletedOnboarding = await SettingsService.getHasCompletedOnboarding();
|
||||
try {
|
||||
// Load onboarding state first - this is critical for determining
|
||||
// when to transition to HomeScreen
|
||||
_hasCompletedOnboarding = await SettingsService.getHasCompletedOnboarding();
|
||||
|
||||
if (!mounted) return;
|
||||
if (!mounted) return;
|
||||
|
||||
setState(() {
|
||||
_settingsLoaded = true;
|
||||
});
|
||||
setState(() {
|
||||
_settingsLoaded = true;
|
||||
});
|
||||
|
||||
_logger.log('🚀 AppStartup: Settings loaded, hasCompletedOnboarding=$_hasCompletedOnboarding');
|
||||
_logger.log('🚀 AppStartup: Settings loaded, hasCompletedOnboarding=$_hasCompletedOnboarding');
|
||||
} catch (e) {
|
||||
_logger.error('AppStartup settings load error: $e');
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_settingsLoaded = true;
|
||||
_hasCompletedOnboarding = true; // Default to true on error
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Now check connection
|
||||
_checkAndConnect();
|
||||
}
|
||||
|
||||
Future<void> _checkAndConnect() async {
|
||||
final serverUrl = await SettingsService.getServerUrl();
|
||||
try {
|
||||
final serverUrl = await SettingsService.getServerUrl();
|
||||
|
||||
// DEBUG: Log where server URL is coming from
|
||||
_logger.log('🐛 DEBUG: Server URL from SharedPreferences: $serverUrl');
|
||||
if (!mounted) return;
|
||||
|
||||
if (!mounted) return;
|
||||
|
||||
setState(() {
|
||||
_savedServerUrl = serverUrl;
|
||||
});
|
||||
|
||||
// If we have a saved server URL, attempt auto-connection
|
||||
if (serverUrl != null && serverUrl.isNotEmpty) {
|
||||
_logger.log('🐛 DEBUG: Auto-connecting because server URL exists');
|
||||
setState(() {
|
||||
_isConnecting = true;
|
||||
_savedServerUrl = serverUrl;
|
||||
});
|
||||
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
// If we have a saved server URL, attempt auto-connection
|
||||
if (serverUrl != null && serverUrl.isNotEmpty) {
|
||||
setState(() {
|
||||
_isConnecting = true;
|
||||
});
|
||||
|
||||
// Connection is handled by MusicAssistantProvider._initialize()
|
||||
// Just wait for it to complete or timeout
|
||||
_logger.log('🚀 AppStartup: Waiting for provider auto-connection to $serverUrl');
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
|
||||
// For first-time users, we need to wait for both connection AND player selection
|
||||
// so the welcome overlay can appear immediately without home screen flash.
|
||||
// For returning users, just wait for connection.
|
||||
final needsWelcome = !_hasCompletedOnboarding;
|
||||
// Connection is handled by MusicAssistantProvider._initialize()
|
||||
// Just wait for it to complete or timeout
|
||||
_logger.log('🚀 AppStartup: Waiting for provider auto-connection to $serverUrl');
|
||||
|
||||
// Give the provider time to connect (it restores credentials and connects in _initialize)
|
||||
// Check connection state periodically
|
||||
for (var i = 0; i < 20; i++) {
|
||||
await Future.delayed(const Duration(milliseconds: 250));
|
||||
// For first-time users, we need to wait for both connection AND player selection
|
||||
// so the welcome overlay can appear immediately without home screen flash.
|
||||
// For returning users, just wait for connection.
|
||||
final needsWelcome = !_hasCompletedOnboarding;
|
||||
|
||||
if (needsWelcome) {
|
||||
// First-time user: wait for connection + player selection
|
||||
if (provider.isConnected && provider.selectedPlayer != null) {
|
||||
_logger.log('🚀 AppStartup: First-time user ready (connected + player selected)');
|
||||
break;
|
||||
// Give the provider time to connect (it restores credentials and connects in _initialize)
|
||||
// Check connection state periodically
|
||||
for (var i = 0; i < 20; i++) {
|
||||
await Future.delayed(const Duration(milliseconds: 250));
|
||||
|
||||
if (needsWelcome) {
|
||||
// First-time user: wait for connection + player selection
|
||||
if (provider.isConnected && provider.selectedPlayer != null) {
|
||||
_logger.log('🚀 AppStartup: First-time user ready (connected + player selected)');
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
// Returning user: just wait for connection
|
||||
if (provider.isConnected) {
|
||||
_logger.log('🚀 AppStartup: Connection established');
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Returning user: just wait for connection
|
||||
if (provider.isConnected) {
|
||||
_logger.log('🚀 AppStartup: Connection established');
|
||||
|
||||
if (provider.connectionState == MAConnectionState.error) {
|
||||
_logger.log('🚀 AppStartup: Connection failed with error');
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (provider.connectionState == MAConnectionState.error) {
|
||||
_logger.log('🚀 AppStartup: Connection failed with error');
|
||||
break;
|
||||
if (!provider.isConnected) {
|
||||
_logger.log('🚀 AppStartup: Connection still pending or failed');
|
||||
}
|
||||
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isConnecting = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (!provider.isConnected) {
|
||||
_logger.log('🚀 AppStartup: Connection still pending or failed');
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
_logger.error('AppStartup connection error: $e');
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isConnecting = false;
|
||||
_connectionAttempted = true;
|
||||
});
|
||||
}
|
||||
} else {
|
||||
setState(() {
|
||||
_connectionAttempted = true;
|
||||
});
|
||||
}
|
||||
_connectionAttempted = true;
|
||||
}
|
||||
|
||||
@override
|
||||
|
||||
@@ -0,0 +1,287 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import '../constants/timings.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../services/cache_service.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../services/library_status_service.dart';
|
||||
import '../services/music_assistant_api.dart';
|
||||
import '../services/provider_filter_service.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../services/sync_service.dart';
|
||||
|
||||
/// Provider for library data management.
|
||||
///
|
||||
/// Manages:
|
||||
/// - Artists, albums, tracks lists
|
||||
/// - Radio stations and podcasts
|
||||
/// - Library loading and refresh
|
||||
/// - Provider filtering
|
||||
/// - Background sync
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to isolate library logic.
|
||||
class LibraryProvider extends ChangeNotifier {
|
||||
final MusicAssistantAPI? _api;
|
||||
final DebugLogger _logger;
|
||||
final CacheService _cacheService;
|
||||
final SettingsService? _settings;
|
||||
final ProviderFilterService _providerFilterService;
|
||||
|
||||
// Library data
|
||||
List<dynamic> _artists = [];
|
||||
List<dynamic> _albums = [];
|
||||
List<dynamic> _tracks = [];
|
||||
List<dynamic> _radioStations = [];
|
||||
List<dynamic> _podcasts = [];
|
||||
|
||||
// Getters
|
||||
List<dynamic> get artists => _artists;
|
||||
List<dynamic> get albums => _albums;
|
||||
List<dynamic> get tracks => _tracks;
|
||||
List<dynamic> get radioStations => _radioStations;
|
||||
List<dynamic> get podcasts => _podcasts;
|
||||
|
||||
// Expose typed lists for convenience
|
||||
List<Artist> get artistList => _artists.cast<Artist>();
|
||||
List<Album> get albumList => _albums.cast<Album>();
|
||||
List<Track> get trackList => _tracks.cast<Track>();
|
||||
|
||||
// Callback for when library status changes
|
||||
Function()? onLibraryChanged;
|
||||
|
||||
LibraryProvider({
|
||||
required MusicAssistantAPI? api,
|
||||
required DebugLogger logger,
|
||||
required CacheService cacheService,
|
||||
SettingsService? settings,
|
||||
required ProviderFilterService providerFilterService,
|
||||
}) : _api = api,
|
||||
_logger = logger,
|
||||
_cacheService = cacheService,
|
||||
_settings = settings,
|
||||
_providerFilterService = providerFilterService;
|
||||
|
||||
/// Load library data from API with caching
|
||||
Future<void> loadLibrary() async {
|
||||
if (_api == null) return;
|
||||
|
||||
try {
|
||||
_logger.log('📚 Loading library from cache (instant)...');
|
||||
|
||||
// Load from database cache first (instant)
|
||||
final syncService = SyncService.instance;
|
||||
if (syncService.hasCache) {
|
||||
_albums = syncService.cachedAlbums;
|
||||
_artists = syncService.cachedArtists;
|
||||
_logger.log('📦 Loaded ${_albums.length} albums, ${_artists.length} artists from cache');
|
||||
_syncLibraryStatusToService();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
// Fetch tracks from API (not cached - too many items)
|
||||
try {
|
||||
_tracks = await _api!.getTracks(
|
||||
limit: LibraryConstants.maxLibraryItems,
|
||||
providerInstanceIds: _providerIdsForApiCalls(),
|
||||
);
|
||||
_logger.log('📥 Fetched ${_tracks.length} tracks from MA');
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to fetch tracks: $e');
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
|
||||
// Trigger background sync (non-blocking)
|
||||
_syncLibraryInBackground();
|
||||
} catch (e) {
|
||||
_logger.log('❌ Error loading library: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// Load artists from library
|
||||
Future<void> loadArtists({int? limit, int? offset, String? search, String? orderBy}) async {
|
||||
if (_api == null) return;
|
||||
|
||||
try {
|
||||
final artists = await _api!.getArtists(
|
||||
limit: limit ?? LibraryConstants.maxLibraryItems,
|
||||
offset: offset,
|
||||
search: search,
|
||||
albumArtistsOnly: false,
|
||||
orderBy: orderBy,
|
||||
);
|
||||
|
||||
// Update SyncService cache
|
||||
SyncService.instance.updateCachedArtists(artists);
|
||||
|
||||
_artists = artists;
|
||||
_syncLibraryStatusToService();
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to load artists: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// Load albums from library
|
||||
Future<void> loadAlbums({int? limit, int? offset, String? search, String? artistId, String? orderBy}) async {
|
||||
if (_api == null) return;
|
||||
|
||||
try {
|
||||
final albums = await _api!.getAlbums(
|
||||
limit: limit ?? LibraryConstants.maxLibraryItems,
|
||||
offset: offset,
|
||||
search: search,
|
||||
artistId: artistId,
|
||||
orderBy: orderBy,
|
||||
);
|
||||
|
||||
// Update SyncService cache
|
||||
SyncService.instance.updateCachedAlbums(albums);
|
||||
|
||||
_albums = albums;
|
||||
_syncLibraryStatusToService();
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to load albums: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// Load radio stations
|
||||
Future<void> loadRadioStations({String? orderBy}) async {
|
||||
if (_api == null) return;
|
||||
|
||||
try {
|
||||
_radioStations = await _api!.getRadioStations(limit: 100, orderBy: orderBy);
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to load radio stations: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// Load podcasts
|
||||
Future<void> loadPodcasts({String? orderBy}) async {
|
||||
if (_api == null) return;
|
||||
|
||||
try {
|
||||
_podcasts = await _api!.getPodcasts(limit: 100, orderBy: orderBy);
|
||||
_logger.log('🎙️ Loaded ${_podcasts.length} podcasts');
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to load podcasts: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// Get playlists with provider filtering
|
||||
Future<List<Playlist>> getPlaylists({int? limit, bool? favoriteOnly, String? orderBy}) async {
|
||||
if (_api == null) return [];
|
||||
try {
|
||||
final playlists = await _api!.getPlaylists(limit: limit, favoriteOnly: favoriteOnly, orderBy: orderBy);
|
||||
return _providerFilterService.filterByProvider(playlists);
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to fetch playlists: $e');
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
/// Get audiobooks with provider filtering
|
||||
Future<List<Audiobook>> getAudiobooks({int? limit, bool? favoriteOnly}) async {
|
||||
if (_api == null) return [];
|
||||
try {
|
||||
final audiobooks = await _api!.getAudiobooks(limit: limit, favoriteOnly: favoriteOnly ?? false);
|
||||
return _providerFilterService.filterByProvider(audiobooks);
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to fetch audiobooks: $e');
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
/// Sync library data in background without blocking UI
|
||||
void _syncLibraryInBackground() {
|
||||
if (_api == null) return;
|
||||
|
||||
final syncService = SyncService.instance;
|
||||
|
||||
// Listen for sync completion to update our lists
|
||||
void onSyncComplete() {
|
||||
if (syncService.status == SyncStatus.completed) {
|
||||
_albums = syncService.cachedAlbums;
|
||||
_artists = syncService.cachedArtists;
|
||||
_logger.log('🔄 Updated library from background sync: ${_albums.length} albums, ${_artists.length} artists');
|
||||
_syncLibraryStatusToService();
|
||||
notifyListeners();
|
||||
onLibraryChanged?.call();
|
||||
}
|
||||
syncService.removeListener(onSyncComplete);
|
||||
}
|
||||
|
||||
syncService.addListener(onSyncComplete);
|
||||
syncService.syncFromApi(_api!, providerInstanceIds: _providerIdsForApiCalls());
|
||||
}
|
||||
|
||||
/// Sync library status to centralized service for reactive UI updates
|
||||
void _syncLibraryStatusToService() {
|
||||
final service = LibraryStatusService.instance;
|
||||
|
||||
service.syncFromLibrary(
|
||||
mediaType: 'album',
|
||||
items: _albums,
|
||||
getInLibrary: (a) => (a as Album).inLibrary,
|
||||
getFavorite: (a) => (a as Album).favorite ?? false,
|
||||
getProvider: (a) => (a as Album).provider,
|
||||
getItemId: (a) => (a as Album).itemId,
|
||||
);
|
||||
|
||||
service.syncFromLibrary(
|
||||
mediaType: 'artist',
|
||||
items: _artists,
|
||||
getInLibrary: (a) => (a as Artist).inLibrary,
|
||||
getFavorite: (a) => (a as Artist).favorite ?? false,
|
||||
getProvider: (a) => (a as Artist).provider,
|
||||
getItemId: (a) => (a as Artist).itemId,
|
||||
);
|
||||
|
||||
service.syncFromLibrary(
|
||||
mediaType: 'track',
|
||||
items: _tracks,
|
||||
getInLibrary: (t) => (t as Track).inLibrary,
|
||||
getFavorite: (t) => (t as Track).favorite ?? false,
|
||||
getProvider: (t) => (t as Track).provider,
|
||||
getItemId: (t) => (t as Track).itemId,
|
||||
);
|
||||
}
|
||||
|
||||
/// Get provider instance IDs for API calls (respects user filter)
|
||||
List<String> _providerIdsForApiCalls() {
|
||||
// For now, always return empty list to use all available providers
|
||||
// Provider filtering can be re-enabled later with async approach
|
||||
return [];
|
||||
}
|
||||
|
||||
/// Update the API reference
|
||||
void setApi(MusicAssistantAPI? api) {
|
||||
if (_api != api) {
|
||||
// Note: We don't dispose the old API here as it's managed by ConnectionProvider
|
||||
// This is just updating the reference
|
||||
}
|
||||
}
|
||||
|
||||
/// Load library from cache for instant display
|
||||
Future<void> loadFromCache() async {
|
||||
try {
|
||||
final syncService = SyncService.instance;
|
||||
|
||||
if (!syncService.hasCache) {
|
||||
await syncService.loadFromCache();
|
||||
}
|
||||
|
||||
if (syncService.hasCache) {
|
||||
_albums = syncService.cachedAlbums;
|
||||
_artists = syncService.cachedArtists;
|
||||
_logger.log('📦 Pre-loaded library: ${_albums.length} albums, ${_artists.length} artists');
|
||||
_syncLibraryStatusToService();
|
||||
notifyListeners();
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Error loading library from cache: $e');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,371 @@
|
||||
import 'dart:async';
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:audio_service/audio_service.dart' as audio_service;
|
||||
import 'package:flutter/foundation.dart';
|
||||
import '../constants/timings.dart';
|
||||
import '../services/audio/massiv_audio_handler.dart';
|
||||
import '../services/auth/auth_manager.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../services/device_id_service.dart';
|
||||
import '../services/local_player_service.dart';
|
||||
import '../services/pcm_audio_player.dart';
|
||||
import '../services/sendspin_service.dart';
|
||||
import '../services/settings_service.dart';
|
||||
|
||||
/// Provider for local audio playback and Sendspin integration.
|
||||
///
|
||||
/// Manages:
|
||||
/// - LocalPlayerService for audio playback
|
||||
/// - SendspinService integration (MA 2.7.0b20+)
|
||||
/// - PcmAudioPlayer for raw audio streaming
|
||||
/// - Player registration with Music Assistant
|
||||
/// - Volume and power control
|
||||
/// - Event handling from Sendspin
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to isolate local player logic.
|
||||
class LocalPlayerProvider extends ChangeNotifier {
|
||||
final AuthManager _authManager;
|
||||
final DebugLogger _logger;
|
||||
final SettingsService? _settings;
|
||||
|
||||
// Local player service
|
||||
late final LocalPlayerService _localPlayer;
|
||||
|
||||
// Sendspin service (MA 2.7.0b20+ replacement for builtin_player)
|
||||
SendspinService? _sendspinService;
|
||||
bool _sendspinConnected = false;
|
||||
|
||||
// PCM audio player for raw Sendspin audio streaming
|
||||
PcmAudioPlayer? _pcmAudioPlayer;
|
||||
|
||||
// Local player state
|
||||
bool _isLocalPlayerPowered = true;
|
||||
int _localPlayerVolume = VolumeConstants.max;
|
||||
bool _builtinPlayerAvailable = true;
|
||||
|
||||
// State reporting timer
|
||||
Timer? _localPlayerStateReportTimer;
|
||||
|
||||
// Audio handler (from audio_service package)
|
||||
final MassivAudioHandler _audioHandler;
|
||||
|
||||
// Server info
|
||||
String? _serverUrl;
|
||||
|
||||
// Callbacks
|
||||
Function()? onSendspinConnected;
|
||||
Function()? onSendspinDisconnected;
|
||||
Function(Map<String, dynamic>)? onLocalPlayerEvent;
|
||||
|
||||
LocalPlayerProvider({
|
||||
AuthManager? authManager,
|
||||
DebugLogger? logger,
|
||||
SettingsService? settings,
|
||||
required MassivAudioHandler audioHandler,
|
||||
}) : _authManager = authManager ?? AuthManager(),
|
||||
_logger = logger ?? DebugLogger(),
|
||||
_settings = settings,
|
||||
_audioHandler = audioHandler {
|
||||
_localPlayer = LocalPlayerService(_authManager);
|
||||
}
|
||||
|
||||
// Getters
|
||||
bool get isLocalPlayerPowered => _isLocalPlayerPowered;
|
||||
int get localPlayerVolume => _localPlayerVolume;
|
||||
bool get sendspinConnected => _sendspinConnected;
|
||||
bool get builtinPlayerAvailable => _builtinPlayerAvailable;
|
||||
bool get isPcmPlaying => _sendspinConnected && _pcmAudioPlayer != null && _pcmAudioPlayer!.isPlaying;
|
||||
LocalPlayerService get localPlayer => _localPlayer;
|
||||
SendspinService? get sendspinService => _sendspinService;
|
||||
PcmAudioPlayer? get pcmAudioPlayer => _pcmAudioPlayer;
|
||||
|
||||
// ============================================================================
|
||||
// INITIALIZATION
|
||||
// ============================================================================
|
||||
|
||||
/// Initialize local playback engine
|
||||
Future<void> initialize() async {
|
||||
await _localPlayer.initialize();
|
||||
_isLocalPlayerPowered = true;
|
||||
|
||||
// Wire up notification button callbacks
|
||||
_wireNotificationCallbacks();
|
||||
|
||||
_logger.log('🔊 Local player initialized');
|
||||
}
|
||||
|
||||
/// Register the built-in/local player with Music Assistant
|
||||
Future<String?> registerLocalPlayer() async {
|
||||
if (_serverUrl == null) {
|
||||
_logger.log('⚠️ Cannot register player: no server URL');
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
final deviceId = await DeviceIdService.getOrCreateDevicePlayerId();
|
||||
final ownerName = await SettingsService.getOwnerName() ?? 'Ensemble User';
|
||||
|
||||
_logger.log('📱 Registering local player: $deviceId');
|
||||
|
||||
// Check if server uses Sendspin (MA 2.7.0b20+)
|
||||
if (_serverUsesSendspin()) {
|
||||
return await _registerSendspinPlayer(deviceId, ownerName);
|
||||
} else {
|
||||
return await _registerBuiltinPlayer(deviceId, ownerName);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to register local player: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Check if server version is >= 2.7.0b20 (uses Sendspin)
|
||||
bool _serverUsesSendspin() {
|
||||
// This would check the server version from API
|
||||
// For now, we'll try both methods
|
||||
return true; // Default to Sendspin for modern MA
|
||||
}
|
||||
|
||||
/// Register using Sendspin protocol (MA 2.7.0b20+)
|
||||
Future<String?> _registerSendspinPlayer(String deviceId, String ownerName) async {
|
||||
_logger.log('📡 Registering via Sendspin protocol...');
|
||||
|
||||
try {
|
||||
// Initialize Sendspin service
|
||||
_sendspinService = SendspinService(_serverUrl!);
|
||||
_builtinPlayerAvailable = false;
|
||||
|
||||
// Initialize PCM audio player
|
||||
_pcmAudioPlayer = PcmAudioPlayer();
|
||||
final pcmInitialized = await _pcmAudioPlayer!.initialize();
|
||||
if (!pcmInitialized) {
|
||||
_logger.log('⚠️ Failed to initialize PCM audio player');
|
||||
}
|
||||
|
||||
// Connect Sendspin events
|
||||
_wireSendspinEvents();
|
||||
|
||||
// Try direct connection first
|
||||
final localSendspinUrl = '$_serverUrl/sendspin/$deviceId';
|
||||
final connected = await _sendspinService!.connectWithUrl(localSendspinUrl);
|
||||
|
||||
if (!connected) {
|
||||
// Try proxy connection
|
||||
final proxyUrl = '$_serverUrl/sendspin/proxy/$deviceId';
|
||||
final proxyConnected = await _sendspinService!.connectWithUrl(proxyUrl, useProxyAuth: true);
|
||||
if (!proxyConnected) {
|
||||
_logger.log('⚠️ Sendspin connection failed, will retry on connect');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// Connect PCM audio player to Sendspin audio stream
|
||||
if (_pcmAudioPlayer != null && pcmInitialized) {
|
||||
await _pcmAudioPlayer!.connectToStream(_sendspinService!.audioDataStream);
|
||||
}
|
||||
|
||||
_sendspinConnected = true;
|
||||
_startStateReporting();
|
||||
onSendspinConnected?.call();
|
||||
|
||||
_logger.log('✅ Sendspin player registered: $deviceId');
|
||||
return deviceId;
|
||||
} catch (e) {
|
||||
_logger.log('❌ Sendspin registration failed: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Register using legacy builtin_player protocol
|
||||
Future<String?> _registerBuiltinPlayer(String deviceId, String ownerName) async {
|
||||
_logger.log('📻 Registering via builtin_player protocol...');
|
||||
// Legacy registration would go here
|
||||
return deviceId;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// SENDSPIN EVENT HANDLERS
|
||||
// ============================================================================
|
||||
|
||||
void _wireSendspinEvents() {
|
||||
if (_sendspinService == null) return;
|
||||
|
||||
_sendspinService!.onPlay = _handleSendspinPlay;
|
||||
_sendspinService!.onPause = _handleSendspinPause;
|
||||
_sendspinService!.onStop = _handleSendspinStop;
|
||||
_sendspinService!.onSeek = _handleSendspinSeek;
|
||||
_sendspinService!.onVolume = _handleSendspinVolume;
|
||||
_sendspinService!.onStreamStart = _handleSendspinStreamStart;
|
||||
_sendspinService!.onStreamEnd = _handleSendspinStreamEnd;
|
||||
}
|
||||
|
||||
void _handleSendspinPlay(String streamUrl, Map<String, dynamic> trackInfo) {
|
||||
_logger.log('📡 Sendspin: Play $streamUrl');
|
||||
_pcmAudioPlayer?.play();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _handleSendspinPause() {
|
||||
_logger.log('📡 Sendspin: Pause');
|
||||
_pcmAudioPlayer?.pause();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _handleSendspinStop() {
|
||||
_logger.log('📡 Sendspin: Stop');
|
||||
_pcmAudioPlayer?.stop();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _handleSendspinSeek(int positionSeconds) {
|
||||
_logger.log('📡 Sendspin: Seek to $positionSeconds');
|
||||
_pcmAudioPlayer?.resetPosition();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _handleSendspinVolume(int volumeLevel) {
|
||||
_logger.log('📡 Sendspin: Set volume to $volumeLevel');
|
||||
_localPlayerVolume = volumeLevel;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _handleSendspinStreamStart(Map<String, dynamic>? trackInfo) {
|
||||
_logger.log('📡 Sendspin: Stream start');
|
||||
_pcmAudioPlayer?.play();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _handleSendspinStreamEnd() {
|
||||
_logger.log('📡 Sendspin: Stream end');
|
||||
_pcmAudioPlayer?.stop();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// LOCAL PLAYER CONTROLS
|
||||
// ============================================================================
|
||||
|
||||
Future<void> setPower(bool powered) async {
|
||||
_isLocalPlayerPowered = powered;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> setVolume(int volumeLevel) async {
|
||||
_localPlayerVolume = volumeLevel;
|
||||
_localPlayer.setVolume(volumeLevel / 100);
|
||||
|
||||
// Report to Sendspin if connected
|
||||
if (_sendspinConnected && _sendspinService != null) {
|
||||
_sendspinService!.reportState(volume: volumeLevel);
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> playUrl(String url) async {
|
||||
await _localPlayer.playUrl(url);
|
||||
|
||||
// Report to Sendspin if connected
|
||||
if (_sendspinConnected && _sendspinService != null) {
|
||||
_sendspinService!.reportState(playing: true, paused: false);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> pause() async {
|
||||
await _localPlayer.pause();
|
||||
|
||||
if (_sendspinConnected && _sendspinService != null) {
|
||||
_sendspinService!.reportState(playing: false, paused: true);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> stop() async {
|
||||
await _localPlayer.stop();
|
||||
|
||||
if (_sendspinConnected && _sendspinService != null) {
|
||||
_sendspinService!.reportState(playing: false, paused: false);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> seek(Duration position) async {
|
||||
await _localPlayer.seek(position);
|
||||
|
||||
if (_sendspinConnected && _sendspinService != null) {
|
||||
_sendspinService!.reportState(position: position.inSeconds);
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// NOTIFICATION CALLBACKS
|
||||
// ============================================================================
|
||||
|
||||
void _wireNotificationCallbacks() {
|
||||
_audioHandler.onPlay = () {
|
||||
_logger.log('🎵 Notification: Play pressed');
|
||||
// This would be handled by PlayerProvider
|
||||
};
|
||||
_audioHandler.onPause = () {
|
||||
_logger.log('🎵 Notification: Pause pressed');
|
||||
// This would be handled by PlayerProvider
|
||||
};
|
||||
_audioHandler.onSkipToNext = () {
|
||||
_logger.log('🎵 Notification: Skip to next pressed');
|
||||
// This would be handled by PlayerProvider
|
||||
};
|
||||
_audioHandler.onSkipToPrevious = () {
|
||||
_logger.log('🎵 Notification: Skip to previous pressed');
|
||||
// This would be handled by PlayerProvider
|
||||
};
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// STATE REPORTING
|
||||
// ============================================================================
|
||||
|
||||
void _startStateReporting() {
|
||||
_localPlayerStateReportTimer?.cancel();
|
||||
_localPlayerStateReportTimer = Timer.periodic(
|
||||
Timings.localPlayerReportInterval,
|
||||
(_) => _reportState(),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _reportState() async {
|
||||
if (!_sendspinConnected || _sendspinService == null) return;
|
||||
|
||||
final isPlaying = _localPlayer.isPlaying;
|
||||
final position = _localPlayer.position.inSeconds;
|
||||
final volume = _localPlayerVolume;
|
||||
final muted = _localPlayerVolume == 0;
|
||||
|
||||
_sendspinService!.reportState(
|
||||
playing: isPlaying,
|
||||
paused: !isPlaying,
|
||||
position: position,
|
||||
volume: volume,
|
||||
muted: muted,
|
||||
);
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// SERVER URL MANAGEMENT
|
||||
// ============================================================================
|
||||
|
||||
void setServerUrl(String? serverUrl) {
|
||||
_serverUrl = serverUrl;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// CLEANUP
|
||||
// ============================================================================
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_localPlayerStateReportTimer?.cancel();
|
||||
_pcmAudioPlayer?.dispose();
|
||||
_sendspinService?.dispose();
|
||||
_localPlayer.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -17,14 +17,14 @@ class NavigationProvider extends ChangeNotifier {
|
||||
if (previousIndex != index) {
|
||||
_selectedIndex = index;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
// Trigger search focus callback when switching to or re-tapping search tab
|
||||
if (index == 2 && onSearchTabSelected != null) {
|
||||
// Use post-frame callback to ensure SearchScreen is built first
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
onSearchTabSelected?.call();
|
||||
});
|
||||
// Trigger search focus callback when switching to search tab
|
||||
if (index == 2 && onSearchTabSelected != null) {
|
||||
// Use post-frame callback to ensure SearchScreen is built first
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
onSearchTabSelected?.call();
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,604 @@
|
||||
import 'dart:async';
|
||||
import 'dart:ui';
|
||||
|
||||
import 'package:audio_service/audio_service.dart' as audio_service;
|
||||
import 'package:flutter/foundation.dart';
|
||||
import '../constants/timings.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../models/player.dart';
|
||||
import '../providers/sleep_timer_provider.dart';
|
||||
import '../services/audio/massiv_audio_handler.dart';
|
||||
import '../services/cache_service.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../services/database_service.dart';
|
||||
import '../services/image_helper_service.dart';
|
||||
import '../services/local_player_service.dart';
|
||||
import '../services/music_assistant_api.dart';
|
||||
import '../services/position_tracker.dart';
|
||||
import '../services/queue_manager_service.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../utils/player_sort_utility.dart';
|
||||
import '../utils/player_sync_state.dart';
|
||||
|
||||
/// Provider for player management and playback controls.
|
||||
///
|
||||
/// Manages:
|
||||
/// - Player selection and available players list
|
||||
/// - Current playback state and track
|
||||
/// - Play/pause/stop/next/previous/seek controls
|
||||
/// - Queue operations
|
||||
/// - Position tracking
|
||||
/// - Sleep timer integration
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to isolate player logic.
|
||||
class PlayerProvider extends ChangeNotifier {
|
||||
final MusicAssistantAPI? _api;
|
||||
final DebugLogger _logger;
|
||||
final CacheService _cacheService;
|
||||
final SettingsService? _settings;
|
||||
final PositionTracker _positionTracker;
|
||||
QueueManagerService? _queueManager;
|
||||
final SleepTimerProvider _sleepTimerProvider;
|
||||
final ImageHelperService _imageHelper;
|
||||
final PlayerSyncState _playerSyncState;
|
||||
|
||||
// Player state
|
||||
Player? _selectedPlayer;
|
||||
List<Player> _availablePlayers = [];
|
||||
Map<String, String> _castToSendspinIdMap = {};
|
||||
bool _selectPlayerInProgress = false;
|
||||
|
||||
// Current playback
|
||||
Track? _currentTrack;
|
||||
Audiobook? _currentAudiobook;
|
||||
String? _currentPodcastName;
|
||||
TrackMetadata? _pendingTrackMetadata;
|
||||
TrackMetadata? _currentNotificationMetadata;
|
||||
|
||||
// Timers
|
||||
Timer? _playerStateTimer;
|
||||
Timer? _notificationPositionTimer;
|
||||
Timer? _idleServiceTimer;
|
||||
|
||||
// Audio handler (MassivAudioHandler for custom notification methods)
|
||||
final MassivAudioHandler _audioHandler;
|
||||
|
||||
// Callbacks for coordination
|
||||
Function()? onPlayerChanged;
|
||||
Function()? onTrackChanged;
|
||||
Function()? onAudiobookChanged;
|
||||
|
||||
PlayerProvider({
|
||||
required MusicAssistantAPI? api,
|
||||
required DebugLogger logger,
|
||||
required CacheService cacheService,
|
||||
SettingsService? settings,
|
||||
required PositionTracker positionTracker,
|
||||
QueueManagerService? queueManager,
|
||||
required SleepTimerProvider sleepTimerProvider,
|
||||
required ImageHelperService imageHelper,
|
||||
required PlayerSyncState playerSyncState,
|
||||
required MassivAudioHandler audioHandler,
|
||||
}) : _api = api,
|
||||
_logger = logger,
|
||||
_cacheService = cacheService,
|
||||
_settings = settings,
|
||||
_positionTracker = positionTracker,
|
||||
_queueManager = queueManager,
|
||||
_sleepTimerProvider = sleepTimerProvider,
|
||||
_imageHelper = imageHelper,
|
||||
_playerSyncState = playerSyncState,
|
||||
_audioHandler = audioHandler {
|
||||
// Connect position tracker to sleep timer
|
||||
_positionTracker.positionStream.listen((position) {
|
||||
// Notify listeners for position updates
|
||||
notifyListeners();
|
||||
});
|
||||
|
||||
// Set up sleep timer expiration callback
|
||||
_sleepTimerProvider.onExpired = () {
|
||||
pausePlayer(_selectedPlayer?.playerId ?? '');
|
||||
};
|
||||
}
|
||||
|
||||
// Getters
|
||||
Player? get selectedPlayer => _selectedPlayer;
|
||||
List<Player> get availablePlayers => _availablePlayers;
|
||||
Track? get currentTrack => _currentTrack;
|
||||
Audiobook? get currentAudiobook => _currentAudiobook;
|
||||
String? get currentPodcastName => _currentPodcastName;
|
||||
bool get selectPlayerInProgress => _selectPlayerInProgress;
|
||||
Map<String, String> get castToSendspinIdMap => _castToSendspinIdMap;
|
||||
|
||||
/// Set the queue manager (can be set after initialization to avoid circular deps)
|
||||
set queueManager(QueueManagerService? manager) {
|
||||
_queueManager = manager;
|
||||
}
|
||||
|
||||
bool get isPlaying => _selectedPlayer?.state == 'playing';
|
||||
bool get isPaused => _selectedPlayer?.state == 'paused';
|
||||
bool get isStopped => _selectedPlayer?.state == 'idle' ||
|
||||
_selectedPlayer?.state == 'off' ||
|
||||
_selectedPlayer == null;
|
||||
|
||||
String? get currentArtworkUrl {
|
||||
if (_currentTrack != null) {
|
||||
return _imageHelper.getImageUrl(_currentTrack!, size: ImageSizes.highRes);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// PLAYER LOADING AND SELECTION
|
||||
// ============================================================================
|
||||
|
||||
/// Load players and auto-select the best one
|
||||
Future<void> loadAndSelectPlayers({bool forceRefresh = false, bool coldStart = false}) async {
|
||||
try {
|
||||
// Check cache validity
|
||||
if (!forceRefresh &&
|
||||
!coldStart &&
|
||||
_cacheService.isPlayersCacheValid() &&
|
||||
_availablePlayers.isNotEmpty) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Load Cast-to-Sendspin mappings
|
||||
await _loadCastToSendspinMappings();
|
||||
|
||||
final allPlayers = await getPlayers();
|
||||
final builtinPlayerId = await SettingsService.getBuiltinPlayerId();
|
||||
|
||||
_logger.log('🎛️ getPlayers returned ${allPlayers.length} players');
|
||||
|
||||
// Filter players
|
||||
_availablePlayers = _filterPlayers(allPlayers, builtinPlayerId);
|
||||
|
||||
// Handle Cast/Sendspin player switching
|
||||
await _handleSendspinPlayers();
|
||||
|
||||
// Sort players
|
||||
final smartSort = await SettingsService.getSmartSortPlayers();
|
||||
_sortPlayersSync(smartSort, builtinPlayerId);
|
||||
|
||||
// Auto-select player if none selected or on cold start
|
||||
if (_selectedPlayer == null || coldStart) {
|
||||
final playerToSelect = _selectBestPlayer(builtinPlayerId);
|
||||
if (playerToSelect != null) {
|
||||
await selectPlayer(playerToSelect);
|
||||
}
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
_logger.log('❌ Error loading players: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// Get all players from API
|
||||
Future<List<Player>> getPlayers() async {
|
||||
return await _api?.getPlayers() ?? [];
|
||||
}
|
||||
|
||||
/// Select a player as the active player
|
||||
Future<void> selectPlayer(Player player, {bool skipNotify = false}) async {
|
||||
if (_selectPlayerInProgress) {
|
||||
_logger.log('⚠️ selectPlayer already in progress, skipping');
|
||||
return;
|
||||
}
|
||||
_selectPlayerInProgress = true;
|
||||
|
||||
try {
|
||||
_selectedPlayer = player;
|
||||
|
||||
// Cache selection
|
||||
_cacheService.setCachedSelectedPlayer(player);
|
||||
await SettingsService.setLastSelectedPlayerId(player.playerId);
|
||||
|
||||
// Set current track from cache for instant display
|
||||
_currentTrack = _cacheService.getCachedTrackForPlayer(player.playerId);
|
||||
|
||||
// Initialize position tracker
|
||||
_positionTracker.onPlayerSelected(player.playerId);
|
||||
if (!player.isExternalSource) {
|
||||
_positionTracker.updateFromServer(
|
||||
playerId: player.playerId,
|
||||
position: player.elapsedTime ?? 0.0,
|
||||
isPlaying: player.state == 'playing',
|
||||
duration: _currentTrack?.duration,
|
||||
serverTimestamp: player.elapsedTimeLastUpdated,
|
||||
);
|
||||
}
|
||||
|
||||
// Update audio handler notification
|
||||
await _updateNotificationForPlayer(player);
|
||||
|
||||
// Start player state polling
|
||||
_startPlayerStatePolling();
|
||||
_manageNotificationPositionTimer();
|
||||
|
||||
if (!skipNotify) {
|
||||
notifyListeners();
|
||||
onPlayerChanged?.call();
|
||||
}
|
||||
} finally {
|
||||
_selectPlayerInProgress = false;
|
||||
}
|
||||
}
|
||||
|
||||
/// Update audio handler notification for the selected player
|
||||
Future<void> _updateNotificationForPlayer(Player player) async {
|
||||
final builtinPlayerId = await SettingsService.getBuiltinPlayerId();
|
||||
final isBuiltinPlayer = builtinPlayerId != null && player.playerId == builtinPlayerId;
|
||||
|
||||
if (isBuiltinPlayer) {
|
||||
_audioHandler.setLocalMode();
|
||||
if (_currentTrack != null && (player.state == 'playing' || player.state == 'paused')) {
|
||||
final track = _currentTrack!;
|
||||
final artworkUrl = _imageHelper.getImageUrl(track, size: ImageSizes.highRes);
|
||||
final artistWithPlayer = track.artistsString.isNotEmpty
|
||||
? '${track.artistsString} • ${player.name}'
|
||||
: player.name;
|
||||
final mediaItem = audio_service.MediaItem(
|
||||
id: track.uri ?? track.itemId,
|
||||
title: track.name,
|
||||
artist: artistWithPlayer,
|
||||
album: track.album?.name ?? '',
|
||||
duration: track.duration,
|
||||
artUri: artworkUrl != null ? Uri.tryParse(artworkUrl) : null,
|
||||
);
|
||||
_audioHandler.updateLocalModeNotification(
|
||||
item: mediaItem,
|
||||
playing: player.state == 'playing',
|
||||
duration: track.duration,
|
||||
);
|
||||
} else if (player.state == 'playing' || player.state == 'paused') {
|
||||
final mediaItem = audio_service.MediaItem(
|
||||
id: 'player_${player.playerId}',
|
||||
title: player.name,
|
||||
artist: 'Loading...',
|
||||
);
|
||||
_audioHandler.updateLocalModeNotification(
|
||||
item: mediaItem,
|
||||
playing: player.state == 'playing',
|
||||
);
|
||||
} else {
|
||||
_audioHandler.clearRemotePlaybackState();
|
||||
_startIdleServiceTimer();
|
||||
}
|
||||
} else {
|
||||
// Remote player
|
||||
if (_currentTrack != null && (player.state == 'playing' || player.state == 'paused')) {
|
||||
final track = _currentTrack!;
|
||||
final artworkUrl = _imageHelper.getImageUrl(track, size: ImageSizes.highRes);
|
||||
final artistWithPlayer = track.artistsString.isNotEmpty
|
||||
? '${track.artistsString} • ${player.name}'
|
||||
: player.name;
|
||||
final mediaItem = audio_service.MediaItem(
|
||||
id: track.uri ?? track.itemId,
|
||||
title: track.name,
|
||||
artist: artistWithPlayer,
|
||||
album: track.album?.name ?? '',
|
||||
duration: track.duration,
|
||||
artUri: artworkUrl != null ? Uri.tryParse(artworkUrl) : null,
|
||||
);
|
||||
final position = _positionTracker.currentPosition;
|
||||
_cancelIdleServiceTimer();
|
||||
_audioHandler.setRemotePlaybackState(
|
||||
item: mediaItem,
|
||||
playing: player.state == 'playing',
|
||||
position: position,
|
||||
duration: track.duration,
|
||||
);
|
||||
} else if (player.state == 'playing' || player.state == 'paused') {
|
||||
final mediaItem = audio_service.MediaItem(
|
||||
id: 'player_${player.playerId}',
|
||||
title: player.name,
|
||||
artist: 'Loading...',
|
||||
);
|
||||
final position = _positionTracker.currentPosition;
|
||||
_cancelIdleServiceTimer();
|
||||
_audioHandler.setRemotePlaybackState(
|
||||
item: mediaItem,
|
||||
playing: player.state == 'playing',
|
||||
position: position,
|
||||
duration: Duration.zero,
|
||||
);
|
||||
} else {
|
||||
_audioHandler.clearRemotePlaybackState();
|
||||
_startIdleServiceTimer();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// PLAYBACK CONTROLS
|
||||
// ============================================================================
|
||||
|
||||
Future<void> playPauseSelectedPlayer() async {
|
||||
if (_selectedPlayer == null) return;
|
||||
final playerId = _selectedPlayer!.playerId;
|
||||
if (_selectedPlayer?.state == 'playing') {
|
||||
await pausePlayer(playerId);
|
||||
} else {
|
||||
await playPlayer(playerId);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> playPlayer(String playerId) async {
|
||||
try {
|
||||
await _api?.resumePlayer(playerId);
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to play: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> pausePlayer(String playerId) async {
|
||||
try {
|
||||
await _api?.pausePlayer(playerId);
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to pause: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> stopPlayer(String playerId) async {
|
||||
try {
|
||||
await _api?.stopPlayer(playerId);
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to stop: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> nextTrack(String playerId) async {
|
||||
try {
|
||||
await _api?.nextTrack(playerId);
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to skip to next: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> previousTrack(String playerId) async {
|
||||
try {
|
||||
await _api?.previousTrack(playerId);
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to go to previous: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> seek(String playerId, int positionSeconds) async {
|
||||
try {
|
||||
await _api?.seek(playerId, positionSeconds);
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to seek: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> seekRelative(String playerId, int deltaSeconds) async {
|
||||
final currentPosition = _positionTracker.currentPosition.inSeconds;
|
||||
await seek(playerId, (currentPosition + deltaSeconds).clamp(0, double.infinity).toInt());
|
||||
}
|
||||
|
||||
Future<void> setVolume(String playerId, int volumeLevel) async {
|
||||
try {
|
||||
await _api?.setVolume(playerId, volumeLevel);
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to set volume: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// TRACK PLAYBACK
|
||||
// ============================================================================
|
||||
|
||||
Future<void> playTrack(String playerId, Track track, {bool clearQueue = true}) async {
|
||||
try {
|
||||
await _api?.playTrack(playerId, track, clearQueue: clearQueue);
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to play track: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> playTracks(String playerId, List<Track> tracks, {int? startIndex, bool clearQueue = true}) async {
|
||||
try {
|
||||
await _api?.playTracks(playerId, tracks, startIndex: startIndex, clearQueue: clearQueue);
|
||||
|
||||
if (tracks.isNotEmpty && startIndex != null && startIndex < tracks.length) {
|
||||
_currentTrack = tracks[startIndex];
|
||||
} else if (tracks.isNotEmpty) {
|
||||
_currentTrack = tracks.first;
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
onTrackChanged?.call();
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to play tracks: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// QUEUE MANAGEMENT
|
||||
// ============================================================================
|
||||
|
||||
Future<PlayerQueue?> getQueue(String playerId) async {
|
||||
return _queueManager?.getQueue(playerId);
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// POLLING AND STATE UPDATES
|
||||
// ============================================================================
|
||||
|
||||
void _startPlayerStatePolling() {
|
||||
_playerStateTimer?.cancel();
|
||||
_playerStateTimer = Timer.periodic(
|
||||
Timings.playerPollingInterval,
|
||||
(_) => _updatePlayerState(),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _updatePlayerState() async {
|
||||
if (_selectedPlayer == null || _api == null) return;
|
||||
|
||||
try {
|
||||
final playerId = _selectedPlayer!.playerId;
|
||||
|
||||
// Get all players and find our selected one
|
||||
final allPlayers = await _api?.getPlayers();
|
||||
final updatedPlayer = allPlayers?.firstWhere(
|
||||
(p) => p.playerId == playerId,
|
||||
orElse: () => _selectedPlayer!,
|
||||
);
|
||||
|
||||
if (updatedPlayer == null) {
|
||||
_logger.log('⚠️ _updatePlayerState: Player not found: $playerId');
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if player changed during fetch
|
||||
if (_selectedPlayer?.playerId != playerId) {
|
||||
_logger.log('⚠️ _updatePlayerState: Player changed during fetch, aborting');
|
||||
return;
|
||||
}
|
||||
|
||||
final previousState = _selectedPlayer!.state;
|
||||
_selectedPlayer = updatedPlayer;
|
||||
|
||||
// Update position tracker
|
||||
_positionTracker.updateFromServer(
|
||||
playerId: playerId,
|
||||
position: updatedPlayer.elapsedTime ?? 0.0,
|
||||
isPlaying: updatedPlayer.state == 'playing',
|
||||
duration: _currentTrack?.duration,
|
||||
serverTimestamp: updatedPlayer.elapsedTimeLastUpdated,
|
||||
);
|
||||
|
||||
// Update notification if state changed
|
||||
if (previousState != updatedPlayer.state) {
|
||||
await _updateNotificationForPlayer(updatedPlayer);
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Error updating player state: $e');
|
||||
}
|
||||
}
|
||||
|
||||
void _manageNotificationPositionTimer() {
|
||||
_notificationPositionTimer?.cancel();
|
||||
|
||||
// Only for remote/Sendspin players
|
||||
// Note: We don't have a sync version, so we use a cached value or null
|
||||
final builtinPlayerId = _selectedPlayer?.playerId; // Simplified for now
|
||||
final isRemotePlayer = _selectedPlayer != null &&
|
||||
(builtinPlayerId == null || _selectedPlayer!.playerId != builtinPlayerId);
|
||||
|
||||
if (isRemotePlayer && (_selectedPlayer?.state == 'playing' || _selectedPlayer?.state == 'paused')) {
|
||||
_notificationPositionTimer = Timer.periodic(
|
||||
Timings.notificationPositionUpdate,
|
||||
(_) => _updateNotificationPosition(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
void _updateNotificationPosition() {
|
||||
if (_currentTrack == null || _selectedPlayer == null) return;
|
||||
|
||||
final position = _positionTracker.currentPosition;
|
||||
// Update notification position
|
||||
// (This would be handled by audio_handler internally)
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// SLEEP TIMER
|
||||
// ============================================================================
|
||||
|
||||
Future<void> setSleepTimer(int? minutes) async {
|
||||
_sleepTimerProvider.setTimer(minutes);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
Future<void> cancelSleepTimer() async {
|
||||
_sleepTimerProvider.setTimer(null);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// HELPER METHODS
|
||||
// ============================================================================
|
||||
|
||||
Future<void> _loadCastToSendspinMappings() async {
|
||||
if (_castToSendspinIdMap.isEmpty) {
|
||||
try {
|
||||
final persistedMappings = await DatabaseService.instance.getAllCastToSendspinMappings();
|
||||
_castToSendspinIdMap.addAll(persistedMappings);
|
||||
if (persistedMappings.isNotEmpty) {
|
||||
_logger.log('🔗 Loaded ${persistedMappings.length} Cast->Sendspin mappings from database');
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to load Cast->Sendspin mappings: $e');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
List<Player> _filterPlayers(List<Player> allPlayers, String? builtinPlayerId) {
|
||||
return PlayerSortUtility.filterPlayers(
|
||||
allPlayers,
|
||||
builtinPlayerId: builtinPlayerId,
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _handleSendspinPlayers() async {
|
||||
// Complex Sendspin/Cast player switching logic
|
||||
// This would need to be extracted fully
|
||||
// For now, we'll keep a simplified version
|
||||
}
|
||||
|
||||
void _sortPlayersSync(bool smartSort, String? builtinPlayerId) {
|
||||
PlayerSortUtility.sortPlayers(
|
||||
_availablePlayers,
|
||||
smartSort: smartSort,
|
||||
builtinPlayerId: builtinPlayerId,
|
||||
);
|
||||
}
|
||||
|
||||
Player? _selectBestPlayer(String? builtinPlayerId) {
|
||||
return PlayerSortUtility.selectBestPlayer(
|
||||
availablePlayers: _availablePlayers,
|
||||
lastSelectedPlayer: null, // Could load from settings
|
||||
lastActivePlayer: null,
|
||||
builtinPlayerId: builtinPlayerId,
|
||||
);
|
||||
}
|
||||
|
||||
void _startIdleServiceTimer() {
|
||||
_idleServiceTimer?.cancel();
|
||||
_idleServiceTimer = Timer(const Duration(minutes: 30), () {
|
||||
// After 30 min idle, stop position tracking
|
||||
_positionTracker.clear();
|
||||
});
|
||||
}
|
||||
|
||||
void _cancelIdleServiceTimer() {
|
||||
_idleServiceTimer?.cancel();
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// CLEANUP
|
||||
// ============================================================================
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_playerStateTimer?.cancel();
|
||||
_notificationPositionTimer?.cancel();
|
||||
_idleServiceTimer?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,7 @@ class SleepTimerProvider with ChangeNotifier {
|
||||
DateTime? _sleepTimerEndTime;
|
||||
int? _sleepTimerMinutes; // null = off, -1 = end of track, positive = minutes
|
||||
Timer? _sleepTimerDisplayTimer;
|
||||
bool _disposed = false;
|
||||
|
||||
/// Callback to pause playback when timer expires
|
||||
OnSleepTimerExpired? onExpired;
|
||||
@@ -74,7 +75,9 @@ class SleepTimerProvider with ChangeNotifier {
|
||||
|
||||
// Start display update timer (every second for countdown)
|
||||
_sleepTimerDisplayTimer = Timer.periodic(const Duration(seconds: 1), (_) {
|
||||
notifyListeners(); // Update UI with remaining time
|
||||
if (!_disposed) {
|
||||
notifyListeners(); // Update UI with remaining time
|
||||
}
|
||||
});
|
||||
|
||||
notifyListeners();
|
||||
@@ -123,6 +126,7 @@ class SleepTimerProvider with ChangeNotifier {
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_disposed = true;
|
||||
_cancelInternal();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,166 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../models/player.dart';
|
||||
import '../models/provider_instance.dart';
|
||||
|
||||
/// Provider for UI-only state that doesn't belong to any specific domain.
|
||||
///
|
||||
/// Manages:
|
||||
/// - Search state (query and results)
|
||||
/// - Provider and player filters (from MA user settings)
|
||||
/// - User-controlled provider enable/disable
|
||||
/// - Loading states
|
||||
/// - Home refresh counter
|
||||
///
|
||||
/// This state is UI-focused and doesn't involve business logic operations.
|
||||
class UIStateProvider extends ChangeNotifier {
|
||||
// Search state
|
||||
String _lastSearchQuery = '';
|
||||
Map<String, List<MediaItem>> _lastSearchResults = {
|
||||
'artists': [],
|
||||
'albums': [],
|
||||
'tracks': [],
|
||||
};
|
||||
|
||||
// Provider filter from MA user settings (empty = all providers allowed)
|
||||
List<String> _providerFilter = [];
|
||||
|
||||
// Player filter from MA user settings (empty = all players allowed)
|
||||
List<String> _playerFilter = [];
|
||||
|
||||
// User-controlled music provider filter (local settings in Ensemble)
|
||||
// Empty list means all providers are enabled (no filtering)
|
||||
List<String> _enabledProviderIds = [];
|
||||
|
||||
// Available music providers discovered from MA
|
||||
List<ProviderInstance> _availableMusicProviders = [];
|
||||
|
||||
// Loading states
|
||||
bool _isLoading = false;
|
||||
bool _isLoadingRadio = false;
|
||||
bool _isLoadingPodcasts = false;
|
||||
|
||||
// Home refresh counter - increments to signal home screen to refresh all rows
|
||||
int _homeRefreshCounter = 0;
|
||||
|
||||
// Getters
|
||||
String get lastSearchQuery => _lastSearchQuery;
|
||||
Map<String, List<MediaItem>> get lastSearchResults => _lastSearchResults;
|
||||
List<String> get providerFilter => _providerFilter;
|
||||
List<String> get playerFilter => _playerFilter;
|
||||
List<String> get enabledProviderIds => _enabledProviderIds;
|
||||
List<ProviderInstance> get availableMusicProviders => _availableMusicProviders;
|
||||
bool get isLoading => _isLoading;
|
||||
bool get isLoadingRadio => _isLoadingRadio;
|
||||
bool get isLoadingPodcasts => _isLoadingPodcasts;
|
||||
int get homeRefreshCounter => _homeRefreshCounter;
|
||||
|
||||
/// Whether provider filtering is active
|
||||
bool get hasProviderFilter => _providerFilter.isNotEmpty;
|
||||
|
||||
/// Whether player filtering is active
|
||||
bool get hasPlayerFilter => _playerFilter.isNotEmpty;
|
||||
|
||||
/// Whether user provider filter is active
|
||||
bool get hasEnabledProviderFilter => _enabledProviderIds.isNotEmpty;
|
||||
|
||||
// Search state management
|
||||
void saveSearchState(String query, Map<String, List<MediaItem>> results) {
|
||||
_lastSearchQuery = query;
|
||||
_lastSearchResults = results;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void clearSearchState() {
|
||||
_lastSearchQuery = '';
|
||||
_lastSearchResults = {'artists': [], 'albums': [], 'tracks': []};
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
// Filter management
|
||||
void setProviderFilter(List<String> filter) {
|
||||
_providerFilter = filter;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void setPlayerFilter(List<String> filter) {
|
||||
_playerFilter = filter;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void setAvailableMusicProviders(List<ProviderInstance> providers) {
|
||||
_availableMusicProviders = providers;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void setEnabledProviderIds(List<String> enabledIds) {
|
||||
_enabledProviderIds = enabledIds;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Toggle a specific music provider on/off
|
||||
void toggleProviderEnabled(String instanceId, bool enabled) {
|
||||
final allIds = _availableMusicProviders.map((p) => p.instanceId).toList();
|
||||
|
||||
// Don't allow disabling the last provider
|
||||
if (!enabled && _enabledProviderIds.isNotEmpty && _enabledProviderIds.length <= 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Update local state
|
||||
if (_enabledProviderIds.isEmpty && !enabled) {
|
||||
// Switch to explicit mode
|
||||
_enabledProviderIds = allIds.where((id) => id != instanceId).toList();
|
||||
} else if (enabled) {
|
||||
if (!_enabledProviderIds.contains(instanceId)) {
|
||||
_enabledProviderIds = [..._enabledProviderIds, instanceId];
|
||||
}
|
||||
} else {
|
||||
_enabledProviderIds = _enabledProviderIds.where((id) => id != instanceId).toList();
|
||||
}
|
||||
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Check if a provider should be visible based on both filters
|
||||
bool isProviderEnabled(String instanceId) {
|
||||
// Check MA user filter (server-side restriction)
|
||||
if (hasProviderFilter && !_providerFilter.contains(instanceId)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check user filter (local preference)
|
||||
if (hasEnabledProviderFilter && !_enabledProviderIds.contains(instanceId)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/// Check if a player should be visible based on MA user filter
|
||||
bool isPlayerAllowed(String playerId) {
|
||||
if (!hasPlayerFilter) return true;
|
||||
return _playerFilter.contains(playerId);
|
||||
}
|
||||
|
||||
// Loading state management
|
||||
void setLoading(bool loading) {
|
||||
_isLoading = loading;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void setLoadingRadio(bool loading) {
|
||||
_isLoadingRadio = loading;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void setLoadingPodcasts(bool loading) {
|
||||
_isLoadingPodcasts = loading;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void incrementHomeRefreshCounter() {
|
||||
_homeRefreshCounter++;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
@@ -67,10 +67,10 @@ class _AlbumDetailsScreenState extends State<AlbumDetailsScreen> with SingleTick
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && widget.album.inLibrary) {
|
||||
service.setLibraryStatus(key, true);
|
||||
service.initLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.album.favorite ?? false)) {
|
||||
service.setFavoriteStatus(key, true);
|
||||
service.initFavoriteStatus(key, true);
|
||||
}
|
||||
_loadTracks();
|
||||
_loadAlbumDescription();
|
||||
@@ -573,7 +573,6 @@ class _AlbumDetailsScreenState extends State<AlbumDetailsScreen> with SingleTick
|
||||
widget.album.provider,
|
||||
widget.album.itemId,
|
||||
forceRefresh: cachedTracks != null, // Force refresh if we had cache
|
||||
album: widget.album,
|
||||
);
|
||||
|
||||
// 3. Update if we got different data
|
||||
@@ -848,9 +847,7 @@ class _AlbumDetailsScreenState extends State<AlbumDetailsScreen> with SingleTick
|
||||
final coverSize = (constraints.maxWidth * 0.7).clamp(200.0, 320.0);
|
||||
final expandedHeight = coverSize + 70;
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
CustomScrollView(
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
SliverAppBar(
|
||||
expandedHeight: expandedHeight,
|
||||
@@ -975,7 +972,7 @@ class _AlbumDetailsScreenState extends State<AlbumDetailsScreen> with SingleTick
|
||||
),
|
||||
),
|
||||
),
|
||||
Spacing.vGap8,
|
||||
Spacing.vGap16,
|
||||
// Album Description
|
||||
if (_albumDescription != null && _albumDescription!.isNotEmpty) ...[
|
||||
InkWell(
|
||||
@@ -1112,7 +1109,7 @@ class _AlbumDetailsScreenState extends State<AlbumDetailsScreen> with SingleTick
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
const SizedBox(height: 24),
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -1219,29 +1216,7 @@ class _AlbumDetailsScreenState extends State<AlbumDetailsScreen> with SingleTick
|
||||
),
|
||||
SliverToBoxAdapter(child: SizedBox(height: BottomSpacing.withMiniPlayer)), // Space for bottom nav + mini player
|
||||
],
|
||||
),
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
height: BottomSpacing.withMiniPlayer,
|
||||
child: IgnorePointer(
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
colorScheme.background.withOpacity(0.0),
|
||||
colorScheme.background,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
@@ -1323,12 +1298,13 @@ class _AlbumDetailsScreenState extends State<AlbumDetailsScreen> with SingleTick
|
||||
ListTile(
|
||||
leading: Icon(Icons.playlist_add, color: colorScheme.onSurface),
|
||||
title: Text(S.of(context)!.addToQueue, style: TextStyle(color: colorScheme.onSurface)),
|
||||
onTap: () {
|
||||
onTap: () async {
|
||||
Navigator.pop(context);
|
||||
// Add to queue on selected player
|
||||
final player = maProvider.selectedPlayer;
|
||||
if (player != null) {
|
||||
maProvider.addTracksToQueue(player.playerId, _tracks).then((_) {
|
||||
try {
|
||||
await maProvider.addTracksToQueue(player.playerId, _tracks);
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
@@ -1337,7 +1313,11 @@ class _AlbumDetailsScreenState extends State<AlbumDetailsScreen> with SingleTick
|
||||
),
|
||||
);
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
if (mounted) {
|
||||
_showError(S.of(context)!.failedToAddToQueue(e.toString()));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
_showError(S.of(context)!.noPlayerSelected);
|
||||
}
|
||||
|
||||
@@ -69,10 +69,10 @@ class _ArtistDetailsScreenState extends State<ArtistDetailsScreen> with LibraryS
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && _checkIfInLibrary(widget.artist)) {
|
||||
service.setLibraryStatus(key, true);
|
||||
service.initLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.artist.favorite ?? false)) {
|
||||
service.setFavoriteStatus(key, true);
|
||||
service.initFavoriteStatus(key, true);
|
||||
}
|
||||
// Use initial image URL immediately for smooth hero animation
|
||||
_artistImageUrl = widget.initialImageUrl;
|
||||
@@ -680,19 +680,6 @@ class _ArtistDetailsScreenState extends State<ArtistDetailsScreen> with LibraryS
|
||||
_isLoading = false;
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// No cache yet - show library albums from memory instantly (no API call)
|
||||
final memoryAlbums = provider.getArtistAlbumsFromLibrary(widget.artist.name);
|
||||
if (memoryAlbums.isNotEmpty && mounted) {
|
||||
final libraryAlbums = memoryAlbums.where((a) => a.inLibrary).toList();
|
||||
final providerOnlyAlbums = memoryAlbums.where((a) => !a.inLibrary).toList();
|
||||
setState(() {
|
||||
_albums = libraryAlbums;
|
||||
_providerAlbums = providerOnlyAlbums;
|
||||
_sortAlbums();
|
||||
_isLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Fetch fresh data in background (silent refresh)
|
||||
@@ -703,14 +690,13 @@ class _ArtistDetailsScreenState extends State<ArtistDetailsScreen> with LibraryS
|
||||
);
|
||||
|
||||
if (mounted && allAlbums.isNotEmpty) {
|
||||
final libraryAlbums = allAlbums.where((a) => a.inLibrary).toList();
|
||||
final providerOnlyAlbums = allAlbums.where((a) => !a.inLibrary).toList();
|
||||
|
||||
// Check if data actually changed
|
||||
final changed = _albums.length != libraryAlbums.length ||
|
||||
_providerAlbums.length != providerOnlyAlbums.length;
|
||||
final albumsChanged = _albums.length != allAlbums.where((a) => a.inLibrary).length;
|
||||
|
||||
if (albumsChanged || _albums.isEmpty) {
|
||||
final libraryAlbums = allAlbums.where((a) => a.inLibrary).toList();
|
||||
final providerOnlyAlbums = allAlbums.where((a) => !a.inLibrary).toList();
|
||||
|
||||
if (changed) {
|
||||
setState(() {
|
||||
_albums = libraryAlbums;
|
||||
_providerAlbums = providerOnlyAlbums;
|
||||
@@ -898,11 +884,9 @@ class _ArtistDetailsScreenState extends State<ArtistDetailsScreen> with LibraryS
|
||||
builder: (context, constraints) {
|
||||
// Responsive cover size: 50% of screen width, clamped between 140-200 (smaller for circular artist image)
|
||||
final coverSize = (constraints.maxWidth * 0.5).clamp(140.0, 200.0);
|
||||
final expandedHeight = coverSize + 45;
|
||||
final expandedHeight = coverSize + 80;
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
CustomScrollView(
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
SliverAppBar(
|
||||
expandedHeight: expandedHeight,
|
||||
@@ -1173,30 +1157,7 @@ class _ArtistDetailsScreenState extends State<ArtistDetailsScreen> with LibraryS
|
||||
],
|
||||
],
|
||||
],
|
||||
),
|
||||
// Bottom fade gradient to mask content behind mini player
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
height: BottomSpacing.withMiniPlayer,
|
||||
child: IgnorePointer(
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
colorScheme.background.withOpacity(0.0),
|
||||
colorScheme.background,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
|
||||
@@ -300,11 +300,9 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
|
||||
builder: (context, constraints) {
|
||||
// Responsive cover size: 50% of screen width, clamped between 140-200 (matches artist detail)
|
||||
final coverSize = (constraints.maxWidth * 0.5).clamp(140.0, 200.0);
|
||||
final expandedHeight = coverSize + 25;
|
||||
final expandedHeight = coverSize + 60;
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
CustomScrollView(
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
SliverAppBar(
|
||||
expandedHeight: expandedHeight,
|
||||
@@ -372,7 +370,7 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(24.0, 8.0, 24.0, 24.0),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// Author info on the left
|
||||
Expanded(
|
||||
@@ -454,28 +452,6 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
|
||||
_buildAudiobookSliver(),
|
||||
SliverToBoxAdapter(child: SizedBox(height: BottomSpacing.withMiniPlayer)),
|
||||
],
|
||||
),
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
height: BottomSpacing.withMiniPlayer,
|
||||
child: IgnorePointer(
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
colorScheme.surface.withOpacity(0.0),
|
||||
colorScheme.surface,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
@@ -68,70 +68,53 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
markDetailScreenEntered(context);
|
||||
_extractColors(); // Extract colors immediately - async so won't block
|
||||
}
|
||||
});
|
||||
|
||||
// Defer detail loading until after hero animation completes
|
||||
// This prevents setState with new data during animation → jank
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
Future.delayed(const Duration(milliseconds: 350), () {
|
||||
if (mounted) {
|
||||
_loadAudiobookDetails();
|
||||
}
|
||||
});
|
||||
// Load full audiobook details with chapters
|
||||
_loadAudiobookDetails();
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _loadAudiobookDetails() async {
|
||||
if (_isLoadingDetails) return;
|
||||
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
setState(() {
|
||||
_isLoadingDetails = true;
|
||||
});
|
||||
|
||||
// 1. Show cached data immediately (if available)
|
||||
final cached = maProvider.getCachedAudiobookDetail(
|
||||
widget.audiobook.provider,
|
||||
widget.audiobook.itemId,
|
||||
);
|
||||
if (cached != null && mounted) {
|
||||
_logger.log('📚 Showing cached audiobook: ${cached.name}, chapters: ${cached.chapters?.length ?? 0}');
|
||||
setState(() {
|
||||
_fullAudiobook = cached;
|
||||
_isLoadingDetails = false;
|
||||
});
|
||||
} else {
|
||||
setState(() {
|
||||
_isLoadingDetails = true;
|
||||
});
|
||||
}
|
||||
|
||||
// 2. Fetch fresh data in background
|
||||
try {
|
||||
final fullBook = await maProvider.getAudiobookDetailsWithCache(
|
||||
widget.audiobook.provider,
|
||||
widget.audiobook.itemId,
|
||||
forceRefresh: cached != null,
|
||||
);
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
|
||||
if (mounted && fullBook != null) {
|
||||
_logger.log('📚 Loaded full audiobook: ${fullBook.name}, chapters: ${fullBook.chapters?.length ?? 0}');
|
||||
if (maProvider.api != null) {
|
||||
final fullBook = await maProvider.api!.getAudiobookDetails(
|
||||
widget.audiobook.provider,
|
||||
widget.audiobook.itemId,
|
||||
);
|
||||
|
||||
if (mounted && fullBook != null) {
|
||||
_logger.log('📚 Loaded full audiobook: ${fullBook.name}, chapters: ${fullBook.chapters?.length ?? 0}');
|
||||
setState(() {
|
||||
_fullAudiobook = fullBook;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_fullAudiobook = fullBook;
|
||||
_isLoadingDetails = false;
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error loading audiobook details: $e');
|
||||
}
|
||||
|
||||
if (mounted && _isLoadingDetails) {
|
||||
setState(() {
|
||||
_isLoadingDetails = false;
|
||||
});
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isLoadingDetails = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _extractColors() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final imageUrl = maProvider.getImageUrl(_audiobook, size: 512);
|
||||
final imageUrl = maProvider.getImageUrl(widget.audiobook, size: 512);
|
||||
if (imageUrl == null) return;
|
||||
|
||||
try {
|
||||
@@ -497,7 +480,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final providerImageUrl = maProvider.getImageUrl(_audiobook, size: 512);
|
||||
final providerImageUrl = maProvider.getImageUrl(widget.audiobook, size: 512);
|
||||
// Use initialImageUrl as fallback for seamless hero animation
|
||||
final imageUrl = providerImageUrl ?? widget.initialImageUrl;
|
||||
|
||||
@@ -540,9 +523,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
final coverSize = (constraints.maxWidth * 0.7).clamp(200.0, 320.0);
|
||||
final expandedHeight = coverSize + 70;
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
CustomScrollView(
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
SliverAppBar(
|
||||
expandedHeight: expandedHeight,
|
||||
@@ -948,29 +929,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
|
||||
SliverToBoxAdapter(child: SizedBox(height: BottomSpacing.withMiniPlayer)),
|
||||
],
|
||||
),
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
height: BottomSpacing.withMiniPlayer,
|
||||
child: IgnorePointer(
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
colorScheme.surface.withOpacity(0.0),
|
||||
colorScheme.surface,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
|
||||
@@ -44,30 +44,24 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
// Extracted colors from book covers
|
||||
List<Color> _extractedColors = [];
|
||||
|
||||
// Cover URLs - set once from initialCovers or first book load, then frozen
|
||||
// Cover URLs - start with initial covers, update when books load
|
||||
List<String> _coverUrls = [];
|
||||
|
||||
// Cached cover widget - built once, never rebuilt
|
||||
Widget? _cachedCoverWidget;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
// Use initial covers immediately for smooth Hero animation
|
||||
if (widget.initialCovers != null && widget.initialCovers!.isNotEmpty) {
|
||||
_coverUrls = List.from(widget.initialCovers!);
|
||||
// Start color extraction from initial covers
|
||||
_extractColorsFromUrls(widget.initialCovers!);
|
||||
}
|
||||
_loadViewPreferences();
|
||||
// Defer color extraction and loading until after hero animation completes
|
||||
// Defer loading until after first frame to ensure UI renders first
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
Future.delayed(const Duration(milliseconds: 350), () {
|
||||
if (mounted) {
|
||||
if (_coverUrls.isNotEmpty) {
|
||||
_extractColorsFromUrls(_coverUrls);
|
||||
}
|
||||
_loadSeriesBooks();
|
||||
}
|
||||
});
|
||||
if (mounted) {
|
||||
_loadSeriesBooks();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -164,68 +158,35 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
|
||||
Future<void> _loadSeriesBooks() async {
|
||||
_logger.log('📚 SeriesScreen _loadSeriesBooks START');
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
|
||||
// 1. Show cached data immediately (if available)
|
||||
final cached = maProvider.getCachedSeriesAudiobooks(widget.series.id);
|
||||
if (cached != null && cached.isNotEmpty && mounted) {
|
||||
_logger.log('📚 Showing ${cached.length} cached series books');
|
||||
_applyBooks(cached, maProvider);
|
||||
} else {
|
||||
try {
|
||||
setState(() {
|
||||
_isLoading = true;
|
||||
_error = null;
|
||||
});
|
||||
}
|
||||
_logger.log('📚 SeriesScreen setState done, getting provider...');
|
||||
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
_logger.log('📚 SeriesScreen got provider, api=${maProvider.api != null}');
|
||||
|
||||
// 2. Fetch fresh data in background
|
||||
try {
|
||||
if (maProvider.api == null) {
|
||||
if (cached == null || cached.isEmpty) {
|
||||
setState(() {
|
||||
_error = S.of(context)!.notConnected;
|
||||
_isLoading = false;
|
||||
});
|
||||
}
|
||||
setState(() {
|
||||
_error = S.of(context)!.notConnected;
|
||||
_isLoading = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
final books = await maProvider.getSeriesAudiobooksWithCache(
|
||||
widget.series.id,
|
||||
forceRefresh: cached != null && cached.isNotEmpty,
|
||||
);
|
||||
_logger.log('📚 SeriesScreen calling getSeriesAudiobooks: path=${widget.series.id}');
|
||||
final books = await maProvider.api!.getSeriesAudiobooks(widget.series.id);
|
||||
_logger.log('📚 SeriesScreen got ${books.length} books');
|
||||
|
||||
if (mounted && books.isNotEmpty) {
|
||||
final changed = _audiobooks.length != books.length;
|
||||
if (changed || _audiobooks.isEmpty) {
|
||||
_applyBooks(books, maProvider);
|
||||
}
|
||||
// Debug: Log sequence data for each book
|
||||
for (final book in books) {
|
||||
_logger.log('📚 Book: "${book.name}" | position=${book.position} | browseOrder=${book.browseOrder} | sortName=${book.sortName} | seq=${book.seriesSequence} | metadata.series=${book.metadata?['series']}');
|
||||
}
|
||||
} catch (e, stack) {
|
||||
_logger.log('📚 SeriesScreen error: $e');
|
||||
_logger.log('📚 SeriesScreen stack: $stack');
|
||||
if (mounted && _audiobooks.isEmpty) {
|
||||
setState(() {
|
||||
_error = 'Failed to load books: $e';
|
||||
_isLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (mounted && _isLoading) {
|
||||
setState(() => _isLoading = false);
|
||||
}
|
||||
}
|
||||
|
||||
void _applyBooks(List<Audiobook> books, MusicAssistantProvider maProvider) {
|
||||
// Only populate covers if we have none yet (initialCovers was empty)
|
||||
final needsCovers = _coverUrls.isEmpty;
|
||||
|
||||
setState(() {
|
||||
_audiobooks = books;
|
||||
_sortAudiobooks();
|
||||
if (needsCovers) {
|
||||
if (mounted) {
|
||||
// Update cover URLs from loaded books
|
||||
final newCovers = <String>[];
|
||||
for (final book in books.take(9)) {
|
||||
final imageUrl = maProvider.getImageUrl(book);
|
||||
@@ -233,15 +194,34 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
newCovers.add(imageUrl);
|
||||
}
|
||||
}
|
||||
if (newCovers.isNotEmpty) {
|
||||
_coverUrls = newCovers;
|
||||
}
|
||||
}
|
||||
_isLoading = false;
|
||||
});
|
||||
|
||||
if (needsCovers && _extractedColors.isEmpty) {
|
||||
_extractCoverColors(maProvider);
|
||||
setState(() {
|
||||
_audiobooks = books;
|
||||
_sortAudiobooks(); // Sort inside setState so UI updates
|
||||
// Update covers if we got new ones (may have more than initial)
|
||||
if (newCovers.isNotEmpty) {
|
||||
_coverUrls = newCovers;
|
||||
}
|
||||
_isLoading = false;
|
||||
});
|
||||
// Debug: Log sorted order
|
||||
_logger.log('📚 Sorted order ($_sortOrder):');
|
||||
for (final book in _audiobooks) {
|
||||
_logger.log(' - ${book.seriesSequence ?? "null"}: ${book.name}');
|
||||
}
|
||||
|
||||
// Extract colors from book covers asynchronously
|
||||
_extractCoverColors(maProvider);
|
||||
}
|
||||
} catch (e, stack) {
|
||||
_logger.log('📚 SeriesScreen error: $e');
|
||||
_logger.log('📚 SeriesScreen stack: $stack');
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_error = 'Failed to load books: $e';
|
||||
_isLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -303,9 +283,7 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
final coverSize = (constraints.maxWidth * 0.7).clamp(200.0, 320.0);
|
||||
final expandedHeight = coverSize + 70;
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
CustomScrollView(
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
// App bar with series cover collage (matches audiobook detail screen)
|
||||
SliverAppBar(
|
||||
@@ -323,31 +301,25 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
children: [
|
||||
const SizedBox(height: 60),
|
||||
// Series cover collage - responsive size
|
||||
// Shadow container outside Hero to avoid widget tree mismatch
|
||||
Container(
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.2),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 4),
|
||||
),
|
||||
],
|
||||
),
|
||||
// Hero child matches source: RepaintBoundary > AspectRatio > ClipRRect
|
||||
child: Hero(
|
||||
tag: widget.heroTag ?? 'series_cover_${widget.series.id}',
|
||||
child: RepaintBoundary(
|
||||
child: AspectRatio(
|
||||
aspectRatio: 1,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
child: _buildSeriesCover(colorScheme, maProvider),
|
||||
Hero(
|
||||
tag: widget.heroTag ?? 'series_cover_${widget.series.id}',
|
||||
child: Container(
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
decoration: BoxDecoration(
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.2),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 4),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
child: _buildSeriesCover(colorScheme, maProvider),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -485,29 +457,7 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
child: SizedBox(height: BottomSpacing.withMiniPlayer),
|
||||
),
|
||||
],
|
||||
),
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
height: BottomSpacing.withMiniPlayer,
|
||||
child: IgnorePointer(
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
colorScheme.surface.withOpacity(0.0),
|
||||
colorScheme.surface,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
@@ -541,9 +491,6 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
);
|
||||
}
|
||||
|
||||
// Return cached cover widget if already built (prevents rebuilds from unrelated setState)
|
||||
if (_cachedCoverWidget != null) return _cachedCoverWidget!;
|
||||
|
||||
final covers = _coverUrls;
|
||||
|
||||
// Dynamic grid size based on number of covers (matches library screen)
|
||||
@@ -567,8 +514,7 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
}
|
||||
|
||||
// Build grid using Column/Row for proper sizing (no scrolling issues)
|
||||
// Cache the widget so it never rebuilds from unrelated setState calls
|
||||
_cachedCoverWidget = Column(
|
||||
return Column(
|
||||
children: List.generate(gridSize, (row) {
|
||||
return Expanded(
|
||||
child: Row(
|
||||
@@ -579,11 +525,8 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
return Expanded(
|
||||
child: coverUrl != null
|
||||
? CachedNetworkImage(
|
||||
key: ValueKey(coverUrl),
|
||||
imageUrl: coverUrl,
|
||||
fit: BoxFit.cover,
|
||||
memCacheWidth: 256,
|
||||
memCacheHeight: 256,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => Container(
|
||||
@@ -605,7 +548,6 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
);
|
||||
}),
|
||||
);
|
||||
return _cachedCoverWidget!;
|
||||
}
|
||||
|
||||
/// Builds an empty cell with either a solid color or a nested grid
|
||||
@@ -723,8 +665,6 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
fit: BoxFit.cover,
|
||||
width: double.infinity,
|
||||
height: double.infinity,
|
||||
memCacheWidth: 256,
|
||||
memCacheHeight: 256,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => Center(
|
||||
|
||||
@@ -364,7 +364,6 @@ class _DebugLogScreenState extends State<DebugLogScreen> {
|
||||
padding: EdgeInsets.only(bottom: BottomSpacing.navBarOnly),
|
||||
child: FloatingActionButton(
|
||||
onPressed: () {
|
||||
setState(() {});
|
||||
if (_scrollController.hasClients) {
|
||||
_scrollController.animateTo(
|
||||
_scrollController.position.maxScrollExtent,
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:material_symbols_icons/symbols.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../providers/navigation_provider.dart';
|
||||
import '../theme/theme_provider.dart';
|
||||
import '../widgets/global_player_overlay.dart';
|
||||
import 'new_home_screen.dart';
|
||||
import 'new_library_screen.dart';
|
||||
@@ -22,7 +19,6 @@ class HomeScreen extends StatefulWidget {
|
||||
class _HomeScreenState extends State<HomeScreen> {
|
||||
final GlobalKey<SearchScreenState> _searchScreenKey = GlobalKey<SearchScreenState>();
|
||||
DateTime? _lastBackPress;
|
||||
final _cachedNavColor = _CachedNavColor();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
@@ -109,15 +105,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
},
|
||||
child: Scaffold(
|
||||
backgroundColor: colorScheme.surface,
|
||||
// extendBody: true preserves the existing layout where content fills the
|
||||
// full screen and screens manage their own bottom padding (BottomSpacing).
|
||||
// Without this, Scaffold would constrain the body above the nav bar,
|
||||
// causing double bottom spacing.
|
||||
extendBody: true,
|
||||
// BottomNavigationBar requires an Overlay ancestor (for Tooltip);
|
||||
// Scaffold inside Navigator provides one. Previously it was in
|
||||
// GlobalPlayerOverlay's Stack (outside Navigator) causing crashes.
|
||||
bottomNavigationBar: _buildBottomNavigationBar(context, colorScheme),
|
||||
// No bottomNavigationBar here - it's now in GlobalPlayerOverlay
|
||||
body: Stack(
|
||||
children: [
|
||||
// Home and Library use IndexedStack for state preservation
|
||||
@@ -143,162 +131,4 @@ class _HomeScreenState extends State<HomeScreen> {
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/// Build the bottom navigation bar with adaptive colors and player expansion animation.
|
||||
/// Moved here from GlobalPlayerOverlay so it has proper Overlay ancestry
|
||||
/// (required by BottomNavigationBar's internal Tooltip widgets).
|
||||
Widget? _buildBottomNavigationBar(BuildContext context, ColorScheme colorScheme) {
|
||||
// Hide nav bar when not connected and no cached players
|
||||
final showNavBar = context.select<MusicAssistantProvider, bool>(
|
||||
(p) => p.isConnected || p.hasCachedPlayers,
|
||||
);
|
||||
if (!showNavBar) return null;
|
||||
|
||||
return Consumer<ThemeProvider>(
|
||||
builder: (context, themeProvider, _) {
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
|
||||
return ValueListenableBuilder<PlayerExpansionState>(
|
||||
valueListenable: playerExpansionNotifier,
|
||||
builder: (context, expansionState, _) {
|
||||
// Nav bar color logic - only use adaptive colors when:
|
||||
// 1. Player is expanding/expanded, OR
|
||||
// 2. On a detail screen (isOnDetailScreen)
|
||||
// On home screen with collapsed player: always use default theme colors
|
||||
final bool useAdaptiveColors = themeProvider.adaptiveTheme &&
|
||||
(expansionState.progress > 0 || themeProvider.isOnDetailScreen);
|
||||
|
||||
// Nav bar background color
|
||||
final Color navBgColor;
|
||||
if (expansionState.progress > 0 && expansionState.backgroundColor != null) {
|
||||
// Player is expanding - blend from surface to player's adaptive color
|
||||
navBgColor = Color.lerp(colorScheme.surface, expansionState.backgroundColor, expansionState.progress)!;
|
||||
} else if (useAdaptiveColors) {
|
||||
// On a detail screen - use adaptive surface color for nav bar
|
||||
final adaptiveBg = themeProvider.getAdaptiveSurfaceColorFor(Theme.of(context).brightness);
|
||||
navBgColor = adaptiveBg ?? colorScheme.surface;
|
||||
} else {
|
||||
// Home screen with collapsed player - use default surface color
|
||||
navBgColor = colorScheme.surface;
|
||||
}
|
||||
|
||||
// Icon color - only use adaptive colors when appropriate
|
||||
final Color baseSourceColor = (useAdaptiveColors && themeProvider.adaptiveColors != null)
|
||||
? themeProvider.adaptiveColors!.primary
|
||||
: colorScheme.primary;
|
||||
|
||||
// Blend icon color with player's primary color during expansion
|
||||
Color sourceColor = baseSourceColor;
|
||||
if (themeProvider.adaptiveTheme && expansionState.progress > 0 && expansionState.primaryColor != null) {
|
||||
sourceColor = Color.lerp(baseSourceColor, expansionState.primaryColor!, expansionState.progress)!;
|
||||
}
|
||||
final navSelectedColor = _cachedNavColor.getAdjustedColor(sourceColor, isDark);
|
||||
|
||||
// Fade out and slide down nav bar as player expands
|
||||
// Use IgnorePointer when faded to prevent accidental taps
|
||||
final navOpacity = (1.0 - expansionState.progress * 2).clamp(0.0, 1.0);
|
||||
final navSlideDown = expansionState.progress * 20; // Slide down 20px as it fades
|
||||
|
||||
return IgnorePointer(
|
||||
ignoring: navOpacity < 0.1,
|
||||
child: Transform.translate(
|
||||
offset: Offset(0, navSlideDown),
|
||||
child: Opacity(
|
||||
opacity: navOpacity,
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: navBgColor,
|
||||
boxShadow: expansionState.progress < 0.5
|
||||
? [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.1),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, -2),
|
||||
),
|
||||
]
|
||||
: null,
|
||||
),
|
||||
child: BottomNavigationBar(
|
||||
currentIndex: navigationProvider.selectedIndex,
|
||||
onTap: (index) {
|
||||
if (GlobalPlayerOverlay.isPlayerExpanded) {
|
||||
GlobalPlayerOverlay.collapsePlayer();
|
||||
}
|
||||
navigationProvider.navigatorKey.currentState?.popUntil((route) => route.isFirst);
|
||||
// Clear adaptive colors when switching tabs (detail screen colors shouldn't persist)
|
||||
themeProvider.clearAdaptiveColors();
|
||||
if (index == 3) {
|
||||
GlobalPlayerOverlay.hidePlayer();
|
||||
} else if (navigationProvider.selectedIndex == 3) {
|
||||
GlobalPlayerOverlay.showPlayer();
|
||||
}
|
||||
navigationProvider.setSelectedIndex(index);
|
||||
},
|
||||
backgroundColor: Colors.transparent,
|
||||
selectedItemColor: navSelectedColor,
|
||||
unselectedItemColor: colorScheme.onSurface.withOpacity(0.54),
|
||||
elevation: 0,
|
||||
type: BottomNavigationBarType.fixed,
|
||||
selectedFontSize: 12,
|
||||
unselectedFontSize: 12,
|
||||
items: [
|
||||
BottomNavigationBarItem(
|
||||
icon: const Icon(Icons.home_outlined),
|
||||
activeIcon: const Icon(Icons.home_rounded),
|
||||
label: S.of(context)!.home,
|
||||
),
|
||||
BottomNavigationBarItem(
|
||||
icon: const Icon(Symbols.book_2, fill: 0),
|
||||
activeIcon: const Icon(Symbols.book_2, fill: 1),
|
||||
label: S.of(context)!.library,
|
||||
),
|
||||
BottomNavigationBarItem(
|
||||
icon: const Icon(Icons.search_rounded),
|
||||
activeIcon: const Icon(Icons.search_rounded),
|
||||
label: S.of(context)!.search,
|
||||
),
|
||||
BottomNavigationBarItem(
|
||||
icon: const Icon(Icons.settings_outlined),
|
||||
activeIcon: const Icon(Icons.settings_rounded),
|
||||
label: S.of(context)!.settings,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Cached color with contrast adjustment for nav bar icon colors.
|
||||
/// Avoids expensive HSL conversions during scroll/animation.
|
||||
class _CachedNavColor {
|
||||
Color? _sourceColor;
|
||||
bool? _isDark;
|
||||
Color? _adjustedColor;
|
||||
|
||||
Color getAdjustedColor(Color sourceColor, bool isDark) {
|
||||
if (_sourceColor == sourceColor && _isDark == isDark && _adjustedColor != null) {
|
||||
return _adjustedColor!;
|
||||
}
|
||||
|
||||
var navSelectedColor = sourceColor;
|
||||
if (isDark && navSelectedColor.computeLuminance() < 0.2) {
|
||||
final hsl = HSLColor.fromColor(navSelectedColor);
|
||||
navSelectedColor = hsl.withLightness((hsl.lightness + 0.3).clamp(0.0, 0.8)).toColor();
|
||||
} else if (!isDark && navSelectedColor.computeLuminance() > 0.8) {
|
||||
final hsl = HSLColor.fromColor(navSelectedColor);
|
||||
navSelectedColor = hsl.withLightness((hsl.lightness - 0.3).clamp(0.2, 1.0)).toColor();
|
||||
}
|
||||
|
||||
_sourceColor = sourceColor;
|
||||
_isDark = isDark;
|
||||
_adjustedColor = navSelectedColor;
|
||||
return navSelectedColor;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,12 +6,52 @@ import '../widgets/album_card.dart';
|
||||
import '../widgets/common/empty_state.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
|
||||
class LibraryAlbumsScreen extends StatelessWidget {
|
||||
class LibraryAlbumsScreen extends StatefulWidget {
|
||||
const LibraryAlbumsScreen({super.key});
|
||||
|
||||
@override
|
||||
State<LibraryAlbumsScreen> createState() => _LibraryAlbumsScreenState();
|
||||
}
|
||||
|
||||
class _LibraryAlbumsScreenState extends State<LibraryAlbumsScreen> {
|
||||
List<Album> _albums = [];
|
||||
bool _isLoading = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
_albums = provider.albums;
|
||||
_isLoading = provider.isLoading;
|
||||
provider.addListener(_onProviderChanged);
|
||||
|
||||
// Auto-load library if empty
|
||||
if (_albums.isEmpty && !_isLoading) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) {
|
||||
provider.loadLibrary();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
context.read<MusicAssistantProvider>().removeListener(_onProviderChanged);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _onProviderChanged() {
|
||||
if (!mounted) return;
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
setState(() {
|
||||
_albums = provider.albums;
|
||||
_isLoading = provider.isLoading;
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// Use Selector for targeted rebuilds - only rebuild when albums or loading state changes
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
|
||||
@@ -34,13 +74,7 @@ class LibraryAlbumsScreen extends StatelessWidget {
|
||||
),
|
||||
centerTitle: true,
|
||||
),
|
||||
body: Selector<MusicAssistantProvider, (List<Album>, bool)>(
|
||||
selector: (_, provider) => (provider.albums, provider.isLoading),
|
||||
builder: (context, data, _) {
|
||||
final (albums, isLoading) = data;
|
||||
return _buildAlbumsList(context, albums, isLoading);
|
||||
},
|
||||
),
|
||||
body: _buildAlbumsList(context, _albums, _isLoading),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -93,4 +127,3 @@ class LibraryAlbumsScreen extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,12 +8,52 @@ import '../widgets/artist_avatar.dart';
|
||||
import 'artist_details_screen.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
|
||||
class LibraryArtistsScreen extends StatelessWidget {
|
||||
class LibraryArtistsScreen extends StatefulWidget {
|
||||
const LibraryArtistsScreen({super.key});
|
||||
|
||||
@override
|
||||
State<LibraryArtistsScreen> createState() => _LibraryArtistsScreenState();
|
||||
}
|
||||
|
||||
class _LibraryArtistsScreenState extends State<LibraryArtistsScreen> {
|
||||
List<Artist> _artists = [];
|
||||
bool _isLoading = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
_artists = provider.artists;
|
||||
_isLoading = provider.isLoading;
|
||||
provider.addListener(_onProviderChanged);
|
||||
|
||||
// Auto-load library if empty
|
||||
if (_artists.isEmpty && !_isLoading) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) {
|
||||
provider.loadLibrary();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
context.read<MusicAssistantProvider>().removeListener(_onProviderChanged);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _onProviderChanged() {
|
||||
if (!mounted) return;
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
setState(() {
|
||||
_artists = provider.artists;
|
||||
_isLoading = provider.isLoading;
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// Use Selector for targeted rebuilds - only rebuild when artists or loading state changes
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
|
||||
@@ -36,13 +76,7 @@ class LibraryArtistsScreen extends StatelessWidget {
|
||||
),
|
||||
centerTitle: true,
|
||||
),
|
||||
body: Selector<MusicAssistantProvider, (List<Artist>, bool)>(
|
||||
selector: (_, provider) => (provider.artists, provider.isLoading),
|
||||
builder: (context, data, _) {
|
||||
final (artists, isLoading) = data;
|
||||
return _buildArtistsList(context, artists, isLoading);
|
||||
},
|
||||
),
|
||||
body: _buildArtistsList(context, _artists, _isLoading),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
+182
-116
@@ -4,7 +4,6 @@ import 'package:provider/provider.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import '../models/recommendation_folder.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../providers/navigation_provider.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../services/sync_service.dart';
|
||||
@@ -30,9 +29,9 @@ class NewHomeScreen extends StatefulWidget {
|
||||
State<NewHomeScreen> createState() => _NewHomeScreenState();
|
||||
}
|
||||
|
||||
class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveClientMixin {
|
||||
class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveClientMixin, WidgetsBindingObserver {
|
||||
static final _logger = DebugLogger();
|
||||
final ValueNotifier<int> _refreshSignal = ValueNotifier<int>(0);
|
||||
Key _refreshKey = UniqueKey();
|
||||
// Main rows (default on)
|
||||
bool _showRecentAlbums = true;
|
||||
bool _showDiscoverArtists = true;
|
||||
@@ -52,6 +51,7 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
List<String> _homeRowOrder = List.from(SettingsService.defaultHomeRowOrder);
|
||||
// Discovery folders (dynamic rows from provider recommendations)
|
||||
List<RecommendationFolder> _discoveryFolders = [];
|
||||
bool _isLoadingDiscoveryFolders = false;
|
||||
// Discovery row preferences (itemId -> enabled)
|
||||
Map<String, bool> _discoveryRowEnabled = {};
|
||||
|
||||
@@ -68,6 +68,7 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance.addObserver(this);
|
||||
_loadSettings();
|
||||
// Listen to sync completion to refresh favorite rows when data becomes available
|
||||
SyncService.instance.addListener(_onSyncChanged);
|
||||
@@ -79,66 +80,15 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
_lastHomeRefreshCounter = provider.homeRefreshCounter;
|
||||
_providerListeningTo = provider;
|
||||
provider.addListener(_onProviderChanged);
|
||||
|
||||
// Reload settings only when switching back to home from settings tab
|
||||
navigationProvider.addListener(_onNavigationChanged);
|
||||
}
|
||||
|
||||
int _lastNavIndex = 0;
|
||||
|
||||
void _onNavigationChanged() {
|
||||
final newIndex = navigationProvider.selectedIndex;
|
||||
// Reload preferences when leaving settings tab (3) for home tab (0)
|
||||
if (_lastNavIndex == 3 && newIndex == 0) {
|
||||
_reloadPreferencesOnly();
|
||||
}
|
||||
_lastNavIndex = newIndex;
|
||||
}
|
||||
|
||||
/// Reload only local preferences (no API calls). Used when switching back from settings.
|
||||
Future<void> _reloadPreferencesOnly() async {
|
||||
final showRecent = await SettingsService.getShowRecentAlbums();
|
||||
final showDiscArtists = await SettingsService.getShowDiscoverArtists();
|
||||
final showDiscAlbums = await SettingsService.getShowDiscoverAlbums();
|
||||
final showFavAlbums = await SettingsService.getShowFavoriteAlbums();
|
||||
final showFavArtists = await SettingsService.getShowFavoriteArtists();
|
||||
final showFavTracks = await SettingsService.getShowFavoriteTracks();
|
||||
final showFavPlaylists = await SettingsService.getShowFavoritePlaylists();
|
||||
final showFavRadio = await SettingsService.getShowFavoriteRadioStations();
|
||||
final showFavPodcasts = await SettingsService.getShowFavoritePodcasts();
|
||||
final showContAudiobooks = await SettingsService.getShowContinueListeningAudiobooks();
|
||||
final showDiscAudiobooks = await SettingsService.getShowDiscoverAudiobooks();
|
||||
final showDiscSeries = await SettingsService.getShowDiscoverSeries();
|
||||
final rowOrder = await SettingsService.getHomeRowOrder();
|
||||
final discoveryRowPrefs = await SettingsService.getDiscoveryRowPreferences();
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_showRecentAlbums = showRecent;
|
||||
_showDiscoverArtists = showDiscArtists;
|
||||
_showDiscoverAlbums = showDiscAlbums;
|
||||
_showFavoriteAlbums = showFavAlbums;
|
||||
_showFavoriteArtists = showFavArtists;
|
||||
_showFavoriteTracks = showFavTracks;
|
||||
_showFavoritePlaylists = showFavPlaylists;
|
||||
_showFavoriteRadioStations = showFavRadio;
|
||||
_showFavoritePodcasts = showFavPodcasts;
|
||||
_showContinueListeningAudiobooks = showContAudiobooks;
|
||||
_showDiscoverAudiobooks = showDiscAudiobooks;
|
||||
_showDiscoverSeries = showDiscSeries;
|
||||
_homeRowOrder = rowOrder;
|
||||
_discoveryRowEnabled = discoveryRowPrefs;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
navigationProvider.removeListener(_onNavigationChanged);
|
||||
SyncService.instance.removeListener(_onSyncChanged);
|
||||
// Clean up provider listener
|
||||
_providerListeningTo?.removeListener(_onProviderChanged);
|
||||
_providerListeningTo = null;
|
||||
_refreshSignal.dispose();
|
||||
WidgetsBinding.instance.removeObserver(this);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -171,7 +121,9 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
if (currentRefreshCounter != _lastHomeRefreshCounter) {
|
||||
_logger.log('🔄 Home: refresh counter changed ($_lastHomeRefreshCounter -> $currentRefreshCounter), refreshing all rows');
|
||||
_lastHomeRefreshCounter = currentRefreshCounter;
|
||||
_refreshSignal.value++;
|
||||
setState(() {
|
||||
_refreshKey = UniqueKey(); // Forces all rows to rebuild and re-fetch data
|
||||
});
|
||||
return; // Don't process other refresh conditions in this cycle
|
||||
}
|
||||
|
||||
@@ -181,7 +133,9 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
if (_lastArtistCount == 0 && currentCount > 0) {
|
||||
_logger.log('🔄 Home: artists loaded from cache ($currentCount), refreshing rows');
|
||||
_hadEmptyFavoritesOnLoad = false;
|
||||
_refreshSignal.value++;
|
||||
setState(() {
|
||||
_refreshKey = UniqueKey();
|
||||
});
|
||||
}
|
||||
_lastArtistCount = currentCount;
|
||||
}
|
||||
@@ -200,12 +154,21 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
_providerListeningTo?.removeListener(_onProviderChanged);
|
||||
_providerListeningTo = null;
|
||||
if (mounted) {
|
||||
_refreshSignal.value++;
|
||||
setState(() {
|
||||
_refreshKey = UniqueKey();
|
||||
});
|
||||
}
|
||||
}
|
||||
_lastSyncStatus = newStatus;
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||
// Reload settings when app resumes (coming back from settings)
|
||||
if (state == AppLifecycleState.resumed) {
|
||||
_loadSettings();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _loadSettings() async {
|
||||
final showRecent = await SettingsService.getShowRecentAlbums();
|
||||
@@ -242,21 +205,21 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
}
|
||||
|
||||
// Load discovery folders dynamically (after settings load)
|
||||
// Skip if already loaded to avoid unnecessary rebuilds on settings reload
|
||||
if (_discoveryFolders.isEmpty) {
|
||||
await _loadDiscoveryFolders(forceRefresh: false);
|
||||
} else {
|
||||
// Just re-sync the row order with current enabled state (no API call)
|
||||
setState(() {
|
||||
_syncDiscoveryRowOrder(_discoveryFolders);
|
||||
});
|
||||
}
|
||||
// This will add enabled discovery rows to the home order
|
||||
await _loadDiscoveryFolders(forceRefresh: false);
|
||||
}
|
||||
|
||||
Future<void> _loadDiscoveryFolders({bool forceRefresh = false}) async {
|
||||
if (!mounted) return;
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
|
||||
// Set loading state if not already loaded
|
||||
if (_discoveryFolders.isEmpty && mounted) {
|
||||
setState(() {
|
||||
_isLoadingDiscoveryFolders = true;
|
||||
});
|
||||
}
|
||||
|
||||
try {
|
||||
var folders = await provider.getDiscoveryFoldersWithCache();
|
||||
// If cached result is empty, force a refresh to get from API/database
|
||||
@@ -269,31 +232,59 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
setState(() {
|
||||
_discoveryFolders = folders;
|
||||
_discoveryRowEnabled = discoveryRowPrefs;
|
||||
_syncDiscoveryRowOrder(folders);
|
||||
_isLoadingDiscoveryFolders = false;
|
||||
});
|
||||
}
|
||||
// Add enabled discovery rows to home row order if not already present
|
||||
if (mounted) {
|
||||
_addDiscoveryRowsToHomeOrder(folders);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to load discovery folders: $e');
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isLoadingDiscoveryFolders = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Sync discovery row order without calling setState. Only adds new folders, never removes.
|
||||
/// Visibility is controlled by _discoveryRowEnabled / _isRowEnabled().
|
||||
bool _syncDiscoveryRowOrder(List<RecommendationFolder> folders) {
|
||||
/// Add discovery rows to the home row order (at the end, like static rows)
|
||||
void _addDiscoveryRowsToHomeOrder(List<RecommendationFolder> folders) {
|
||||
if (!mounted) return;
|
||||
|
||||
bool didModify = false;
|
||||
|
||||
_logger.log('🔍 Discovery: Processing ${folders.length} folders, prefs: $_discoveryRowEnabled');
|
||||
|
||||
for (final folder in folders) {
|
||||
final discoveryRowId = 'discovery:${folder.itemId}';
|
||||
if (!_homeRowOrder.contains(discoveryRowId)) {
|
||||
// Check if this discovery row is enabled (default to false)
|
||||
final isEnabled = _discoveryRowEnabled[folder.itemId] ?? false;
|
||||
|
||||
_logger.log('🔍 Discovery: ${folder.name} (${folder.itemId}) enabled=$isEnabled, inOrder=${_homeRowOrder.contains(discoveryRowId)}');
|
||||
|
||||
if (isEnabled && !_homeRowOrder.contains(discoveryRowId)) {
|
||||
// Add at the end (consistent with static rows behavior)
|
||||
_homeRowOrder.add(discoveryRowId);
|
||||
_logger.log('✅ Discovery: Adding $discoveryRowId to home order at end');
|
||||
didModify = true;
|
||||
} else if (!isEnabled && _homeRowOrder.contains(discoveryRowId)) {
|
||||
// Remove disabled discovery row from order
|
||||
_homeRowOrder.remove(discoveryRowId);
|
||||
_logger.log('❌ Discovery: Removing $discoveryRowId from home order');
|
||||
didModify = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Save the updated row order to settings and trigger rebuild
|
||||
if (didModify) {
|
||||
_logger.log('💾 Discovery: Saving updated home row order: $_homeRowOrder');
|
||||
SettingsService.setHomeRowOrder(_homeRowOrder);
|
||||
if (mounted) {
|
||||
setState(() {}); // Trigger rebuild to show new row order
|
||||
}
|
||||
}
|
||||
return didModify;
|
||||
}
|
||||
|
||||
Future<void> _onRefresh() async {
|
||||
@@ -308,7 +299,9 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
await _loadSettings();
|
||||
|
||||
if (mounted) {
|
||||
_refreshSignal.value++;
|
||||
setState(() {
|
||||
_refreshKey = UniqueKey();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -430,29 +423,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
),
|
||||
),
|
||||
),
|
||||
// Bottom fade gradient to mask content behind mini player
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
height: BottomSpacing.miniPlayerHeight + 22.0,
|
||||
child: IgnorePointer(
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
colorScheme.background.withOpacity(0.0),
|
||||
colorScheme.background.withOpacity(0.25),
|
||||
colorScheme.background.withOpacity(0.85),
|
||||
],
|
||||
stops: const [0.0, 0.5, 1.0],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
@@ -468,6 +438,23 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
for (final rowId in _homeRowOrder) {
|
||||
if (_isRowEnabled(rowId)) count++;
|
||||
}
|
||||
// Count discovery folders that are NOT in the main row order yet (legacy support during load)
|
||||
// This handles the brief moment between when discovery folders load and when they're added to the order
|
||||
if (_discoveryFolders.isNotEmpty) {
|
||||
for (final folder in _discoveryFolders) {
|
||||
final discoveryRowId = 'discovery:${folder.itemId}';
|
||||
if (!_homeRowOrder.contains(discoveryRowId) && (_discoveryRowEnabled[folder.itemId] ?? false)) {
|
||||
count++;
|
||||
}
|
||||
}
|
||||
} else if (_isLoadingDiscoveryFolders && _discoveryFolders.isEmpty) {
|
||||
// Count as 1 row when loading so RefreshIndicator works
|
||||
// Only if no discovery rows are in the main order
|
||||
final hasDiscoveryRowsInOrder = _homeRowOrder.any((id) => id.startsWith('discovery:'));
|
||||
if (!hasDiscoveryRowsInOrder) {
|
||||
count += 1;
|
||||
}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
@@ -496,6 +483,57 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
}
|
||||
}
|
||||
|
||||
/// Build a loading placeholder for discovery rows
|
||||
Widget _buildDiscoveryLoadingPlaceholder(double rowHeight) {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
|
||||
return SizedBox(
|
||||
height: rowHeight,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.fromLTRB(16.0, 12.0, 16.0, 8.0),
|
||||
child: Text(
|
||||
S.of(context)!.discoveryMixes,
|
||||
style: textTheme.titleLarge?.copyWith(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: colorScheme.onBackground,
|
||||
),
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Center(
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 24,
|
||||
height: 24,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
valueColor: AlwaysStoppedAnimation<Color>(
|
||||
colorScheme.primary.withOpacity(0.7),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
Text(
|
||||
S.of(context)!.loading,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildConnectedView(
|
||||
BuildContext context, MusicAssistantProvider provider) {
|
||||
// Use LayoutBuilder to get available screen height
|
||||
@@ -503,18 +541,15 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
builder: (context, constraints) {
|
||||
// Each row is always 1/3 of screen height
|
||||
// 1 row = 1/3, 2 rows = 2/3, 3 rows = full screen, 4+ rows scroll
|
||||
// With extendBody: true, constraints include the area behind the nav bar.
|
||||
// Subtract mini player overlay space (mini player + its margins sit above the nav bar).
|
||||
final miniPlayerSpace = BottomSpacing.miniPlayerHeight + 22.0; // 84 + 22 = 106
|
||||
final availableHeight = constraints.maxHeight - miniPlayerSpace;
|
||||
final availableHeight = constraints.maxHeight - BottomSpacing.withMiniPlayer;
|
||||
|
||||
// Account for margins between rows (2px each, 2 margins for 3 rows).
|
||||
// Always use the 3-row margin calculation so rowHeight stays stable
|
||||
// regardless of how many rows are currently enabled (avoids jitter on reload).
|
||||
// Account for margins between rows (2px each)
|
||||
// Only adjust for margins when ≤3 rows (so they fit exactly without scroll)
|
||||
// For 4+ rows, use original calculation so 4th row stays hidden (scrollable)
|
||||
const marginSize = 2.0;
|
||||
final enabledRows = _countEnabledRows();
|
||||
const marginsInView = 2 * marginSize; // always 2 margins for 3-row layout
|
||||
final rowHeight = (availableHeight - marginsInView) / 3 + 2;
|
||||
final marginsInView = enabledRows > 1 && enabledRows <= 3 ? (enabledRows - 1) * marginSize : 0.0;
|
||||
final rowHeight = (availableHeight - marginsInView) / 3;
|
||||
|
||||
// Use Android 12+ stretch overscroll effect
|
||||
return NotificationListener<ScrollNotification>(
|
||||
@@ -536,15 +571,12 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
behavior: const _StretchScrollBehavior(),
|
||||
child: SingleChildScrollView(
|
||||
physics: const AlwaysScrollableScrollPhysics(),
|
||||
// For ≤3 rows: no padding needed (rows fit within viewport)
|
||||
// For 4+ rows: pad so last row scrolls above mini player
|
||||
padding: enabledRows >= 4
|
||||
? EdgeInsets.only(bottom: miniPlayerSpace)
|
||||
: EdgeInsets.zero,
|
||||
padding: EdgeInsets.only(bottom: BottomSpacing.withMiniPlayer),
|
||||
child: SizedBox(
|
||||
// Ensure minimum height for pull-to-refresh when empty
|
||||
height: enabledRows == 0 ? availableHeight : null,
|
||||
child: Column(
|
||||
key: _refreshKey,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: _buildOrderedRows(provider, rowHeight, enabledRows == 0),
|
||||
),
|
||||
@@ -602,6 +634,9 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
return rows;
|
||||
}
|
||||
|
||||
// Track which discovery folders have been rendered (from main row order)
|
||||
final renderedDiscoveryFolders = <String>{};
|
||||
|
||||
for (final rowId in _homeRowOrder) {
|
||||
final widget = _buildRowWidget(rowId, provider, rowHeight);
|
||||
if (widget != null) {
|
||||
@@ -610,6 +645,42 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
rows.add(const SizedBox(height: 2.0));
|
||||
}
|
||||
rows.add(widget);
|
||||
// Track discovery folders that were rendered from main row order
|
||||
if (rowId.startsWith('discovery:')) {
|
||||
renderedDiscoveryFolders.add(rowId.substring('discovery:'.length));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Add legacy discovery folders that aren't in the main row order yet
|
||||
// This ensures existing discovery folders still show even if not yet in _homeRowOrder
|
||||
if (_discoveryFolders.isNotEmpty) {
|
||||
for (final folder in _discoveryFolders) {
|
||||
if (!renderedDiscoveryFolders.contains(folder.itemId)) {
|
||||
final discoveryRowId = 'discovery:${folder.itemId}';
|
||||
// Check if this specific discovery row is enabled
|
||||
final isEnabled = _discoveryRowEnabled[folder.itemId] ?? false;
|
||||
if (isEnabled) {
|
||||
final widget = _buildRowWidget(discoveryRowId, provider, rowHeight);
|
||||
if (widget != null) {
|
||||
// Add spacing between rows
|
||||
if (rows.isNotEmpty) {
|
||||
rows.add(const SizedBox(height: 2.0));
|
||||
}
|
||||
rows.add(widget);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (_isLoadingDiscoveryFolders && _discoveryFolders.isEmpty) {
|
||||
// Show loading placeholder when discovery folders are loading
|
||||
// Only if no discovery rows are in the main order
|
||||
final hasDiscoveryRowsInOrder = _homeRowOrder.any((id) => id.startsWith('discovery:'));
|
||||
if (!hasDiscoveryRowsInOrder) {
|
||||
if (rows.isNotEmpty) {
|
||||
rows.add(const SizedBox(height: 2.0));
|
||||
}
|
||||
rows.add(_buildDiscoveryLoadingPlaceholder(rowHeight));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -626,7 +697,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
title: S.of(context)!.recentlyPlayed,
|
||||
loadAlbums: () => provider.getRecentAlbumsWithCache(),
|
||||
getCachedAlbums: () => provider.getCachedRecentAlbums(),
|
||||
refreshSignal: _refreshSignal,
|
||||
rowHeight: rowHeight,
|
||||
);
|
||||
case 'discover-artists':
|
||||
@@ -636,7 +706,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
title: S.of(context)!.discoverArtists,
|
||||
loadArtists: () => provider.getDiscoverArtistsWithCache(),
|
||||
getCachedArtists: () => provider.getCachedDiscoverArtists(),
|
||||
refreshSignal: _refreshSignal,
|
||||
rowHeight: rowHeight,
|
||||
);
|
||||
case 'discover-albums':
|
||||
@@ -646,7 +715,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
title: S.of(context)!.discoverAlbums,
|
||||
loadAlbums: () => provider.getDiscoverAlbumsWithCache(),
|
||||
getCachedAlbums: () => provider.getCachedDiscoverAlbums(),
|
||||
refreshSignal: _refreshSignal,
|
||||
rowHeight: rowHeight,
|
||||
);
|
||||
case 'continue-listening':
|
||||
@@ -682,7 +750,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
key: const ValueKey('favorite-albums'),
|
||||
title: S.of(context)!.favoriteAlbums,
|
||||
loadAlbums: () => provider.getFavoriteAlbums(),
|
||||
refreshSignal: _refreshSignal,
|
||||
rowHeight: rowHeight,
|
||||
);
|
||||
case 'favorite-artists':
|
||||
@@ -691,7 +758,6 @@ class _NewHomeScreenState extends State<NewHomeScreen> with AutomaticKeepAliveCl
|
||||
key: const ValueKey('favorite-artists'),
|
||||
title: S.of(context)!.favoriteArtists,
|
||||
loadArtists: () => provider.getFavoriteArtists(),
|
||||
refreshSignal: _refreshSignal,
|
||||
rowHeight: rowHeight,
|
||||
);
|
||||
case 'favorite-tracks':
|
||||
|
||||
+530
-548
File diff suppressed because it is too large
Load Diff
@@ -59,6 +59,7 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
super.initState();
|
||||
_isFavorite = widget.playlist.favorite ?? false;
|
||||
_isInLibrary = widget.playlist.inLibrary;
|
||||
_loadTracks();
|
||||
|
||||
// Mark that we're on a detail screen and extract colors immediately
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
@@ -67,15 +68,6 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
_extractColors(); // Extract colors immediately - async so won't block
|
||||
}
|
||||
});
|
||||
|
||||
// Defer track loading until after hero animation completes
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
Future.delayed(const Duration(milliseconds: 350), () {
|
||||
if (mounted) {
|
||||
_loadTracks();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _extractColors() async {
|
||||
@@ -598,12 +590,13 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
ListTile(
|
||||
leading: Icon(Icons.playlist_add, color: colorScheme.onSurface),
|
||||
title: Text(S.of(context)!.addToQueue, style: TextStyle(color: colorScheme.onSurface)),
|
||||
onTap: () {
|
||||
onTap: () async {
|
||||
Navigator.pop(context);
|
||||
// Add to queue on selected player
|
||||
final player = maProvider.selectedPlayer;
|
||||
if (player != null) {
|
||||
maProvider.addTracksToQueue(player.playerId, _tracks).then((_) {
|
||||
try {
|
||||
await maProvider.addTracksToQueue(player.playerId, _tracks);
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
@@ -612,7 +605,11 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
),
|
||||
);
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
if (mounted) {
|
||||
_showError(S.of(context)!.failedToAddToQueue(e.toString()));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
_showError(S.of(context)!.noPlayerSelected);
|
||||
}
|
||||
@@ -805,9 +802,7 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
final coverSize = (constraints.maxWidth * 0.7).clamp(200.0, 320.0);
|
||||
final expandedHeight = coverSize + 70;
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
CustomScrollView(
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
SliverAppBar(
|
||||
expandedHeight: expandedHeight,
|
||||
@@ -1062,13 +1057,12 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
);
|
||||
},
|
||||
child: ListTile(
|
||||
contentPadding: const EdgeInsets.only(left: 12, right: 20),
|
||||
leading: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// Track number
|
||||
SizedBox(
|
||||
width: 24,
|
||||
width: 28,
|
||||
child: Text(
|
||||
'${index + 1}',
|
||||
style: textTheme.bodyMedium?.copyWith(
|
||||
@@ -1077,7 +1071,7 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
textAlign: TextAlign.right,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
const SizedBox(width: 12),
|
||||
// Track artwork
|
||||
ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
@@ -1126,28 +1120,25 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
trailing: Padding(
|
||||
padding: const EdgeInsets.only(right: 4),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (HiResBadge.getTooltip(track) != null) ...[
|
||||
HiResBadge.fromTrack(track, primaryColor: colorScheme.primary)!,
|
||||
const SizedBox(width: 12),
|
||||
],
|
||||
if (track.duration != null)
|
||||
SizedBox(
|
||||
width: 40,
|
||||
child: Text(
|
||||
_formatDuration(track.duration!),
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
textAlign: TextAlign.right,
|
||||
),
|
||||
),
|
||||
trailing: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (HiResBadge.getTooltip(track) != null) ...[
|
||||
HiResBadge.fromTrack(track, primaryColor: colorScheme.primary)!,
|
||||
const SizedBox(width: 12),
|
||||
],
|
||||
),
|
||||
if (track.duration != null)
|
||||
SizedBox(
|
||||
width: 40,
|
||||
child: Text(
|
||||
_formatDuration(track.duration!),
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
textAlign: TextAlign.right,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
onTap: () => _playTrack(index),
|
||||
),
|
||||
@@ -1158,28 +1149,6 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
),
|
||||
SliverToBoxAdapter(child: SizedBox(height: BottomSpacing.withMiniPlayer)), // Space for bottom nav + mini player
|
||||
],
|
||||
),
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
height: BottomSpacing.withMiniPlayer,
|
||||
child: IgnorePointer(
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
colorScheme.surface.withOpacity(0.0),
|
||||
colorScheme.surface,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
@@ -61,15 +61,7 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
markDetailScreenEntered(context);
|
||||
_extractColors(); // Extract colors immediately - async so won't block
|
||||
}
|
||||
});
|
||||
|
||||
// Defer episode loading until after hero animation completes
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
Future.delayed(const Duration(milliseconds: 350), () {
|
||||
if (mounted) {
|
||||
_loadEpisodes();
|
||||
}
|
||||
});
|
||||
_loadEpisodes();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -388,62 +380,54 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
Future<void> _loadEpisodes() async {
|
||||
if (_isLoadingEpisodes) return;
|
||||
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
setState(() {
|
||||
_isLoadingEpisodes = true;
|
||||
});
|
||||
|
||||
// 1. Show cached episodes immediately (if available)
|
||||
final cached = maProvider.getCachedPodcastEpisodes(
|
||||
widget.podcast.itemId,
|
||||
provider: widget.podcast.provider,
|
||||
);
|
||||
if (cached != null && cached.isNotEmpty && mounted) {
|
||||
_logger.log('🎙️ Showing ${cached.length} cached episodes for ${widget.podcast.name}');
|
||||
setState(() {
|
||||
_episodes = cached;
|
||||
_sortEpisodes();
|
||||
_isLoadingEpisodes = false;
|
||||
});
|
||||
} else {
|
||||
setState(() {
|
||||
_isLoadingEpisodes = true;
|
||||
});
|
||||
}
|
||||
|
||||
// 2. Fetch fresh data in background
|
||||
try {
|
||||
List<MediaItem> episodes = [];
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
if (maProvider.api != null) {
|
||||
List<MediaItem> episodes = [];
|
||||
|
||||
// Try loading with the podcast's own ID and provider first
|
||||
episodes = await maProvider.getPodcastEpisodesWithCache(
|
||||
widget.podcast.itemId,
|
||||
provider: widget.podcast.provider,
|
||||
forceRefresh: cached != null && cached.isNotEmpty,
|
||||
);
|
||||
// Try loading with the podcast's own ID and provider first
|
||||
try {
|
||||
episodes = await maProvider.api!.getPodcastEpisodes(
|
||||
widget.podcast.itemId,
|
||||
provider: widget.podcast.provider,
|
||||
);
|
||||
} catch (e) {
|
||||
_logger.log('🎙️ Primary episode load failed: $e');
|
||||
}
|
||||
|
||||
// If that failed and we have provider mappings, try those
|
||||
if (episodes.isEmpty && widget.podcast.providerMappings != null) {
|
||||
for (final mapping in widget.podcast.providerMappings!) {
|
||||
if (mapping.itemId.isNotEmpty && mapping.providerInstance.isNotEmpty) {
|
||||
try {
|
||||
_logger.log('🎙️ Trying provider mapping: ${mapping.providerInstance}');
|
||||
episodes = await maProvider.getPodcastEpisodesWithCache(
|
||||
mapping.itemId,
|
||||
provider: mapping.providerInstance,
|
||||
);
|
||||
if (episodes.isNotEmpty) {
|
||||
_logger.log('🎙️ Loaded episodes via provider mapping');
|
||||
break;
|
||||
// If that failed and we have provider mappings, try those
|
||||
if (episodes.isEmpty && widget.podcast.providerMappings != null) {
|
||||
for (final mapping in widget.podcast.providerMappings!) {
|
||||
if (mapping.itemId.isNotEmpty && mapping.providerInstance.isNotEmpty) {
|
||||
try {
|
||||
_logger.log('🎙️ Trying provider mapping: ${mapping.providerInstance}');
|
||||
episodes = await maProvider.api!.getPodcastEpisodes(
|
||||
mapping.itemId,
|
||||
provider: mapping.providerInstance,
|
||||
);
|
||||
if (episodes.isNotEmpty) {
|
||||
_logger.log('🎙️ Loaded episodes via provider mapping');
|
||||
break;
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('🎙️ Provider mapping failed: $e');
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('🎙️ Provider mapping failed: $e');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (mounted && episodes.isNotEmpty) {
|
||||
final changed = _episodes.length != episodes.length;
|
||||
if (changed || _episodes.isEmpty) {
|
||||
if (mounted) {
|
||||
_logger.log('🎙️ Loaded ${episodes.length} episodes for ${widget.podcast.name}');
|
||||
// Debug: Log first episode metadata to see available fields
|
||||
if (episodes.isNotEmpty) {
|
||||
final first = episodes.first;
|
||||
_logger.log('🎙️ First episode metadata keys: ${first.metadata?.keys.toList()}');
|
||||
_logger.log('🎙️ First episode metadata: ${first.metadata}');
|
||||
}
|
||||
setState(() {
|
||||
_episodes = episodes;
|
||||
_sortEpisodes();
|
||||
@@ -452,12 +436,12 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('🎙️ Error loading episodes: $e');
|
||||
}
|
||||
|
||||
if (mounted && _isLoadingEpisodes) {
|
||||
setState(() {
|
||||
_isLoadingEpisodes = false;
|
||||
});
|
||||
} finally {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isLoadingEpisodes = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -670,9 +654,7 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
final coverSize = (constraints.maxWidth * 0.7).clamp(200.0, 320.0);
|
||||
final expandedHeight = coverSize + 70;
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
CustomScrollView(
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
SliverAppBar(
|
||||
expandedHeight: expandedHeight,
|
||||
@@ -1127,28 +1109,6 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
child: SizedBox(height: BottomSpacing.withMiniPlayer),
|
||||
),
|
||||
],
|
||||
),
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
height: BottomSpacing.withMiniPlayer,
|
||||
child: IgnorePointer(
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
colorScheme.surface.withOpacity(0.0),
|
||||
colorScheme.surface,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
@@ -255,9 +255,7 @@ class _PodcastEpisodeDetailScreenState extends State<PodcastEpisodeDetailScreen>
|
||||
final coverSize = (constraints.maxWidth * 0.6).clamp(180.0, 280.0);
|
||||
final expandedHeight = coverSize + 70;
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
CustomScrollView(
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
SliverAppBar(
|
||||
expandedHeight: expandedHeight,
|
||||
@@ -497,28 +495,6 @@ class _PodcastEpisodeDetailScreenState extends State<PodcastEpisodeDetailScreen>
|
||||
child: SizedBox(height: BottomSpacing.withMiniPlayer),
|
||||
),
|
||||
],
|
||||
),
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
height: BottomSpacing.withMiniPlayer,
|
||||
child: IgnorePointer(
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
colorScheme.surface.withOpacity(0.0),
|
||||
colorScheme.surface,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
@@ -314,10 +314,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
|
||||
void requestFocus() {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isSearchBarVisible = true;
|
||||
_lastVerticalScrollOffset = 0;
|
||||
});
|
||||
_focusNode.requestFocus();
|
||||
}
|
||||
}
|
||||
@@ -821,7 +817,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
child: ListView.builder(
|
||||
// PERF: Use key to preserve scroll position per filter
|
||||
key: PageStorageKey('list_$filterForPage'),
|
||||
keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
|
||||
padding: EdgeInsets.fromLTRB(16, 16, 16, BottomSpacing.navBarOnly),
|
||||
cacheExtent: 1000,
|
||||
addAutomaticKeepAlives: false,
|
||||
@@ -1201,7 +1196,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
return RepaintBoundary(
|
||||
child: GestureDetector(
|
||||
onLongPressStart: (details) {
|
||||
removeFocus();
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
@@ -1244,7 +1238,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
style: TextStyle(color: colorScheme.onSurface.withOpacity(0.6), fontSize: 12),
|
||||
),
|
||||
onTap: () {
|
||||
removeFocus();
|
||||
updateAdaptiveColorsFromImage(context, imageUrl);
|
||||
Navigator.push(
|
||||
context,
|
||||
@@ -1273,7 +1266,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
return RepaintBoundary(
|
||||
child: GestureDetector(
|
||||
onLongPressStart: (details) {
|
||||
removeFocus();
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
@@ -1352,7 +1344,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
),
|
||||
),
|
||||
onTap: () {
|
||||
removeFocus();
|
||||
updateAdaptiveColorsFromImage(context, imageUrl);
|
||||
Navigator.push(
|
||||
context,
|
||||
@@ -1381,7 +1372,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
return RepaintBoundary(
|
||||
child: GestureDetector(
|
||||
onLongPressStart: (details) {
|
||||
removeFocus();
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
@@ -1450,10 +1440,7 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
style: TextStyle(color: colorScheme.onSurface.withOpacity(0.5), fontSize: 12),
|
||||
)
|
||||
: null,
|
||||
onTap: () {
|
||||
removeFocus();
|
||||
_playTrack(track);
|
||||
},
|
||||
onTap: () => _playTrack(track),
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -1471,7 +1458,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
return RepaintBoundary(
|
||||
child: GestureDetector(
|
||||
onLongPressStart: (details) {
|
||||
removeFocus();
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
@@ -1560,7 +1546,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
)
|
||||
: null,
|
||||
onTap: () {
|
||||
removeFocus();
|
||||
updateAdaptiveColorsFromImage(context, imageUrl);
|
||||
Navigator.push(
|
||||
context,
|
||||
@@ -1591,7 +1576,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
return RepaintBoundary(
|
||||
child: GestureDetector(
|
||||
onLongPressStart: (details) {
|
||||
removeFocus();
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
@@ -1667,7 +1651,7 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
)
|
||||
: null,
|
||||
onTap: () {
|
||||
removeFocus();
|
||||
// Update adaptive colors before navigation
|
||||
updateAdaptiveColorsFromImage(context, imageUrl);
|
||||
Navigator.push(
|
||||
context,
|
||||
@@ -1694,7 +1678,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
return RepaintBoundary(
|
||||
child: GestureDetector(
|
||||
onLongPressStart: (details) {
|
||||
removeFocus();
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
@@ -1743,10 +1726,7 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
onTap: () {
|
||||
removeFocus();
|
||||
_playRadioStation(radio);
|
||||
},
|
||||
onTap: () => _playRadioStation(radio),
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -1764,7 +1744,6 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
return RepaintBoundary(
|
||||
child: GestureDetector(
|
||||
onLongPressStart: (details) {
|
||||
removeFocus();
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
@@ -1821,7 +1800,7 @@ class SearchScreenState extends State<SearchScreen> {
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
onTap: () {
|
||||
removeFocus();
|
||||
// Update adaptive colors before navigation
|
||||
updateAdaptiveColorsFromImage(context, imageUrl);
|
||||
Navigator.push(
|
||||
context,
|
||||
|
||||
@@ -12,7 +12,6 @@ import '../services/settings_service.dart';
|
||||
import '../theme/theme_provider.dart';
|
||||
import '../theme/app_theme.dart';
|
||||
import '../utils/page_transitions.dart';
|
||||
import '../providers/navigation_provider.dart';
|
||||
import '../widgets/global_player_overlay.dart';
|
||||
import 'debug_log_screen.dart';
|
||||
import 'login_screen.dart';
|
||||
@@ -25,7 +24,6 @@ class SettingsScreen extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _SettingsScreenState extends State<SettingsScreen> {
|
||||
final _scrollController = ScrollController();
|
||||
final _lastFmApiKeyController = TextEditingController();
|
||||
final _audioDbApiKeyController = TextEditingController();
|
||||
String _appVersion = '';
|
||||
@@ -192,7 +190,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_scrollController.dispose();
|
||||
_lastFmApiKeyController.dispose();
|
||||
_audioDbApiKeyController.dispose();
|
||||
super.dispose();
|
||||
@@ -353,15 +350,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
final itemId = rowId.substring('discovery:'.length);
|
||||
_discoveryRowEnabled[itemId] = value;
|
||||
SettingsService.setDiscoveryRowPreference(itemId, value);
|
||||
// Always add to home row order for position tracking
|
||||
if (!_homeRowOrder.contains(rowId)) {
|
||||
_homeRowOrder.add(rowId);
|
||||
SettingsService.setHomeRowOrder(_homeRowOrder);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// Save the setting
|
||||
switch (rowId) {
|
||||
case 'recent-albums':
|
||||
_showRecentAlbums = value;
|
||||
@@ -411,14 +402,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
_showFavoritePodcasts = value;
|
||||
SettingsService.setShowFavoritePodcasts(value);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// When enabling a row, add it to home row order if not already present
|
||||
if (value && !_homeRowOrder.contains(rowId)) {
|
||||
_homeRowOrder.add(rowId);
|
||||
SettingsService.setHomeRowOrder(_homeRowOrder);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -453,13 +436,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
elevation: 0,
|
||||
leading: IconButton(
|
||||
icon: const Icon(Icons.arrow_back_rounded),
|
||||
onPressed: () {
|
||||
// Settings is rendered conditionally in HomeScreen (not pushed as a route),
|
||||
// so Navigator.pop would pop the entire HomeScreen causing a black screen.
|
||||
// Instead, switch tab back to Home and restore the mini player.
|
||||
GlobalPlayerOverlay.showPlayer();
|
||||
navigationProvider.setSelectedIndex(0);
|
||||
},
|
||||
onPressed: () => Navigator.pop(context),
|
||||
color: colorScheme.onBackground,
|
||||
),
|
||||
title: Text(
|
||||
@@ -485,7 +462,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
],
|
||||
),
|
||||
body: SingleChildScrollView(
|
||||
controller: _scrollController,
|
||||
padding: const EdgeInsets.all(24.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
@@ -1051,8 +1027,21 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
displayRows.insert(newIndex, item);
|
||||
|
||||
setState(() {
|
||||
// Update _homeRowOrder with the new order (all rows, including discovery)
|
||||
_homeRowOrder = displayRows;
|
||||
// Update _homeRowOrder with the new order
|
||||
_homeRowOrder.clear();
|
||||
|
||||
// Add discovery rows that are enabled
|
||||
for (final rowId in displayRows) {
|
||||
if (rowId.startsWith('discovery:')) {
|
||||
// Only add enabled discovery rows to home order
|
||||
final itemId = rowId.substring('discovery:'.length);
|
||||
if (_discoveryRowEnabled[itemId] ?? false) {
|
||||
_homeRowOrder.add(rowId);
|
||||
}
|
||||
} else {
|
||||
_homeRowOrder.add(rowId);
|
||||
}
|
||||
}
|
||||
});
|
||||
SettingsService.setHomeRowOrder(_homeRowOrder);
|
||||
},
|
||||
|
||||
@@ -2,17 +2,12 @@ import 'dart:async';
|
||||
import 'package:audio_service/audio_service.dart';
|
||||
import 'package:audio_session/audio_session.dart';
|
||||
import 'package:just_audio/just_audio.dart';
|
||||
import 'package:rxdart/rxdart.dart';
|
||||
import '../debug_logger.dart';
|
||||
import '../auth/auth_manager.dart';
|
||||
import '../settings_service.dart';
|
||||
import '../sync_service.dart';
|
||||
import '../../providers/music_assistant_provider.dart';
|
||||
import '../../models/media_item.dart' as ma;
|
||||
|
||||
/// Custom AudioHandler for Ensemble that provides full control over
|
||||
/// notification actions and metadata updates.
|
||||
class MassivAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
|
||||
class MassivAudioHandler extends BaseAudioHandler with SeekHandler {
|
||||
final AudioPlayer _player = AudioPlayer();
|
||||
final AuthManager authManager;
|
||||
final _logger = DebugLogger();
|
||||
@@ -37,16 +32,6 @@ class MassivAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler
|
||||
// Track whether we're in remote control mode (controlling MA player, not playing locally)
|
||||
bool _isRemoteMode = false;
|
||||
|
||||
// Android Auto: provider reference (set after app initialises)
|
||||
MusicAssistantProvider? _autoProvider;
|
||||
|
||||
// Android Auto: track queue cache — maps context key to ordered track list.
|
||||
// Populated during getChildren so playFromMediaId can queue the full album/playlist.
|
||||
final Map<String, List<ma.Track>> _autoTrackCache = {};
|
||||
|
||||
// Android Auto: subjects for subscribeToChildren
|
||||
final Map<String, BehaviorSubject<Map<String, dynamic>>> _autoChildrenSubjects = {};
|
||||
|
||||
// Custom control for switching players (uses stop action with custom icon)
|
||||
static const _switchPlayerControl = MediaControl(
|
||||
androidIcon: 'drawable/ic_switch_player',
|
||||
@@ -327,760 +312,6 @@ class MassivAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler
|
||||
|
||||
MediaItem? get currentMediaItem => _currentMediaItem;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Android Auto — media browsing and playback
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/// Wire the provider in after the app has initialised.
|
||||
/// Called from _MusicAssistantAppState.initState().
|
||||
void setProvider(MusicAssistantProvider provider) {
|
||||
_autoProvider = provider;
|
||||
_logger.log('AndroidAuto: provider set');
|
||||
}
|
||||
|
||||
// Media ID constants — root categories
|
||||
static const _autoIdHome = 'cat|home';
|
||||
static const _autoIdMusic = 'cat|music';
|
||||
static const _autoIdAudiobooks = 'cat|audiobooks';
|
||||
static const _autoIdPodcasts = 'cat|podcasts';
|
||||
static const _autoIdRadio = 'cat|radio';
|
||||
|
||||
// Media ID constants — Music subcategories
|
||||
static const _autoIdPlaylists = 'cat|playlists';
|
||||
static const _autoIdArtists = 'cat|artists';
|
||||
static const _autoIdAlbums = 'cat|albums';
|
||||
static const _autoIdFavorites = 'cat|favorites';
|
||||
|
||||
// Media ID constants — Audiobook subcategories
|
||||
static const _autoIdAbAuthors = 'cat|ab_authors';
|
||||
static const _autoIdAbBooks = 'cat|ab_books';
|
||||
static const _autoIdAbSeries = 'cat|ab_series';
|
||||
|
||||
// Android Auto content style hints
|
||||
static const _gridHints = {
|
||||
'android.media.browse.CONTENT_STYLE_BROWSABLE_HINT': 2,
|
||||
'android.media.browse.CONTENT_STYLE_PLAYABLE_HINT': 2,
|
||||
};
|
||||
|
||||
// Icon URIs for category items
|
||||
static const _iconPkg = 'com.collotsspot.ensemble';
|
||||
static final _iconHome = Uri.parse('android.resource://$_iconPkg/drawable/ic_auto_home');
|
||||
static final _iconMusic = Uri.parse('android.resource://$_iconPkg/drawable/ic_auto_music');
|
||||
static final _iconBook = Uri.parse('android.resource://$_iconPkg/drawable/ic_auto_book');
|
||||
static final _iconPodcast = Uri.parse('android.resource://$_iconPkg/drawable/ic_auto_podcast');
|
||||
static final _iconRadio = Uri.parse('android.resource://$_iconPkg/drawable/ic_auto_radio');
|
||||
static final _iconArtist = Uri.parse('android.resource://$_iconPkg/drawable/ic_auto_artist');
|
||||
static final _iconAlbum = Uri.parse('android.resource://$_iconPkg/drawable/ic_auto_album');
|
||||
static final _iconPlaylist = Uri.parse('android.resource://$_iconPkg/drawable/ic_auto_playlist');
|
||||
static final _iconFavorite = Uri.parse('android.resource://$_iconPkg/drawable/ic_auto_favorite');
|
||||
|
||||
@override
|
||||
Future<List<MediaItem>> getChildren(String parentMediaId,
|
||||
[Map<String, dynamic>? options]) async {
|
||||
final provider = _autoProvider;
|
||||
if (provider == null) {
|
||||
_logger.log('AndroidAuto: getChildren("$parentMediaId") — provider not set yet');
|
||||
return [];
|
||||
}
|
||||
|
||||
// Ensure provider is connected — AA may browse before app is fully ready
|
||||
if (!provider.isConnected) {
|
||||
_logger.log('AndroidAuto: provider disconnected, starting reconnect');
|
||||
// Don't await — reconnection can take seconds and AA may timeout
|
||||
// getChildren. Cached data is served immediately; live API calls
|
||||
// inside builders will await their own reconnect if needed.
|
||||
provider.checkAndReconnect();
|
||||
}
|
||||
|
||||
try {
|
||||
final result = await _autoGetChildren(provider, parentMediaId);
|
||||
_logger.log('AndroidAuto: getChildren "$parentMediaId" → ${result.length} items');
|
||||
return result;
|
||||
} catch (e, st) {
|
||||
_logger.log('AndroidAuto: getChildren error for "$parentMediaId": $e\n$st');
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
Future<List<MediaItem>> _autoGetChildren(
|
||||
MusicAssistantProvider provider, String parentMediaId) async {
|
||||
switch (parentMediaId) {
|
||||
// Root
|
||||
case AudioService.browsableRootId:
|
||||
return _autoBuildRoot();
|
||||
|
||||
// Home — subcategory folders matching user's homescreen settings
|
||||
case _autoIdHome:
|
||||
return _autoBuildHome();
|
||||
|
||||
// Music
|
||||
case _autoIdMusic:
|
||||
return _autoBuildMusicCategories();
|
||||
case _autoIdPlaylists:
|
||||
return _autoBuildPlaylistList(provider);
|
||||
case _autoIdArtists:
|
||||
return _autoBuildArtistList(provider);
|
||||
case _autoIdAlbums:
|
||||
return _autoBuildAlbumList(provider);
|
||||
case _autoIdFavorites:
|
||||
return _autoBuildFavorites(provider);
|
||||
|
||||
// Audiobooks
|
||||
case _autoIdAudiobooks:
|
||||
return _autoBuildAudiobookCategories();
|
||||
case _autoIdAbAuthors:
|
||||
return _autoBuildAudiobookAuthorList(provider);
|
||||
case _autoIdAbBooks:
|
||||
return _autoBuildAudiobookList(provider);
|
||||
case _autoIdAbSeries:
|
||||
return _autoBuildAudiobookSeriesList(provider);
|
||||
|
||||
// Podcasts
|
||||
case _autoIdPodcasts:
|
||||
return _autoBuildPodcastList(provider);
|
||||
|
||||
// Radio
|
||||
case _autoIdRadio:
|
||||
return _autoBuildRadioList(provider);
|
||||
|
||||
default:
|
||||
// Home row content (home|recent-albums, etc.)
|
||||
if (parentMediaId.startsWith('home|')) {
|
||||
return _autoBuildHomeRowContent(provider, parentMediaId.substring(5));
|
||||
}
|
||||
return _autoBuildDynamicChildren(provider, parentMediaId);
|
||||
}
|
||||
}
|
||||
|
||||
/// Route prefix-based dynamic media IDs (albums, playlists, artists, etc.)
|
||||
Future<List<MediaItem>> _autoBuildDynamicChildren(
|
||||
MusicAssistantProvider provider, String parentMediaId) async {
|
||||
final parts = parentMediaId.split('|');
|
||||
if (parts.length < 2) return [];
|
||||
|
||||
switch (parts[0]) {
|
||||
case 'playlist':
|
||||
if (parts.length >= 3) {
|
||||
return _autoBuildPlaylistTracks(provider, parts[1], parts[2]);
|
||||
}
|
||||
case 'album':
|
||||
if (parts.length >= 3) {
|
||||
return _autoBuildAlbumTracks(provider, parts[1], parts[2]);
|
||||
}
|
||||
case 'artist':
|
||||
final name = parts.sublist(1).join('|');
|
||||
return _autoBuildArtistAlbums(provider, name);
|
||||
case 'podcast':
|
||||
if (parts.length >= 3) {
|
||||
return _autoBuildPodcastEpisodes(provider, parts[1], parts[2]);
|
||||
}
|
||||
case 'ab_author':
|
||||
final authorName = parts.sublist(1).join('|');
|
||||
return _autoBuildAuthorAudiobooks(provider, authorName);
|
||||
case 'ab_series':
|
||||
final seriesPath = parts.sublist(1).join('|');
|
||||
return _autoBuildSeriesAudiobooks(provider, seriesPath);
|
||||
}
|
||||
|
||||
_logger.log('AndroidAuto: unhandled parentMediaId "$parentMediaId"');
|
||||
return [];
|
||||
}
|
||||
|
||||
@override
|
||||
ValueStream<Map<String, dynamic>> subscribeToChildren(String parentMediaId) {
|
||||
_autoChildrenSubjects[parentMediaId] ??= BehaviorSubject.seeded({});
|
||||
return _autoChildrenSubjects[parentMediaId]!.stream;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> playFromMediaId(String mediaId,
|
||||
[Map<String, dynamic>? extras]) async {
|
||||
final provider = _autoProvider;
|
||||
if (provider == null) {
|
||||
_logger.log('AndroidAuto: playFromMediaId called before provider is set');
|
||||
return;
|
||||
}
|
||||
|
||||
final playerId = await SettingsService.getBuiltinPlayerId();
|
||||
if (playerId == null) {
|
||||
_logger.log('AndroidAuto: no builtin player ID — cannot play');
|
||||
return;
|
||||
}
|
||||
|
||||
// Auto-switch to the builtin (local) player when AA triggers playback
|
||||
if (provider.selectedPlayer?.playerId != playerId) {
|
||||
final builtinPlayer = provider.availablePlayersUnfiltered
|
||||
.where((p) => p.playerId == playerId)
|
||||
.firstOrNull;
|
||||
if (builtinPlayer != null) {
|
||||
_logger.log('AndroidAuto: switching to builtin player "${builtinPlayer.name}"');
|
||||
provider.selectPlayer(builtinPlayer);
|
||||
}
|
||||
}
|
||||
|
||||
_logger.log('AndroidAuto: playFromMediaId $mediaId');
|
||||
|
||||
try {
|
||||
if (mediaId.startsWith('track|')) {
|
||||
// Format: track|{tProvider}|{tItemId}|{ctxType}|{ctxProvider}|{ctxId}
|
||||
final parts = mediaId.split('|');
|
||||
if (parts.length < 6) return;
|
||||
final tProvider = parts[1];
|
||||
final tItemId = parts[2];
|
||||
final ctxKey = parts.sublist(3).join('|');
|
||||
|
||||
final trackList = _autoTrackCache[ctxKey];
|
||||
if (trackList == null || trackList.isEmpty) {
|
||||
_logger.log('AndroidAuto: cache miss for $ctxKey, playing single track');
|
||||
await provider.playTrack(
|
||||
playerId,
|
||||
ma.Track(itemId: tItemId, provider: tProvider, name: ''),
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
final index = trackList.indexWhere(
|
||||
(t) => t.provider == tProvider && t.itemId == tItemId,
|
||||
);
|
||||
await provider.playTracks(
|
||||
playerId,
|
||||
trackList,
|
||||
startIndex: index < 0 ? 0 : index,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
if (mediaId.startsWith('radio|')) {
|
||||
// Format: radio|{provider}|{itemId}
|
||||
final parts = mediaId.split('|');
|
||||
if (parts.length < 3) return;
|
||||
if (provider.api == null) await provider.checkAndReconnect();
|
||||
if (provider.api == null) {
|
||||
_logger.log('AndroidAuto: no API, cannot play radio');
|
||||
return;
|
||||
}
|
||||
final station = provider.radioStations.firstWhere(
|
||||
(s) => s.provider == parts[1] && s.itemId == parts[2],
|
||||
orElse: () => provider.radioStationsUnfiltered.firstWhere(
|
||||
(s) => s.provider == parts[1] && s.itemId == parts[2],
|
||||
orElse: () => throw Exception('Radio station not found: $mediaId'),
|
||||
),
|
||||
);
|
||||
await provider.api!.playRadioStation(playerId, station);
|
||||
return;
|
||||
}
|
||||
|
||||
if (mediaId.startsWith('audiobook|')) {
|
||||
// Format: audiobook|{provider}|{itemId}
|
||||
final parts = mediaId.split('|');
|
||||
if (parts.length < 3) return;
|
||||
if (provider.api == null) {
|
||||
await provider.checkAndReconnect();
|
||||
}
|
||||
if (provider.api == null) {
|
||||
_logger.log('AndroidAuto: no API, cannot play audiobook');
|
||||
return;
|
||||
}
|
||||
final book = SyncService.instance.cachedAudiobooks.firstWhere(
|
||||
(b) => b.provider == parts[1] && b.itemId == parts[2],
|
||||
orElse: () => throw Exception('Audiobook not found: $mediaId'),
|
||||
);
|
||||
await provider.api!.playAudiobook(playerId, book);
|
||||
return;
|
||||
}
|
||||
|
||||
if (mediaId.startsWith('podcast_ep|')) {
|
||||
// Format: podcast_ep|{provider}|{itemId}
|
||||
final parts = mediaId.split('|');
|
||||
if (parts.length < 3) return;
|
||||
if (provider.api == null) await provider.checkAndReconnect();
|
||||
if (provider.api == null) {
|
||||
_logger.log('AndroidAuto: no API, cannot play podcast');
|
||||
return;
|
||||
}
|
||||
// Use provider-specific URI (e.g. spotify--xxx://podcast_episode/id)
|
||||
// instead of library:// which fails for non-library items
|
||||
final uri = '${parts[1]}://podcast_episode/${parts[2]}';
|
||||
final episode = ma.MediaItem(
|
||||
itemId: parts[2],
|
||||
provider: parts[1],
|
||||
name: '',
|
||||
mediaType: ma.MediaType.podcastEpisode,
|
||||
uri: uri,
|
||||
);
|
||||
_logger.log('AndroidAuto: playing podcast episode URI: $uri');
|
||||
await provider.api!.playPodcastEpisode(playerId, episode);
|
||||
return;
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('AndroidAuto: playFromMediaId error: $e');
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Future<List<MediaItem>> search(String query,
|
||||
[Map<String, dynamic>? extras]) async {
|
||||
final provider = _autoProvider;
|
||||
if (provider == null || query.trim().isEmpty) return [];
|
||||
|
||||
try {
|
||||
final results = await provider.searchWithCache(query);
|
||||
final tracks = (results['tracks'] ?? []).whereType<ma.Track>().toList();
|
||||
const ctxKey = 'search||';
|
||||
_autoTrackCache[ctxKey] = tracks;
|
||||
return tracks
|
||||
.map((t) => _autoTrackItem(provider, t, ctxKey))
|
||||
.toList();
|
||||
} catch (e) {
|
||||
_logger.log('AndroidAuto: search error: $e');
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
// --- Root & category builders ---
|
||||
|
||||
List<MediaItem> _autoBuildRoot() {
|
||||
return [
|
||||
MediaItem(id: _autoIdHome, title: 'Home', playable: false,
|
||||
artUri: _iconHome),
|
||||
MediaItem(id: _autoIdMusic, title: 'Music', playable: false,
|
||||
artUri: _iconMusic),
|
||||
MediaItem(id: _autoIdAudiobooks, title: 'Audiobooks', playable: false,
|
||||
artUri: _iconBook),
|
||||
MediaItem(id: _autoIdPodcasts, title: 'Podcasts', playable: false,
|
||||
artUri: _iconPodcast, extras: _gridHints),
|
||||
MediaItem(id: _autoIdRadio, title: 'Radio', playable: false,
|
||||
artUri: _iconRadio, extras: _gridHints),
|
||||
];
|
||||
}
|
||||
|
||||
// Row ID → display title mapping
|
||||
static const _homeRowTitles = {
|
||||
'recent-albums': 'Recent Albums',
|
||||
'discover-artists': 'Discover Artists',
|
||||
'discover-albums': 'Discover Albums',
|
||||
'continue-listening': 'Continue Listening',
|
||||
'discover-audiobooks': 'Discover Audiobooks',
|
||||
'discover-series': 'Discover Series',
|
||||
'favorite-albums': 'Favourite Albums',
|
||||
'favorite-artists': 'Favourite Artists',
|
||||
'favorite-tracks': 'Favourite Tracks',
|
||||
'favorite-playlists': 'Favourite Playlists',
|
||||
'favorite-radio-stations': 'Favourite Radio',
|
||||
'favorite-podcasts': 'Favourite Podcasts',
|
||||
};
|
||||
|
||||
/// Home shows subcategory folders matching the user's homescreen settings.
|
||||
Future<List<MediaItem>> _autoBuildHome() async {
|
||||
final rowOrder = await SettingsService.getHomeRowOrder();
|
||||
final items = <MediaItem>[];
|
||||
|
||||
for (final rowId in rowOrder) {
|
||||
if (!await _isHomeRowEnabled(rowId)) continue;
|
||||
final title = _homeRowTitles[rowId];
|
||||
if (title == null) continue; // skip discovery rows for now
|
||||
items.add(MediaItem(
|
||||
id: 'home|$rowId',
|
||||
title: title,
|
||||
playable: false,
|
||||
extras: _gridHints,
|
||||
));
|
||||
}
|
||||
|
||||
_logger.log('AndroidAuto: Home built ${items.length} rows');
|
||||
return items;
|
||||
}
|
||||
|
||||
Future<bool> _isHomeRowEnabled(String rowId) async {
|
||||
switch (rowId) {
|
||||
case 'recent-albums': return SettingsService.getShowRecentAlbums();
|
||||
case 'discover-artists': return SettingsService.getShowDiscoverArtists();
|
||||
case 'discover-albums': return SettingsService.getShowDiscoverAlbums();
|
||||
case 'continue-listening': return SettingsService.getShowContinueListeningAudiobooks();
|
||||
case 'discover-audiobooks': return SettingsService.getShowDiscoverAudiobooks();
|
||||
case 'discover-series': return SettingsService.getShowDiscoverSeries();
|
||||
case 'favorite-albums': return SettingsService.getShowFavoriteAlbums();
|
||||
case 'favorite-artists': return SettingsService.getShowFavoriteArtists();
|
||||
case 'favorite-tracks': return SettingsService.getShowFavoriteTracks();
|
||||
case 'favorite-playlists': return SettingsService.getShowFavoritePlaylists();
|
||||
case 'favorite-radio-stations': return SettingsService.getShowFavoriteRadioStations();
|
||||
case 'favorite-podcasts': return SettingsService.getShowFavoritePodcasts();
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// Build content for a specific home row.
|
||||
Future<List<MediaItem>> _autoBuildHomeRowContent(
|
||||
MusicAssistantProvider provider, String rowId) async {
|
||||
switch (rowId) {
|
||||
case 'recent-albums':
|
||||
var albums = await provider.getRecentAlbumsWithCache();
|
||||
if (albums.isEmpty) albums = SyncService.instance.cachedAlbums.take(20).toList();
|
||||
return albums.take(20).map((a) => MediaItem(
|
||||
id: 'album|${a.provider}|${a.itemId}',
|
||||
title: a.name, artist: a.artistsString,
|
||||
artUri: _autoArtUri(provider, a), playable: false,
|
||||
)).toList();
|
||||
|
||||
case 'discover-artists':
|
||||
var artists = await provider.getDiscoverArtistsWithCache();
|
||||
if (artists.isEmpty) artists = SyncService.instance.cachedArtists.take(10).toList();
|
||||
return artists.take(10).map((a) => MediaItem(
|
||||
id: 'artist|${a.name}',
|
||||
title: a.name,
|
||||
artUri: _autoArtUri(provider, a), playable: false,
|
||||
)).toList();
|
||||
|
||||
case 'discover-albums':
|
||||
final albums = await provider.getDiscoverAlbumsWithCache();
|
||||
return albums.take(20).map((a) => MediaItem(
|
||||
id: 'album|${a.provider}|${a.itemId}',
|
||||
title: a.name, artist: a.artistsString,
|
||||
artUri: _autoArtUri(provider, a), playable: false,
|
||||
)).toList();
|
||||
|
||||
case 'continue-listening':
|
||||
final books = await provider.getInProgressAudiobooksWithCache();
|
||||
return books.map((b) => MediaItem(
|
||||
id: 'audiobook|${b.provider}|${b.itemId}',
|
||||
title: b.name, artist: b.authorsString,
|
||||
artUri: _autoArtUri(provider, b), playable: true,
|
||||
)).toList();
|
||||
|
||||
case 'discover-audiobooks':
|
||||
final books = await provider.getDiscoverAudiobooksWithCache();
|
||||
return books.map((b) => MediaItem(
|
||||
id: 'audiobook|${b.provider}|${b.itemId}',
|
||||
title: b.name, artist: b.authorsString,
|
||||
artUri: _autoArtUri(provider, b), playable: true,
|
||||
)).toList();
|
||||
|
||||
case 'discover-series':
|
||||
return _autoBuildAudiobookSeriesList(provider);
|
||||
|
||||
case 'favorite-albums':
|
||||
final albums = await provider.getFavoriteAlbums();
|
||||
return albums.map((a) => MediaItem(
|
||||
id: 'album|${a.provider}|${a.itemId}',
|
||||
title: a.name, artist: a.artistsString,
|
||||
artUri: _autoArtUri(provider, a), playable: false,
|
||||
)).toList();
|
||||
|
||||
case 'favorite-artists':
|
||||
final artists = await provider.getFavoriteArtists();
|
||||
return artists.map((a) => MediaItem(
|
||||
id: 'artist|${a.name}',
|
||||
title: a.name,
|
||||
artUri: _autoArtUri(provider, a), playable: false,
|
||||
)).toList();
|
||||
|
||||
case 'favorite-tracks':
|
||||
final tracks = await provider.getFavoriteTracks();
|
||||
const ctxKey = 'favs||';
|
||||
_autoTrackCache[ctxKey] = tracks;
|
||||
return tracks.map((t) => _autoTrackItem(provider, t, ctxKey)).toList();
|
||||
|
||||
case 'favorite-playlists':
|
||||
final playlists = await provider.getFavoritePlaylists();
|
||||
return playlists.map((p) => MediaItem(
|
||||
id: 'playlist|${p.provider}|${p.itemId}',
|
||||
title: p.name, artist: p.owner,
|
||||
artUri: _autoArtUri(provider, p), playable: false,
|
||||
)).toList();
|
||||
|
||||
case 'favorite-radio-stations':
|
||||
final stations = await provider.getFavoriteRadioStations();
|
||||
return stations.map((s) => MediaItem(
|
||||
id: 'radio|${s.provider}|${s.itemId}',
|
||||
title: s.name,
|
||||
artUri: _autoArtUri(provider, s), playable: true,
|
||||
)).toList();
|
||||
|
||||
case 'favorite-podcasts':
|
||||
// Use cached podcasts filtered by favorite
|
||||
final podcasts = SyncService.instance.cachedPodcasts
|
||||
.where((p) => p.favorite == true).toList();
|
||||
return podcasts.map((p) => MediaItem(
|
||||
id: 'podcast|${p.provider}|${p.itemId}',
|
||||
title: p.name,
|
||||
artUri: _autoArtUri(provider, p), playable: false,
|
||||
)).toList();
|
||||
|
||||
default:
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
List<MediaItem> _autoBuildMusicCategories() {
|
||||
return [
|
||||
MediaItem(id: _autoIdArtists, title: 'Artists', playable: false,
|
||||
artUri: _iconArtist, extras: _gridHints),
|
||||
MediaItem(id: _autoIdAlbums, title: 'Albums', playable: false,
|
||||
artUri: _iconAlbum, extras: _gridHints),
|
||||
MediaItem(id: _autoIdPlaylists, title: 'Playlists', playable: false,
|
||||
artUri: _iconPlaylist, extras: _gridHints),
|
||||
MediaItem(id: _autoIdFavorites, title: 'Favourites', playable: false,
|
||||
artUri: _iconFavorite),
|
||||
];
|
||||
}
|
||||
|
||||
List<MediaItem> _autoBuildAudiobookCategories() {
|
||||
return [
|
||||
MediaItem(id: _autoIdAbAuthors, title: 'Authors', playable: false,
|
||||
artUri: _iconArtist),
|
||||
MediaItem(id: _autoIdAbBooks, title: 'Books', playable: false,
|
||||
artUri: _iconBook, extras: _gridHints),
|
||||
MediaItem(id: _autoIdAbSeries, title: 'Series', playable: false,
|
||||
artUri: _iconBook, extras: _gridHints),
|
||||
];
|
||||
}
|
||||
|
||||
// --- Music builders ---
|
||||
|
||||
Future<List<MediaItem>> _autoBuildFavorites(
|
||||
MusicAssistantProvider provider) async {
|
||||
final tracks = await provider.getFavoriteTracks();
|
||||
_logger.log('AndroidAuto: Favorites returned ${tracks.length} tracks');
|
||||
const ctxKey = 'favs||';
|
||||
_autoTrackCache[ctxKey] = tracks;
|
||||
return tracks.map((t) => _autoTrackItem(provider, t, ctxKey)).toList();
|
||||
}
|
||||
|
||||
List<MediaItem> _autoBuildPlaylistList(MusicAssistantProvider provider) {
|
||||
final playlists = SyncService.instance.cachedPlaylists;
|
||||
_logger.log('AndroidAuto: Playlists: ${playlists.length}');
|
||||
return playlists.map((p) => MediaItem(
|
||||
id: 'playlist|${p.provider}|${p.itemId}',
|
||||
title: p.name,
|
||||
artist: p.owner,
|
||||
artUri: _autoArtUri(provider, p),
|
||||
playable: false,
|
||||
)).toList();
|
||||
}
|
||||
|
||||
Future<List<MediaItem>> _autoBuildPlaylistTracks(
|
||||
MusicAssistantProvider provider, String plProvider, String plItemId) async {
|
||||
final tracks =
|
||||
await provider.getPlaylistTracksWithCache(plProvider, plItemId);
|
||||
final ctxKey = 'plist|$plProvider|$plItemId';
|
||||
_autoTrackCache[ctxKey] = tracks;
|
||||
return tracks.map((t) => _autoTrackItem(provider, t, ctxKey)).toList();
|
||||
}
|
||||
|
||||
List<MediaItem> _autoBuildArtistList(MusicAssistantProvider provider) {
|
||||
final artists = SyncService.instance.cachedArtists;
|
||||
_logger.log('AndroidAuto: Artists: ${artists.length}');
|
||||
return artists.map((a) => MediaItem(
|
||||
id: 'artist|${a.name}',
|
||||
title: a.name,
|
||||
artUri: _autoArtUri(provider, a),
|
||||
playable: false,
|
||||
)).toList();
|
||||
}
|
||||
|
||||
Future<List<MediaItem>> _autoBuildArtistAlbums(
|
||||
MusicAssistantProvider provider, String artistName) async {
|
||||
var albums = await provider.getArtistAlbumsWithCache(artistName);
|
||||
if (albums.isEmpty) {
|
||||
// Fallback to library if API unavailable
|
||||
albums = provider.getArtistAlbumsFromLibrary(artistName);
|
||||
}
|
||||
_logger.log('AndroidAuto: Artist "$artistName" albums: ${albums.length}');
|
||||
return albums.map((a) => MediaItem(
|
||||
id: 'album|${a.provider}|${a.itemId}',
|
||||
title: a.name,
|
||||
artist: a.artistsString,
|
||||
artUri: _autoArtUri(provider, a),
|
||||
playable: false,
|
||||
)).toList();
|
||||
}
|
||||
|
||||
List<MediaItem> _autoBuildAlbumList(MusicAssistantProvider provider) {
|
||||
final albums = SyncService.instance.cachedAlbums;
|
||||
_logger.log('AndroidAuto: Albums: ${albums.length}');
|
||||
return albums.map((a) => MediaItem(
|
||||
id: 'album|${a.provider}|${a.itemId}',
|
||||
title: a.name,
|
||||
artist: a.artistsString,
|
||||
artUri: _autoArtUri(provider, a),
|
||||
playable: false,
|
||||
)).toList();
|
||||
}
|
||||
|
||||
Future<List<MediaItem>> _autoBuildAlbumTracks(
|
||||
MusicAssistantProvider provider, String alProvider, String alItemId) async {
|
||||
final tracks =
|
||||
await provider.getAlbumTracksWithCache(alProvider, alItemId);
|
||||
_logger.log('AndroidAuto: Album $alProvider/$alItemId tracks: ${tracks.length}');
|
||||
final ctxKey = 'album|$alProvider|$alItemId';
|
||||
_autoTrackCache[ctxKey] = tracks;
|
||||
return tracks.map((t) => _autoTrackItem(provider, t, ctxKey)).toList();
|
||||
}
|
||||
|
||||
// --- Audiobook builders ---
|
||||
|
||||
List<MediaItem> _autoBuildAudiobookAuthorList(
|
||||
MusicAssistantProvider provider) {
|
||||
final books = SyncService.instance.cachedAudiobooks;
|
||||
final seen = <String>{};
|
||||
final items = <MediaItem>[];
|
||||
for (final b in books) {
|
||||
final author = b.authorsString;
|
||||
if (seen.add(author)) {
|
||||
items.add(MediaItem(
|
||||
id: 'ab_author|$author',
|
||||
title: author,
|
||||
artUri: _autoArtUri(provider, b),
|
||||
playable: false,
|
||||
));
|
||||
}
|
||||
}
|
||||
_logger.log('AndroidAuto: Audiobook authors: ${items.length}');
|
||||
return items;
|
||||
}
|
||||
|
||||
List<MediaItem> _autoBuildAuthorAudiobooks(
|
||||
MusicAssistantProvider provider, String authorName) {
|
||||
final books = SyncService.instance.cachedAudiobooks
|
||||
.where((b) => b.authorsString == authorName)
|
||||
.toList();
|
||||
return books.map((b) => MediaItem(
|
||||
id: 'audiobook|${b.provider}|${b.itemId}',
|
||||
title: b.name,
|
||||
artist: b.authorsString,
|
||||
artUri: _autoArtUri(provider, b),
|
||||
playable: true,
|
||||
)).toList();
|
||||
}
|
||||
|
||||
Future<List<MediaItem>> _autoBuildAudiobookList(MusicAssistantProvider provider) async {
|
||||
var books = SyncService.instance.cachedAudiobooks;
|
||||
if (books.isEmpty) {
|
||||
// Sync cache may not be loaded yet — wait for it
|
||||
_logger.log('AndroidAuto: cachedAudiobooks empty, loading from cache');
|
||||
await SyncService.instance.loadFromCache();
|
||||
books = SyncService.instance.cachedAudiobooks;
|
||||
}
|
||||
_logger.log('AndroidAuto: Books: ${books.length}');
|
||||
// Sort alphabetically and cap to avoid overwhelming Android Auto
|
||||
books.sort((a, b) => a.name.compareTo(b.name));
|
||||
return books.take(500).map((b) => MediaItem(
|
||||
id: 'audiobook|${b.provider}|${b.itemId}',
|
||||
title: b.name,
|
||||
artist: b.authorsString,
|
||||
artUri: _autoArtUri(provider, b),
|
||||
playable: true,
|
||||
)).toList();
|
||||
}
|
||||
|
||||
Future<List<MediaItem>> _autoBuildAudiobookSeriesList(
|
||||
MusicAssistantProvider provider) async {
|
||||
final series = await provider.getDiscoverSeriesWithCache();
|
||||
_logger.log('AndroidAuto: Audiobook series: ${series.length}');
|
||||
final items = <MediaItem>[];
|
||||
for (final s in series) {
|
||||
// Use first book's artwork instead of series mosaic thumbnail
|
||||
Uri? artUri;
|
||||
var cachedBooks = provider.getCachedSeriesAudiobooks(s.id);
|
||||
if (cachedBooks == null || cachedBooks.isEmpty) {
|
||||
// Fetch books for this series (result is cached for future use)
|
||||
try {
|
||||
cachedBooks = await provider.getSeriesAudiobooksWithCache(s.id);
|
||||
} catch (_) {}
|
||||
}
|
||||
if (cachedBooks != null && cachedBooks.isNotEmpty) {
|
||||
artUri = _autoArtUri(provider, cachedBooks.first);
|
||||
}
|
||||
items.add(MediaItem(
|
||||
id: 'ab_series|${s.id}',
|
||||
title: s.name,
|
||||
artUri: artUri,
|
||||
playable: false,
|
||||
));
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
Future<List<MediaItem>> _autoBuildSeriesAudiobooks(
|
||||
MusicAssistantProvider provider, String seriesPath) async {
|
||||
final books = await provider.getSeriesAudiobooksWithCache(seriesPath);
|
||||
return books.map((b) => MediaItem(
|
||||
id: 'audiobook|${b.provider}|${b.itemId}',
|
||||
title: b.name,
|
||||
artist: b.authorsString,
|
||||
artUri: _autoArtUri(provider, b),
|
||||
playable: true,
|
||||
)).toList();
|
||||
}
|
||||
|
||||
// --- Podcast builders ---
|
||||
|
||||
List<MediaItem> _autoBuildPodcastList(MusicAssistantProvider provider) {
|
||||
final podcasts = SyncService.instance.cachedPodcasts;
|
||||
_logger.log('AndroidAuto: Podcasts: ${podcasts.length}');
|
||||
return podcasts.map((p) => MediaItem(
|
||||
id: 'podcast|${p.provider}|${p.itemId}',
|
||||
title: p.name,
|
||||
artUri: _autoArtUri(provider, p),
|
||||
playable: false,
|
||||
)).toList();
|
||||
}
|
||||
|
||||
Future<List<MediaItem>> _autoBuildPodcastEpisodes(
|
||||
MusicAssistantProvider provider, String podProvider, String podItemId) async {
|
||||
final episodes = await provider.getPodcastEpisodesWithCache(
|
||||
podItemId,
|
||||
provider: podProvider,
|
||||
);
|
||||
return episodes.map((e) => MediaItem(
|
||||
id: 'podcast_ep|${e.provider}|${e.itemId}',
|
||||
title: e.name,
|
||||
duration: e.duration,
|
||||
artUri: _autoArtUri(provider, e),
|
||||
playable: true,
|
||||
)).toList();
|
||||
}
|
||||
|
||||
// --- Radio builder ---
|
||||
|
||||
Future<List<MediaItem>> _autoBuildRadioList(MusicAssistantProvider provider) async {
|
||||
// Radio stations are lazily loaded — trigger load if empty
|
||||
if (provider.radioStations.isEmpty) {
|
||||
_logger.log('AndroidAuto: Radio empty, loading stations');
|
||||
await provider.loadRadioStations();
|
||||
}
|
||||
final stations = provider.radioStations;
|
||||
_logger.log('AndroidAuto: Radio stations: ${stations.length}');
|
||||
return stations.map((s) => MediaItem(
|
||||
id: 'radio|${s.provider}|${s.itemId}',
|
||||
title: s.name,
|
||||
artUri: _autoArtUri(provider, s),
|
||||
playable: true,
|
||||
)).toList();
|
||||
}
|
||||
|
||||
// --- Helpers ---
|
||||
|
||||
MediaItem _autoTrackItem(
|
||||
MusicAssistantProvider provider, ma.Track t, String ctxKey) {
|
||||
return MediaItem(
|
||||
id: 'track|${t.provider}|${t.itemId}|$ctxKey',
|
||||
title: t.name,
|
||||
artist: t.artistsString,
|
||||
album: t.album?.name,
|
||||
duration: t.duration,
|
||||
artUri: _autoArtUri(provider, t),
|
||||
playable: true,
|
||||
);
|
||||
}
|
||||
|
||||
Uri? _autoArtUri(MusicAssistantProvider provider, ma.MediaItem item) {
|
||||
final url = provider.getImageUrl(item, size: 256);
|
||||
return url != null ? Uri.tryParse(url) : null;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/// Dispose of resources and cancel all subscriptions
|
||||
Future<void> dispose() async {
|
||||
await _interruptionSubscription?.cancel();
|
||||
|
||||
@@ -55,9 +55,6 @@ class CacheService {
|
||||
final Map<String, Track?> _playerTrackCache = {};
|
||||
final Map<String, DateTime> _playerTrackCacheTime = {};
|
||||
|
||||
// Last-known track cache (survives idle-out, for resume after Chromecast idle)
|
||||
final Map<String, Track> _lastKnownTrackCache = {};
|
||||
|
||||
// ============================================================================
|
||||
// HOME SCREEN ROW CACHING
|
||||
// ============================================================================
|
||||
@@ -322,7 +319,6 @@ class CacheService {
|
||||
_albumTracksCacheTime[cacheKey] = DateTime.now();
|
||||
_evictOldestEntries(_albumTracksCache, _albumTracksCacheTime, _maxDetailCacheSize);
|
||||
_logger.log('✅ Cached ${tracks.length} tracks for album $cacheKey');
|
||||
_persistDetailTracks('album', cacheKey, tracks);
|
||||
}
|
||||
|
||||
/// Invalidate album tracks cache for a specific album
|
||||
@@ -357,7 +353,6 @@ class CacheService {
|
||||
_playlistTracksCacheTime[cacheKey] = DateTime.now();
|
||||
_evictOldestEntries(_playlistTracksCache, _playlistTracksCacheTime, _maxDetailCacheSize);
|
||||
_logger.log('✅ Cached ${tracks.length} tracks for playlist $cacheKey');
|
||||
_persistDetailTracks('playlist', cacheKey, tracks);
|
||||
}
|
||||
|
||||
/// Invalidate playlist tracks cache for a specific playlist
|
||||
@@ -489,14 +484,6 @@ class CacheService {
|
||||
_playerTrackCacheTime.remove(playerId);
|
||||
}
|
||||
|
||||
/// Get last-known track for a player (survives idle-out)
|
||||
Track? getLastKnownTrack(String playerId) => _lastKnownTrackCache[playerId];
|
||||
|
||||
/// Save last-known track for a player (only called when a real track is playing/paused)
|
||||
void setLastKnownTrack(String playerId, Track track) {
|
||||
_lastKnownTrackCache[playerId] = track;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// CLEAR ALL
|
||||
// ============================================================================
|
||||
@@ -513,21 +500,7 @@ class CacheService {
|
||||
_searchCacheTime.clear();
|
||||
_playerTrackCache.clear();
|
||||
_playerTrackCacheTime.clear();
|
||||
_audiobookDetailCache.clear();
|
||||
_audiobookDetailCacheTime.clear();
|
||||
_podcastEpisodesCache.clear();
|
||||
_podcastEpisodesCacheTime.clear();
|
||||
_logger.log('🗑️ All detail caches cleared');
|
||||
// Also clear DB detail cache
|
||||
() async {
|
||||
try {
|
||||
if (DatabaseService.instance.isInitialized) {
|
||||
await DatabaseService.instance.clearDetailTrackCache();
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to clear detail track DB cache: $e');
|
||||
}
|
||||
}();
|
||||
}
|
||||
|
||||
/// Clear all caches
|
||||
@@ -671,177 +644,4 @@ class CacheService {
|
||||
_logger.log('🗑️ LRU evicted ${keysToRemove.length} cache entries');
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// AUDIOBOOK DETAIL CACHING
|
||||
// ============================================================================
|
||||
|
||||
final Map<String, String> _audiobookDetailCache = {}; // cacheKey -> JSON
|
||||
final Map<String, DateTime> _audiobookDetailCacheTime = {};
|
||||
|
||||
bool isAudiobookDetailCacheValid(String cacheKey, {bool forceRefresh = false}) {
|
||||
if (forceRefresh) return false;
|
||||
final cacheTime = _audiobookDetailCacheTime[cacheKey];
|
||||
return _audiobookDetailCache.containsKey(cacheKey) &&
|
||||
cacheTime != null &&
|
||||
DateTime.now().difference(cacheTime) < const Duration(minutes: 5);
|
||||
}
|
||||
|
||||
String? getCachedAudiobookDetail(String cacheKey) => _audiobookDetailCache[cacheKey];
|
||||
|
||||
void setCachedAudiobookDetail(String cacheKey, String audiobookJson) {
|
||||
_audiobookDetailCache[cacheKey] = audiobookJson;
|
||||
_audiobookDetailCacheTime[cacheKey] = DateTime.now();
|
||||
_evictOldestEntries(_audiobookDetailCache, _audiobookDetailCacheTime, _maxDetailCacheSize);
|
||||
_logger.log('✅ Cached audiobook detail for $cacheKey');
|
||||
_persistDetailData('audiobook', cacheKey, audiobookJson);
|
||||
}
|
||||
|
||||
Future<String?> getAudiobookDetailWithDbFallback(String cacheKey) async {
|
||||
final memCached = _audiobookDetailCache[cacheKey];
|
||||
if (memCached != null) return memCached;
|
||||
|
||||
try {
|
||||
if (!DatabaseService.instance.isInitialized) return null;
|
||||
final dbResult = await DatabaseService.instance.getDetailTracks('audiobook', cacheKey);
|
||||
if (dbResult == null) return null;
|
||||
|
||||
_audiobookDetailCache[cacheKey] = dbResult.tracksJson;
|
||||
_audiobookDetailCacheTime[cacheKey] = dbResult.lastFetched;
|
||||
_logger.log('📦 Loaded audiobook detail from database for $cacheKey');
|
||||
return dbResult.tracksJson;
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to load audiobook detail from database: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// PODCAST EPISODE CACHING
|
||||
// ============================================================================
|
||||
|
||||
final Map<String, List<MediaItem>> _podcastEpisodesCache = {};
|
||||
final Map<String, DateTime> _podcastEpisodesCacheTime = {};
|
||||
|
||||
bool isPodcastEpisodesCacheValid(String cacheKey, {bool forceRefresh = false}) {
|
||||
if (forceRefresh) return false;
|
||||
final cacheTime = _podcastEpisodesCacheTime[cacheKey];
|
||||
return _podcastEpisodesCache.containsKey(cacheKey) &&
|
||||
cacheTime != null &&
|
||||
DateTime.now().difference(cacheTime) < const Duration(minutes: 5);
|
||||
}
|
||||
|
||||
List<MediaItem>? getCachedPodcastEpisodes(String cacheKey) => _podcastEpisodesCache[cacheKey];
|
||||
|
||||
void setCachedPodcastEpisodes(String cacheKey, List<MediaItem> episodes) {
|
||||
_podcastEpisodesCache[cacheKey] = episodes;
|
||||
_podcastEpisodesCacheTime[cacheKey] = DateTime.now();
|
||||
_evictOldestEntries(_podcastEpisodesCache, _podcastEpisodesCacheTime, _maxDetailCacheSize);
|
||||
_logger.log('✅ Cached ${episodes.length} episodes for podcast $cacheKey');
|
||||
_persistDetailMediaItems('podcast', cacheKey, episodes);
|
||||
}
|
||||
|
||||
Future<List<MediaItem>?> getPodcastEpisodesWithDbFallback(String cacheKey) async {
|
||||
final memCached = _podcastEpisodesCache[cacheKey];
|
||||
if (memCached != null) return memCached;
|
||||
|
||||
try {
|
||||
if (!DatabaseService.instance.isInitialized) return null;
|
||||
final dbResult = await DatabaseService.instance.getDetailTracks('podcast', cacheKey);
|
||||
if (dbResult == null) return null;
|
||||
|
||||
final episodes = (jsonDecode(dbResult.tracksJson) as List)
|
||||
.map((json) => MediaItem.fromJson(json as Map<String, dynamic>))
|
||||
.toList();
|
||||
|
||||
_podcastEpisodesCache[cacheKey] = episodes;
|
||||
_podcastEpisodesCacheTime[cacheKey] = dbResult.lastFetched;
|
||||
_logger.log('📦 Loaded ${episodes.length} podcast episodes from database for $cacheKey');
|
||||
return episodes;
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to load podcast episodes from database: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// DATABASE PERSISTENCE FOR DETAIL TRACKS
|
||||
// ============================================================================
|
||||
|
||||
/// Persist detail tracks to database (fire-and-forget)
|
||||
void _persistDetailTracks(String parentType, String cacheKey, List<Track> tracks) {
|
||||
_persistDetailData(parentType, cacheKey, jsonEncode(tracks.map((t) => t.toJson()).toList()));
|
||||
}
|
||||
|
||||
/// Persist detail media items to database (fire-and-forget)
|
||||
void _persistDetailMediaItems(String parentType, String cacheKey, List<MediaItem> items) {
|
||||
_persistDetailData(parentType, cacheKey, jsonEncode(items.map((i) => i.toJson()).toList()));
|
||||
}
|
||||
|
||||
/// Persist raw JSON detail data to database (fire-and-forget)
|
||||
void _persistDetailData(String parentType, String cacheKey, String dataJson) {
|
||||
() async {
|
||||
try {
|
||||
if (!DatabaseService.instance.isInitialized) return;
|
||||
await DatabaseService.instance.saveDetailTracks(parentType, cacheKey, dataJson);
|
||||
_logger.log('💾 Persisted detail data ($parentType/$cacheKey) to database');
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to persist detail data: $e');
|
||||
}
|
||||
}();
|
||||
}
|
||||
|
||||
/// Get album tracks with database fallback (memory → DB → null)
|
||||
Future<List<Track>?> getAlbumTracksWithDbFallback(String cacheKey) async {
|
||||
// Check memory cache first
|
||||
final memCached = _albumTracksCache[cacheKey];
|
||||
if (memCached != null) return memCached;
|
||||
|
||||
// Try database
|
||||
try {
|
||||
if (!DatabaseService.instance.isInitialized) return null;
|
||||
final dbResult = await DatabaseService.instance.getDetailTracks('album', cacheKey);
|
||||
if (dbResult == null) return null;
|
||||
|
||||
final tracks = (jsonDecode(dbResult.tracksJson) as List)
|
||||
.map((json) => Track.fromJson(json as Map<String, dynamic>))
|
||||
.toList();
|
||||
|
||||
// Warm memory cache
|
||||
_albumTracksCache[cacheKey] = tracks;
|
||||
_albumTracksCacheTime[cacheKey] = dbResult.lastFetched;
|
||||
_logger.log('📦 Loaded ${tracks.length} album tracks from database for $cacheKey');
|
||||
return tracks;
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to load album tracks from database: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Get playlist tracks with database fallback (memory → DB → null)
|
||||
Future<List<Track>?> getPlaylistTracksWithDbFallback(String cacheKey) async {
|
||||
// Check memory cache first
|
||||
final memCached = _playlistTracksCache[cacheKey];
|
||||
if (memCached != null) return memCached;
|
||||
|
||||
// Try database
|
||||
try {
|
||||
if (!DatabaseService.instance.isInitialized) return null;
|
||||
final dbResult = await DatabaseService.instance.getDetailTracks('playlist', cacheKey);
|
||||
if (dbResult == null) return null;
|
||||
|
||||
final tracks = (jsonDecode(dbResult.tracksJson) as List)
|
||||
.map((json) => Track.fromJson(json as Map<String, dynamic>))
|
||||
.toList();
|
||||
|
||||
// Warm memory cache
|
||||
_playlistTracksCache[cacheKey] = tracks;
|
||||
_playlistTracksCacheTime[cacheKey] = dbResult.lastFetched;
|
||||
_logger.log('📦 Loaded ${tracks.length} playlist tracks from database for $cacheKey');
|
||||
return tracks;
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to load playlist tracks from database: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -323,23 +323,6 @@ class DatabaseService {
|
||||
/// Clear all search history
|
||||
Future<void> clearSearchHistory() => db.clearSearchHistory();
|
||||
|
||||
// ============================================
|
||||
// Detail Track Cache Convenience Methods
|
||||
// ============================================
|
||||
|
||||
/// Save detail tracks for an album or playlist
|
||||
Future<void> saveDetailTracks(String parentType, String parentKey, String tracksJson) {
|
||||
return db.saveDetailTracks(parentType, parentKey, tracksJson);
|
||||
}
|
||||
|
||||
/// Get cached detail tracks for an album or playlist
|
||||
Future<DetailTrackCacheData?> getDetailTracks(String parentType, String parentKey) {
|
||||
return db.getDetailTracks(parentType, parentKey);
|
||||
}
|
||||
|
||||
/// Clear all detail track cache
|
||||
Future<void> clearDetailTrackCache() => db.clearDetailTrackCache();
|
||||
|
||||
// ============================================
|
||||
// Cast-to-Sendspin Mapping Methods
|
||||
// ============================================
|
||||
|
||||
@@ -1,175 +0,0 @@
|
||||
import '../models/player.dart';
|
||||
import 'debug_logger.dart';
|
||||
|
||||
/// Manages volume state for group players where the MA API returns null volume.
|
||||
///
|
||||
/// Both pre-configured speaker groups (provider == 'player_group') and dynamic
|
||||
/// sync groups (ID typically starts with 'syncgroup_') don't have their own
|
||||
/// volume_level in the MA API. This manager computes an effective volume from
|
||||
/// group members and caches recently-set volumes to prevent slider snap-back.
|
||||
class GroupVolumeManager {
|
||||
final _logger = DebugLogger();
|
||||
|
||||
// Cache of last-set volume per group player ID.
|
||||
// Prevents slider snap-back between setVolume() and next player_updated event.
|
||||
final Map<String, int> _pendingVolumes = {};
|
||||
|
||||
// Timestamps for pending volumes - used to expire stale entries
|
||||
final Map<String, DateTime> _pendingTimestamps = {};
|
||||
|
||||
// How long to trust a pending volume before falling back to computed average.
|
||||
// For group players the API never returns a volume, so we keep the pending
|
||||
// value until the computed member average converges (within tolerance) or
|
||||
// until a generous timeout to avoid leaking state forever.
|
||||
static const Duration _pendingTimeout = Duration(seconds: 30);
|
||||
|
||||
// If the computed member average is within this many points of the pending
|
||||
// value, we consider the server to have confirmed it and clear the pending.
|
||||
static const int _confirmationTolerance = 3;
|
||||
|
||||
/// Check if a player is a group player that needs computed volume.
|
||||
///
|
||||
/// Detects both:
|
||||
/// - Pre-configured MA speaker groups (provider == 'player_group')
|
||||
/// - Dynamic sync groups (have group members but API returns null volume)
|
||||
bool isGroupPlayer(Player player) {
|
||||
// Pre-configured MA speaker groups
|
||||
if (player.provider == 'player_group') return true;
|
||||
// Dynamic sync groups: have multiple group members but MA returns null volume
|
||||
if (player.groupMembers != null &&
|
||||
player.groupMembers!.length > 1 &&
|
||||
player.volumeLevel == null) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// Get the effective volume for a player.
|
||||
///
|
||||
/// For non-group players: returns player.volumeLevel (unchanged behavior).
|
||||
/// For group players: returns cached pending volume if recent, otherwise
|
||||
/// computes average from group members.
|
||||
///
|
||||
/// [player] - The player to get volume for.
|
||||
/// [allPlayers] - All available players (needed to look up group members).
|
||||
///
|
||||
/// Returns volume as int 0-100, or null if no volume can be determined.
|
||||
int? getEffectiveVolumeLevel(Player player, List<Player> allPlayers) {
|
||||
if (!isGroupPlayer(player)) {
|
||||
return player.volumeLevel;
|
||||
}
|
||||
|
||||
// Check for a pending (just-set) volume
|
||||
final pending = _pendingVolumes[player.playerId];
|
||||
if (pending != null) {
|
||||
final timestamp = _pendingTimestamps[player.playerId];
|
||||
if (timestamp != null &&
|
||||
DateTime.now().difference(timestamp) < _pendingTimeout) {
|
||||
// Compute member average to see if server has converged
|
||||
final memberAvg = _computeGroupVolume(player, allPlayers);
|
||||
if (memberAvg != null && (memberAvg - pending).abs() <= _confirmationTolerance) {
|
||||
// Server confirmed — member average matches what we set
|
||||
_pendingVolumes.remove(player.playerId);
|
||||
_pendingTimestamps.remove(player.playerId);
|
||||
_logger.debug(
|
||||
'GroupVolume: Convergence confirmed for ${player.name}: '
|
||||
'pending=$pending, memberAvg=$memberAvg',
|
||||
context: 'GroupVolumeManager');
|
||||
return memberAvg;
|
||||
}
|
||||
// Not yet confirmed — keep showing the pending value
|
||||
_logger.debug(
|
||||
'GroupVolume: Pending protection active for ${player.name}: '
|
||||
'pending=$pending, memberAvg=$memberAvg, '
|
||||
'elapsed=${DateTime.now().difference(timestamp).inSeconds}s',
|
||||
context: 'GroupVolumeManager');
|
||||
return pending;
|
||||
}
|
||||
// Expired after generous timeout — remove it
|
||||
_logger.debug(
|
||||
'GroupVolume: Pending expired for ${player.name} after ${_pendingTimeout.inSeconds}s, '
|
||||
'falling back to computed average',
|
||||
context: 'GroupVolumeManager');
|
||||
_pendingVolumes.remove(player.playerId);
|
||||
_pendingTimestamps.remove(player.playerId);
|
||||
}
|
||||
|
||||
// Compute average from group members
|
||||
return _computeGroupVolume(player, allPlayers);
|
||||
}
|
||||
|
||||
/// Compute the average volume across all group members.
|
||||
/// Recursively resolves nested group members (MA sometimes makes the first
|
||||
/// member of a group also a group player, which returns null for volumeLevel).
|
||||
/// Returns null if no members have a valid volume.
|
||||
int? _computeGroupVolume(Player groupPlayer, List<Player> allPlayers,
|
||||
{int depth = 0}) {
|
||||
// Prevent infinite recursion from circular group references
|
||||
if (depth > 3) return null;
|
||||
|
||||
final memberIds = groupPlayer.groupMembers;
|
||||
if (memberIds == null || memberIds.isEmpty) {
|
||||
_logger.debug('GroupVolume: No group members for ${groupPlayer.name}',
|
||||
context: 'GroupVolumeManager');
|
||||
return null;
|
||||
}
|
||||
|
||||
int totalVolume = 0;
|
||||
int count = 0;
|
||||
|
||||
for (final memberId in memberIds) {
|
||||
// Skip self-references (groupMembers can include the group's own ID)
|
||||
if (memberId == groupPlayer.playerId) continue;
|
||||
|
||||
final member =
|
||||
allPlayers.where((p) => p.playerId == memberId).firstOrNull;
|
||||
if (member == null) continue;
|
||||
|
||||
if (member.volumeLevel != null) {
|
||||
totalVolume += member.volumeLevel!;
|
||||
count++;
|
||||
} else if (isGroupPlayer(member)) {
|
||||
// Nested group player — MA returns null volumeLevel for these.
|
||||
// Recursively compute from the nested group's own members.
|
||||
final subVolume =
|
||||
_computeGroupVolume(member, allPlayers, depth: depth + 1);
|
||||
if (subVolume != null) {
|
||||
totalVolume += subVolume;
|
||||
count++;
|
||||
_logger.debug(
|
||||
'GroupVolume: Resolved nested group ${member.name} → volume $subVolume',
|
||||
context: 'GroupVolumeManager');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (count == 0) {
|
||||
_logger.debug(
|
||||
'GroupVolume: No members with volume for ${groupPlayer.name} '
|
||||
'(${memberIds.length} members checked, depth=$depth)',
|
||||
context: 'GroupVolumeManager');
|
||||
return null;
|
||||
}
|
||||
|
||||
final avg = (totalVolume / count).round();
|
||||
_logger.debug(
|
||||
'GroupVolume: ${groupPlayer.name} average=$avg from $count members '
|
||||
'(total=$totalVolume, depth=$depth)',
|
||||
context: 'GroupVolumeManager');
|
||||
return avg;
|
||||
}
|
||||
|
||||
/// Record that a volume was just set on a group player.
|
||||
/// This prevents the slider from snapping back to 0 before the
|
||||
/// MA server processes the volume change on all members.
|
||||
void onVolumeSet(String playerId, int volumeLevel) {
|
||||
_pendingVolumes[playerId] = volumeLevel;
|
||||
_pendingTimestamps[playerId] = DateTime.now();
|
||||
}
|
||||
|
||||
/// Clear all cached state (e.g., on disconnect)
|
||||
void clear() {
|
||||
_pendingVolumes.clear();
|
||||
_pendingTimestamps.clear();
|
||||
}
|
||||
}
|
||||
@@ -7,11 +7,6 @@ import 'debug_logger.dart';
|
||||
///
|
||||
/// For MA players: intercept buttons and send volume commands via API
|
||||
/// For builtin player: let native volume work (don't intercept)
|
||||
///
|
||||
/// Also provides a volume observer for lockscreen volume changes.
|
||||
/// When the app is in the background/lockscreen, dispatchKeyEvent doesn't fire,
|
||||
/// so the observer watches system STREAM_MUSIC volume changes and sends
|
||||
/// absolute volume values to Flutter for routing to the MA player.
|
||||
class HardwareVolumeService {
|
||||
static final HardwareVolumeService _instance = HardwareVolumeService._internal();
|
||||
factory HardwareVolumeService() => _instance;
|
||||
@@ -22,25 +17,16 @@ class HardwareVolumeService {
|
||||
|
||||
final _volumeUpController = StreamController<void>.broadcast();
|
||||
final _volumeDownController = StreamController<void>.broadcast();
|
||||
final _absoluteVolumeController = StreamController<int>.broadcast();
|
||||
|
||||
Stream<void> get onVolumeUp => _volumeUpController.stream;
|
||||
Stream<void> get onVolumeDown => _volumeDownController.stream;
|
||||
|
||||
/// Stream of absolute volume values (0-100) from lockscreen hardware buttons.
|
||||
/// Fires when the system STREAM_MUSIC volume changes while the volume
|
||||
/// observer is active (remote/group player selected, app in background).
|
||||
Stream<int> get onAbsoluteVolumeChange => _absoluteVolumeController.stream;
|
||||
|
||||
bool _isListening = false;
|
||||
bool get isListening => _isListening;
|
||||
|
||||
bool _isIntercepting = false;
|
||||
bool get isIntercepting => _isIntercepting;
|
||||
|
||||
bool _isObservingVolume = false;
|
||||
bool get isObservingVolume => _isObservingVolume;
|
||||
|
||||
/// Initialize the service and start listening for volume button events
|
||||
Future<void> init() async {
|
||||
if (_isListening) return;
|
||||
@@ -53,11 +39,6 @@ class HardwareVolumeService {
|
||||
case 'volumeDown':
|
||||
_volumeDownController.add(null);
|
||||
break;
|
||||
case 'absoluteVolumeChange':
|
||||
// Volume changed from lockscreen/background via ContentObserver
|
||||
final volume = call.arguments as int? ?? 0;
|
||||
_absoluteVolumeController.add(volume);
|
||||
break;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -89,53 +70,8 @@ class HardwareVolumeService {
|
||||
}
|
||||
}
|
||||
|
||||
/// Start the volume observer for lockscreen/background volume changes.
|
||||
/// When active, system STREAM_MUSIC volume changes are detected and sent
|
||||
/// to Flutter via [onAbsoluteVolumeChange]. Optionally sets the system
|
||||
/// volume to [initialVolume] (0-100) to match the MA player's current volume.
|
||||
Future<void> startVolumeObserver({int? initialVolume}) async {
|
||||
if (_isObservingVolume) return;
|
||||
|
||||
try {
|
||||
await _channel.invokeMethod('startVolumeObserver', {
|
||||
if (initialVolume != null) 'initialVolume': initialVolume,
|
||||
});
|
||||
_isObservingVolume = true;
|
||||
_logger.info('Volume observer started', context: 'VolumeService');
|
||||
} catch (e) {
|
||||
_logger.error('Failed to start volume observer', context: 'VolumeService', error: e);
|
||||
}
|
||||
}
|
||||
|
||||
/// Stop the volume observer.
|
||||
Future<void> stopVolumeObserver() async {
|
||||
if (!_isObservingVolume) return;
|
||||
|
||||
try {
|
||||
await _channel.invokeMethod('stopVolumeObserver');
|
||||
_isObservingVolume = false;
|
||||
_logger.info('Volume observer stopped', context: 'VolumeService');
|
||||
} catch (e) {
|
||||
_logger.error('Failed to stop volume observer', context: 'VolumeService', error: e);
|
||||
}
|
||||
}
|
||||
|
||||
/// Sync the system volume to match the MA player volume (0-100).
|
||||
/// Used to keep the system volume HUD in sync with the MA player.
|
||||
Future<void> syncSystemVolume(int maVolume) async {
|
||||
try {
|
||||
await _channel.invokeMethod('syncSystemVolume', {'volume': maVolume});
|
||||
} catch (e) {
|
||||
_logger.error('Failed to sync system volume', context: 'VolumeService', error: e);
|
||||
}
|
||||
}
|
||||
|
||||
/// Stop listening for volume button events
|
||||
Future<void> dispose() async {
|
||||
if (_isObservingVolume) {
|
||||
await stopVolumeObserver();
|
||||
}
|
||||
|
||||
if (!_isListening) return;
|
||||
|
||||
try {
|
||||
@@ -150,6 +86,5 @@ class HardwareVolumeService {
|
||||
// Close StreamControllers to prevent memory leaks
|
||||
await _volumeUpController.close();
|
||||
await _volumeDownController.close();
|
||||
await _absoluteVolumeController.close();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
import '../models/media_item.dart';
|
||||
import '../models/provider_manifest.dart';
|
||||
import '../services/music_assistant_api.dart';
|
||||
import '../services/metadata_service.dart';
|
||||
|
||||
/// Service for handling image/artwork URL generation and caching.
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to reduce complexity.
|
||||
class ImageHelperService {
|
||||
final MusicAssistantAPI? _api;
|
||||
|
||||
/// Podcast cover cache: podcastId -> best available cover URL
|
||||
/// This is populated with episode covers when podcast covers are low-res
|
||||
final Map<String, String> _podcastCoverCache = {};
|
||||
|
||||
/// Callback to get cached track for a player
|
||||
final Track? Function(String playerId) getCachedTrackForPlayer;
|
||||
|
||||
ImageHelperService({
|
||||
required MusicAssistantAPI? api,
|
||||
required this.getCachedTrackForPlayer,
|
||||
}) : _api = api;
|
||||
|
||||
/// Get artwork URL for a media item from Music Assistant
|
||||
String? getImageUrl(MediaItem item, {int size = 256}) {
|
||||
return _api?.getImageUrl(item, size: size);
|
||||
}
|
||||
|
||||
/// Get best available podcast cover URL
|
||||
///
|
||||
/// Returns cached iTunes URL (800x800) if available, otherwise falls back to MA imageproxy.
|
||||
/// The cache is persisted to storage and loaded on app start for instant high-res display.
|
||||
String? getPodcastImageUrl(MediaItem podcast, {int size = 256}) {
|
||||
// Return cached iTunes URL if available (persisted across app launches)
|
||||
final cachedUrl = _podcastCoverCache[podcast.itemId];
|
||||
if (cachedUrl != null) {
|
||||
return cachedUrl;
|
||||
}
|
||||
// Fall back to MA imageproxy (will be replaced once iTunes fetch completes)
|
||||
return _api?.getImageUrl(podcast, size: size);
|
||||
}
|
||||
|
||||
/// Get artist image URL with fallback to external sources (Deezer, Fanart.tv)
|
||||
///
|
||||
/// Returns a Future since fallback requires async API calls.
|
||||
Future<String?> getArtistImageUrlWithFallback(Artist artist, {int size = 256}) async {
|
||||
// Try Music Assistant first
|
||||
final maUrl = _api?.getImageUrl(artist, size: size);
|
||||
if (maUrl != null) {
|
||||
return maUrl;
|
||||
}
|
||||
|
||||
// Fall back to external sources (Deezer, Fanart.tv, etc.)
|
||||
return MetadataService.getArtistImageUrl(artist.name);
|
||||
}
|
||||
|
||||
/// Get SVG icon for a provider domain
|
||||
///
|
||||
/// Returns null if no icon is available.
|
||||
String? getProviderIconSvg(String domain, {bool isDark = false}) {
|
||||
return _api?.getProviderIconSvg(domain, isDark: isDark);
|
||||
}
|
||||
|
||||
/// Get provider manifest by domain
|
||||
ProviderManifest? getProviderManifest(String domain) {
|
||||
return _api?.getProviderManifest(domain);
|
||||
}
|
||||
|
||||
/// Get artwork URL for a player from cache
|
||||
String? getCachedArtworkUrl(String playerId, {int size = 512}) {
|
||||
final track = getCachedTrackForPlayer(playerId);
|
||||
if (track == null) return null;
|
||||
return getImageUrl(track, size: size);
|
||||
}
|
||||
|
||||
/// Load podcast cover cache from storage for instant high-res display
|
||||
///
|
||||
/// Should be called during initialization.
|
||||
Future<void> loadPodcastCoverCache(Map<String, String> cache) async {
|
||||
if (cache.isNotEmpty) {
|
||||
_podcastCoverCache.addAll(cache);
|
||||
}
|
||||
}
|
||||
|
||||
/// Get the current podcast cover cache (for persistence)
|
||||
Map<String, String> get podcastCoverCache => Map.unmodifiable(_podcastCoverCache);
|
||||
|
||||
/// Update podcast cover cache entry
|
||||
void updatePodcastCoverCache(String podcastId, String coverUrl) {
|
||||
_podcastCoverCache[podcastId] = coverUrl;
|
||||
}
|
||||
|
||||
/// Clear all podcast cover cache entries
|
||||
void clearPodcastCoverCache() {
|
||||
_podcastCoverCache.clear();
|
||||
}
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
|
||||
import 'debug_logger.dart';
|
||||
|
||||
/// Custom cache manager for album images with extended retention
|
||||
class AlbumImageCacheManager extends CacheManager with ImageCacheManager {
|
||||
static const key = 'albumImageCache';
|
||||
|
||||
static final AlbumImageCacheManager _instance = AlbumImageCacheManager._();
|
||||
factory AlbumImageCacheManager() => _instance;
|
||||
|
||||
AlbumImageCacheManager._()
|
||||
: super(Config(
|
||||
key,
|
||||
stalePeriod: const Duration(days: 30),
|
||||
maxNrOfCacheObjects: 2000,
|
||||
));
|
||||
}
|
||||
|
||||
/// Service to prefetch album images in the background after sync
|
||||
class ImagePrefetchService {
|
||||
static final _logger = DebugLogger();
|
||||
bool _cancelled = false;
|
||||
|
||||
/// Cancel any in-progress prefetch
|
||||
void cancel() {
|
||||
_cancelled = true;
|
||||
}
|
||||
|
||||
/// Prefetch images in batches, skipping already-cached URLs
|
||||
Future<void> prefetchImages(List<String> urls) async {
|
||||
_cancelled = false;
|
||||
if (urls.isEmpty) return;
|
||||
|
||||
final cacheManager = AlbumImageCacheManager();
|
||||
int cached = 0;
|
||||
int skipped = 0;
|
||||
int failed = 0;
|
||||
|
||||
const batchSize = 10;
|
||||
for (var i = 0; i < urls.length; i += batchSize) {
|
||||
if (_cancelled) {
|
||||
_logger.log('🖼️ Image prefetch cancelled after $cached cached, $skipped skipped');
|
||||
return;
|
||||
}
|
||||
|
||||
final batch = urls.skip(i).take(batchSize);
|
||||
await Future.wait(batch.map((url) async {
|
||||
try {
|
||||
final fileInfo = await cacheManager.getFileFromCache(url);
|
||||
if (fileInfo != null) {
|
||||
skipped++;
|
||||
return;
|
||||
}
|
||||
await cacheManager.downloadFile(url);
|
||||
cached++;
|
||||
} catch (_) {
|
||||
failed++;
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
_logger.log('🖼️ Image prefetch complete: $cached cached, $skipped already cached, $failed failed (${urls.length} total)');
|
||||
}
|
||||
}
|
||||
@@ -62,6 +62,18 @@ class LibraryStatusService extends ChangeNotifier {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Initialize library status without notifying listeners.
|
||||
/// Use during initState to sync service from widget data without triggering rebuilds.
|
||||
void initLibraryStatus(String key, bool inLibrary) {
|
||||
_libraryStatus[key] ??= inLibrary;
|
||||
}
|
||||
|
||||
/// Initialize favorite status without notifying listeners.
|
||||
/// Use during initState to sync service from widget data without triggering rebuilds.
|
||||
void initFavoriteStatus(String key, bool favorite) {
|
||||
_favoriteStatus[key] ??= favorite;
|
||||
}
|
||||
|
||||
/// Mark operation as pending (for rollback tracking)
|
||||
void markLibraryPending(String key, bool previousValue) {
|
||||
_pendingLibraryOps[key] = previousValue;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'debug_logger.dart';
|
||||
import 'settings_service.dart';
|
||||
import '../utils/lru_cache.dart';
|
||||
@@ -261,17 +259,8 @@ class MetadataService {
|
||||
/// Cache for album images - includes null entries for failed lookups (200 entries)
|
||||
static final NullableLruCache<String, String> _albumImageCache = NullableLruCache(maxSize: 200);
|
||||
|
||||
/// Cache for author images (audiobooks) - includes null entries for failed lookups (500 entries)
|
||||
static final NullableLruCache<String, String> _authorImageCache = NullableLruCache(maxSize: 500);
|
||||
|
||||
/// In-flight author image requests for deduplication
|
||||
static final Map<String, Completer<String?>> _authorImageInFlight = {};
|
||||
|
||||
/// SharedPreferences key for persisted author images
|
||||
static const _authorImagePrefsKey = 'author_image_urls';
|
||||
|
||||
/// Whether persisted author images have been loaded into memory cache
|
||||
static bool _authorImageCacheWarmed = false;
|
||||
/// Cache for author images (audiobooks) - includes null entries for failed lookups (100 entries)
|
||||
static final NullableLruCache<String, String> _authorImageCache = NullableLruCache(maxSize: 100);
|
||||
|
||||
/// Fetches album cover URL from Deezer (free, no API key required)
|
||||
/// Returns the image URL if found, null otherwise
|
||||
@@ -660,122 +649,33 @@ class MetadataService {
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Load persisted author image URLs into memory cache on first access
|
||||
static Future<void> _warmAuthorImageCache() async {
|
||||
if (_authorImageCacheWarmed) return;
|
||||
_authorImageCacheWarmed = true;
|
||||
|
||||
try {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
final jsonStr = prefs.getString(_authorImagePrefsKey);
|
||||
if (jsonStr != null) {
|
||||
final map = (json.decode(jsonStr) as Map<String, dynamic>).cast<String, String>();
|
||||
for (final entry in map.entries) {
|
||||
_authorImageCache[entry.key] = entry.value;
|
||||
}
|
||||
_logger.log('📸 Loaded ${map.length} persisted author images');
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.warning('Failed to load persisted author images: $e', context: 'Metadata');
|
||||
}
|
||||
}
|
||||
|
||||
/// Persist an author image URL to SharedPreferences
|
||||
static Future<void> _persistAuthorImage(String cacheKey, String url) async {
|
||||
try {
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
final jsonStr = prefs.getString(_authorImagePrefsKey);
|
||||
final map = jsonStr != null
|
||||
? (json.decode(jsonStr) as Map<String, dynamic>).cast<String, String>()
|
||||
: <String, String>{};
|
||||
map[cacheKey] = url;
|
||||
// Cap at 500 entries to prevent unbounded growth
|
||||
if (map.length > 500) {
|
||||
final keys = map.keys.toList();
|
||||
for (var i = 0; i < map.length - 500; i++) {
|
||||
map.remove(keys[i]);
|
||||
}
|
||||
}
|
||||
await prefs.setString(_authorImagePrefsKey, json.encode(map));
|
||||
} catch (e) {
|
||||
_logger.warning('Failed to persist author image: $e', context: 'Metadata');
|
||||
}
|
||||
}
|
||||
|
||||
/// Validate that an image URL actually returns an image
|
||||
static Future<bool> _validateImageUrl(String url) async {
|
||||
try {
|
||||
final response = await http.head(Uri.parse(url)).timeout(const Duration(seconds: 3));
|
||||
return response.statusCode == 200 || response.statusCode == 301 ||
|
||||
response.statusCode == 302 || response.statusCode == 307 || response.statusCode == 308;
|
||||
} catch (_) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// Try a single source with all name variations, return first validated result
|
||||
static Future<String?> _trySourceWithVariations(
|
||||
Future<String?> Function(String name) source,
|
||||
List<String> variations, {
|
||||
bool alreadyValidated = false,
|
||||
}) async {
|
||||
for (final name in variations) {
|
||||
final url = await source(name);
|
||||
if (url != null) {
|
||||
if (alreadyValidated || await _validateImageUrl(url)) {
|
||||
return url;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Fetches author image URL from multiple sources in parallel
|
||||
/// Sources: 1. Audnexus, 2. Open Library, 3. Wikidata, 4. Wikipedia
|
||||
/// All sources run in parallel; first validated result wins
|
||||
/// Fetches author image URL from multiple sources with fuzzy name matching
|
||||
/// Priority: 1. Audnexus, 2. Open Library, 3. Wikipedia
|
||||
/// Tries name variations if exact match fails
|
||||
static Future<String?> getAuthorImageUrl(String authorName) async {
|
||||
// Warm cache from persistence on first access
|
||||
await _warmAuthorImageCache();
|
||||
|
||||
// Check cache first
|
||||
final cacheKey = 'authorImage:$authorName';
|
||||
if (_authorImageCache.containsKey(cacheKey)) {
|
||||
return _authorImageCache[cacheKey];
|
||||
}
|
||||
|
||||
// Deduplicate concurrent requests for the same author
|
||||
if (_authorImageInFlight.containsKey(cacheKey)) {
|
||||
return _authorImageInFlight[cacheKey]!.future;
|
||||
}
|
||||
|
||||
final completer = Completer<String?>();
|
||||
_authorImageInFlight[cacheKey] = completer;
|
||||
|
||||
try {
|
||||
final result = await _fetchAuthorImage(authorName, cacheKey);
|
||||
completer.complete(result);
|
||||
return result;
|
||||
} catch (e) {
|
||||
completer.complete(null);
|
||||
return null;
|
||||
} finally {
|
||||
_authorImageInFlight.remove(cacheKey);
|
||||
}
|
||||
}
|
||||
|
||||
/// Internal fetch logic (called once per author, deduplicated)
|
||||
static Future<String?> _fetchAuthorImage(String authorName, String cacheKey) async {
|
||||
// Handle comma-separated author names (e.g., "Neil Gaiman, Dirk Maggs")
|
||||
// Try to get image for the first/primary author
|
||||
if (authorName.contains(',')) {
|
||||
final authors = authorName.split(',').map((s) => s.trim()).where((s) => s.isNotEmpty).toList();
|
||||
|
||||
// Skip if this looks like "Lastname, Firstname" format or has suffixes
|
||||
// - Second part is initials (J.R.R., J.K., etc.)
|
||||
// - Second part is a suffix (Jr., Sr., III, PhD, etc.)
|
||||
final suffixes = ['jr', 'jr.', 'sr', 'sr.', 'ii', 'iii', 'iv', 'phd', 'ph.d.', 'md', 'm.d.'];
|
||||
if (authors.length == 2) {
|
||||
final secondPart = authors[1].toLowerCase();
|
||||
// Check if second part is a suffix or looks like initials
|
||||
if (suffixes.contains(secondPart) ||
|
||||
RegExp(r'^[a-z]\.?\s*[a-z]?\.?\s*[a-z]?\.?$').hasMatch(secondPart)) {
|
||||
// "Lastname, First" or "Name, Jr." - don't split
|
||||
// This is "Lastname, First" or "Name, Jr." - don't split
|
||||
} else if (authors[0].split(' ').length > 1 && authors[1].split(' ').length > 1) {
|
||||
// Both parts have multiple words - likely "Author1, Author2"
|
||||
for (final author in authors) {
|
||||
final result = await getAuthorImageUrl(author);
|
||||
if (result != null) {
|
||||
@@ -783,8 +683,10 @@ class MetadataService {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
// Don't cache null here - fall through to try the full name
|
||||
}
|
||||
} else if (authors.length > 2) {
|
||||
// Multiple commas = definitely multiple authors
|
||||
for (final author in authors) {
|
||||
final result = await getAuthorImageUrl(author);
|
||||
if (result != null) {
|
||||
@@ -792,28 +694,55 @@ class MetadataService {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
// Don't cache null - fall through to try full name
|
||||
}
|
||||
}
|
||||
|
||||
// Generate name variations for fuzzy matching
|
||||
final variations = _generateNameVariations(authorName);
|
||||
|
||||
// Run all sources in parallel - first validated result wins
|
||||
final results = await Future.wait([
|
||||
_trySourceWithVariations(_tryAudnexus, variations),
|
||||
_trySourceWithVariations(_tryOpenLibrary, variations, alreadyValidated: true),
|
||||
_trySourceWithVariations(_tryWikidata, variations.take(2).toList()),
|
||||
_trySourceWithVariations(_tryWikipedia, variations.take(3).toList()),
|
||||
]);
|
||||
// Try each source with all variations before moving to next source
|
||||
// This prioritizes source quality over name variation
|
||||
|
||||
// Pick first non-null result (priority: Audnexus > OpenLibrary > Wikidata > Wikipedia)
|
||||
final result = results[0] ?? results[1] ?? results[2] ?? results[3];
|
||||
|
||||
_authorImageCache[cacheKey] = result;
|
||||
if (result != null) {
|
||||
_persistAuthorImage(cacheKey, result);
|
||||
// 1. Try Audnexus (best for audiobook authors)
|
||||
for (final name in variations) {
|
||||
final result = await _tryAudnexus(name);
|
||||
if (result != null) {
|
||||
_authorImageCache[cacheKey] = result;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
||||
// 2. Try Open Library
|
||||
for (final name in variations) {
|
||||
final result = await _tryOpenLibrary(name);
|
||||
if (result != null) {
|
||||
_authorImageCache[cacheKey] = result;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Try Wikidata (structured data, good for finding exact person)
|
||||
for (final name in variations.take(2)) {
|
||||
final wikidataResult = await _tryWikidata(name);
|
||||
if (wikidataResult != null) {
|
||||
_authorImageCache[cacheKey] = wikidataResult;
|
||||
return wikidataResult;
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Try Wikipedia (search-based, good fallback)
|
||||
for (final name in variations.take(3)) {
|
||||
final wikiResult = await _tryWikipedia(name);
|
||||
if (wikiResult != null) {
|
||||
_authorImageCache[cacheKey] = wikiResult;
|
||||
return wikiResult;
|
||||
}
|
||||
}
|
||||
|
||||
// Cache the null result to avoid repeated failed lookups
|
||||
_authorImageCache[cacheKey] = null;
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Cache for lyrics - uses bounded Map with manual size limiting (500 entries max)
|
||||
|
||||
@@ -251,7 +251,7 @@ class MusicAssistantAPI {
|
||||
void _handleMessage(dynamic message) {
|
||||
try {
|
||||
final data = jsonDecode(message as String) as Map<String, dynamic>;
|
||||
_logger.debug('Received message: ${data.keys}');
|
||||
_logger.log('Received message: ${data.keys}');
|
||||
|
||||
// Check for server info message (first message on connect)
|
||||
if (data.containsKey('server_version')) {
|
||||
@@ -1466,10 +1466,9 @@ class MusicAssistantAPI {
|
||||
final futures = batch.map((uri) => _sendCommand(
|
||||
'music/item_by_uri',
|
||||
args: {'uri': uri},
|
||||
).timeout(const Duration(seconds: 5), onTimeout: () => <String, dynamic>{'result': null})
|
||||
.catchError((_) => <String, dynamic>{'result': null}));
|
||||
).timeout(const Duration(seconds: 5), onTimeout: () => <String, dynamic>{'result': null}));
|
||||
|
||||
final results = await Future.wait(futures);
|
||||
final results = await Future.wait(futures, eagerError: false);
|
||||
|
||||
for (final trackResponse in results) {
|
||||
if (albumUris.length >= limit) break;
|
||||
@@ -1506,10 +1505,9 @@ class MusicAssistantAPI {
|
||||
final futures = batch.map((uri) => _sendCommand(
|
||||
'music/item_by_uri',
|
||||
args: {'uri': uri},
|
||||
).timeout(const Duration(seconds: 5), onTimeout: () => <String, dynamic>{'result': null})
|
||||
.catchError((_) => <String, dynamic>{'result': null}));
|
||||
).timeout(const Duration(seconds: 5), onTimeout: () => <String, dynamic>{'result': null}));
|
||||
|
||||
final results = await Future.wait(futures);
|
||||
final results = await Future.wait(futures, eagerError: false);
|
||||
|
||||
for (final albumResponse in results) {
|
||||
try {
|
||||
@@ -1621,28 +1619,36 @@ class MusicAssistantAPI {
|
||||
}
|
||||
|
||||
Future<List<Track>> getAlbumTracks(String provider, String itemId) async {
|
||||
try {
|
||||
final response = await _sendCommand(
|
||||
'music/albums/album_tracks',
|
||||
args: {
|
||||
'provider_instance_id_or_domain': provider,
|
||||
'item_id': itemId,
|
||||
},
|
||||
);
|
||||
return await RetryHelper.retryNetwork(
|
||||
operation: () async {
|
||||
try {
|
||||
final response = await _sendCommand(
|
||||
'music/albums/album_tracks',
|
||||
args: {
|
||||
'provider_instance_id_or_domain': provider,
|
||||
'item_id': itemId,
|
||||
},
|
||||
);
|
||||
|
||||
final items = response['result'] as List<dynamic>?;
|
||||
if (items == null) {
|
||||
_logger.log('No result for album tracks');
|
||||
return <Track>[];
|
||||
}
|
||||
final items = response['result'] as List<dynamic>?;
|
||||
if (items == null) {
|
||||
_logger.log('No result for album tracks');
|
||||
return <Track>[];
|
||||
}
|
||||
|
||||
return items
|
||||
.map((item) => Track.fromJson(item as Map<String, dynamic>))
|
||||
.toList();
|
||||
} catch (e) {
|
||||
_logger.log('Error getting album tracks: $e');
|
||||
rethrow;
|
||||
}
|
||||
|
||||
return items
|
||||
.map((item) => Track.fromJson(item as Map<String, dynamic>))
|
||||
.toList();
|
||||
} catch (e) {
|
||||
_logger.log('Error getting album tracks: $e');
|
||||
return <Track>[];
|
||||
}
|
||||
},
|
||||
).catchError((e) {
|
||||
_logger.log('Error getting album tracks after retries: $e');
|
||||
return <Track>[];
|
||||
});
|
||||
}
|
||||
|
||||
/// Get playlists
|
||||
@@ -1703,28 +1709,35 @@ class MusicAssistantAPI {
|
||||
|
||||
/// Get playlist tracks
|
||||
Future<List<Track>> getPlaylistTracks(String provider, String itemId) async {
|
||||
try {
|
||||
final response = await _sendCommand(
|
||||
'music/playlists/playlist_tracks',
|
||||
args: {
|
||||
'provider_instance_id_or_domain': provider,
|
||||
'item_id': itemId,
|
||||
},
|
||||
);
|
||||
return await RetryHelper.retryNetwork(
|
||||
operation: () async {
|
||||
try {
|
||||
final response = await _sendCommand(
|
||||
'music/playlists/playlist_tracks',
|
||||
args: {
|
||||
'provider_instance_id_or_domain': provider,
|
||||
'item_id': itemId,
|
||||
},
|
||||
);
|
||||
|
||||
final items = response['result'] as List<dynamic>?;
|
||||
if (items == null) {
|
||||
_logger.log('No result for playlist tracks');
|
||||
return <Track>[];
|
||||
}
|
||||
final items = response['result'] as List<dynamic>?;
|
||||
if (items == null) {
|
||||
_logger.log('No result for playlist tracks');
|
||||
return <Track>[];
|
||||
}
|
||||
|
||||
return items
|
||||
.map((item) => Track.fromJson(item as Map<String, dynamic>))
|
||||
.toList();
|
||||
} catch (e) {
|
||||
_logger.log('Error getting playlist tracks: $e');
|
||||
rethrow;
|
||||
}
|
||||
return items
|
||||
.map((item) => Track.fromJson(item as Map<String, dynamic>))
|
||||
.toList();
|
||||
} catch (e) {
|
||||
_logger.log('Error getting playlist tracks: $e');
|
||||
return <Track>[];
|
||||
}
|
||||
},
|
||||
).catchError((e) {
|
||||
_logger.log('Error getting playlist tracks after retries: $e');
|
||||
return <Track>[];
|
||||
});
|
||||
}
|
||||
|
||||
// Favorites
|
||||
@@ -1981,7 +1994,7 @@ class MusicAssistantAPI {
|
||||
currentIndex = queueResult['current_index'] as int?;
|
||||
shuffleEnabled = queueResult['shuffle_enabled'] as bool?;
|
||||
repeatMode = queueResult['repeat_mode'] as String?;
|
||||
_logger.debug('🔀 Queue metadata: shuffle_enabled=$shuffleEnabled, repeat_mode=$repeatMode');
|
||||
_logger.log('🔀 Queue metadata: shuffle_enabled=$shuffleEnabled, repeat_mode=$repeatMode');
|
||||
|
||||
final currentItemData = queueResult['current_item'] as Map<String, dynamic>?;
|
||||
final currentItemName = currentItemData?['name'] as String?;
|
||||
@@ -2017,7 +2030,7 @@ class MusicAssistantAPI {
|
||||
}
|
||||
|
||||
if (items.isEmpty) {
|
||||
_logger.debug('⚠️ Queue is empty or all items failed to parse');
|
||||
_logger.log('⚠️ Queue is empty or all items failed to parse');
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -88,9 +88,6 @@ class PcmAudioPlayer {
|
||||
// Each chunk is ~4KB, so max ~500 chunks
|
||||
static const int _maxBufferChunks = 500;
|
||||
|
||||
// Software volume gain (0.0 = silent, 1.0 = full volume)
|
||||
double _volumeGain = 1.0;
|
||||
|
||||
// Stats
|
||||
int _framesPlayed = 0;
|
||||
int _bytesPlayed = 0;
|
||||
@@ -116,11 +113,6 @@ class PcmAudioPlayer {
|
||||
_state == PcmPlayerState.resuming ||
|
||||
_state == PcmPlayerState.stopping;
|
||||
|
||||
/// Set software volume gain (0.0 = silent, 1.0 = full). Applied to PCM samples at feed time.
|
||||
void setVolumeGain(double gain) {
|
||||
_volumeGain = gain.clamp(0.0, 1.0);
|
||||
}
|
||||
|
||||
/// Check if feeding should be blocked
|
||||
bool get _shouldBlockFeeding => isTransitioning || _state == PcmPlayerState.paused;
|
||||
|
||||
@@ -368,10 +360,7 @@ class PcmAudioPlayer {
|
||||
|
||||
// Convert Uint8List (raw bytes) to Int16 samples
|
||||
// Sendspin sends 16-bit little-endian PCM
|
||||
final rawSamples = _bytesToInt16List(chunk);
|
||||
final samples = _volumeGain == 1.0
|
||||
? rawSamples
|
||||
: rawSamples.map((s) => (s * _volumeGain).round().clamp(-32768, 32767)).toList();
|
||||
final samples = _bytesToInt16List(chunk);
|
||||
|
||||
// Check state again before the async feed call
|
||||
if (samples.isNotEmpty && !_shouldBlockFeeding) {
|
||||
|
||||
@@ -100,7 +100,7 @@ class PositionTracker {
|
||||
Duration? duration,
|
||||
double? serverTimestamp,
|
||||
}) {
|
||||
_logger.debug('⏱️ PositionTracker.updateFromServer: pos=${position.toStringAsFixed(1)}s, isPlaying=$isPlaying, playerId=$playerId');
|
||||
_logger.log('⏱️ PositionTracker.updateFromServer: pos=${position.toStringAsFixed(1)}s, isPlaying=$isPlaying, playerId=$playerId');
|
||||
final bool playerChanged = _playerId != playerId;
|
||||
final bool playStateChanged = _isPlaying != isPlaying;
|
||||
final bool durationChanged = duration != null && _duration != duration;
|
||||
@@ -179,11 +179,11 @@ class PositionTracker {
|
||||
final newAnchorPos = anchorIsGettingStale && !playerChanged && !playStateChanged && isPlaying
|
||||
? currentInterpolated // Keep our interpolated position, just refresh the anchor time
|
||||
: anchorPos; // Use server position for other cases
|
||||
_logger.debug('⏱️ PositionTracker: Anchor updated ${_anchorPosition.toStringAsFixed(1)}s -> ${newAnchorPos.toStringAsFixed(1)}s (playerChanged=$playerChanged, playStateChanged=$playStateChanged, positionDiff=${positionDiff.toStringAsFixed(1)}, suspiciousReset=$isSuspiciousReset, anchorStale=$anchorIsGettingStale)');
|
||||
_logger.log('⏱️ PositionTracker: Anchor updated ${_anchorPosition.toStringAsFixed(1)}s -> ${newAnchorPos.toStringAsFixed(1)}s (playerChanged=$playerChanged, playStateChanged=$playStateChanged, positionDiff=${positionDiff.toStringAsFixed(1)}, suspiciousReset=$isSuspiciousReset, anchorStale=$anchorIsGettingStale)');
|
||||
_anchorPosition = newAnchorPos;
|
||||
_anchorTime = DateTime.now();
|
||||
} else if (positionDiff > 2) {
|
||||
_logger.debug('⏱️ PositionTracker: Anchor NOT updated (suspiciousReset=$isSuspiciousReset, staleTimestamp=$hasStaleTimestamp, interpolated=${currentInterpolated.toStringAsFixed(1)}s)');
|
||||
_logger.log('⏱️ PositionTracker: Anchor NOT updated (suspiciousReset=$isSuspiciousReset, staleTimestamp=$hasStaleTimestamp, interpolated=${currentInterpolated.toStringAsFixed(1)}s)');
|
||||
}
|
||||
|
||||
_isPlaying = isPlaying;
|
||||
@@ -227,7 +227,7 @@ class PositionTracker {
|
||||
|
||||
/// Clear tracker state (e.g., when disconnecting)
|
||||
void clear() {
|
||||
_logger.debug('⏱️ PositionTracker.clear() called');
|
||||
_logger.log('⏱️ PositionTracker.clear() called');
|
||||
_stopInterpolationTimer();
|
||||
_playerId = null;
|
||||
_isPlaying = false;
|
||||
@@ -238,17 +238,17 @@ class PositionTracker {
|
||||
|
||||
void _startInterpolationTimer() {
|
||||
if (_interpolationTimer != null) {
|
||||
_logger.debug('⏱️ PositionTracker: Timer already running, skipping start');
|
||||
_logger.log('⏱️ PositionTracker: Timer already running, skipping start');
|
||||
return;
|
||||
}
|
||||
|
||||
_logger.debug('⏱️ PositionTracker: Starting interpolation timer (anchor=${_anchorPosition.toStringAsFixed(1)}s)');
|
||||
_logger.log('⏱️ PositionTracker: Starting interpolation timer (anchor=${_anchorPosition.toStringAsFixed(1)}s)');
|
||||
_interpolationTimer = Timer.periodic(const Duration(milliseconds: 250), (timer) {
|
||||
// Log every 4 ticks (1 second) if no emission happened
|
||||
if (timer.tick % 4 == 0) {
|
||||
final pos = currentPosition;
|
||||
if (pos.inSeconds == _lastEmittedSeconds) {
|
||||
_logger.debug('⏱️ PositionTracker: Timer tick ${timer.tick}, pos=${pos.inSeconds}s unchanged');
|
||||
_logger.log('⏱️ PositionTracker: Timer tick ${timer.tick}, pos=${pos.inSeconds}s unchanged');
|
||||
}
|
||||
}
|
||||
_emitPosition();
|
||||
@@ -259,7 +259,7 @@ class PositionTracker {
|
||||
}
|
||||
|
||||
void _stopInterpolationTimer() {
|
||||
_logger.debug('⏱️ PositionTracker: Stopping interpolation timer (was ${_interpolationTimer != null ? "running" : "null"})');
|
||||
_logger.log('⏱️ PositionTracker: Stopping interpolation timer (was ${_interpolationTimer != null ? "running" : "null"})');
|
||||
_interpolationTimer?.cancel();
|
||||
_interpolationTimer = null;
|
||||
}
|
||||
@@ -271,7 +271,7 @@ class PositionTracker {
|
||||
// Only emit if second changed (reduces unnecessary updates)
|
||||
if (seconds != _lastEmittedSeconds) {
|
||||
_lastEmittedSeconds = seconds;
|
||||
_logger.debug('⏱️ PositionTracker: Emitting position ${seconds}s (anchor=${_anchorPosition.toStringAsFixed(1)}s, playing=$_isPlaying)');
|
||||
_logger.log('⏱️ PositionTracker: Emitting position ${seconds}s (anchor=${_anchorPosition.toStringAsFixed(1)}s, playing=$_isPlaying)');
|
||||
_positionController.add(pos);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,319 @@
|
||||
import '../models/media_item.dart';
|
||||
import '../models/player.dart';
|
||||
import '../models/provider_instance.dart';
|
||||
import '../services/sync_service.dart';
|
||||
|
||||
/// Service for filtering media items and players based on user settings.
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to reduce complexity.
|
||||
class ProviderFilterService {
|
||||
/// Provider filter from MA user settings (empty = all providers allowed)
|
||||
final List<String> providerFilter;
|
||||
|
||||
/// Player filter from MA user settings (empty = all players allowed)
|
||||
final List<String> playerFilter;
|
||||
|
||||
/// Available music providers discovered from MA
|
||||
final List<ProviderInstance> availableMusicProviders;
|
||||
|
||||
/// Library data for provider counting
|
||||
final List<dynamic> artists;
|
||||
final List<dynamic> albums;
|
||||
final List<dynamic> tracks;
|
||||
final List<dynamic> podcasts;
|
||||
final List<dynamic> radioStations;
|
||||
|
||||
ProviderFilterService({
|
||||
required this.providerFilter,
|
||||
required this.playerFilter,
|
||||
required this.availableMusicProviders,
|
||||
required this.artists,
|
||||
required this.albums,
|
||||
required this.tracks,
|
||||
required this.podcasts,
|
||||
required this.radioStations,
|
||||
});
|
||||
|
||||
// ===========================================================================
|
||||
// PROVIDER FILTER (from MA user settings)
|
||||
// ===========================================================================
|
||||
|
||||
/// Whether provider filtering is active
|
||||
bool get hasProviderFilter => providerFilter.isNotEmpty;
|
||||
|
||||
/// Check if a media item should be visible based on provider filter.
|
||||
///
|
||||
/// Returns true if:
|
||||
/// - No filter is active (empty list = all providers allowed)
|
||||
/// - The item has at least one provider mapping in the allowed list
|
||||
/// - The item's primary provider is in the allowed list
|
||||
bool isItemAllowedByProviderFilter(MediaItem item) {
|
||||
// No filter = show everything
|
||||
if (providerFilter.isEmpty) return true;
|
||||
|
||||
// Check if item's provider mappings include any allowed provider
|
||||
final mappings = item.providerMappings;
|
||||
if (mappings != null && mappings.isNotEmpty) {
|
||||
for (final mapping in mappings) {
|
||||
if (providerFilter.contains(mapping.providerInstance)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Also check primary provider field (for items without full mappings)
|
||||
if (providerFilter.contains(item.provider)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/// Filter a list of media items based on provider filter.
|
||||
List<T> filterByProvider<T extends MediaItem>(List<T> items) {
|
||||
if (providerFilter.isEmpty) return items;
|
||||
return items.where(isItemAllowedByProviderFilter).toList();
|
||||
}
|
||||
|
||||
/// Filter search results map based on provider filter.
|
||||
Map<String, List<MediaItem>> filterSearchResults(Map<String, List<MediaItem>> results) {
|
||||
if (providerFilter.isEmpty) return results;
|
||||
return {
|
||||
for (final entry in results.entries)
|
||||
entry.key: entry.value.where(isItemAllowedByProviderFilter).toList(),
|
||||
};
|
||||
}
|
||||
|
||||
// ===========================================================================
|
||||
// PLAYER FILTER (from MA user settings)
|
||||
// ===========================================================================
|
||||
|
||||
/// Whether player filtering is active
|
||||
bool get hasPlayerFilter => playerFilter.isNotEmpty;
|
||||
|
||||
/// Check if a player should be visible based on player filter.
|
||||
bool isPlayerAllowedByFilter(Player player) {
|
||||
if (playerFilter.isEmpty) return true;
|
||||
return playerFilter.contains(player.playerId);
|
||||
}
|
||||
|
||||
/// Filter a list of players based on player filter.
|
||||
List<Player> filterPlayers(List<Player> players) {
|
||||
if (playerFilter.isEmpty) return players;
|
||||
return players.where(isPlayerAllowedByFilter).toList();
|
||||
}
|
||||
|
||||
// ===========================================================================
|
||||
// PROVIDER COUNTING
|
||||
// ===========================================================================
|
||||
|
||||
/// Get providers that have content in artists library (with item counts).
|
||||
Map<String, int> getProvidersWithArtists() {
|
||||
return _getProvidersWithCounts(artists);
|
||||
}
|
||||
|
||||
/// Get providers that have content in albums library (with item counts).
|
||||
Map<String, int> getProvidersWithAlbums() {
|
||||
return _getProvidersWithCounts(albums);
|
||||
}
|
||||
|
||||
/// Get providers that have content in tracks library (with item counts).
|
||||
Map<String, int> getProvidersWithTracks() {
|
||||
return _getProvidersWithCounts(tracks);
|
||||
}
|
||||
|
||||
/// Get providers that have content in playlists (with item counts).
|
||||
Map<String, int> getProvidersWithPlaylists() {
|
||||
return _getProvidersWithCounts(SyncService.instance.cachedPlaylists);
|
||||
}
|
||||
|
||||
/// Get providers that have audiobooks (with item counts).
|
||||
Map<String, int> getProvidersWithAudiobooks() {
|
||||
return _getProvidersWithCounts(SyncService.instance.cachedAudiobooks);
|
||||
}
|
||||
|
||||
/// Get providers that have radio stations (with item counts).
|
||||
Map<String, int> getProvidersWithRadio() {
|
||||
return _getProvidersWithCounts(radioStations);
|
||||
}
|
||||
|
||||
/// Get providers that have podcasts (with item counts).
|
||||
///
|
||||
/// Only counts mappings where inLibrary is true - this indicates which provider
|
||||
/// the user actually added the podcast from (vs providers that can play it).
|
||||
Map<String, int> getProvidersWithPodcasts() {
|
||||
final counts = <String, int>{};
|
||||
for (final item in podcasts) {
|
||||
final mappings = (item as MediaItem).providerMappings;
|
||||
if (mappings != null) {
|
||||
for (final mapping in mappings) {
|
||||
// Only count if this provider "owns" the item (user added it from this account)
|
||||
if (mapping.inLibrary) {
|
||||
final instanceId = mapping.providerInstance;
|
||||
if (instanceId.isNotEmpty) {
|
||||
counts[instanceId] = (counts[instanceId] ?? 0) + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return counts;
|
||||
}
|
||||
|
||||
/// Internal helper to count items per provider from a list of media items.
|
||||
///
|
||||
/// Only counts mappings where inLibrary is true - this indicates which provider
|
||||
/// the user actually added the item from (vs providers that can play it).
|
||||
Map<String, int> _getProvidersWithCounts(List<dynamic> items) {
|
||||
final counts = <String, int>{};
|
||||
for (final item in items) {
|
||||
if (item is! MediaItem) continue;
|
||||
final mediaItem = item as MediaItem;
|
||||
final mappings = mediaItem.providerMappings;
|
||||
if (mappings != null) {
|
||||
for (final mapping in mappings) {
|
||||
// Only count if this provider "owns" the item (user added it from this account)
|
||||
if (mapping.inLibrary) {
|
||||
final instanceId = mapping.providerInstance;
|
||||
if (instanceId.isNotEmpty) {
|
||||
counts[instanceId] = (counts[instanceId] ?? 0) + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return counts;
|
||||
}
|
||||
|
||||
/// Get ProviderInstance objects for providers that have content in a category.
|
||||
///
|
||||
/// Returns list of (ProviderInstance, itemCount) tuples, sorted by name.
|
||||
List<(ProviderInstance, int)> getRelevantProvidersForCategory(String category) {
|
||||
final Map<String, int> counts;
|
||||
switch (category) {
|
||||
case 'artists':
|
||||
counts = getProvidersWithArtists();
|
||||
break;
|
||||
case 'albums':
|
||||
counts = getProvidersWithAlbums();
|
||||
break;
|
||||
case 'tracks':
|
||||
counts = getProvidersWithTracks();
|
||||
break;
|
||||
case 'playlists':
|
||||
counts = getProvidersWithPlaylists();
|
||||
break;
|
||||
case 'audiobooks':
|
||||
counts = getProvidersWithAudiobooks();
|
||||
break;
|
||||
case 'radio':
|
||||
counts = getProvidersWithRadio();
|
||||
break;
|
||||
case 'podcasts':
|
||||
counts = getProvidersWithPodcasts();
|
||||
break;
|
||||
default:
|
||||
counts = {};
|
||||
}
|
||||
|
||||
// Build list of providers that support this category, with their item counts
|
||||
// Only include providers that have at least 1 item (hides providers not synced to library)
|
||||
// Multiple instances of the same domain are allowed (e.g., two Spotify accounts)
|
||||
// but we dedupe if names match exactly (same account re-added with new instance ID)
|
||||
final result = <(ProviderInstance, int)>[];
|
||||
final addedInstanceIds = <String>{};
|
||||
final addedNames = <String, int>{}; // Track name -> count to dedupe same-name providers
|
||||
|
||||
for (final provider in availableMusicProviders) {
|
||||
// Only include providers that support this content type AND have items
|
||||
if (provider.supportsContentType(category)) {
|
||||
final count = counts[provider.instanceId] ?? 0;
|
||||
if (count > 0) {
|
||||
final existingCount = addedNames[provider.name];
|
||||
if (existingCount == null) {
|
||||
// First provider with this name
|
||||
result.add((provider, count));
|
||||
addedInstanceIds.add(provider.instanceId);
|
||||
addedNames[provider.name] = count;
|
||||
} else if (count > existingCount) {
|
||||
// Same name but more items - likely same account re-added, keep better one
|
||||
result.removeWhere((r) => r.$1.name == provider.name);
|
||||
result.add((provider, count));
|
||||
addedInstanceIds.add(provider.instanceId);
|
||||
addedNames[provider.name] = count;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Also include providers that have items but aren't in availableMusicProviders
|
||||
// (e.g., search-only providers like iTunes, or orphaned items from removed providers)
|
||||
// For these synthetic providers, dedupe by domain since we don't have account-specific names
|
||||
final addedRealDomains = result.map((r) => r.$1.domain).toSet();
|
||||
final addedSyntheticDomains = <String>{};
|
||||
|
||||
for (final entry in counts.entries) {
|
||||
if (!addedInstanceIds.contains(entry.key) && entry.value > 0) {
|
||||
// Create a synthetic ProviderInstance from the instance ID
|
||||
// Format is typically "domain--uniqueId" (e.g., "itunes--abc123")
|
||||
final instanceId = entry.key;
|
||||
final domain = instanceId.contains('--')
|
||||
? instanceId.split('--').first
|
||||
: instanceId;
|
||||
|
||||
// Skip if this domain is already represented by a real provider or synthetic
|
||||
if (addedRealDomains.contains(domain)) continue;
|
||||
if (addedSyntheticDomains.contains(domain)) continue;
|
||||
|
||||
// Only add if this domain supports the category
|
||||
final capabilities = ProviderInstance.providerCapabilities[domain];
|
||||
if (capabilities != null && capabilities.contains(category)) {
|
||||
result.add((
|
||||
ProviderInstance(
|
||||
instanceId: instanceId,
|
||||
domain: domain,
|
||||
name: _formatProviderName(domain),
|
||||
available: true,
|
||||
),
|
||||
entry.value,
|
||||
));
|
||||
addedSyntheticDomains.add(domain);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Sort by name
|
||||
result.sort((a, b) => a.$1.name.compareTo(b.$1.name));
|
||||
return result;
|
||||
}
|
||||
|
||||
/// Format a provider domain into a readable display name.
|
||||
String _formatProviderName(String domain) {
|
||||
const names = {
|
||||
'spotify': 'Spotify',
|
||||
'tidal': 'Tidal',
|
||||
'qobuz': 'Qobuz',
|
||||
'deezer': 'Deezer',
|
||||
'ytmusic': 'YouTube Music',
|
||||
'soundcloud': 'SoundCloud',
|
||||
'apple_music': 'Apple Music',
|
||||
'amazon_music': 'Amazon Music',
|
||||
'plex': 'Plex',
|
||||
'jellyfin': 'Jellyfin',
|
||||
'emby': 'Emby',
|
||||
'subsonic': 'Subsonic',
|
||||
'opensubsonic': 'OpenSubsonic',
|
||||
'gmusic': 'Google Music',
|
||||
'bandcamp': 'Bandcamp',
|
||||
'youtube': 'YouTube',
|
||||
'itunes': 'iTunes/Apple',
|
||||
'spotifyfree': 'Spotify Free',
|
||||
'tunein': 'TuneIn',
|
||||
'radio_net': 'Radio.net',
|
||||
'dirble': 'Dirble',
|
||||
'freq': 'FREQ',
|
||||
'radionomy': 'Radionomy',
|
||||
};
|
||||
return names[domain] ?? domain.split('_').map((s) => s[0].toUpperCase() + s.substring(1)).join(' ');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,221 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import '../models/media_item.dart';
|
||||
import '../models/player.dart';
|
||||
import '../services/database_service.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../services/error_handler.dart';
|
||||
import '../services/music_assistant_api.dart';
|
||||
|
||||
/// Service for managing player queue operations.
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to isolate queue logic including:
|
||||
/// - Queue fetching from API with player ID translation
|
||||
/// - Queue caching to database for instant display
|
||||
/// - Queue restoration from cache on app resume
|
||||
/// - Track validation for queue items
|
||||
class QueueManagerService {
|
||||
final MusicAssistantAPI? _api;
|
||||
final DatabaseService _database;
|
||||
final DebugLogger _logger;
|
||||
final List<Player> Function() getAvailablePlayers;
|
||||
final Map<String, String> Function() getCastToSendspinMap;
|
||||
final Future<void> Function(String playerId, List<Track> tracks, {int startIndex}) playTracks;
|
||||
|
||||
QueueManagerService({
|
||||
required MusicAssistantAPI? api,
|
||||
required DatabaseService database,
|
||||
required DebugLogger logger,
|
||||
required this.getAvailablePlayers,
|
||||
required this.getCastToSendspinMap,
|
||||
required this.playTracks,
|
||||
}) : _api = api,
|
||||
_database = database,
|
||||
_logger = logger;
|
||||
|
||||
/// Fetch queue for a player from the API.
|
||||
///
|
||||
/// Handles:
|
||||
/// - Group child players (fetches leader's queue)
|
||||
/// - Cast-to-Sendspin ID translation
|
||||
/// - Automatic caching to database
|
||||
Future<PlayerQueue?> getQueue(String playerId) async {
|
||||
final effectivePlayerId = _getEffectivePlayerId(playerId);
|
||||
|
||||
final queue = await _api?.getQueue(effectivePlayerId);
|
||||
|
||||
// Persist queue to database for instant display on app resume
|
||||
if (queue != null) {
|
||||
persistQueueToDatabase(playerId, queue);
|
||||
}
|
||||
|
||||
return queue;
|
||||
}
|
||||
|
||||
/// Get cached queue for instant display (before API refresh).
|
||||
Future<PlayerQueue?> getCachedQueue(String playerId) async {
|
||||
try {
|
||||
if (!_database.isInitialized) return null;
|
||||
|
||||
final cachedItems = await _database.getCachedQueue(playerId);
|
||||
if (cachedItems.isEmpty) return null;
|
||||
|
||||
final items = <QueueItem>[];
|
||||
for (final cached in cachedItems) {
|
||||
try {
|
||||
final itemData = jsonDecode(cached.itemJson) as Map<String, dynamic>;
|
||||
items.add(QueueItem.fromJson(itemData));
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Error parsing cached queue item: $e');
|
||||
}
|
||||
}
|
||||
|
||||
if (items.isEmpty) return null;
|
||||
|
||||
return PlayerQueue(
|
||||
playerId: playerId,
|
||||
items: items,
|
||||
currentIndex: 0, // Will be updated from fresh data
|
||||
);
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Error loading cached queue: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Persist queue to database for app restart persistence.
|
||||
void persistQueueToDatabase(String playerId, PlayerQueue queue) {
|
||||
() async {
|
||||
try {
|
||||
if (!_database.isInitialized) return;
|
||||
|
||||
final itemJsonList = queue.items.map((item) => jsonEncode(item.toJson())).toList();
|
||||
await _database.saveQueue(playerId, itemJsonList);
|
||||
_logger.log('💾 Persisted ${queue.items.length} queue items to database');
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Error persisting queue to database: $e');
|
||||
}
|
||||
}();
|
||||
}
|
||||
|
||||
/// Attempt to restore the queue from cached data and start playback.
|
||||
Future<bool> restoreQueueFromCache(String playerId) async {
|
||||
try {
|
||||
final cachedQueue = await getCachedQueue(playerId);
|
||||
if (cachedQueue == null || cachedQueue.items.isEmpty) {
|
||||
_logger.log('⚠️ No cached queue to restore');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Extract and validate tracks from queue items
|
||||
final tracks = _validateQueueTracks(cachedQueue.items);
|
||||
|
||||
if (tracks.isEmpty) {
|
||||
_logger.log('⚠️ Cached queue has no valid tracks');
|
||||
return false;
|
||||
}
|
||||
|
||||
_logger.log('🔄 Restoring ${tracks.length} tracks from cached queue');
|
||||
|
||||
// Re-queue all tracks and start playback
|
||||
await playTracks(playerId, tracks, startIndex: 0);
|
||||
|
||||
return true;
|
||||
} catch (e) {
|
||||
_logger.log('❌ Error restoring queue from cache: $e');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// Validate and filter tracks from queue items.
|
||||
///
|
||||
/// Returns only tracks that can be played (have available provider mappings
|
||||
/// or valid provider/itemId combination).
|
||||
List<Track> _validateQueueTracks(List<QueueItem> queueItems) {
|
||||
return queueItems
|
||||
.map((item) => item.track)
|
||||
.where((track) {
|
||||
// Check for providerMappings with at least one available entry
|
||||
if (track.providerMappings != null && track.providerMappings!.isNotEmpty) {
|
||||
return track.providerMappings!.any((m) => m.available);
|
||||
}
|
||||
// Fallback: provider + itemId can be used to construct URI
|
||||
return track.provider.isNotEmpty && track.itemId.isNotEmpty;
|
||||
})
|
||||
.toList();
|
||||
}
|
||||
|
||||
/// Get the effective player ID for queue operations.
|
||||
///
|
||||
/// Handles:
|
||||
/// - Group child players (returns leader's ID)
|
||||
/// - Cast-to-Sendspin ID translation
|
||||
String _getEffectivePlayerId(String playerId) {
|
||||
String effectivePlayerId = playerId;
|
||||
final availablePlayers = getAvailablePlayers();
|
||||
final castToSendspinMap = getCastToSendspinMap();
|
||||
|
||||
final player = availablePlayers.firstWhere(
|
||||
(p) => p.playerId == playerId,
|
||||
orElse: () => Player(
|
||||
playerId: playerId,
|
||||
name: '',
|
||||
available: false,
|
||||
powered: false,
|
||||
state: 'idle',
|
||||
),
|
||||
);
|
||||
|
||||
// If this player is a group child, fetch the leader's queue instead
|
||||
// This ensures grouped players show the same queue as their leader
|
||||
if (player.isGroupChild && player.syncedTo != null) {
|
||||
_logger.log('🔗 Player $playerId is grouped, fetching leader queue: ${player.syncedTo}');
|
||||
effectivePlayerId = player.syncedTo!;
|
||||
}
|
||||
|
||||
// Translate Sendspin ID to Cast UUID for queue fetch
|
||||
// MA stores queues under the Cast UUID, not the Sendspin ID
|
||||
effectivePlayerId = _translateSendspinToCastId(effectivePlayerId, availablePlayers, castToSendspinMap);
|
||||
|
||||
return effectivePlayerId;
|
||||
}
|
||||
|
||||
/// Translate Sendspin ID to Cast UUID for queue operations.
|
||||
///
|
||||
/// MA stores queues under the Cast UUID, not the Sendspin ID.
|
||||
/// Format: cast-7df484e3 -> need Cast UUID starting with 7df484e3
|
||||
String _translateSendspinToCastId(
|
||||
String playerId,
|
||||
List<Player> availablePlayers,
|
||||
Map<String, String> castToSendspinMap,
|
||||
) {
|
||||
if (!playerId.startsWith('cast-') || playerId.length < 13) {
|
||||
return playerId;
|
||||
}
|
||||
|
||||
final prefix = playerId.substring(5); // Remove "cast-"
|
||||
|
||||
// Reverse lookup in the map
|
||||
for (final entry in castToSendspinMap.entries) {
|
||||
if (entry.value == playerId) {
|
||||
_logger.log('🔗 Translated Sendspin ID $playerId to Cast UUID ${entry.key} for queue fetch');
|
||||
return entry.key;
|
||||
}
|
||||
}
|
||||
|
||||
// If not in map, try to find in available players
|
||||
for (final p in availablePlayers) {
|
||||
if (p.provider == 'chromecast' && p.playerId.startsWith(prefix)) {
|
||||
_logger.log('🔗 Found Cast UUID ${p.playerId} for Sendspin ID $playerId via player lookup');
|
||||
return p.playerId;
|
||||
}
|
||||
}
|
||||
|
||||
return playerId;
|
||||
}
|
||||
|
||||
/// Clear cached queue for a player.
|
||||
Future<void> clearCachedQueue(String playerId) async {
|
||||
await _database.clearCachedQueue(playerId);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
import '../models/media_item.dart';
|
||||
import '../services/cache_service.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../services/music_assistant_api.dart';
|
||||
|
||||
/// Service for handling search operations with caching.
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to isolate search logic.
|
||||
class SearchService {
|
||||
final MusicAssistantAPI? _api;
|
||||
final CacheService _cacheService;
|
||||
final DebugLogger _logger;
|
||||
|
||||
SearchService({
|
||||
required MusicAssistantAPI? api,
|
||||
required CacheService cacheService,
|
||||
required DebugLogger logger,
|
||||
}) : _api = api,
|
||||
_cacheService = cacheService,
|
||||
_logger = logger;
|
||||
|
||||
/// Search with caching support.
|
||||
///
|
||||
/// Returns cached results if available and not expired.
|
||||
/// Otherwise fetches from API and caches the results.
|
||||
Future<Map<String, List<MediaItem>>> searchWithCache(
|
||||
String query, {
|
||||
bool forceRefresh = false,
|
||||
bool libraryOnly = false,
|
||||
}) async {
|
||||
final baseKey = query.toLowerCase().trim();
|
||||
if (baseKey.isEmpty) {
|
||||
return _emptySearchResults();
|
||||
}
|
||||
|
||||
// Include libraryOnly in cache key to separate results
|
||||
final cacheKey = libraryOnly ? '$baseKey:library' : baseKey;
|
||||
|
||||
if (_cacheService.isSearchCacheValid(cacheKey, forceRefresh: forceRefresh)) {
|
||||
_logger.log('📦 Using cached search results for "$query" (libraryOnly: $libraryOnly)');
|
||||
return _cacheService.getCachedSearchResults(cacheKey)!;
|
||||
}
|
||||
|
||||
if (_api == null) {
|
||||
return _cacheService.getCachedSearchResults(cacheKey) ?? _emptySearchResults();
|
||||
}
|
||||
|
||||
try {
|
||||
_logger.log('🔄 Searching for "$query" (libraryOnly: $libraryOnly)...');
|
||||
final results = await _api!.search(query, libraryOnly: libraryOnly);
|
||||
|
||||
final cachedResults = <String, List<MediaItem>>{
|
||||
'artists': results['artists'] ?? [],
|
||||
'albums': results['albums'] ?? [],
|
||||
'tracks': results['tracks'] ?? [],
|
||||
'playlists': results['playlists'] ?? [],
|
||||
'audiobooks': results['audiobooks'] ?? [],
|
||||
};
|
||||
|
||||
_cacheService.setCachedSearchResults(cacheKey, cachedResults);
|
||||
_logger.log('✅ Cached search results for "$query"');
|
||||
return cachedResults;
|
||||
} catch (e) {
|
||||
_logger.log('❌ Search failed: $e');
|
||||
return _cacheService.getCachedSearchResults(cacheKey) ?? _emptySearchResults();
|
||||
}
|
||||
}
|
||||
|
||||
/// Clear all search and detail caches.
|
||||
void clearAllDetailCaches() {
|
||||
_cacheService.clearAllDetailCaches();
|
||||
}
|
||||
|
||||
/// Check if search cache is valid for a query.
|
||||
bool isSearchCacheValid(String query, {bool forceRefresh = false}) {
|
||||
final baseKey = query.toLowerCase().trim();
|
||||
return _cacheService.isSearchCacheValid(baseKey, forceRefresh: forceRefresh);
|
||||
}
|
||||
|
||||
/// Get cached search results for a query.
|
||||
Map<String, List<MediaItem>>? getCachedSearchResults(String query, {bool libraryOnly = false}) {
|
||||
final baseKey = query.toLowerCase().trim();
|
||||
final cacheKey = libraryOnly ? '$baseKey:library' : baseKey;
|
||||
return _cacheService.getCachedSearchResults(cacheKey);
|
||||
}
|
||||
|
||||
Map<String, List<MediaItem>> _emptySearchResults() {
|
||||
return {
|
||||
'artists': [],
|
||||
'albums': [],
|
||||
'tracks': [],
|
||||
'playlists': [],
|
||||
'audiobooks': [],
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -249,7 +249,7 @@ class SendspinService {
|
||||
'name': _playerName,
|
||||
'version': 1, // Protocol version (integer)
|
||||
'supported_roles': ['player@v1'],
|
||||
'player@v1_support': {
|
||||
'player_support': {
|
||||
'supported_formats': [
|
||||
{
|
||||
'codec': 'pcm',
|
||||
@@ -427,25 +427,7 @@ class SendspinService {
|
||||
}
|
||||
break;
|
||||
|
||||
case 'server/command':
|
||||
final cmdPayload = data['payload'] as Map<String, dynamic>?;
|
||||
final playerCmd = cmdPayload?['player'] as Map<String, dynamic>?;
|
||||
final command = playerCmd?['command'] as String?;
|
||||
if (command == 'volume') {
|
||||
final level = playerCmd?['volume'] as int?;
|
||||
if (level != null) {
|
||||
_volume = level;
|
||||
onVolume?.call(level);
|
||||
}
|
||||
} else if (command == 'mute') {
|
||||
final muted = playerCmd?['mute'] as bool? ?? false;
|
||||
_isMuted = muted;
|
||||
onVolume?.call(muted ? 0 : _volume);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'volume':
|
||||
// Legacy protocol - kept for compatibility
|
||||
final level = data['level'] as int?;
|
||||
if (level != null) {
|
||||
_volume = level;
|
||||
@@ -541,7 +523,7 @@ class SendspinService {
|
||||
|
||||
try {
|
||||
final json = jsonEncode(message);
|
||||
_logger.debug('Sendspin: Sending message: ${message['type']}');
|
||||
_logger.log('Sendspin: Sending message: ${message['type']}');
|
||||
_channel!.sink.add(json);
|
||||
} catch (e) {
|
||||
_logger.log('Sendspin: Error sending message: $e');
|
||||
|
||||
@@ -43,7 +43,6 @@ class SyncService with ChangeNotifier {
|
||||
List<Artist> _cachedArtists = [];
|
||||
List<Audiobook> _cachedAudiobooks = [];
|
||||
List<Playlist> _cachedPlaylists = [];
|
||||
List<MediaItem> _cachedPodcasts = [];
|
||||
|
||||
// Source provider tracking for client-side filtering
|
||||
// Maps itemId -> list of provider instance IDs that provided the item
|
||||
@@ -51,6 +50,7 @@ class SyncService with ChangeNotifier {
|
||||
Map<String, List<String>> _artistSourceProviders = {};
|
||||
Map<String, List<String>> _audiobookSourceProviders = {};
|
||||
Map<String, List<String>> _playlistSourceProviders = {};
|
||||
|
||||
// Getters
|
||||
SyncStatus get status => _status;
|
||||
String? get lastError => _lastError;
|
||||
@@ -60,16 +60,15 @@ class SyncService with ChangeNotifier {
|
||||
List<Artist> get cachedArtists => _cachedArtists;
|
||||
List<Audiobook> get cachedAudiobooks => _cachedAudiobooks;
|
||||
List<Playlist> get cachedPlaylists => _cachedPlaylists;
|
||||
List<MediaItem> get cachedPodcasts => _cachedPodcasts;
|
||||
bool get hasCache => _cachedAlbums.isNotEmpty || _cachedArtists.isNotEmpty ||
|
||||
_cachedAudiobooks.isNotEmpty || _cachedPlaylists.isNotEmpty ||
|
||||
_cachedPodcasts.isNotEmpty;
|
||||
_cachedAudiobooks.isNotEmpty || _cachedPlaylists.isNotEmpty;
|
||||
|
||||
// Source provider getters for client-side filtering
|
||||
Map<String, List<String>> get albumSourceProviders => _albumSourceProviders;
|
||||
Map<String, List<String>> get artistSourceProviders => _artistSourceProviders;
|
||||
Map<String, List<String>> get audiobookSourceProviders => _audiobookSourceProviders;
|
||||
Map<String, List<String>> get playlistSourceProviders => _playlistSourceProviders;
|
||||
|
||||
/// Load library data from database cache (instant)
|
||||
/// Call this on app startup for immediate data
|
||||
/// Also loads source provider info for client-side filtering
|
||||
@@ -146,20 +145,8 @@ class SyncService with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
// Load podcasts from cache (no source provider tracking - API doesn't support filtering)
|
||||
final podcastData = await _db.getCachedItems('podcast');
|
||||
_cachedPodcasts = [];
|
||||
for (final data in podcastData) {
|
||||
try {
|
||||
_cachedPodcasts.add(MediaItem.fromJson(data));
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to parse cached podcast: $e');
|
||||
}
|
||||
}
|
||||
|
||||
_logger.log('📦 Loaded ${_cachedAlbums.length} albums, ${_cachedArtists.length} artists, '
|
||||
'${_cachedAudiobooks.length} audiobooks, ${_cachedPlaylists.length} playlists, '
|
||||
'${_cachedPodcasts.length} podcasts from cache');
|
||||
'${_cachedAudiobooks.length} audiobooks, ${_cachedPlaylists.length} playlists from cache');
|
||||
_logger.log('📦 Source providers: ${_albumSourceProviders.length} albums, ${_artistSourceProviders.length} artists tracked');
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
@@ -186,16 +173,13 @@ class SyncService with ChangeNotifier {
|
||||
}
|
||||
|
||||
// Check if sync is needed (default: every 5 minutes)
|
||||
// Always sync if cache is empty (no albums AND no artists loaded)
|
||||
final cacheEmpty = _cachedAlbums.isEmpty && _cachedArtists.isEmpty;
|
||||
if (!force && !cacheEmpty) {
|
||||
if (!force) {
|
||||
final albumsNeedSync = await _db.needsSync('albums', maxAge: const Duration(minutes: 5));
|
||||
final artistsNeedSync = await _db.needsSync('artists', maxAge: const Duration(minutes: 5));
|
||||
final audiobooksNeedSync = await _db.needsSync('audiobooks', maxAge: const Duration(minutes: 5));
|
||||
final playlistsNeedSync = await _db.needsSync('playlists', maxAge: const Duration(minutes: 5));
|
||||
final podcastsNeedSync = await _db.needsSync('podcasts', maxAge: const Duration(minutes: 5));
|
||||
|
||||
if (!albumsNeedSync && !artistsNeedSync && !audiobooksNeedSync && !playlistsNeedSync && !podcastsNeedSync) {
|
||||
if (!albumsNeedSync && !artistsNeedSync && !audiobooksNeedSync && !playlistsNeedSync) {
|
||||
_logger.log('✅ Cache is fresh, skipping sync');
|
||||
return;
|
||||
}
|
||||
@@ -221,7 +205,6 @@ class SyncService with ChangeNotifier {
|
||||
await _db.clearCacheForType('artist');
|
||||
await _db.clearCacheForType('audiobook');
|
||||
await _db.clearCacheForType('playlist');
|
||||
await _db.clearCacheForType('podcast');
|
||||
}
|
||||
|
||||
// Build NEW source tracking maps - don't modify existing until sync is complete
|
||||
@@ -266,9 +249,6 @@ class SyncService with ChangeNotifier {
|
||||
_logger.log(' 📡 Syncing provider: $providerId');
|
||||
|
||||
// Fetch from this specific provider
|
||||
// Note: Tracks are NOT fetched during background sync to avoid
|
||||
// overwhelming provider rate limits (especially Spotify).
|
||||
// Tracks are loaded on-demand when the user visits the tracks tab.
|
||||
final results = await Future.wait([
|
||||
api.getAlbums(limit: 1000, providerInstanceIds: [providerId]),
|
||||
api.getArtists(limit: 1000, albumArtistsOnly: showOnlyArtistsWithAlbums, providerInstanceIds: [providerId]),
|
||||
@@ -281,7 +261,7 @@ class SyncService with ChangeNotifier {
|
||||
final audiobooks = results[2] as List<Audiobook>;
|
||||
final playlists = results[3] as List<Playlist>;
|
||||
|
||||
_logger.log(' 📥 Got ${albums.length} albums, ${artists.length} artists, ${audiobooks.length} audiobooks, ${playlists.length} playlists from $providerId');
|
||||
_logger.log(' 📥 Got ${albums.length} albums, ${artists.length} artists, ${audiobooks.length} audiobooks from $providerId');
|
||||
|
||||
// Add to maps and track source provider in NEW tracking maps
|
||||
for (final album in albums) {
|
||||
@@ -343,31 +323,20 @@ class SyncService with ChangeNotifier {
|
||||
final audiobooks = audiobookMap.values.toList();
|
||||
final playlists = playlistMap.values.toList();
|
||||
|
||||
// Fetch podcasts separately (API doesn't support providerInstanceIds)
|
||||
List<MediaItem> podcasts = [];
|
||||
try {
|
||||
podcasts = await api.getPodcasts(limit: 100);
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to fetch podcasts: $e');
|
||||
}
|
||||
|
||||
_logger.log('📥 Total: ${albums.length} albums, ${artists.length} artists, '
|
||||
'${audiobooks.length} audiobooks, ${playlists.length} playlists, '
|
||||
'${podcasts.length} podcasts');
|
||||
'${audiobooks.length} audiobooks, ${playlists.length} playlists');
|
||||
|
||||
// Save to database cache with source provider info (using NEW tracking maps)
|
||||
await _saveAlbumsToCache(albums, newAlbumSourceProviders);
|
||||
await _saveArtistsToCache(artists, newArtistSourceProviders);
|
||||
await _saveAudiobooksToCache(audiobooks, newAudiobookSourceProviders);
|
||||
await _savePlaylistsToCache(playlists, newPlaylistSourceProviders);
|
||||
await _savePodcastsToCache(podcasts);
|
||||
|
||||
// Update sync metadata
|
||||
await _db.updateSyncMetadata('albums', albums.length);
|
||||
await _db.updateSyncMetadata('artists', artists.length);
|
||||
await _db.updateSyncMetadata('audiobooks', audiobooks.length);
|
||||
await _db.updateSyncMetadata('playlists', playlists.length);
|
||||
await _db.updateSyncMetadata('podcasts', podcasts.length);
|
||||
|
||||
// Update in-memory cache
|
||||
if (isPartialSync) {
|
||||
@@ -401,9 +370,6 @@ class SyncService with ChangeNotifier {
|
||||
_cachedAudiobooks = audiobooks;
|
||||
_cachedPlaylists = playlists;
|
||||
}
|
||||
// Podcasts always full replace (no per-provider tracking)
|
||||
_cachedPodcasts = podcasts;
|
||||
|
||||
// Atomically swap in the new source tracking maps
|
||||
// This ensures filtering always sees complete data, never partial
|
||||
_albumSourceProviders = newAlbumSourceProviders;
|
||||
@@ -506,24 +472,6 @@ class SyncService with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
/// Save podcasts to database cache (batched, no source provider tracking)
|
||||
Future<void> _savePodcastsToCache(List<MediaItem> podcasts) async {
|
||||
final batchItems = <BatchCacheItem>[];
|
||||
for (final podcast in podcasts) {
|
||||
batchItems.add(BatchCacheItem(
|
||||
itemType: 'podcast',
|
||||
itemId: podcast.itemId,
|
||||
data: jsonEncode(podcast.toJson()),
|
||||
));
|
||||
}
|
||||
try {
|
||||
await _db.batchCacheItems(batchItems);
|
||||
_logger.log('💾 Batch saved ${podcasts.length} podcasts to cache');
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to batch cache podcasts: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// Force a fresh sync (for pull-to-refresh)
|
||||
/// [providerInstanceIds] - optional list of provider IDs to filter by (null = all providers)
|
||||
Future<void> forceSync(MusicAssistantAPI api, {List<String>? providerInstanceIds}) async {
|
||||
@@ -539,7 +487,6 @@ class SyncService with ChangeNotifier {
|
||||
_cachedArtists = [];
|
||||
_cachedAudiobooks = [];
|
||||
_cachedPlaylists = [];
|
||||
_cachedPodcasts = [];
|
||||
_albumSourceProviders = {};
|
||||
_artistSourceProviders = {};
|
||||
_audiobookSourceProviders = {};
|
||||
@@ -625,13 +572,9 @@ class SyncService with ChangeNotifier {
|
||||
/// Get playlists (from cache or empty if not loaded)
|
||||
List<Playlist> getPlaylists() => _cachedPlaylists;
|
||||
|
||||
/// Get podcasts (from cache or empty if not loaded)
|
||||
List<MediaItem> getPodcasts() => _cachedPodcasts;
|
||||
|
||||
/// Check if we have data available (from cache or sync)
|
||||
bool get hasData => _cachedAlbums.isNotEmpty || _cachedArtists.isNotEmpty ||
|
||||
_cachedAudiobooks.isNotEmpty || _cachedPlaylists.isNotEmpty ||
|
||||
_cachedPodcasts.isNotEmpty;
|
||||
_cachedAudiobooks.isNotEmpty || _cachedPlaylists.isNotEmpty;
|
||||
|
||||
/// Update cached albums with sorted data from provider
|
||||
/// Used when sort order changes - preserves source provider tracking
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
/// Utility methods for network-related operations.
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to isolate network logic.
|
||||
class NetworkUtils {
|
||||
/// Check if a hostname is a local/private network address.
|
||||
///
|
||||
/// Returns true for:
|
||||
/// - Private IPv4 ranges (192.168.x.x, 10.x.x.x, 172.16-31.x.x)
|
||||
/// - localhost (127.x.x.x)
|
||||
/// - .local domains (mDNS/Bonjour)
|
||||
/// - .ts.net domains (Tailscale VPN - treat as local since it's a VPN)
|
||||
static bool isLocalNetworkHost(String host) {
|
||||
return host.startsWith('192.168.') ||
|
||||
host.startsWith('10.') ||
|
||||
host.startsWith('172.16.') ||
|
||||
host.startsWith('172.17.') ||
|
||||
host.startsWith('172.18.') ||
|
||||
host.startsWith('172.19.') ||
|
||||
host.startsWith('172.2') ||
|
||||
host.startsWith('172.30.') ||
|
||||
host.startsWith('172.31.') ||
|
||||
host == 'localhost' ||
|
||||
host.startsWith('127.') ||
|
||||
host.endsWith('.local') ||
|
||||
host.endsWith('.ts.net'); // Tailscale - treat as local since it's a VPN
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
import '../models/player.dart';
|
||||
|
||||
/// Utility for player list sorting and filtering operations.
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to isolate player sorting logic.
|
||||
class PlayerSortUtility {
|
||||
/// Sort players list based on smart sort setting.
|
||||
///
|
||||
/// Smart sort order: local player first, then playing, then on, then off.
|
||||
/// Within same status, sort alphabetically.
|
||||
///
|
||||
/// Default sort: alphabetical only.
|
||||
static void sortPlayers(
|
||||
List<Player> players, {
|
||||
required bool smartSort,
|
||||
String? builtinPlayerId,
|
||||
}) {
|
||||
if (smartSort) {
|
||||
// Smart sort: local player first, then playing, then on, then off
|
||||
players.sort((a, b) {
|
||||
// Local player always first
|
||||
final aIsLocal = builtinPlayerId != null && a.playerId == builtinPlayerId;
|
||||
final bIsLocal = builtinPlayerId != null && b.playerId == builtinPlayerId;
|
||||
if (aIsLocal && !bIsLocal) return -1;
|
||||
if (bIsLocal && !aIsLocal) return 1;
|
||||
|
||||
// Then by status: playing > on > off
|
||||
final aPriority = _statusPriority(a);
|
||||
final bPriority = _statusPriority(b);
|
||||
if (aPriority != bPriority) return aPriority.compareTo(bPriority);
|
||||
|
||||
// Within same status, sort alphabetically
|
||||
return a.name.toLowerCase().compareTo(b.name.toLowerCase());
|
||||
});
|
||||
} else {
|
||||
// Default alphabetical sort
|
||||
players.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
|
||||
}
|
||||
}
|
||||
|
||||
/// Get priority for player status (lower = higher priority).
|
||||
static int _statusPriority(Player player) {
|
||||
if (player.state == 'playing') return 0;
|
||||
if (player.powered && player.state != 'off') return 1;
|
||||
return 2;
|
||||
}
|
||||
|
||||
/// Filter players to exclude unwanted players.
|
||||
///
|
||||
/// Removes:
|
||||
/// - "Music Assistant Mobile" players
|
||||
/// - MA Web UI's built-in player (ma_ prefix)
|
||||
/// - "This Device" named players without proper provider
|
||||
/// - Other device's ensemble players
|
||||
/// - Unavailable players (except builtin player)
|
||||
static List<Player> filterPlayers(
|
||||
List<Player> players, {
|
||||
required String? builtinPlayerId,
|
||||
}) {
|
||||
final result = <Player>[];
|
||||
|
||||
for (final player in players) {
|
||||
final nameLower = player.name.toLowerCase();
|
||||
|
||||
// Filter out "music assistant mobile" players
|
||||
if (nameLower.contains('music assistant mobile')) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Filter out MA Web UI's built-in player (provider is 'builtin_player' and starts with 'ma_')
|
||||
if (player.provider == 'builtin_player' && player.playerId.startsWith('ma_')) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Filter out "This Device" named players without proper provider
|
||||
if (nameLower == 'this device') {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Filter out other device's ensemble players
|
||||
if (player.playerId.startsWith('ensemble_')) {
|
||||
if (builtinPlayerId == null || player.playerId != builtinPlayerId) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// Filter out unavailable players (except builtin player)
|
||||
if (!player.available) {
|
||||
if (builtinPlayerId != null && player.playerId == builtinPlayerId) {
|
||||
result.add(player);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
result.add(player);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// Find the best player to auto-select based on priority.
|
||||
///
|
||||
/// Priority order:
|
||||
/// 1. Last selected player (if available)
|
||||
/// 2. Last active player from any session
|
||||
/// 3. Built-in player
|
||||
/// 4. First available player
|
||||
static Player? selectBestPlayer({
|
||||
required List<Player> availablePlayers,
|
||||
required Player? lastSelectedPlayer,
|
||||
required Player? lastActivePlayer,
|
||||
required String? builtinPlayerId,
|
||||
}) {
|
||||
// Priority 1: Last selected player (if available and in current list)
|
||||
if (lastSelectedPlayer != null) {
|
||||
final found = availablePlayers.firstWhere(
|
||||
(p) => p.playerId == lastSelectedPlayer!.playerId,
|
||||
orElse: () => _emptyPlayer,
|
||||
);
|
||||
if (found.playerId.isNotEmpty) {
|
||||
return found;
|
||||
}
|
||||
}
|
||||
|
||||
// Priority 2: Last active player from any session (if available)
|
||||
if (lastActivePlayer != null) {
|
||||
final found = availablePlayers.firstWhere(
|
||||
(p) => p.playerId == lastActivePlayer!.playerId,
|
||||
orElse: () => _emptyPlayer,
|
||||
);
|
||||
if (found.playerId.isNotEmpty) {
|
||||
return found;
|
||||
}
|
||||
}
|
||||
|
||||
// Priority 3: Built-in player (if available)
|
||||
if (builtinPlayerId != null) {
|
||||
final builtin = availablePlayers.firstWhere(
|
||||
(p) => p.playerId == builtinPlayerId,
|
||||
orElse: () => _emptyPlayer,
|
||||
);
|
||||
if (builtin.playerId.isNotEmpty) {
|
||||
return builtin;
|
||||
}
|
||||
}
|
||||
|
||||
// Priority 4: First available player
|
||||
if (availablePlayers.isNotEmpty) {
|
||||
return availablePlayers.first;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
static final Player _emptyPlayer = Player(
|
||||
playerId: '',
|
||||
name: '',
|
||||
available: false,
|
||||
powered: false,
|
||||
state: 'idle',
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
import '../models/player.dart';
|
||||
|
||||
/// Utility for determining player sync state.
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to isolate complex sync logic
|
||||
/// and make it testable independently.
|
||||
class PlayerSyncState {
|
||||
final List<Player> availablePlayers;
|
||||
final Map<String, String> castToSendspinIdMap;
|
||||
|
||||
PlayerSyncState({
|
||||
required this.availablePlayers,
|
||||
required this.castToSendspinIdMap,
|
||||
});
|
||||
|
||||
/// Check if a player should show the "manually synced" indicator (yellow border).
|
||||
///
|
||||
/// Returns true for BOTH the leader AND children of a manually created sync group.
|
||||
/// Excludes pre-configured MA speaker groups (provider = 'player_group').
|
||||
bool isPlayerManuallySynced(String playerId) {
|
||||
final player = availablePlayers.where((p) => p.playerId == playerId).firstOrNull;
|
||||
if (player == null) return false;
|
||||
|
||||
// Group players (like "All Speakers") should NEVER have yellow border
|
||||
// They are pre-configured containers, not manually synced players
|
||||
// Check this FIRST before any other logic to prevent edge cases
|
||||
if (player.provider == 'player_group') return false;
|
||||
|
||||
// Case 1: Player is a child synced to another player
|
||||
if (player.syncedTo != null) {
|
||||
// Look up sync target - also check translated IDs for Cast+Sendspin players
|
||||
// The syncedTo might contain a Cast ID but the player list has the Sendspin version
|
||||
Player? syncTarget = availablePlayers.where((p) => p.playerId == player.syncedTo).firstOrNull;
|
||||
|
||||
// If not found, try looking up by translated Sendspin ID
|
||||
if (syncTarget == null) {
|
||||
final translatedId = castToSendspinIdMap[player.syncedTo];
|
||||
if (translatedId != null) {
|
||||
syncTarget = availablePlayers.where((p) => p.playerId == translatedId).firstOrNull;
|
||||
}
|
||||
}
|
||||
|
||||
// Also check reverse: syncedTo might be Sendspin ID, look for Cast player
|
||||
if (syncTarget == null) {
|
||||
// Build reverse map on demand
|
||||
for (final entry in castToSendspinIdMap.entries) {
|
||||
if (entry.value == player.syncedTo) {
|
||||
syncTarget = availablePlayers.where((p) => p.playerId == entry.key).firstOrNull;
|
||||
if (syncTarget != null) break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (syncTarget == null) return false;
|
||||
|
||||
// If synced to a group player, it's part of a pre-configured group
|
||||
if (syncTarget.provider == 'player_group') return false;
|
||||
|
||||
// Synced to a regular player - this is a manual sync child
|
||||
return true;
|
||||
}
|
||||
|
||||
// Case 2: Player is a leader with group members
|
||||
if (player.groupMembers != null && player.groupMembers!.length > 1) {
|
||||
// Key distinction: In a MANUAL sync, the leader's own ID is in groupMembers
|
||||
// In a PRE-CONFIGURED group (UGP), the group player's ID is NOT in groupMembers
|
||||
// (the members are the child players, not including the group itself)
|
||||
final isInOwnGroup = player.groupMembers!.contains(player.playerId);
|
||||
if (!isInOwnGroup) {
|
||||
// This is a pre-configured group player (like "All Speakers")
|
||||
return false;
|
||||
}
|
||||
// Leader's ID is in groupMembers = manual sync
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/// Find a player by ID, optionally translating Cast IDs to Sendspin IDs.
|
||||
Player? findPlayer(String playerId) {
|
||||
// Try direct lookup first
|
||||
var player = availablePlayers.where((p) => p.playerId == playerId).firstOrNull;
|
||||
|
||||
// If not found, try Cast-to-Sendspin translation
|
||||
if (player == null && castToSendspinIdMap.containsKey(playerId)) {
|
||||
final sendspinId = castToSendspinIdMap[playerId];
|
||||
player = availablePlayers.where((p) => p.playerId == sendspinId).firstOrNull;
|
||||
}
|
||||
|
||||
return player;
|
||||
}
|
||||
|
||||
/// Find the sync target for a player, handling Cast/Sendspin ID translation.
|
||||
Player? findSyncTarget(Player player) {
|
||||
if (player.syncedTo == null) return null;
|
||||
|
||||
// Try direct lookup
|
||||
var syncTarget = availablePlayers.where((p) => p.playerId == player.syncedTo).firstOrNull;
|
||||
|
||||
// If not found, try translated Sendspin ID
|
||||
if (syncTarget == null) {
|
||||
final translatedId = castToSendspinIdMap[player.syncedTo];
|
||||
if (translatedId != null) {
|
||||
syncTarget = availablePlayers.where((p) => p.playerId == translatedId).firstOrNull;
|
||||
}
|
||||
}
|
||||
|
||||
// Also check reverse: syncedTo might be Sendspin ID, look for Cast player
|
||||
if (syncTarget == null) {
|
||||
for (final entry in castToSendspinIdMap.entries) {
|
||||
if (entry.value == player.syncedTo) {
|
||||
syncTarget = availablePlayers.where((p) => p.playerId == entry.key).firstOrNull;
|
||||
if (syncTarget != null) break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return syncTarget;
|
||||
}
|
||||
|
||||
/// Check if a player is a group player (pre-configured MA speaker group).
|
||||
bool isGroupPlayer(Player player) {
|
||||
return player.provider == 'player_group';
|
||||
}
|
||||
|
||||
/// Check if a player is a leader in a manual sync group.
|
||||
bool isManualSyncLeader(Player player) {
|
||||
if (player.groupMembers == null || player.groupMembers!.length <= 1) {
|
||||
return false;
|
||||
}
|
||||
// In a MANUAL sync, the leader's own ID is in groupMembers
|
||||
return player.groupMembers!.contains(player.playerId);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
import '../constants/timings.dart';
|
||||
|
||||
/// Utility methods for queue playback controls.
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to isolate queue control logic.
|
||||
class QueueControls {
|
||||
/// Get the next repeat mode in the cycle.
|
||||
///
|
||||
/// Cycle order: off → all → one → off
|
||||
static String getNextRepeatMode(String? currentMode) {
|
||||
switch (currentMode) {
|
||||
case RepeatModes.off:
|
||||
case null:
|
||||
return RepeatModes.all;
|
||||
case RepeatModes.all:
|
||||
return RepeatModes.one;
|
||||
case RepeatModes.one:
|
||||
return RepeatModes.off;
|
||||
default:
|
||||
return RepeatModes.off;
|
||||
}
|
||||
}
|
||||
|
||||
/// Check if a repeat mode is valid.
|
||||
static bool isValidRepeatMode(String? mode) {
|
||||
return mode == RepeatModes.off ||
|
||||
mode == RepeatModes.all ||
|
||||
mode == RepeatModes.one;
|
||||
}
|
||||
}
|
||||
+31
-34
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import '../services/image_prefetch_service.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../screens/album_details_screen.dart';
|
||||
@@ -60,20 +59,15 @@ class _AlbumCardState extends State<AlbumCard> with LibraryStatusMixin {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
// Defer status initialization to after the build frame completes.
|
||||
// setLibraryStatus() calls notifyListeners() synchronously, which triggers
|
||||
// setState() in listening widgets — illegal during the build phase.
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && widget.album.inLibrary) {
|
||||
service.setLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.album.favorite ?? false)) {
|
||||
service.setFavoriteStatus(key, true);
|
||||
}
|
||||
});
|
||||
// Initialize status in centralized service from widget data
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && widget.album.inLibrary) {
|
||||
service.initLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.album.favorite ?? false)) {
|
||||
service.initFavoriteStatus(key, true);
|
||||
}
|
||||
_initFallbackImage();
|
||||
}
|
||||
|
||||
@@ -338,11 +332,11 @@ class _AlbumCardState extends State<AlbumCard> with LibraryStatusMixin {
|
||||
initialImageUrl: imageUrl,
|
||||
),
|
||||
),
|
||||
).then((_) {
|
||||
// Reset after navigation debounce delay
|
||||
Future.delayed(Timings.navigationDebounce, () {
|
||||
if (mounted) _isNavigating = false;
|
||||
});
|
||||
);
|
||||
|
||||
// Reset after navigation debounce delay
|
||||
Future.delayed(Timings.navigationDebounce, () {
|
||||
if (mounted) _isNavigating = false;
|
||||
});
|
||||
},
|
||||
onLongPressStart: (details) {
|
||||
@@ -378,7 +372,6 @@ class _AlbumCardState extends State<AlbumCard> with LibraryStatusMixin {
|
||||
fit: BoxFit.cover,
|
||||
memCacheWidth: cacheSize,
|
||||
memCacheHeight: cacheSize,
|
||||
cacheManager: AlbumImageCacheManager(),
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (context, url) => const SizedBox(),
|
||||
@@ -417,22 +410,26 @@ class _AlbumCardState extends State<AlbumCard> with LibraryStatusMixin {
|
||||
const SizedBox(height: 8),
|
||||
// Album title with year
|
||||
// PERF: Removed Hero - text animations provide minimal benefit but add overhead
|
||||
Text(
|
||||
widget.album.nameWithYear,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.album.nameWithYear,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
),
|
||||
// Artist name
|
||||
Text(
|
||||
widget.album.artistsString,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.7),
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.album.artistsString,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.7),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import '../services/image_prefetch_service.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
@@ -15,8 +14,6 @@ class AlbumRow extends StatefulWidget {
|
||||
final double? rowHeight;
|
||||
/// Optional: synchronous getter for cached data (for instant display)
|
||||
final List<Album>? Function()? getCachedAlbums;
|
||||
/// Optional: signal to trigger in-place reload without destroying the widget
|
||||
final ValueNotifier<int>? refreshSignal;
|
||||
|
||||
const AlbumRow({
|
||||
super.key,
|
||||
@@ -25,7 +22,6 @@ class AlbumRow extends StatefulWidget {
|
||||
this.heroTagSuffix,
|
||||
this.rowHeight,
|
||||
this.getCachedAlbums,
|
||||
this.refreshSignal,
|
||||
});
|
||||
|
||||
@override
|
||||
@@ -50,19 +46,6 @@ class _AlbumRowState extends State<AlbumRow> with AutomaticKeepAliveClientMixin
|
||||
_isLoading = false;
|
||||
}
|
||||
_loadAlbums();
|
||||
widget.refreshSignal?.addListener(_onRefreshSignal);
|
||||
}
|
||||
|
||||
void _onRefreshSignal() {
|
||||
if (!mounted) return;
|
||||
_hasLoaded = false;
|
||||
_loadAlbums();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
widget.refreshSignal?.removeListener(_onRefreshSignal);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
Future<void> _loadAlbums() async {
|
||||
@@ -102,7 +85,7 @@ class _AlbumRowState extends State<AlbumRow> with AutomaticKeepAliveClientMixin
|
||||
if (imageUrl != null) {
|
||||
// Use CachedNetworkImageProvider to warm the cache
|
||||
precacheImage(
|
||||
CachedNetworkImageProvider(imageUrl, cacheManager: AlbumImageCacheManager()),
|
||||
CachedNetworkImageProvider(imageUrl),
|
||||
context,
|
||||
).catchError((_) {
|
||||
// Silently ignore precache errors
|
||||
@@ -130,8 +113,8 @@ class _AlbumRowState extends State<AlbumRow> with AutomaticKeepAliveClientMixin
|
||||
}
|
||||
|
||||
// Card layout: square artwork + text below
|
||||
// Text area: 8px gap + ~18px title + ~18px artist = ~44px
|
||||
const textAreaHeight = 44.0;
|
||||
// Text area: 8px gap + ~20px title + ~20px artist = ~48px
|
||||
const textAreaHeight = 48.0;
|
||||
final artworkSize = contentHeight - textAreaHeight;
|
||||
final cardWidth = artworkSize; // Card width = artwork width (square)
|
||||
final itemExtent = cardWidth + 12; // width + horizontal margins
|
||||
|
||||
@@ -59,20 +59,15 @@ class _ArtistCardState extends State<ArtistCard> with LibraryStatusMixin {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
// Defer status initialization to after the build frame completes.
|
||||
// setLibraryStatus() calls notifyListeners() synchronously, which triggers
|
||||
// setState() in listening widgets — illegal during the build phase.
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && widget.artist.inLibrary) {
|
||||
service.setLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.artist.favorite ?? false)) {
|
||||
service.setFavoriteStatus(key, true);
|
||||
}
|
||||
});
|
||||
// Initialize status in centralized service from widget data
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && widget.artist.inLibrary) {
|
||||
service.initLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.artist.favorite ?? false)) {
|
||||
service.initFavoriteStatus(key, true);
|
||||
}
|
||||
// Fetch fallback image once in initState, not during build
|
||||
_initFallbackImage();
|
||||
}
|
||||
@@ -323,11 +318,11 @@ class _ArtistCardState extends State<ArtistCard> with LibraryStatusMixin {
|
||||
initialImageUrl: imageUrl,
|
||||
),
|
||||
),
|
||||
).then((_) {
|
||||
// Reset after navigation debounce delay
|
||||
Future.delayed(Timings.navigationDebounce, () {
|
||||
if (mounted) _isNavigating = false;
|
||||
});
|
||||
);
|
||||
|
||||
// Reset after navigation debounce delay
|
||||
Future.delayed(Timings.navigationDebounce, () {
|
||||
if (mounted) _isNavigating = false;
|
||||
});
|
||||
},
|
||||
onLongPressStart: (details) {
|
||||
|
||||
@@ -14,8 +14,6 @@ class ArtistRow extends StatefulWidget {
|
||||
final double? rowHeight;
|
||||
/// Optional: synchronous getter for cached data (for instant display)
|
||||
final List<Artist>? Function()? getCachedArtists;
|
||||
/// Optional: signal to trigger in-place reload without destroying the widget
|
||||
final ValueNotifier<int>? refreshSignal;
|
||||
|
||||
const ArtistRow({
|
||||
super.key,
|
||||
@@ -24,7 +22,6 @@ class ArtistRow extends StatefulWidget {
|
||||
this.heroTagSuffix,
|
||||
this.rowHeight,
|
||||
this.getCachedArtists,
|
||||
this.refreshSignal,
|
||||
});
|
||||
|
||||
@override
|
||||
@@ -49,19 +46,6 @@ class _ArtistRowState extends State<ArtistRow> with AutomaticKeepAliveClientMixi
|
||||
_isLoading = false;
|
||||
}
|
||||
_loadArtists();
|
||||
widget.refreshSignal?.addListener(_onRefreshSignal);
|
||||
}
|
||||
|
||||
void _onRefreshSignal() {
|
||||
if (!mounted) return;
|
||||
_hasLoaded = false;
|
||||
_loadArtists();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
widget.refreshSignal?.removeListener(_onRefreshSignal);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
Future<void> _loadArtists() async {
|
||||
@@ -129,8 +113,8 @@ class _ArtistRowState extends State<ArtistRow> with AutomaticKeepAliveClientMixi
|
||||
}
|
||||
|
||||
// Card layout: circle image + name below
|
||||
// Text area: 8px gap + ~36px for 2-line name = ~44px
|
||||
const textAreaHeight = 44.0;
|
||||
// Text area: 8px gap + ~40px for 2-line name = ~48px
|
||||
const textAreaHeight = 48.0;
|
||||
final imageSize = contentHeight - textAreaHeight;
|
||||
final cardWidth = imageSize; // Card width = image width (circle)
|
||||
final itemExtent = cardWidth + 16; // width + horizontal margins
|
||||
|
||||
@@ -3,7 +3,6 @@ import 'package:flutter/services.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
|
||||
import '../services/image_prefetch_service.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
@@ -96,7 +95,7 @@ class _AudiobookRowState extends State<AudiobookRow> with AutomaticKeepAliveClie
|
||||
final imageUrl = maProvider.api?.getImageUrl(audiobook, size: 256);
|
||||
if (imageUrl != null) {
|
||||
precacheImage(
|
||||
CachedNetworkImageProvider(imageUrl, cacheManager: AlbumImageCacheManager()),
|
||||
CachedNetworkImageProvider(imageUrl),
|
||||
context,
|
||||
).catchError((_) {
|
||||
// Silently ignore precache errors
|
||||
@@ -122,7 +121,7 @@ class _AudiobookRowState extends State<AudiobookRow> with AutomaticKeepAliveClie
|
||||
);
|
||||
}
|
||||
|
||||
const textAreaHeight = 44.0;
|
||||
const textAreaHeight = 48.0;
|
||||
final artworkSize = contentHeight - textAreaHeight;
|
||||
final cardWidth = artworkSize;
|
||||
final itemExtent = cardWidth + 12;
|
||||
@@ -224,10 +223,10 @@ class _AudiobookCardState extends State<_AudiobookCard> with LibraryStatusMixin
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && widget.audiobook.inLibrary) {
|
||||
service.setLibraryStatus(key, true);
|
||||
service.initLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.audiobook.favorite ?? false)) {
|
||||
service.setFavoriteStatus(key, true);
|
||||
service.initFavoriteStatus(key, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -450,7 +449,6 @@ class _AudiobookCardState extends State<_AudiobookCard> with LibraryStatusMixin
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
cacheManager: AlbumImageCacheManager(),
|
||||
// PERF: Duration.zero for hero-wrapped images
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
|
||||
|
||||
/// A wrapper around CachedNetworkImage for consistent image caching throughout the app.
|
||||
///
|
||||
@@ -19,7 +18,6 @@ class CachedImage extends StatelessWidget {
|
||||
final int? cacheWidth;
|
||||
final int? cacheHeight;
|
||||
final BorderRadius? borderRadius;
|
||||
final BaseCacheManager? cacheManager;
|
||||
|
||||
const CachedImage({
|
||||
super.key,
|
||||
@@ -32,7 +30,6 @@ class CachedImage extends StatelessWidget {
|
||||
this.cacheWidth,
|
||||
this.cacheHeight,
|
||||
this.borderRadius,
|
||||
this.cacheManager,
|
||||
});
|
||||
|
||||
@override
|
||||
@@ -46,7 +43,6 @@ class CachedImage extends StatelessWidget {
|
||||
fit: fit,
|
||||
memCacheWidth: cacheWidth,
|
||||
memCacheHeight: cacheHeight,
|
||||
cacheManager: cacheManager,
|
||||
fadeInDuration: const Duration(milliseconds: 150),
|
||||
fadeOutDuration: const Duration(milliseconds: 150),
|
||||
placeholder: (context, url) => placeholder ?? Container(
|
||||
|
||||
@@ -114,8 +114,8 @@ class _DiscoveryRowState extends State<DiscoveryRow> with AutomaticKeepAliveClie
|
||||
}
|
||||
|
||||
// Card layout: square artwork + text below
|
||||
// Text area: 8px gap + ~18px title + ~18px subtitle = ~44px
|
||||
const textAreaHeight = 44.0;
|
||||
// Text area: 8px gap + ~20px title + ~20px subtitle = ~48px
|
||||
const textAreaHeight = 48.0;
|
||||
final artworkSize = contentHeight - textAreaHeight;
|
||||
final cardWidth = artworkSize; // Card width = artwork width (square)
|
||||
final itemExtent = cardWidth + 12; // width + horizontal margins
|
||||
@@ -191,13 +191,15 @@ class _DiscoveryRowState extends State<DiscoveryRow> with AutomaticKeepAliveClie
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
item.name,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
Flexible(
|
||||
child: Text(
|
||||
item.name,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
),
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
@@ -140,10 +140,6 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
static const double _collapsedBorderRadius = 16.0;
|
||||
static double get _collapsedArtSize => MiniPlayerLayout.artSize;
|
||||
static const double _bottomNavHeight = 56.0;
|
||||
|
||||
// Animation for hiding bottom nav offset on detail screens
|
||||
late AnimationController _detailScreenController;
|
||||
bool _lastIsOnDetailScreen = false;
|
||||
static const double _edgeDeadZone = 40.0; // Dead zone for Android back gesture
|
||||
|
||||
// Pastel yellow for grouped players (matches PlayerCard.groupBorderColor)
|
||||
@@ -248,7 +244,11 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
// Reset expansion notifier to match initial controller state (0.0)
|
||||
// This fixes a bug where stale progress values from a previous widget instance
|
||||
// caused the nav bar to be invisible on app restart/widget recreation
|
||||
playerExpansionNotifier.value = PlayerExpansionState(0.0, null, null);
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) {
|
||||
playerExpansionNotifier.value = PlayerExpansionState(0.0, null, null);
|
||||
}
|
||||
});
|
||||
|
||||
_controller = AnimationController(
|
||||
duration: const Duration(milliseconds: 300),
|
||||
@@ -322,13 +322,6 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
// Track lyrics scroll position for swipe-to-close (only allowed at top)
|
||||
_lyricsScrollController.addListener(_onLyricsScroll);
|
||||
|
||||
// Animation for transitioning mini player when entering/leaving detail screens
|
||||
_detailScreenController = AnimationController(
|
||||
duration: const Duration(milliseconds: 150),
|
||||
vsync: this,
|
||||
);
|
||||
_detailScreenController.addListener(_onDetailScreenAnimation);
|
||||
|
||||
// Slide animation for device switching - used for snap/spring animations
|
||||
_slideController = AnimationController(
|
||||
duration: const Duration(milliseconds: 250),
|
||||
@@ -367,10 +360,6 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
_loadVolumePrecisionModeSetting();
|
||||
}
|
||||
|
||||
void _onDetailScreenAnimation() {
|
||||
if (mounted) setState(() {});
|
||||
}
|
||||
|
||||
Future<void> _loadVolumePrecisionModeSetting() async {
|
||||
final enabled = await SettingsService.getVolumePrecisionMode();
|
||||
if (mounted) {
|
||||
@@ -430,7 +419,6 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
// (Controllers remove listeners on dispose, but explicit removal is clearer)
|
||||
_controller.removeListener(_notifyExpansionProgress);
|
||||
_controller.removeListener(_recordAnimationFrame);
|
||||
_detailScreenController.removeListener(_onDetailScreenAnimation);
|
||||
_lyricsScrollController.removeListener(_onLyricsScroll);
|
||||
|
||||
_controller.dispose();
|
||||
@@ -438,7 +426,6 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
_sleepTimerPanelController.dispose();
|
||||
_lyricsPanelController.dispose();
|
||||
_slideController.dispose();
|
||||
_detailScreenController.dispose();
|
||||
_slideOffsetNotifier.dispose();
|
||||
_positionSubscription?.cancel();
|
||||
_queueItemsSubscription?.cancel();
|
||||
@@ -657,7 +644,7 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
_logger.log('📊 Subscribing to positionStream for progress bar');
|
||||
_positionSubscription = maProvider.positionTracker.positionStream.listen((position) {
|
||||
if (!mounted) return;
|
||||
_logger.debug('📊 Progress received position: ${position.inSeconds}s');
|
||||
_logger.log('📊 Progress received position: ${position.inSeconds}s');
|
||||
_progressNotifier.value = position.inSeconds;
|
||||
});
|
||||
}
|
||||
@@ -1658,7 +1645,7 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
_slideController.addListener(animateToTarget);
|
||||
_slideController.duration = const Duration(milliseconds: 150);
|
||||
|
||||
_slideController.forward().then((_) {
|
||||
_slideController.forward().then((_) async {
|
||||
if (!mounted) return;
|
||||
|
||||
_slideController.removeListener(animateToTarget);
|
||||
@@ -1811,23 +1798,9 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
Widget build(BuildContext context) {
|
||||
// PERF: Use select() to only rebuild when adaptive theme setting changes
|
||||
final adaptiveTheme = context.select<ThemeProvider, bool>((p) => p.adaptiveTheme);
|
||||
// Watch detail screen state to animate mini player position
|
||||
final isOnDetailScreen = context.select<ThemeProvider, bool>((p) => p.isOnDetailScreen);
|
||||
// Get full themeProvider for methods that need adaptive color schemes
|
||||
final themeProvider = context.read<ThemeProvider>();
|
||||
|
||||
// Animate bottom nav offset when entering/leaving detail screens
|
||||
if (isOnDetailScreen != _lastIsOnDetailScreen) {
|
||||
_lastIsOnDetailScreen = isOnDetailScreen;
|
||||
if (isOnDetailScreen) {
|
||||
_detailScreenController.duration = const Duration(milliseconds: 100);
|
||||
_detailScreenController.forward();
|
||||
} else {
|
||||
_detailScreenController.duration = const Duration(milliseconds: 80);
|
||||
_detailScreenController.reverse();
|
||||
}
|
||||
}
|
||||
|
||||
return Consumer<MusicAssistantProvider>(
|
||||
builder: (context, maProvider, child) {
|
||||
final selectedPlayer = maProvider.selectedPlayer;
|
||||
@@ -1956,8 +1929,7 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
? adaptiveScheme.onPrimaryContainer
|
||||
: colorScheme.onPrimaryContainer;
|
||||
|
||||
final effectiveNavHeight = _bottomNavHeight * (1.0 - _detailScreenController.value);
|
||||
final bottomNavSpace = effectiveNavHeight + bottomPadding;
|
||||
final bottomNavSpace = _bottomNavHeight + bottomPadding;
|
||||
final bottomOffset = bottomNavSpace + _collapsedMargin;
|
||||
final width = screenSize.width - (_collapsedMargin * 2);
|
||||
|
||||
@@ -2106,10 +2078,9 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
final textAlignment = Alignment.lerp(Alignment.centerLeft, Alignment.center, t)!;
|
||||
final titleFontWeight = FontWeight.lerp(MiniPlayerLayout.primaryFontWeight, FontWeight.w600, t);
|
||||
|
||||
// Collapsed: position above bottom nav bar (or at bottom edge on detail screens)
|
||||
// Collapsed: position above bottom nav bar
|
||||
// Expanded: extend to very bottom (behind system nav bar) for seamless edge-to-edge
|
||||
final effectiveNavHeight = _bottomNavHeight * (1.0 - _detailScreenController.value);
|
||||
final bottomNavSpace = effectiveNavHeight + bottomPadding;
|
||||
final bottomNavSpace = _bottomNavHeight + bottomPadding;
|
||||
final collapsedBottomOffset = bottomNavSpace + _collapsedMargin;
|
||||
final expandedBottomOffset = 0.0; // Extend behind system nav bar
|
||||
final expandedHeight = screenSize.height; // Full screen height for edge-to-edge
|
||||
@@ -2283,10 +2254,6 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
// Smoothly fade out horizontal slide offset (for device switching) as animation progresses
|
||||
final miniPlayerSlideOffset = _slideOffset * collapsedWidth * offsetFade;
|
||||
|
||||
// Extend gesture hit area above mini player for easier swipe-down,
|
||||
// especially on detail screens where the player sits closer to screen edge.
|
||||
const _gestureExtension = 20.0;
|
||||
|
||||
return Positioned(
|
||||
left: horizontalMargin,
|
||||
right: horizontalMargin,
|
||||
@@ -2512,12 +2479,7 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
});
|
||||
}
|
||||
},
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// Invisible gesture extension area above mini player
|
||||
if (!isExpanded) const SizedBox(height: _gestureExtension),
|
||||
Container(
|
||||
child: Container(
|
||||
// PERF Phase 4: Only show shadow when meaningfully visible (t < 0.5)
|
||||
// This avoids BoxDecoration allocation for majority of animation frames
|
||||
// Shadow fades out quickly during first half of expansion
|
||||
@@ -3457,8 +3419,6 @@ class ExpandablePlayerState extends State<ExpandablePlayer>
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -3,16 +3,51 @@ import 'dart:ui';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:material_symbols_icons/symbols.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../providers/navigation_provider.dart';
|
||||
import '../theme/theme_provider.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../theme/theme_provider.dart';
|
||||
|
||||
import 'expandable_player.dart';
|
||||
import 'player/mini_player_content.dart' show MiniPlayerLayout;
|
||||
import 'player/player_reveal_overlay.dart';
|
||||
|
||||
/// Cached color with contrast adjustment
|
||||
/// Avoids expensive HSL conversions during scroll
|
||||
class _CachedNavColor {
|
||||
Color? _sourceColor;
|
||||
bool? _isDark;
|
||||
Color? _adjustedColor;
|
||||
|
||||
Color getAdjustedColor(Color sourceColor, bool isDark) {
|
||||
// Return cached value if inputs haven't changed
|
||||
if (_sourceColor == sourceColor && _isDark == isDark && _adjustedColor != null) {
|
||||
return _adjustedColor!;
|
||||
}
|
||||
|
||||
// Compute new adjusted color
|
||||
var navSelectedColor = sourceColor;
|
||||
if (isDark && navSelectedColor.computeLuminance() < 0.2) {
|
||||
final hsl = HSLColor.fromColor(navSelectedColor);
|
||||
navSelectedColor = hsl.withLightness((hsl.lightness + 0.3).clamp(0.0, 0.8)).toColor();
|
||||
} else if (!isDark && navSelectedColor.computeLuminance() > 0.8) {
|
||||
final hsl = HSLColor.fromColor(navSelectedColor);
|
||||
navSelectedColor = hsl.withLightness((hsl.lightness - 0.3).clamp(0.2, 1.0)).toColor();
|
||||
}
|
||||
|
||||
// Cache the result
|
||||
_sourceColor = sourceColor;
|
||||
_isDark = isDark;
|
||||
_adjustedColor = navSelectedColor;
|
||||
|
||||
return navSelectedColor;
|
||||
}
|
||||
}
|
||||
|
||||
final _cachedNavColor = _CachedNavColor();
|
||||
|
||||
/// A global key to access the player state from anywhere in the app
|
||||
final globalPlayerKey = GlobalKey<ExpandablePlayerState>();
|
||||
|
||||
@@ -162,7 +197,6 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
// State for player reveal overlay
|
||||
bool _isRevealVisible = false;
|
||||
|
||||
|
||||
// State for interactive hint mode (blur backdrop + wait for user action)
|
||||
bool _isHintModeActive = false;
|
||||
Timer? _hintBounceTimer;
|
||||
@@ -444,10 +478,10 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
final theme = Theme.of(context);
|
||||
final colorScheme = theme.colorScheme;
|
||||
|
||||
// PERF: Use select() to only rebuild when connection state or player changes
|
||||
final (isConnected, hasSelectedPlayer) = context.select<MusicAssistantProvider, (bool, bool)>(
|
||||
(p) => (p.isConnected, p.selectedPlayer != null),
|
||||
);
|
||||
return Consumer<MusicAssistantProvider>(
|
||||
builder: (context, maProvider, _) {
|
||||
final isConnected = maProvider.isConnected;
|
||||
final hasSelectedPlayer = maProvider.selectedPlayer != null;
|
||||
|
||||
// Compute whether this is a first-time user ready for welcome screen.
|
||||
// This is SYNCHRONOUS - no setState needed - so it works in the same frame.
|
||||
@@ -496,9 +530,138 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
padding: const EdgeInsets.only(bottom: 0), // Content manages its own padding
|
||||
child: widget.child,
|
||||
),
|
||||
// BottomNavigationBar is now in HomeScreen's Scaffold.bottomNavigationBar
|
||||
// for proper Navigator/Overlay ancestry
|
||||
// Global persistent bottom navigation bar - positioned at bottom
|
||||
// Hide when: not connected OR showing welcome screen
|
||||
// Always show when connected so users can access Settings/Library even without a player
|
||||
if (isConnected && !shouldShowWelcomeBackdrop)
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
child: ListenableBuilder(
|
||||
listenable: navigationProvider,
|
||||
builder: (context, _) {
|
||||
return Consumer<ThemeProvider>(
|
||||
builder: (context, themeProvider, _) {
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
|
||||
return ValueListenableBuilder<PlayerExpansionState>(
|
||||
valueListenable: playerExpansionNotifier,
|
||||
builder: (context, expansionState, _) {
|
||||
// Nav bar color logic - only use adaptive colors when:
|
||||
// 1. Player is expanding/expanded, OR
|
||||
// 2. On a detail screen (isOnDetailScreen)
|
||||
// On home screen with collapsed player: always use default theme colors
|
||||
final bool useAdaptiveColors = themeProvider.adaptiveTheme &&
|
||||
(expansionState.progress > 0 || themeProvider.isOnDetailScreen);
|
||||
|
||||
// Nav bar background color
|
||||
final Color navBgColor;
|
||||
if (expansionState.progress > 0 && expansionState.backgroundColor != null) {
|
||||
// Player is expanding - blend from surface to player's adaptive color
|
||||
navBgColor = Color.lerp(colorScheme.surface, expansionState.backgroundColor, expansionState.progress)!;
|
||||
} else if (useAdaptiveColors) {
|
||||
// On a detail screen - use adaptive surface color for nav bar
|
||||
final adaptiveBg = themeProvider.getAdaptiveSurfaceColorFor(Theme.of(context).brightness);
|
||||
navBgColor = adaptiveBg ?? colorScheme.surface;
|
||||
} else {
|
||||
// Home screen with collapsed player - use default surface color
|
||||
navBgColor = colorScheme.surface;
|
||||
}
|
||||
|
||||
// Icon color - only use adaptive colors when appropriate
|
||||
final Color baseSourceColor = (useAdaptiveColors && themeProvider.adaptiveColors != null)
|
||||
? themeProvider.adaptiveColors!.primary
|
||||
: colorScheme.primary;
|
||||
|
||||
// Blend icon color with player's primary color during expansion
|
||||
Color sourceColor = baseSourceColor;
|
||||
if (themeProvider.adaptiveTheme && expansionState.progress > 0 && expansionState.primaryColor != null) {
|
||||
sourceColor = Color.lerp(baseSourceColor, expansionState.primaryColor!, expansionState.progress)!;
|
||||
}
|
||||
final navSelectedColor = _cachedNavColor.getAdjustedColor(sourceColor, isDark);
|
||||
|
||||
// Fade out and slide down nav bar as player expands
|
||||
// Use IgnorePointer when faded to prevent accidental taps
|
||||
final navOpacity = (1.0 - expansionState.progress * 2).clamp(0.0, 1.0);
|
||||
final navSlideDown = expansionState.progress * 20; // Slide down 20px as it fades
|
||||
|
||||
return IgnorePointer(
|
||||
ignoring: navOpacity < 0.1,
|
||||
child: Transform.translate(
|
||||
offset: Offset(0, navSlideDown),
|
||||
child: Opacity(
|
||||
opacity: navOpacity,
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: navBgColor,
|
||||
boxShadow: expansionState.progress < 0.5
|
||||
? [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.1),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, -2),
|
||||
),
|
||||
]
|
||||
: null,
|
||||
),
|
||||
child: BottomNavigationBar(
|
||||
currentIndex: navigationProvider.selectedIndex,
|
||||
onTap: (index) {
|
||||
if (GlobalPlayerOverlay.isPlayerExpanded) {
|
||||
GlobalPlayerOverlay.collapsePlayer();
|
||||
}
|
||||
navigationProvider.navigatorKey.currentState?.popUntil((route) => route.isFirst);
|
||||
// Clear adaptive colors when switching tabs (detail screen colors shouldn't persist)
|
||||
themeProvider.clearAdaptiveColors();
|
||||
if (index == 3) {
|
||||
GlobalPlayerOverlay.hidePlayer();
|
||||
} else if (navigationProvider.selectedIndex == 3) {
|
||||
GlobalPlayerOverlay.showPlayer();
|
||||
}
|
||||
navigationProvider.setSelectedIndex(index);
|
||||
},
|
||||
backgroundColor: Colors.transparent,
|
||||
selectedItemColor: navSelectedColor,
|
||||
unselectedItemColor: colorScheme.onSurface.withOpacity(0.54),
|
||||
elevation: 0,
|
||||
type: BottomNavigationBarType.fixed,
|
||||
selectedFontSize: 12,
|
||||
unselectedFontSize: 12,
|
||||
items: [
|
||||
BottomNavigationBarItem(
|
||||
icon: const Icon(Icons.home_outlined),
|
||||
activeIcon: const Icon(Icons.home_rounded),
|
||||
label: S.of(context)!.home,
|
||||
),
|
||||
BottomNavigationBarItem(
|
||||
icon: const Icon(Symbols.book_2, fill: 0),
|
||||
activeIcon: const Icon(Symbols.book_2, fill: 1),
|
||||
label: S.of(context)!.library,
|
||||
),
|
||||
BottomNavigationBarItem(
|
||||
icon: const Icon(Icons.search_rounded),
|
||||
activeIcon: const Icon(Icons.search_rounded),
|
||||
label: S.of(context)!.search,
|
||||
),
|
||||
BottomNavigationBarItem(
|
||||
icon: const Icon(Icons.settings_outlined),
|
||||
activeIcon: const Icon(Icons.settings_rounded),
|
||||
label: S.of(context)!.settings,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
// Blur backdrop for device selector (reveal mode) - static, no animation
|
||||
if (_isRevealVisible && !_isHintModeActive)
|
||||
Positioned.fill(
|
||||
@@ -625,9 +788,8 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
PlayerRevealOverlay(
|
||||
key: _revealKey,
|
||||
onDismiss: _hidePlayerReveal,
|
||||
// Use viewPadding to match BottomNavigationBar's height calculation.
|
||||
// On detail screens the nav bar is hidden so exclude its height.
|
||||
miniPlayerBottom: (context.read<ThemeProvider>().isOnDetailScreen ? 0.0 : BottomSpacing.navBarHeight) + MediaQuery.of(context).viewPadding.bottom + 12,
|
||||
// Use viewPadding to match BottomNavigationBar's height calculation
|
||||
miniPlayerBottom: BottomSpacing.navBarHeight + MediaQuery.of(context).viewPadding.bottom + 12,
|
||||
miniPlayerHeight: 64,
|
||||
showOnboardingHints: _isOnboardingReveal,
|
||||
// Pass pending action parameters for "Play On" functionality
|
||||
@@ -638,16 +800,15 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
|
||||
// Global player overlay - renders ON TOP so cards slide behind it
|
||||
// Use Selector instead of Consumer to avoid rebuilds during animation
|
||||
Selector<MusicAssistantProvider, ({bool isConnected, bool hasPlayer, bool hasTrack, bool hasCachedPlayers})>(
|
||||
Selector<MusicAssistantProvider, ({bool isConnected, bool hasPlayer, bool hasTrack})>(
|
||||
selector: (_, provider) => (
|
||||
isConnected: provider.isConnected,
|
||||
hasPlayer: provider.selectedPlayer != null,
|
||||
hasTrack: provider.currentTrack != null,
|
||||
hasCachedPlayers: provider.hasCachedPlayers,
|
||||
),
|
||||
builder: (context, state, child) {
|
||||
// Show player if connected with a player, or if cached players exist (brief disconnect)
|
||||
if ((!state.isConnected && !state.hasCachedPlayers) || !state.hasPlayer) {
|
||||
// Only show player if connected and has a selected player
|
||||
if (!state.isConnected || !state.hasPlayer) {
|
||||
// Reset expansion state to prevent stale values from causing
|
||||
// invisible/non-interactive nav bar when connection restores.
|
||||
// This fixes a bug where expanded player state persisted after
|
||||
@@ -688,5 +849,7 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/scheduler.dart';
|
||||
import '../services/library_status_service.dart';
|
||||
|
||||
/// A widget that rebuilds when the library/favorite status of an item changes.
|
||||
@@ -123,16 +122,10 @@ mixin LibraryStatusMixin<T extends StatefulWidget> on State<T> {
|
||||
}
|
||||
|
||||
void _onLibraryStatusChanged() {
|
||||
// Trigger rebuild to pick up new status values
|
||||
// Defer setState to avoid calling it during build phase
|
||||
if (!mounted) return;
|
||||
|
||||
// Use Future.microtask to defer setState until after the current build phase
|
||||
// This prevents "setState during build" errors while avoiding Overlay issues
|
||||
Future.microtask(() {
|
||||
if (mounted) {
|
||||
setState(() {});
|
||||
}
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
setState(() {});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@ import 'package:material_symbols_icons/symbols.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../widgets/global_player_overlay.dart' show GlobalPlayerOverlay, BottomSpacing;
|
||||
import '../theme/theme_provider.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
|
||||
@@ -501,42 +500,39 @@ class _MediaContextMenuOverlayState extends State<_MediaContextMenuOverlay>
|
||||
final screenSize = MediaQuery.of(context).size;
|
||||
final viewPadding = MediaQuery.of(context).viewPadding;
|
||||
|
||||
// Account for mini player and bottom nav bar.
|
||||
// On detail screens the nav bar hides and mini player drops to bottom edge.
|
||||
final isOnDetailScreen = context.read<ThemeProvider>().isOnDetailScreen;
|
||||
final bottomInset = isOnDetailScreen
|
||||
? BottomSpacing.miniPlayerHeight + 22.0 + viewPadding.bottom
|
||||
: BottomSpacing.withMiniPlayer + viewPadding.bottom;
|
||||
// Account for mini player and bottom nav bar
|
||||
final bottomInset = BottomSpacing.withMiniPlayer + viewPadding.bottom;
|
||||
|
||||
// Position near the tap, but keep on screen
|
||||
double left = widget.position.dx - menuWidth / 2;
|
||||
double top = widget.position.dy;
|
||||
|
||||
// Keep menu on screen horizontally
|
||||
left = left.clamp(8.0, screenSize.width - menuWidth - 8);
|
||||
|
||||
// Estimate menu height based on content
|
||||
double estimatedHeight = 8.0; // vertical padding (4 top + 4 bottom)
|
||||
double estimatedHeight;
|
||||
if (widget.mediaType == ContextMenuMediaType.podcastEpisode) {
|
||||
estimatedHeight += 4 * 46.0; // 4 menu items
|
||||
// Episode menu: 4 items + divider = ~200px
|
||||
estimatedHeight = 200.0;
|
||||
} else {
|
||||
if (widget.showTopRow) estimatedHeight += 60.0; // icon button row
|
||||
estimatedHeight += 3 * 46.0; // Play on, Start radio, Start radio on
|
||||
estimatedHeight = widget.showTopRow ? 280.0 : 180.0;
|
||||
// Add height for sort section (header + items)
|
||||
if (widget.onToggleSort != null) {
|
||||
estimatedHeight += 1.0 + 32.0; // divider + header
|
||||
final sortCount = widget.mediaType == ContextMenuMediaType.podcast ? 4 : 2;
|
||||
estimatedHeight += sortCount * 42.0; // sort items
|
||||
// Podcast has 4 sort options, others have 2
|
||||
estimatedHeight += widget.mediaType == ContextMenuMediaType.podcast ? 170.0 : 110.0;
|
||||
}
|
||||
// Add height for view section (divider + header + 3 items)
|
||||
if (widget.onCycleView != null) {
|
||||
estimatedHeight += 1.0 + 32.0; // divider + header
|
||||
estimatedHeight += 3 * 42.0; // view mode items
|
||||
estimatedHeight += 140.0;
|
||||
}
|
||||
}
|
||||
|
||||
// Keep menu below the tap point but above the mini player
|
||||
final top = widget.position.dy.clamp(
|
||||
viewPadding.top + 8,
|
||||
screenSize.height - estimatedHeight - bottomInset,
|
||||
);
|
||||
// If menu would go off bottom (accounting for mini player), position above the tap point
|
||||
if (top + estimatedHeight > screenSize.height - bottomInset) {
|
||||
top = widget.position.dy - estimatedHeight;
|
||||
}
|
||||
top = top.clamp(viewPadding.top + 8, screenSize.height - estimatedHeight - bottomInset);
|
||||
|
||||
return Stack(
|
||||
children: [
|
||||
|
||||
@@ -68,6 +68,9 @@ class PlayerRevealOverlayState extends State<PlayerRevealOverlay>
|
||||
// Hint system
|
||||
bool _showHints = true;
|
||||
|
||||
// Guard to run color preload only once from didChangeDependencies
|
||||
bool _hasPreloaded = false;
|
||||
|
||||
// PERF: Pre-cached static BoxShadow to avoid allocation per frame
|
||||
static const BoxShadow _cardShadow = BoxShadow(
|
||||
color: Color(0x33000000), // 20% black
|
||||
@@ -80,9 +83,7 @@ class PlayerRevealOverlayState extends State<PlayerRevealOverlay>
|
||||
super.initState();
|
||||
|
||||
// Load hint settings
|
||||
SettingsService.getShowHints().then((value) {
|
||||
if (mounted) setState(() => _showHints = value);
|
||||
});
|
||||
_loadHintSettings();
|
||||
|
||||
_revealController = AnimationController(
|
||||
vsync: this,
|
||||
@@ -100,23 +101,35 @@ class PlayerRevealOverlayState extends State<PlayerRevealOverlay>
|
||||
curve: const Interval(0.0, 0.4, curve: Curves.easeOut),
|
||||
);
|
||||
|
||||
// Start reveal animation first, then load colors after it settles
|
||||
// (color extraction triggers setState which causes jitter during animation)
|
||||
// Start reveal animation
|
||||
_revealController.duration = const Duration(milliseconds: 200);
|
||||
_revealController.forward().then((_) {
|
||||
if (mounted) _preloadColorsForPlayers();
|
||||
});
|
||||
_revealController.forward();
|
||||
|
||||
// Auto-refresh player data
|
||||
_refreshTimer = Timer.periodic(Timings.playerPollingInterval, (_) {
|
||||
_refreshTimer = Timer.periodic(Timings.playerPollingInterval, (_) async {
|
||||
if (mounted) {
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
provider.refreshPlayers();
|
||||
provider.preloadAllPlayerTracks().then((_) => _preloadColorsForPlayers());
|
||||
await provider.preloadAllPlayerTracks();
|
||||
_preloadColorsForPlayers();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
super.didChangeDependencies();
|
||||
if (!_hasPreloaded) {
|
||||
_hasPreloaded = true;
|
||||
_preloadColorsForPlayers();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _loadHintSettings() async {
|
||||
final value = await SettingsService.getShowHints();
|
||||
if (mounted) setState(() => _showHints = value);
|
||||
}
|
||||
|
||||
/// Extract accent colors from album art for each player
|
||||
Future<void> _preloadColorsForPlayers() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
@@ -164,7 +177,7 @@ class PlayerRevealOverlayState extends State<PlayerRevealOverlay>
|
||||
}
|
||||
|
||||
/// Animate dismissal and call callback when done
|
||||
void dismiss() {
|
||||
Future<void> dismiss() async {
|
||||
// Trigger single bounce on mini player when cards are ~70% collapsed
|
||||
// This creates the effect of cards "landing" on the mini player
|
||||
bool bounceFired = false;
|
||||
@@ -188,10 +201,9 @@ class PlayerRevealOverlayState extends State<PlayerRevealOverlay>
|
||||
|
||||
_revealController.duration = const Duration(milliseconds: 150);
|
||||
_revealController.addListener(checkBounce);
|
||||
_revealController.reverse().then((_) {
|
||||
_revealController.removeListener(checkBounce);
|
||||
widget.onDismiss();
|
||||
});
|
||||
await _revealController.reverse();
|
||||
_revealController.removeListener(checkBounce);
|
||||
widget.onDismiss();
|
||||
}
|
||||
|
||||
/// Check if scroll is at top (or not scrollable)
|
||||
@@ -266,23 +278,15 @@ class PlayerRevealOverlayState extends State<PlayerRevealOverlay>
|
||||
final hintColor = colorScheme.onSurface.withOpacity(0.7);
|
||||
|
||||
// Back gesture is handled at GlobalPlayerOverlay level
|
||||
// Use Selector to only rebuild when the player list actually changes,
|
||||
// not on every provider notification (prevents jitter during animation)
|
||||
return Selector<MusicAssistantProvider, ({List<dynamic> players, String? selectedId, int playerCount})>(
|
||||
selector: (_, p) => (
|
||||
players: p.availablePlayers,
|
||||
selectedId: p.selectedPlayer?.playerId,
|
||||
playerCount: p.availablePlayers.length,
|
||||
),
|
||||
shouldRebuild: (prev, next) => prev.playerCount != next.playerCount || prev.selectedId != next.selectedId,
|
||||
builder: (context, data, child) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final allPlayers = data.players;
|
||||
return Consumer<MusicAssistantProvider>(
|
||||
builder: (context, maProvider, child) {
|
||||
final allPlayers = maProvider.availablePlayers;
|
||||
final selectedPlayer = maProvider.selectedPlayer;
|
||||
final currentTrack = maProvider.currentTrack;
|
||||
|
||||
// Filter out the selected player - it's already shown in the mini player
|
||||
final players = allPlayers
|
||||
.where((p) => p.playerId != data.selectedId)
|
||||
.where((p) => p.playerId != selectedPlayer?.playerId)
|
||||
.toList();
|
||||
|
||||
// Default card colors - used when player doesn't have extracted colors
|
||||
|
||||
@@ -207,11 +207,10 @@ class _QueuePanelState extends State<QueuePanel> with SingleTickerProviderStateM
|
||||
_dropdownController.forward();
|
||||
}
|
||||
|
||||
void _closeTransferDropdown() {
|
||||
void _closeTransferDropdown() async {
|
||||
if (!_showingTransferDropdown) return;
|
||||
_dropdownController.reverse().then((_) {
|
||||
if (mounted) setState(() => _showingTransferDropdown = false);
|
||||
});
|
||||
await _dropdownController.reverse();
|
||||
if (mounted) setState(() => _showingTransferDropdown = false);
|
||||
}
|
||||
|
||||
void _handleTransferQueue(BuildContext context) {
|
||||
@@ -806,12 +805,14 @@ class _QueuePanelState extends State<QueuePanel> with SingleTickerProviderStateM
|
||||
),
|
||||
onPressed: () => _handleTransferQueue(context),
|
||||
padding: Spacing.paddingAll12,
|
||||
tooltip: S.of(context)!.transferQueueToPlayer,
|
||||
),
|
||||
// Clear queue button
|
||||
IconButton(
|
||||
icon: Icon(Icons.delete_sweep_rounded, color: widget.textColor.withOpacity(0.7), size: IconSizes.sm),
|
||||
onPressed: _handleClearQueue,
|
||||
padding: Spacing.paddingAll12,
|
||||
tooltip: S.of(context)!.clearQueue,
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
@@ -14,12 +14,13 @@ class PlayerSelector extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// Use select to only rebuild when player data changes (not on every provider update)
|
||||
final (selectedPlayer, availablePlayers) = context.select<MusicAssistantProvider, (dynamic, List)>(
|
||||
(p) => (p.selectedPlayer, p.availablePlayers),
|
||||
);
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
|
||||
return Consumer<MusicAssistantProvider>(
|
||||
builder: (context, maProvider, _) {
|
||||
final selectedPlayer = maProvider.selectedPlayer;
|
||||
final availablePlayers = maProvider.availablePlayers;
|
||||
|
||||
// Count players that are currently playing MA content (excluding selected player)
|
||||
// User already sees if selected player is playing, badge shows "other" activity
|
||||
// Exclude external sources (Spotify Connect, TV optical, etc.) - they're not playing MA content
|
||||
@@ -80,6 +81,8 @@ class PlayerSelector extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
void _showPlayerSelector(BuildContext context) {
|
||||
|
||||
@@ -50,10 +50,10 @@ class _PlaylistCardState extends State<PlaylistCard> with LibraryStatusMixin {
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && widget.playlist.inLibrary) {
|
||||
service.setLibraryStatus(key, true);
|
||||
service.initLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.playlist.favorite ?? false)) {
|
||||
service.setFavoriteStatus(key, true);
|
||||
service.initFavoriteStatus(key, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -255,11 +255,11 @@ class _PlaylistCardState extends State<PlaylistCard> with LibraryStatusMixin {
|
||||
initialImageUrl: imageUrl,
|
||||
),
|
||||
),
|
||||
).then((_) {
|
||||
// Reset after navigation debounce delay
|
||||
Future.delayed(Timings.navigationDebounce, () {
|
||||
if (mounted) _isNavigating = false;
|
||||
});
|
||||
);
|
||||
|
||||
// Reset after navigation debounce delay
|
||||
Future.delayed(Timings.navigationDebounce, () {
|
||||
if (mounted) _isNavigating = false;
|
||||
});
|
||||
},
|
||||
onLongPressStart: (details) {
|
||||
@@ -327,22 +327,26 @@ class _PlaylistCardState extends State<PlaylistCard> with LibraryStatusMixin {
|
||||
const SizedBox(height: 8),
|
||||
// Playlist title
|
||||
// PERF: Removed Hero - text animations provide minimal benefit but add overhead
|
||||
Text(
|
||||
widget.playlist.name,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.playlist.name,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
),
|
||||
// Owner/track count
|
||||
Text(
|
||||
widget.playlist.owner ?? (widget.playlist.trackCount != null ? '${widget.playlist.trackCount} tracks' : ''),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.7),
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.playlist.owner ?? (widget.playlist.trackCount != null ? '${widget.playlist.trackCount} tracks' : ''),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.7),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
@@ -106,8 +106,8 @@ class _PlaylistRowState extends State<PlaylistRow> with AutomaticKeepAliveClient
|
||||
}
|
||||
|
||||
// Card layout: square artwork + text below (same as AlbumRow)
|
||||
// Text area: 8px gap + ~18px title + ~18px owner = ~44px
|
||||
const textAreaHeight = 44.0;
|
||||
// Text area: 8px gap + ~20px title + ~20px owner = ~48px
|
||||
const textAreaHeight = 48.0;
|
||||
final artworkSize = contentHeight - textAreaHeight;
|
||||
final cardWidth = artworkSize; // Card width = artwork width (square)
|
||||
final itemExtent = cardWidth + 12; // width + horizontal margins
|
||||
|
||||
@@ -53,10 +53,10 @@ class _PodcastCardState extends State<PodcastCard> with LibraryStatusMixin {
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && widget.podcast.inLibrary) {
|
||||
service.setLibraryStatus(key, true);
|
||||
service.initLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.podcast.favorite ?? false)) {
|
||||
service.setFavoriteStatus(key, true);
|
||||
service.initFavoriteStatus(key, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -261,11 +261,11 @@ class _PodcastCardState extends State<PodcastCard> with LibraryStatusMixin {
|
||||
initialImageUrl: imageUrl,
|
||||
),
|
||||
),
|
||||
).then((_) {
|
||||
// Reset after navigation debounce delay
|
||||
Future.delayed(Timings.navigationDebounce, () {
|
||||
if (mounted) _isNavigating = false;
|
||||
});
|
||||
);
|
||||
|
||||
// Reset after navigation debounce delay
|
||||
Future.delayed(Timings.navigationDebounce, () {
|
||||
if (mounted) _isNavigating = false;
|
||||
});
|
||||
},
|
||||
onLongPressStart: (details) {
|
||||
@@ -333,22 +333,26 @@ class _PodcastCardState extends State<PodcastCard> with LibraryStatusMixin {
|
||||
const SizedBox(height: 8),
|
||||
// Podcast title
|
||||
// PERF: Removed Hero - text animations provide minimal benefit but add overhead
|
||||
Text(
|
||||
widget.podcast.name,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.podcast.name,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
),
|
||||
// Podcast author (if available)
|
||||
Text(
|
||||
_getAuthor(widget.podcast),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.7),
|
||||
Flexible(
|
||||
child: Text(
|
||||
_getAuthor(widget.podcast),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.7),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
@@ -114,8 +114,8 @@ class _PodcastRowState extends State<PodcastRow> with AutomaticKeepAliveClientMi
|
||||
}
|
||||
|
||||
// Card layout: square artwork + text below (same as AlbumRow)
|
||||
// Text area: 8px gap + ~18px title + ~18px author = ~44px
|
||||
const textAreaHeight = 44.0;
|
||||
// Text area: 8px gap + ~20px title + ~20px author = ~48px
|
||||
const textAreaHeight = 48.0;
|
||||
final artworkSize = contentHeight - textAreaHeight;
|
||||
final cardWidth = artworkSize; // Card width = artwork width (square)
|
||||
final itemExtent = cardWidth + 12; // width + horizontal margins
|
||||
|
||||
@@ -47,10 +47,10 @@ class _RadioStationCardState extends State<RadioStationCard> with LibraryStatusM
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && widget.radioStation.inLibrary) {
|
||||
service.setLibraryStatus(key, true);
|
||||
service.initLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.radioStation.favorite ?? false)) {
|
||||
service.setFavoriteStatus(key, true);
|
||||
service.initFavoriteStatus(key, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -106,8 +106,8 @@ class _RadioStationRowState extends State<RadioStationRow> with AutomaticKeepAli
|
||||
}
|
||||
|
||||
// Card layout: circle image + name below (same as ArtistRow)
|
||||
// Text area: 8px gap + ~36px for 2-line name = ~44px
|
||||
const textAreaHeight = 44.0;
|
||||
// Text area: 8px gap + ~40px for 2-line name = ~48px
|
||||
const textAreaHeight = 48.0;
|
||||
final imageSize = contentHeight - textAreaHeight;
|
||||
final cardWidth = imageSize; // Card width = image width (circle)
|
||||
final itemExtent = cardWidth + 16; // width + horizontal margins
|
||||
|
||||
@@ -179,7 +179,7 @@ class _SeriesRowState extends State<SeriesRow> with AutomaticKeepAliveClientMixi
|
||||
);
|
||||
}
|
||||
|
||||
const textAreaHeight = 44.0;
|
||||
const textAreaHeight = 48.0;
|
||||
final artworkSize = contentHeight - textAreaHeight;
|
||||
final cardWidth = artworkSize;
|
||||
final itemExtent = cardWidth + 12;
|
||||
|
||||
+21
-17
@@ -108,8 +108,8 @@ class _TrackRowState extends State<TrackRow> with AutomaticKeepAliveClientMixin
|
||||
}
|
||||
|
||||
// Card layout: square artwork + text below
|
||||
// Text area: 8px gap + ~18px title + ~18px artist = ~44px
|
||||
const textAreaHeight = 44.0;
|
||||
// Text area: 8px gap + ~20px title + ~20px artist = ~48px
|
||||
const textAreaHeight = 48.0;
|
||||
final artworkSize = contentHeight - textAreaHeight;
|
||||
final cardWidth = artworkSize; // Card width = artwork width (square)
|
||||
final itemExtent = cardWidth + 12;
|
||||
@@ -211,10 +211,10 @@ class _TrackCardState extends State<_TrackCard> with LibraryStatusMixin {
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && widget.track.inLibrary) {
|
||||
service.setLibraryStatus(key, true);
|
||||
service.initLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.track.favorite ?? false)) {
|
||||
service.setFavoriteStatus(key, true);
|
||||
service.initFavoriteStatus(key, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -453,22 +453,26 @@ class _TrackCardState extends State<_TrackCard> with LibraryStatusMixin {
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
// Track title
|
||||
Text(
|
||||
widget.track.name,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.track.name,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
),
|
||||
// Artist name
|
||||
Text(
|
||||
widget.track.artistsString,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.7),
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.track.artistsString,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.7),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
@@ -72,7 +72,6 @@ class _VolumeControlState extends State<VolumeControl> {
|
||||
setState(() {
|
||||
_systemVolume = volume;
|
||||
});
|
||||
context.read<MusicAssistantProvider>().updateLocalPlayerVolume((volume * 100).round());
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -141,7 +140,6 @@ class _VolumeControlState extends State<VolumeControl> {
|
||||
_systemVolume = newVolume / 100.0;
|
||||
});
|
||||
}
|
||||
maProvider.updateLocalPlayerVolume(newVolume);
|
||||
} catch (e) {
|
||||
_logger.log('Volume: Error setting system volume - $e');
|
||||
}
|
||||
@@ -165,7 +163,6 @@ class _VolumeControlState extends State<VolumeControl> {
|
||||
|
||||
if (_isLocalPlayer) {
|
||||
FlutterVolumeController.setVolume(volume);
|
||||
maProvider.updateLocalPlayerVolume(volumeLevel);
|
||||
} else {
|
||||
maProvider.setVolume(playerId, volumeLevel);
|
||||
}
|
||||
@@ -174,9 +171,8 @@ class _VolumeControlState extends State<VolumeControl> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// Use select to only rebuild when selectedPlayer or localPlayerVolume changes
|
||||
// Use select to only rebuild when selectedPlayer changes (not on every provider update)
|
||||
final player = context.select<MusicAssistantProvider, dynamic>((p) => p.selectedPlayer);
|
||||
final maLocalVolume = context.select<MusicAssistantProvider, int>((p) => p.localPlayerVolume);
|
||||
|
||||
if (player == null) {
|
||||
return const SizedBox.shrink();
|
||||
@@ -186,9 +182,9 @@ class _VolumeControlState extends State<VolumeControl> {
|
||||
|
||||
// Use pending volume during drag or button tap to prevent stale state issues
|
||||
final currentVolume = (_isDragging || _showButtonIndicator)
|
||||
? (_pendingVolume ?? (_isLocalPlayer ? maLocalVolume / 100.0 : player.volume.toDouble() / 100.0))
|
||||
? (_pendingVolume ?? (_isLocalPlayer ? (_systemVolume ?? 0.5) : player.volume.toDouble() / 100.0))
|
||||
: _isLocalPlayer
|
||||
? maLocalVolume / 100.0
|
||||
? (_systemVolume ?? 0.5)
|
||||
: player.volume.toDouble() / 100.0;
|
||||
|
||||
// Use accent color if provided, otherwise fall back to theme primary
|
||||
@@ -302,7 +298,6 @@ class _VolumeControlState extends State<VolumeControl> {
|
||||
if (_isLocalPlayer) {
|
||||
FlutterVolumeController.setVolume(finalVolume);
|
||||
_systemVolume = finalVolume;
|
||||
context.read<MusicAssistantProvider>().updateLocalPlayerVolume(volumeLevel);
|
||||
} else {
|
||||
context.read<MusicAssistantProvider>().setVolume(player.playerId, volumeLevel);
|
||||
}
|
||||
|
||||
@@ -1,260 +0,0 @@
|
||||
# Pull Request: Group Volume Management, Hardware Volume Integration, and Bugfixes
|
||||
|
||||
## Summary
|
||||
|
||||
This PR represents a testing and debugging cycle following v3.0.2. Initial work on sync group volume management uncovered multiple UI bugs that required fixes. The final result addresses:
|
||||
|
||||
1. **Fix: Group Player Volume Management** - Two distinct volume control issues for Music Assistant sync groups
|
||||
2. **Feature: Hardware Volume Button Integration** - Phone volume buttons now control Music Assistant player volume from lockscreen / shade widget / app minimised
|
||||
3. **UI Bug Fixes** - Five UI issues discovered during sync group testing, which had to be fixed to get the sync groups to work without crashes
|
||||
4. **Fix: Cold Start Homepage Race Condition** - Intermittent empty homepage on app cold start - surfaced once sync group volume calculations were introduced.
|
||||
5. **Code Quality: Cleanup and Optimization** - Removes dead code and eliminates duplicate logic - mine, not yours, I tried to not to touch your code as much as possible
|
||||
|
||||
All changes have been tested and verified with `dart analyze` showing no new issues.
|
||||
|
||||
---
|
||||
|
||||
## Group Volume Management Fixes
|
||||
|
||||
### 1. Group Player Volume Management
|
||||
|
||||
**Issue:** Volume control for Music Assistant sync groups had two distinct problems depending on how the group was created:
|
||||
|
||||
1. **Server-side groups**: Volume slider would snap back to 0 immediately after release
|
||||
2. **In-app created groups**: Adjusting the leader's volume only changed that one player, not all members proportionally
|
||||
|
||||
#### Part A: Server-Side Groups (Null Volume Snap-back)
|
||||
|
||||
**Root Cause:** The Music Assistant API returns `volume_level: null` for certain group players (pre-configured speaker groups with `provider == 'player_group'` and some server-side sync groups). The app had no logic to handle this case, so the null volume was interpreted as 0.
|
||||
|
||||
**Solution:** Implemented `GroupVolumeManager` service with dual-tier volume protection:
|
||||
|
||||
- **Tier 1 (GroupVolumeManager):** Computes effective volume from group members (detects groups, resolves nested, averages volumes, caches pending for 30s, confirms with ±3 tolerance).
|
||||
- **Tier 2 (Provider-level):** Optimistic update protection (caches for 8s/30s, prevents stale overwrites).
|
||||
|
||||
#### Part B: In-App Created Groups (Proportional Volume Propagation)
|
||||
|
||||
**Root Cause:** For in-app groups, leader has non-null volume, so `setVolume()` only affects leader, not members.
|
||||
|
||||
**Expected behavior:** Leader adjustment changes all members proportionally; individual adjustments affect only that member.
|
||||
|
||||
**Solution:** In `setVolume()`, for group leaders with non-null volume:
|
||||
1. Calculate proportional: `memberNewVol = (memberCurrentVol * newVol / leaderCurrentVol).round()` (handle zero case with absolute).
|
||||
2. Cache pending, update optimistically, fire parallel API calls.
|
||||
|
||||
**Files Changed:**
|
||||
- `lib/services/group_volume_manager.dart` (NEW - 162 lines)
|
||||
- `lib/providers/music_assistant_provider.dart` (added manager, helper, updated events/state/volume methods)
|
||||
|
||||
---
|
||||
|
||||
## Features
|
||||
|
||||
### 2. Hardware Volume Button Integration (Convenience Feature)
|
||||
|
||||
**Feature:** Phone hardware volume buttons (including lockscreen) control MA player volume, with system HUD mirroring.
|
||||
|
||||
**Implementation:**
|
||||
- **Android Native:** `MainActivity.kt` (~120 lines) - VolumeContentObserver, MethodChannel commands, lifecycle.
|
||||
- **Flutter Service:** `hardware_volume_service.dart` (~65 lines) - streams, observer methods, sync.
|
||||
- **Integration:** `main.dart` (~35 lines) - adjust/set/update methods, subscription.
|
||||
|
||||
**Why This Matters:** Seamless remote control from lockscreen/tray/buttons.
|
||||
|
||||
---
|
||||
|
||||
## UI Bug Fixes
|
||||
|
||||
During sync group testing, fixed these UI bugs:
|
||||
|
||||
### 3A. Zone Mismatch Warning
|
||||
|
||||
**File:** `lib/main.dart`
|
||||
|
||||
**Issue:** Console warnings during init.
|
||||
|
||||
**Root Cause:** Init code outside `runZonedGuarded()`.
|
||||
|
||||
**Fix:** Move init inside `runZonedGuarded()`.
|
||||
|
||||
---
|
||||
|
||||
### 3B. BottomNavigationBar "No Overlay" Crash
|
||||
|
||||
**Files:** `lib/screens/home_screen.dart`, `lib/widgets/global_player_overlay.dart`
|
||||
|
||||
**Issue:** Crash on nav interaction.
|
||||
|
||||
**Root Cause:** Nav in Stack without Overlay.
|
||||
|
||||
**Fix:** Move nav to Scaffold.bottomNavigationBar, add extendBody: true.
|
||||
|
||||
---
|
||||
|
||||
### 3C. setState During Build Warning (Artist/Album Cards)
|
||||
|
||||
**Files:** `lib/widgets/artist_card.dart`, `lib/widgets/album_card.dart`
|
||||
|
||||
**Issue:** Warnings causing corruption.
|
||||
|
||||
**Root Cause:** Service calls in initState trigger setState during build.
|
||||
|
||||
**Fix:** Defer with addPostFrameCallback, add mounted guard.
|
||||
|
||||
---
|
||||
|
||||
### 3D. context.select Inside SliverList Crash
|
||||
|
||||
**File:** `lib/screens/new_library_screen.dart`
|
||||
|
||||
**Issue:** Crash on library tabs.
|
||||
|
||||
**Root Cause:** context.select in sliver context.
|
||||
|
||||
**Fix:** Use Consumer wrappers for tabs.
|
||||
|
||||
---
|
||||
|
||||
### 3E. QueuePanel Tooltip "No Overlay" Error
|
||||
|
||||
**File:** `lib/widgets/player/queue_panel.dart`
|
||||
|
||||
**Issue:** Crash on long-press buttons.
|
||||
|
||||
**Root Cause:** Tooltips require Overlay, but in Stack.
|
||||
|
||||
**Fix:** Remove tooltip properties.
|
||||
|
||||
---
|
||||
|
||||
### 3F. Settings Back Button Crash
|
||||
|
||||
**File:** `lib/screens/settings_screen.dart`
|
||||
|
||||
**Issue:** Back button crashes to black screen.
|
||||
|
||||
**Root Cause:** Navigator.pop pops home screen.
|
||||
|
||||
**Fix:** Use showPlayer + setSelectedIndex(0).
|
||||
|
||||
---
|
||||
|
||||
## Cold Start Homepage Race Condition Fix
|
||||
|
||||
### 4. Cold Start Homepage Empty/No Refresh
|
||||
|
||||
**Issue:** Intermittent empty homepage on cold start.
|
||||
|
||||
**Root Cause:** isConnected true before auth complete, leading to failed fetches.
|
||||
|
||||
**Solution:** Delay broadcasting 'connected' state until auth if required (`music_assistant_provider.dart:1058-1101`).
|
||||
|
||||
---
|
||||
|
||||
## Technical Implementation Details
|
||||
|
||||
### GroupVolumeManager Architecture
|
||||
|
||||
The `GroupVolumeManager` is a stateful service that handles **server-side groups with null volume**:
|
||||
|
||||
1. **Detects group players:**
|
||||
```dart
|
||||
bool isGroupPlayer(Player player) {
|
||||
// Pre-configured MA speaker groups
|
||||
if (player.provider == 'player_group') return true;
|
||||
// Dynamic sync groups: have multiple members but MA returns null volume
|
||||
if (player.groupMembers != null &&
|
||||
player.groupMembers!.length > 1 &&
|
||||
player.volumeLevel == null) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
2. **Computes effective volume:**
|
||||
- Recursively resolves nested groups (max depth 3)
|
||||
- Averages volumes across all leaf members
|
||||
- Skips self-references in `groupMembers`
|
||||
- Returns `null` if no members have valid volumes
|
||||
|
||||
3. **Caches pending volumes:**
|
||||
- When user sets volume: stored with timestamp
|
||||
- Returns cached value if within 30s timeout
|
||||
- Clears cache when member average converges (±3 tolerance)
|
||||
- Falls back to computed average after timeout
|
||||
|
||||
4. **Integrates with provider:**
|
||||
- Called from `_applyVolumeProtection()` in provider
|
||||
- Receives fresh `allPlayers` list for accurate member volumes
|
||||
- Injects effective volume into `_selectedPlayer` via `copyWith()`
|
||||
|
||||
### Proportional Volume Propagation (In-App Groups)
|
||||
|
||||
For **in-app created groups with non-null leader volume**, proportional propagation works as follows:
|
||||
|
||||
1. **Detection:** `setVolume()` checks if `player.isGroupLeader && !isGroupPlayer(player)`
|
||||
- Leader has `groupMembers` with 2+ entries
|
||||
- Leader has its own non-null `volumeLevel`
|
||||
- NOT detected as a group player (GroupVolumeManager handles those)
|
||||
|
||||
2. **Calculation:** For each member in `groupMembers` (excluding leader itself):
|
||||
```dart
|
||||
if (leaderCurrentVol > 0) {
|
||||
memberNewVol = (memberVol * newVol / leaderCurrentVol).round().clamp(0, 100)
|
||||
} else {
|
||||
memberNewVol = newVol // Can't ratio from zero
|
||||
}
|
||||
```
|
||||
|
||||
3. **Execution:**
|
||||
- Cache `_pendingVolumes[memberId]` and `_pendingVolumeTimestamps[memberId]`
|
||||
- Update `_availablePlayers[idx]` optimistically
|
||||
- Fire `_api?.setVolume(memberId, memberNewVol)` without awaiting
|
||||
- Continue to send leader's own `volume_set` command
|
||||
|
||||
4. **Result:** All member volumes scale proportionally with the leader, preserving relative balance.
|
||||
|
||||
### Connection State Flow (After Fix)
|
||||
|
||||
```
|
||||
WebSocket connects → MAConnectionState.connected
|
||||
↓
|
||||
Auth required?
|
||||
↙ ↘
|
||||
YES NO
|
||||
↓ ↓
|
||||
Don't notify Set state + notify
|
||||
Try auth ↓
|
||||
↓ Initialize
|
||||
Success?
|
||||
↙ ↘
|
||||
YES NO
|
||||
↓ ↓
|
||||
auth error state
|
||||
event + notify
|
||||
↓
|
||||
Set state
|
||||
+ notify
|
||||
↓
|
||||
Initialize
|
||||
```
|
||||
|
||||
**Key:** Listeners only see `isConnected = true` after auth completes (or immediately if no auth required).
|
||||
|
||||
|
||||
## Files Modified
|
||||
android/.../MainActivity.kt | 120 + (NEW - ContentObserver)
|
||||
lib/main.dart | 207 ±
|
||||
lib/providers/music_assistant_provider.dart | 165 ±
|
||||
lib/screens/home_screen.dart | 172 ± (BottomNav moved here)
|
||||
lib/screens/new_library_screen.dart | 70 ± (Consumer wrappers)
|
||||
lib/screens/settings_screen.dart | 9 ± (back button fix)
|
||||
lib/services/group_volume_manager.dart | 162 + (NEW)
|
||||
lib/services/hardware_volume_service.dart | 65 + (NEW)
|
||||
lib/widgets/album_card.dart | 23 ± (postFrameCallback)
|
||||
lib/widgets/artist_card.dart | 23 ± (postFrameCallback)
|
||||
lib/widgets/global_player_overlay.dart | 171 - (BottomNav moved out)
|
||||
lib/widgets/player/queue_panel.dart | 2 - (tooltip removed)
|
||||
|
||||
**Total:** ~650 added, ~300 removed/refactored.
|
||||
+2
-2
@@ -351,7 +351,7 @@ packages:
|
||||
source: sdk
|
||||
version: "0.0.0"
|
||||
flutter_cache_manager:
|
||||
dependency: "direct main"
|
||||
dependency: transitive
|
||||
description:
|
||||
name: flutter_cache_manager
|
||||
sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386"
|
||||
@@ -854,7 +854,7 @@ packages:
|
||||
source: hosted
|
||||
version: "4.1.0"
|
||||
rxdart:
|
||||
dependency: "direct main"
|
||||
dependency: transitive
|
||||
description:
|
||||
name: rxdart
|
||||
sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
|
||||
|
||||
+1
-3
@@ -1,7 +1,7 @@
|
||||
name: ensemble
|
||||
description: A minimalistic Music Assistant client built with Flutter
|
||||
publish_to: 'none'
|
||||
version: 3.0.5+57
|
||||
version: 3.0.2+54
|
||||
|
||||
environment:
|
||||
sdk: '>=3.0.0 <4.0.0'
|
||||
@@ -27,7 +27,6 @@ dependencies:
|
||||
web_socket_channel: ^2.4.0
|
||||
http: ^1.1.0
|
||||
cached_network_image: ^3.3.1
|
||||
flutter_cache_manager: ^3.3.1
|
||||
|
||||
# Storage
|
||||
shared_preferences: ^2.2.2
|
||||
@@ -50,7 +49,6 @@ dependencies:
|
||||
audio_service: ^0.18.12
|
||||
audio_session: ^0.1.18
|
||||
flutter_volume_controller: ^1.3.2
|
||||
rxdart: ^0.28.0
|
||||
|
||||
# Raw PCM Audio Playback (for Sendspin streaming)
|
||||
flutter_pcm_sound: ^3.3.3
|
||||
|
||||
Reference in New Issue
Block a user