Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Chris
|
8f7da70352 | ||
|
Chris
|
526727955f |
@@ -31,8 +31,8 @@ jobs:
|
||||
- name: Setup Flutter
|
||||
uses: subosito/flutter-action@v2
|
||||
with:
|
||||
flutter-version: '3.38.0'
|
||||
channel: 'master'
|
||||
flutter-version: '3.24.0'
|
||||
channel: 'stable'
|
||||
cache: true
|
||||
|
||||
- name: Cache Gradle dependencies
|
||||
@@ -63,7 +63,10 @@ jobs:
|
||||
|
||||
- name: Setup signing keystore
|
||||
run: |
|
||||
# Decode keystore from secret (persistent key for consistent signatures)
|
||||
echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > android/app/upload-keystore.jks
|
||||
|
||||
# Create key.properties file
|
||||
cat > android/key.properties << EOF
|
||||
storePassword=${{ secrets.KEYSTORE_PASSWORD }}
|
||||
keyPassword=${{ secrets.KEY_PASSWORD }}
|
||||
@@ -72,7 +75,12 @@ jobs:
|
||||
EOF
|
||||
|
||||
- name: Build APK
|
||||
run: flutter build apk --release
|
||||
run: |
|
||||
# Use init.gradle to force Maven mirrors (workaround for Maven Central 403)
|
||||
mkdir -p ~/.gradle
|
||||
cp android/init.gradle ~/.gradle/init.gradle
|
||||
|
||||
flutter build apk --release
|
||||
|
||||
- name: Upload APK artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
@@ -83,5 +91,10 @@ jobs:
|
||||
|
||||
- name: Upload APK summary
|
||||
run: |
|
||||
echo "## APK Build Successful!" >> $GITHUB_STEP_SUMMARY
|
||||
echo "## APK Build Successful! 🎉" >> $GITHUB_STEP_SUMMARY
|
||||
echo "" >> $GITHUB_STEP_SUMMARY
|
||||
echo "📱 **APK Location:** \`build/app/outputs/flutter-apk/app-release.apk\`" >> $GITHUB_STEP_SUMMARY
|
||||
echo "" >> $GITHUB_STEP_SUMMARY
|
||||
echo "📦 **Download:** Check the artifacts section below" >> $GITHUB_STEP_SUMMARY
|
||||
echo "" >> $GITHUB_STEP_SUMMARY
|
||||
ls -lh build/app/outputs/flutter-apk/app-release.apk >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
@@ -36,8 +36,7 @@ This application was built with AI-assisted development using **Claude Code** an
|
||||
### Queue Management
|
||||
- **View & Manage Queue** - See upcoming tracks in the playback queue
|
||||
- **Drag to Reorder** - Instant drag handles for reordering tracks
|
||||
- **Swipe left to Delete** - Remove tracks with a simple swipe gesture
|
||||
- **Swipe right to play next** - Move tracks with a simple swipe gesture
|
||||
- **Swipe to Delete** - Remove tracks with a simple swipe gesture
|
||||
|
||||
### Home Screen
|
||||
- **Customizable Rows** - Toggle and reorder: Recently Played, Discover Artists, Discover Albums
|
||||
@@ -51,9 +50,7 @@ This application was built with AI-assisted development using **Claude Code** an
|
||||
- **Podcasts** - Browse podcasts, view episodes with descriptions and publish dates
|
||||
- **Audiobooks** - Browse by title, series, or author with progress tracking
|
||||
- **Favorites Filter** - Toggle to show only your favorite items
|
||||
- **Providers Filter** - Toggle to show only specific provider items
|
||||
- **Letter Scrollbar** - Fast navigation through long lists
|
||||
- **Provider Icons** - Provider icons on library covers
|
||||
|
||||
### Search
|
||||
- **Universal Search** - Find music, podcasts, radio stations, playlists, and audiobooks
|
||||
@@ -89,18 +86,16 @@ This application was built with AI-assisted development using **Claude Code** an
|
||||
## Screenshots
|
||||
|
||||
<div align="center">
|
||||
<img src="assets/screenshots/1.png?v=4" alt="Screenshot 1" width="150">
|
||||
<img src="assets/screenshots/2.png?v=4" alt="Screenshot 2" width="150">
|
||||
<img src="assets/screenshots/3.png?v=4" alt="Screenshot 3" width="150">
|
||||
<img src="assets/screenshots/4.png?v=4" alt="Screenshot 4" width="150">
|
||||
<img src="assets/screenshots/5.png?v=4" alt="Screenshot 5" width="150">
|
||||
<img src="assets/screenshots/6.png?v=4" alt="Screenshot 6" width="150">
|
||||
<img src="assets/screenshots/7.png?v=4" alt="Screenshot 7" width="150">
|
||||
<img src="assets/screenshots/8.png?v=4" alt="Screenshot 8" width="150">
|
||||
<img src="assets/screenshots/9.png?v=4" alt="Screenshot 9" width="150">
|
||||
<img src="assets/screenshots/10.png?v=4" alt="Screenshot 10" width="150">
|
||||
<img src="assets/screenshots/11.png?v=4" alt="Screenshot 11" width="150">
|
||||
<img src="assets/screenshots/12.png?v=4" alt="Screenshot 12" width="150">
|
||||
<img src="assets/screenshots/1.png?v=3" alt="Screenshot 1" width="150">
|
||||
<img src="assets/screenshots/2.png?v=3" alt="Screenshot 2" width="150">
|
||||
<img src="assets/screenshots/3.png?v=3" alt="Screenshot 3" width="150">
|
||||
<img src="assets/screenshots/4.png?v=3" alt="Screenshot 4" width="150">
|
||||
<img src="assets/screenshots/5.png?v=3" alt="Screenshot 5" width="150">
|
||||
<img src="assets/screenshots/6.png?v=3" alt="Screenshot 6" width="150">
|
||||
<img src="assets/screenshots/7.png?v=3" alt="Screenshot 7" width="150">
|
||||
<img src="assets/screenshots/8.png?v=3" alt="Screenshot 8" width="150">
|
||||
<img src="assets/screenshots/9.png?v=3" alt="Screenshot 9" width="150">
|
||||
<img src="assets/screenshots/10.png?v=3" alt="Screenshot 10" width="150">
|
||||
</div>
|
||||
|
||||
## Download
|
||||
@@ -127,11 +122,25 @@ To find the correct URL:
|
||||
|
||||
If you run Music Assistant as a Home Assistant add-on:
|
||||
- Use the IP address of your Home Assistant server
|
||||
- Enter `8095` in the port field
|
||||
- Do **not** use your Home Assistant URL or ingress URL
|
||||
|
||||
### 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).
|
||||
For access outside your home network, you'll need to expose Music Assistant through a reverse proxy (e.g., Nginx Proxy Manager, Cloudflare Tunnel).
|
||||
|
||||
## Authentication
|
||||
|
||||
Ensemble supports multiple authentication methods:
|
||||
|
||||
| Method | Status |
|
||||
|--------|--------|
|
||||
| Music Assistant native auth | Tested |
|
||||
| No authentication | Tested |
|
||||
| Authelia | Implemented, not recently tested |
|
||||
| HTTP Basic Auth | Implemented, not recently tested |
|
||||
|
||||
**Note:** Development and testing is done against Music Assistant beta with native authentication enabled.
|
||||
|
||||
## Requirements
|
||||
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
# Release Notes Draft
|
||||
|
||||
## v2.9.2-beta (TBD)
|
||||
|
||||
### New Features
|
||||
|
||||
#### Context Menus
|
||||
- **Long-press context menus on all media items**: Albums, artists, tracks, playlists, podcasts, and radio stations now all support long-press to show a context menu with Play, Add to Library, and Favorite options.
|
||||
|
||||
#### Podcasts
|
||||
- **Podcast episode detail screen**: Tap "View Details" from episode context menu to see full scrollable description, publish date, duration, with Play, Play On, and Add to Queue actions.
|
||||
- **Episode sorting**: Sort podcast episodes by newest first, oldest first, alphabetical, or duration.
|
||||
|
||||
#### Audio Quality
|
||||
- **Hi-res audio badge**: Track listings now show a hi-res badge when high quality audio is available.
|
||||
|
||||
### Improvements
|
||||
|
||||
#### UI/UX
|
||||
- **New library icon**: Replaced confusing library icon with clearer book icon (book_2) across bottom nav, search filter, detail screens, and context menus. Filled when in library, outlined when not.
|
||||
- **Player selector**: Replaced popup dialog with player select overlay for queue actions.
|
||||
- **Search library filter**: Filled icon indicates active filter state without background highlight.
|
||||
- **Context menu polish**: Slightly larger buttons (46px), wider menu (185px), consistent text colors that don't pick up adaptive theming.
|
||||
- **Navigation transitions**: Smoother fade/slide animations between screens.
|
||||
- **Hero animations**: Podcast episode images animate smoothly to detail screen.
|
||||
|
||||
#### Performance
|
||||
- **Library list optimization**: Standardized list item heights with itemExtent, reduced image cache sizes for smoother scrolling.
|
||||
- **Palette extraction**: Moved to isolate for better UI responsiveness during color extraction.
|
||||
- **Provider selects**: Optimized provider state watching to reduce unnecessary rebuilds.
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
#### Audiobooks
|
||||
- **Fixed audiobooks not loading after provider re-add**: When removing and re-adding an AudiobookShelf provider, the app would show 0 audiobooks because saved library paths referenced the old provider instance ID. Now automatically clears stale settings and falls back to the library_items API.
|
||||
|
||||
- **Fixed duplicate provider filter options**: After re-adding a provider, two entries for the same provider could appear in the library filter menu. Now deduplicates providers by name, keeping the one with more items.
|
||||
|
||||
- **Fixed multiple accounts of same service not showing**: When you have multiple accounts of the same service (e.g., two Spotify accounts for different family members), only one would appear in the library menu provider toggles. Now all accounts with distinct names are shown.
|
||||
|
||||
- **Fixed audiobook year sorting**: Sort by year now works correctly for audiobooks. Fixed two issues:
|
||||
- Year data is now properly extracted from ABS's `metadata.release_date` field (handles both "2024" and "2024-01-15" formats)
|
||||
- Sort handler now properly supports ascending and descending year sorts
|
||||
|
||||
#### Library Sorting
|
||||
- **Fixed letter scrollbar showing irrelevant letters**: When sorting by date or play count, the scrollbar popup now hides instead of showing meaningless letters. Shows contextual info based on sort type (letters for alphabetical, years for year sort, hidden for date/count sorts).
|
||||
|
||||
- **Fixed sorting not working for date added, last played, play count**: These sort options now correctly preserve server-side sorting instead of re-sorting alphabetically on the client. Affected albums, artists, and tracks tabs.
|
||||
|
||||
- **Fixed playlists sorting**: Modified, last played, and play count sorting now works for playlists by properly requesting sorted data from the server.
|
||||
|
||||
- **Fixed ascending/descending not working**: Sort direction now properly applies for all sort types across albums, artists, playlists, and audiobooks.
|
||||
|
||||
- **Fixed list not updating when sort order changes**: Added sort order to ListView/GridView keys to force UI rebuilds when changing sort direction.
|
||||
|
||||
#### Provider Management
|
||||
- **Fixed stale provider IDs persisting in settings**: When toggling providers, stale provider instance IDs (from removed providers) are now automatically cleaned up from saved settings.
|
||||
|
||||
#### Playback
|
||||
- **Fixed Spotify external source detection** (issue #27): Properly detects when Spotify is the music provider.
|
||||
- **Fixed foreground service not stopping** (issue #51): Auto-stops after 30 minutes idle.
|
||||
- **Fixed Sendspin proxy auth**: Now works correctly for local network connections.
|
||||
|
||||
#### UI Fixes
|
||||
- **Fixed nav bar hidden when no player selected**: Navigation bar now always visible.
|
||||
- **Fixed Flutter 3.38 slider grey rectangles**: Volume and seek sliders render correctly.
|
||||
- **Fixed library tab scroll position**: Maintains position when switching tabs.
|
||||
|
||||
### Technical Changes
|
||||
- Flutter 3.38 compatibility
|
||||
- Simplified authentication using MA built-in auth
|
||||
- Added `material_symbols_icons` package for book_2 icon
|
||||
- Added `ScrollbarDisplayMode` enum (`letter`, `year`, `count`, `none`) for contextual scrollbar popups
|
||||
- Added `updateCachedAlbums()`, `updateCachedArtists()`, `updateCachedPlaylists()` methods to SyncService for proper cache synchronization with sorted data
|
||||
- Provider filter now validates against available providers when toggling, not just on initial load
|
||||
- Removed Selector caching from albums and artists tabs to ensure proper rebuilds when source tracking updates
|
||||
- Options menu provider toggles now use Consumer to watch Provider state directly
|
||||
- Centralized player selector logic in GlobalPlayerOverlay.showPlayerSelectorForAction()
|
||||
@@ -59,7 +59,7 @@ android {
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.musicassistant.music_assistant"
|
||||
minSdkVersion flutter.minSdkVersion
|
||||
minSdk 21
|
||||
targetSdk 35
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
buildscript {
|
||||
ext.kotlin_version = '2.1.0'
|
||||
ext.kotlin_version = '1.9.10'
|
||||
repositories {
|
||||
google()
|
||||
// Use Maven Central mirrors as fallback for 403 errors
|
||||
@@ -9,7 +9,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.7.0'
|
||||
classpath 'com.android.tools.build:gradle:8.1.0'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
|
||||
|
||||
@@ -22,8 +22,8 @@ pluginManagement {
|
||||
|
||||
plugins {
|
||||
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
|
||||
id "com.android.application" version "8.7.0" apply false
|
||||
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
|
||||
id "com.android.application" version "8.1.0" apply false
|
||||
id "org.jetbrains.kotlin.android" version "1.9.10" apply false
|
||||
}
|
||||
|
||||
include ":app"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 544 KiB After Width: | Height: | Size: 1.4 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 458 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 893 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 1.3 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 649 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 427 KiB After Width: | Height: | Size: 502 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 142 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 503 KiB After Width: | Height: | Size: 478 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 362 KiB After Width: | Height: | Size: 1.7 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 909 KiB After Width: | Height: | Size: 1.0 MiB |
@@ -1,336 +0,0 @@
|
||||
# Per-Provider Sync Implementation
|
||||
|
||||
## Date: January 17, 2026
|
||||
|
||||
## Overview
|
||||
|
||||
This document details the implementation of per-provider sync with source tracking, enabling instant client-side filtering that properly differentiates between multiple accounts of the same provider type (e.g., two different Spotify accounts).
|
||||
|
||||
## Problem Statement
|
||||
|
||||
### The Core Issue
|
||||
|
||||
When a user has multiple accounts of the same provider type (e.g., two Spotify accounts: "Chris Laycock" and "Bababagoly"), the existing provider filter couldn't differentiate between them.
|
||||
|
||||
**Why?** Music Assistant's `provider_mappings` field on media items shows which providers **CAN PLAY** an item, not which provider **ADDED** it. When both Spotify accounts can play the same artist, both appear in `provider_mappings`, making client-side filtering impossible.
|
||||
|
||||
### Previous Approach (Failed)
|
||||
|
||||
The initial implementation tried to filter client-side using `provider_mappings`:
|
||||
|
||||
```dart
|
||||
bool isItemAllowedByProviderFilter(MediaItem item) {
|
||||
final mappings = item.providerMappings;
|
||||
for (final mapping in mappings) {
|
||||
if (_providerFilter.contains(mapping.providerInstance)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
```
|
||||
|
||||
**Result:** Both Spotify accounts showed the same items because `provider_mappings` contained both account IDs for shared content.
|
||||
|
||||
### Race Condition Issue
|
||||
|
||||
Additionally, when rapidly toggling providers, a race condition occurred:
|
||||
1. User toggles Provider A off
|
||||
2. Sync starts for remaining providers
|
||||
3. User toggles Provider B off before sync completes
|
||||
4. First sync completes with wrong filter state
|
||||
5. UI shows incorrect results
|
||||
|
||||
## Solution: Per-Provider Sync with Source Tracking
|
||||
|
||||
### Concept
|
||||
|
||||
Instead of relying on `provider_mappings`, we:
|
||||
1. **Sync each provider separately** using the MA API's `provider` parameter
|
||||
2. **Tag each item** with which provider instance(s) returned it
|
||||
3. **Store source tracking** in the local database
|
||||
4. **Filter client-side** using the source tracking data (instant)
|
||||
5. **Background sync** keeps data fresh without blocking UI
|
||||
|
||||
### Why This Works
|
||||
|
||||
When we call the MA API with `provider: ["spotify--RKnr3jKx"]`, the server returns **only items from that specific account's library**. By syncing each provider separately and remembering which provider returned each item, we can accurately filter.
|
||||
|
||||
## Implementation Details
|
||||
|
||||
### 1. Database Schema Update
|
||||
|
||||
**File:** `lib/database/database.dart`
|
||||
|
||||
Added `sourceProviders` column to `LibraryCache` table:
|
||||
|
||||
```dart
|
||||
class LibraryCache extends Table {
|
||||
// ... existing columns ...
|
||||
|
||||
/// Provider instance IDs that provided this item (JSON array)
|
||||
/// Used for client-side filtering by source provider
|
||||
TextColumn get sourceProviders => text().withDefault(const Constant('[]'))();
|
||||
}
|
||||
```
|
||||
|
||||
**Schema version:** 5 → 6
|
||||
|
||||
**Migration:**
|
||||
```dart
|
||||
if (from < 6) {
|
||||
await customStatement(
|
||||
"ALTER TABLE library_cache ADD COLUMN source_providers TEXT NOT NULL DEFAULT '[]'"
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
### 2. Database Service Updates
|
||||
|
||||
**File:** `lib/services/database_service.dart`
|
||||
|
||||
Added `sourceProvider` parameter to `cacheItem()`:
|
||||
|
||||
```dart
|
||||
Future<void> cacheItem<T>({
|
||||
required String itemType,
|
||||
required String itemId,
|
||||
required Map<String, dynamic> data,
|
||||
String? sourceProvider, // NEW: tracks which provider this item came from
|
||||
})
|
||||
```
|
||||
|
||||
Added new method to retrieve items with source tracking:
|
||||
|
||||
```dart
|
||||
Future<List<(Map<String, dynamic>, List<String>)>> getCachedItemsWithProviders(String itemType)
|
||||
```
|
||||
|
||||
Returns tuples of `(itemData, sourceProviderIds)`.
|
||||
|
||||
### 3. SyncService Rewrite
|
||||
|
||||
**File:** `lib/services/sync_service.dart`
|
||||
|
||||
#### New Fields
|
||||
|
||||
```dart
|
||||
// Source provider tracking for client-side filtering
|
||||
Map<String, List<String>> _albumSourceProviders = {};
|
||||
Map<String, List<String>> _artistSourceProviders = {};
|
||||
Map<String, List<String>> _audiobookSourceProviders = {};
|
||||
Map<String, List<String>> _playlistSourceProviders = {};
|
||||
```
|
||||
|
||||
#### Per-Provider Sync Logic
|
||||
|
||||
```dart
|
||||
Future<void> syncFromApi(MusicAssistantAPI api, {
|
||||
bool force = false,
|
||||
List<String>? providerInstanceIds,
|
||||
}) async {
|
||||
// If specific providers are requested, sync each separately
|
||||
if (providerInstanceIds != null && providerInstanceIds.isNotEmpty) {
|
||||
for (final providerId in providerInstanceIds) {
|
||||
// Fetch from this specific provider
|
||||
final results = await Future.wait([
|
||||
api.getAlbums(limit: 1000, providerInstanceIds: [providerId]),
|
||||
api.getArtists(limit: 1000, providerInstanceIds: [providerId]),
|
||||
// ... etc
|
||||
]);
|
||||
|
||||
// Track source provider for each item
|
||||
for (final album in albums) {
|
||||
albumMap[album.itemId] = album;
|
||||
_albumSourceProviders.putIfAbsent(album.itemId, () => []);
|
||||
if (!_albumSourceProviders[album.itemId]!.contains(providerId)) {
|
||||
_albumSourceProviders[album.itemId]!.add(providerId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### Client-Side Filtering Methods
|
||||
|
||||
```dart
|
||||
/// Filter albums by source provider (instant, no network)
|
||||
List<Album> getAlbumsFilteredByProviders(Set<String> enabledProviderIds) {
|
||||
if (enabledProviderIds.isEmpty || _albumSourceProviders.isEmpty) {
|
||||
return _cachedAlbums;
|
||||
}
|
||||
return _cachedAlbums.where((album) {
|
||||
final sources = _albumSourceProviders[album.itemId];
|
||||
if (sources == null || sources.isEmpty) return true; // No tracking = show
|
||||
return sources.any((s) => enabledProviderIds.contains(s));
|
||||
}).toList();
|
||||
}
|
||||
|
||||
// Similar methods for artists, audiobooks, playlists
|
||||
```
|
||||
|
||||
### 4. Library Screen Updates
|
||||
|
||||
**File:** `lib/screens/new_library_screen.dart`
|
||||
|
||||
#### Hybrid Provider Toggle Handler
|
||||
|
||||
```dart
|
||||
void _handleProviderToggle(String providerId, bool enabled) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
|
||||
// Instant UI update via global provider toggle
|
||||
maProvider.toggleProviderEnabled(providerId, enabled);
|
||||
setState(() {}); // Rebuild with client-side filtering
|
||||
|
||||
// Background sync after 1.5s debounce
|
||||
_providerFilterDebounce?.cancel();
|
||||
_providerFilterDebounce = Timer(const Duration(milliseconds: 1500), () async {
|
||||
if (mounted) {
|
||||
await maProvider.forceLibrarySync();
|
||||
if (mounted) setState(() {});
|
||||
}
|
||||
});
|
||||
}
|
||||
```
|
||||
|
||||
#### Updated Tab Builders
|
||||
|
||||
Artists tab now uses source tracking:
|
||||
|
||||
```dart
|
||||
Widget _buildArtistsTab(BuildContext context, S l10n) {
|
||||
return Selector<MusicAssistantProvider, (List<Artist>, bool, Set<String>)>(
|
||||
selector: (_, provider) => (
|
||||
provider.artists,
|
||||
provider.isLoading,
|
||||
provider.enabledProviderIds.toSet()
|
||||
),
|
||||
builder: (context, data, _) {
|
||||
final (allArtists, isLoading, enabledProviders) = data;
|
||||
|
||||
// Client-side filtering using SyncService source tracking
|
||||
final syncService = SyncService.instance;
|
||||
final filteredArtists = syncService.hasSourceTracking && enabledProviders.isNotEmpty
|
||||
? syncService.getArtistsFilteredByProviders(enabledProviders)
|
||||
: allArtists;
|
||||
|
||||
// ... rest of build
|
||||
},
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
Similar updates for albums, playlists, and audiobooks tabs.
|
||||
|
||||
### 5. Provider Instance Model
|
||||
|
||||
**File:** `lib/models/provider_instance.dart` (new file)
|
||||
|
||||
```dart
|
||||
class ProviderInstance {
|
||||
final String instanceId; // e.g., "spotify--abc123"
|
||||
final String domain; // e.g., "spotify"
|
||||
final String name; // e.g., "Spotify (John's Account)"
|
||||
final bool available;
|
||||
|
||||
/// Known music provider domains
|
||||
static const Set<String> musicProviderDomains = {
|
||||
'spotify', 'tidal', 'qobuz', 'deezer', 'ytmusic', 'soundcloud',
|
||||
'apple_music', 'amazon_music', 'plex', 'subsonic', 'opensubsonic',
|
||||
'jellyfin', 'emby', 'navidrome', 'audiobookshelf', 'filesystem',
|
||||
'tunein', 'radiobrowser', 'snapcast', 'fully_kiosk',
|
||||
};
|
||||
|
||||
bool get isMusicProvider => musicProviderDomains.contains(domain);
|
||||
}
|
||||
```
|
||||
|
||||
## Data Flow
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ User Toggles Provider │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ 1. MusicAssistantProvider.toggleProviderEnabled() │
|
||||
│ - Updates enabledProviderIds │
|
||||
│ - Triggers setState() for instant UI update │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ 2. UI Rebuilds Immediately │
|
||||
│ - Selector detects enabledProviderIds change │
|
||||
│ - Calls SyncService.getArtistsFilteredByProviders() │
|
||||
│ - Filters using source tracking (instant, no network) │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ 3. Background Sync (after 1.5s debounce) │
|
||||
│ - forceLibrarySync() called │
|
||||
│ - Syncs each enabled provider separately │
|
||||
│ - Updates source tracking in database │
|
||||
│ - UI refreshes with fresh data │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
## Files Changed
|
||||
|
||||
| File | Changes |
|
||||
|------|---------|
|
||||
| `lib/database/database.dart` | Added `sourceProviders` column, schema v6, migration |
|
||||
| `lib/database/database.g.dart` | Auto-generated from schema changes |
|
||||
| `lib/services/database_service.dart` | Added `sourceProvider` param, `getCachedItemsWithProviders()` |
|
||||
| `lib/services/sync_service.dart` | Per-provider sync, source tracking maps, filtering methods |
|
||||
| `lib/screens/new_library_screen.dart` | Hybrid toggle handler, updated tab builders |
|
||||
| `lib/models/provider_instance.dart` | New model for provider instances |
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
- [ ] Fresh install: First sync should populate source tracking
|
||||
- [ ] Toggle single provider: UI updates instantly
|
||||
- [ ] Toggle multiple providers rapidly: Debounce prevents race conditions
|
||||
- [ ] Two Spotify accounts: Toggling one only shows that account's items
|
||||
- [ ] Mixed providers: Toggling Spotify doesn't affect Audiobookshelf items
|
||||
- [ ] Legacy cache: Items without source tracking show regardless of filter
|
||||
- [ ] Pull to refresh: Refreshes source tracking data
|
||||
|
||||
## Known Limitations
|
||||
|
||||
1. **First sync required:** Source tracking only works after at least one sync with providers enabled
|
||||
2. **Network cost:** Per-provider sync makes N API calls (one per provider) vs. 1 call for all providers
|
||||
3. **Items in multiple accounts:** If the same item exists in both Spotify accounts, it will show when either is enabled
|
||||
|
||||
## Future Improvements
|
||||
|
||||
1. **Incremental sync:** Only sync changed items instead of full library
|
||||
2. **Provider-specific cache age:** Different sync intervals per provider
|
||||
3. **Offline source tracking:** Persist source tracking independently of full cache
|
||||
|
||||
## Branch
|
||||
|
||||
All changes are on the `feature/per-provider-sync` branch.
|
||||
|
||||
```bash
|
||||
git checkout feature/per-provider-sync
|
||||
```
|
||||
|
||||
## Commit
|
||||
|
||||
```
|
||||
feat: Add per-provider sync with source tracking for instant filtering
|
||||
|
||||
- Add sourceProviders column to database schema (v6) for tracking which
|
||||
provider instance each item came from
|
||||
- Update SyncService to sync each enabled provider separately and tag
|
||||
items with their source provider
|
||||
- Add client-side filtering methods that use source tracking to properly
|
||||
differentiate between multiple accounts of the same provider type
|
||||
- Update library UI to use instant client-side filtering with background
|
||||
sync for data freshness
|
||||
```
|
||||
@@ -1,217 +0,0 @@
|
||||
# Provider Filter Implementation Notes
|
||||
|
||||
## Overview
|
||||
|
||||
This document captures the context and learnings from an attempted implementation of provider filtering in the Ensemble app. The goal was to allow users to filter their library to show only items from a specific music provider (e.g., only one Spotify account when multiple are configured).
|
||||
|
||||
## The Problem
|
||||
|
||||
Users with multiple music provider accounts (e.g., two Spotify accounts: one personal, one family) want to filter their library view to show only items from one specific account. The Music Assistant (MA) web UI successfully implements this feature.
|
||||
|
||||
## What Works vs What Failed
|
||||
|
||||
### Works: Different Provider Types
|
||||
Filtering between different provider types (e.g., Spotify vs Tidal vs Plex) works correctly. Each provider type has distinct `provider_mappings` entries.
|
||||
|
||||
### Failed: Multiple Accounts of Same Provider
|
||||
Filtering between multiple Spotify accounts (e.g., `spotify--abc123` vs `spotify--xyz789`) does NOT work correctly. The same library items appear regardless of which Spotify account is selected.
|
||||
|
||||
## Root Cause Analysis
|
||||
|
||||
### The provider_mappings Problem
|
||||
|
||||
MA's `provider_mappings` field on media items does NOT indicate "which account ADDED this item to the library." Instead, it indicates "which providers CAN PLAY this item."
|
||||
|
||||
Example: An artist "Ari Mason" that exists ONLY in User A's Spotify library will show provider_mappings containing BOTH Spotify accounts:
|
||||
```json
|
||||
{
|
||||
"provider_mappings": [
|
||||
{"provider_instance": "spotify--userA_id", "item_id": "..."},
|
||||
{"provider_instance": "spotify--userB_id", "item_id": "..."}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
This happens because:
|
||||
1. MA's internal database stores that the artist exists
|
||||
2. MA knows both Spotify accounts CAN play this artist (Spotify has the content)
|
||||
3. MA doesn't track WHICH account originally added the item to the library
|
||||
|
||||
### MA Web UI Behavior
|
||||
|
||||
The MA web UI's provider filter works differently - it appears to use server-side filtering via the `provider` parameter on library_items API calls. When you select a single provider in MA settings, the API returns only items from that provider's library.
|
||||
|
||||
## API Investigation
|
||||
|
||||
### Server-Side Filtering Parameter
|
||||
|
||||
The MA server's `library_items` method accepts a `provider` parameter:
|
||||
- Parameter name: `provider` (string or list of strings)
|
||||
- Endpoint: `music/{type}/library_items` (e.g., `music/artists/library_items`)
|
||||
- Expected behavior: Filter to only return items from the specified provider's library
|
||||
|
||||
### What We Tried
|
||||
|
||||
1. **Client-side filtering based on provider_mappings**
|
||||
- Result: Failed - all Spotify accounts appear in mappings regardless of which added the item
|
||||
|
||||
2. **Server-side filtering with `provider` parameter**
|
||||
- Result: Partially implemented but behavior was inconsistent
|
||||
- The API accepts the parameter but may not filter correctly for same-provider-type accounts
|
||||
|
||||
3. **Using `provider_instance_id_or_domain` parameter**
|
||||
- Result: This parameter is for getting specific items by ID, not for filtering library_items
|
||||
|
||||
## Code Locations
|
||||
|
||||
### Files Modified (in stash)
|
||||
|
||||
The implementation attempt is preserved in git stash:
|
||||
```bash
|
||||
git stash list # Look for "provider-filter-and-dropdown-work"
|
||||
git stash show -p stash@{0} # View the changes
|
||||
```
|
||||
|
||||
Key files that were modified:
|
||||
|
||||
1. **lib/providers/music_assistant_provider.dart**
|
||||
- `_disabledProviders`: List of disabled provider instance IDs (local app setting)
|
||||
- `selectedProviderForFilter`: Returns single enabled provider for server-side filtering
|
||||
- `toggleProviderEnabled()`: Toggle provider on/off and trigger re-sync
|
||||
- `loadDisabledProviders()`: Load from local settings
|
||||
- `filterByProvider()`: Client-side filtering (enhanced version)
|
||||
- `isItemAllowedByProviderFilter()`: Check if item should be visible
|
||||
|
||||
2. **lib/services/music_assistant_api.dart**
|
||||
- Added `provider` parameter to: `getArtists`, `getAlbums`, `getTracks`, `getRandomArtists`, `getRandomAlbums`
|
||||
- Added `MusicProvider` model parsing from `/providers` endpoint
|
||||
- `musicProviders` getter: List of available music providers
|
||||
|
||||
3. **lib/services/sync_service.dart**
|
||||
- Added `provider` parameter to `syncFromApi()` and `forceSync()`
|
||||
- Pass provider filter to API calls during sync
|
||||
|
||||
4. **lib/services/settings_service.dart**
|
||||
- `getDisabledMusicProviders()`: Get list of disabled provider IDs
|
||||
- `setDisabledMusicProviders()`: Save disabled providers
|
||||
- `toggleProviderEnabled()`: Toggle and persist
|
||||
|
||||
5. **lib/screens/settings_screen.dart**
|
||||
- UI for toggling individual providers on/off
|
||||
- Display provider name and instance ID
|
||||
|
||||
6. **lib/screens/new_library_screen.dart**
|
||||
- Integration with provider filtering
|
||||
|
||||
7. **lib/models/music_provider.dart** (new file)
|
||||
- Model for MA provider instances
|
||||
- Fields: `instanceId`, `domain`, `name`, `available`
|
||||
|
||||
## Race Condition Issue
|
||||
|
||||
A race condition was identified where:
|
||||
1. Initial app sync starts WITHOUT provider filter
|
||||
2. User toggles provider filter
|
||||
3. `clearCache()` is called
|
||||
4. New sync with provider filter tries to start
|
||||
5. "Sync already in progress" - new sync is skipped
|
||||
6. Result: Old unfiltered data remains
|
||||
|
||||
Fix attempted: Reset `_isSyncing = false` in `clearCache()` to allow fresh sync.
|
||||
|
||||
## Potential Solutions to Explore
|
||||
|
||||
### 1. Investigate MA Server-Side Filtering
|
||||
|
||||
The MA server should support filtering by provider. Need to verify:
|
||||
- Does the `provider` parameter work for filtering between same-type providers?
|
||||
- Is there a different parameter or API endpoint?
|
||||
- Check MA source code: https://github.com/music-assistant/server
|
||||
|
||||
### 2. Library Sync Per Provider
|
||||
|
||||
Instead of syncing all items and filtering, sync each provider's library separately:
|
||||
```dart
|
||||
for (final provider in enabledProviders) {
|
||||
final items = await api.getAlbums(provider: provider.instanceId);
|
||||
// Store with provider association
|
||||
}
|
||||
```
|
||||
|
||||
### 3. Track Item Origin
|
||||
|
||||
Store which provider originally added each item:
|
||||
- Modify database schema to track `source_provider`
|
||||
- When syncing, record which provider the item came from
|
||||
- Filter based on source, not playability
|
||||
|
||||
### 4. Use MA's Internal Library State
|
||||
|
||||
MA might have internal state about which items are in which provider's library. Investigate:
|
||||
- `/music/library/items` endpoint
|
||||
- Provider-specific library endpoints
|
||||
- MA's database schema for library associations
|
||||
|
||||
### 5. Check MA User Settings
|
||||
|
||||
The MA web UI's provider filter might be stored in user settings:
|
||||
```dart
|
||||
final userInfo = await api.getCurrentUserInfo();
|
||||
// Check for provider_filter or similar field
|
||||
```
|
||||
|
||||
## Testing Notes
|
||||
|
||||
### Log Messages to Watch
|
||||
|
||||
```
|
||||
🔌 Selected provider for filter: spotify--xxxxx
|
||||
🔍 API getArtists args: {limit: 1000, provider: spotify--xxxxx}
|
||||
🔍 API getArtists returned XXX items
|
||||
🔌 filterByProvider: XXX → YYY (disabled=[...])
|
||||
```
|
||||
|
||||
### Test Scenario
|
||||
|
||||
1. Configure two Spotify accounts in MA
|
||||
2. Add different artists to each account's library
|
||||
3. In Ensemble, select only one Spotify account
|
||||
4. Verify library shows ONLY that account's items
|
||||
5. Switch to other account, verify different items
|
||||
|
||||
### Expected vs Actual
|
||||
|
||||
- **Expected**: Artist "Ari Mason" (only in Account A) should NOT appear when Account B is selected
|
||||
- **Actual**: Artist appears regardless of which account is selected
|
||||
|
||||
## MA API Reference
|
||||
|
||||
### Get Providers
|
||||
```
|
||||
Command: providers
|
||||
Returns: List of provider instances with type, domain, instanceId, name, available
|
||||
```
|
||||
|
||||
### Library Items with Filter
|
||||
```
|
||||
Command: music/artists/library_items
|
||||
Args: {
|
||||
limit: int,
|
||||
offset: int,
|
||||
provider: string | list<string>, // Filter to specific provider(s)
|
||||
album_artists_only: bool,
|
||||
order_by: string
|
||||
}
|
||||
```
|
||||
|
||||
### Relevant MA Source Files
|
||||
|
||||
- `music_assistant/server/controllers/music.py` - Library item retrieval
|
||||
- `music_assistant/server/models/provider.py` - Provider model
|
||||
- `music_assistant/server/providers/` - Individual provider implementations
|
||||
|
||||
## Conclusion
|
||||
|
||||
The core challenge is that MA's `provider_mappings` indicates playability, not ownership. Server-side filtering via the `provider` parameter should work but needs further investigation to understand why it doesn't differentiate between multiple accounts of the same provider type.
|
||||
|
||||
The implementation is preserved in the git stash for future reference. The sorting/dropdown improvements were extracted and committed separately.
|
||||
@@ -1,271 +0,0 @@
|
||||
# Audiobook Provider Filtering Fix
|
||||
|
||||
## Date: January 17, 2026 (Continuation)
|
||||
|
||||
## Overview
|
||||
|
||||
This session focused on fixing provider filtering issues discovered after the initial provider filtering improvements:
|
||||
1. Audiobooks were not responding to provider filter changes (browse API ignoring `providerInstanceIds`)
|
||||
2. UI not updating instantly when toggling providers (missing `notifyListeners()` call)
|
||||
3. Audiobook tabs not rebuilding on provider changes (using `context.read` instead of `Selector`)
|
||||
|
||||
---
|
||||
|
||||
## Problem Statement
|
||||
|
||||
After implementing capability-based provider filtering for the music library, two issues remained:
|
||||
|
||||
### Issue 1: Audiobooks Not Filtering During Sync
|
||||
|
||||
The bug report showed:
|
||||
```
|
||||
📊 Source tracking: 252 albums, 87 artists have provider info
|
||||
📚 Total audiobooks from browse: 186
|
||||
```
|
||||
|
||||
- Albums and artists had provider source tracking
|
||||
- Audiobooks had NO provider source tracking (not listed)
|
||||
- All 186 audiobooks were returned regardless of provider selection
|
||||
|
||||
### Issue 2: UI Not Updating Instantly
|
||||
|
||||
When toggling providers in the library menu:
|
||||
- Music tabs weren't updating immediately
|
||||
- Audiobooks required manual pull-to-refresh
|
||||
- Changes only appeared after ~600ms (debounce timer)
|
||||
|
||||
---
|
||||
|
||||
## Root Cause Analysis
|
||||
|
||||
### Cause 1: Browse API Ignoring Provider Filter
|
||||
|
||||
In `lib/services/music_assistant_api.dart`, when ABS library filtering is enabled, the `getAudiobooks()` function uses the browse API but was **ignoring** the `providerInstanceIds` parameter:
|
||||
|
||||
```dart
|
||||
// BEFORE: providerInstanceIds was ignored when using browse API
|
||||
if (enabledLibraries != null && enabledLibraries.isNotEmpty) {
|
||||
return await _getAudiobooksFromBrowse(enabledLibraries, favoriteOnly: favoriteOnly);
|
||||
}
|
||||
```
|
||||
|
||||
### Cause 2: `notifyListeners()` Called Too Late
|
||||
|
||||
In `lib/providers/music_assistant_provider.dart`, the `toggleProviderEnabled()` function only called `notifyListeners()` **inside** the 600ms debounce timer:
|
||||
|
||||
```dart
|
||||
// BEFORE: notifyListeners only called after 600ms debounce
|
||||
_providerFilterDebounceTimer = Timer(const Duration(milliseconds: 600), () {
|
||||
forceLibrarySync();
|
||||
notifyListeners(); // Too late! UI should update immediately
|
||||
});
|
||||
```
|
||||
|
||||
### Cause 3: Audiobook Tabs Not Listening for Changes
|
||||
|
||||
The audiobook tabs used `context.read<MusicAssistantProvider>()` which doesn't trigger rebuilds when the provider changes:
|
||||
|
||||
```dart
|
||||
// BEFORE: context.read doesn't listen for changes
|
||||
Widget _buildBooksAuthorsTab(BuildContext context, S l10n) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final enabledProviders = maProvider.enabledProviderIds.toSet();
|
||||
// ... widget doesn't rebuild when enabledProviders changes
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Solutions
|
||||
|
||||
### Fix 1: Browse API Provider Filtering
|
||||
|
||||
**File:** `lib/services/music_assistant_api.dart` (lines 760-785)
|
||||
|
||||
Added logic to filter library paths by provider ID before browsing:
|
||||
|
||||
```dart
|
||||
if (enabledLibraries != null && enabledLibraries.isNotEmpty) {
|
||||
_logger.log('📚 getAudiobooks: enabledLibraries=$enabledLibraries, providerInstanceIds=$providerInstanceIds');
|
||||
|
||||
// If specific providers are requested, filter libraries to only matching providers
|
||||
// Library paths start with provider ID (e.g., "audiobookshelf--abc123://lb...")
|
||||
var librariesToBrowse = enabledLibraries;
|
||||
if (providerInstanceIds != null && providerInstanceIds.isNotEmpty) {
|
||||
librariesToBrowse = enabledLibraries.where((libPath) {
|
||||
// Extract provider ID from library path (everything before "://")
|
||||
final providerEnd = libPath.indexOf('://');
|
||||
if (providerEnd == -1) return false;
|
||||
final providerId = libPath.substring(0, providerEnd);
|
||||
return providerInstanceIds.contains(providerId);
|
||||
}).toList();
|
||||
|
||||
// If no libraries match the requested providers, return empty
|
||||
if (librariesToBrowse.isEmpty) {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
return await _getAudiobooksFromBrowse(librariesToBrowse, favoriteOnly: favoriteOnly);
|
||||
}
|
||||
```
|
||||
|
||||
### Fix 2: Immediate `notifyListeners()` Call
|
||||
|
||||
**File:** `lib/providers/music_assistant_provider.dart` (line 1149)
|
||||
|
||||
Moved `notifyListeners()` to fire immediately after `_enabledProviderIds` changes:
|
||||
|
||||
```dart
|
||||
// Reload the enabled providers
|
||||
final savedEnabled = await SettingsService.getEnabledMusicProviders();
|
||||
_enabledProviderIds = savedEnabled ?? [];
|
||||
|
||||
// Notify listeners IMMEDIATELY so UI rebuilds with client-side filtering
|
||||
// This enables instant UI updates using cached data with source tracking
|
||||
notifyListeners();
|
||||
|
||||
// Cancel any pending debounce timer
|
||||
_providerFilterDebounceTimer?.cancel();
|
||||
|
||||
// Start debounced sync - waits 600ms for user to finish toggling
|
||||
// This refreshes the cache with new data from enabled providers
|
||||
_providerFilterDebounceTimer = Timer(const Duration(milliseconds: 600), () {
|
||||
_logger.log('🔄 Debounce complete, starting library sync...');
|
||||
forceLibrarySync();
|
||||
});
|
||||
```
|
||||
|
||||
### Fix 3: Audiobook Tabs Use Selector
|
||||
|
||||
**File:** `lib/screens/new_library_screen.dart`
|
||||
|
||||
Wrapped `_buildBooksAuthorsTab` and `_buildAllBooksTab` in `Selector` to rebuild when `enabledProviderIds` changes:
|
||||
|
||||
```dart
|
||||
Widget _buildBooksAuthorsTab(BuildContext context, S l10n) {
|
||||
// Use Selector to rebuild when enabledProviderIds changes
|
||||
return Selector<MusicAssistantProvider, Set<String>>(
|
||||
selector: (_, provider) => provider.enabledProviderIds.toSet(),
|
||||
builder: (context, enabledProviders, _) {
|
||||
final syncService = SyncService.instance;
|
||||
|
||||
// Client-side filtering using SyncService source tracking for instant updates
|
||||
var audiobooks = syncService.hasSourceTracking && enabledProviders.isNotEmpty
|
||||
? syncService.getAudiobooksFilteredByProviders(enabledProviders)
|
||||
: List<Audiobook>.from(_audiobooks);
|
||||
|
||||
// ... rest of widget
|
||||
},
|
||||
);
|
||||
}
|
||||
```
|
||||
|
||||
### Fix 4: Enhanced Sync Logging
|
||||
|
||||
**File:** `lib/services/sync_service.dart`
|
||||
|
||||
Added audiobook counts to logging:
|
||||
|
||||
```dart
|
||||
// Per-provider log (line 237)
|
||||
_logger.log(' 📥 Got ${albums.length} albums, ${artists.length} artists, ${audiobooks.length} audiobooks from $providerId');
|
||||
|
||||
// Source tracking summary (line 323)
|
||||
_logger.log('📊 Source tracking: ${_albumSourceProviders.length} albums, ${_artistSourceProviders.length} artists, ${_audiobookSourceProviders.length} audiobooks have provider info');
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Data Flow After Fixes
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ User Toggles Provider │
|
||||
│ │
|
||||
│ 1. toggleProviderEnabled() called │
|
||||
│ 2. _enabledProviderIds updated │
|
||||
│ 3. notifyListeners() called IMMEDIATELY │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ Selectors Detect Change │
|
||||
│ │
|
||||
│ Music tabs: Selector<..., (List, bool, Set<String>)> │
|
||||
│ Audiobook tabs: Selector<..., Set<String>> │
|
||||
│ │
|
||||
│ → All tabs rebuild immediately │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ Client-Side Filtering (Instant) │
|
||||
│ │
|
||||
│ syncService.getAlbumsFilteredByProviders(enabledProviders) │
|
||||
│ syncService.getArtistsFilteredByProviders(enabledProviders) │
|
||||
│ syncService.getAudiobooksFilteredByProviders(enabledProviders)│
|
||||
│ │
|
||||
│ → Uses EXISTING cache with source tracking │
|
||||
│ → Instant UI update, no network required │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ Background Sync (After 600ms Debounce) │
|
||||
│ │
|
||||
│ - Refreshes cache with new data from enabled providers │
|
||||
│ - Updates source tracking │
|
||||
│ - Only needed when ENABLING providers (to fetch new data) │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Files Changed
|
||||
|
||||
| File | Changes |
|
||||
|------|---------|
|
||||
| `lib/services/music_assistant_api.dart` | Added provider filtering to browse API path in `getAudiobooks()`, added debug logging |
|
||||
| `lib/services/sync_service.dart` | Added audiobook counts to per-provider and summary logs |
|
||||
| `lib/providers/music_assistant_provider.dart` | Moved `notifyListeners()` to fire immediately on provider toggle |
|
||||
| `lib/screens/new_library_screen.dart` | Wrapped audiobook tabs in `Selector` to rebuild on provider changes |
|
||||
|
||||
---
|
||||
|
||||
## Expected Behavior After Fixes
|
||||
|
||||
1. **Instant UI Updates:** When you toggle a provider, the library immediately updates using client-side filtering
|
||||
2. **Audiobook Source Tracking:** Audiobooks now have provider source tracking (visible in logs)
|
||||
3. **Audiobook Tab Rebuilds:** Both audiobook tabs (Authors and All Books) rebuild instantly on provider toggle
|
||||
4. **Music Tab Consistency:** Music tabs continue to work as before, now with immediate rebuilds
|
||||
|
||||
---
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
- [ ] Toggle a music provider, verify instant UI update (no 600ms delay)
|
||||
- [ ] Toggle between different Spotify accounts, verify correct filtering
|
||||
- [ ] Sync with ABS library filtering enabled
|
||||
- [ ] Verify audiobooks appear in source tracking log
|
||||
- [ ] Toggle ABS provider off in library menu
|
||||
- [ ] Verify audiobooks list becomes empty immediately (no pull-to-refresh needed)
|
||||
- [ ] Toggle ABS provider back on
|
||||
- [ ] Verify audiobooks reappear after sync completes
|
||||
- [ ] Test with multiple providers (Spotify audiobooks + ABS)
|
||||
|
||||
---
|
||||
|
||||
## Related Documentation
|
||||
|
||||
- `docs/SESSION_2026_01_17_PROVIDER_FILTERING.md` - Initial provider filtering implementation
|
||||
- `docs/PER_PROVIDER_SYNC_IMPLEMENTATION.md` - Per-provider sync architecture
|
||||
|
||||
---
|
||||
|
||||
## Known Limitations
|
||||
|
||||
1. **Series Tab:** The Series tab still doesn't filter by provider. Series are fetched as `AudiobookSeries` objects without per-provider tracking.
|
||||
|
||||
2. **Mixed Provider Scenario:** If user has both Spotify audiobooks and ABS audiobooks, and ABS library filtering is enabled, Spotify audiobooks may not be fetched because the browse API path is taken. This is a pre-existing architectural limitation.
|
||||
|
||||
3. **Enabling Providers:** When ENABLING a previously disabled provider, the UI updates immediately but shows empty until the background sync completes (because the cache doesn't have that provider's data yet). This is expected behavior.
|
||||
@@ -1,217 +0,0 @@
|
||||
# Session 2026-01-17: Optimistic Updates & Podcast Provider Filtering
|
||||
|
||||
## Overview
|
||||
|
||||
This session focused on fixing provider filtering for podcasts, resolving iTunes podcast provider issues, and implementing optimistic updates for library buttons across detail screens.
|
||||
|
||||
## Issues Addressed
|
||||
|
||||
### 1. Podcast Provider Counts Showing Incorrectly
|
||||
|
||||
**Problem**: All Spotify accounts showed the same podcast count instead of only counting podcasts owned by each account.
|
||||
|
||||
**Root Cause**: The podcast counting logic wasn't checking the `inLibrary` field on provider mappings.
|
||||
|
||||
**Solution**:
|
||||
- Added `inLibrary` field to `ProviderMapping` model
|
||||
- Updated `getProvidersWithPodcasts()` to only count mappings where `inLibrary == true`
|
||||
- Updated podcast filtering in library screen to check `inLibrary` field
|
||||
|
||||
**Files Modified**:
|
||||
- `lib/models/media_item.dart` - Added `inLibrary` field
|
||||
- `lib/providers/music_assistant_provider.dart` - Updated counting logic
|
||||
- `lib/screens/new_library_screen.dart` - Updated filtering logic
|
||||
|
||||
### 2. iTunes Podcasts Not Appearing in Library
|
||||
|
||||
**Problem**: Podcasts added from iTunes search weren't showing in library and iTunes provider filter showed 0 count.
|
||||
|
||||
**Investigation**:
|
||||
- Added `itunes_podcasts` to provider capabilities and music provider domains
|
||||
- Added synthetic provider instance creation for search-only providers
|
||||
- Added debug logging to understand podcast loading
|
||||
|
||||
**Resolution**: The issue was with Music Assistant's iTunes podcast provider itself - podcasts added via iTunes weren't being properly stored in the MA library. The user removed the iTunes provider from MA and re-added podcasts via Spotify search as a workaround.
|
||||
|
||||
**Files Modified**:
|
||||
- `lib/models/provider_instance.dart` - Added `itunes_podcasts` to capabilities
|
||||
|
||||
### 3. Episode Loading Failing for Non-Library Podcasts
|
||||
|
||||
**Problem**: When a podcast was removed from library, the old library ID became invalid and episodes wouldn't load.
|
||||
|
||||
**Solution**: Added fallback logic to try loading episodes via provider mappings when the primary ID fails.
|
||||
|
||||
**Files Modified**:
|
||||
- `lib/screens/podcast_detail_screen.dart` - Added fallback episode loading
|
||||
|
||||
### 4. Search Filtering Rework
|
||||
|
||||
**Problem**: Server-side provider filtering was being applied to search results when it should only apply when the "in library" toggle is enabled.
|
||||
|
||||
**Solution**:
|
||||
- Removed `filterSearchResults()` calls from search methods
|
||||
- Added client-side `_filterByEnabledProviders()` helper
|
||||
- Applied filtering only when `_libraryOnly` toggle is ON
|
||||
|
||||
**Files Modified**:
|
||||
- `lib/providers/music_assistant_provider.dart` - Removed filterSearchResults calls
|
||||
- `lib/screens/search_screen.dart` - Added client-side filtering
|
||||
|
||||
### 5. Library Buttons Not Updating Immediately
|
||||
|
||||
**Problem**: Add/remove library buttons on detail screens waited for API response before updating, causing perceived lag.
|
||||
|
||||
**Solution**: Implemented optimistic updates - update UI immediately, revert on failure.
|
||||
|
||||
**Files Modified**:
|
||||
- `lib/screens/podcast_detail_screen.dart`
|
||||
- `lib/screens/album_details_screen.dart`
|
||||
- `lib/screens/artist_details_screen.dart`
|
||||
|
||||
## Code Changes
|
||||
|
||||
### ProviderMapping.inLibrary Field
|
||||
|
||||
```dart
|
||||
// lib/models/media_item.dart
|
||||
class ProviderMapping {
|
||||
final String itemId;
|
||||
final String providerDomain;
|
||||
final String providerInstance;
|
||||
final bool available;
|
||||
final Map<String, dynamic>? audioFormat;
|
||||
final bool inLibrary; // NEW: indicates ownership
|
||||
|
||||
factory ProviderMapping.fromJson(Map<String, dynamic> json) {
|
||||
return ProviderMapping(
|
||||
// ... other fields ...
|
||||
inLibrary: json['in_library'] == true || json['in_library'] == 1,
|
||||
);
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Podcast Provider Counting
|
||||
|
||||
```dart
|
||||
// lib/providers/music_assistant_provider.dart
|
||||
Map<String, int> getProvidersWithPodcasts() {
|
||||
final counts = <String, int>{};
|
||||
for (final item in _podcasts) {
|
||||
final mappings = item.providerMappings;
|
||||
if (mappings != null) {
|
||||
for (final mapping in mappings) {
|
||||
// Only count if this provider "owns" the item
|
||||
if (mapping.inLibrary) {
|
||||
final instanceId = mapping.providerInstance;
|
||||
if (instanceId.isNotEmpty) {
|
||||
counts[instanceId] = (counts[instanceId] ?? 0) + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return counts;
|
||||
}
|
||||
```
|
||||
|
||||
### Optimistic Update Pattern
|
||||
|
||||
```dart
|
||||
// Example from podcast_detail_screen.dart
|
||||
Future<void> _toggleLibrary() async {
|
||||
final newState = !_isInLibrary;
|
||||
|
||||
// OPTIMISTIC UPDATE: Update UI immediately
|
||||
setState(() {
|
||||
_isInLibrary = newState;
|
||||
});
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text(S.of(context)!.addedToLibrary)),
|
||||
);
|
||||
}
|
||||
|
||||
// Fire and forget - API call happens in background
|
||||
maProvider.addToLibrary(...).catchError((e) {
|
||||
// Revert on failure
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isInLibrary = !newState;
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
```
|
||||
|
||||
### Client-Side Search Filtering
|
||||
|
||||
```dart
|
||||
// lib/screens/search_screen.dart
|
||||
Map<String, List<MediaItem>> _filterByEnabledProviders(
|
||||
Map<String, List<MediaItem>> results,
|
||||
Set<String> enabledProviders,
|
||||
) {
|
||||
if (enabledProviders.isEmpty) return results;
|
||||
|
||||
bool isItemAllowed(MediaItem item) {
|
||||
final mappings = item.providerMappings;
|
||||
if (mappings == null || mappings.isEmpty) return true;
|
||||
return mappings.any((m) => m.inLibrary && enabledProviders.contains(m.providerInstance));
|
||||
}
|
||||
|
||||
return {
|
||||
for (final entry in results.entries)
|
||||
entry.key: entry.value.where(isItemAllowed).toList(),
|
||||
};
|
||||
}
|
||||
|
||||
// Applied when setting results:
|
||||
if (_libraryOnly) {
|
||||
final enabledProviders = provider.enabledProviderIds.toSet();
|
||||
combinedResults = _filterByEnabledProviders(combinedResults, enabledProviders);
|
||||
}
|
||||
```
|
||||
|
||||
## Provider Capabilities Update
|
||||
|
||||
```dart
|
||||
// lib/models/provider_instance.dart
|
||||
static const Map<String, Set<String>> providerCapabilities = {
|
||||
'spotify': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
|
||||
'ytmusic': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
|
||||
'apple_music': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
|
||||
'plex': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
|
||||
'jellyfin': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
|
||||
'emby': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
|
||||
'audiobookshelf': {'audiobooks', 'podcasts'},
|
||||
'itunes_podcasts': {'podcasts'}, // NEW
|
||||
'tunein': {'radio', 'podcasts'},
|
||||
// ... other providers
|
||||
};
|
||||
```
|
||||
|
||||
## Summary of All Modified Files
|
||||
|
||||
| File | Changes |
|
||||
|------|---------|
|
||||
| `lib/models/media_item.dart` | Added `inLibrary` field to ProviderMapping |
|
||||
| `lib/models/provider_instance.dart` | Added `itunes_podcasts`, podcasts to capabilities |
|
||||
| `lib/providers/music_assistant_provider.dart` | Updated podcast counting, removed filterSearchResults |
|
||||
| `lib/screens/new_library_screen.dart` | Updated podcast filtering with inLibrary check |
|
||||
| `lib/screens/search_screen.dart` | Added client-side filtering for in-library mode |
|
||||
| `lib/screens/podcast_detail_screen.dart` | Optimistic updates, fallback episode loading |
|
||||
| `lib/screens/album_details_screen.dart` | Optimistic updates for library button |
|
||||
| `lib/screens/artist_details_screen.dart` | Optimistic updates for library button |
|
||||
|
||||
## Key Learnings
|
||||
|
||||
1. **inLibrary field**: Music Assistant's provider mappings include an `in_library` field that indicates whether the user added the item from that specific provider account. This is essential for accurate per-provider filtering.
|
||||
|
||||
2. **iTunes podcast provider**: The MA iTunes podcast provider is for search only - it doesn't properly store items in the library. Users should add podcasts from streaming providers like Spotify instead.
|
||||
|
||||
3. **Optimistic updates**: For better UX, library toggle buttons should update immediately and only revert if the API call fails, rather than waiting for API response.
|
||||
|
||||
4. **Search vs Library filtering**: Server-side provider filtering should only apply to library views, not search results (unless the "in library" toggle is enabled).
|
||||
@@ -1,263 +0,0 @@
|
||||
# Provider Filtering Improvements
|
||||
|
||||
## Date: January 17, 2026
|
||||
|
||||
## Overview
|
||||
|
||||
This session focused on improving the provider filtering system across the app, building on the per-provider sync implementation. Key improvements include a cleaner capability-based architecture, fixing filter visibility bugs, and extending filtering to the audiobooks library.
|
||||
|
||||
---
|
||||
|
||||
## Changes Made
|
||||
|
||||
### 1. Provider Capability Mapping
|
||||
|
||||
**File:** `lib/models/provider_instance.dart`
|
||||
|
||||
Replaced the clunky item-count-based filtering with a static capability map that defines what content types each provider domain supports.
|
||||
|
||||
```dart
|
||||
static const Map<String, Set<String>> providerCapabilities = {
|
||||
// Music streaming services
|
||||
'spotify': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
|
||||
'tidal': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'qobuz': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'deezer': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'ytmusic': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'soundcloud': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'apple_music': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'amazon_music': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
|
||||
// Self-hosted media servers (can have music and audiobooks)
|
||||
'plex': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
|
||||
'jellyfin': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
|
||||
'emby': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks'},
|
||||
|
||||
// Music-only servers
|
||||
'subsonic': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'opensubsonic': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'navidrome': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'filesystem': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
|
||||
// Audiobook-only providers
|
||||
'audiobookshelf': {'audiobooks'},
|
||||
|
||||
// Radio providers
|
||||
'tunein': {'radio'},
|
||||
'radiobrowser': {'radio'},
|
||||
|
||||
// Player/system providers (no library content)
|
||||
'snapcast': <String>{},
|
||||
'fully_kiosk': <String>{},
|
||||
};
|
||||
```
|
||||
|
||||
**Added helper methods:**
|
||||
```dart
|
||||
Set<String> get supportedContentTypes => providerCapabilities[domain] ?? <String>{};
|
||||
bool supportsContentType(String category) => supportedContentTypes.contains(category);
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Radio providers never show in Artists tab (by design, not by count)
|
||||
- Works immediately, even with empty libraries
|
||||
- Disabled providers still show in menu (if they support the content type)
|
||||
- Clean separation of concerns
|
||||
|
||||
---
|
||||
|
||||
### 2. Updated Provider Filtering in MusicAssistantProvider
|
||||
|
||||
**File:** `lib/providers/music_assistant_provider.dart`
|
||||
|
||||
Updated `getRelevantProvidersForCategory()` to filter by capability:
|
||||
|
||||
```dart
|
||||
List<(ProviderInstance, int)> getRelevantProvidersForCategory(String category) {
|
||||
// ... get counts ...
|
||||
|
||||
final result = <(ProviderInstance, int)>[];
|
||||
for (final provider in _availableMusicProviders) {
|
||||
// Only include providers that support this content type
|
||||
if (provider.supportsContentType(category)) {
|
||||
final count = counts[provider.instanceId] ?? 0;
|
||||
result.add((provider, count));
|
||||
}
|
||||
}
|
||||
// ...
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 3. Simplified Library Menu Provider Filter
|
||||
|
||||
**File:** `lib/screens/new_library_screen.dart`
|
||||
|
||||
Simplified the options menu overlay to show all providers that support the current category:
|
||||
|
||||
**Before (clunky):**
|
||||
```dart
|
||||
if (widget.relevantProviders.where((p) {
|
||||
final hasItems = p.$2 > 0;
|
||||
final isDisabledByUser = widget.enabledProviderIds.isNotEmpty &&
|
||||
!widget.enabledProviderIds.contains(p.$1.instanceId);
|
||||
return hasItems || isDisabledByUser;
|
||||
}).length > 1) ...[
|
||||
```
|
||||
|
||||
**After (clean):**
|
||||
```dart
|
||||
// relevantProviders is pre-filtered by capability
|
||||
if (widget.relevantProviders.length > 1) ...[
|
||||
// Show all providers that support this category
|
||||
...widget.relevantProviders.map((providerData) {
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 4. Removed Provider Toggles from Settings Screen
|
||||
|
||||
**File:** `lib/screens/settings_screen.dart`
|
||||
|
||||
Removed the "Music Providers" section entirely since provider filtering is now handled in the library menu:
|
||||
|
||||
- Removed `_providerEnabled` state variable
|
||||
- Removed provider loading code from `_loadSettings()`
|
||||
- Removed the entire Music Providers UI section (~100 lines)
|
||||
|
||||
**Rationale:** Single source of truth - provider toggles now only appear in the library menu where they're contextually relevant.
|
||||
|
||||
---
|
||||
|
||||
### 5. Fixed Audiobooks Library Provider Filtering
|
||||
|
||||
**File:** `lib/screens/new_library_screen.dart`
|
||||
|
||||
The audiobooks tabs were not filtering by provider - they loaded data once and displayed it without responding to provider changes.
|
||||
|
||||
**Fixed `_buildBooksAuthorsTab()`:**
|
||||
```dart
|
||||
final syncService = SyncService.instance;
|
||||
final enabledProviders = maProvider.enabledProviderIds.toSet();
|
||||
|
||||
// Client-side filtering using SyncService source tracking
|
||||
var audiobooks = syncService.hasSourceTracking && enabledProviders.isNotEmpty
|
||||
? syncService.getAudiobooksFilteredByProviders(enabledProviders)
|
||||
: List<Audiobook>.from(_audiobooks);
|
||||
|
||||
// Filter by favorites if enabled
|
||||
if (_showFavoritesOnly) {
|
||||
audiobooks = audiobooks.where((a) => a.favorite == true).toList();
|
||||
}
|
||||
|
||||
// Group filtered audiobooks by author (dynamic, not cached)
|
||||
final groupedByAuthor = <String, List<Audiobook>>{};
|
||||
for (final book in audiobooks) {
|
||||
final authorName = book.authorsString;
|
||||
groupedByAuthor.putIfAbsent(authorName, () => []).add(book);
|
||||
}
|
||||
```
|
||||
|
||||
**Fixed `_buildAllBooksTab()`:**
|
||||
- Same provider filtering pattern
|
||||
- Dynamic sorting after filtering
|
||||
- Updated PageStorageKey to include provider count for proper rebuild
|
||||
|
||||
---
|
||||
|
||||
## Bug Fixes
|
||||
|
||||
### Provider Filter Menu Disappearing
|
||||
|
||||
**Problem:** When providers were deselected, the background sync would clear the cache and only fetch data for enabled providers. Disabled providers then had 0 items, and the menu required `> 1 providers WITH items` to show. The entire Providers section would disappear.
|
||||
|
||||
**Solution:** Changed to capability-based filtering. The menu now shows all providers that support the category, regardless of item count.
|
||||
|
||||
### Audiobooks Not Filtering by Provider
|
||||
|
||||
**Problem:** Audiobooks tabs loaded data once into `_audiobooks` and displayed it without provider filtering. Toggling providers in the menu had no effect.
|
||||
|
||||
**Solution:** Added inline provider filtering during build (same pattern as music tabs).
|
||||
|
||||
---
|
||||
|
||||
## Files Changed
|
||||
|
||||
| File | Changes |
|
||||
|------|---------|
|
||||
| `lib/models/provider_instance.dart` | Added `providerCapabilities` map and helper methods |
|
||||
| `lib/providers/music_assistant_provider.dart` | Updated `getRelevantProvidersForCategory()` to filter by capability |
|
||||
| `lib/screens/new_library_screen.dart` | Simplified menu filter logic, added audiobook provider filtering |
|
||||
| `lib/screens/settings_screen.dart` | Removed Music Providers section |
|
||||
|
||||
---
|
||||
|
||||
## Architecture
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ Provider Capability Map │
|
||||
│ (ProviderInstance.providerCapabilities) │
|
||||
│ │
|
||||
│ spotify → {artists, albums, tracks, playlists, audiobooks} │
|
||||
│ audiobookshelf → {audiobooks} │
|
||||
│ tunein → {radio} │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ getRelevantProvidersForCategory(category) │
|
||||
│ │
|
||||
│ - Filters _availableMusicProviders by capability │
|
||||
│ - Returns only providers that support the category │
|
||||
│ - Includes item counts for display │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ Library Menu (Options) │
|
||||
│ │
|
||||
│ - Shows providers section if > 1 providers support category │
|
||||
│ - All relevant providers shown (can toggle on/off) │
|
||||
│ - Instant UI update via setState() │
|
||||
│ - Background sync after 1.5s debounce │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
│
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────────┐
|
||||
│ Tab Build Methods │
|
||||
│ │
|
||||
│ - Get enabledProviderIds from MusicAssistantProvider │
|
||||
│ - Filter data using SyncService source tracking │
|
||||
│ - Display filtered results │
|
||||
└─────────────────────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Known Limitations
|
||||
|
||||
1. **Series Tab:** The Series tab in audiobooks doesn't filter by provider yet. Series are fetched separately as `AudiobookSeries` objects and don't have the same source tracking as individual audiobooks.
|
||||
|
||||
2. **First Sync Required:** Source tracking only works after at least one sync with providers enabled.
|
||||
|
||||
---
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
- [x] Music tabs filter by provider correctly
|
||||
- [x] Provider menu shows only relevant providers per category
|
||||
- [x] Radio providers don't appear in Artists/Albums tabs
|
||||
- [x] Spotify appears in Audiobooks tab (has audiobooks)
|
||||
- [x] Audiobooks Authors tab filters by provider
|
||||
- [x] Audiobooks All Books tab filters by provider
|
||||
- [ ] Audiobooks Series tab filters by provider (not implemented)
|
||||
- [x] Disabled providers can be re-enabled from menu
|
||||
- [x] Settings screen no longer has provider toggles
|
||||
|
||||
---
|
||||
|
||||
## Related Documentation
|
||||
|
||||
- `docs/PER_PROVIDER_SYNC_IMPLEMENTATION.md` - Original per-provider sync implementation
|
||||
@@ -1,221 +0,0 @@
|
||||
# Feature: Replace "Play On" Popups with Player Selector
|
||||
|
||||
## Overview
|
||||
|
||||
Replace the `PlayerPickerSheet` popup modal with the existing Player Selector (reveal overlay) when users tap "Play on" buttons throughout the app. This provides a consistent, richer player selection experience.
|
||||
|
||||
## Current State
|
||||
|
||||
### PlayerPickerSheet Popup
|
||||
Used in 7+ places:
|
||||
- `album_details_screen.dart` - Play Album, Play From Here, Play Radio
|
||||
- `playlist_details_screen.dart` - Play Playlist, Play Radio
|
||||
- `search_screen.dart` - Play album/playlist/audiobook/radio from search
|
||||
- `podcast_detail_screen.dart` - Play Episode
|
||||
- `audiobook_detail_screen.dart` - Play Audiobook
|
||||
- `queue_screen.dart` - Transfer Queue (special case - keep popup)
|
||||
|
||||
### Player Selector (Reveal Overlay)
|
||||
- Location: `lib/widgets/player/player_reveal_overlay.dart`
|
||||
- Shows vertical list of all players with artwork, current track, sync status
|
||||
- Has hints above player list: "Long-press to sync" & "Swipe to adjust volume"
|
||||
- Triggered by pull-down gesture or device button tap
|
||||
|
||||
## Proposed Changes
|
||||
|
||||
### 1. Modify PlayerRevealOverlay
|
||||
|
||||
**File:** `lib/widgets/player/player_reveal_overlay.dart`
|
||||
|
||||
Add new optional parameters:
|
||||
|
||||
```dart
|
||||
class PlayerRevealOverlay extends StatefulWidget {
|
||||
final VoidCallback onDismiss;
|
||||
final double miniPlayerBottom;
|
||||
final double miniPlayerHeight;
|
||||
final bool showOnboardingHints;
|
||||
|
||||
// NEW: Callback when player is selected for a pending action
|
||||
final void Function(Player player)? onPlayerSelected;
|
||||
|
||||
// NEW: Context hint to display instead of default hints
|
||||
// e.g., "Select player to play album"
|
||||
final String? contextHint;
|
||||
|
||||
// NEW: Icon for context hint (default: speaker icon)
|
||||
final IconData? contextHintIcon;
|
||||
```
|
||||
|
||||
### 2. Modify Hint Display
|
||||
|
||||
**File:** `lib/widgets/player/player_reveal_overlay.dart` (around line 386-394)
|
||||
|
||||
```dart
|
||||
// Current:
|
||||
: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
buildHintRow(Icons.lightbulb_outline, S.of(context)!.holdToSync),
|
||||
const SizedBox(height: 4),
|
||||
buildHintRow(Icons.lightbulb_outline, S.of(context)!.swipeToAdjustVolume),
|
||||
],
|
||||
),
|
||||
|
||||
// New:
|
||||
: widget.contextHint != null
|
||||
? buildHintRow(
|
||||
widget.contextHintIcon ?? Icons.play_circle_outline,
|
||||
widget.contextHint!,
|
||||
)
|
||||
: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
buildHintRow(Icons.lightbulb_outline, S.of(context)!.holdToSync),
|
||||
const SizedBox(height: 4),
|
||||
buildHintRow(Icons.lightbulb_outline, S.of(context)!.swipeToAdjustVolume),
|
||||
],
|
||||
),
|
||||
```
|
||||
|
||||
### 3. Modify Player Card onTap
|
||||
|
||||
**File:** `lib/widgets/player/player_reveal_overlay.dart` (around line 437-441 and 490-494)
|
||||
|
||||
```dart
|
||||
// Current:
|
||||
onTap: () {
|
||||
HapticFeedback.mediumImpact();
|
||||
maProvider.selectPlayer(data.player);
|
||||
dismiss();
|
||||
},
|
||||
|
||||
// New:
|
||||
onTap: () {
|
||||
HapticFeedback.mediumImpact();
|
||||
if (widget.onPlayerSelected != null) {
|
||||
// Execute the pending action with selected player
|
||||
widget.onPlayerSelected!(data.player);
|
||||
} else {
|
||||
// Default behavior: just select the player
|
||||
maProvider.selectPlayer(data.player);
|
||||
}
|
||||
dismiss();
|
||||
},
|
||||
```
|
||||
|
||||
### 4. Add Helper Method to GlobalPlayerOverlay
|
||||
|
||||
**File:** `lib/widgets/global_player_overlay.dart`
|
||||
|
||||
Add a static method to show player selector with pending action:
|
||||
|
||||
```dart
|
||||
/// Show player selector for a "Play on" action
|
||||
///
|
||||
/// [contextHint] - Message shown instead of default hints
|
||||
/// [onPlayerSelected] - Called when user taps a player
|
||||
///
|
||||
/// Example:
|
||||
/// ```dart
|
||||
/// GlobalPlayerOverlay.showPlayerSelectorForAction(
|
||||
/// contextHint: "Select player to play album",
|
||||
/// onPlayerSelected: (player) {
|
||||
/// provider.playAlbum(albumId, playerId: player.playerId);
|
||||
/// },
|
||||
/// );
|
||||
/// ```
|
||||
static void showPlayerSelectorForAction({
|
||||
required String contextHint,
|
||||
required void Function(Player player) onPlayerSelected,
|
||||
IconData? hintIcon,
|
||||
}) {
|
||||
// Implementation: trigger the player reveal overlay with these parameters
|
||||
// May need to store pending action in state and pass to overlay
|
||||
}
|
||||
```
|
||||
|
||||
### 5. Update Calling Sites
|
||||
|
||||
Replace `showPlayerPickerSheet()` calls with new method:
|
||||
|
||||
**Example - album_details_screen.dart:**
|
||||
|
||||
```dart
|
||||
// Current (around line 1305-1316):
|
||||
showPlayerPickerSheet(
|
||||
context: context,
|
||||
title: 'Play Album',
|
||||
onPlayerSelected: (player) async {
|
||||
GlobalPlayerOverlay.hidePlayer();
|
||||
await maProvider.playAlbum(albumId, playerId: player.playerId);
|
||||
GlobalPlayerOverlay.showPlayer();
|
||||
},
|
||||
);
|
||||
|
||||
// New:
|
||||
GlobalPlayerOverlay.showPlayerSelectorForAction(
|
||||
contextHint: S.of(context)!.selectPlayerToPlayAlbum, // Add localization
|
||||
onPlayerSelected: (player) async {
|
||||
await maProvider.playAlbum(albumId, playerId: player.playerId);
|
||||
},
|
||||
);
|
||||
```
|
||||
|
||||
### 6. Add Localizations
|
||||
|
||||
**File:** `lib/l10n/app_en.arb` (and other language files)
|
||||
|
||||
```json
|
||||
"selectPlayerToPlay": "Select player to play",
|
||||
"selectPlayerToPlayAlbum": "Select player to play album",
|
||||
"selectPlayerToPlayPlaylist": "Select player to play playlist",
|
||||
"selectPlayerToPlayRadio": "Select player to start radio",
|
||||
"selectPlayerToPlayEpisode": "Select player to play episode",
|
||||
"selectPlayerToPlayAudiobook": "Select player to play audiobook"
|
||||
```
|
||||
|
||||
## Files to Modify
|
||||
|
||||
1. `lib/widgets/player/player_reveal_overlay.dart` - Add parameters, modify hints & onTap
|
||||
2. `lib/widgets/global_player_overlay.dart` - Add helper method
|
||||
3. `lib/screens/album_details_screen.dart` - Replace 3 popup calls
|
||||
4. `lib/screens/playlist_details_screen.dart` - Replace 2 popup calls
|
||||
5. `lib/screens/search_screen.dart` - Replace ~5 popup calls
|
||||
6. `lib/screens/podcast_detail_screen.dart` - Replace 1 popup call
|
||||
7. `lib/screens/audiobook_detail_screen.dart` - Replace 1 popup call
|
||||
8. `lib/l10n/app_en.arb` - Add new strings
|
||||
9. `lib/l10n/app_de.arb`, `app_fr.arb`, `app_es.arb` - Translations
|
||||
|
||||
## Exception: Queue Transfer
|
||||
|
||||
**Keep the popup for `queue_screen.dart`** because:
|
||||
- Needs to filter out current player (can't transfer to self)
|
||||
- Needs to filter out certain player types
|
||||
- Different UX intent (transfer vs play)
|
||||
|
||||
## Implementation Order
|
||||
|
||||
1. Modify `PlayerRevealOverlay` to accept new parameters
|
||||
2. Add helper method to `GlobalPlayerOverlay`
|
||||
3. Test with one screen (album_details_screen.dart)
|
||||
4. Add localizations
|
||||
5. Migrate remaining screens
|
||||
6. Clean up unused code from PlayerPickerSheet if no longer needed elsewhere
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
- [ ] Album details: Play Album button
|
||||
- [ ] Album details: Play From Here (track context menu)
|
||||
- [ ] Album details: Play Radio (track context menu)
|
||||
- [ ] Playlist details: Play Playlist button
|
||||
- [ ] Playlist details: Play Radio (track context menu)
|
||||
- [ ] Search: Play album from results
|
||||
- [ ] Search: Play playlist from results
|
||||
- [ ] Search: Play radio from results
|
||||
- [ ] Podcast detail: Play episode
|
||||
- [ ] Audiobook detail: Play audiobook
|
||||
- [ ] Queue transfer still works with popup
|
||||
- [ ] Long-press to sync still works in player selector
|
||||
- [ ] Dismiss by tapping backdrop works
|
||||
- [ ] Dismiss by swiping down works
|
||||
@@ -1,328 +0,0 @@
|
||||
# Remote Connection - Future Implementation Guide
|
||||
|
||||
## Overview
|
||||
|
||||
This document provides guidance for implementing remote connection to Music Assistant servers via WebRTC. Remote connection allows the Ensemble app to connect to MA servers outside the local network using Nabu Casa's WebRTC signaling infrastructure.
|
||||
|
||||
## Current Status: On Hold
|
||||
|
||||
Remote connection was partially implemented but put on hold due to a critical bug where the `ma-api` data channel becomes one-way after 1-3 minutes. See `MA_WEBRTC_BUG_REPORT.md` for details.
|
||||
|
||||
---
|
||||
|
||||
## Architecture
|
||||
|
||||
### How It Works
|
||||
|
||||
```
|
||||
┌─────────────────┐ WebSocket ┌──────────────────────────┐
|
||||
│ Ensemble App │◄──────────────────►│ MA Server (local WS) │
|
||||
└─────────────────┘ └──────────────────────────┘
|
||||
│ │
|
||||
│ (when local unavailable) │
|
||||
▼ ▼
|
||||
┌─────────────────┐ ┌──────────────────────────┐
|
||||
│ SignalingClient│◄──── WebSocket ───►│ signaling.music-assistant│
|
||||
└─────────────────┘ │ .io/ws │
|
||||
│ └──────────────────────────┘
|
||||
│ ICE candidates, SDP │
|
||||
▼ ▼
|
||||
┌─────────────────┐ ┌──────────────────────────┐
|
||||
│ WebRTC Peer │◄═══ Data Channel ══►│ MA Server WebRTC │
|
||||
│ Connection │ (ma-api) │ Endpoint │
|
||||
└─────────────────┘ └──────────────────────────┘
|
||||
```
|
||||
|
||||
### Components
|
||||
|
||||
1. **SignalingClient** - WebSocket connection to `wss://signaling.music-assistant.io/ws`
|
||||
2. **WebRTCConnection** - Manages RTCPeerConnection and data channels
|
||||
3. **RemoteBridge** - Bridges local WebSocket API to remote WebRTC connection
|
||||
|
||||
### Data Channels
|
||||
|
||||
| Channel | Purpose | Traffic Pattern |
|
||||
|---------|---------|-----------------|
|
||||
| `ma-api` | JSON API requests/responses | High volume, large payloads |
|
||||
| `sendspin` | Audio streaming + control | Low JSON, binary audio data |
|
||||
|
||||
---
|
||||
|
||||
## Key Files to Create/Modify
|
||||
|
||||
### New Files
|
||||
|
||||
| File | Purpose |
|
||||
|------|---------|
|
||||
| `lib/services/remote/signaling_client.dart` | WebSocket client for signaling server |
|
||||
| `lib/services/remote/webrtc_connection.dart` | WebRTC peer connection management |
|
||||
| `lib/services/remote/remote_bridge.dart` | Bridges API calls to WebRTC |
|
||||
|
||||
### Files to Modify
|
||||
|
||||
| File | Changes |
|
||||
|------|---------|
|
||||
| `lib/services/music_assistant_api.dart` | Add remote connection fallback |
|
||||
| `lib/providers/music_assistant_provider.dart` | Expose remote connection state |
|
||||
| `pubspec.yaml` | Add `flutter_webrtc` dependency |
|
||||
|
||||
---
|
||||
|
||||
## Implementation Steps
|
||||
|
||||
### Step 1: Add Dependencies
|
||||
|
||||
```yaml
|
||||
# pubspec.yaml
|
||||
dependencies:
|
||||
flutter_webrtc: ^0.12.0 # or latest
|
||||
```
|
||||
|
||||
### Step 2: Implement SignalingClient
|
||||
|
||||
The signaling client connects to Music Assistant's signaling server and exchanges WebRTC offers/answers.
|
||||
|
||||
```dart
|
||||
class SignalingClient {
|
||||
WebSocket? _socket;
|
||||
|
||||
Future<void> connect(String serverId) async {
|
||||
_socket = await WebSocket.connect('wss://signaling.music-assistant.io/ws');
|
||||
|
||||
// Send connect request
|
||||
_send({
|
||||
'type': 'connect-request',
|
||||
'server_id': serverId,
|
||||
});
|
||||
|
||||
// Listen for messages
|
||||
_socket!.listen(_handleMessage);
|
||||
}
|
||||
|
||||
void _handleMessage(dynamic data) {
|
||||
final message = jsonDecode(data);
|
||||
switch (message['type']) {
|
||||
case 'answer':
|
||||
onAnswer?.call(message['sdp']);
|
||||
break;
|
||||
case 'ice-candidate':
|
||||
onIceCandidate?.call(message['candidate']);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Step 3: Implement WebRTCConnection
|
||||
|
||||
```dart
|
||||
class WebRTCConnection {
|
||||
RTCPeerConnection? _peerConnection;
|
||||
RTCDataChannel? _apiChannel;
|
||||
RTCDataChannel? _sendspinChannel;
|
||||
|
||||
Future<void> connect(SignalingClient signaling) async {
|
||||
// Create peer connection with STUN/TURN servers
|
||||
_peerConnection = await createPeerConnection({
|
||||
'iceServers': [
|
||||
{'urls': 'stun:stun.l.google.com:19302'},
|
||||
// TURN servers provided by signaling
|
||||
],
|
||||
});
|
||||
|
||||
// Create data channels BEFORE creating offer
|
||||
_apiChannel = await _peerConnection!.createDataChannel(
|
||||
'ma-api',
|
||||
RTCDataChannelInit()..ordered = true,
|
||||
);
|
||||
|
||||
_sendspinChannel = await _peerConnection!.createDataChannel(
|
||||
'sendspin',
|
||||
RTCDataChannelInit()..ordered = true,
|
||||
);
|
||||
|
||||
// Create and send offer
|
||||
final offer = await _peerConnection!.createOffer();
|
||||
await _peerConnection!.setLocalDescription(offer);
|
||||
signaling.sendOffer(offer.sdp!);
|
||||
|
||||
// Handle answer from server
|
||||
signaling.onAnswer = (sdp) async {
|
||||
await _peerConnection!.setRemoteDescription(
|
||||
RTCSessionDescription(sdp, 'answer'),
|
||||
);
|
||||
};
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Step 4: Implement RemoteBridge
|
||||
|
||||
The bridge translates between the local WebSocket API format and WebRTC data channel messages.
|
||||
|
||||
```dart
|
||||
class RemoteBridge {
|
||||
final WebRTCConnection _webrtc;
|
||||
final StreamController<String> _messageController;
|
||||
|
||||
void sendCommand(String json) {
|
||||
_webrtc.sendToApiChannel(json);
|
||||
}
|
||||
|
||||
Stream<String> get messages => _messageController.stream;
|
||||
}
|
||||
```
|
||||
|
||||
### Step 5: Integrate with MusicAssistantAPI
|
||||
|
||||
```dart
|
||||
class MusicAssistantAPI {
|
||||
WebSocket? _localSocket;
|
||||
RemoteBridge? _remoteBridge;
|
||||
|
||||
Future<void> connect(String host, {String? serverId}) async {
|
||||
try {
|
||||
// Try local connection first
|
||||
_localSocket = await WebSocket.connect('ws://$host/ws');
|
||||
} catch (e) {
|
||||
// Fall back to remote if serverId provided
|
||||
if (serverId != null) {
|
||||
_remoteBridge = RemoteBridge();
|
||||
await _remoteBridge!.connect(serverId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Critical Implementation Details
|
||||
|
||||
### 1. Channel Creation Order
|
||||
|
||||
The client MUST create data channels BEFORE sending the WebRTC offer. The server expects the client to create:
|
||||
- `ma-api` - for API traffic
|
||||
- `sendspin` - for audio streaming (optional)
|
||||
|
||||
### 2. Health Monitoring
|
||||
|
||||
Implement aggressive health checks because data channels can silently die:
|
||||
|
||||
```dart
|
||||
// Track message counts
|
||||
int _sentCount = 0;
|
||||
int _recvCount = 0;
|
||||
DateTime _lastRecvTime = DateTime.now();
|
||||
|
||||
// Health check every 10 seconds
|
||||
void _healthCheck() {
|
||||
final timeSinceRecv = DateTime.now().difference(_lastRecvTime);
|
||||
if (timeSinceRecv.inSeconds > 30) {
|
||||
// Channel is dead, trigger reconnection
|
||||
_reconnect();
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 3. Keepalive Messages
|
||||
|
||||
Send periodic keepalive on the data channel itself (not just signaling):
|
||||
|
||||
```dart
|
||||
void _sendKeepalive() {
|
||||
_apiChannel?.send(RTCDataChannelMessage(
|
||||
jsonEncode({'type': 'ping', 'timestamp': DateTime.now().toIso8601String()}),
|
||||
));
|
||||
}
|
||||
```
|
||||
|
||||
### 4. Flow Control
|
||||
|
||||
Monitor buffer to prevent overflow:
|
||||
|
||||
```dart
|
||||
void sendMessage(String json) {
|
||||
if (_apiChannel!.bufferedAmount > 1048576) { // 1MB
|
||||
// Queue message, don't send
|
||||
_sendQueue.add(json);
|
||||
return;
|
||||
}
|
||||
_apiChannel!.send(RTCDataChannelMessage(json));
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Known Issues & Pitfalls
|
||||
|
||||
### 1. One-Way Channel Death (CRITICAL - UNSOLVED)
|
||||
|
||||
The `ma-api` channel stops receiving after 1-3 minutes while `sendspin` continues working. This occurs in both flutter_webrtc and WebView implementations.
|
||||
|
||||
**Workaround options:**
|
||||
- Detect via health check and force reconnection
|
||||
- Try single-channel multiplexing (see `PLAN_B_SINGLE_CHANNEL.md`)
|
||||
- Report to MA team and wait for server-side fix
|
||||
|
||||
### 2. flutter_webrtc Quirks
|
||||
|
||||
- `RTCDataChannel.state` may show "open" when actually dead
|
||||
- `bufferedAmount` accuracy varies by platform
|
||||
- `onBufferedAmountLow` callback support inconsistent
|
||||
|
||||
### 3. Android Background Throttling
|
||||
|
||||
Android aggressively throttles background WebRTC. Consider:
|
||||
- Foreground service for sustained connections
|
||||
- Reconnection on app resume
|
||||
|
||||
### 4. ICE/TURN Issues
|
||||
|
||||
- aiortc (server-side) has known TURN + DataChannel bugs
|
||||
- May need ICE restart on network changes
|
||||
|
||||
---
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
- [ ] Connect via remote when local unavailable
|
||||
- [ ] Verify API commands work (players/all, library queries)
|
||||
- [ ] Test sustained connection (30+ minutes)
|
||||
- [ ] Test app backgrounding and resume
|
||||
- [ ] Test network transitions (WiFi ↔ cellular)
|
||||
- [ ] Verify reconnection after channel death
|
||||
- [ ] Test sendspin audio streaming (if implemented)
|
||||
|
||||
---
|
||||
|
||||
## Useful Resources
|
||||
|
||||
- [Music Assistant Remote Access Docs](https://music-assistant.io/docs/remote-access/)
|
||||
- [flutter_webrtc Package](https://pub.dev/packages/flutter_webrtc)
|
||||
- [WebRTC Data Channel MDN](https://developer.mozilla.org/en-US/docs/Web/API/RTCDataChannel)
|
||||
- Signaling server: `wss://signaling.music-assistant.io/ws`
|
||||
|
||||
---
|
||||
|
||||
## Files in This Directory
|
||||
|
||||
| File | Description |
|
||||
|------|-------------|
|
||||
| `FUTURE_IMPLEMENTATION_GUIDE.md` | This file - implementation guide |
|
||||
| `MA_WEBRTC_BUG_REPORT.md` | Bug report for MA team |
|
||||
| `WEBRTC_DISCONNECT_FIXES.md` | All fixes attempted |
|
||||
| `WEBRTC_PROGRESS.md` | Progress log |
|
||||
| `PLAN_B_SINGLE_CHANNEL.md` | Alternative single-channel approach |
|
||||
| `webrtc-failure-logs.txt` | Raw failure logs |
|
||||
| `console-export-*.log` | Browser console exports |
|
||||
|
||||
---
|
||||
|
||||
## Quick Start for Future Implementation
|
||||
|
||||
1. Read this guide fully
|
||||
2. Review `WEBRTC_DISCONNECT_FIXES.md` for all attempted fixes
|
||||
3. Check if MA team has fixed server-side issues
|
||||
4. Start with basic implementation, add health monitoring early
|
||||
5. Test extensively before shipping - the failure mode is subtle
|
||||
@@ -1,127 +0,0 @@
|
||||
# WebRTC Data Channel Failure on Android - Bug Report
|
||||
|
||||
## Summary
|
||||
|
||||
When connecting to Music Assistant via WebRTC remote access (Nabu Casa), the `ma-api` data channel becomes **one-way** (can send, cannot receive) after 1-3 minutes of use, while the `sendspin` channel continues working normally.
|
||||
|
||||
## Environment
|
||||
|
||||
- **MA Server**: 2.8.0b7 (Home Assistant add-on)
|
||||
- **Client**: Android app (Flutter) connecting via Nabu Casa remote access
|
||||
- **Remote Access**: WebRTC via `wss://signaling.music-assistant.io/ws`
|
||||
|
||||
## Reproduction Steps
|
||||
|
||||
1. Connect to MA server via WebRTC remote access (not local network)
|
||||
2. Use the app normally - browse library, view players
|
||||
3. After 1-3 minutes, the connection degrades
|
||||
4. Commands time out, but signaling ping/pong continues working
|
||||
|
||||
## Observed Behavior
|
||||
|
||||
### Timeline from logs:
|
||||
|
||||
```
|
||||
07:14:20 - Working normally
|
||||
Health: API sent:51 recv:54 (balanced)
|
||||
|
||||
07:15:57 - Receive stops
|
||||
Health: API sent:97 recv:97, lastRecv:12s ago
|
||||
|
||||
07:16:02 - Timeouts begin
|
||||
"TimeoutException: Command timeout: players/all"
|
||||
|
||||
07:16:17 - Sendspin still works!
|
||||
"Sendspin: Received server/time response"
|
||||
Health: API sent:114 recv:97, lastRecv:27s ago
|
||||
|
||||
07:17:30 - Forced reconnect
|
||||
Health: API sent:137 recv:97, lastRecv:42s ago
|
||||
"Health check detected stale connection"
|
||||
```
|
||||
|
||||
### Key Observation
|
||||
|
||||
| Channel | Traffic Pattern | Status |
|
||||
|---------|-----------------|--------|
|
||||
| `ma-api` | High (10+ msg/s, large payloads) | **FAILS** - stops receiving |
|
||||
| `sendspin` | Low (~1 msg/5s, small payloads) | **SURVIVES** - continues working |
|
||||
| Signaling | Ping/pong every 15s | **SURVIVES** - continues working |
|
||||
|
||||
The WebRTC peer connection remains in "connected" state. ICE connection shows "completed". Only the ma-api data channel stops receiving.
|
||||
|
||||
## Testing Performed
|
||||
|
||||
### Test 1: flutter_webrtc (Native WebRTC)
|
||||
- **Result**: ma-api channel dies after 1-3 minutes
|
||||
- **Sendspin**: Continues working
|
||||
|
||||
### Test 2: WebView-based WebRTC (Browser engine)
|
||||
- **Hypothesis**: Use Android WebView's browser-native WebRTC, since MA Web UI works
|
||||
- **Implementation**: Hidden InAppWebView running JavaScript WebRTC engine
|
||||
- **Result**: **Same failure mode** - ma-api dies, sendspin survives
|
||||
- **Conclusion**: Not a flutter_webrtc bug
|
||||
|
||||
### Test 3: Various Data Channel Settings
|
||||
- Tried `ordered: false` with `maxRetransmits: 3`
|
||||
- Tried letting server create channels (failed - server expects client to create)
|
||||
- No improvement
|
||||
|
||||
## Analysis
|
||||
|
||||
The identical failure in both native and WebView WebRTC implementations suggests the issue is:
|
||||
|
||||
1. **Server-side** - Different handling of ma-api vs sendspin channels
|
||||
2. **TURN relay** - High-traffic channel may hit limits
|
||||
3. **Not client-specific** - Both implementations fail identically
|
||||
|
||||
### Questions for MA Team
|
||||
|
||||
1. Are the two data channels (`ma-api`, `sendspin`) created with different settings?
|
||||
2. Is there any server-side buffering or rate limiting that could affect high-traffic channels?
|
||||
3. Does the MA Web UI use different data channel configurations?
|
||||
4. Are there known issues with the TURN relay for sustained high-traffic channels?
|
||||
|
||||
## Comparison: MA Web UI vs Android App
|
||||
|
||||
| Aspect | MA Web UI | Android App |
|
||||
|--------|-----------|-------------|
|
||||
| Platform | Browser tab (visible, active) | Background-capable app |
|
||||
| WebRTC | Browser native | flutter_webrtc / WebView |
|
||||
| Result | Works | Fails after 1-3 min |
|
||||
|
||||
The MA Web UI runs in a **visible, active browser tab**. Android may throttle background apps differently, but this doesn't explain why sendspin survives while ma-api dies on the same connection.
|
||||
|
||||
## Logs
|
||||
|
||||
### Health Check Pattern (shows channel death)
|
||||
```
|
||||
07:14:25 API sent:51 recv:54, lastRecv:2s ago <- Working
|
||||
07:15:35 API sent:87 recv:91, lastRecv:2s ago <- Working
|
||||
07:16:05 API sent:108 recv:97, lastRecv:17s ago <- DYING (gap growing)
|
||||
07:16:15 API sent:114 recv:97, lastRecv:27s ago <- DEAD
|
||||
07:16:45 API sent:130 recv:97, lastRecv:27s ago <- Still sending, no receive
|
||||
07:17:30 API sent:137 recv:97, lastRecv:42s ago <- Forced reconnect
|
||||
```
|
||||
|
||||
### Sendspin Still Working During Failure
|
||||
```
|
||||
07:16:17 Sendspin: Received server/time response <- Still alive!
|
||||
07:16:47 Sendspin: Received server/time response <- Still alive!
|
||||
```
|
||||
|
||||
## Requested Information
|
||||
|
||||
1. Data channel creation code/settings for both channels
|
||||
2. Any server-side differences in channel handling
|
||||
3. TURN server configuration details
|
||||
4. Whether this has been reported by other Android/mobile clients
|
||||
|
||||
## Workaround
|
||||
|
||||
Currently using local WebSocket connection when on same network. Remote access via WebRTC is unusable for sustained use.
|
||||
|
||||
---
|
||||
|
||||
**Reporter**: Ensemble Android App Developer
|
||||
**Date**: 2026-01-24
|
||||
@@ -1,149 +0,0 @@
|
||||
# Plan B: Single Data Channel Multiplexing
|
||||
|
||||
## Why This Might Be Needed
|
||||
|
||||
If upgrading flutter_webrtc doesn't fix the one-way channel failure, the root cause is likely a bug in how flutter_webrtc (or underlying libwebrtc) handles **multiple data channels**.
|
||||
|
||||
Evidence:
|
||||
- MA Web UI works fine with local playback (same server, browser WebRTC)
|
||||
- Our app uses flutter_webrtc which has known issues:
|
||||
- [Issue #1428](https://github.com/flutter-webrtc/flutter-webrtc/issues/1428): Threading issues causing data loss
|
||||
- [Issue #974](https://github.com/flutter-webrtc/flutter-webrtc/issues/974): EventChannel intermittently fails
|
||||
- Pattern matches: second channel survives while first dies
|
||||
|
||||
## Current Architecture
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────┐
|
||||
│ WebRTC Peer Connection │
|
||||
├────────────────────┬────────────────────────────┤
|
||||
│ ma-api channel │ sendspin channel │
|
||||
│ (JSON API) │ (JSON + binary audio) │
|
||||
│ SCTP stream 0 │ SCTP stream 1 │
|
||||
└────────────────────┴────────────────────────────┘
|
||||
```
|
||||
|
||||
## Proposed Architecture
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────┐
|
||||
│ WebRTC Peer Connection │
|
||||
├─────────────────────────────────────────────────┤
|
||||
│ unified channel │
|
||||
│ (multiplexed: API + Sendspin text + binary) │
|
||||
│ SCTP stream 0 │
|
||||
└─────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
## Multiplexing Protocol
|
||||
|
||||
### Message Framing
|
||||
|
||||
Each message has a 1-byte type prefix:
|
||||
|
||||
| Prefix | Type | Content |
|
||||
|--------|------|---------|
|
||||
| 0x00 | API | JSON text (MA API request/response) |
|
||||
| 0x01 | Sendspin Text | JSON text (Sendspin control messages) |
|
||||
| 0x02 | Sendspin Binary | Raw bytes (PCM audio data) |
|
||||
|
||||
### Implementation
|
||||
|
||||
#### Sending (Client → Server)
|
||||
|
||||
```dart
|
||||
void sendApiMessage(String json) {
|
||||
final prefix = Uint8List.fromList([0x00]);
|
||||
final payload = utf8.encode(json);
|
||||
final message = Uint8List(1 + payload.length);
|
||||
message[0] = 0x00;
|
||||
message.setRange(1, message.length, payload);
|
||||
_dataChannel.send(RTCDataChannelMessage.fromBinary(message));
|
||||
}
|
||||
|
||||
void sendSendspinText(String json) {
|
||||
final prefix = Uint8List.fromList([0x01]);
|
||||
final payload = utf8.encode(json);
|
||||
final message = Uint8List(1 + payload.length);
|
||||
message[0] = 0x01;
|
||||
message.setRange(1, message.length, payload);
|
||||
_dataChannel.send(RTCDataChannelMessage.fromBinary(message));
|
||||
}
|
||||
|
||||
void sendSendspinBinary(Uint8List audio) {
|
||||
final message = Uint8List(1 + audio.length);
|
||||
message[0] = 0x02;
|
||||
message.setRange(1, message.length, audio);
|
||||
_dataChannel.send(RTCDataChannelMessage.fromBinary(message));
|
||||
}
|
||||
```
|
||||
|
||||
#### Receiving (Server → Client)
|
||||
|
||||
```dart
|
||||
void _onMessage(RTCDataChannelMessage message) {
|
||||
final data = message.binary;
|
||||
if (data == null || data.isEmpty) return;
|
||||
|
||||
final type = data[0];
|
||||
final payload = data.sublist(1);
|
||||
|
||||
switch (type) {
|
||||
case 0x00: // API
|
||||
final json = utf8.decode(payload);
|
||||
_handleApiMessage(json);
|
||||
break;
|
||||
case 0x01: // Sendspin text
|
||||
final json = utf8.decode(payload);
|
||||
_handleSendspinText(json);
|
||||
break;
|
||||
case 0x02: // Sendspin binary
|
||||
_handleSendspinBinary(payload);
|
||||
break;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## Server-Side Changes Required
|
||||
|
||||
The Music Assistant server would need to:
|
||||
1. Accept a single "unified" data channel instead of separate ma-api and sendspin channels
|
||||
2. Multiplex responses using the same framing protocol
|
||||
3. This requires changes to the MA remote connection code
|
||||
|
||||
**Alternative**: Keep server unchanged, do multiplexing in a proxy layer on the client.
|
||||
|
||||
## Client-Only Approach (No Server Changes)
|
||||
|
||||
If we can't change the server, we could:
|
||||
|
||||
1. Still create two channels to the server (ma-api + sendspin)
|
||||
2. But internally route them through a single "virtual" channel for flutter_webrtc
|
||||
3. This is more complex and may not avoid the underlying bug
|
||||
|
||||
## Files to Modify
|
||||
|
||||
| File | Changes |
|
||||
|------|---------|
|
||||
| `webrtc_connection.dart` | Single channel creation, multiplexing logic |
|
||||
| `remote_bridge.dart` | Route messages based on type prefix |
|
||||
|
||||
## Risks
|
||||
|
||||
1. **Server compatibility**: Requires MA server changes or complex client proxy
|
||||
2. **Performance**: Extra byte per message, decode overhead
|
||||
3. **Binary handling**: Must handle all messages as binary (not text)
|
||||
|
||||
## Testing Plan
|
||||
|
||||
1. Implement client-side changes
|
||||
2. Test with modified server (if available) or mock
|
||||
3. Verify both API and Sendspin traffic flows correctly
|
||||
4. Long-duration stability test
|
||||
|
||||
## Decision Point
|
||||
|
||||
Try this approach if:
|
||||
- flutter_webrtc 0.14.x doesn't fix the issue
|
||||
- The one-way failure pattern continues
|
||||
- We've confirmed the issue is multi-channel specific
|
||||
@@ -1,406 +0,0 @@
|
||||
# WebRTC Data Channel Disconnect Fixes
|
||||
|
||||
## Document Purpose
|
||||
Track all fixes attempted for the WebRTC data channel disconnection issues in Ensemble's remote connection feature. This document should be referenced when debugging future disconnection problems.
|
||||
|
||||
---
|
||||
|
||||
## Problem Summary
|
||||
|
||||
The WebRTC data channel between the Ensemble mobile app and Music Assistant server can fail in several ways:
|
||||
|
||||
1. **One-way failure**: Data channel appears "open" but only sends work, receives stop
|
||||
2. **Silent disconnect**: No error events fire, channel just stops working
|
||||
3. **ICE failure**: ICE connection fails, properly detected but causes disconnect
|
||||
4. **Signaling disconnect**: Signaling WebSocket closes, causing ICE/WebRTC to fail
|
||||
|
||||
---
|
||||
|
||||
## Key Files
|
||||
|
||||
| File | Purpose |
|
||||
|------|---------|
|
||||
| `lib/services/remote/webrtc_connection.dart` | WebRTC peer connection, data channel management |
|
||||
| `lib/services/remote/remote_bridge.dart` | WebSocket bridge, health monitoring, reconnection logic |
|
||||
| `lib/services/remote/signaling_client.dart` | Signaling server WebSocket connection |
|
||||
|
||||
---
|
||||
|
||||
## Implemented Fixes (Chronological)
|
||||
|
||||
### Fix 1: Data Channel Keepalive (Original)
|
||||
**Problem**: Data channel could silently die without any error events firing.
|
||||
|
||||
**Solution**: Added periodic keepalive ping/pong on the data channel itself.
|
||||
|
||||
**Code** (`webrtc_connection.dart`):
|
||||
- `_keepaliveTimer`: Runs every 10 seconds
|
||||
- `_checkKeepalive()`: Checks time since last data received
|
||||
- `_sendKeepalivePing()`: Sends JSON ping message
|
||||
- `_recordDataReceived()`: Called on every message receipt
|
||||
|
||||
**Constants**:
|
||||
```dart
|
||||
static const _keepaliveInterval = Duration(seconds: 10);
|
||||
static const _keepaliveTimeout = Duration(seconds: 20); // Reduced from 30
|
||||
static const _maxKeepaliveMisses = 2; // Reduced from 3
|
||||
```
|
||||
|
||||
### Fix 2: ICE Recovery
|
||||
**Problem**: ICE connection could temporarily disconnect and might auto-recover.
|
||||
|
||||
**Solution**: Added ICE recovery timer before declaring failure.
|
||||
|
||||
**Code** (`webrtc_connection.dart`):
|
||||
- `_startIceRecovery()`: Starts 5-second timer when ICE disconnects
|
||||
- `_cancelIceRecovery()`: Cancels if ICE recovers on its own
|
||||
- `_attemptIceRestart()`: Calls `restartIce()` if recovery timer expires
|
||||
|
||||
### Fix 3: Flow Control (Buffer Overflow Prevention)
|
||||
**Problem**: Fire-and-forget sends could overflow the 16MB SCTP buffer, causing silent channel death.
|
||||
|
||||
**Solution**: Added send-side flow control with buffering.
|
||||
|
||||
**Code** (`webrtc_connection.dart`):
|
||||
```dart
|
||||
static const _maxBufferedAmount = 1048576; // 1MB threshold
|
||||
static const _bufferLowThreshold = 65536; // 64KB resume threshold
|
||||
bool _sendPaused = false;
|
||||
final _sendQueue = <String>[];
|
||||
```
|
||||
|
||||
**Modified `sendRaw()`**:
|
||||
- Checks `bufferedAmount` before sending
|
||||
- Queues messages if buffer > 1MB
|
||||
- `onBufferedAmountLow` callback drains queue
|
||||
|
||||
### Fix 4: Health Check Stale Detection
|
||||
**Problem**: Health check could see "30s since last data" but not trigger reconnection.
|
||||
|
||||
**Solution**: Reduced stale detection threshold from 45s to 30s.
|
||||
|
||||
**Code** (`remote_bridge.dart`):
|
||||
```dart
|
||||
if (_state == RemoteBridgeState.connected && timeSinceLastData > 30 && !_isReconnecting) {
|
||||
// Force reconnection
|
||||
}
|
||||
```
|
||||
|
||||
### Fix 5: Reduced Keepalive Timeouts
|
||||
**Problem**: 30s timeout × 3 misses = 90s minimum before detection.
|
||||
|
||||
**Solution**: Reduced to 20s timeout × 2 misses = ~40s detection.
|
||||
|
||||
### Fix 6: Recv Stagnation Detection
|
||||
**Problem**: One-way failure where recv stops but sent continues not detected quickly enough.
|
||||
|
||||
**Solution**: Track recv count across health checks. If recv stuck while sent increases for 2 consecutive checks (20s), force reconnection.
|
||||
|
||||
**Code** (`remote_bridge.dart`):
|
||||
```dart
|
||||
// Track across health checks
|
||||
int _lastHealthCheckRecvCount = 0;
|
||||
int _lastHealthCheckSentCount = 0;
|
||||
int _recvStagnationCount = 0;
|
||||
|
||||
// In health check:
|
||||
if (recvStuck && sentIncreased) {
|
||||
_recvStagnationCount++;
|
||||
if (_recvStagnationCount >= 2) {
|
||||
// Force reconnection - channel is one-way
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**Detection time**: ~20 seconds (2 × 10s health check interval)
|
||||
|
||||
---
|
||||
|
||||
## Log Patterns to Watch For
|
||||
|
||||
### Healthy Connection
|
||||
```
|
||||
Health check - API sent:93 recv:88 ... lastRecv:0s ago
|
||||
```
|
||||
- `sent` and `recv` both increasing
|
||||
- `lastRecv` low (< 5s typically)
|
||||
|
||||
### One-Way Failure (CRITICAL)
|
||||
```
|
||||
Health check - API sent:206 recv:163 ... lastRecv:30s ago
|
||||
Health check - API sent:218 recv:163 ... lastRecv:40s ago
|
||||
```
|
||||
- `sent` increases, `recv` STUCK
|
||||
- `lastRecv` keeps increasing
|
||||
- Data channel still shows "open"
|
||||
|
||||
### Signaling Disconnect
|
||||
```
|
||||
WebRTC: Signaling disconnected
|
||||
... (6-16 seconds later) ...
|
||||
WebRTC: ICE connection state: RTCIceConnectionStateDisconnected
|
||||
WebRTC: ICE connection state: RTCIceConnectionStateFailed
|
||||
```
|
||||
|
||||
### Network Failure (DNS)
|
||||
```
|
||||
Signaling: WebSocket closed
|
||||
... (reconnection attempt) ...
|
||||
Signaling: Failed to connect: SocketException: Failed host lookup: 'signaling.music-assistant.io'
|
||||
```
|
||||
This indicates the phone lost network connectivity entirely.
|
||||
|
||||
### Reconnection Storm (Signaling Instability)
|
||||
```
|
||||
Signaling: Connecting to wss://signaling.music-assistant.io/ws
|
||||
Signaling: Sending connect-request
|
||||
Signaling: WebSocket closed ← Closes within 100-500ms
|
||||
WebRTC: Signaling disconnected
|
||||
RemoteBridge: Scheduling reconnect attempt X/10 in Ys
|
||||
```
|
||||
Rapid reconnection loop - signaling never stays connected long enough.
|
||||
|
||||
### Flow Control Engaged
|
||||
```
|
||||
WebRTC: ⚠️ Buffer full (1234567 bytes) or paused - queueing message
|
||||
WebRTC: Buffer drained to 12345 bytes - draining 5 queued messages
|
||||
WebRTC: ✅ Send queue drained (5 messages) - resuming normal sends
|
||||
```
|
||||
|
||||
### Keepalive Detection
|
||||
```
|
||||
WebRTC: ⚠️ Keepalive timeout! No data for 22s (missed: 1/2)
|
||||
WebRTC: ❌ Data channel appears dead - triggering reconnection
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Known Issues / Limitations
|
||||
|
||||
### 1. flutter_webrtc Limitations
|
||||
- `RTCDataChannel.state` may show "open" when actually dead (Issue #843)
|
||||
- `bufferedAmount` may not be accurate on all platforms
|
||||
- `onBufferedAmountLow` callback support varies
|
||||
|
||||
### 2. SCTP Receive Window
|
||||
- If server sends faster than client processes, receive window fills
|
||||
- This causes server-side to stop sending, client sees no data
|
||||
- No way to monitor receive-side buffer from client
|
||||
|
||||
### 3. TURN Server Issues
|
||||
- aiortc (server-side) has known issues with TURN + DataChannel (#1156)
|
||||
- Data channel may fail silently when using TURN relay
|
||||
|
||||
### 4. Network Transitions
|
||||
- WiFi → Cellular or vice versa can cause ICE to fail
|
||||
- App backgrounding on mobile can close WebSocket/WebRTC
|
||||
|
||||
---
|
||||
|
||||
## Root Cause Categories
|
||||
|
||||
### Category A: Network Issues (Not Code Bugs)
|
||||
These are environmental issues, not bugs in our code:
|
||||
- **DNS failure**: `Failed host lookup` - Phone lost internet
|
||||
- **WiFi/Cellular switch**: Network changed, connections dropped
|
||||
- **Server unreachable**: Signaling server down or blocked
|
||||
- **Firewall/NAT issues**: TURN relay needed but unavailable
|
||||
|
||||
**Evidence**: Signaling WebSocket closes, DNS lookups fail, reconnection attempts fail repeatedly.
|
||||
|
||||
### Category B: WebRTC/SCTP Issues (Partial Code Control)
|
||||
These can be mitigated but not fully prevented:
|
||||
- **One-way channel death**: Channel appears open but data stops flowing
|
||||
- **Buffer overflow**: Too much data sent, SCTP buffer exceeded
|
||||
- **ICE failure**: Network path lost, no recovery possible
|
||||
|
||||
**Evidence**: Data channel shows "open" but `recv` stuck, `lastRecv` increasing.
|
||||
|
||||
### Category C: Code Bugs (Fixable)
|
||||
Issues in our implementation:
|
||||
- **Detection too slow**: Timeouts too long, misses too many
|
||||
- **Recovery not triggered**: State checks wrong, reconnection not started
|
||||
- **Resource leaks**: Timers not cancelled, connections not cleaned up
|
||||
|
||||
**Evidence**: Logs show problem but no action taken, or wrong action taken.
|
||||
|
||||
---
|
||||
|
||||
## Debugging Checklist
|
||||
|
||||
When investigating a disconnect:
|
||||
|
||||
1. **Find the last successful response**:
|
||||
```
|
||||
grep "WebRTC API → WS" logs.txt | head -5
|
||||
```
|
||||
|
||||
2. **Check health check progression**:
|
||||
```
|
||||
grep "Health check" logs.txt
|
||||
```
|
||||
Look for `recv` getting stuck while `sent` increases.
|
||||
|
||||
3. **Check for signaling issues**:
|
||||
```
|
||||
grep -i "signaling" logs.txt
|
||||
```
|
||||
|
||||
4. **Check ICE state changes**:
|
||||
```
|
||||
grep "ICE connection state" logs.txt
|
||||
```
|
||||
|
||||
5. **Check for keepalive detection**:
|
||||
```
|
||||
grep -i "keepalive" logs.txt
|
||||
```
|
||||
|
||||
6. **Check buffer status**:
|
||||
```
|
||||
grep -E "(buffer|queue|paused)" logs.txt
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Potential Future Improvements
|
||||
|
||||
### 1. Server-Side Backpressure
|
||||
MA protocol doesn't have explicit backpressure. Could add:
|
||||
- Client-side request throttling
|
||||
- Application-level ACKs for critical messages
|
||||
|
||||
### 2. More Aggressive Detection
|
||||
- Track recv count across health checks, detect stagnation
|
||||
- Shorter keepalive interval (5s instead of 10s)
|
||||
|
||||
### 3. Proactive Health Signals
|
||||
- Monitor `bufferedAmount` trend (increasing = problem)
|
||||
- Track round-trip latency of keepalive pings
|
||||
|
||||
### 4. Connection Quality Metrics
|
||||
- Expose packet loss, jitter from WebRTC stats
|
||||
- Use to predict imminent failure
|
||||
|
||||
---
|
||||
|
||||
## Test Scenarios
|
||||
|
||||
| Scenario | How to Test | Expected Behavior |
|
||||
|----------|-------------|-------------------|
|
||||
| Normal usage | Browse library, play music | No warnings |
|
||||
| Heavy sync | Pull-to-refresh library | Buffer may queue, should drain |
|
||||
| Long session | Leave connected 2+ hours | Should stay connected |
|
||||
| Rapid navigation | Quick tab switching | Brief queue usage, recovers |
|
||||
| Network change | WiFi → Cellular | Should detect and reconnect |
|
||||
| App background | Background for 5+ min | May disconnect, should reconnect |
|
||||
|
||||
---
|
||||
|
||||
## Observed Failure Patterns
|
||||
|
||||
### Pattern 1: One-Way Death After Library Sync
|
||||
**Observed**: 2026-01-23 (multiple times)
|
||||
|
||||
```
|
||||
17:13:06.175 - Last response (playlists sync)
|
||||
17:13:06.264 - Local batch save
|
||||
-- 5 seconds silence --
|
||||
17:13:11.005 - Send players/all → NO RESPONSE
|
||||
17:13:13.914 - ICE state: completed (looks healthy!)
|
||||
17:13:28 - Keepalive detects timeout
|
||||
17:13:38 - Reconnection triggered
|
||||
```
|
||||
|
||||
**Characteristics**:
|
||||
- Often happens after library sync (large batch responses)
|
||||
- ICE shows "completed" even though data channel is dead
|
||||
- Signaling ping/pong continues working
|
||||
- Only data channel receive is affected
|
||||
|
||||
**Hypothesis**:
|
||||
- Server-side SCTP buffer exhausted from sending large responses?
|
||||
- Client receive window full, server blocks?
|
||||
- flutter_webrtc onMessage callback stops firing?
|
||||
|
||||
### Pattern 2: Reconnection Storm / Signaling Instability
|
||||
**Observed**: 2026-01-23 17:30-17:31
|
||||
|
||||
```
|
||||
17:31:05.093 - Signaling: Connecting
|
||||
17:31:05.216 - Signaling: Sending connect-request
|
||||
17:31:05.218 - Signaling: WebSocket closed (123ms later!)
|
||||
17:31:05.218 - WebRTC: Signaling disconnected
|
||||
```
|
||||
|
||||
**Characteristics**:
|
||||
- Signaling WebSocket closes almost immediately after connect
|
||||
- Multiple rapid reconnection attempts (storm)
|
||||
- Connection never stable long enough for data flow
|
||||
- Often happens after network instability
|
||||
- Artist detail, albums etc don't load because connection keeps failing
|
||||
|
||||
**Possible Causes**:
|
||||
- Network instability (WiFi/cellular issues)
|
||||
- Signaling server rate limiting
|
||||
- DNS resolution failures
|
||||
- Server rejecting rapid reconnection attempts
|
||||
|
||||
**Side Effects**:
|
||||
- UI shows errors like "Not connected to Music Assistant server"
|
||||
- Artist/album detail screens fail to load
|
||||
- Players list empty or stale
|
||||
|
||||
### Pattern 3: API Channel Dies While Sendspin Lives
|
||||
**Observed**: 2026-01-23 17:53
|
||||
|
||||
```
|
||||
17:53:35.755 - Send album_tracks request → NO RESPONSE
|
||||
17:53:40.596 - Health check: recv stuck at 197, sent increased
|
||||
17:53:55.204 - Sendspin channel RECEIVES server/time response!
|
||||
17:54:02.790 - Keepalive detects dead API channel
|
||||
```
|
||||
|
||||
**Characteristics**:
|
||||
- API data channel (ma-api) stops receiving
|
||||
- Sendspin data channel continues working normally
|
||||
- Same WebRTC peer connection, different data channels
|
||||
- This proves it's NOT a network issue - Sendspin traffic flows fine
|
||||
|
||||
**Hypothesis**:
|
||||
- flutter_webrtc bug where `onMessage` callback stops firing for one channel
|
||||
- Possible memory/GC issue with the callback
|
||||
- Server-side might be sending to wrong channel?
|
||||
|
||||
**Key Evidence**:
|
||||
- Recv count stays at 197 for API
|
||||
- Sendspin recv count increases (7→8)
|
||||
- Both channels use same peer connection
|
||||
|
||||
---
|
||||
|
||||
## Version History
|
||||
|
||||
| Date | Build | Changes |
|
||||
|------|-------|---------|
|
||||
| 2026-01-23 | ~v49 | Initial flow control implementation |
|
||||
| 2026-01-23 | ~v49 | Reduced keepalive timeout 30→20s, misses 3→2 |
|
||||
| 2026-01-23 | ~v49 | Reduced health check stale threshold 45→30s |
|
||||
| 2026-01-23 | ~v49 | Fixed excessive "queue drained" logging |
|
||||
| 2026-01-23 | ~v49 | Created WEBRTC_DISCONNECT_FIXES.md documentation |
|
||||
| 2026-01-23 | ~v49 | Added recv stagnation detection (20s detection) |
|
||||
| 2026-01-23 | ~v49 | Documented Pattern 2: Reconnection storm / signaling instability |
|
||||
| 2026-01-23 | ~v49 | Fixed race condition in _scheduleReconnect (multiple simultaneous calls) |
|
||||
| 2026-01-23 | ~v49 | Added WebSocket close code/reason logging to signaling |
|
||||
| 2026-01-23 | ~v49 | **CRITICAL FIX**: _reconnectWebRTC() was returning immediately due to _isReconnecting already being true |
|
||||
| 2026-01-23 | ~v49 | Fixed old WebRTC callbacks firing during reconnection cleanup (clear callbacks before disconnect) |
|
||||
| 2026-01-23 | ~v49 | Fixed onStateChanged handler calling _handleWebRTCDisconnection during active reconnection |
|
||||
|
||||
---
|
||||
|
||||
## References
|
||||
|
||||
- flutter_webrtc Issue #843: Data channel state unreliable
|
||||
- aiortc Issue #1156: TURN + DataChannel bugs
|
||||
- WebRTC SCTP: Max buffer is 16MB, recommended threshold 1MB
|
||||
- Music Assistant remote protocol: No explicit flow control
|
||||
@@ -1,118 +0,0 @@
|
||||
# WebRTC Remote Connection Progress
|
||||
|
||||
## Problem Statement
|
||||
The flutter_webrtc library has reliability issues causing data channel failures during remote connections via Nabu Casa. The ma-api data channel becomes one-way (can send, but receives stop) after some time, while the sendspin channel continues working.
|
||||
|
||||
## Approaches Tried
|
||||
|
||||
### 1. Original Implementation (flutter_webrtc)
|
||||
- **Status**: Fails
|
||||
- **Issue**: ma-api data channel goes one-way after some time
|
||||
- **Files**: `lib/services/remote/webrtc_connection.dart`
|
||||
|
||||
### 2. WebView-based WebRTC Implementation
|
||||
- **Status**: Same failure mode
|
||||
- **Hypothesis**: Use browser-native WebRTC via InAppWebView, since MA Web UI works
|
||||
- **Result**: Same one-way channel death occurs
|
||||
- **Key Finding**: This proves the issue is NOT specific to flutter_webrtc
|
||||
|
||||
## Key Observations
|
||||
|
||||
From the logs:
|
||||
```
|
||||
lastRecv:26s ago <- No messages received in 26 seconds
|
||||
API sent:674 recv:618 <- Gap growing, responses stopped
|
||||
```
|
||||
|
||||
- Signaling ping/pong continues working
|
||||
- Sendspin channel continues receiving (`server/time` responses)
|
||||
- Only ma-api channel becomes one-way
|
||||
- WebRTC peer connection itself remains "connected"
|
||||
|
||||
## Differences from Working MA Web UI
|
||||
|
||||
The MA Web UI runs in a **visible, active browser tab**. Our implementations:
|
||||
1. flutter_webrtc: Native WebRTC in background app
|
||||
2. WebView: Browser WebRTC in **hidden 1x1 pixel WebView**
|
||||
|
||||
Android aggressively throttles hidden WebViews to save battery.
|
||||
|
||||
## Current Implementation (WebView)
|
||||
|
||||
### Files Created
|
||||
| File | Purpose |
|
||||
|------|---------|
|
||||
| `lib/services/remote/webview_webrtc_connection.dart` | Dart WebView wrapper |
|
||||
| `assets/webrtc_engine.js` | JavaScript WebRTC engine |
|
||||
|
||||
### Files Modified
|
||||
| File | Changes |
|
||||
|------|---------|
|
||||
| `pubspec.yaml` | Added `flutter_inappwebview: ^6.0.0` |
|
||||
| `lib/services/remote/remote_bridge.dart` | Uses `WebViewWebRTCConnection` |
|
||||
| `lib/providers/music_assistant_provider.dart` | Exposes WebView widget |
|
||||
| `lib/main.dart` | Adds WebView to widget tree |
|
||||
|
||||
### Architecture
|
||||
```
|
||||
MusicAssistantAPI -> localhost WebSocket -> RemoteBridge
|
||||
|
|
||||
WebViewWebRTCConnection
|
||||
|
|
||||
Hidden InAppWebView
|
||||
|
|
||||
JavaScript WebRTC Engine
|
||||
|
|
||||
MA Server via TURN
|
||||
```
|
||||
|
||||
## Current Fixes Being Tested
|
||||
|
||||
### 1. Prevent WebView Throttling
|
||||
- Changed WebView position from off-screen (-10,-10) to on-screen (0,0) with Opacity(0)
|
||||
- Added various InAppWebViewSettings to prevent background throttling
|
||||
|
||||
### 2. Data Channel Settings
|
||||
- Changed from `ordered: true` to `ordered: false` with `maxRetransmits: 3`
|
||||
- Hypothesis: Ordered delivery may cause buffer bloat issues
|
||||
|
||||
### 3. Buffer Monitoring
|
||||
- Added `bufferedAmount` checking in JavaScript
|
||||
- Logs warning when buffer exceeds 1MB
|
||||
- Added `getChannelHealth()` function for diagnostics
|
||||
|
||||
### 4. Reduced Logging
|
||||
- Removed per-message logging (was filling logs too fast)
|
||||
- Keep only state changes, errors, and warnings
|
||||
|
||||
## Experiments Completed
|
||||
|
||||
### 5. Server-Created Channels (Failed)
|
||||
- **Hypothesis**: Let server create data channels to avoid ID collisions
|
||||
- **Result**: Connection timeout - server expects CLIENT to create channels
|
||||
- **Learning**: Client must create channels before sending offer
|
||||
|
||||
## Next Steps to Try
|
||||
|
||||
1. **Make WebView actually visible** - Android may still throttle Opacity(0) WebView
|
||||
2. **Single data channel** - Use only ma-api, disable sendspin
|
||||
3. **Periodic channel recreation** - Detect stale channel and recreate
|
||||
4. **Report to MA team** - Browser WebRTC also fails, suggesting server-side issue
|
||||
|
||||
## Test APK Location
|
||||
`/home/chris/Ensemble/ensemble-webview-webrtc.apk`
|
||||
|
||||
## Useful Debug Commands
|
||||
|
||||
Check channel health (in JS console or via Dart):
|
||||
```javascript
|
||||
getChannelHealth()
|
||||
// Returns: { peerConnection, iceConnection, apiChannel, apiBuffered, sendspinChannel, sendspinBuffered, signalingConnected }
|
||||
```
|
||||
|
||||
## Open Questions
|
||||
|
||||
1. Why does sendspin channel survive when ma-api dies?
|
||||
2. Is there a difference in how MA server handles the two channels?
|
||||
3. Does MA Web UI use different data channel settings?
|
||||
4. Is there a TURN relay issue specific to high-traffic channels?
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
@@ -32,12 +32,6 @@ class HeroTags {
|
||||
/// Podcast title hero tag prefix
|
||||
static const String podcastTitle = 'podcast_title_';
|
||||
|
||||
/// Podcast episode cover hero tag prefix
|
||||
static const String podcastEpisodeCover = 'podcast_episode_cover_';
|
||||
|
||||
/// Podcast episode title hero tag prefix
|
||||
static const String podcastEpisodeTitle = 'podcast_episode_title_';
|
||||
|
||||
/// Playlist cover hero tag prefix
|
||||
static const String playlistCover = 'playlist_cover_';
|
||||
|
||||
|
||||
@@ -10,7 +10,4 @@ class NetworkConstants {
|
||||
|
||||
/// Default HTTP port
|
||||
static const int defaultHttpPort = 80;
|
||||
|
||||
/// Maximum number of pending WebSocket requests to prevent memory leaks
|
||||
static const int maxPendingRequests = 100;
|
||||
}
|
||||
|
||||
+8
-115
@@ -78,10 +78,6 @@ class LibraryCache extends Table {
|
||||
/// Whether this item was deleted on the server
|
||||
BoolColumn get isDeleted => boolean().withDefault(const Constant(false))();
|
||||
|
||||
/// Provider instance IDs that provided this item (JSON array)
|
||||
/// Used for client-side filtering by source provider
|
||||
TextColumn get sourceProviders => text().withDefault(const Constant('[]'))();
|
||||
|
||||
@override
|
||||
Set<Column> get primaryKey => {cacheKey};
|
||||
}
|
||||
@@ -195,7 +191,7 @@ class AppDatabase extends _$AppDatabase {
|
||||
AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());
|
||||
|
||||
@override
|
||||
int get schemaVersion => 6;
|
||||
int get schemaVersion => 5;
|
||||
|
||||
@override
|
||||
MigrationStrategy get migration {
|
||||
@@ -230,10 +226,6 @@ class AppDatabase extends _$AppDatabase {
|
||||
await customStatement('CREATE INDEX IF NOT EXISTS idx_cached_queue_player ON cached_queue (player_id)');
|
||||
await customStatement('CREATE INDEX IF NOT EXISTS idx_cached_queue_player_position ON cached_queue (player_id, position)');
|
||||
}
|
||||
// Migration from v5 to v6: Add source_providers column for client-side filtering
|
||||
if (from < 6) {
|
||||
await customStatement("ALTER TABLE library_cache ADD COLUMN source_providers TEXT NOT NULL DEFAULT '[]'");
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -376,57 +368,20 @@ class AppDatabase extends _$AppDatabase {
|
||||
// ============================================
|
||||
|
||||
/// Cache a library item
|
||||
/// [sourceProvider] - the provider instance ID that provided this item (for filtering)
|
||||
Future<void> cacheItem({
|
||||
required String itemType,
|
||||
required String itemId,
|
||||
required String data,
|
||||
String? sourceProvider,
|
||||
}) async {
|
||||
final cacheKey = '${itemType}_$itemId';
|
||||
|
||||
// If sourceProvider is specified, we need to merge with existing providers
|
||||
if (sourceProvider != null) {
|
||||
final existing = await getCachedItem(itemType, itemId);
|
||||
List<String> providers = [];
|
||||
if (existing != null) {
|
||||
try {
|
||||
final existingProviders = existing.sourceProviders;
|
||||
if (existingProviders.isNotEmpty && existingProviders != '[]') {
|
||||
providers = List<String>.from(
|
||||
(await Future.value(existingProviders))
|
||||
.replaceAll('[', '')
|
||||
.replaceAll(']', '')
|
||||
.replaceAll('"', '')
|
||||
.split(',')
|
||||
.where((s) => s.trim().isNotEmpty)
|
||||
.map((s) => s.trim()),
|
||||
);
|
||||
}
|
||||
} catch (_) {}
|
||||
}
|
||||
if (!providers.contains(sourceProvider)) {
|
||||
providers.add(sourceProvider);
|
||||
}
|
||||
final sourceProvidersJson = '[${providers.map((p) => '"$p"').join(',')}]';
|
||||
|
||||
await into(libraryCache).insertOnConflictUpdate(LibraryCacheCompanion.insert(
|
||||
cacheKey: cacheKey,
|
||||
itemType: itemType,
|
||||
itemId: itemId,
|
||||
data: data,
|
||||
lastSynced: DateTime.now(),
|
||||
sourceProviders: Value(sourceProvidersJson),
|
||||
));
|
||||
} else {
|
||||
await into(libraryCache).insertOnConflictUpdate(LibraryCacheCompanion.insert(
|
||||
cacheKey: cacheKey,
|
||||
itemType: itemType,
|
||||
itemId: itemId,
|
||||
data: data,
|
||||
lastSynced: DateTime.now(),
|
||||
));
|
||||
}
|
||||
await into(libraryCache).insertOnConflictUpdate(LibraryCacheCompanion.insert(
|
||||
cacheKey: cacheKey,
|
||||
itemType: itemType,
|
||||
itemId: itemId,
|
||||
data: data,
|
||||
lastSynced: DateTime.now(),
|
||||
));
|
||||
}
|
||||
|
||||
/// Get cached items by type
|
||||
@@ -695,66 +650,4 @@ class AppDatabase extends _$AppDatabase {
|
||||
Future<void> clearSearchHistory() async {
|
||||
await delete(searchHistory).go();
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Batch Cache Operations
|
||||
// ============================================
|
||||
|
||||
/// Batch size for chunked inserts to prevent SQLite limits
|
||||
static const int _batchChunkSize = 500;
|
||||
|
||||
/// Batch cache multiple items efficiently using drift batch API
|
||||
/// This is much faster than individual inserts for large datasets.
|
||||
/// Items are chunked into batches of 500 to prevent SQLite variable limits.
|
||||
///
|
||||
/// [items] - List of items to cache, each containing:
|
||||
/// - itemType: 'album', 'artist', 'track', 'playlist', 'audiobook', etc.
|
||||
/// - itemId: the item's ID
|
||||
/// - data: JSON string of the item
|
||||
/// - sourceProviders: list of provider instance IDs
|
||||
Future<void> batchCacheItems(List<BatchCacheItem> items) async {
|
||||
if (items.isEmpty) return;
|
||||
|
||||
// Process in chunks to avoid SQLite variable limits
|
||||
for (var i = 0; i < items.length; i += _batchChunkSize) {
|
||||
final chunk = items.skip(i).take(_batchChunkSize).toList();
|
||||
|
||||
await batch((b) {
|
||||
for (final item in chunk) {
|
||||
final cacheKey = '${item.itemType}_${item.itemId}';
|
||||
final sourceProvidersJson = item.sourceProviders.isEmpty
|
||||
? '[]'
|
||||
: '[${item.sourceProviders.map((p) => '"$p"').join(',')}]';
|
||||
|
||||
b.insert(
|
||||
libraryCache,
|
||||
LibraryCacheCompanion.insert(
|
||||
cacheKey: cacheKey,
|
||||
itemType: item.itemType,
|
||||
itemId: item.itemId,
|
||||
data: item.data,
|
||||
lastSynced: DateTime.now(),
|
||||
sourceProviders: Value(sourceProvidersJson),
|
||||
),
|
||||
mode: InsertMode.insertOrReplace,
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Data class for batch cache operations
|
||||
class BatchCacheItem {
|
||||
final String itemType;
|
||||
final String itemId;
|
||||
final String data;
|
||||
final List<String> sourceProviders;
|
||||
|
||||
const BatchCacheItem({
|
||||
required this.itemType,
|
||||
required this.itemId,
|
||||
required this.data,
|
||||
this.sourceProviders = const [],
|
||||
});
|
||||
}
|
||||
|
||||
@@ -856,24 +856,9 @@ class $LibraryCacheTable extends LibraryCache
|
||||
defaultConstraints:
|
||||
GeneratedColumn.constraintIsAlways('CHECK ("is_deleted" IN (0, 1))'),
|
||||
defaultValue: const Constant(false));
|
||||
static const VerificationMeta _sourceProvidersMeta =
|
||||
const VerificationMeta('sourceProviders');
|
||||
@override
|
||||
late final GeneratedColumn<String> sourceProviders = GeneratedColumn<String>(
|
||||
'source_providers', aliasedName, false,
|
||||
type: DriftSqlType.string,
|
||||
requiredDuringInsert: false,
|
||||
defaultValue: const Constant('[]'));
|
||||
@override
|
||||
List<GeneratedColumn> get $columns => [
|
||||
cacheKey,
|
||||
itemType,
|
||||
itemId,
|
||||
data,
|
||||
lastSynced,
|
||||
isDeleted,
|
||||
sourceProviders
|
||||
];
|
||||
List<GeneratedColumn> get $columns =>
|
||||
[cacheKey, itemType, itemId, data, lastSynced, isDeleted];
|
||||
@override
|
||||
String get aliasedName => _alias ?? actualTableName;
|
||||
@override
|
||||
@@ -920,12 +905,6 @@ class $LibraryCacheTable extends LibraryCache
|
||||
context.handle(_isDeletedMeta,
|
||||
isDeleted.isAcceptableOrUnknown(data['is_deleted']!, _isDeletedMeta));
|
||||
}
|
||||
if (data.containsKey('source_providers')) {
|
||||
context.handle(
|
||||
_sourceProvidersMeta,
|
||||
sourceProviders.isAcceptableOrUnknown(
|
||||
data['source_providers']!, _sourceProvidersMeta));
|
||||
}
|
||||
return context;
|
||||
}
|
||||
|
||||
@@ -947,8 +926,6 @@ class $LibraryCacheTable extends LibraryCache
|
||||
.read(DriftSqlType.dateTime, data['${effectivePrefix}last_synced'])!,
|
||||
isDeleted: attachedDatabase.typeMapping
|
||||
.read(DriftSqlType.bool, data['${effectivePrefix}is_deleted'])!,
|
||||
sourceProviders: attachedDatabase.typeMapping.read(
|
||||
DriftSqlType.string, data['${effectivePrefix}source_providers'])!,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -977,18 +954,13 @@ class LibraryCacheData extends DataClass
|
||||
|
||||
/// Whether this item was deleted on the server
|
||||
final bool isDeleted;
|
||||
|
||||
/// Provider instance IDs that provided this item (JSON array)
|
||||
/// Used for client-side filtering by source provider
|
||||
final String sourceProviders;
|
||||
const LibraryCacheData(
|
||||
{required this.cacheKey,
|
||||
required this.itemType,
|
||||
required this.itemId,
|
||||
required this.data,
|
||||
required this.lastSynced,
|
||||
required this.isDeleted,
|
||||
required this.sourceProviders});
|
||||
required this.isDeleted});
|
||||
@override
|
||||
Map<String, Expression> toColumns(bool nullToAbsent) {
|
||||
final map = <String, Expression>{};
|
||||
@@ -998,7 +970,6 @@ class LibraryCacheData extends DataClass
|
||||
map['data'] = Variable<String>(data);
|
||||
map['last_synced'] = Variable<DateTime>(lastSynced);
|
||||
map['is_deleted'] = Variable<bool>(isDeleted);
|
||||
map['source_providers'] = Variable<String>(sourceProviders);
|
||||
return map;
|
||||
}
|
||||
|
||||
@@ -1010,7 +981,6 @@ class LibraryCacheData extends DataClass
|
||||
data: Value(data),
|
||||
lastSynced: Value(lastSynced),
|
||||
isDeleted: Value(isDeleted),
|
||||
sourceProviders: Value(sourceProviders),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1024,7 +994,6 @@ class LibraryCacheData extends DataClass
|
||||
data: serializer.fromJson<String>(json['data']),
|
||||
lastSynced: serializer.fromJson<DateTime>(json['lastSynced']),
|
||||
isDeleted: serializer.fromJson<bool>(json['isDeleted']),
|
||||
sourceProviders: serializer.fromJson<String>(json['sourceProviders']),
|
||||
);
|
||||
}
|
||||
@override
|
||||
@@ -1037,7 +1006,6 @@ class LibraryCacheData extends DataClass
|
||||
'data': serializer.toJson<String>(data),
|
||||
'lastSynced': serializer.toJson<DateTime>(lastSynced),
|
||||
'isDeleted': serializer.toJson<bool>(isDeleted),
|
||||
'sourceProviders': serializer.toJson<String>(sourceProviders),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1047,8 +1015,7 @@ class LibraryCacheData extends DataClass
|
||||
String? itemId,
|
||||
String? data,
|
||||
DateTime? lastSynced,
|
||||
bool? isDeleted,
|
||||
String? sourceProviders}) =>
|
||||
bool? isDeleted}) =>
|
||||
LibraryCacheData(
|
||||
cacheKey: cacheKey ?? this.cacheKey,
|
||||
itemType: itemType ?? this.itemType,
|
||||
@@ -1056,7 +1023,6 @@ class LibraryCacheData extends DataClass
|
||||
data: data ?? this.data,
|
||||
lastSynced: lastSynced ?? this.lastSynced,
|
||||
isDeleted: isDeleted ?? this.isDeleted,
|
||||
sourceProviders: sourceProviders ?? this.sourceProviders,
|
||||
);
|
||||
LibraryCacheData copyWithCompanion(LibraryCacheCompanion data) {
|
||||
return LibraryCacheData(
|
||||
@@ -1067,9 +1033,6 @@ class LibraryCacheData extends DataClass
|
||||
lastSynced:
|
||||
data.lastSynced.present ? data.lastSynced.value : this.lastSynced,
|
||||
isDeleted: data.isDeleted.present ? data.isDeleted.value : this.isDeleted,
|
||||
sourceProviders: data.sourceProviders.present
|
||||
? data.sourceProviders.value
|
||||
: this.sourceProviders,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1081,15 +1044,14 @@ class LibraryCacheData extends DataClass
|
||||
..write('itemId: $itemId, ')
|
||||
..write('data: $data, ')
|
||||
..write('lastSynced: $lastSynced, ')
|
||||
..write('isDeleted: $isDeleted, ')
|
||||
..write('sourceProviders: $sourceProviders')
|
||||
..write('isDeleted: $isDeleted')
|
||||
..write(')'))
|
||||
.toString();
|
||||
}
|
||||
|
||||
@override
|
||||
int get hashCode => Object.hash(
|
||||
cacheKey, itemType, itemId, data, lastSynced, isDeleted, sourceProviders);
|
||||
int get hashCode =>
|
||||
Object.hash(cacheKey, itemType, itemId, data, lastSynced, isDeleted);
|
||||
@override
|
||||
bool operator ==(Object other) =>
|
||||
identical(this, other) ||
|
||||
@@ -1099,8 +1061,7 @@ class LibraryCacheData extends DataClass
|
||||
other.itemId == this.itemId &&
|
||||
other.data == this.data &&
|
||||
other.lastSynced == this.lastSynced &&
|
||||
other.isDeleted == this.isDeleted &&
|
||||
other.sourceProviders == this.sourceProviders);
|
||||
other.isDeleted == this.isDeleted);
|
||||
}
|
||||
|
||||
class LibraryCacheCompanion extends UpdateCompanion<LibraryCacheData> {
|
||||
@@ -1110,7 +1071,6 @@ class LibraryCacheCompanion extends UpdateCompanion<LibraryCacheData> {
|
||||
final Value<String> data;
|
||||
final Value<DateTime> lastSynced;
|
||||
final Value<bool> isDeleted;
|
||||
final Value<String> sourceProviders;
|
||||
final Value<int> rowid;
|
||||
const LibraryCacheCompanion({
|
||||
this.cacheKey = const Value.absent(),
|
||||
@@ -1119,7 +1079,6 @@ class LibraryCacheCompanion extends UpdateCompanion<LibraryCacheData> {
|
||||
this.data = const Value.absent(),
|
||||
this.lastSynced = const Value.absent(),
|
||||
this.isDeleted = const Value.absent(),
|
||||
this.sourceProviders = const Value.absent(),
|
||||
this.rowid = const Value.absent(),
|
||||
});
|
||||
LibraryCacheCompanion.insert({
|
||||
@@ -1129,7 +1088,6 @@ class LibraryCacheCompanion extends UpdateCompanion<LibraryCacheData> {
|
||||
required String data,
|
||||
required DateTime lastSynced,
|
||||
this.isDeleted = const Value.absent(),
|
||||
this.sourceProviders = const Value.absent(),
|
||||
this.rowid = const Value.absent(),
|
||||
}) : cacheKey = Value(cacheKey),
|
||||
itemType = Value(itemType),
|
||||
@@ -1143,7 +1101,6 @@ class LibraryCacheCompanion extends UpdateCompanion<LibraryCacheData> {
|
||||
Expression<String>? data,
|
||||
Expression<DateTime>? lastSynced,
|
||||
Expression<bool>? isDeleted,
|
||||
Expression<String>? sourceProviders,
|
||||
Expression<int>? rowid,
|
||||
}) {
|
||||
return RawValuesInsertable({
|
||||
@@ -1153,7 +1110,6 @@ class LibraryCacheCompanion extends UpdateCompanion<LibraryCacheData> {
|
||||
if (data != null) 'data': data,
|
||||
if (lastSynced != null) 'last_synced': lastSynced,
|
||||
if (isDeleted != null) 'is_deleted': isDeleted,
|
||||
if (sourceProviders != null) 'source_providers': sourceProviders,
|
||||
if (rowid != null) 'rowid': rowid,
|
||||
});
|
||||
}
|
||||
@@ -1165,7 +1121,6 @@ class LibraryCacheCompanion extends UpdateCompanion<LibraryCacheData> {
|
||||
Value<String>? data,
|
||||
Value<DateTime>? lastSynced,
|
||||
Value<bool>? isDeleted,
|
||||
Value<String>? sourceProviders,
|
||||
Value<int>? rowid}) {
|
||||
return LibraryCacheCompanion(
|
||||
cacheKey: cacheKey ?? this.cacheKey,
|
||||
@@ -1174,7 +1129,6 @@ class LibraryCacheCompanion extends UpdateCompanion<LibraryCacheData> {
|
||||
data: data ?? this.data,
|
||||
lastSynced: lastSynced ?? this.lastSynced,
|
||||
isDeleted: isDeleted ?? this.isDeleted,
|
||||
sourceProviders: sourceProviders ?? this.sourceProviders,
|
||||
rowid: rowid ?? this.rowid,
|
||||
);
|
||||
}
|
||||
@@ -1200,9 +1154,6 @@ class LibraryCacheCompanion extends UpdateCompanion<LibraryCacheData> {
|
||||
if (isDeleted.present) {
|
||||
map['is_deleted'] = Variable<bool>(isDeleted.value);
|
||||
}
|
||||
if (sourceProviders.present) {
|
||||
map['source_providers'] = Variable<String>(sourceProviders.value);
|
||||
}
|
||||
if (rowid.present) {
|
||||
map['rowid'] = Variable<int>(rowid.value);
|
||||
}
|
||||
@@ -1218,7 +1169,6 @@ class LibraryCacheCompanion extends UpdateCompanion<LibraryCacheData> {
|
||||
..write('data: $data, ')
|
||||
..write('lastSynced: $lastSynced, ')
|
||||
..write('isDeleted: $isDeleted, ')
|
||||
..write('sourceProviders: $sourceProviders, ')
|
||||
..write('rowid: $rowid')
|
||||
..write(')'))
|
||||
.toString();
|
||||
@@ -3557,7 +3507,6 @@ typedef $$LibraryCacheTableCreateCompanionBuilder = LibraryCacheCompanion
|
||||
required String data,
|
||||
required DateTime lastSynced,
|
||||
Value<bool> isDeleted,
|
||||
Value<String> sourceProviders,
|
||||
Value<int> rowid,
|
||||
});
|
||||
typedef $$LibraryCacheTableUpdateCompanionBuilder = LibraryCacheCompanion
|
||||
@@ -3568,7 +3517,6 @@ typedef $$LibraryCacheTableUpdateCompanionBuilder = LibraryCacheCompanion
|
||||
Value<String> data,
|
||||
Value<DateTime> lastSynced,
|
||||
Value<bool> isDeleted,
|
||||
Value<String> sourceProviders,
|
||||
Value<int> rowid,
|
||||
});
|
||||
|
||||
@@ -3598,10 +3546,6 @@ class $$LibraryCacheTableFilterComposer
|
||||
|
||||
ColumnFilters<bool> get isDeleted => $composableBuilder(
|
||||
column: $table.isDeleted, builder: (column) => ColumnFilters(column));
|
||||
|
||||
ColumnFilters<String> get sourceProviders => $composableBuilder(
|
||||
column: $table.sourceProviders,
|
||||
builder: (column) => ColumnFilters(column));
|
||||
}
|
||||
|
||||
class $$LibraryCacheTableOrderingComposer
|
||||
@@ -3630,10 +3574,6 @@ class $$LibraryCacheTableOrderingComposer
|
||||
|
||||
ColumnOrderings<bool> get isDeleted => $composableBuilder(
|
||||
column: $table.isDeleted, builder: (column) => ColumnOrderings(column));
|
||||
|
||||
ColumnOrderings<String> get sourceProviders => $composableBuilder(
|
||||
column: $table.sourceProviders,
|
||||
builder: (column) => ColumnOrderings(column));
|
||||
}
|
||||
|
||||
class $$LibraryCacheTableAnnotationComposer
|
||||
@@ -3662,9 +3602,6 @@ class $$LibraryCacheTableAnnotationComposer
|
||||
|
||||
GeneratedColumn<bool> get isDeleted =>
|
||||
$composableBuilder(column: $table.isDeleted, builder: (column) => column);
|
||||
|
||||
GeneratedColumn<String> get sourceProviders => $composableBuilder(
|
||||
column: $table.sourceProviders, builder: (column) => column);
|
||||
}
|
||||
|
||||
class $$LibraryCacheTableTableManager extends RootTableManager<
|
||||
@@ -3699,7 +3636,6 @@ class $$LibraryCacheTableTableManager extends RootTableManager<
|
||||
Value<String> data = const Value.absent(),
|
||||
Value<DateTime> lastSynced = const Value.absent(),
|
||||
Value<bool> isDeleted = const Value.absent(),
|
||||
Value<String> sourceProviders = const Value.absent(),
|
||||
Value<int> rowid = const Value.absent(),
|
||||
}) =>
|
||||
LibraryCacheCompanion(
|
||||
@@ -3709,7 +3645,6 @@ class $$LibraryCacheTableTableManager extends RootTableManager<
|
||||
data: data,
|
||||
lastSynced: lastSynced,
|
||||
isDeleted: isDeleted,
|
||||
sourceProviders: sourceProviders,
|
||||
rowid: rowid,
|
||||
),
|
||||
createCompanionCallback: ({
|
||||
@@ -3719,7 +3654,6 @@ class $$LibraryCacheTableTableManager extends RootTableManager<
|
||||
required String data,
|
||||
required DateTime lastSynced,
|
||||
Value<bool> isDeleted = const Value.absent(),
|
||||
Value<String> sourceProviders = const Value.absent(),
|
||||
Value<int> rowid = const Value.absent(),
|
||||
}) =>
|
||||
LibraryCacheCompanion.insert(
|
||||
@@ -3729,7 +3663,6 @@ class $$LibraryCacheTableTableManager extends RootTableManager<
|
||||
data: data,
|
||||
lastSynced: lastSynced,
|
||||
isDeleted: isDeleted,
|
||||
sourceProviders: sourceProviders,
|
||||
rowid: rowid,
|
||||
),
|
||||
withReferenceMapper: (p0) => p0
|
||||
|
||||
+2
-254
@@ -51,7 +51,7 @@
|
||||
"description": "Hint for port field"
|
||||
},
|
||||
|
||||
"portDescription": "Leave blank unless using a custom port",
|
||||
"portDescription": "Leave blank for reverse proxy or standard ports. Enter 8095 for direct connection.",
|
||||
"@portDescription": {
|
||||
"description": "Description for port field"
|
||||
},
|
||||
@@ -604,11 +604,6 @@
|
||||
|
||||
"tracksAddedToQueue": "Tracks added to queue",
|
||||
"@tracksAddedToQueue": {
|
||||
"description": "Snackbar message for tracks added to queue"
|
||||
},
|
||||
|
||||
"trackAddedToQueue": "Track added to queue",
|
||||
"@trackAddedToQueue": {
|
||||
"description": "Confirmation when tracks added"
|
||||
},
|
||||
|
||||
@@ -1074,10 +1069,6 @@
|
||||
"sortAlphabetically": "Sort alphabetically",
|
||||
"sortByYear": "Sort by year",
|
||||
"sortBySeriesOrder": "Sort by series order",
|
||||
"sortByDuration": "Sort by duration",
|
||||
"newestFirst": "Newest first",
|
||||
"oldestFirst": "Oldest first",
|
||||
"viewDetails": "View details",
|
||||
"listView": "List view",
|
||||
"gridView": "Grid view",
|
||||
"noBooksInSeries": "No books found in this series",
|
||||
@@ -1096,12 +1087,11 @@
|
||||
"showFavoritePodcasts": "Show a row of your favorite podcasts",
|
||||
"extractColorsFromArtwork": "Extract colors from album and artist artwork",
|
||||
"chooseHomeScreenRows": "Choose which rows to display on the home screen",
|
||||
"favorite": "Favorite",
|
||||
"addedToFavorites": "Added to favorites",
|
||||
"removedFromFavorites": "Removed from favorites",
|
||||
"addedToLibrary": "Added to library",
|
||||
"removedFromLibrary": "Removed from library",
|
||||
"addToLibrary": "Add",
|
||||
"addToLibrary": "Add to library",
|
||||
"unknown": "Unknown",
|
||||
"noUpcomingTracks": "No upcoming tracks",
|
||||
"showAll": "Show all",
|
||||
@@ -1150,10 +1140,6 @@
|
||||
"audiobookLibraries": "Audiobook Libraries",
|
||||
"chooseAudiobookLibraries": "Choose which Audiobookshelf libraries to include",
|
||||
"unknownLibrary": "Unknown Library",
|
||||
"musicProviders": "Music Providers",
|
||||
"musicProvidersDescription": "Choose which accounts to show in your library",
|
||||
"libraryRefreshing": "Refreshing library...",
|
||||
"cannotDisableLastProvider": "Cannot disable the last provider",
|
||||
"noSeriesFound": "No Series Found",
|
||||
"ensembleBugReport": "Ensemble Bug Report",
|
||||
"byOwner": "By {owner}",
|
||||
@@ -1217,21 +1203,11 @@
|
||||
"description": "Bottom sheet title for adding album to queue"
|
||||
},
|
||||
|
||||
"addToQueue": "Add to queue",
|
||||
"@addToQueue": {
|
||||
"description": "Add item to queue on selected player"
|
||||
},
|
||||
|
||||
"addToQueueOn": "Add to queue on...",
|
||||
"@addToQueueOn": {
|
||||
"description": "Bottom sheet title for adding to queue"
|
||||
},
|
||||
|
||||
"startRadio": "Start radio",
|
||||
"@startRadio": {
|
||||
"description": "Start radio on selected player"
|
||||
},
|
||||
|
||||
"startRadioOn": "Start {name} radio on...",
|
||||
"@startRadioOn": {
|
||||
"description": "Bottom sheet title for starting radio",
|
||||
@@ -1312,16 +1288,6 @@
|
||||
"description": "Description for smart sort players setting"
|
||||
},
|
||||
|
||||
"disableAutoSwitch": "Disable Auto-Switch",
|
||||
"@disableAutoSwitch": {
|
||||
"description": "Setting to disable automatic player switching"
|
||||
},
|
||||
|
||||
"disableAutoSwitchDescription": "Never automatically switch to a different player",
|
||||
"@disableAutoSwitchDescription": {
|
||||
"description": "Description for disable auto-switch setting"
|
||||
},
|
||||
|
||||
"playerStateUnavailable": "Unavailable",
|
||||
"@playerStateUnavailable": {
|
||||
"description": "Player state when unavailable"
|
||||
@@ -1377,31 +1343,6 @@
|
||||
"description": "Description for show hints toggle"
|
||||
},
|
||||
|
||||
"volumePrecisionMode": "Volume Precision Mode",
|
||||
"@volumePrecisionMode": {
|
||||
"description": "Setting for fine volume control"
|
||||
},
|
||||
|
||||
"volumePrecisionModeDescription": "Hold still while adjusting volume for fine control",
|
||||
"@volumePrecisionModeDescription": {
|
||||
"description": "Description for volume precision mode setting"
|
||||
},
|
||||
|
||||
"display": "Display",
|
||||
"@display": {
|
||||
"description": "Settings section title for display options"
|
||||
},
|
||||
|
||||
"showProviderIcons": "Show Provider Icons",
|
||||
"@showProviderIcons": {
|
||||
"description": "Toggle label for showing provider icons on album art"
|
||||
},
|
||||
|
||||
"showProviderIconsDescription": "Display provider logos on album art",
|
||||
"@showProviderIconsDescription": {
|
||||
"description": "Description for show provider icons toggle"
|
||||
},
|
||||
|
||||
"pullToSelectPlayers": "Pull to select players",
|
||||
"@pullToSelectPlayers": {
|
||||
"description": "Hint shown when mini player bounces"
|
||||
@@ -1490,198 +1431,5 @@
|
||||
"longPressPodcastHint": "Long-press a podcast and tap the heart to add it to favorites",
|
||||
"@longPressPodcastHint": {
|
||||
"description": "Hint for favoriting podcasts"
|
||||
},
|
||||
|
||||
"failedToPlayRadioStation": "Failed to play radio station: {error}",
|
||||
"@failedToPlayRadioStation": {
|
||||
"description": "Error when playing radio station fails",
|
||||
"placeholders": {
|
||||
"error": {
|
||||
"type": "String"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"itemAlreadyInLibrary": "Item is already in library",
|
||||
"@itemAlreadyInLibrary": {
|
||||
"description": "Message when trying to add item already in library"
|
||||
},
|
||||
|
||||
"failedToAddToLibrary": "Failed to add to library",
|
||||
"@failedToAddToLibrary": {
|
||||
"description": "Error when adding to library fails"
|
||||
},
|
||||
|
||||
"cannotFindLibraryId": "Cannot find library ID for removal",
|
||||
"@cannotFindLibraryId": {
|
||||
"description": "Error when library ID not found for removal"
|
||||
},
|
||||
|
||||
"failedToRemoveFromLibrary": "Failed to remove from library",
|
||||
"@failedToRemoveFromLibrary": {
|
||||
"description": "Error when removing from library fails"
|
||||
},
|
||||
|
||||
"failedToPlayAlbum": "Failed to play album: {error}",
|
||||
"@failedToPlayAlbum": {
|
||||
"description": "Error when playing album fails",
|
||||
"placeholders": {
|
||||
"error": {
|
||||
"type": "String"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"playingOnPlayer": "Playing {name} on {playerName}",
|
||||
"@playingOnPlayer": {
|
||||
"description": "Status when playing item on specific player",
|
||||
"placeholders": {
|
||||
"name": {
|
||||
"type": "String"
|
||||
},
|
||||
"playerName": {
|
||||
"type": "String"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"failedToPlayPlaylist": "Failed to play playlist: {error}",
|
||||
"@failedToPlayPlaylist": {
|
||||
"description": "Error when playing playlist fails",
|
||||
"placeholders": {
|
||||
"error": {
|
||||
"type": "String"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"failedToPlayAudiobook": "Failed to play audiobook: {error}",
|
||||
"@failedToPlayAudiobook": {
|
||||
"description": "Error when playing audiobook fails",
|
||||
"placeholders": {
|
||||
"error": {
|
||||
"type": "String"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"noOtherPlayersAvailable": "No other players available",
|
||||
"@noOtherPlayersAvailable": {
|
||||
"description": "Message when no other players available for transfer"
|
||||
},
|
||||
|
||||
"transferQueue": "Transfer queue",
|
||||
"@transferQueue": {
|
||||
"description": "Tooltip for transfer queue button"
|
||||
},
|
||||
|
||||
"clearQueue": "Clear queue",
|
||||
"@clearQueue": {
|
||||
"description": "Tooltip for clear queue button"
|
||||
},
|
||||
|
||||
"syncingPlayer": "Syncing {playerName}...",
|
||||
"@syncingPlayer": {
|
||||
"description": "Status when syncing player",
|
||||
"placeholders": {
|
||||
"playerName": {
|
||||
"type": "String"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"switchPlayer": "Switch Player",
|
||||
"@switchPlayer": {
|
||||
"description": "Label for switch player action"
|
||||
},
|
||||
|
||||
"logsCopiedToClipboard": "Logs copied to clipboard",
|
||||
"@logsCopiedToClipboard": {
|
||||
"description": "Confirmation when logs copied"
|
||||
},
|
||||
|
||||
"auto": "Auto",
|
||||
"@auto": {
|
||||
"description": "Auto option for language selection"
|
||||
},
|
||||
|
||||
"transferQueueTo": "Transfer Queue To",
|
||||
"@transferQueueTo": {
|
||||
"description": "Title for transfer queue dialog"
|
||||
},
|
||||
|
||||
"queueTransferredTo": "Queue transferred to {playerName}",
|
||||
"@queueTransferredTo": {
|
||||
"description": "Success message when queue transferred",
|
||||
"placeholders": {
|
||||
"playerName": {
|
||||
"type": "String"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"failedToTransferQueue": "Failed to transfer queue: {error}",
|
||||
"@failedToTransferQueue": {
|
||||
"description": "Error when queue transfer fails",
|
||||
"placeholders": {
|
||||
"error": {
|
||||
"type": "String"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"failedToLoadQueue": "Failed to load queue: {error}",
|
||||
"@failedToLoadQueue": {
|
||||
"description": "Error when queue loading fails",
|
||||
"placeholders": {
|
||||
"error": {
|
||||
"type": "String"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"transferTo": "Transfer to...",
|
||||
"@transferTo": {
|
||||
"description": "Label for transfer destination selection"
|
||||
},
|
||||
|
||||
"transferQueueToPlayer": "Transfer queue to another player",
|
||||
"@transferQueueToPlayer": {
|
||||
"description": "Tooltip for transfer queue button"
|
||||
},
|
||||
|
||||
"selectPlayerToPlay": "Select a player",
|
||||
"@selectPlayerToPlay": {
|
||||
"description": "Generic hint for selecting a player in player selector"
|
||||
},
|
||||
|
||||
"selectPlayerToPlayAlbum": "Select player to play album",
|
||||
"@selectPlayerToPlayAlbum": {
|
||||
"description": "Hint for selecting player to play album"
|
||||
},
|
||||
|
||||
"selectPlayerToPlayPlaylist": "Select player to play playlist",
|
||||
"@selectPlayerToPlayPlaylist": {
|
||||
"description": "Hint for selecting player to play playlist"
|
||||
},
|
||||
|
||||
"selectPlayerForRadio": "Select player for radio",
|
||||
"@selectPlayerForRadio": {
|
||||
"description": "Hint for selecting player to start radio"
|
||||
},
|
||||
|
||||
"selectPlayerForEpisode": "Select player for episode",
|
||||
"@selectPlayerForEpisode": {
|
||||
"description": "Hint for selecting player to play episode"
|
||||
},
|
||||
|
||||
"selectPlayerForAudiobook": "Select player for audiobook",
|
||||
"@selectPlayerForAudiobook": {
|
||||
"description": "Hint for selecting player to play audiobook"
|
||||
},
|
||||
|
||||
"selectPlayerToAddToQueue": "Select player to add to queue",
|
||||
"@selectPlayerToAddToQueue": {
|
||||
"description": "Hint for selecting player to add to queue"
|
||||
}
|
||||
}
|
||||
|
||||
+17
-309
@@ -64,8 +64,7 @@ import 'app_localizations_fr.dart';
|
||||
/// be consistent with the languages listed in the S.supportedLocales
|
||||
/// property.
|
||||
abstract class S {
|
||||
S(String locale)
|
||||
: localeName = intl.Intl.canonicalizedLocale(locale.toString());
|
||||
S(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
|
||||
|
||||
final String localeName;
|
||||
|
||||
@@ -85,8 +84,7 @@ abstract class S {
|
||||
/// Additional delegates can be added by appending to this list in
|
||||
/// MaterialApp. This list does not have to be used at all if a custom list
|
||||
/// of delegates is preferred or required.
|
||||
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
|
||||
<LocalizationsDelegate<dynamic>>[
|
||||
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
|
||||
delegate,
|
||||
GlobalMaterialLocalizations.delegate,
|
||||
GlobalCupertinoLocalizations.delegate,
|
||||
@@ -164,7 +162,7 @@ abstract class S {
|
||||
/// Description for port field
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Leave blank unless using a custom port'**
|
||||
/// **'Leave blank for reverse proxy or standard ports. Enter 8095 for direct connection.'**
|
||||
String get portDescription;
|
||||
|
||||
/// Username field label
|
||||
@@ -761,18 +759,12 @@ abstract class S {
|
||||
/// **'Album added to queue'**
|
||||
String get albumAddedToQueue;
|
||||
|
||||
/// Snackbar message for tracks added to queue
|
||||
/// Confirmation when tracks added
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Tracks added to queue'**
|
||||
String get tracksAddedToQueue;
|
||||
|
||||
/// Confirmation when tracks added
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Track added to queue'**
|
||||
String get trackAddedToQueue;
|
||||
|
||||
/// Play button label
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
@@ -1235,30 +1227,6 @@ abstract class S {
|
||||
/// **'Sort by series order'**
|
||||
String get sortBySeriesOrder;
|
||||
|
||||
/// No description provided for @sortByDuration.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Sort by duration'**
|
||||
String get sortByDuration;
|
||||
|
||||
/// No description provided for @newestFirst.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Newest first'**
|
||||
String get newestFirst;
|
||||
|
||||
/// No description provided for @oldestFirst.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Oldest first'**
|
||||
String get oldestFirst;
|
||||
|
||||
/// No description provided for @viewDetails.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'View details'**
|
||||
String get viewDetails;
|
||||
|
||||
/// No description provided for @listView.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
@@ -1367,12 +1335,6 @@ abstract class S {
|
||||
/// **'Choose which rows to display on the home screen'**
|
||||
String get chooseHomeScreenRows;
|
||||
|
||||
/// No description provided for @favorite.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Favorite'**
|
||||
String get favorite;
|
||||
|
||||
/// No description provided for @addedToFavorites.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
@@ -1400,7 +1362,7 @@ abstract class S {
|
||||
/// No description provided for @addToLibrary.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Add'**
|
||||
/// **'Add to library'**
|
||||
String get addToLibrary;
|
||||
|
||||
/// No description provided for @unknown.
|
||||
@@ -1601,30 +1563,6 @@ abstract class S {
|
||||
/// **'Unknown Library'**
|
||||
String get unknownLibrary;
|
||||
|
||||
/// No description provided for @musicProviders.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Music Providers'**
|
||||
String get musicProviders;
|
||||
|
||||
/// No description provided for @musicProvidersDescription.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Choose which accounts to show in your library'**
|
||||
String get musicProvidersDescription;
|
||||
|
||||
/// No description provided for @libraryRefreshing.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Refreshing library...'**
|
||||
String get libraryRefreshing;
|
||||
|
||||
/// No description provided for @cannotDisableLastProvider.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Cannot disable the last provider'**
|
||||
String get cannotDisableLastProvider;
|
||||
|
||||
/// No description provided for @noSeriesFound.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
@@ -1709,24 +1647,12 @@ abstract class S {
|
||||
/// **'Add album to queue on...'**
|
||||
String get addAlbumToQueueOn;
|
||||
|
||||
/// Add item to queue on selected player
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Add to queue'**
|
||||
String get addToQueue;
|
||||
|
||||
/// Bottom sheet title for adding to queue
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Add to queue on...'**
|
||||
String get addToQueueOn;
|
||||
|
||||
/// Start radio on selected player
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Start radio'**
|
||||
String get startRadio;
|
||||
|
||||
/// Bottom sheet title for starting radio
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
@@ -1811,18 +1737,6 @@ abstract class S {
|
||||
/// **'Sort by status (playing, on, off) instead of alphabetically'**
|
||||
String get smartSortPlayersDescription;
|
||||
|
||||
/// Setting to disable automatic player switching
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Disable Auto-Switch'**
|
||||
String get disableAutoSwitch;
|
||||
|
||||
/// Description for disable auto-switch setting
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Never automatically switch to a different player'**
|
||||
String get disableAutoSwitchDescription;
|
||||
|
||||
/// Player state when unavailable
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
@@ -1883,36 +1797,6 @@ abstract class S {
|
||||
/// **'Display helpful tips for discovering features'**
|
||||
String get showHintsDescription;
|
||||
|
||||
/// Setting for fine volume control
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Volume Precision Mode'**
|
||||
String get volumePrecisionMode;
|
||||
|
||||
/// Description for volume precision mode setting
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Hold still while adjusting volume for fine control'**
|
||||
String get volumePrecisionModeDescription;
|
||||
|
||||
/// Settings section title for display options
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Display'**
|
||||
String get display;
|
||||
|
||||
/// Toggle label for showing provider icons on album art
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Show Provider Icons'**
|
||||
String get showProviderIcons;
|
||||
|
||||
/// Description for show provider icons toggle
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Display provider logos on album art'**
|
||||
String get showProviderIconsDescription;
|
||||
|
||||
/// Hint shown when mini player bounces
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
@@ -2008,180 +1892,6 @@ abstract class S {
|
||||
/// In en, this message translates to:
|
||||
/// **'Long-press a podcast and tap the heart to add it to favorites'**
|
||||
String get longPressPodcastHint;
|
||||
|
||||
/// Error when playing radio station fails
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Failed to play radio station: {error}'**
|
||||
String failedToPlayRadioStation(String error);
|
||||
|
||||
/// Message when trying to add item already in library
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Item is already in library'**
|
||||
String get itemAlreadyInLibrary;
|
||||
|
||||
/// Error when adding to library fails
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Failed to add to library'**
|
||||
String get failedToAddToLibrary;
|
||||
|
||||
/// Error when library ID not found for removal
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Cannot find library ID for removal'**
|
||||
String get cannotFindLibraryId;
|
||||
|
||||
/// Error when removing from library fails
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Failed to remove from library'**
|
||||
String get failedToRemoveFromLibrary;
|
||||
|
||||
/// Error when playing album fails
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Failed to play album: {error}'**
|
||||
String failedToPlayAlbum(String error);
|
||||
|
||||
/// Status when playing item on specific player
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Playing {name} on {playerName}'**
|
||||
String playingOnPlayer(String name, String playerName);
|
||||
|
||||
/// Error when playing playlist fails
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Failed to play playlist: {error}'**
|
||||
String failedToPlayPlaylist(String error);
|
||||
|
||||
/// Error when playing audiobook fails
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Failed to play audiobook: {error}'**
|
||||
String failedToPlayAudiobook(String error);
|
||||
|
||||
/// Message when no other players available for transfer
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'No other players available'**
|
||||
String get noOtherPlayersAvailable;
|
||||
|
||||
/// Tooltip for transfer queue button
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Transfer queue'**
|
||||
String get transferQueue;
|
||||
|
||||
/// Tooltip for clear queue button
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Clear queue'**
|
||||
String get clearQueue;
|
||||
|
||||
/// Status when syncing player
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Syncing {playerName}...'**
|
||||
String syncingPlayer(String playerName);
|
||||
|
||||
/// Label for switch player action
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Switch Player'**
|
||||
String get switchPlayer;
|
||||
|
||||
/// Confirmation when logs copied
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Logs copied to clipboard'**
|
||||
String get logsCopiedToClipboard;
|
||||
|
||||
/// Auto option for language selection
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Auto'**
|
||||
String get auto;
|
||||
|
||||
/// Title for transfer queue dialog
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Transfer Queue To'**
|
||||
String get transferQueueTo;
|
||||
|
||||
/// Success message when queue transferred
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Queue transferred to {playerName}'**
|
||||
String queueTransferredTo(String playerName);
|
||||
|
||||
/// Error when queue transfer fails
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Failed to transfer queue: {error}'**
|
||||
String failedToTransferQueue(String error);
|
||||
|
||||
/// Error when queue loading fails
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Failed to load queue: {error}'**
|
||||
String failedToLoadQueue(String error);
|
||||
|
||||
/// Label for transfer destination selection
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Transfer to...'**
|
||||
String get transferTo;
|
||||
|
||||
/// Tooltip for transfer queue button
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Transfer queue to another player'**
|
||||
String get transferQueueToPlayer;
|
||||
|
||||
/// Generic hint for selecting a player in player selector
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Select a player'**
|
||||
String get selectPlayerToPlay;
|
||||
|
||||
/// Hint for selecting player to play album
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Select player to play album'**
|
||||
String get selectPlayerToPlayAlbum;
|
||||
|
||||
/// Hint for selecting player to play playlist
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Select player to play playlist'**
|
||||
String get selectPlayerToPlayPlaylist;
|
||||
|
||||
/// Hint for selecting player to start radio
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Select player for radio'**
|
||||
String get selectPlayerForRadio;
|
||||
|
||||
/// Hint for selecting player to play episode
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Select player for episode'**
|
||||
String get selectPlayerForEpisode;
|
||||
|
||||
/// Hint for selecting player to play audiobook
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Select player for audiobook'**
|
||||
String get selectPlayerForAudiobook;
|
||||
|
||||
/// Hint for selecting player to add to queue
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Select player to add to queue'**
|
||||
String get selectPlayerToAddToQueue;
|
||||
}
|
||||
|
||||
class _SDelegate extends LocalizationsDelegate<S> {
|
||||
@@ -2193,29 +1903,27 @@ class _SDelegate extends LocalizationsDelegate<S> {
|
||||
}
|
||||
|
||||
@override
|
||||
bool isSupported(Locale locale) =>
|
||||
<String>['de', 'en', 'es', 'fr'].contains(locale.languageCode);
|
||||
bool isSupported(Locale locale) => <String>['de', 'en', 'es', 'fr'].contains(locale.languageCode);
|
||||
|
||||
@override
|
||||
bool shouldReload(_SDelegate old) => false;
|
||||
}
|
||||
|
||||
S lookupS(Locale locale) {
|
||||
|
||||
|
||||
// Lookup logic when only language code is specified.
|
||||
switch (locale.languageCode) {
|
||||
case 'de':
|
||||
return SDe();
|
||||
case 'en':
|
||||
return SEn();
|
||||
case 'es':
|
||||
return SEs();
|
||||
case 'fr':
|
||||
return SFr();
|
||||
case 'de': return SDe();
|
||||
case 'en': return SEn();
|
||||
case 'es': return SEs();
|
||||
case 'fr': return SFr();
|
||||
}
|
||||
|
||||
throw FlutterError(
|
||||
'S.delegate failed to load unsupported locale "$locale". This is likely '
|
||||
'an issue with the localizations generation tool. Please file an issue '
|
||||
'on GitHub with a reproducible sample app and the gen-l10n configuration '
|
||||
'that was used.');
|
||||
'S.delegate failed to load unsupported locale "$locale". This is likely '
|
||||
'an issue with the localizations generation tool. Please file an issue '
|
||||
'on GitHub with a reproducible sample app and the gen-l10n configuration '
|
||||
'that was used.'
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// ignore: unused_import
|
||||
import 'package:intl/intl.dart' as intl;
|
||||
|
||||
import 'app_localizations.dart';
|
||||
|
||||
// ignore_for_file: type=lint
|
||||
@@ -39,8 +39,7 @@ class SDe extends S {
|
||||
String get portHint => 'z.B. 8095 oder leer lassen';
|
||||
|
||||
@override
|
||||
String get portDescription =>
|
||||
'Leer lassen bei Reverse Proxy oder Standardports. 8095 eingeben bei Direktverbindung.';
|
||||
String get portDescription => 'Leer lassen bei Reverse Proxy oder Standardports. 8095 eingeben bei Direktverbindung.';
|
||||
|
||||
@override
|
||||
String get username => 'Benutzername';
|
||||
@@ -61,12 +60,10 @@ class SDe extends S {
|
||||
String get authServerUrlOptional => 'Auth-Server URL (Optional)';
|
||||
|
||||
@override
|
||||
String get authServerUrlHint =>
|
||||
'z.B. auth.example.com (wenn abweichend vom Server)';
|
||||
String get authServerUrlHint => 'z.B. auth.example.com (wenn abweichend vom Server)';
|
||||
|
||||
@override
|
||||
String get authServerUrlDescription =>
|
||||
'Leer lassen, wenn Authentifizierung auf demselben Server';
|
||||
String get authServerUrlDescription => 'Leer lassen, wenn Authentifizierung auf demselben Server';
|
||||
|
||||
@override
|
||||
String detectedAuthType(String authType) {
|
||||
@@ -83,49 +80,40 @@ class SDe extends S {
|
||||
String get unencryptedConnection => 'Unverschlusselte Verbindung';
|
||||
|
||||
@override
|
||||
String get usingHttpOverTailscale =>
|
||||
'HTTP uber Tailscale (verschlusselter Tunnel)';
|
||||
String get usingHttpOverTailscale => 'HTTP uber Tailscale (verschlusselter Tunnel)';
|
||||
|
||||
@override
|
||||
String get httpsFailedUsingHttp => 'HTTPS fehlgeschlagen, verwende HTTP';
|
||||
|
||||
@override
|
||||
String get httpNotEncrypted =>
|
||||
'HTTP-Verbindung - Daten sind nicht verschlusselt';
|
||||
String get httpNotEncrypted => 'HTTP-Verbindung - Daten sind nicht verschlusselt';
|
||||
|
||||
@override
|
||||
String get pleaseEnterServerAddress =>
|
||||
'Bitte gib deine Music Assistant Serveradresse ein';
|
||||
String get pleaseEnterServerAddress => 'Bitte gib deine Music Assistant Serveradresse ein';
|
||||
|
||||
@override
|
||||
String get pleaseEnterName => 'Bitte gib deinen Namen ein';
|
||||
|
||||
@override
|
||||
String get pleaseEnterValidPort =>
|
||||
'Bitte gib eine gultige Portnummer ein (1-65535)';
|
||||
String get pleaseEnterValidPort => 'Bitte gib eine gultige Portnummer ein (1-65535)';
|
||||
|
||||
@override
|
||||
String get pleaseEnterCredentials =>
|
||||
'Bitte gib Benutzername und Passwort ein';
|
||||
String get pleaseEnterCredentials => 'Bitte gib Benutzername und Passwort ein';
|
||||
|
||||
@override
|
||||
String get authFailed =>
|
||||
'Authentifizierung fehlgeschlagen. Bitte uberprufe deine Anmeldedaten.';
|
||||
String get authFailed => 'Authentifizierung fehlgeschlagen. Bitte uberprufe deine Anmeldedaten.';
|
||||
|
||||
@override
|
||||
String get maLoginFailed =>
|
||||
'Music Assistant Anmeldung fehlgeschlagen. Bitte uberprufe deine Anmeldedaten.';
|
||||
String get maLoginFailed => 'Music Assistant Anmeldung fehlgeschlagen. Bitte uberprufe deine Anmeldedaten.';
|
||||
|
||||
@override
|
||||
String get connectionFailed =>
|
||||
'Verbindung zum Server fehlgeschlagen. Bitte uberprufe die Adresse und versuche es erneut.';
|
||||
String get connectionFailed => 'Verbindung zum Server fehlgeschlagen. Bitte uberprufe die Adresse und versuche es erneut.';
|
||||
|
||||
@override
|
||||
String get detectingAuth => 'Erkenne Authentifizierung...';
|
||||
|
||||
@override
|
||||
String get cannotDetermineAuth =>
|
||||
'Authentifizierungsanforderungen konnten nicht ermittelt werden. Bitte uberprufe die Server-URL.';
|
||||
String get cannotDetermineAuth => 'Authentifizierungsanforderungen konnten nicht ermittelt werden. Bitte uberprufe die Server-URL.';
|
||||
|
||||
@override
|
||||
String get noAuthentication => 'Keine Authentifizierung';
|
||||
@@ -233,12 +221,10 @@ class SDe extends S {
|
||||
String get noRadioStations => 'Keine Radiosender';
|
||||
|
||||
@override
|
||||
String get addRadioStationsHint =>
|
||||
'Füge Radiosender in Music Assistant hinzu';
|
||||
String get addRadioStationsHint => 'Füge Radiosender in Music Assistant hinzu';
|
||||
|
||||
@override
|
||||
String get searchFailed =>
|
||||
'Suche fehlgeschlagen. Bitte überprüfe deine Verbindung.';
|
||||
String get searchFailed => 'Suche fehlgeschlagen. Bitte überprüfe deine Verbindung.';
|
||||
|
||||
@override
|
||||
String get queue => 'Warteschlange';
|
||||
@@ -373,9 +359,6 @@ class SDe extends S {
|
||||
@override
|
||||
String get tracksAddedToQueue => 'Songs zur Warteschlange hinzugefügt';
|
||||
|
||||
@override
|
||||
String get trackAddedToQueue => 'Track added to queue';
|
||||
|
||||
@override
|
||||
String get play => 'Abspielen';
|
||||
|
||||
@@ -488,43 +471,37 @@ class SDe extends S {
|
||||
String get noFavoriteAudiobooks => 'Keine Lieblingshörbücher';
|
||||
|
||||
@override
|
||||
String get tapHeartAudiobook =>
|
||||
'Tippe auf das Herz bei einem Hörbuch, um es zu Favoriten hinzuzufügen';
|
||||
String get tapHeartAudiobook => 'Tippe auf das Herz bei einem Hörbuch, um es zu Favoriten hinzuzufügen';
|
||||
|
||||
@override
|
||||
String get noAudiobooks => 'Keine Hörbücher';
|
||||
|
||||
@override
|
||||
String get addAudiobooksHint =>
|
||||
'Füge Hörbücher zu deiner Bibliothek hinzu, um sie hier zu sehen';
|
||||
String get addAudiobooksHint => 'Füge Hörbücher zu deiner Bibliothek hinzu, um sie hier zu sehen';
|
||||
|
||||
@override
|
||||
String get noFavoriteArtists => 'Keine Lieblingskünstler';
|
||||
|
||||
@override
|
||||
String get tapHeartArtist =>
|
||||
'Tippe auf das Herz bei einem Künstler, um ihn zu Favoriten hinzuzufügen';
|
||||
String get tapHeartArtist => 'Tippe auf das Herz bei einem Künstler, um ihn zu Favoriten hinzuzufügen';
|
||||
|
||||
@override
|
||||
String get noFavoriteAlbums => 'Keine Lieblingsalben';
|
||||
|
||||
@override
|
||||
String get tapHeartAlbum =>
|
||||
'Tippe auf das Herz bei einem Album, um es zu Favoriten hinzuzufügen';
|
||||
String get tapHeartAlbum => 'Tippe auf das Herz bei einem Album, um es zu Favoriten hinzuzufügen';
|
||||
|
||||
@override
|
||||
String get noFavoritePlaylists => 'Keine Lieblings-Wiedergabelisten';
|
||||
|
||||
@override
|
||||
String get tapHeartPlaylist =>
|
||||
'Tippe auf das Herz bei einer Wiedergabeliste, um sie zu Favoriten hinzuzufügen';
|
||||
String get tapHeartPlaylist => 'Tippe auf das Herz bei einer Wiedergabeliste, um sie zu Favoriten hinzuzufügen';
|
||||
|
||||
@override
|
||||
String get noFavoriteTracks => 'Keine Lieblingssongs';
|
||||
|
||||
@override
|
||||
String get longPressTrackHint =>
|
||||
'Halte einen Song gedrückt und tippe auf das Herz, um ihn zu Favoriten hinzuzufügen';
|
||||
String get longPressTrackHint => 'Halte einen Song gedrückt und tippe auf das Herz, um ihn zu Favoriten hinzuzufügen';
|
||||
|
||||
@override
|
||||
String get loadSeries => 'Serien laden';
|
||||
@@ -536,8 +513,7 @@ class SDe extends S {
|
||||
String get notConnectedTitle => 'Nicht verbunden';
|
||||
|
||||
@override
|
||||
String get connectHint =>
|
||||
'Verbinde dich mit deinem Music Assistant Server, um Musik zu hören';
|
||||
String get connectHint => 'Verbinde dich mit deinem Music Assistant Server, um Musik zu hören';
|
||||
|
||||
@override
|
||||
String get configureServer => 'Server konfigurieren';
|
||||
@@ -573,8 +549,7 @@ class SDe extends S {
|
||||
String get noLogsToCopy => 'Keine Protokolle zum Kopieren';
|
||||
|
||||
@override
|
||||
String get noDebugLogsYet =>
|
||||
'Noch keine Debug-Protokolle. Versuche Authentifizierung zu erkennen.';
|
||||
String get noDebugLogsYet => 'Noch keine Debug-Protokolle. Versuche Authentifizierung zu erkennen.';
|
||||
|
||||
@override
|
||||
String get showDebug => 'Debug anzeigen';
|
||||
@@ -649,18 +624,6 @@ class SDe extends S {
|
||||
@override
|
||||
String get sortBySeriesOrder => 'Nach Serienreihenfolge sortieren';
|
||||
|
||||
@override
|
||||
String get sortByDuration => 'Sort by duration';
|
||||
|
||||
@override
|
||||
String get newestFirst => 'Newest first';
|
||||
|
||||
@override
|
||||
String get oldestFirst => 'Oldest first';
|
||||
|
||||
@override
|
||||
String get viewDetails => 'View details';
|
||||
|
||||
@override
|
||||
String get listView => 'Listenansicht';
|
||||
|
||||
@@ -686,12 +649,10 @@ class SDe extends S {
|
||||
String get showAudiobooksInProgress => 'Hörbücher in Bearbeitung anzeigen';
|
||||
|
||||
@override
|
||||
String get showRandomAudiobooks =>
|
||||
'Zufällige Hörbücher zum Entdecken anzeigen';
|
||||
String get showRandomAudiobooks => 'Zufällige Hörbücher zum Entdecken anzeigen';
|
||||
|
||||
@override
|
||||
String get showRandomSeries =>
|
||||
'Zufällige Hörbuchserien zum Entdecken anzeigen';
|
||||
String get showRandomSeries => 'Zufällige Hörbuchserien zum Entdecken anzeigen';
|
||||
|
||||
@override
|
||||
String get showFavoriteAlbums => 'Lieblingsalben anzeigen';
|
||||
@@ -706,22 +667,16 @@ class SDe extends S {
|
||||
String get showFavoritePlaylists => 'Show a row of your favorite playlists';
|
||||
|
||||
@override
|
||||
String get showFavoriteRadioStations =>
|
||||
'Show a row of your favorite radio stations';
|
||||
String get showFavoriteRadioStations => 'Show a row of your favorite radio stations';
|
||||
|
||||
@override
|
||||
String get showFavoritePodcasts => 'Show a row of your favorite podcasts';
|
||||
|
||||
@override
|
||||
String get extractColorsFromArtwork =>
|
||||
'Farben aus Album- und Künstlercover extrahieren';
|
||||
String get extractColorsFromArtwork => 'Farben aus Album- und Künstlercover extrahieren';
|
||||
|
||||
@override
|
||||
String get chooseHomeScreenRows =>
|
||||
'Wähle welche Zeilen auf dem Startbildschirm angezeigt werden';
|
||||
|
||||
@override
|
||||
String get favorite => 'Favorite';
|
||||
String get chooseHomeScreenRows => 'Wähle welche Zeilen auf dem Startbildschirm angezeigt werden';
|
||||
|
||||
@override
|
||||
String get addedToFavorites => 'Zu Favoriten hinzugefügt';
|
||||
@@ -736,7 +691,7 @@ class SDe extends S {
|
||||
String get removedFromLibrary => 'Removed from library';
|
||||
|
||||
@override
|
||||
String get addToLibrary => 'Add';
|
||||
String get addToLibrary => 'Add to library';
|
||||
|
||||
@override
|
||||
String get unknown => 'Unbekannt';
|
||||
@@ -830,32 +785,17 @@ class SDe extends S {
|
||||
String get theAudioDbApiKey => 'TheAudioDB API-Schlüssel';
|
||||
|
||||
@override
|
||||
String get theAudioDbApiKeyHint =>
|
||||
'\"2\" für kostenlosen Zugang oder Premium-Schlüssel';
|
||||
String get theAudioDbApiKeyHint => '\"2\" für kostenlosen Zugang oder Premium-Schlüssel';
|
||||
|
||||
@override
|
||||
String get audiobookLibraries => 'Hörbuch-Bibliotheken';
|
||||
|
||||
@override
|
||||
String get chooseAudiobookLibraries =>
|
||||
'Wähle welche Audiobookshelf-Bibliotheken einbezogen werden';
|
||||
String get chooseAudiobookLibraries => 'Wähle welche Audiobookshelf-Bibliotheken einbezogen werden';
|
||||
|
||||
@override
|
||||
String get unknownLibrary => 'Unbekannte Bibliothek';
|
||||
|
||||
@override
|
||||
String get musicProviders => 'Music Providers';
|
||||
|
||||
@override
|
||||
String get musicProvidersDescription =>
|
||||
'Choose which accounts to show in your library';
|
||||
|
||||
@override
|
||||
String get libraryRefreshing => 'Refreshing library...';
|
||||
|
||||
@override
|
||||
String get cannotDisableLastProvider => 'Cannot disable the last provider';
|
||||
|
||||
@override
|
||||
String get noSeriesFound => 'Keine Serien gefunden';
|
||||
|
||||
@@ -868,19 +808,16 @@ class SDe extends S {
|
||||
}
|
||||
|
||||
@override
|
||||
String get noSeriesAvailable =>
|
||||
'Keine Serien in deiner Hörbuch-Bibliothek verfügbar.\nZiehe zum Aktualisieren.';
|
||||
String get noSeriesAvailable => 'Keine Serien in deiner Hörbuch-Bibliothek verfügbar.\nZiehe zum Aktualisieren.';
|
||||
|
||||
@override
|
||||
String get pullToLoadSeries =>
|
||||
'Ziehe nach unten um Serien\nvon Music Assistant zu laden';
|
||||
String get pullToLoadSeries => 'Ziehe nach unten um Serien\nvon Music Assistant zu laden';
|
||||
|
||||
@override
|
||||
String get search => 'Suche';
|
||||
|
||||
@override
|
||||
String get metadataApisDescription =>
|
||||
'Künstlerbilder werden automatisch von Deezer abgerufen. Füge unten API-Schlüssel für Künstlerbiografien und Albenbeschreibungen hinzu.';
|
||||
String get metadataApisDescription => 'Künstlerbilder werden automatisch von Deezer abgerufen. Füge unten API-Schlüssel für Künstlerbiografien und Albenbeschreibungen hinzu.';
|
||||
|
||||
@override
|
||||
String get lastFmApiKey => 'Last.fm API-Schlüssel';
|
||||
@@ -905,15 +842,9 @@ class SDe extends S {
|
||||
@override
|
||||
String get addAlbumToQueueOn => 'Album zur Warteschlange hinzufügen auf...';
|
||||
|
||||
@override
|
||||
String get addToQueue => 'Add to queue';
|
||||
|
||||
@override
|
||||
String get addToQueueOn => 'Zur Warteschlange hinzufügen auf...';
|
||||
|
||||
@override
|
||||
String get startRadio => 'Start radio';
|
||||
|
||||
@override
|
||||
String startRadioOn(String name) {
|
||||
return '$name Radio starten auf...';
|
||||
@@ -958,22 +889,13 @@ class SDe extends S {
|
||||
String get preferLocalPlayer => 'Lokales Gerät bevorzugen';
|
||||
|
||||
@override
|
||||
String get preferLocalPlayerDescription =>
|
||||
'Dieses Gerät immer zuerst auswählen, wenn verfügbar';
|
||||
String get preferLocalPlayerDescription => 'Dieses Gerät immer zuerst auswählen, wenn verfügbar';
|
||||
|
||||
@override
|
||||
String get smartSortPlayers => 'Intelligente Sortierung';
|
||||
|
||||
@override
|
||||
String get smartSortPlayersDescription =>
|
||||
'Nach Status sortieren (spielt, an, aus) statt alphabetisch';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitch => 'Disable Auto-Switch';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitchDescription =>
|
||||
'Never automatically switch to a different player';
|
||||
String get smartSortPlayersDescription => 'Nach Status sortieren (spielt, an, aus) statt alphabetisch';
|
||||
|
||||
@override
|
||||
String get playerStateUnavailable => 'Nicht verfügbar';
|
||||
@@ -1005,25 +927,7 @@ class SDe extends S {
|
||||
String get showHints => 'Hinweise anzeigen';
|
||||
|
||||
@override
|
||||
String get showHintsDescription =>
|
||||
'Hilfreiche Tipps zum Entdecken von Funktionen anzeigen';
|
||||
|
||||
@override
|
||||
String get volumePrecisionMode => 'Volume Precision Mode';
|
||||
|
||||
@override
|
||||
String get volumePrecisionModeDescription =>
|
||||
'Hold still while adjusting volume for fine control';
|
||||
|
||||
@override
|
||||
String get display => 'Display';
|
||||
|
||||
@override
|
||||
String get showProviderIcons => 'Show Provider Icons';
|
||||
|
||||
@override
|
||||
String get showProviderIconsDescription =>
|
||||
'Display provider logos on album art';
|
||||
String get showHintsDescription => 'Hilfreiche Tipps zum Entdecken von Funktionen anzeigen';
|
||||
|
||||
@override
|
||||
String get pullToSelectPlayers => 'Ziehen um Geräte auszuwählen';
|
||||
@@ -1041,15 +945,13 @@ class SDe extends S {
|
||||
String get welcomeToEnsemble => 'Welcome to Ensemble';
|
||||
|
||||
@override
|
||||
String get welcomeMessage =>
|
||||
'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
String get welcomeMessage => 'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
|
||||
@override
|
||||
String get skip => 'Skip';
|
||||
|
||||
@override
|
||||
String get dismissPlayerHint =>
|
||||
'Swipe down, tap outside, or press back to return';
|
||||
String get dismissPlayerHint => 'Swipe down, tap outside, or press back to return';
|
||||
|
||||
@override
|
||||
String playingAlbum(String albumName) {
|
||||
@@ -1065,125 +967,17 @@ class SDe extends S {
|
||||
String get noTracks => 'No tracks';
|
||||
|
||||
@override
|
||||
String get addTracksHint =>
|
||||
'Add some music to your library to see tracks here';
|
||||
String get addTracksHint => 'Add some music to your library to see tracks here';
|
||||
|
||||
@override
|
||||
String get noFavoriteRadioStations => 'No favorite radio stations';
|
||||
|
||||
@override
|
||||
String get longPressRadioHint =>
|
||||
'Long-press a station and tap the heart to add it to favorites';
|
||||
String get longPressRadioHint => 'Long-press a station and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoritePodcasts => 'No favorite podcasts';
|
||||
|
||||
@override
|
||||
String get longPressPodcastHint =>
|
||||
'Long-press a podcast and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String failedToPlayRadioStation(String error) {
|
||||
return 'Failed to play radio station: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get itemAlreadyInLibrary => 'Item is already in library';
|
||||
|
||||
@override
|
||||
String get failedToAddToLibrary => 'Failed to add to library';
|
||||
|
||||
@override
|
||||
String get cannotFindLibraryId => 'Cannot find library ID for removal';
|
||||
|
||||
@override
|
||||
String get failedToRemoveFromLibrary => 'Failed to remove from library';
|
||||
|
||||
@override
|
||||
String failedToPlayAlbum(String error) {
|
||||
return 'Failed to play album: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String playingOnPlayer(String name, String playerName) {
|
||||
return 'Playing $name on $playerName';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToPlayPlaylist(String error) {
|
||||
return 'Failed to play playlist: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToPlayAudiobook(String error) {
|
||||
return 'Failed to play audiobook: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get noOtherPlayersAvailable => 'No other players available';
|
||||
|
||||
@override
|
||||
String get transferQueue => 'Transfer queue';
|
||||
|
||||
@override
|
||||
String get clearQueue => 'Clear queue';
|
||||
|
||||
@override
|
||||
String syncingPlayer(String playerName) {
|
||||
return 'Syncing $playerName...';
|
||||
}
|
||||
|
||||
@override
|
||||
String get switchPlayer => 'Switch Player';
|
||||
|
||||
@override
|
||||
String get logsCopiedToClipboard => 'Logs copied to clipboard';
|
||||
|
||||
@override
|
||||
String get auto => 'Auto';
|
||||
|
||||
@override
|
||||
String get transferQueueTo => 'Transfer Queue To';
|
||||
|
||||
@override
|
||||
String queueTransferredTo(String playerName) {
|
||||
return 'Queue transferred to $playerName';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToTransferQueue(String error) {
|
||||
return 'Failed to transfer queue: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToLoadQueue(String error) {
|
||||
return 'Failed to load queue: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get transferTo => 'Transfer to...';
|
||||
|
||||
@override
|
||||
String get transferQueueToPlayer => 'Transfer queue to another player';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlay => 'Select a player';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlayAlbum => 'Select player to play album';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlayPlaylist => 'Select player to play playlist';
|
||||
|
||||
@override
|
||||
String get selectPlayerForRadio => 'Select player for radio';
|
||||
|
||||
@override
|
||||
String get selectPlayerForEpisode => 'Select player for episode';
|
||||
|
||||
@override
|
||||
String get selectPlayerForAudiobook => 'Select player for audiobook';
|
||||
|
||||
@override
|
||||
String get selectPlayerToAddToQueue => 'Select player to add to queue';
|
||||
String get longPressPodcastHint => 'Long-press a podcast and tap the heart to add it to favorites';
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// ignore: unused_import
|
||||
import 'package:intl/intl.dart' as intl;
|
||||
|
||||
import 'app_localizations.dart';
|
||||
|
||||
// ignore_for_file: type=lint
|
||||
@@ -39,7 +39,7 @@ class SEn extends S {
|
||||
String get portHint => 'e.g., 8095 or leave blank';
|
||||
|
||||
@override
|
||||
String get portDescription => 'Leave blank unless using a custom port';
|
||||
String get portDescription => 'Leave blank for reverse proxy or standard ports. Enter 8095 for direct connection.';
|
||||
|
||||
@override
|
||||
String get username => 'Username';
|
||||
@@ -60,12 +60,10 @@ class SEn extends S {
|
||||
String get authServerUrlOptional => 'Auth Server URL (Optional)';
|
||||
|
||||
@override
|
||||
String get authServerUrlHint =>
|
||||
'e.g., auth.example.com (if different from server)';
|
||||
String get authServerUrlHint => 'e.g., auth.example.com (if different from server)';
|
||||
|
||||
@override
|
||||
String get authServerUrlDescription =>
|
||||
'Leave empty if authentication is on the same server';
|
||||
String get authServerUrlDescription => 'Leave empty if authentication is on the same server';
|
||||
|
||||
@override
|
||||
String detectedAuthType(String authType) {
|
||||
@@ -82,8 +80,7 @@ class SEn extends S {
|
||||
String get unencryptedConnection => 'Unencrypted Connection';
|
||||
|
||||
@override
|
||||
String get usingHttpOverTailscale =>
|
||||
'Using HTTP over Tailscale (encrypted tunnel)';
|
||||
String get usingHttpOverTailscale => 'Using HTTP over Tailscale (encrypted tunnel)';
|
||||
|
||||
@override
|
||||
String get httpsFailedUsingHttp => 'HTTPS failed, using HTTP fallback';
|
||||
@@ -92,37 +89,31 @@ class SEn extends S {
|
||||
String get httpNotEncrypted => 'HTTP connection - data is not encrypted';
|
||||
|
||||
@override
|
||||
String get pleaseEnterServerAddress =>
|
||||
'Please enter your Music Assistant server address';
|
||||
String get pleaseEnterServerAddress => 'Please enter your Music Assistant server address';
|
||||
|
||||
@override
|
||||
String get pleaseEnterName => 'Please enter your name';
|
||||
|
||||
@override
|
||||
String get pleaseEnterValidPort =>
|
||||
'Please enter a valid port number (1-65535)';
|
||||
String get pleaseEnterValidPort => 'Please enter a valid port number (1-65535)';
|
||||
|
||||
@override
|
||||
String get pleaseEnterCredentials => 'Please enter username and password';
|
||||
|
||||
@override
|
||||
String get authFailed =>
|
||||
'Authentication failed. Please check your credentials.';
|
||||
String get authFailed => 'Authentication failed. Please check your credentials.';
|
||||
|
||||
@override
|
||||
String get maLoginFailed =>
|
||||
'Music Assistant login failed. Please check your credentials.';
|
||||
String get maLoginFailed => 'Music Assistant login failed. Please check your credentials.';
|
||||
|
||||
@override
|
||||
String get connectionFailed =>
|
||||
'Could not connect to server. Please check the address and try again.';
|
||||
String get connectionFailed => 'Could not connect to server. Please check the address and try again.';
|
||||
|
||||
@override
|
||||
String get detectingAuth => 'Detecting authentication...';
|
||||
|
||||
@override
|
||||
String get cannotDetermineAuth =>
|
||||
'Cannot determine authentication requirements. Please check server URL.';
|
||||
String get cannotDetermineAuth => 'Cannot determine authentication requirements. Please check server URL.';
|
||||
|
||||
@override
|
||||
String get noAuthentication => 'No Authentication';
|
||||
@@ -368,9 +359,6 @@ class SEn extends S {
|
||||
@override
|
||||
String get tracksAddedToQueue => 'Tracks added to queue';
|
||||
|
||||
@override
|
||||
String get trackAddedToQueue => 'Track added to queue';
|
||||
|
||||
@override
|
||||
String get play => 'Play';
|
||||
|
||||
@@ -483,43 +471,37 @@ class SEn extends S {
|
||||
String get noFavoriteAudiobooks => 'No favorite audiobooks';
|
||||
|
||||
@override
|
||||
String get tapHeartAudiobook =>
|
||||
'Tap the heart on an audiobook to add it to favorites';
|
||||
String get tapHeartAudiobook => 'Tap the heart on an audiobook to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noAudiobooks => 'No audiobooks';
|
||||
|
||||
@override
|
||||
String get addAudiobooksHint =>
|
||||
'Add audiobooks to your library to see them here';
|
||||
String get addAudiobooksHint => 'Add audiobooks to your library to see them here';
|
||||
|
||||
@override
|
||||
String get noFavoriteArtists => 'No favorite artists';
|
||||
|
||||
@override
|
||||
String get tapHeartArtist =>
|
||||
'Tap the heart on an artist to add them to favorites';
|
||||
String get tapHeartArtist => 'Tap the heart on an artist to add them to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoriteAlbums => 'No favorite albums';
|
||||
|
||||
@override
|
||||
String get tapHeartAlbum =>
|
||||
'Tap the heart on an album to add it to favorites';
|
||||
String get tapHeartAlbum => 'Tap the heart on an album to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoritePlaylists => 'No favorite playlists';
|
||||
|
||||
@override
|
||||
String get tapHeartPlaylist =>
|
||||
'Tap the heart on a playlist to add it to favorites';
|
||||
String get tapHeartPlaylist => 'Tap the heart on a playlist to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoriteTracks => 'No favorite tracks';
|
||||
|
||||
@override
|
||||
String get longPressTrackHint =>
|
||||
'Long-press a track and tap the heart to add it to favorites';
|
||||
String get longPressTrackHint => 'Long-press a track and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String get loadSeries => 'Load Series';
|
||||
@@ -531,8 +513,7 @@ class SEn extends S {
|
||||
String get notConnectedTitle => 'Not Connected';
|
||||
|
||||
@override
|
||||
String get connectHint =>
|
||||
'Connect to your Music Assistant server to start listening';
|
||||
String get connectHint => 'Connect to your Music Assistant server to start listening';
|
||||
|
||||
@override
|
||||
String get configureServer => 'Configure Server';
|
||||
@@ -643,18 +624,6 @@ class SEn extends S {
|
||||
@override
|
||||
String get sortBySeriesOrder => 'Sort by series order';
|
||||
|
||||
@override
|
||||
String get sortByDuration => 'Sort by duration';
|
||||
|
||||
@override
|
||||
String get newestFirst => 'Newest first';
|
||||
|
||||
@override
|
||||
String get oldestFirst => 'Oldest first';
|
||||
|
||||
@override
|
||||
String get viewDetails => 'View details';
|
||||
|
||||
@override
|
||||
String get listView => 'List view';
|
||||
|
||||
@@ -698,22 +667,16 @@ class SEn extends S {
|
||||
String get showFavoritePlaylists => 'Show a row of your favorite playlists';
|
||||
|
||||
@override
|
||||
String get showFavoriteRadioStations =>
|
||||
'Show a row of your favorite radio stations';
|
||||
String get showFavoriteRadioStations => 'Show a row of your favorite radio stations';
|
||||
|
||||
@override
|
||||
String get showFavoritePodcasts => 'Show a row of your favorite podcasts';
|
||||
|
||||
@override
|
||||
String get extractColorsFromArtwork =>
|
||||
'Extract colors from album and artist artwork';
|
||||
String get extractColorsFromArtwork => 'Extract colors from album and artist artwork';
|
||||
|
||||
@override
|
||||
String get chooseHomeScreenRows =>
|
||||
'Choose which rows to display on the home screen';
|
||||
|
||||
@override
|
||||
String get favorite => 'Favorite';
|
||||
String get chooseHomeScreenRows => 'Choose which rows to display on the home screen';
|
||||
|
||||
@override
|
||||
String get addedToFavorites => 'Added to favorites';
|
||||
@@ -728,7 +691,7 @@ class SEn extends S {
|
||||
String get removedFromLibrary => 'Removed from library';
|
||||
|
||||
@override
|
||||
String get addToLibrary => 'Add';
|
||||
String get addToLibrary => 'Add to library';
|
||||
|
||||
@override
|
||||
String get unknown => 'Unknown';
|
||||
@@ -828,25 +791,11 @@ class SEn extends S {
|
||||
String get audiobookLibraries => 'Audiobook Libraries';
|
||||
|
||||
@override
|
||||
String get chooseAudiobookLibraries =>
|
||||
'Choose which Audiobookshelf libraries to include';
|
||||
String get chooseAudiobookLibraries => 'Choose which Audiobookshelf libraries to include';
|
||||
|
||||
@override
|
||||
String get unknownLibrary => 'Unknown Library';
|
||||
|
||||
@override
|
||||
String get musicProviders => 'Music Providers';
|
||||
|
||||
@override
|
||||
String get musicProvidersDescription =>
|
||||
'Choose which accounts to show in your library';
|
||||
|
||||
@override
|
||||
String get libraryRefreshing => 'Refreshing library...';
|
||||
|
||||
@override
|
||||
String get cannotDisableLastProvider => 'Cannot disable the last provider';
|
||||
|
||||
@override
|
||||
String get noSeriesFound => 'No Series Found';
|
||||
|
||||
@@ -859,19 +808,16 @@ class SEn extends S {
|
||||
}
|
||||
|
||||
@override
|
||||
String get noSeriesAvailable =>
|
||||
'No series available from your audiobook library.\nPull to refresh.';
|
||||
String get noSeriesAvailable => 'No series available from your audiobook library.\nPull to refresh.';
|
||||
|
||||
@override
|
||||
String get pullToLoadSeries =>
|
||||
'Pull down to load series\nfrom Music Assistant';
|
||||
String get pullToLoadSeries => 'Pull down to load series\nfrom Music Assistant';
|
||||
|
||||
@override
|
||||
String get search => 'Search';
|
||||
|
||||
@override
|
||||
String get metadataApisDescription =>
|
||||
'Artist images are automatically fetched from Deezer. Add API keys below for artist biographies and album descriptions.';
|
||||
String get metadataApisDescription => 'Artist images are automatically fetched from Deezer. Add API keys below for artist biographies and album descriptions.';
|
||||
|
||||
@override
|
||||
String get lastFmApiKey => 'Last.fm API Key';
|
||||
@@ -896,15 +842,9 @@ class SEn extends S {
|
||||
@override
|
||||
String get addAlbumToQueueOn => 'Add album to queue on...';
|
||||
|
||||
@override
|
||||
String get addToQueue => 'Add to queue';
|
||||
|
||||
@override
|
||||
String get addToQueueOn => 'Add to queue on...';
|
||||
|
||||
@override
|
||||
String get startRadio => 'Start radio';
|
||||
|
||||
@override
|
||||
String startRadioOn(String name) {
|
||||
return 'Start $name radio on...';
|
||||
@@ -949,22 +889,13 @@ class SEn extends S {
|
||||
String get preferLocalPlayer => 'Prefer Local Player';
|
||||
|
||||
@override
|
||||
String get preferLocalPlayerDescription =>
|
||||
'Always select this device first when available';
|
||||
String get preferLocalPlayerDescription => 'Always select this device first when available';
|
||||
|
||||
@override
|
||||
String get smartSortPlayers => 'Smart Sort';
|
||||
|
||||
@override
|
||||
String get smartSortPlayersDescription =>
|
||||
'Sort by status (playing, on, off) instead of alphabetically';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitch => 'Disable Auto-Switch';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitchDescription =>
|
||||
'Never automatically switch to a different player';
|
||||
String get smartSortPlayersDescription => 'Sort by status (playing, on, off) instead of alphabetically';
|
||||
|
||||
@override
|
||||
String get playerStateUnavailable => 'Unavailable';
|
||||
@@ -996,25 +927,7 @@ class SEn extends S {
|
||||
String get showHints => 'Show Hints';
|
||||
|
||||
@override
|
||||
String get showHintsDescription =>
|
||||
'Display helpful tips for discovering features';
|
||||
|
||||
@override
|
||||
String get volumePrecisionMode => 'Volume Precision Mode';
|
||||
|
||||
@override
|
||||
String get volumePrecisionModeDescription =>
|
||||
'Hold still while adjusting volume for fine control';
|
||||
|
||||
@override
|
||||
String get display => 'Display';
|
||||
|
||||
@override
|
||||
String get showProviderIcons => 'Show Provider Icons';
|
||||
|
||||
@override
|
||||
String get showProviderIconsDescription =>
|
||||
'Display provider logos on album art';
|
||||
String get showHintsDescription => 'Display helpful tips for discovering features';
|
||||
|
||||
@override
|
||||
String get pullToSelectPlayers => 'Pull to select players';
|
||||
@@ -1032,15 +945,13 @@ class SEn extends S {
|
||||
String get welcomeToEnsemble => 'Welcome to Ensemble';
|
||||
|
||||
@override
|
||||
String get welcomeMessage =>
|
||||
'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
String get welcomeMessage => 'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
|
||||
@override
|
||||
String get skip => 'Skip';
|
||||
|
||||
@override
|
||||
String get dismissPlayerHint =>
|
||||
'Swipe down, tap outside, or press back to return';
|
||||
String get dismissPlayerHint => 'Swipe down, tap outside, or press back to return';
|
||||
|
||||
@override
|
||||
String playingAlbum(String albumName) {
|
||||
@@ -1056,125 +967,17 @@ class SEn extends S {
|
||||
String get noTracks => 'No tracks';
|
||||
|
||||
@override
|
||||
String get addTracksHint =>
|
||||
'Add some music to your library to see tracks here';
|
||||
String get addTracksHint => 'Add some music to your library to see tracks here';
|
||||
|
||||
@override
|
||||
String get noFavoriteRadioStations => 'No favorite radio stations';
|
||||
|
||||
@override
|
||||
String get longPressRadioHint =>
|
||||
'Long-press a station and tap the heart to add it to favorites';
|
||||
String get longPressRadioHint => 'Long-press a station and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoritePodcasts => 'No favorite podcasts';
|
||||
|
||||
@override
|
||||
String get longPressPodcastHint =>
|
||||
'Long-press a podcast and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String failedToPlayRadioStation(String error) {
|
||||
return 'Failed to play radio station: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get itemAlreadyInLibrary => 'Item is already in library';
|
||||
|
||||
@override
|
||||
String get failedToAddToLibrary => 'Failed to add to library';
|
||||
|
||||
@override
|
||||
String get cannotFindLibraryId => 'Cannot find library ID for removal';
|
||||
|
||||
@override
|
||||
String get failedToRemoveFromLibrary => 'Failed to remove from library';
|
||||
|
||||
@override
|
||||
String failedToPlayAlbum(String error) {
|
||||
return 'Failed to play album: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String playingOnPlayer(String name, String playerName) {
|
||||
return 'Playing $name on $playerName';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToPlayPlaylist(String error) {
|
||||
return 'Failed to play playlist: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToPlayAudiobook(String error) {
|
||||
return 'Failed to play audiobook: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get noOtherPlayersAvailable => 'No other players available';
|
||||
|
||||
@override
|
||||
String get transferQueue => 'Transfer queue';
|
||||
|
||||
@override
|
||||
String get clearQueue => 'Clear queue';
|
||||
|
||||
@override
|
||||
String syncingPlayer(String playerName) {
|
||||
return 'Syncing $playerName...';
|
||||
}
|
||||
|
||||
@override
|
||||
String get switchPlayer => 'Switch Player';
|
||||
|
||||
@override
|
||||
String get logsCopiedToClipboard => 'Logs copied to clipboard';
|
||||
|
||||
@override
|
||||
String get auto => 'Auto';
|
||||
|
||||
@override
|
||||
String get transferQueueTo => 'Transfer Queue To';
|
||||
|
||||
@override
|
||||
String queueTransferredTo(String playerName) {
|
||||
return 'Queue transferred to $playerName';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToTransferQueue(String error) {
|
||||
return 'Failed to transfer queue: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToLoadQueue(String error) {
|
||||
return 'Failed to load queue: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get transferTo => 'Transfer to...';
|
||||
|
||||
@override
|
||||
String get transferQueueToPlayer => 'Transfer queue to another player';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlay => 'Select a player';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlayAlbum => 'Select player to play album';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlayPlaylist => 'Select player to play playlist';
|
||||
|
||||
@override
|
||||
String get selectPlayerForRadio => 'Select player for radio';
|
||||
|
||||
@override
|
||||
String get selectPlayerForEpisode => 'Select player for episode';
|
||||
|
||||
@override
|
||||
String get selectPlayerForAudiobook => 'Select player for audiobook';
|
||||
|
||||
@override
|
||||
String get selectPlayerToAddToQueue => 'Select player to add to queue';
|
||||
String get longPressPodcastHint => 'Long-press a podcast and tap the heart to add it to favorites';
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// ignore: unused_import
|
||||
import 'package:intl/intl.dart' as intl;
|
||||
|
||||
import 'app_localizations.dart';
|
||||
|
||||
// ignore_for_file: type=lint
|
||||
@@ -39,8 +39,7 @@ class SEs extends S {
|
||||
String get portHint => 'ej., 8095 o dejar en blanco';
|
||||
|
||||
@override
|
||||
String get portDescription =>
|
||||
'Dejar en blanco para proxy inverso o puertos estándar. Introduce 8095 para conexión directa.';
|
||||
String get portDescription => 'Dejar en blanco para proxy inverso o puertos estándar. Introduce 8095 para conexión directa.';
|
||||
|
||||
@override
|
||||
String get username => 'Usuario';
|
||||
@@ -58,16 +57,13 @@ class SEs extends S {
|
||||
String get disconnect => 'Desconectar';
|
||||
|
||||
@override
|
||||
String get authServerUrlOptional =>
|
||||
'URL del servidor de autenticación (Opcional)';
|
||||
String get authServerUrlOptional => 'URL del servidor de autenticación (Opcional)';
|
||||
|
||||
@override
|
||||
String get authServerUrlHint =>
|
||||
'ej., auth.example.com (si es diferente del servidor)';
|
||||
String get authServerUrlHint => 'ej., auth.example.com (si es diferente del servidor)';
|
||||
|
||||
@override
|
||||
String get authServerUrlDescription =>
|
||||
'Dejar vacío si la autenticación está en el mismo servidor';
|
||||
String get authServerUrlDescription => 'Dejar vacío si la autenticación está en el mismo servidor';
|
||||
|
||||
@override
|
||||
String detectedAuthType(String authType) {
|
||||
@@ -84,49 +80,40 @@ class SEs extends S {
|
||||
String get unencryptedConnection => 'Conexión sin cifrar';
|
||||
|
||||
@override
|
||||
String get usingHttpOverTailscale =>
|
||||
'Usando HTTP sobre Tailscale (túnel cifrado)';
|
||||
String get usingHttpOverTailscale => 'Usando HTTP sobre Tailscale (túnel cifrado)';
|
||||
|
||||
@override
|
||||
String get httpsFailedUsingHttp =>
|
||||
'HTTPS falló, usando HTTP como alternativa';
|
||||
String get httpsFailedUsingHttp => 'HTTPS falló, usando HTTP como alternativa';
|
||||
|
||||
@override
|
||||
String get httpNotEncrypted => 'Conexión HTTP - los datos no están cifrados';
|
||||
|
||||
@override
|
||||
String get pleaseEnterServerAddress =>
|
||||
'Por favor, introduce la dirección de tu servidor Music Assistant';
|
||||
String get pleaseEnterServerAddress => 'Por favor, introduce la dirección de tu servidor Music Assistant';
|
||||
|
||||
@override
|
||||
String get pleaseEnterName => 'Por favor, introduce tu nombre';
|
||||
|
||||
@override
|
||||
String get pleaseEnterValidPort =>
|
||||
'Por favor, introduce un número de puerto válido (1-65535)';
|
||||
String get pleaseEnterValidPort => 'Por favor, introduce un número de puerto válido (1-65535)';
|
||||
|
||||
@override
|
||||
String get pleaseEnterCredentials =>
|
||||
'Por favor, introduce usuario y contraseña';
|
||||
String get pleaseEnterCredentials => 'Por favor, introduce usuario y contraseña';
|
||||
|
||||
@override
|
||||
String get authFailed =>
|
||||
'Autenticación fallida. Por favor, verifica tus credenciales.';
|
||||
String get authFailed => 'Autenticación fallida. Por favor, verifica tus credenciales.';
|
||||
|
||||
@override
|
||||
String get maLoginFailed =>
|
||||
'Inicio de sesión en Music Assistant fallido. Por favor, verifica tus credenciales.';
|
||||
String get maLoginFailed => 'Inicio de sesión en Music Assistant fallido. Por favor, verifica tus credenciales.';
|
||||
|
||||
@override
|
||||
String get connectionFailed =>
|
||||
'No se pudo conectar al servidor. Por favor, verifica la dirección e inténtalo de nuevo.';
|
||||
String get connectionFailed => 'No se pudo conectar al servidor. Por favor, verifica la dirección e inténtalo de nuevo.';
|
||||
|
||||
@override
|
||||
String get detectingAuth => 'Detectando autenticación...';
|
||||
|
||||
@override
|
||||
String get cannotDetermineAuth =>
|
||||
'No se pueden determinar los requisitos de autenticación. Por favor, verifica la URL del servidor.';
|
||||
String get cannotDetermineAuth => 'No se pueden determinar los requisitos de autenticación. Por favor, verifica la URL del servidor.';
|
||||
|
||||
@override
|
||||
String get noAuthentication => 'Sin autenticación';
|
||||
@@ -234,12 +221,10 @@ class SEs extends S {
|
||||
String get noRadioStations => 'No hay emisoras de radio';
|
||||
|
||||
@override
|
||||
String get addRadioStationsHint =>
|
||||
'Añade emisoras de radio en Music Assistant';
|
||||
String get addRadioStationsHint => 'Añade emisoras de radio en Music Assistant';
|
||||
|
||||
@override
|
||||
String get searchFailed =>
|
||||
'Búsqueda fallida. Por favor, verifica tu conexión.';
|
||||
String get searchFailed => 'Búsqueda fallida. Por favor, verifica tu conexión.';
|
||||
|
||||
@override
|
||||
String get queue => 'Cola';
|
||||
@@ -279,8 +264,7 @@ class SEs extends S {
|
||||
String get system => 'Sistema';
|
||||
|
||||
@override
|
||||
String get pullToRefresh =>
|
||||
'Desliza hacia abajo para actualizar la biblioteca y aplicar los cambios';
|
||||
String get pullToRefresh => 'Desliza hacia abajo para actualizar la biblioteca y aplicar los cambios';
|
||||
|
||||
@override
|
||||
String get viewDebugLogs => 'Ver registros de depuración';
|
||||
@@ -317,8 +301,7 @@ class SEs extends S {
|
||||
String get logsCleared => 'Registros borrados';
|
||||
|
||||
@override
|
||||
String get playerListCopied =>
|
||||
'Lista de reproductores copiada al portapapeles';
|
||||
String get playerListCopied => 'Lista de reproductores copiada al portapapeles';
|
||||
|
||||
@override
|
||||
String get noLogsYet => 'Aún no hay registros';
|
||||
@@ -376,9 +359,6 @@ class SEs extends S {
|
||||
@override
|
||||
String get tracksAddedToQueue => 'Canciones añadidas a la cola';
|
||||
|
||||
@override
|
||||
String get trackAddedToQueue => 'Track added to queue';
|
||||
|
||||
@override
|
||||
String get play => 'Reproducir';
|
||||
|
||||
@@ -491,43 +471,37 @@ class SEs extends S {
|
||||
String get noFavoriteAudiobooks => 'No hay audiolibros favoritos';
|
||||
|
||||
@override
|
||||
String get tapHeartAudiobook =>
|
||||
'Toca el corazón en un audiolibro para añadirlo a favoritos';
|
||||
String get tapHeartAudiobook => 'Toca el corazón en un audiolibro para añadirlo a favoritos';
|
||||
|
||||
@override
|
||||
String get noAudiobooks => 'No hay audiolibros';
|
||||
|
||||
@override
|
||||
String get addAudiobooksHint =>
|
||||
'Añade audiolibros a tu biblioteca para verlos aquí';
|
||||
String get addAudiobooksHint => 'Añade audiolibros a tu biblioteca para verlos aquí';
|
||||
|
||||
@override
|
||||
String get noFavoriteArtists => 'No hay artistas favoritos';
|
||||
|
||||
@override
|
||||
String get tapHeartArtist =>
|
||||
'Toca el corazón en un artista para añadirlo a favoritos';
|
||||
String get tapHeartArtist => 'Toca el corazón en un artista para añadirlo a favoritos';
|
||||
|
||||
@override
|
||||
String get noFavoriteAlbums => 'No hay álbumes favoritos';
|
||||
|
||||
@override
|
||||
String get tapHeartAlbum =>
|
||||
'Toca el corazón en un álbum para añadirlo a favoritos';
|
||||
String get tapHeartAlbum => 'Toca el corazón en un álbum para añadirlo a favoritos';
|
||||
|
||||
@override
|
||||
String get noFavoritePlaylists => 'No hay listas de reproducción favoritas';
|
||||
|
||||
@override
|
||||
String get tapHeartPlaylist =>
|
||||
'Toca el corazón en una lista para añadirla a favoritos';
|
||||
String get tapHeartPlaylist => 'Toca el corazón en una lista para añadirla a favoritos';
|
||||
|
||||
@override
|
||||
String get noFavoriteTracks => 'No hay canciones favoritas';
|
||||
|
||||
@override
|
||||
String get longPressTrackHint =>
|
||||
'Mantén presionada una canción y toca el corazón para añadirla a favoritos';
|
||||
String get longPressTrackHint => 'Mantén presionada una canción y toca el corazón para añadirla a favoritos';
|
||||
|
||||
@override
|
||||
String get loadSeries => 'Cargar series';
|
||||
@@ -539,8 +513,7 @@ class SEs extends S {
|
||||
String get notConnectedTitle => 'No conectado';
|
||||
|
||||
@override
|
||||
String get connectHint =>
|
||||
'Conéctate a tu servidor Music Assistant para empezar a escuchar';
|
||||
String get connectHint => 'Conéctate a tu servidor Music Assistant para empezar a escuchar';
|
||||
|
||||
@override
|
||||
String get configureServer => 'Configurar servidor';
|
||||
@@ -576,8 +549,7 @@ class SEs extends S {
|
||||
String get noLogsToCopy => 'No hay registros para copiar';
|
||||
|
||||
@override
|
||||
String get noDebugLogsYet =>
|
||||
'Aún no hay registros de depuración. Intenta detectar autenticación.';
|
||||
String get noDebugLogsYet => 'Aún no hay registros de depuración. Intenta detectar autenticación.';
|
||||
|
||||
@override
|
||||
String get showDebug => 'Mostrar depuración';
|
||||
@@ -592,8 +564,7 @@ class SEs extends S {
|
||||
String get noChapters => 'Sin capítulos';
|
||||
|
||||
@override
|
||||
String get noChapterInfo =>
|
||||
'Este audiolibro no tiene información de capítulos';
|
||||
String get noChapterInfo => 'Este audiolibro no tiene información de capítulos';
|
||||
|
||||
@override
|
||||
String errorSeeking(String error) {
|
||||
@@ -653,18 +624,6 @@ class SEs extends S {
|
||||
@override
|
||||
String get sortBySeriesOrder => 'Ordenar por orden de serie';
|
||||
|
||||
@override
|
||||
String get sortByDuration => 'Sort by duration';
|
||||
|
||||
@override
|
||||
String get newestFirst => 'Newest first';
|
||||
|
||||
@override
|
||||
String get oldestFirst => 'Oldest first';
|
||||
|
||||
@override
|
||||
String get viewDetails => 'View details';
|
||||
|
||||
@override
|
||||
String get listView => 'Vista de lista';
|
||||
|
||||
@@ -678,8 +637,7 @@ class SEs extends S {
|
||||
String get artist => 'Artista';
|
||||
|
||||
@override
|
||||
String get showRecentlyPlayedAlbums =>
|
||||
'Mostrar álbumes reproducidos recientemente';
|
||||
String get showRecentlyPlayedAlbums => 'Mostrar álbumes reproducidos recientemente';
|
||||
|
||||
@override
|
||||
String get showRandomArtists => 'Mostrar artistas aleatorios para descubrir';
|
||||
@@ -691,44 +649,34 @@ class SEs extends S {
|
||||
String get showAudiobooksInProgress => 'Mostrar audiolibros en progreso';
|
||||
|
||||
@override
|
||||
String get showRandomAudiobooks =>
|
||||
'Mostrar audiolibros aleatorios para descubrir';
|
||||
String get showRandomAudiobooks => 'Mostrar audiolibros aleatorios para descubrir';
|
||||
|
||||
@override
|
||||
String get showRandomSeries =>
|
||||
'Mostrar series de audiolibros aleatorias para descubrir';
|
||||
String get showRandomSeries => 'Mostrar series de audiolibros aleatorias para descubrir';
|
||||
|
||||
@override
|
||||
String get showFavoriteAlbums => 'Mostrar una fila de tus álbumes favoritos';
|
||||
|
||||
@override
|
||||
String get showFavoriteArtists =>
|
||||
'Mostrar una fila de tus artistas favoritos';
|
||||
String get showFavoriteArtists => 'Mostrar una fila de tus artistas favoritos';
|
||||
|
||||
@override
|
||||
String get showFavoriteTracks =>
|
||||
'Mostrar una fila de tus canciones favoritas';
|
||||
String get showFavoriteTracks => 'Mostrar una fila de tus canciones favoritas';
|
||||
|
||||
@override
|
||||
String get showFavoritePlaylists => 'Show a row of your favorite playlists';
|
||||
|
||||
@override
|
||||
String get showFavoriteRadioStations =>
|
||||
'Show a row of your favorite radio stations';
|
||||
String get showFavoriteRadioStations => 'Show a row of your favorite radio stations';
|
||||
|
||||
@override
|
||||
String get showFavoritePodcasts => 'Show a row of your favorite podcasts';
|
||||
|
||||
@override
|
||||
String get extractColorsFromArtwork =>
|
||||
'Extraer colores de las portadas de álbumes y artistas';
|
||||
String get extractColorsFromArtwork => 'Extraer colores de las portadas de álbumes y artistas';
|
||||
|
||||
@override
|
||||
String get chooseHomeScreenRows =>
|
||||
'Elige qué filas mostrar en la pantalla de inicio';
|
||||
|
||||
@override
|
||||
String get favorite => 'Favorite';
|
||||
String get chooseHomeScreenRows => 'Elige qué filas mostrar en la pantalla de inicio';
|
||||
|
||||
@override
|
||||
String get addedToFavorites => 'Añadido a favoritos';
|
||||
@@ -743,7 +691,7 @@ class SEs extends S {
|
||||
String get removedFromLibrary => 'Removed from library';
|
||||
|
||||
@override
|
||||
String get addToLibrary => 'Add';
|
||||
String get addToLibrary => 'Add to library';
|
||||
|
||||
@override
|
||||
String get unknown => 'Desconocido';
|
||||
@@ -826,8 +774,7 @@ class SEs extends S {
|
||||
String get loadingChapters => 'Cargando capítulos...';
|
||||
|
||||
@override
|
||||
String get noChapterInfoAvailable =>
|
||||
'No hay información de capítulos disponible';
|
||||
String get noChapterInfoAvailable => 'No hay información de capítulos disponible';
|
||||
|
||||
@override
|
||||
String percentComplete(int percent) {
|
||||
@@ -838,32 +785,17 @@ class SEs extends S {
|
||||
String get theAudioDbApiKey => 'Clave API de TheAudioDB';
|
||||
|
||||
@override
|
||||
String get theAudioDbApiKeyHint =>
|
||||
'Usa \"2\" para nivel gratuito o clave premium';
|
||||
String get theAudioDbApiKeyHint => 'Usa \"2\" para nivel gratuito o clave premium';
|
||||
|
||||
@override
|
||||
String get audiobookLibraries => 'Bibliotecas de audiolibros';
|
||||
|
||||
@override
|
||||
String get chooseAudiobookLibraries =>
|
||||
'Elige qué bibliotecas de Audiobookshelf incluir';
|
||||
String get chooseAudiobookLibraries => 'Elige qué bibliotecas de Audiobookshelf incluir';
|
||||
|
||||
@override
|
||||
String get unknownLibrary => 'Biblioteca desconocida';
|
||||
|
||||
@override
|
||||
String get musicProviders => 'Music Providers';
|
||||
|
||||
@override
|
||||
String get musicProvidersDescription =>
|
||||
'Choose which accounts to show in your library';
|
||||
|
||||
@override
|
||||
String get libraryRefreshing => 'Refreshing library...';
|
||||
|
||||
@override
|
||||
String get cannotDisableLastProvider => 'Cannot disable the last provider';
|
||||
|
||||
@override
|
||||
String get noSeriesFound => 'No se encontraron series';
|
||||
|
||||
@@ -876,19 +808,16 @@ class SEs extends S {
|
||||
}
|
||||
|
||||
@override
|
||||
String get noSeriesAvailable =>
|
||||
'No hay series disponibles en tu biblioteca de audiolibros.\nDesliza para actualizar.';
|
||||
String get noSeriesAvailable => 'No hay series disponibles en tu biblioteca de audiolibros.\nDesliza para actualizar.';
|
||||
|
||||
@override
|
||||
String get pullToLoadSeries =>
|
||||
'Desliza hacia abajo para cargar series\ndesde Music Assistant';
|
||||
String get pullToLoadSeries => 'Desliza hacia abajo para cargar series\ndesde Music Assistant';
|
||||
|
||||
@override
|
||||
String get search => 'Buscar';
|
||||
|
||||
@override
|
||||
String get metadataApisDescription =>
|
||||
'Las imágenes de artistas se obtienen automáticamente de Deezer. Añade claves API a continuación para biografías de artistas y descripciones de álbumes.';
|
||||
String get metadataApisDescription => 'Las imágenes de artistas se obtienen automáticamente de Deezer. Añade claves API a continuación para biografías de artistas y descripciones de álbumes.';
|
||||
|
||||
@override
|
||||
String get lastFmApiKey => 'Clave API de Last.fm';
|
||||
@@ -913,15 +842,9 @@ class SEs extends S {
|
||||
@override
|
||||
String get addAlbumToQueueOn => 'Añadir álbum a la cola en...';
|
||||
|
||||
@override
|
||||
String get addToQueue => 'Add to queue';
|
||||
|
||||
@override
|
||||
String get addToQueueOn => 'Añadir a la cola en...';
|
||||
|
||||
@override
|
||||
String get startRadio => 'Start radio';
|
||||
|
||||
@override
|
||||
String startRadioOn(String name) {
|
||||
return 'Iniciar radio de $name en...';
|
||||
@@ -966,22 +889,13 @@ class SEs extends S {
|
||||
String get preferLocalPlayer => 'Preferir dispositivo local';
|
||||
|
||||
@override
|
||||
String get preferLocalPlayerDescription =>
|
||||
'Seleccionar siempre este dispositivo primero cuando esté disponible';
|
||||
String get preferLocalPlayerDescription => 'Seleccionar siempre este dispositivo primero cuando esté disponible';
|
||||
|
||||
@override
|
||||
String get smartSortPlayers => 'Orden inteligente';
|
||||
|
||||
@override
|
||||
String get smartSortPlayersDescription =>
|
||||
'Ordenar por estado (reproduciendo, encendido, apagado) en lugar de alfabéticamente';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitch => 'Disable Auto-Switch';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitchDescription =>
|
||||
'Never automatically switch to a different player';
|
||||
String get smartSortPlayersDescription => 'Ordenar por estado (reproduciendo, encendido, apagado) en lugar de alfabéticamente';
|
||||
|
||||
@override
|
||||
String get playerStateUnavailable => 'No disponible';
|
||||
@@ -1013,25 +927,7 @@ class SEs extends S {
|
||||
String get showHints => 'Mostrar Sugerencias';
|
||||
|
||||
@override
|
||||
String get showHintsDescription =>
|
||||
'Mostrar consejos útiles para descubrir funciones';
|
||||
|
||||
@override
|
||||
String get volumePrecisionMode => 'Volume Precision Mode';
|
||||
|
||||
@override
|
||||
String get volumePrecisionModeDescription =>
|
||||
'Hold still while adjusting volume for fine control';
|
||||
|
||||
@override
|
||||
String get display => 'Display';
|
||||
|
||||
@override
|
||||
String get showProviderIcons => 'Show Provider Icons';
|
||||
|
||||
@override
|
||||
String get showProviderIconsDescription =>
|
||||
'Display provider logos on album art';
|
||||
String get showHintsDescription => 'Mostrar consejos útiles para descubrir funciones';
|
||||
|
||||
@override
|
||||
String get pullToSelectPlayers => 'Desliza para seleccionar dispositivos';
|
||||
@@ -1049,15 +945,13 @@ class SEs extends S {
|
||||
String get welcomeToEnsemble => 'Welcome to Ensemble';
|
||||
|
||||
@override
|
||||
String get welcomeMessage =>
|
||||
'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
String get welcomeMessage => 'By default your phone is the selected player.\nPull the mini player down to select another player.';
|
||||
|
||||
@override
|
||||
String get skip => 'Skip';
|
||||
|
||||
@override
|
||||
String get dismissPlayerHint =>
|
||||
'Swipe down, tap outside, or press back to return';
|
||||
String get dismissPlayerHint => 'Swipe down, tap outside, or press back to return';
|
||||
|
||||
@override
|
||||
String playingAlbum(String albumName) {
|
||||
@@ -1073,125 +967,17 @@ class SEs extends S {
|
||||
String get noTracks => 'No tracks';
|
||||
|
||||
@override
|
||||
String get addTracksHint =>
|
||||
'Add some music to your library to see tracks here';
|
||||
String get addTracksHint => 'Add some music to your library to see tracks here';
|
||||
|
||||
@override
|
||||
String get noFavoriteRadioStations => 'No favorite radio stations';
|
||||
|
||||
@override
|
||||
String get longPressRadioHint =>
|
||||
'Long-press a station and tap the heart to add it to favorites';
|
||||
String get longPressRadioHint => 'Long-press a station and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoritePodcasts => 'No favorite podcasts';
|
||||
|
||||
@override
|
||||
String get longPressPodcastHint =>
|
||||
'Long-press a podcast and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String failedToPlayRadioStation(String error) {
|
||||
return 'Failed to play radio station: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get itemAlreadyInLibrary => 'Item is already in library';
|
||||
|
||||
@override
|
||||
String get failedToAddToLibrary => 'Failed to add to library';
|
||||
|
||||
@override
|
||||
String get cannotFindLibraryId => 'Cannot find library ID for removal';
|
||||
|
||||
@override
|
||||
String get failedToRemoveFromLibrary => 'Failed to remove from library';
|
||||
|
||||
@override
|
||||
String failedToPlayAlbum(String error) {
|
||||
return 'Failed to play album: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String playingOnPlayer(String name, String playerName) {
|
||||
return 'Playing $name on $playerName';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToPlayPlaylist(String error) {
|
||||
return 'Failed to play playlist: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToPlayAudiobook(String error) {
|
||||
return 'Failed to play audiobook: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get noOtherPlayersAvailable => 'No other players available';
|
||||
|
||||
@override
|
||||
String get transferQueue => 'Transfer queue';
|
||||
|
||||
@override
|
||||
String get clearQueue => 'Clear queue';
|
||||
|
||||
@override
|
||||
String syncingPlayer(String playerName) {
|
||||
return 'Syncing $playerName...';
|
||||
}
|
||||
|
||||
@override
|
||||
String get switchPlayer => 'Switch Player';
|
||||
|
||||
@override
|
||||
String get logsCopiedToClipboard => 'Logs copied to clipboard';
|
||||
|
||||
@override
|
||||
String get auto => 'Auto';
|
||||
|
||||
@override
|
||||
String get transferQueueTo => 'Transfer Queue To';
|
||||
|
||||
@override
|
||||
String queueTransferredTo(String playerName) {
|
||||
return 'Queue transferred to $playerName';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToTransferQueue(String error) {
|
||||
return 'Failed to transfer queue: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToLoadQueue(String error) {
|
||||
return 'Failed to load queue: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get transferTo => 'Transfer to...';
|
||||
|
||||
@override
|
||||
String get transferQueueToPlayer => 'Transfer queue to another player';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlay => 'Select a player';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlayAlbum => 'Select player to play album';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlayPlaylist => 'Select player to play playlist';
|
||||
|
||||
@override
|
||||
String get selectPlayerForRadio => 'Select player for radio';
|
||||
|
||||
@override
|
||||
String get selectPlayerForEpisode => 'Select player for episode';
|
||||
|
||||
@override
|
||||
String get selectPlayerForAudiobook => 'Select player for audiobook';
|
||||
|
||||
@override
|
||||
String get selectPlayerToAddToQueue => 'Select player to add to queue';
|
||||
String get longPressPodcastHint => 'Long-press a podcast and tap the heart to add it to favorites';
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// ignore: unused_import
|
||||
import 'package:intl/intl.dart' as intl;
|
||||
|
||||
import 'app_localizations.dart';
|
||||
|
||||
// ignore_for_file: type=lint
|
||||
@@ -39,8 +39,7 @@ class SFr extends S {
|
||||
String get portHint => 'ex., 8095 ou laisser vide';
|
||||
|
||||
@override
|
||||
String get portDescription =>
|
||||
'Laisser vide pour les proxys inverses ou les ports standards. Entrer 8095 pour une connexion directe.';
|
||||
String get portDescription => 'Laisser vide pour les proxys inverses ou les ports standards. Entrer 8095 pour une connexion directe.';
|
||||
|
||||
@override
|
||||
String get username => 'Nom d\'utilisateur';
|
||||
@@ -61,12 +60,10 @@ class SFr extends S {
|
||||
String get authServerUrlOptional => 'URL du serveur d\'auth (Facultatif)';
|
||||
|
||||
@override
|
||||
String get authServerUrlHint =>
|
||||
'ex., auth.example.com (si different du serveur)';
|
||||
String get authServerUrlHint => 'ex., auth.example.com (si different du serveur)';
|
||||
|
||||
@override
|
||||
String get authServerUrlDescription =>
|
||||
'Laisser vide si l\'authentification est sur le meme serveur';
|
||||
String get authServerUrlDescription => 'Laisser vide si l\'authentification est sur le meme serveur';
|
||||
|
||||
@override
|
||||
String detectedAuthType(String authType) {
|
||||
@@ -83,50 +80,40 @@ class SFr extends S {
|
||||
String get unencryptedConnection => 'Connexion non chiffrée';
|
||||
|
||||
@override
|
||||
String get usingHttpOverTailscale =>
|
||||
'Utilisation de HTTP via Tailscale (tunnel chiffre)';
|
||||
String get usingHttpOverTailscale => 'Utilisation de HTTP via Tailscale (tunnel chiffre)';
|
||||
|
||||
@override
|
||||
String get httpsFailedUsingHttp =>
|
||||
'HTTPS a échoué, utilisation de HTTP en repli';
|
||||
String get httpsFailedUsingHttp => 'HTTPS a échoué, utilisation de HTTP en repli';
|
||||
|
||||
@override
|
||||
String get httpNotEncrypted =>
|
||||
'Connexion HTTP - les donnees ne sont pas chiffrées';
|
||||
String get httpNotEncrypted => 'Connexion HTTP - les donnees ne sont pas chiffrées';
|
||||
|
||||
@override
|
||||
String get pleaseEnterServerAddress =>
|
||||
'Veuillez entrer l\'adresse de votre serveur Music Assistant';
|
||||
String get pleaseEnterServerAddress => 'Veuillez entrer l\'adresse de votre serveur Music Assistant';
|
||||
|
||||
@override
|
||||
String get pleaseEnterName => 'Veuillez entrer votre nom';
|
||||
|
||||
@override
|
||||
String get pleaseEnterValidPort =>
|
||||
'Veuillez entrer un numero de port valide (1-65535)';
|
||||
String get pleaseEnterValidPort => 'Veuillez entrer un numero de port valide (1-65535)';
|
||||
|
||||
@override
|
||||
String get pleaseEnterCredentials =>
|
||||
'Veuillez entrer le nom d\'utilisateur et le mot de passe';
|
||||
String get pleaseEnterCredentials => 'Veuillez entrer le nom d\'utilisateur et le mot de passe';
|
||||
|
||||
@override
|
||||
String get authFailed =>
|
||||
'Echec de l\'authentification. Veuillez verifier vos identifiants.';
|
||||
String get authFailed => 'Echec de l\'authentification. Veuillez verifier vos identifiants.';
|
||||
|
||||
@override
|
||||
String get maLoginFailed =>
|
||||
'Echec de la connexion a Music Assistant. Veuillez verifier vos identifiants.';
|
||||
String get maLoginFailed => 'Echec de la connexion a Music Assistant. Veuillez verifier vos identifiants.';
|
||||
|
||||
@override
|
||||
String get connectionFailed =>
|
||||
'Impossible de se connecter au serveur. Veuillez verifier l\'adresse et reessayer.';
|
||||
String get connectionFailed => 'Impossible de se connecter au serveur. Veuillez verifier l\'adresse et reessayer.';
|
||||
|
||||
@override
|
||||
String get detectingAuth => 'Detection de l\'authentification...';
|
||||
|
||||
@override
|
||||
String get cannotDetermineAuth =>
|
||||
'Impossible de determiner les exigences d\'authentification. Veuillez verifier l\'URL du serveur.';
|
||||
String get cannotDetermineAuth => 'Impossible de determiner les exigences d\'authentification. Veuillez verifier l\'URL du serveur.';
|
||||
|
||||
@override
|
||||
String get noAuthentication => 'Pas d\'authentification';
|
||||
@@ -141,8 +128,7 @@ class SFr extends S {
|
||||
String get musicAssistantLogin => 'Connexion Music Assistant';
|
||||
|
||||
@override
|
||||
String get pressBackToMinimize =>
|
||||
'Appuyez a nouveau sur retour pour minimiser';
|
||||
String get pressBackToMinimize => 'Appuyez a nouveau sur retour pour minimiser';
|
||||
|
||||
@override
|
||||
String get recentlyPlayed => 'Ecoutes recemment';
|
||||
@@ -235,12 +221,10 @@ class SFr extends S {
|
||||
String get noRadioStations => 'Aucune station de radio';
|
||||
|
||||
@override
|
||||
String get addRadioStationsHint =>
|
||||
'Ajouter des stations de radio dans Music Assistant';
|
||||
String get addRadioStationsHint => 'Ajouter des stations de radio dans Music Assistant';
|
||||
|
||||
@override
|
||||
String get searchFailed =>
|
||||
'La recherche a échoué. Veuillez verifier votre connexion.';
|
||||
String get searchFailed => 'La recherche a échoué. Veuillez verifier votre connexion.';
|
||||
|
||||
@override
|
||||
String get queue => 'File d\'attente';
|
||||
@@ -280,8 +264,7 @@ class SFr extends S {
|
||||
String get system => 'Système';
|
||||
|
||||
@override
|
||||
String get pullToRefresh =>
|
||||
'Tirez pour rafraichir la bibliothèque et appliquer les modifications';
|
||||
String get pullToRefresh => 'Tirez pour rafraichir la bibliothèque et appliquer les modifications';
|
||||
|
||||
@override
|
||||
String get viewDebugLogs => 'Voir les journaux de debogage';
|
||||
@@ -318,8 +301,7 @@ class SFr extends S {
|
||||
String get logsCleared => 'Journaux effaces';
|
||||
|
||||
@override
|
||||
String get playerListCopied =>
|
||||
'Liste des lecteurs copiee dans le presse-papiers !';
|
||||
String get playerListCopied => 'Liste des lecteurs copiee dans le presse-papiers !';
|
||||
|
||||
@override
|
||||
String get noLogsYet => 'Pas encore de journaux';
|
||||
@@ -377,9 +359,6 @@ class SFr extends S {
|
||||
@override
|
||||
String get tracksAddedToQueue => 'Pistes ajoutées a la file d\'attente';
|
||||
|
||||
@override
|
||||
String get trackAddedToQueue => 'Track added to queue';
|
||||
|
||||
@override
|
||||
String get play => 'Lire';
|
||||
|
||||
@@ -492,43 +471,37 @@ class SFr extends S {
|
||||
String get noFavoriteAudiobooks => 'Aucun livre audio favori';
|
||||
|
||||
@override
|
||||
String get tapHeartAudiobook =>
|
||||
'Appuyez sur le coeur d\'un livre audio pour l\'ajoutér aux favoris';
|
||||
String get tapHeartAudiobook => 'Appuyez sur le coeur d\'un livre audio pour l\'ajoutér aux favoris';
|
||||
|
||||
@override
|
||||
String get noAudiobooks => 'Aucun livre audio';
|
||||
|
||||
@override
|
||||
String get addAudiobooksHint =>
|
||||
'Ajoutez des livres audio a votre bibliothèque pour les voir ici';
|
||||
String get addAudiobooksHint => 'Ajoutez des livres audio a votre bibliothèque pour les voir ici';
|
||||
|
||||
@override
|
||||
String get noFavoriteArtists => 'Aucun artiste favori';
|
||||
|
||||
@override
|
||||
String get tapHeartArtist =>
|
||||
'Appuyez sur le coeur d\'un artiste pour l\'ajoutér aux favoris';
|
||||
String get tapHeartArtist => 'Appuyez sur le coeur d\'un artiste pour l\'ajoutér aux favoris';
|
||||
|
||||
@override
|
||||
String get noFavoriteAlbums => 'Aucun album favori';
|
||||
|
||||
@override
|
||||
String get tapHeartAlbum =>
|
||||
'Appuyez sur le coeur d\'un album pour l\'ajoutér aux favoris';
|
||||
String get tapHeartAlbum => 'Appuyez sur le coeur d\'un album pour l\'ajoutér aux favoris';
|
||||
|
||||
@override
|
||||
String get noFavoritePlaylists => 'Aucune playlist favorite';
|
||||
|
||||
@override
|
||||
String get tapHeartPlaylist =>
|
||||
'Appuyez sur le coeur d\'une playlist pour l\'ajoutér aux favoris';
|
||||
String get tapHeartPlaylist => 'Appuyez sur le coeur d\'une playlist pour l\'ajoutér aux favoris';
|
||||
|
||||
@override
|
||||
String get noFavoriteTracks => 'Aucune piste favorite';
|
||||
|
||||
@override
|
||||
String get longPressTrackHint =>
|
||||
'Appuyez longuement sur une piste et touchez le coeur pour l\'ajoutér aux favoris';
|
||||
String get longPressTrackHint => 'Appuyez longuement sur une piste et touchez le coeur pour l\'ajoutér aux favoris';
|
||||
|
||||
@override
|
||||
String get loadSeries => 'Charger les séries';
|
||||
@@ -540,8 +513,7 @@ class SFr extends S {
|
||||
String get notConnectedTitle => 'Not Connected';
|
||||
|
||||
@override
|
||||
String get connectHint =>
|
||||
'Connectéz-vous a votre serveur Music Assistant pour commencer a écouter';
|
||||
String get connectHint => 'Connectéz-vous a votre serveur Music Assistant pour commencer a écouter';
|
||||
|
||||
@override
|
||||
String get configureServer => 'Configurer le serveur';
|
||||
@@ -577,8 +549,7 @@ class SFr extends S {
|
||||
String get noLogsToCopy => 'Aucun journal a copier';
|
||||
|
||||
@override
|
||||
String get noDebugLogsYet =>
|
||||
'Pas encore de journaux de debogage. Essayez de détectér l\'authentification.';
|
||||
String get noDebugLogsYet => 'Pas encore de journaux de debogage. Essayez de détectér l\'authentification.';
|
||||
|
||||
@override
|
||||
String get showDebug => 'Afficher le debogage';
|
||||
@@ -593,8 +564,7 @@ class SFr extends S {
|
||||
String get noChapters => 'Aucun chapitre';
|
||||
|
||||
@override
|
||||
String get noChapterInfo =>
|
||||
'Ce livre audio n\'a pas d\'informations de chapitre';
|
||||
String get noChapterInfo => 'Ce livre audio n\'a pas d\'informations de chapitre';
|
||||
|
||||
@override
|
||||
String errorSeeking(String error) {
|
||||
@@ -654,18 +624,6 @@ class SFr extends S {
|
||||
@override
|
||||
String get sortBySeriesOrder => 'Trier par ordre de série';
|
||||
|
||||
@override
|
||||
String get sortByDuration => 'Sort by duration';
|
||||
|
||||
@override
|
||||
String get newestFirst => 'Newest first';
|
||||
|
||||
@override
|
||||
String get oldestFirst => 'Oldest first';
|
||||
|
||||
@override
|
||||
String get viewDetails => 'View details';
|
||||
|
||||
@override
|
||||
String get listView => 'Vue en liste';
|
||||
|
||||
@@ -679,12 +637,10 @@ class SFr extends S {
|
||||
String get artist => 'Artiste';
|
||||
|
||||
@override
|
||||
String get showRecentlyPlayedAlbums =>
|
||||
'Afficher les albums écoutes recemment';
|
||||
String get showRecentlyPlayedAlbums => 'Afficher les albums écoutes recemment';
|
||||
|
||||
@override
|
||||
String get showRandomArtists =>
|
||||
'Afficher des artistes aléatoires a découvrir';
|
||||
String get showRandomArtists => 'Afficher des artistes aléatoires a découvrir';
|
||||
|
||||
@override
|
||||
String get showRandomAlbums => 'Afficher des albums aléatoires a découvrir';
|
||||
@@ -693,46 +649,34 @@ class SFr extends S {
|
||||
String get showAudiobooksInProgress => 'Afficher les livres audio en cours';
|
||||
|
||||
@override
|
||||
String get showRandomAudiobooks =>
|
||||
'Afficher des livres audio aléatoires a découvrir';
|
||||
String get showRandomAudiobooks => 'Afficher des livres audio aléatoires a découvrir';
|
||||
|
||||
@override
|
||||
String get showRandomSeries =>
|
||||
'Afficher des séries de livres audio aléatoires a découvrir';
|
||||
String get showRandomSeries => 'Afficher des séries de livres audio aléatoires a découvrir';
|
||||
|
||||
@override
|
||||
String get showFavoriteAlbums => 'Afficher une rangee de vos albums favoris';
|
||||
|
||||
@override
|
||||
String get showFavoriteArtists =>
|
||||
'Afficher une rangee de vos artistes favoris';
|
||||
String get showFavoriteArtists => 'Afficher une rangee de vos artistes favoris';
|
||||
|
||||
@override
|
||||
String get showFavoriteTracks =>
|
||||
'Afficher une rangee de vos pistes favorites';
|
||||
String get showFavoriteTracks => 'Afficher une rangee de vos pistes favorites';
|
||||
|
||||
@override
|
||||
String get showFavoritePlaylists =>
|
||||
'Afficher une rangee de vos playlists favorites';
|
||||
String get showFavoritePlaylists => 'Afficher une rangee de vos playlists favorites';
|
||||
|
||||
@override
|
||||
String get showFavoriteRadioStations =>
|
||||
'Afficher une rangee de vos stations de radio favorites';
|
||||
String get showFavoriteRadioStations => 'Afficher une rangee de vos stations de radio favorites';
|
||||
|
||||
@override
|
||||
String get showFavoritePodcasts =>
|
||||
'Afficher une rangee de vos podcasts favoris';
|
||||
String get showFavoritePodcasts => 'Afficher une rangee de vos podcasts favoris';
|
||||
|
||||
@override
|
||||
String get extractColorsFromArtwork =>
|
||||
'Extraire les couleurs des pochettes d\'albums et d\'artistes';
|
||||
String get extractColorsFromArtwork => 'Extraire les couleurs des pochettes d\'albums et d\'artistes';
|
||||
|
||||
@override
|
||||
String get chooseHomeScreenRows =>
|
||||
'Choisir les rangees a afficher sur l\'ecran d\'accueil';
|
||||
|
||||
@override
|
||||
String get favorite => 'Favorite';
|
||||
String get chooseHomeScreenRows => 'Choisir les rangees a afficher sur l\'ecran d\'accueil';
|
||||
|
||||
@override
|
||||
String get addedToFavorites => 'Ajoute aux favoris';
|
||||
@@ -777,15 +721,13 @@ class SFr extends S {
|
||||
String get podcasts => 'Podcasts';
|
||||
|
||||
@override
|
||||
String get podcastSupportComingSoon =>
|
||||
'Prise en charge des podcasts bientot disponible';
|
||||
String get podcastSupportComingSoon => 'Prise en charge des podcasts bientot disponible';
|
||||
|
||||
@override
|
||||
String get noPodcasts => 'Aucun podcast';
|
||||
|
||||
@override
|
||||
String get addPodcastsHint =>
|
||||
'Abonnez-vous a des podcasts dans Music Assistant';
|
||||
String get addPodcastsHint => 'Abonnez-vous a des podcasts dans Music Assistant';
|
||||
|
||||
@override
|
||||
String get episodes => 'Episodes';
|
||||
@@ -832,8 +774,7 @@ class SFr extends S {
|
||||
String get loadingChapters => 'Chargement des chapitres...';
|
||||
|
||||
@override
|
||||
String get noChapterInfoAvailable =>
|
||||
'Aucune information de chapitre disponible';
|
||||
String get noChapterInfoAvailable => 'Aucune information de chapitre disponible';
|
||||
|
||||
@override
|
||||
String percentComplete(int percent) {
|
||||
@@ -844,32 +785,17 @@ class SFr extends S {
|
||||
String get theAudioDbApiKey => 'Cle API TheAudioDB';
|
||||
|
||||
@override
|
||||
String get theAudioDbApiKeyHint =>
|
||||
'Utilisez \"2\" pour le niveau gratuit ou une cle premium';
|
||||
String get theAudioDbApiKeyHint => 'Utilisez \"2\" pour le niveau gratuit ou une cle premium';
|
||||
|
||||
@override
|
||||
String get audiobookLibraries => 'Bibliothèques de livres audio';
|
||||
|
||||
@override
|
||||
String get chooseAudiobookLibraries =>
|
||||
'Choisir quelles bibliothèques Audiobookshelf inclure';
|
||||
String get chooseAudiobookLibraries => 'Choisir quelles bibliothèques Audiobookshelf inclure';
|
||||
|
||||
@override
|
||||
String get unknownLibrary => 'Bibliothèque inconnue';
|
||||
|
||||
@override
|
||||
String get musicProviders => 'Music Providers';
|
||||
|
||||
@override
|
||||
String get musicProvidersDescription =>
|
||||
'Choose which accounts to show in your library';
|
||||
|
||||
@override
|
||||
String get libraryRefreshing => 'Refreshing library...';
|
||||
|
||||
@override
|
||||
String get cannotDisableLastProvider => 'Cannot disable the last provider';
|
||||
|
||||
@override
|
||||
String get noSeriesFound => 'Aucune série trouvee';
|
||||
|
||||
@@ -882,19 +808,16 @@ class SFr extends S {
|
||||
}
|
||||
|
||||
@override
|
||||
String get noSeriesAvailable =>
|
||||
'Aucune série disponible dans votre bibliothèque de livres audio.\nTirez pour rafraichir.';
|
||||
String get noSeriesAvailable => 'Aucune série disponible dans votre bibliothèque de livres audio.\nTirez pour rafraichir.';
|
||||
|
||||
@override
|
||||
String get pullToLoadSeries =>
|
||||
'Tirez vers le bas pour charger les séries\ndepuis Music Assistant';
|
||||
String get pullToLoadSeries => 'Tirez vers le bas pour charger les séries\ndepuis Music Assistant';
|
||||
|
||||
@override
|
||||
String get search => 'Rechercher';
|
||||
|
||||
@override
|
||||
String get metadataApisDescription =>
|
||||
'Les images d\'artistes sont automatiquement recuperees depuis Deezer. Ajoutez les cles API ci-dessous pour les biographies d\'artistes et les descriptions d\'albums.';
|
||||
String get metadataApisDescription => 'Les images d\'artistes sont automatiquement recuperees depuis Deezer. Ajoutez les cles API ci-dessous pour les biographies d\'artistes et les descriptions d\'albums.';
|
||||
|
||||
@override
|
||||
String get lastFmApiKey => 'Cle API Last.fm';
|
||||
@@ -917,18 +840,11 @@ class SFr extends S {
|
||||
String get playOn => 'Lire sur...';
|
||||
|
||||
@override
|
||||
String get addAlbumToQueueOn =>
|
||||
'Ajouter l\'album a la file d\'attente sur...';
|
||||
|
||||
@override
|
||||
String get addToQueue => 'Add to queue';
|
||||
String get addAlbumToQueueOn => 'Ajouter l\'album a la file d\'attente sur...';
|
||||
|
||||
@override
|
||||
String get addToQueueOn => 'Ajouter a la file d\'attente sur...';
|
||||
|
||||
@override
|
||||
String get startRadio => 'Start radio';
|
||||
|
||||
@override
|
||||
String startRadioOn(String name) {
|
||||
return 'Demarrer la radio $name sur...';
|
||||
@@ -961,8 +877,7 @@ class SFr extends S {
|
||||
}
|
||||
|
||||
@override
|
||||
String get materialYouDescription =>
|
||||
'Utiliser les couleurs systeme (Android 12+)';
|
||||
String get materialYouDescription => 'Utiliser les couleurs systeme (Android 12+)';
|
||||
|
||||
@override
|
||||
String get accentColor => 'Couleur d\'accentuation';
|
||||
@@ -974,22 +889,13 @@ class SFr extends S {
|
||||
String get preferLocalPlayer => 'Préférer le lecteur local';
|
||||
|
||||
@override
|
||||
String get preferLocalPlayerDescription =>
|
||||
'Toujours sélectionner cet appareil en premier si disponible';
|
||||
String get preferLocalPlayerDescription => 'Toujours sélectionner cet appareil en premier si disponible';
|
||||
|
||||
@override
|
||||
String get smartSortPlayers => 'Tri intelligent';
|
||||
|
||||
@override
|
||||
String get smartSortPlayersDescription =>
|
||||
'Trier par statut (en lecture, allume, eteint) au lieu d\'alphabétiquement';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitch => 'Disable Auto-Switch';
|
||||
|
||||
@override
|
||||
String get disableAutoSwitchDescription =>
|
||||
'Never automatically switch to a different player';
|
||||
String get smartSortPlayersDescription => 'Trier par statut (en lecture, allume, eteint) au lieu d\'alphabétiquement';
|
||||
|
||||
@override
|
||||
String get playerStateUnavailable => 'Indisponible';
|
||||
@@ -1021,25 +927,7 @@ class SFr extends S {
|
||||
String get showHints => 'Afficher les astuces';
|
||||
|
||||
@override
|
||||
String get showHintsDescription =>
|
||||
'Afficher des conseils utiles pour découvrir les fonctionnalites';
|
||||
|
||||
@override
|
||||
String get volumePrecisionMode => 'Volume Precision Mode';
|
||||
|
||||
@override
|
||||
String get volumePrecisionModeDescription =>
|
||||
'Hold still while adjusting volume for fine control';
|
||||
|
||||
@override
|
||||
String get display => 'Display';
|
||||
|
||||
@override
|
||||
String get showProviderIcons => 'Show Provider Icons';
|
||||
|
||||
@override
|
||||
String get showProviderIconsDescription =>
|
||||
'Display provider logos on album art';
|
||||
String get showHintsDescription => 'Afficher des conseils utiles pour découvrir les fonctionnalites';
|
||||
|
||||
@override
|
||||
String get pullToSelectPlayers => 'Tirez pour sélectionner les lecteurs';
|
||||
@@ -1051,22 +939,19 @@ class SFr extends S {
|
||||
String get swipeToAdjustVolume => 'Balayez pour ajuster le volume';
|
||||
|
||||
@override
|
||||
String get selectPlayerHint =>
|
||||
'Choisissez un lecteur ou fermez en balayant vers le bas';
|
||||
String get selectPlayerHint => 'Choisissez un lecteur ou fermez en balayant vers le bas';
|
||||
|
||||
@override
|
||||
String get welcomeToEnsemble => 'Bienvenue dans Ensemble';
|
||||
|
||||
@override
|
||||
String get welcomeMessage =>
|
||||
'Par defaut, votre telephone est le lecteur selectionne.\nTirez le mini-lecteur vers le bas pour sélectionner un autre lecteur.';
|
||||
String get welcomeMessage => 'Par defaut, votre telephone est le lecteur selectionne.\nTirez le mini-lecteur vers le bas pour sélectionner un autre lecteur.';
|
||||
|
||||
@override
|
||||
String get skip => 'Passer';
|
||||
|
||||
@override
|
||||
String get dismissPlayerHint =>
|
||||
'Balayez vers le bas, touchez a l\'exterieur ou appuyez sur retour pour revenir';
|
||||
String get dismissPlayerHint => 'Balayez vers le bas, touchez a l\'exterieur ou appuyez sur retour pour revenir';
|
||||
|
||||
@override
|
||||
String playingAlbum(String albumName) {
|
||||
@@ -1082,125 +967,17 @@ class SFr extends S {
|
||||
String get noTracks => 'No tracks';
|
||||
|
||||
@override
|
||||
String get addTracksHint =>
|
||||
'Add some music to your library to see tracks here';
|
||||
String get addTracksHint => 'Add some music to your library to see tracks here';
|
||||
|
||||
@override
|
||||
String get noFavoriteRadioStations => 'No favorite radio stations';
|
||||
|
||||
@override
|
||||
String get longPressRadioHint =>
|
||||
'Long-press a station and tap the heart to add it to favorites';
|
||||
String get longPressRadioHint => 'Long-press a station and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String get noFavoritePodcasts => 'No favorite podcasts';
|
||||
|
||||
@override
|
||||
String get longPressPodcastHint =>
|
||||
'Long-press a podcast and tap the heart to add it to favorites';
|
||||
|
||||
@override
|
||||
String failedToPlayRadioStation(String error) {
|
||||
return 'Failed to play radio station: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get itemAlreadyInLibrary => 'Item is already in library';
|
||||
|
||||
@override
|
||||
String get failedToAddToLibrary => 'Failed to add to library';
|
||||
|
||||
@override
|
||||
String get cannotFindLibraryId => 'Cannot find library ID for removal';
|
||||
|
||||
@override
|
||||
String get failedToRemoveFromLibrary => 'Failed to remove from library';
|
||||
|
||||
@override
|
||||
String failedToPlayAlbum(String error) {
|
||||
return 'Failed to play album: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String playingOnPlayer(String name, String playerName) {
|
||||
return 'Playing $name on $playerName';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToPlayPlaylist(String error) {
|
||||
return 'Failed to play playlist: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToPlayAudiobook(String error) {
|
||||
return 'Failed to play audiobook: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get noOtherPlayersAvailable => 'No other players available';
|
||||
|
||||
@override
|
||||
String get transferQueue => 'Transfer queue';
|
||||
|
||||
@override
|
||||
String get clearQueue => 'Clear queue';
|
||||
|
||||
@override
|
||||
String syncingPlayer(String playerName) {
|
||||
return 'Syncing $playerName...';
|
||||
}
|
||||
|
||||
@override
|
||||
String get switchPlayer => 'Switch Player';
|
||||
|
||||
@override
|
||||
String get logsCopiedToClipboard => 'Logs copied to clipboard';
|
||||
|
||||
@override
|
||||
String get auto => 'Auto';
|
||||
|
||||
@override
|
||||
String get transferQueueTo => 'Transfer Queue To';
|
||||
|
||||
@override
|
||||
String queueTransferredTo(String playerName) {
|
||||
return 'Queue transferred to $playerName';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToTransferQueue(String error) {
|
||||
return 'Failed to transfer queue: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String failedToLoadQueue(String error) {
|
||||
return 'Failed to load queue: $error';
|
||||
}
|
||||
|
||||
@override
|
||||
String get transferTo => 'Transfer to...';
|
||||
|
||||
@override
|
||||
String get transferQueueToPlayer => 'Transfer queue to another player';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlay => 'Select a player';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlayAlbum => 'Select player to play album';
|
||||
|
||||
@override
|
||||
String get selectPlayerToPlayPlaylist => 'Select player to play playlist';
|
||||
|
||||
@override
|
||||
String get selectPlayerForRadio => 'Select player for radio';
|
||||
|
||||
@override
|
||||
String get selectPlayerForEpisode => 'Select player for episode';
|
||||
|
||||
@override
|
||||
String get selectPlayerForAudiobook => 'Select player for audiobook';
|
||||
|
||||
@override
|
||||
String get selectPlayerToAddToQueue => 'Select player to add to queue';
|
||||
String get longPressPodcastHint => 'Long-press a podcast and tap the heart to add it to favorites';
|
||||
}
|
||||
|
||||
+1
-2
@@ -223,9 +223,8 @@ class _MusicAssistantAppState extends State<MusicAssistantApp> with WidgetsBindi
|
||||
}
|
||||
|
||||
// Then check expanded player
|
||||
// No haptic - Android back gesture provides its own
|
||||
if (GlobalPlayerOverlay.isPlayerExpanded) {
|
||||
GlobalPlayerOverlay.collapsePlayer(withHaptic: false);
|
||||
GlobalPlayerOverlay.collapsePlayer();
|
||||
return true; // We handled it, don't let Navigator process it
|
||||
}
|
||||
|
||||
|
||||
+67
-62
@@ -16,10 +16,6 @@ class ProviderMapping {
|
||||
final String providerInstance;
|
||||
final bool available;
|
||||
final Map<String, dynamic>? audioFormat;
|
||||
/// Whether this item is in the library for this specific provider instance.
|
||||
/// True = this provider "owns" the item (user added it from this account)
|
||||
/// False = item exists but wasn't added from this provider
|
||||
final bool inLibrary;
|
||||
|
||||
ProviderMapping({
|
||||
required this.itemId,
|
||||
@@ -27,7 +23,6 @@ class ProviderMapping {
|
||||
required this.providerInstance,
|
||||
required this.available,
|
||||
this.audioFormat,
|
||||
this.inLibrary = true,
|
||||
});
|
||||
|
||||
factory ProviderMapping.fromJson(Map<String, dynamic> json) {
|
||||
@@ -37,8 +32,6 @@ class ProviderMapping {
|
||||
providerInstance: json['provider_instance'] as String? ?? '',
|
||||
available: json['available'] as bool? ?? true,
|
||||
audioFormat: json['audio_format'] as Map<String, dynamic>?,
|
||||
// Parse in_library field - MA uses 1/0 or true/false
|
||||
inLibrary: json['in_library'] == true || json['in_library'] == 1,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -49,7 +42,6 @@ class ProviderMapping {
|
||||
'provider_instance': providerInstance,
|
||||
'available': available,
|
||||
if (audioFormat != null) 'audio_format': audioFormat,
|
||||
'in_library': inLibrary,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -66,6 +58,10 @@ class MediaItem {
|
||||
final bool? favorite;
|
||||
final int? position;
|
||||
final Duration? duration;
|
||||
final DateTime? timestampAdded;
|
||||
final DateTime? timestampModified;
|
||||
final DateTime? lastPlayed;
|
||||
final int? playCount;
|
||||
|
||||
MediaItem({
|
||||
required this.itemId,
|
||||
@@ -79,6 +75,10 @@ class MediaItem {
|
||||
this.favorite,
|
||||
this.position,
|
||||
this.duration,
|
||||
this.timestampAdded,
|
||||
this.timestampModified,
|
||||
this.lastPlayed,
|
||||
this.playCount,
|
||||
});
|
||||
|
||||
factory MediaItem.fromJson(Map<String, dynamic> json) {
|
||||
@@ -91,6 +91,21 @@ class MediaItem {
|
||||
);
|
||||
}
|
||||
|
||||
// Parse timestamp fields (can be int unix timestamp or ISO string)
|
||||
DateTime? parseTimestamp(dynamic value) {
|
||||
if (value == null) return null;
|
||||
if (value is int) {
|
||||
return DateTime.fromMillisecondsSinceEpoch(value * 1000);
|
||||
}
|
||||
if (value is double) {
|
||||
return DateTime.fromMillisecondsSinceEpoch((value * 1000).toInt());
|
||||
}
|
||||
if (value is String) {
|
||||
return DateTime.tryParse(value);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
return MediaItem(
|
||||
itemId: json['item_id']?.toString() ?? json['id']?.toString() ?? '',
|
||||
provider: json['provider'] as String? ?? 'unknown',
|
||||
@@ -107,6 +122,10 @@ class MediaItem {
|
||||
duration: json['duration'] != null
|
||||
? Duration(seconds: (json['duration'] as num).toInt())
|
||||
: null,
|
||||
timestampAdded: parseTimestamp(json['timestamp_added']),
|
||||
timestampModified: parseTimestamp(json['timestamp_modified']),
|
||||
lastPlayed: parseTimestamp(json['last_played']),
|
||||
playCount: json['play_count'] as int?,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -124,25 +143,12 @@ class MediaItem {
|
||||
if (favorite != null) 'favorite': favorite,
|
||||
if (position != null) 'position': position,
|
||||
if (duration != null) 'duration': duration!.inSeconds,
|
||||
if (timestampAdded != null) 'timestamp_added': timestampAdded!.millisecondsSinceEpoch ~/ 1000,
|
||||
if (timestampModified != null) 'timestamp_modified': timestampModified!.millisecondsSinceEpoch ~/ 1000,
|
||||
if (lastPlayed != null) 'last_played': lastPlayed!.millisecondsSinceEpoch ~/ 1000,
|
||||
if (playCount != null) 'play_count': playCount,
|
||||
};
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) =>
|
||||
identical(this, other) ||
|
||||
other is MediaItem &&
|
||||
runtimeType == other.runtimeType &&
|
||||
itemId == other.itemId &&
|
||||
provider == other.provider;
|
||||
|
||||
@override
|
||||
int get hashCode => Object.hash(itemId, provider);
|
||||
|
||||
/// Check if this item is in the user's library
|
||||
bool get inLibrary {
|
||||
if (provider == 'library') return true;
|
||||
return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
|
||||
}
|
||||
}
|
||||
|
||||
class Artist extends MediaItem {
|
||||
@@ -155,6 +161,10 @@ class Artist extends MediaItem {
|
||||
super.providerMappings,
|
||||
super.metadata,
|
||||
super.favorite,
|
||||
super.timestampAdded,
|
||||
super.timestampModified,
|
||||
super.lastPlayed,
|
||||
super.playCount,
|
||||
}) : super(mediaType: MediaType.artist);
|
||||
|
||||
factory Artist.fromJson(Map<String, dynamic> json) {
|
||||
@@ -168,15 +178,13 @@ class Artist extends MediaItem {
|
||||
providerMappings: item.providerMappings,
|
||||
metadata: item.metadata,
|
||||
favorite: item.favorite,
|
||||
timestampAdded: item.timestampAdded,
|
||||
timestampModified: item.timestampModified,
|
||||
lastPlayed: item.lastPlayed,
|
||||
playCount: item.playCount,
|
||||
);
|
||||
}
|
||||
|
||||
/// Check if this artist is in the user's library
|
||||
bool get inLibrary {
|
||||
if (provider == 'library') return true;
|
||||
return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, dynamic> toJson() => super.toJson();
|
||||
}
|
||||
@@ -198,6 +206,10 @@ class Album extends MediaItem {
|
||||
super.providerMappings,
|
||||
super.metadata,
|
||||
super.favorite,
|
||||
super.timestampAdded,
|
||||
super.timestampModified,
|
||||
super.lastPlayed,
|
||||
super.playCount,
|
||||
}) : super(mediaType: MediaType.album);
|
||||
|
||||
factory Album.fromJson(Map<String, dynamic> json) {
|
||||
@@ -225,6 +237,10 @@ class Album extends MediaItem {
|
||||
providerMappings: item.providerMappings,
|
||||
metadata: item.metadata,
|
||||
favorite: item.favorite,
|
||||
timestampAdded: item.timestampAdded,
|
||||
timestampModified: item.timestampModified,
|
||||
lastPlayed: item.lastPlayed,
|
||||
playCount: item.playCount,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -271,6 +287,10 @@ class Track extends MediaItem {
|
||||
super.favorite,
|
||||
super.position,
|
||||
super.duration,
|
||||
super.timestampAdded,
|
||||
super.timestampModified,
|
||||
super.lastPlayed,
|
||||
super.playCount,
|
||||
}) : super(mediaType: MediaType.track);
|
||||
|
||||
factory Track.fromJson(Map<String, dynamic> json) {
|
||||
@@ -292,18 +312,16 @@ class Track extends MediaItem {
|
||||
favorite: item.favorite,
|
||||
position: item.position,
|
||||
duration: item.duration,
|
||||
timestampAdded: item.timestampAdded,
|
||||
timestampModified: item.timestampModified,
|
||||
lastPlayed: item.lastPlayed,
|
||||
playCount: item.playCount,
|
||||
);
|
||||
}
|
||||
|
||||
String get artistsString =>
|
||||
artists?.map((a) => a.name).join(', ') ?? 'Unknown Artist';
|
||||
|
||||
/// Check if this track is in the user's library
|
||||
bool get inLibrary {
|
||||
if (provider == 'library') return true;
|
||||
return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, dynamic> toJson() {
|
||||
final json = super.toJson();
|
||||
@@ -332,6 +350,10 @@ class Playlist extends MediaItem {
|
||||
super.providerMappings,
|
||||
super.metadata,
|
||||
super.favorite,
|
||||
super.timestampAdded,
|
||||
super.timestampModified,
|
||||
super.lastPlayed,
|
||||
super.playCount,
|
||||
}) : super(mediaType: MediaType.playlist);
|
||||
|
||||
factory Playlist.fromJson(Map<String, dynamic> json) {
|
||||
@@ -348,14 +370,12 @@ class Playlist extends MediaItem {
|
||||
providerMappings: item.providerMappings,
|
||||
metadata: item.metadata,
|
||||
favorite: item.favorite,
|
||||
timestampAdded: item.timestampAdded,
|
||||
timestampModified: item.timestampModified,
|
||||
lastPlayed: item.lastPlayed,
|
||||
playCount: item.playCount,
|
||||
);
|
||||
}
|
||||
|
||||
/// Check if this playlist is in the user's library
|
||||
bool get inLibrary {
|
||||
if (provider == 'library') return true;
|
||||
return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
|
||||
}
|
||||
}
|
||||
|
||||
class Chapter {
|
||||
@@ -464,20 +484,9 @@ class Audiobook extends MediaItem {
|
||||
factory Audiobook.fromJson(Map<String, dynamic> json) {
|
||||
final item = MediaItem.fromJson(json);
|
||||
|
||||
// Parse year - check top level first, then metadata.release_date (ABS format)
|
||||
// Parse year
|
||||
int? year;
|
||||
final metadata = json['metadata'] as Map<String, dynamic>?;
|
||||
dynamic yearValue = json['year'];
|
||||
if (yearValue == null && metadata != null) {
|
||||
// ABS stores year in metadata.release_date (can be "2024" or "2024-01-15")
|
||||
final releaseDate = metadata['release_date'];
|
||||
if (releaseDate is String && releaseDate.isNotEmpty) {
|
||||
// Extract year from date string (handles both "2024" and "2024-01-15" formats)
|
||||
yearValue = releaseDate.split('-').first;
|
||||
} else if (releaseDate is int) {
|
||||
yearValue = releaseDate;
|
||||
}
|
||||
}
|
||||
final yearValue = json['year'];
|
||||
if (yearValue is int) {
|
||||
year = yearValue;
|
||||
} else if (yearValue is String) {
|
||||
@@ -507,6 +516,8 @@ class Audiobook extends MediaItem {
|
||||
|
||||
// Parse chapters - check top level first, then metadata
|
||||
List<Chapter>? chapters;
|
||||
final metadata = json['metadata'] as Map<String, dynamic>?;
|
||||
|
||||
dynamic chaptersData = json['chapters'];
|
||||
if (chaptersData == null && metadata != null) {
|
||||
chaptersData = metadata['chapters'];
|
||||
@@ -552,12 +563,6 @@ class Audiobook extends MediaItem {
|
||||
String get narratorsString =>
|
||||
narrators?.map((n) => n.name).join(', ') ?? 'Unknown Narrator';
|
||||
|
||||
/// Check if this audiobook is in the user's library
|
||||
bool get inLibrary {
|
||||
if (provider == 'library') return true;
|
||||
return providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
|
||||
}
|
||||
|
||||
/// Get progress as a percentage (0.0 to 1.0)
|
||||
double get progress {
|
||||
if (fullyPlayed == true) return 1.0;
|
||||
|
||||
+24
-41
@@ -17,7 +17,6 @@ class Player {
|
||||
final String? activeSource; // The currently active source for this player
|
||||
final bool isExternalSource; // True when an external source (optical, Spotify, etc.) is active
|
||||
final String? appId; // The app_id from MA - 'music_assistant' when MA is playing, else external source
|
||||
final String? activeQueue; // The active_queue from MA - has value when MA is controlling playback
|
||||
|
||||
Player({
|
||||
required this.playerId,
|
||||
@@ -36,7 +35,6 @@ class Player {
|
||||
this.activeSource,
|
||||
this.isExternalSource = false,
|
||||
this.appId,
|
||||
this.activeQueue,
|
||||
});
|
||||
|
||||
/// Create a copy of this Player with some fields replaced
|
||||
@@ -57,7 +55,6 @@ class Player {
|
||||
String? activeSource,
|
||||
bool? isExternalSource,
|
||||
String? appId,
|
||||
String? activeQueue,
|
||||
}) {
|
||||
return Player(
|
||||
playerId: playerId ?? this.playerId,
|
||||
@@ -76,7 +73,6 @@ class Player {
|
||||
activeSource: activeSource ?? this.activeSource,
|
||||
isExternalSource: isExternalSource ?? this.isExternalSource,
|
||||
appId: appId ?? this.appId,
|
||||
activeQueue: activeQueue ?? this.activeQueue,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -222,61 +218,50 @@ class Player {
|
||||
// Parse active_source - the currently active source for this player
|
||||
final activeSource = json['active_source'] as String?;
|
||||
|
||||
// Parse active_queue - this is the key indicator for MA-controlled playback
|
||||
// When MA is playing: active_queue = 'uuid:...' or similar queue ID
|
||||
// When external source: active_queue = null
|
||||
final activeQueue = json['active_queue'] as String?;
|
||||
|
||||
// Parse app_id - helps distinguish external sources on DLNA players
|
||||
final appId = json['app_id'] as String?;
|
||||
|
||||
// Detect external source (optical, Spotify Connect, AirPlay, etc.)
|
||||
//
|
||||
// Detection logic priority:
|
||||
// 1. If app_id == 'music_assistant' -> MA is playing, NOT external
|
||||
// 2. If active_queue has a value -> MA has a queue, NOT external
|
||||
// (This handles Spotify as music provider where URI is spotify:// but MA controls playback)
|
||||
// 3. If app_id is set and NOT 'music_assistant' -> external source (e.g., 'http', 'spotify')
|
||||
// 4. Fallback: Check URI patterns for simple external IDs (optical, line_in, etc.)
|
||||
// Detect external source (optical, Spotify, AirPlay, etc.)
|
||||
// Primary indicator: app_id - if not 'music_assistant', it's an external source
|
||||
// Secondary indicators: URI patterns and media_type
|
||||
bool isExternalSource = false;
|
||||
|
||||
// If MA explicitly says it's playing, trust that
|
||||
if (appId == 'music_assistant') {
|
||||
isExternalSource = false;
|
||||
}
|
||||
// If there's an active queue, MA is controlling playback (even with spotify:// URIs)
|
||||
else if (activeQueue != null && activeQueue.isNotEmpty) {
|
||||
isExternalSource = false;
|
||||
}
|
||||
// If app_id is set to something else (http, spotify, etc.), it's external
|
||||
else if (appId != null && appId.isNotEmpty) {
|
||||
// Check app_id first - this is the most reliable indicator for DLNA players
|
||||
// When MA is playing: app_id = 'music_assistant'
|
||||
// When external source: app_id = 'http', 'spotify', etc.
|
||||
final appId = json['app_id'] as String?;
|
||||
if (appId != null && appId.isNotEmpty && appId != 'music_assistant') {
|
||||
// app_id is set but not 'music_assistant' - external source is active
|
||||
isExternalSource = true;
|
||||
}
|
||||
// Fallback: check current_media for simple external source indicators
|
||||
// Only check these when we have no app_id and no active_queue
|
||||
else if (json.containsKey('current_media')) {
|
||||
|
||||
// Also check current_media for additional external source indicators
|
||||
if (!isExternalSource && json.containsKey('current_media')) {
|
||||
final currentMedia = json['current_media'] as Map<String, dynamic>?;
|
||||
if (currentMedia != null) {
|
||||
final uri = currentMedia['uri'] as String?;
|
||||
final mediaType = currentMedia['media_type'] as String?;
|
||||
|
||||
// Only check for simple external source identifiers (physical inputs)
|
||||
// Do NOT flag spotify://, airplay://, etc. as external here -
|
||||
// those should only be external if app_id indicates external control
|
||||
// External source indicators:
|
||||
// 1. URI is a simple identifier like 'optical', 'line_in', 'bluetooth', 'hdmi'
|
||||
// 2. URI starts with external protocols: 'spotify://', 'airplay://', etc.
|
||||
// 3. Media type is 'unknown' (MA doesn't recognize the source)
|
||||
if (uri != null) {
|
||||
final uriLower = uri.toLowerCase();
|
||||
// Simple external source identifiers (no :// or /)
|
||||
// These are physical inputs that are always external
|
||||
final isSimpleExternalId = !uri.contains('://') && !uri.contains('/') &&
|
||||
(uriLower == 'optical' || uriLower == 'line_in' || uriLower == 'bluetooth' ||
|
||||
uriLower == 'hdmi' || uriLower == 'tv' || uriLower == 'aux' ||
|
||||
uriLower == 'coaxial' || uriLower == 'toslink');
|
||||
// External streaming protocols
|
||||
final isExternalProtocol = uriLower.startsWith('spotify://') ||
|
||||
uriLower.startsWith('airplay://') ||
|
||||
uriLower.startsWith('cast://') ||
|
||||
uriLower.startsWith('bluetooth://');
|
||||
|
||||
isExternalSource = isSimpleExternalId;
|
||||
isExternalSource = isSimpleExternalId || isExternalProtocol;
|
||||
}
|
||||
|
||||
// Also check media_type - 'unknown' with non-MA URI indicates external source
|
||||
// Also check media_type - 'unknown' often indicates external source
|
||||
if (!isExternalSource && mediaType == 'unknown') {
|
||||
// If media_type is unknown and URI doesn't look like MA content, it's external
|
||||
final uri = currentMedia['uri'] as String?;
|
||||
if (uri != null && !uri.startsWith('library://') && !uri.contains('://track/')) {
|
||||
isExternalSource = true;
|
||||
@@ -302,7 +287,6 @@ class Player {
|
||||
activeSource: activeSource,
|
||||
isExternalSource: isExternalSource,
|
||||
appId: appId,
|
||||
activeQueue: activeQueue,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -324,7 +308,6 @@ class Player {
|
||||
if (activeSource != null) 'active_source': activeSource,
|
||||
'is_external_source': isExternalSource,
|
||||
if (appId != null) 'app_id': appId,
|
||||
if (activeQueue != null) 'active_queue': activeQueue,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,128 +0,0 @@
|
||||
/// Represents a music provider instance from Music Assistant.
|
||||
///
|
||||
/// Each provider (like Spotify, Tidal) can have multiple instances
|
||||
/// (e.g., two different Spotify accounts). This class represents
|
||||
/// a single provider instance with its unique ID.
|
||||
class ProviderInstance {
|
||||
/// Unique identifier for this provider instance (e.g., "spotify--abc123")
|
||||
final String instanceId;
|
||||
|
||||
/// The provider domain/type (e.g., "spotify", "tidal", "qobuz")
|
||||
final String domain;
|
||||
|
||||
/// Display name for this instance (e.g., "Spotify (John's Account)")
|
||||
final String name;
|
||||
|
||||
/// Whether this provider is currently available/connected
|
||||
final bool available;
|
||||
|
||||
ProviderInstance({
|
||||
required this.instanceId,
|
||||
required this.domain,
|
||||
required this.name,
|
||||
required this.available,
|
||||
});
|
||||
|
||||
/// Provider capabilities - maps domain to supported content types
|
||||
/// This determines which tabs/categories show which providers
|
||||
static const Map<String, Set<String>> providerCapabilities = {
|
||||
// Music streaming services (support artists, albums, tracks, playlists)
|
||||
// Spotify also has audiobooks and podcasts
|
||||
'spotify': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
|
||||
'tidal': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'qobuz': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'deezer': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'ytmusic': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
|
||||
'soundcloud': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'apple_music': {'artists', 'albums', 'tracks', 'playlists', 'podcasts'},
|
||||
'amazon_music': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
// Self-hosted media servers (can have music, audiobooks, and podcasts)
|
||||
'plex': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
|
||||
'jellyfin': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
|
||||
'emby': {'artists', 'albums', 'tracks', 'playlists', 'audiobooks', 'podcasts'},
|
||||
// Music-only servers
|
||||
'subsonic': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'opensubsonic': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'navidrome': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
'filesystem': {'artists', 'albums', 'tracks', 'playlists'},
|
||||
// Audiobook and podcast providers
|
||||
'audiobookshelf': {'audiobooks', 'podcasts'},
|
||||
'itunes_podcasts': {'podcasts'},
|
||||
// Radio providers (tunein also has podcasts)
|
||||
'tunein': {'radio', 'podcasts'},
|
||||
'radiobrowser': {'radio'},
|
||||
// Player/system providers (no library content)
|
||||
'snapcast': <String>{},
|
||||
'fully_kiosk': <String>{},
|
||||
};
|
||||
|
||||
/// Known music provider domains that provide library content
|
||||
static const Set<String> musicProviderDomains = {
|
||||
// Streaming services
|
||||
'spotify',
|
||||
'tidal',
|
||||
'qobuz',
|
||||
'deezer',
|
||||
'ytmusic',
|
||||
'soundcloud',
|
||||
'apple_music',
|
||||
'amazon_music',
|
||||
// Self-hosted / local
|
||||
'plex',
|
||||
'subsonic',
|
||||
'opensubsonic',
|
||||
'jellyfin',
|
||||
'emby',
|
||||
'navidrome',
|
||||
'audiobookshelf',
|
||||
'filesystem',
|
||||
'itunes_podcasts',
|
||||
// Other
|
||||
'tunein',
|
||||
'radiobrowser',
|
||||
'snapcast',
|
||||
'fully_kiosk',
|
||||
};
|
||||
|
||||
/// Whether this is a music provider (vs. player provider, metadata provider, etc.)
|
||||
bool get isMusicProvider => musicProviderDomains.contains(domain);
|
||||
|
||||
/// Get supported content types for this provider
|
||||
Set<String> get supportedContentTypes =>
|
||||
providerCapabilities[domain] ?? <String>{};
|
||||
|
||||
/// Check if this provider supports a specific content type/category
|
||||
bool supportsContentType(String category) =>
|
||||
supportedContentTypes.contains(category);
|
||||
|
||||
factory ProviderInstance.fromJson(Map<String, dynamic> json) {
|
||||
return ProviderInstance(
|
||||
instanceId: json['instance_id'] as String? ?? '',
|
||||
domain: json['domain'] as String? ?? json['type'] as String? ?? '',
|
||||
name: json['name'] as String? ?? json['instance_id'] as String? ?? 'Unknown',
|
||||
available: json['available'] as bool? ?? true,
|
||||
);
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
return {
|
||||
'instance_id': instanceId,
|
||||
'domain': domain,
|
||||
'name': name,
|
||||
'available': available,
|
||||
};
|
||||
}
|
||||
|
||||
@override
|
||||
String toString() => 'ProviderInstance($instanceId: $name)';
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) =>
|
||||
identical(this, other) ||
|
||||
other is ProviderInstance &&
|
||||
runtimeType == other.runtimeType &&
|
||||
instanceId == other.instanceId;
|
||||
|
||||
@override
|
||||
int get hashCode => instanceId.hashCode;
|
||||
}
|
||||
@@ -1,65 +0,0 @@
|
||||
/// Represents a provider manifest from Music Assistant.
|
||||
///
|
||||
/// Contains metadata about a provider type including its icons.
|
||||
/// This is separate from ProviderInstance which represents a configured
|
||||
/// instance of a provider.
|
||||
class ProviderManifest {
|
||||
/// The provider domain/type (e.g., "spotify", "tidal", "qobuz")
|
||||
final String domain;
|
||||
|
||||
/// Display name for this provider type
|
||||
final String name;
|
||||
|
||||
/// Description of the provider
|
||||
final String? description;
|
||||
|
||||
/// SVG icon as XML string
|
||||
final String? iconSvg;
|
||||
|
||||
/// SVG icon for dark theme as XML string
|
||||
final String? iconSvgDark;
|
||||
|
||||
/// Monochrome SVG icon as XML string
|
||||
final String? iconSvgMonochrome;
|
||||
|
||||
/// Material Design icon name (fallback)
|
||||
final String? icon;
|
||||
|
||||
ProviderManifest({
|
||||
required this.domain,
|
||||
required this.name,
|
||||
this.description,
|
||||
this.iconSvg,
|
||||
this.iconSvgDark,
|
||||
this.iconSvgMonochrome,
|
||||
this.icon,
|
||||
});
|
||||
|
||||
/// Whether this manifest has any SVG icon available
|
||||
bool get hasSvgIcon =>
|
||||
iconSvg != null || iconSvgDark != null || iconSvgMonochrome != null;
|
||||
|
||||
/// Get the best available SVG icon for the given brightness
|
||||
/// Prefers dark icon for dark themes, falls back to regular or monochrome
|
||||
String? getSvgIcon({bool isDark = false}) {
|
||||
if (isDark && iconSvgDark != null) {
|
||||
return iconSvgDark;
|
||||
}
|
||||
return iconSvg ?? iconSvgMonochrome;
|
||||
}
|
||||
|
||||
factory ProviderManifest.fromJson(Map<String, dynamic> json) {
|
||||
return ProviderManifest(
|
||||
domain: json['domain'] as String? ?? '',
|
||||
name: json['name'] as String? ?? '',
|
||||
description: json['description'] as String?,
|
||||
iconSvg: json['icon_svg'] as String?,
|
||||
iconSvgDark: json['icon_svg_dark'] as String?,
|
||||
iconSvgMonochrome: json['icon_svg_monochrome'] as String?,
|
||||
icon: json['icon'] as String?,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
String toString() => 'ProviderManifest($domain: $name)';
|
||||
}
|
||||
@@ -1,245 +0,0 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import '../services/music_assistant_api.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../services/error_handler.dart';
|
||||
import '../services/auth/auth_manager.dart';
|
||||
|
||||
/// Callback types for connection events
|
||||
typedef OnConnected = Future<void> Function();
|
||||
typedef OnAuthenticated = Future<void> Function();
|
||||
typedef OnDisconnected = void Function();
|
||||
|
||||
/// Provider for connection state management.
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to handle:
|
||||
/// - WebSocket connection lifecycle
|
||||
/// - Authentication flow (MA token, credentials)
|
||||
/// - Reconnection logic
|
||||
/// - Connection state broadcasting
|
||||
///
|
||||
/// Note: This is a partial extraction. Full integration requires updating
|
||||
/// all consumers to use this provider directly.
|
||||
class ConnectionProvider with ChangeNotifier {
|
||||
final DebugLogger _logger = DebugLogger();
|
||||
final AuthManager _authManager = AuthManager();
|
||||
|
||||
MusicAssistantAPI? _api;
|
||||
String? _serverUrl;
|
||||
String? _error;
|
||||
MAConnectionState _connectionState = MAConnectionState.disconnected;
|
||||
|
||||
StreamSubscription? _connectionStateSubscription;
|
||||
|
||||
// Callbacks for connection events - set by the facade provider
|
||||
OnConnected? onConnected;
|
||||
OnAuthenticated? onAuthenticated;
|
||||
OnDisconnected? onDisconnected;
|
||||
|
||||
// User settings captured during authentication
|
||||
List<String> _providerFilter = [];
|
||||
List<String> _playerFilter = [];
|
||||
|
||||
// ============================================================================
|
||||
// GETTERS
|
||||
// ============================================================================
|
||||
|
||||
MusicAssistantAPI? get api => _api;
|
||||
AuthManager get authManager => _authManager;
|
||||
String? get serverUrl => _serverUrl;
|
||||
String? get error => _error;
|
||||
MAConnectionState get connectionState => _connectionState;
|
||||
|
||||
bool get isConnected =>
|
||||
_connectionState == MAConnectionState.connected ||
|
||||
_connectionState == MAConnectionState.authenticated;
|
||||
|
||||
List<String> get providerFilter => _providerFilter;
|
||||
List<String> get playerFilter => _playerFilter;
|
||||
|
||||
// ============================================================================
|
||||
// CONNECTION
|
||||
// ============================================================================
|
||||
|
||||
/// Connect to the Music Assistant server
|
||||
Future<void> connect(String serverUrl) async {
|
||||
try {
|
||||
_error = null;
|
||||
_serverUrl = serverUrl;
|
||||
await SettingsService.setServerUrl(serverUrl);
|
||||
|
||||
// Dispose the old API to stop any pending reconnects
|
||||
_api?.dispose();
|
||||
|
||||
_api = MusicAssistantAPI(serverUrl, _authManager);
|
||||
|
||||
_connectionStateSubscription?.cancel();
|
||||
_connectionStateSubscription = _api!.connectionState.listen(
|
||||
(state) async {
|
||||
_connectionState = state;
|
||||
notifyListeners();
|
||||
|
||||
if (state == MAConnectionState.connected) {
|
||||
_logger.log('🔗 WebSocket connected to MA server');
|
||||
|
||||
if (_api!.authRequired && !_api!.isAuthenticated) {
|
||||
_logger.log('🔐 MA auth required, attempting authentication...');
|
||||
final authenticated = await _handleAuthentication();
|
||||
if (!authenticated) {
|
||||
_error = 'Authentication required. Please log in again.';
|
||||
notifyListeners();
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// No auth required, trigger callback
|
||||
await onConnected?.call();
|
||||
} else if (state == MAConnectionState.authenticated) {
|
||||
_logger.log('✅ MA authentication successful');
|
||||
await onAuthenticated?.call();
|
||||
} else if (state == MAConnectionState.disconnected) {
|
||||
_logger.log('📡 Disconnected - keeping cached data for instant resume');
|
||||
onDisconnected?.call();
|
||||
}
|
||||
},
|
||||
onError: (error) {
|
||||
_logger.log('Connection state stream error: $error');
|
||||
_connectionState = MAConnectionState.error;
|
||||
notifyListeners();
|
||||
},
|
||||
);
|
||||
|
||||
await _api!.connect();
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
final errorInfo = ErrorHandler.handleError(e, context: 'Connect to server');
|
||||
_error = errorInfo.userMessage;
|
||||
_connectionState = MAConnectionState.error;
|
||||
_logger.log('Connection error: ${errorInfo.technicalMessage}');
|
||||
notifyListeners();
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<bool> _handleAuthentication() async {
|
||||
if (_api == null) return false;
|
||||
|
||||
try {
|
||||
final storedToken = await SettingsService.getMaAuthToken();
|
||||
if (storedToken != null) {
|
||||
_logger.log('🔐 Trying stored MA token...');
|
||||
final success = await _api!.authenticateWithToken(storedToken);
|
||||
if (success) {
|
||||
_logger.log('✅ MA authentication with stored token successful');
|
||||
await _fetchUserSettings();
|
||||
return true;
|
||||
}
|
||||
_logger.log('⚠️ Stored MA token invalid, clearing...');
|
||||
await SettingsService.clearMaAuthToken();
|
||||
}
|
||||
|
||||
final username = await SettingsService.getUsername();
|
||||
final password = await SettingsService.getPassword();
|
||||
|
||||
if (username != null &&
|
||||
password != null &&
|
||||
username.isNotEmpty &&
|
||||
password.isNotEmpty) {
|
||||
_logger.log('🔐 Trying stored credentials...');
|
||||
final accessToken = await _api!.loginWithCredentials(username, password);
|
||||
|
||||
if (accessToken != null) {
|
||||
_logger.log('✅ MA login with stored credentials successful');
|
||||
|
||||
final longLivedToken = await _api!.createLongLivedToken();
|
||||
if (longLivedToken != null) {
|
||||
await SettingsService.setMaAuthToken(longLivedToken);
|
||||
_logger.log('✅ Saved new long-lived MA token');
|
||||
} else {
|
||||
await SettingsService.setMaAuthToken(accessToken);
|
||||
}
|
||||
|
||||
await _fetchUserSettings();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
_logger.log('❌ MA authentication failed - no valid token or credentials');
|
||||
return false;
|
||||
} catch (e) {
|
||||
_logger.log('❌ MA authentication error: $e');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _fetchUserSettings() async {
|
||||
if (_api == null) return;
|
||||
|
||||
try {
|
||||
final userInfo = await _api!.getCurrentUserInfo();
|
||||
if (userInfo == null) return;
|
||||
|
||||
// Set profile name
|
||||
final displayName = userInfo['display_name'] as String?;
|
||||
final username = userInfo['username'] as String?;
|
||||
final profileName =
|
||||
(displayName != null && displayName.isNotEmpty) ? displayName : username;
|
||||
|
||||
if (profileName != null && profileName.isNotEmpty) {
|
||||
await SettingsService.setOwnerName(profileName);
|
||||
_logger.log('✅ Set owner name from MA profile: $profileName');
|
||||
}
|
||||
|
||||
// Capture provider filter
|
||||
final providerFilterRaw = userInfo['provider_filter'];
|
||||
if (providerFilterRaw is List) {
|
||||
_providerFilter = providerFilterRaw.cast<String>().toList();
|
||||
if (_providerFilter.isNotEmpty) {
|
||||
_logger.log(
|
||||
'🔒 Provider filter active: ${_providerFilter.length} providers allowed');
|
||||
}
|
||||
} else {
|
||||
_providerFilter = [];
|
||||
}
|
||||
|
||||
// Capture player filter
|
||||
final playerFilterRaw = userInfo['player_filter'];
|
||||
if (playerFilterRaw is List) {
|
||||
_playerFilter = playerFilterRaw.cast<String>().toList();
|
||||
if (_playerFilter.isNotEmpty) {
|
||||
_logger.log(
|
||||
'🔒 Player filter active: ${_playerFilter.length} players allowed');
|
||||
}
|
||||
} else {
|
||||
_playerFilter = [];
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Could not fetch user settings (non-fatal): $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// Disconnect from the server
|
||||
Future<void> disconnect() async {
|
||||
_connectionStateSubscription?.cancel();
|
||||
await _api?.disconnect();
|
||||
_connectionState = MAConnectionState.disconnected;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Check connection and reconnect if needed
|
||||
Future<void> checkAndReconnect() async {
|
||||
if (_serverUrl != null && !isConnected) {
|
||||
_logger.log('🔄 Attempting reconnection...');
|
||||
await connect(_serverUrl!);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_connectionStateSubscription?.cancel();
|
||||
_api?.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,129 +0,0 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
|
||||
/// Callback type for when sleep timer expires and should pause playback
|
||||
typedef OnSleepTimerExpired = void Function();
|
||||
|
||||
/// Provider for sleep timer functionality.
|
||||
///
|
||||
/// Extracted from MusicAssistantProvider to reduce complexity and improve testability.
|
||||
/// This provider manages:
|
||||
/// - Timed sleep (pause after X minutes)
|
||||
/// - End of track sleep (pause when current track ends)
|
||||
class SleepTimerProvider with ChangeNotifier {
|
||||
final DebugLogger _logger = DebugLogger();
|
||||
|
||||
Timer? _sleepTimer;
|
||||
DateTime? _sleepTimerEndTime;
|
||||
int? _sleepTimerMinutes; // null = off, -1 = end of track, positive = minutes
|
||||
Timer? _sleepTimerDisplayTimer;
|
||||
|
||||
/// Callback to pause playback when timer expires
|
||||
OnSleepTimerExpired? onExpired;
|
||||
|
||||
// ============================================================================
|
||||
// GETTERS
|
||||
// ============================================================================
|
||||
|
||||
/// Whether a sleep timer is currently active
|
||||
bool get isActive => _sleepTimerMinutes != null;
|
||||
|
||||
/// Current timer setting: null = off, -1 = end of track, positive = minutes
|
||||
int? get minutes => _sleepTimerMinutes;
|
||||
|
||||
/// Time remaining until sleep timer expires (null if end-of-track mode or inactive)
|
||||
Duration? get remaining {
|
||||
if (_sleepTimerEndTime == null) return null;
|
||||
final remaining = _sleepTimerEndTime!.difference(DateTime.now());
|
||||
return remaining.isNegative ? Duration.zero : remaining;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// TIMER CONTROL
|
||||
// ============================================================================
|
||||
|
||||
/// Set sleep timer. Pass null to turn off, -1 for end of track, or minutes.
|
||||
void setTimer(int? minutes) {
|
||||
// Cancel any existing timer
|
||||
_cancelInternal();
|
||||
|
||||
_sleepTimerMinutes = minutes;
|
||||
|
||||
if (minutes == null) {
|
||||
// Timer off
|
||||
_logger.log('😴 Sleep timer: OFF');
|
||||
notifyListeners();
|
||||
return;
|
||||
}
|
||||
|
||||
if (minutes == -1) {
|
||||
// End of track - handled in player state updates
|
||||
_sleepTimerEndTime = null; // No fixed end time
|
||||
_logger.log('😴 Sleep timer: End of track');
|
||||
notifyListeners();
|
||||
return;
|
||||
}
|
||||
|
||||
// Set timer for specified minutes
|
||||
_sleepTimerEndTime = DateTime.now().add(Duration(minutes: minutes));
|
||||
_logger.log('😴 Sleep timer: $minutes minutes (until $_sleepTimerEndTime)');
|
||||
|
||||
// Create the actual timer
|
||||
_sleepTimer = Timer(Duration(minutes: minutes), _onTimerExpired);
|
||||
|
||||
// Start display update timer (every second for countdown)
|
||||
_sleepTimerDisplayTimer = Timer.periodic(const Duration(seconds: 1), (_) {
|
||||
notifyListeners(); // Update UI with remaining time
|
||||
});
|
||||
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Cancel sleep timer
|
||||
void cancel() {
|
||||
_cancelInternal();
|
||||
_sleepTimerMinutes = null;
|
||||
_sleepTimerEndTime = null;
|
||||
_logger.log('😴 Sleep timer: Cancelled');
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void _cancelInternal() {
|
||||
_sleepTimer?.cancel();
|
||||
_sleepTimer = null;
|
||||
_sleepTimerDisplayTimer?.cancel();
|
||||
_sleepTimerDisplayTimer = null;
|
||||
}
|
||||
|
||||
void _onTimerExpired() {
|
||||
_logger.log('😴 Sleep timer expired - pausing playback');
|
||||
_cancelInternal();
|
||||
_sleepTimerMinutes = null;
|
||||
_sleepTimerEndTime = null;
|
||||
|
||||
// Trigger the callback to pause playback
|
||||
onExpired?.call();
|
||||
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Called when track ends - checks if "end of track" sleep timer is active
|
||||
void checkEndOfTrack() {
|
||||
if (_sleepTimerMinutes == -1) {
|
||||
_logger.log('😴 End of track sleep timer triggered');
|
||||
_sleepTimerMinutes = null;
|
||||
|
||||
// Trigger the callback to pause playback
|
||||
onExpired?.call();
|
||||
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_cancelInternal();
|
||||
super.dispose();
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,12 +1,11 @@
|
||||
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 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../widgets/global_player_overlay.dart';
|
||||
import '../widgets/media_context_menu.dart';
|
||||
import '../theme/palette_helper.dart';
|
||||
import '../theme/theme_provider.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../services/metadata_service.dart';
|
||||
@@ -15,7 +14,6 @@ import '../utils/page_transitions.dart';
|
||||
import '../constants/hero_tags.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import 'audiobook_detail_screen.dart';
|
||||
import '../widgets/provider_icon.dart';
|
||||
|
||||
class AudiobookAuthorScreen extends StatefulWidget {
|
||||
final String authorName;
|
||||
@@ -120,149 +118,6 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Toggle favorite status for an audiobook
|
||||
Future<void> _toggleAudiobookFavorite(Audiobook book) async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final newState = !(book.favorite ?? false);
|
||||
|
||||
try {
|
||||
bool success;
|
||||
if (newState) {
|
||||
// Add to favorites
|
||||
String actualProvider = book.provider;
|
||||
String actualItemId = book.itemId;
|
||||
|
||||
if (book.providerMappings != null && book.providerMappings!.isNotEmpty) {
|
||||
final mapping = book.providerMappings!.firstWhere(
|
||||
(m) => m.available && m.providerInstance != 'library',
|
||||
orElse: () => book.providerMappings!.firstWhere(
|
||||
(m) => m.available,
|
||||
orElse: () => book.providerMappings!.first,
|
||||
),
|
||||
);
|
||||
actualProvider = mapping.providerInstance;
|
||||
actualItemId = mapping.itemId;
|
||||
}
|
||||
|
||||
success = await maProvider.addToFavorites(
|
||||
mediaType: 'audiobook',
|
||||
itemId: actualItemId,
|
||||
provider: actualProvider,
|
||||
);
|
||||
} else {
|
||||
// Remove from favorites
|
||||
int? libraryItemId;
|
||||
if (book.provider == 'library') {
|
||||
libraryItemId = int.tryParse(book.itemId);
|
||||
} else if (book.providerMappings != null) {
|
||||
final libraryMapping = book.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => book.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId != null) {
|
||||
success = await maProvider.removeFromFavorites(
|
||||
mediaType: 'audiobook',
|
||||
libraryItemId: libraryItemId,
|
||||
);
|
||||
} else {
|
||||
success = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (success && mounted) {
|
||||
setState(() {
|
||||
final index = _audiobooks.indexWhere((b) => b.itemId == book.itemId);
|
||||
if (index != -1) {
|
||||
_audiobooks[index] = Audiobook(
|
||||
itemId: book.itemId,
|
||||
provider: book.provider,
|
||||
name: book.name,
|
||||
sortName: book.sortName,
|
||||
uri: book.uri,
|
||||
providerMappings: book.providerMappings,
|
||||
favorite: newState,
|
||||
metadata: book.metadata,
|
||||
year: book.year,
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error toggling audiobook favorite: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// Toggle library status for an audiobook
|
||||
Future<void> _toggleAudiobookLibrary(Audiobook book) async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final newState = !book.inLibrary;
|
||||
|
||||
try {
|
||||
bool success;
|
||||
if (newState) {
|
||||
// Add to library
|
||||
String? actualProvider;
|
||||
String? actualItemId;
|
||||
|
||||
if (book.providerMappings != null && book.providerMappings!.isNotEmpty) {
|
||||
final mapping = book.providerMappings!.firstWhere(
|
||||
(m) => m.available && m.providerInstance != 'library',
|
||||
orElse: () => book.providerMappings!.first,
|
||||
);
|
||||
if (mapping.providerInstance != 'library') {
|
||||
actualProvider = mapping.providerInstance;
|
||||
actualItemId = mapping.itemId;
|
||||
}
|
||||
}
|
||||
|
||||
if (actualProvider != null && actualItemId != null) {
|
||||
success = await maProvider.addToLibrary(
|
||||
mediaType: 'audiobook',
|
||||
itemId: actualItemId,
|
||||
provider: actualProvider,
|
||||
);
|
||||
} else {
|
||||
success = false;
|
||||
}
|
||||
} else {
|
||||
// Remove from library
|
||||
int? libraryItemId;
|
||||
if (book.provider == 'library') {
|
||||
libraryItemId = int.tryParse(book.itemId);
|
||||
} else if (book.providerMappings != null) {
|
||||
final libraryMapping = book.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => book.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId != null) {
|
||||
success = await maProvider.removeFromLibrary(
|
||||
mediaType: 'audiobook',
|
||||
libraryItemId: libraryItemId,
|
||||
);
|
||||
} else {
|
||||
success = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (success) {
|
||||
// Refresh would require reloading from parent - for now just show success
|
||||
_logger.log('Audiobook library status toggled');
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error toggling audiobook library: $e');
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final adaptiveTheme = context.select<ThemeProvider, bool>(
|
||||
@@ -315,49 +170,6 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
|
||||
},
|
||||
color: colorScheme.onSurface,
|
||||
),
|
||||
actions: [
|
||||
// Three-dot menu with sort/view options
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(right: 8),
|
||||
child: SizedBox(
|
||||
height: 40,
|
||||
width: 40,
|
||||
child: Builder(
|
||||
builder: (buttonContext) => FilledButton.tonal(
|
||||
onPressed: () {
|
||||
final RenderBox box = buttonContext.findRenderObject() as RenderBox;
|
||||
final Offset position = box.localToGlobal(Offset(box.size.width / 2, box.size.height));
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: position,
|
||||
mediaType: ContextMenuMediaType.audiobook,
|
||||
item: _audiobooks.isNotEmpty ? _audiobooks.first : null,
|
||||
isFavorite: false,
|
||||
isInLibrary: false,
|
||||
adaptiveColorScheme: adaptiveScheme,
|
||||
showTopRow: false,
|
||||
sortOrder: _sortOrder,
|
||||
onToggleSort: _toggleSortOrder,
|
||||
viewMode: _viewMode,
|
||||
onCycleView: _cycleViewMode,
|
||||
);
|
||||
},
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: Icon(
|
||||
Icons.more_vert,
|
||||
size: 20,
|
||||
color: Colors.white70,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
flexibleSpace: FlexibleSpaceBar(
|
||||
background: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
@@ -432,16 +244,55 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
|
||||
),
|
||||
),
|
||||
),
|
||||
// Audiobooks Section Header
|
||||
// Audiobooks Section Header with controls
|
||||
SliverToBoxAdapter(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(24.0, 8.0, 24.0, 8.0),
|
||||
child: Text(
|
||||
S.of(context)!.audiobooks,
|
||||
style: textTheme.titleLarge?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
padding: const EdgeInsets.fromLTRB(24.0, 8.0, 12.0, 8.0),
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
S.of(context)!.audiobooks,
|
||||
style: textTheme.titleLarge?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
// Sort toggle
|
||||
IconButton(
|
||||
icon: Icon(
|
||||
_sortOrder == 'alpha' ? Icons.sort_by_alpha : Icons.calendar_today,
|
||||
color: colorScheme.primary,
|
||||
size: 20,
|
||||
),
|
||||
tooltip: _sortOrder == 'alpha' ? S.of(context)!.sortByYear : S.of(context)!.sortAlphabetically,
|
||||
onPressed: _toggleSortOrder,
|
||||
visualDensity: VisualDensity.compact,
|
||||
padding: EdgeInsets.zero,
|
||||
constraints: const BoxConstraints(minWidth: 36, minHeight: 36),
|
||||
),
|
||||
// View mode toggle
|
||||
IconButton(
|
||||
icon: Icon(
|
||||
_viewMode == 'list'
|
||||
? Icons.view_list
|
||||
: _viewMode == 'grid3'
|
||||
? Icons.grid_view
|
||||
: Icons.grid_on,
|
||||
color: colorScheme.primary,
|
||||
size: 20,
|
||||
),
|
||||
tooltip: _viewMode == 'grid2'
|
||||
? S.of(context)!.threeColumnGrid
|
||||
: _viewMode == 'grid3'
|
||||
? S.of(context)!.listView
|
||||
: S.of(context)!.twoColumnGrid,
|
||||
onPressed: _cycleViewMode,
|
||||
visualDensity: VisualDensity.compact,
|
||||
padding: EdgeInsets.zero,
|
||||
constraints: const BoxConstraints(minWidth: 36, minHeight: 36),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -495,31 +346,10 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
final heroSuffix = 'author${_heroTagSuffix}';
|
||||
|
||||
// Get adaptive scheme for context menu
|
||||
final themeProvider = context.read<ThemeProvider>();
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
final adaptiveScheme = themeProvider.adaptiveTheme
|
||||
? (isDark ? _darkColorScheme : _lightColorScheme)
|
||||
: null;
|
||||
|
||||
return GestureDetector(
|
||||
onLongPressStart: (details) {
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
mediaType: ContextMenuMediaType.audiobook,
|
||||
item: book,
|
||||
isFavorite: book.favorite ?? false,
|
||||
isInLibrary: book.inLibrary,
|
||||
adaptiveColorScheme: adaptiveScheme,
|
||||
onToggleFavorite: () => _toggleAudiobookFavorite(book),
|
||||
onToggleLibrary: () => _toggleAudiobookLibrary(book),
|
||||
);
|
||||
},
|
||||
child: InkWell(
|
||||
onTap: () => _navigateToAudiobook(book, heroTagSuffix: heroSuffix, initialImageUrl: imageUrl),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
return InkWell(
|
||||
onTap: () => _navigateToAudiobook(book, heroTagSuffix: heroSuffix, initialImageUrl: imageUrl),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
AspectRatio(
|
||||
aspectRatio: 1.0,
|
||||
@@ -577,11 +407,6 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
|
||||
minHeight: 3,
|
||||
),
|
||||
),
|
||||
// Provider icon overlay
|
||||
if (book.providerMappings?.isNotEmpty == true)
|
||||
ProviderIconOverlay(
|
||||
domain: book.providerMappings!.first.providerDomain,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -610,8 +435,7 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -623,30 +447,9 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
final heroSuffix = 'author${_heroTagSuffix}';
|
||||
|
||||
// Get adaptive scheme for context menu
|
||||
final themeProvider = context.read<ThemeProvider>();
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
final adaptiveScheme = themeProvider.adaptiveTheme
|
||||
? (isDark ? _darkColorScheme : _lightColorScheme)
|
||||
: null;
|
||||
|
||||
return GestureDetector(
|
||||
onLongPressStart: (details) {
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
mediaType: ContextMenuMediaType.audiobook,
|
||||
item: book,
|
||||
isFavorite: book.favorite ?? false,
|
||||
isInLibrary: book.inLibrary,
|
||||
adaptiveColorScheme: adaptiveScheme,
|
||||
onToggleFavorite: () => _toggleAudiobookFavorite(book),
|
||||
onToggleLibrary: () => _toggleAudiobookLibrary(book),
|
||||
);
|
||||
},
|
||||
child: ListTile(
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
leading: Hero(
|
||||
return ListTile(
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
|
||||
leading: Hero(
|
||||
tag: HeroTags.audiobookCover + (book.uri ?? book.itemId) + '_$heroSuffix',
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
@@ -727,8 +530,7 @@ class _AudiobookAuthorScreenState extends State<AudiobookAuthorScreen> {
|
||||
),
|
||||
)
|
||||
: null,
|
||||
onTap: () => _navigateToAudiobook(book, heroTagSuffix: heroSuffix, initialImageUrl: imageUrl),
|
||||
),
|
||||
onTap: () => _navigateToAudiobook(book, heroTagSuffix: heroSuffix, initialImageUrl: imageUrl),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
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 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
|
||||
import 'package:material_symbols_icons/symbols.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../widgets/global_player_overlay.dart';
|
||||
import '../widgets/provider_icon.dart';
|
||||
import '../widgets/media_context_menu.dart';
|
||||
import '../widgets/player_picker_sheet.dart';
|
||||
import '../theme/palette_helper.dart';
|
||||
import '../theme/theme_provider.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
@@ -38,7 +35,6 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
final _logger = DebugLogger();
|
||||
bool _isDescriptionExpanded = false;
|
||||
bool _isFavorite = false;
|
||||
bool _isInLibrary = false;
|
||||
ColorScheme? _lightColorScheme;
|
||||
ColorScheme? _darkColorScheme;
|
||||
int? _expandedChapterIndex;
|
||||
@@ -50,24 +46,17 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
// Use full audiobook if loaded, otherwise use widget audiobook
|
||||
Audiobook get _audiobook => _fullAudiobook ?? widget.audiobook;
|
||||
|
||||
/// Check if audiobook is in library
|
||||
bool _checkIfInLibrary(Audiobook audiobook) {
|
||||
if (audiobook.provider == 'library') return true;
|
||||
return audiobook.providerMappings?.any((m) => m.providerInstance == 'library') ?? false;
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_isFavorite = widget.audiobook.favorite ?? false;
|
||||
_isInLibrary = _checkIfInLibrary(widget.audiobook);
|
||||
|
||||
// Mark that we're on a detail screen and extract colors immediately
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) {
|
||||
markDetailScreenEntered(context);
|
||||
_extractColors(); // Extract colors immediately - async so won't block
|
||||
}
|
||||
Future.delayed(const Duration(milliseconds: 350), () {
|
||||
if (mounted) {
|
||||
_extractColors();
|
||||
}
|
||||
});
|
||||
// Load full audiobook details with chapters
|
||||
_loadAudiobookDetails();
|
||||
});
|
||||
@@ -118,18 +107,15 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
if (imageUrl == null) return;
|
||||
|
||||
try {
|
||||
// Use isolate-based extraction to avoid blocking the main thread
|
||||
final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(imageUrl);
|
||||
final colorSchemes = await PaletteHelper.extractColorSchemes(
|
||||
CachedNetworkImageProvider(imageUrl),
|
||||
);
|
||||
|
||||
if (colorSchemes != null && mounted) {
|
||||
setState(() {
|
||||
_lightColorScheme = colorSchemes.$1;
|
||||
_darkColorScheme = colorSchemes.$2;
|
||||
});
|
||||
|
||||
// Update ThemeProvider so nav bar uses adaptive colors
|
||||
final themeProvider = context.read<ThemeProvider>();
|
||||
themeProvider.updateAdaptiveColors(colorSchemes.$1, colorSchemes.$2, isFromDetailScreen: true);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Failed to extract colors for audiobook: $e');
|
||||
@@ -223,93 +209,16 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Toggle library status
|
||||
Future<void> _toggleLibrary() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
|
||||
try {
|
||||
final newState = !_isInLibrary;
|
||||
|
||||
if (newState) {
|
||||
String? actualProvider;
|
||||
String? actualItemId;
|
||||
|
||||
if (widget.audiobook.providerMappings != null && widget.audiobook.providerMappings!.isNotEmpty) {
|
||||
final nonLibraryMapping = widget.audiobook.providerMappings!.where(
|
||||
(m) => m.providerInstance != 'library' && m.providerDomain != 'library',
|
||||
).firstOrNull;
|
||||
|
||||
if (nonLibraryMapping != null) {
|
||||
actualProvider = nonLibraryMapping.providerDomain;
|
||||
actualItemId = nonLibraryMapping.itemId;
|
||||
}
|
||||
}
|
||||
|
||||
if (actualProvider == null || actualItemId == null) {
|
||||
if (widget.audiobook.provider != 'library') {
|
||||
actualProvider = widget.audiobook.provider;
|
||||
actualItemId = widget.audiobook.itemId;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
setState(() => _isInLibrary = newState);
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.addedToLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
|
||||
maProvider.addToLibrary(
|
||||
mediaType: 'audiobook',
|
||||
provider: actualProvider,
|
||||
itemId: actualItemId,
|
||||
).catchError((e) {
|
||||
if (mounted) setState(() => _isInLibrary = !newState);
|
||||
});
|
||||
} else {
|
||||
int? libraryItemId;
|
||||
if (widget.audiobook.provider == 'library') {
|
||||
libraryItemId = int.tryParse(widget.audiobook.itemId);
|
||||
} else if (widget.audiobook.providerMappings != null) {
|
||||
final libraryMapping = widget.audiobook.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => widget.audiobook.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId == null) return;
|
||||
|
||||
setState(() => _isInLibrary = newState);
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.removedFromLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
|
||||
maProvider.removeFromLibrary(
|
||||
mediaType: 'audiobook',
|
||||
libraryItemId: libraryItemId,
|
||||
).catchError((e) {
|
||||
if (mounted) setState(() => _isInLibrary = !newState);
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error toggling audiobook library: $e');
|
||||
}
|
||||
}
|
||||
|
||||
void _showPlayOnMenu(BuildContext context) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
|
||||
GlobalPlayerOverlay.showPlayerSelectorForAction(
|
||||
contextHint: S.of(context)!.selectPlayerForAudiobook,
|
||||
GlobalPlayerOverlay.hidePlayer();
|
||||
|
||||
showPlayerPickerSheet(
|
||||
context: context,
|
||||
title: S.of(context)!.playOn,
|
||||
players: maProvider.availablePlayers,
|
||||
selectedPlayer: maProvider.selectedPlayer,
|
||||
onPlayerSelected: (player) async {
|
||||
maProvider.selectPlayer(player);
|
||||
maProvider.setCurrentAudiobook(_audiobook);
|
||||
@@ -318,7 +227,9 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
widget.audiobook,
|
||||
);
|
||||
},
|
||||
);
|
||||
).whenComplete(() {
|
||||
GlobalPlayerOverlay.showPlayer();
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _markAsFinished() async {
|
||||
@@ -594,55 +505,41 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
tag: HeroTags.audiobookCover + (widget.audiobook.uri ?? widget.audiobook.itemId) + _heroTagSuffix,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
child: SizedBox(
|
||||
child: Container(
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
child: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
Container(
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: imageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
// Match source memCacheWidth for smooth Hero animation
|
||||
memCacheWidth: 256,
|
||||
memCacheHeight: 256,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => Center(
|
||||
child: Icon(
|
||||
MdiIcons.bookOutline,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
errorWidget: (_, __, ___) => Center(
|
||||
child: Icon(
|
||||
MdiIcons.bookOutline,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
)
|
||||
: Center(
|
||||
child: Icon(
|
||||
MdiIcons.bookOutline,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
// Provider icon overlay
|
||||
if (widget.audiobook.providerMappings?.isNotEmpty == true)
|
||||
ProviderIconOverlay(
|
||||
domain: widget.audiobook.providerMappings!.first.providerDomain,
|
||||
size: 24,
|
||||
margin: 8,
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: imageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
// Match source memCacheWidth for smooth Hero animation
|
||||
memCacheWidth: 256,
|
||||
memCacheHeight: 256,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => Center(
|
||||
child: Icon(
|
||||
MdiIcons.bookOutline,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
errorWidget: (_, __, ___) => Center(
|
||||
child: Icon(
|
||||
MdiIcons.bookOutline,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
)
|
||||
: Center(
|
||||
child: Icon(
|
||||
MdiIcons.bookOutline,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -748,6 +645,7 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
children: [
|
||||
// Play/Resume Button
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: SizedBox(
|
||||
height: 50,
|
||||
child: ElevatedButton.icon(
|
||||
@@ -781,33 +679,26 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.replay, size: 25),
|
||||
child: const Icon(Icons.replay),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
const SizedBox(width: 12),
|
||||
|
||||
// Library Button
|
||||
// Play On Button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: _toggleLibrary,
|
||||
onPressed: () => _showPlayOnMenu(context),
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: Icon(
|
||||
Symbols.book_2,
|
||||
size: 25,
|
||||
fill: _isInLibrary ? 1 : 0,
|
||||
color: _isInLibrary
|
||||
? colorScheme.primary
|
||||
: Colors.white70,
|
||||
),
|
||||
child: const Icon(Icons.speaker_group_outlined),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -826,50 +717,10 @@ class _AudiobookDetailScreenState extends State<AudiobookDetailScreen> {
|
||||
),
|
||||
),
|
||||
child: Icon(
|
||||
Icons.favorite,
|
||||
size: 25,
|
||||
_isFavorite ? Icons.favorite : Icons.favorite_border,
|
||||
color: _isFavorite
|
||||
? colorScheme.error
|
||||
: Colors.white70,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(width: 12),
|
||||
|
||||
// Three-dot Menu Button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: Builder(
|
||||
builder: (buttonContext) => FilledButton.tonal(
|
||||
onPressed: () {
|
||||
final RenderBox box = buttonContext.findRenderObject() as RenderBox;
|
||||
final Offset position = box.localToGlobal(Offset(box.size.width / 2, box.size.height));
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: position,
|
||||
mediaType: ContextMenuMediaType.audiobook,
|
||||
item: widget.audiobook,
|
||||
isFavorite: _isFavorite,
|
||||
isInLibrary: _isInLibrary,
|
||||
onToggleFavorite: _toggleFavorite,
|
||||
onToggleLibrary: _toggleLibrary,
|
||||
adaptiveColorScheme: adaptiveScheme,
|
||||
showTopRow: false,
|
||||
);
|
||||
},
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: Icon(
|
||||
Icons.more_vert,
|
||||
size: 25,
|
||||
color: Colors.white70,
|
||||
),
|
||||
: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -6,7 +6,6 @@ import 'package:palette_generator/palette_generator.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../widgets/global_player_overlay.dart' show BottomSpacing;
|
||||
import '../widgets/provider_icon.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../utils/page_transitions.dart';
|
||||
@@ -271,8 +270,7 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
Widget build(BuildContext context) {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
// Use read since we only need the provider for non-reactive operations (getImageUrl)
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final maProvider = context.watch<MusicAssistantProvider>();
|
||||
final l10n = S.of(context)!;
|
||||
|
||||
return Scaffold(
|
||||
@@ -692,11 +690,6 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
),
|
||||
),
|
||||
),
|
||||
// Provider icon overlay
|
||||
if (book.providerMappings?.isNotEmpty == true)
|
||||
ProviderIconOverlay(
|
||||
domain: book.providerMappings!.first.providerDomain,
|
||||
),
|
||||
// Progress indicator
|
||||
if (book.progress > 0)
|
||||
Positioned(
|
||||
@@ -755,55 +748,45 @@ class _AudiobookSeriesScreenState extends State<AudiobookSeriesScreen> {
|
||||
tag: HeroTags.audiobookCover + (book.uri ?? book.itemId) + '_$heroSuffix',
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
child: SizedBox(
|
||||
width: 56,
|
||||
height: 56,
|
||||
child: Stack(
|
||||
children: [
|
||||
Container(
|
||||
width: 56,
|
||||
height: 56,
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: imageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => Icon(
|
||||
MdiIcons.bookOutline,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
errorWidget: (_, __, ___) => Icon(
|
||||
MdiIcons.bookOutline,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
: Icon(
|
||||
child: Stack(
|
||||
children: [
|
||||
Container(
|
||||
width: 56,
|
||||
height: 56,
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: imageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => Icon(
|
||||
MdiIcons.bookOutline,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
errorWidget: (_, __, ___) => Icon(
|
||||
MdiIcons.bookOutline,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
: Icon(
|
||||
MdiIcons.bookOutline,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
if (book.progress > 0)
|
||||
Positioned(
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: LinearProgressIndicator(
|
||||
value: book.progress,
|
||||
backgroundColor: Colors.black54,
|
||||
valueColor: AlwaysStoppedAnimation<Color>(colorScheme.primary),
|
||||
minHeight: 2,
|
||||
),
|
||||
),
|
||||
// Provider icon overlay
|
||||
if (book.providerMappings?.isNotEmpty == true)
|
||||
ProviderIconOverlay(
|
||||
domain: book.providerMappings!.first.providerDomain,
|
||||
size: 16,
|
||||
),
|
||||
if (book.progress > 0)
|
||||
Positioned(
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: LinearProgressIndicator(
|
||||
value: book.progress,
|
||||
backgroundColor: Colors.black54,
|
||||
valueColor: AlwaysStoppedAnimation<Color>(colorScheme.primary),
|
||||
minHeight: 2,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -43,6 +43,7 @@ class _LibraryPlaylistsScreenState extends State<LibraryPlaylistsScreen> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final provider = context.watch<MusicAssistantProvider>();
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
|
||||
@@ -65,13 +66,11 @@ class _LibraryPlaylistsScreenState extends State<LibraryPlaylistsScreen> {
|
||||
),
|
||||
centerTitle: true,
|
||||
),
|
||||
body: _buildPlaylistsList(context),
|
||||
body: _buildPlaylistsList(context, provider),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildPlaylistsList(BuildContext context) {
|
||||
// Use read since we only need the provider for non-reactive operations
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
Widget _buildPlaylistsList(BuildContext context, MusicAssistantProvider provider) {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
|
||||
// Show cached data immediately if available, even while loading
|
||||
|
||||
@@ -11,6 +11,7 @@ class LibraryTracksScreen extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final provider = context.watch<MusicAssistantProvider>();
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
|
||||
@@ -33,41 +34,35 @@ class LibraryTracksScreen extends StatelessWidget {
|
||||
),
|
||||
centerTitle: true,
|
||||
),
|
||||
body: _buildTracksList(context),
|
||||
body: _buildTracksList(context, provider),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildTracksList(BuildContext context) {
|
||||
// Use select to only rebuild when tracks or isLoading changes
|
||||
final (tracks, isLoading) = context.select<MusicAssistantProvider, (List, bool)>(
|
||||
(p) => (p.tracks, p.isLoading),
|
||||
);
|
||||
Widget _buildTracksList(
|
||||
BuildContext context, MusicAssistantProvider provider) {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
|
||||
// Show cached data immediately if available, even while loading
|
||||
// Only show spinner if we have no data at all AND we're loading
|
||||
if (tracks.isEmpty && isLoading) {
|
||||
if (provider.tracks.isEmpty && provider.isLoading) {
|
||||
return Center(
|
||||
child: CircularProgressIndicator(color: colorScheme.primary),
|
||||
);
|
||||
}
|
||||
|
||||
if (tracks.isEmpty) {
|
||||
return EmptyState.tracks(
|
||||
context: context,
|
||||
onRefresh: context.read<MusicAssistantProvider>().loadLibrary,
|
||||
);
|
||||
if (provider.tracks.isEmpty) {
|
||||
return EmptyState.tracks(context: context, onRefresh: provider.loadLibrary);
|
||||
}
|
||||
|
||||
return ListView.builder(
|
||||
itemCount: tracks.length,
|
||||
itemCount: provider.tracks.length,
|
||||
padding: const EdgeInsets.all(8),
|
||||
cacheExtent: 500, // Prebuild items off-screen for smoother scrolling
|
||||
addAutomaticKeepAlives: false, // Tiles don't need individual keep-alive
|
||||
addRepaintBoundaries: false, // We add RepaintBoundary manually to tiles
|
||||
itemBuilder: (context, index) {
|
||||
final track = tracks[index] as Track;
|
||||
return _buildTrackTile(context, track, index);
|
||||
final track = provider.tracks[index];
|
||||
return _buildTrackTile(context, track, provider, index);
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -75,9 +70,9 @@ class LibraryTracksScreen extends StatelessWidget {
|
||||
Widget _buildTrackTile(
|
||||
BuildContext context,
|
||||
Track track,
|
||||
MusicAssistantProvider maProvider,
|
||||
int index,
|
||||
) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final imageUrl = track.album != null
|
||||
? maProvider.getImageUrl(track.album!, size: 128)
|
||||
: null;
|
||||
|
||||
+689
-147
@@ -4,6 +4,7 @@ import '../providers/music_assistant_provider.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../services/database_service.dart';
|
||||
import '../services/profile_service.dart';
|
||||
import '../services/auth/auth_strategy.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../widgets/debug/debug_console.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
@@ -18,91 +19,260 @@ class LoginScreen extends StatefulWidget {
|
||||
|
||||
class _LoginScreenState extends State<LoginScreen> {
|
||||
final TextEditingController _serverUrlController = TextEditingController();
|
||||
final TextEditingController _ownerNameController = TextEditingController();
|
||||
final TextEditingController _portController = TextEditingController();
|
||||
final TextEditingController _authServerUrlController = TextEditingController(); // For separate auth server (Authelia)
|
||||
final TextEditingController _usernameController = TextEditingController();
|
||||
final TextEditingController _passwordController = TextEditingController();
|
||||
final FocusNode _usernameFocusNode = FocusNode();
|
||||
final _logger = DebugLogger();
|
||||
|
||||
bool _isConnecting = false;
|
||||
bool _isDetectingAuth = false;
|
||||
AuthStrategy? _detectedAuthStrategy;
|
||||
String? _detectedAuthType;
|
||||
String? _error;
|
||||
bool _showDebug = false;
|
||||
List<String> _debugLogs = [];
|
||||
String? _resolvedServerUrl; // The actual URL after fallback (e.g., HTTP if HTTPS failed)
|
||||
bool _usedHttpFallback = false; // True if HTTPS failed and we fell back to HTTP
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_loadSavedSettings();
|
||||
}
|
||||
|
||||
Future<void> _loadSavedSettings() async {
|
||||
final savedPort = await SettingsService.getWebSocketPort();
|
||||
final savedAuthServerUrl = await SettingsService.getAuthServerUrl();
|
||||
final savedOwnerName = await SettingsService.getOwnerName();
|
||||
|
||||
if (savedPort != null) {
|
||||
setState(() {
|
||||
_portController.text = savedPort.toString();
|
||||
});
|
||||
}
|
||||
|
||||
if (savedAuthServerUrl != null) {
|
||||
setState(() {
|
||||
_authServerUrlController.text = savedAuthServerUrl;
|
||||
});
|
||||
}
|
||||
|
||||
if (savedOwnerName != null) {
|
||||
setState(() {
|
||||
_ownerNameController.text = savedOwnerName;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_serverUrlController.dispose();
|
||||
_ownerNameController.dispose();
|
||||
_portController.dispose();
|
||||
_authServerUrlController.dispose();
|
||||
_usernameController.dispose();
|
||||
_passwordController.dispose();
|
||||
_usernameFocusNode.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
/// Normalize server URL and add default port for local IPs
|
||||
String _buildServerUrl(String input) {
|
||||
var url = input.trim();
|
||||
|
||||
// Remove trailing slashes
|
||||
String _normalizeServerUrl(String url) {
|
||||
// Remove any trailing slashes
|
||||
url = url.trim();
|
||||
while (url.endsWith('/')) {
|
||||
url = url.substring(0, url.length - 1);
|
||||
}
|
||||
|
||||
// Add protocol if missing
|
||||
if (!url.startsWith('http://') && !url.startsWith('https://')) {
|
||||
if (_isLocalAddress(url)) {
|
||||
url = 'http://$url';
|
||||
} else if (url.endsWith('.ts.net') || url.contains('.ts.net:')) {
|
||||
// Tailscale - use http since VPN is encrypted
|
||||
url = 'http://$url';
|
||||
} else {
|
||||
url = 'https://$url';
|
||||
}
|
||||
// If URL already has a protocol, return it
|
||||
if (url.startsWith('http://') || url.startsWith('https://')) {
|
||||
return url;
|
||||
}
|
||||
|
||||
// Add default port 8095 for local IPs without a port
|
||||
final uri = Uri.parse(url);
|
||||
if (!uri.hasPort && _isLocalAddress(uri.host)) {
|
||||
return '${uri.scheme}://${uri.host}:8095';
|
||||
// If it's an IP address or localhost, default to http://
|
||||
if (url.startsWith('192.') ||
|
||||
url.startsWith('10.') ||
|
||||
url.startsWith('172.') ||
|
||||
url == 'localhost' ||
|
||||
url.startsWith('127.')) {
|
||||
return 'http://$url';
|
||||
}
|
||||
|
||||
return url;
|
||||
// Tailscale URLs (*.ts.net) - default to http:// since VPN tunnel is already encrypted
|
||||
if (url.endsWith('.ts.net') || url.contains('.ts.net:')) {
|
||||
return 'http://$url';
|
||||
}
|
||||
|
||||
// For domain names, default to https://
|
||||
return 'https://$url';
|
||||
}
|
||||
|
||||
/// Check if address is local/private
|
||||
bool _isLocalAddress(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.');
|
||||
/// Check if the URL is using HTTP (for security warning display)
|
||||
bool _isHttpConnection(String url) {
|
||||
final normalized = _normalizeServerUrl(url);
|
||||
return normalized.startsWith('http://') && !normalized.startsWith('https://');
|
||||
}
|
||||
|
||||
/// Check if the URL is a Tailscale URL (safe for HTTP)
|
||||
bool _isTailscaleUrl(String url) {
|
||||
final normalized = url.trim().toLowerCase();
|
||||
return normalized.contains('.ts.net');
|
||||
}
|
||||
|
||||
String _buildServerUrl() {
|
||||
// Normalize the base URL
|
||||
var url = _normalizeServerUrl(_serverUrlController.text.trim());
|
||||
|
||||
// Parse to check if port is already included
|
||||
final uri = Uri.parse(url);
|
||||
|
||||
// Get port from field
|
||||
final portText = _portController.text.trim();
|
||||
if (portText.isEmpty) {
|
||||
return url; // No port specified, use URL as-is
|
||||
}
|
||||
|
||||
final port = int.tryParse(portText);
|
||||
if (port == null) {
|
||||
return url; // Invalid port, use URL as-is
|
||||
}
|
||||
|
||||
// Skip adding port if it's the default for the scheme
|
||||
final isDefaultPort = (uri.scheme == 'https' && port == 443) ||
|
||||
(uri.scheme == 'http' && port == 80);
|
||||
|
||||
if (isDefaultPort) {
|
||||
return url; // Don't add default ports
|
||||
}
|
||||
|
||||
// Build URL with custom port
|
||||
return '${uri.scheme}://${uri.host}:$port';
|
||||
}
|
||||
|
||||
void _addDebugLog(String message) {
|
||||
setState(() {
|
||||
_debugLogs.add('[${DateTime.now().toString().substring(11, 19)}] $message');
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _detectAuthRequirements() async {
|
||||
if (_serverUrlController.text.trim().isEmpty) {
|
||||
setState(() {
|
||||
_error = S.of(context)!.pleaseEnterServerAddress;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
setState(() {
|
||||
_isDetectingAuth = true;
|
||||
_error = null;
|
||||
_detectedAuthStrategy = null;
|
||||
_detectedAuthType = null;
|
||||
_resolvedServerUrl = null;
|
||||
_usedHttpFallback = false;
|
||||
_debugLogs.clear();
|
||||
});
|
||||
|
||||
try {
|
||||
final serverUrl = _buildServerUrl();
|
||||
_addDebugLog('Built server URL: $serverUrl');
|
||||
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
|
||||
_addDebugLog('Starting auth detection...');
|
||||
// Auto-detect authentication requirements
|
||||
final strategy = await provider.authManager.detectAuthStrategy(serverUrl);
|
||||
|
||||
// Check if auth manager used a different URL (e.g., HTTP fallback)
|
||||
final resolvedUrl = provider.authManager.lastSuccessfulUrl;
|
||||
if (resolvedUrl != null && resolvedUrl != serverUrl) {
|
||||
_addDebugLog('URL resolved via fallback: $resolvedUrl');
|
||||
_usedHttpFallback = serverUrl.startsWith('https://') && resolvedUrl.startsWith('http://');
|
||||
}
|
||||
|
||||
_addDebugLog('Detection complete. Strategy: ${strategy?.name ?? 'null'}');
|
||||
|
||||
if (strategy == null) {
|
||||
setState(() {
|
||||
_error = S.of(context)!.cannotDetermineAuth;
|
||||
_isDetectingAuth = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
setState(() {
|
||||
_detectedAuthStrategy = strategy;
|
||||
_detectedAuthType = _getAuthTypeName(strategy.name);
|
||||
_resolvedServerUrl = resolvedUrl;
|
||||
_isDetectingAuth = false;
|
||||
});
|
||||
|
||||
// If no auth required, connect immediately
|
||||
if (strategy.name == 'none') {
|
||||
await _connect();
|
||||
} else {
|
||||
// Auth required - focus username field after a brief delay
|
||||
// to allow the new fields to build
|
||||
Future.delayed(const Duration(milliseconds: 100), () {
|
||||
if (mounted) {
|
||||
_usernameFocusNode.requestFocus();
|
||||
}
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
setState(() {
|
||||
_error = 'Auth detection failed: ${e.toString()}';
|
||||
_isDetectingAuth = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
String _getAuthTypeName(String strategyName) {
|
||||
switch (strategyName) {
|
||||
case 'none':
|
||||
return S.of(context)!.noAuthentication;
|
||||
case 'basic':
|
||||
return S.of(context)!.httpBasicAuth;
|
||||
case 'authelia':
|
||||
return S.of(context)!.authelia;
|
||||
case 'music_assistant':
|
||||
return S.of(context)!.musicAssistantLogin;
|
||||
default:
|
||||
return 'Unknown';
|
||||
}
|
||||
}
|
||||
|
||||
IconData _getAuthIcon(String strategyName) {
|
||||
switch (strategyName) {
|
||||
case 'none':
|
||||
return Icons.lock_open_rounded;
|
||||
case 'basic':
|
||||
return Icons.vpn_key_rounded;
|
||||
case 'authelia':
|
||||
return Icons.shield_rounded;
|
||||
case 'music_assistant':
|
||||
return Icons.music_note_rounded;
|
||||
default:
|
||||
return Icons.security_rounded;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _connect() async {
|
||||
final serverInput = _serverUrlController.text.trim();
|
||||
final username = _usernameController.text.trim();
|
||||
final password = _passwordController.text.trim();
|
||||
if (_serverUrlController.text.trim().isEmpty) {
|
||||
setState(() {
|
||||
_error = S.of(context)!.pleaseEnterServerAddress;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// Validate inputs
|
||||
if (serverInput.isEmpty) {
|
||||
setState(() => _error = S.of(context)!.pleaseEnterServerAddress);
|
||||
return;
|
||||
}
|
||||
if (username.isEmpty) {
|
||||
setState(() => _error = S.of(context)!.pleaseEnterCredentials);
|
||||
_usernameFocusNode.requestFocus();
|
||||
return;
|
||||
}
|
||||
if (password.isEmpty) {
|
||||
setState(() => _error = S.of(context)!.pleaseEnterCredentials);
|
||||
// Validate owner name - only required if NOT using MA auth
|
||||
// (MA auth will get display_name from user profile after login)
|
||||
final isMaAuth = _detectedAuthStrategy?.name == 'music_assistant';
|
||||
if (!isMaAuth && _ownerNameController.text.trim().isEmpty) {
|
||||
setState(() {
|
||||
_error = S.of(context)!.pleaseEnterName;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -112,73 +282,173 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
});
|
||||
|
||||
try {
|
||||
final serverUrl = _buildServerUrl(serverInput);
|
||||
_logger.log('Connecting to: $serverUrl');
|
||||
// Use the resolved URL if available (e.g., from HTTP fallback), otherwise build it
|
||||
final serverUrl = _resolvedServerUrl ?? _buildServerUrl();
|
||||
_addDebugLog('Using server URL for connection: $serverUrl');
|
||||
final port = _portController.text.trim();
|
||||
|
||||
// Validate port (if provided)
|
||||
int? portNum;
|
||||
if (port.isNotEmpty) {
|
||||
portNum = int.tryParse(port);
|
||||
if (portNum == null || portNum < 1 || portNum > 65535) {
|
||||
setState(() {
|
||||
_error = S.of(context)!.pleaseEnterValidPort;
|
||||
_isConnecting = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Save owner name (if provided) and port to settings
|
||||
// For MA auth, the owner name will be set from user profile after login
|
||||
if (!isMaAuth && _ownerNameController.text.trim().isNotEmpty) {
|
||||
final ownerName = _ownerNameController.text.trim();
|
||||
await SettingsService.setOwnerName(ownerName);
|
||||
|
||||
// Create/activate profile in local database for manual name entry
|
||||
if (DatabaseService.instance.isInitialized) {
|
||||
await ProfileService.instance.onManualNameEntered(ownerName);
|
||||
}
|
||||
}
|
||||
await SettingsService.setWebSocketPort(portNum);
|
||||
|
||||
final provider = context.read<MusicAssistantProvider>();
|
||||
|
||||
// Connect to server
|
||||
await provider.connectToServer(serverUrl);
|
||||
// Handle authentication based on detected strategy
|
||||
// Note: isMaAuth is already defined earlier in this method
|
||||
|
||||
// Authenticate with MA
|
||||
_logger.log('Authenticating with Music Assistant...');
|
||||
if (_detectedAuthStrategy != null && _detectedAuthStrategy!.name != 'none' && !isMaAuth) {
|
||||
// Pre-connect auth (Authelia, Basic Auth)
|
||||
final username = _usernameController.text.trim();
|
||||
final password = _passwordController.text.trim();
|
||||
|
||||
// Check if we have a stored MA token first
|
||||
final storedToken = await SettingsService.getMaAuthToken();
|
||||
bool authSuccess = false;
|
||||
|
||||
if (storedToken != null && provider.api != null) {
|
||||
_logger.log('Trying stored MA token...');
|
||||
authSuccess = await provider.api!.authenticateWithToken(storedToken);
|
||||
}
|
||||
|
||||
if (!authSuccess) {
|
||||
_logger.log('Logging in with credentials...');
|
||||
final accessToken = await provider.api?.loginWithCredentials(username, password);
|
||||
|
||||
if (accessToken == null) {
|
||||
if (username.isEmpty || password.isEmpty) {
|
||||
setState(() {
|
||||
_error = S.of(context)!.maLoginFailed;
|
||||
_error = S.of(context)!.pleaseEnterCredentials;
|
||||
_isConnecting = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// Try to create a long-lived token for future use
|
||||
final longLivedToken = await provider.api?.createLongLivedToken();
|
||||
final tokenToStore = longLivedToken ?? accessToken;
|
||||
// Get auth server URL (if provided for Authelia)
|
||||
String? authServerUrl;
|
||||
if (_detectedAuthStrategy!.name == 'authelia') {
|
||||
final authUrl = _authServerUrlController.text.trim();
|
||||
if (authUrl.isNotEmpty) {
|
||||
authServerUrl = _normalizeServerUrl(authUrl);
|
||||
}
|
||||
}
|
||||
|
||||
// Save the token for future auto-login
|
||||
await SettingsService.setMaAuthToken(tokenToStore);
|
||||
_logger.log('MA token saved for future logins');
|
||||
// Attempt login with detected strategy
|
||||
final success = await provider.authManager.login(
|
||||
serverUrl,
|
||||
username,
|
||||
password,
|
||||
_detectedAuthStrategy!,
|
||||
authServerUrl: authServerUrl,
|
||||
);
|
||||
|
||||
if (!success) {
|
||||
setState(() {
|
||||
_error = S.of(context)!.authFailed;
|
||||
_isConnecting = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// Save credentials for future auto-login
|
||||
await SettingsService.setUsername(username);
|
||||
await SettingsService.setPassword(password);
|
||||
|
||||
// Save auth server URL if provided
|
||||
if (authServerUrl != null && authServerUrl.isNotEmpty) {
|
||||
await SettingsService.setAuthServerUrl(authServerUrl);
|
||||
} else {
|
||||
await SettingsService.setAuthServerUrl(null);
|
||||
}
|
||||
|
||||
// Save auth credentials to settings
|
||||
final serialized = provider.authManager.serializeCredentials();
|
||||
if (serialized != null) {
|
||||
await SettingsService.setAuthCredentials(serialized);
|
||||
}
|
||||
}
|
||||
|
||||
// Save credentials
|
||||
await SettingsService.setUsername(username);
|
||||
await SettingsService.setPassword(password);
|
||||
await SettingsService.setServerUrl(serverUrl);
|
||||
// Connect to server
|
||||
await provider.connectToServer(serverUrl);
|
||||
|
||||
// Save auth credentials to settings
|
||||
await SettingsService.setAuthCredentials({
|
||||
'strategy': 'music_assistant',
|
||||
'data': {'username': username},
|
||||
});
|
||||
// Post-connect auth (Music Assistant native auth)
|
||||
if (isMaAuth) {
|
||||
final username = _usernameController.text.trim();
|
||||
final password = _passwordController.text.trim();
|
||||
|
||||
// Set owner name from username for profile
|
||||
if (DatabaseService.instance.isInitialized) {
|
||||
await ProfileService.instance.onManualNameEntered(username);
|
||||
if (username.isEmpty || password.isEmpty) {
|
||||
setState(() {
|
||||
_error = S.of(context)!.pleaseEnterCredentials;
|
||||
_isConnecting = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
_addDebugLog('Authenticating with Music Assistant...');
|
||||
|
||||
// Check if we have a stored MA token first
|
||||
final storedToken = await SettingsService.getMaAuthToken();
|
||||
bool authSuccess = false;
|
||||
|
||||
if (storedToken != null && provider.api != null) {
|
||||
_addDebugLog('Trying stored MA token...');
|
||||
authSuccess = await provider.api!.authenticateWithToken(storedToken);
|
||||
}
|
||||
|
||||
if (!authSuccess) {
|
||||
_addDebugLog('Logging in with credentials...');
|
||||
// Login with credentials over WebSocket
|
||||
final accessToken = await provider.api?.loginWithCredentials(username, password);
|
||||
|
||||
if (accessToken == null) {
|
||||
setState(() {
|
||||
_error = S.of(context)!.maLoginFailed;
|
||||
_isConnecting = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// Try to create a long-lived token for future use
|
||||
final longLivedToken = await provider.api?.createLongLivedToken();
|
||||
final tokenToStore = longLivedToken ?? accessToken;
|
||||
|
||||
// Save the token for future auto-login
|
||||
await SettingsService.setMaAuthToken(tokenToStore);
|
||||
_addDebugLog('MA token saved for future logins');
|
||||
}
|
||||
|
||||
// Save credentials for future auto-login
|
||||
await SettingsService.setUsername(username);
|
||||
await SettingsService.setPassword(password);
|
||||
|
||||
// Save auth strategy info
|
||||
await SettingsService.setAuthCredentials({
|
||||
'strategy': 'music_assistant',
|
||||
'data': {'username': username},
|
||||
});
|
||||
}
|
||||
|
||||
// Wait for connection to complete
|
||||
// Wait for connection and authentication to complete
|
||||
// MA auth happens asynchronously after connect, so we need to wait longer
|
||||
for (int i = 0; i < 10; i++) {
|
||||
await Future.delayed(const Duration(milliseconds: 500));
|
||||
if (provider.isConnected) break;
|
||||
}
|
||||
|
||||
if (provider.isConnected) {
|
||||
// First-time user: wait for player selection
|
||||
// For first-time users, wait for player selection so the welcome
|
||||
// overlay can appear immediately without home screen flash.
|
||||
// This matches the logic in AppStartup._checkAndConnect().
|
||||
final hasCompletedOnboarding = await SettingsService.getHasCompletedOnboarding();
|
||||
if (!hasCompletedOnboarding) {
|
||||
// First-time user: wait for connection + player selection
|
||||
for (int i = 0; i < 20; i++) {
|
||||
await Future.delayed(const Duration(milliseconds: 250));
|
||||
if (provider.selectedPlayer != null) break;
|
||||
@@ -187,6 +457,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
|
||||
// Navigate to home screen
|
||||
if (mounted) {
|
||||
// Ensure keyboard is closed before navigating
|
||||
FocusScope.of(context).unfocus();
|
||||
Navigator.of(context).pushReplacement(
|
||||
MaterialPageRoute(builder: (context) => const HomeScreen()),
|
||||
@@ -199,7 +470,6 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Connection error: $e');
|
||||
setState(() {
|
||||
_error = 'Connection failed: ${e.toString()}';
|
||||
_isConnecting = false;
|
||||
@@ -212,6 +482,9 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
|
||||
// Determine if we need auth fields
|
||||
final needsAuth = _detectedAuthStrategy != null && _detectedAuthStrategy!.name != 'none';
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: colorScheme.background,
|
||||
body: SafeArea(
|
||||
@@ -265,29 +538,76 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
color: colorScheme.onSurface.withOpacity(0.54),
|
||||
),
|
||||
),
|
||||
enabled: !_isConnecting,
|
||||
enabled: !_isConnecting && !_isDetectingAuth,
|
||||
keyboardType: TextInputType.url,
|
||||
textInputAction: TextInputAction.next,
|
||||
),
|
||||
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// Username
|
||||
// Your Name - only show AFTER auth detection AND only for non-MA auth
|
||||
// (MA auth gets display_name from user profile automatically)
|
||||
// Show for: 'none' (no auth), 'authelia', 'basic_auth', etc.
|
||||
// Hide for: 'music_assistant' (gets name from profile)
|
||||
if (_detectedAuthStrategy != null &&
|
||||
_detectedAuthStrategy!.name != 'music_assistant') ...[
|
||||
Text(
|
||||
S.of(context)!.yourName,
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
TextField(
|
||||
controller: _ownerNameController,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
decoration: InputDecoration(
|
||||
hintText: S.of(context)!.yourFirstName,
|
||||
hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
|
||||
filled: true,
|
||||
fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
prefixIcon: Icon(
|
||||
Icons.person_rounded,
|
||||
color: colorScheme.onSurface.withOpacity(0.54),
|
||||
),
|
||||
),
|
||||
enabled: !_isConnecting && !_isDetectingAuth,
|
||||
keyboardType: TextInputType.name,
|
||||
textInputAction: TextInputAction.next,
|
||||
),
|
||||
|
||||
const SizedBox(height: 24),
|
||||
],
|
||||
|
||||
// Port
|
||||
Text(
|
||||
S.of(context)!.username,
|
||||
S.of(context)!.portOptional,
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
S.of(context)!.portDescription,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onBackground.withOpacity(0.6),
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
TextField(
|
||||
controller: _usernameController,
|
||||
focusNode: _usernameFocusNode,
|
||||
controller: _portController,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
decoration: InputDecoration(
|
||||
hintText: S.of(context)!.username,
|
||||
hintText: S.of(context)!.portHint,
|
||||
hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
|
||||
filled: true,
|
||||
fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
@@ -296,50 +616,248 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
prefixIcon: Icon(
|
||||
Icons.person_rounded,
|
||||
Icons.settings_ethernet_rounded,
|
||||
color: colorScheme.onSurface.withOpacity(0.54),
|
||||
),
|
||||
),
|
||||
enabled: !_isConnecting,
|
||||
textInputAction: TextInputAction.next,
|
||||
enabled: !_isConnecting && !_isDetectingAuth,
|
||||
keyboardType: TextInputType.number,
|
||||
textInputAction: needsAuth ? TextInputAction.next : TextInputAction.done,
|
||||
onSubmitted: (_) => needsAuth ? null : _detectedAuthStrategy == null ? _detectAuthRequirements() : _connect(),
|
||||
),
|
||||
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// Password
|
||||
Text(
|
||||
S.of(context)!.password,
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
TextField(
|
||||
controller: _passwordController,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
decoration: InputDecoration(
|
||||
hintText: S.of(context)!.password,
|
||||
hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
|
||||
filled: true,
|
||||
fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
border: OutlineInputBorder(
|
||||
// Detected auth method indicator
|
||||
if (_detectedAuthType != null)
|
||||
Container(
|
||||
padding: const EdgeInsets.all(16),
|
||||
margin: const EdgeInsets.only(bottom: 24),
|
||||
decoration: BoxDecoration(
|
||||
color: needsAuth
|
||||
? colorScheme.primaryContainer.withOpacity(0.3)
|
||||
: colorScheme.tertiaryContainer.withOpacity(0.3),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
prefixIcon: Icon(
|
||||
Icons.lock_rounded,
|
||||
color: colorScheme.onSurface.withOpacity(0.54),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
_getAuthIcon(_detectedAuthStrategy!.name),
|
||||
color: needsAuth ? colorScheme.primary : colorScheme.tertiary,
|
||||
size: 24,
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
S.of(context)!.detectedAuthType(_detectedAuthType!),
|
||||
style: TextStyle(
|
||||
color: needsAuth
|
||||
? colorScheme.onPrimaryContainer
|
||||
: colorScheme.onTertiaryContainer,
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
if (needsAuth)
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 4),
|
||||
child: Text(
|
||||
S.of(context)!.serverRequiresAuth,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onPrimaryContainer.withOpacity(0.7),
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
obscureText: true,
|
||||
enabled: !_isConnecting,
|
||||
textInputAction: TextInputAction.done,
|
||||
onSubmitted: (_) => _connect(),
|
||||
),
|
||||
|
||||
const SizedBox(height: 32),
|
||||
// HTTP connection info banner
|
||||
if (_resolvedServerUrl != null && _isHttpConnection(_resolvedServerUrl!))
|
||||
Container(
|
||||
padding: const EdgeInsets.all(16),
|
||||
margin: const EdgeInsets.only(bottom: 24),
|
||||
decoration: BoxDecoration(
|
||||
color: _isTailscaleUrl(_serverUrlController.text)
|
||||
? colorScheme.secondaryContainer.withOpacity(0.3)
|
||||
: colorScheme.errorContainer.withOpacity(0.3),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: _isTailscaleUrl(_serverUrlController.text)
|
||||
? null
|
||||
: Border.all(color: colorScheme.error.withOpacity(0.3)),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
_isTailscaleUrl(_serverUrlController.text)
|
||||
? Icons.vpn_lock_rounded
|
||||
: Icons.warning_amber_rounded,
|
||||
color: _isTailscaleUrl(_serverUrlController.text)
|
||||
? colorScheme.secondary
|
||||
: colorScheme.error,
|
||||
size: 24,
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
_isTailscaleUrl(_serverUrlController.text)
|
||||
? S.of(context)!.tailscaleVpnConnection
|
||||
: S.of(context)!.unencryptedConnection,
|
||||
style: TextStyle(
|
||||
color: _isTailscaleUrl(_serverUrlController.text)
|
||||
? colorScheme.onSecondaryContainer
|
||||
: colorScheme.onErrorContainer,
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 4),
|
||||
child: Text(
|
||||
_isTailscaleUrl(_serverUrlController.text)
|
||||
? S.of(context)!.usingHttpOverTailscale
|
||||
: _usedHttpFallback
|
||||
? S.of(context)!.httpsFailedUsingHttp
|
||||
: S.of(context)!.httpNotEncrypted,
|
||||
style: TextStyle(
|
||||
color: (_isTailscaleUrl(_serverUrlController.text)
|
||||
? colorScheme.onSecondaryContainer
|
||||
: colorScheme.onErrorContainer).withOpacity(0.7),
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
// Authentication fields (shown only if auth required)
|
||||
if (needsAuth) ...[
|
||||
// Auth Server URL (only for Authelia)
|
||||
if (_detectedAuthStrategy?.name == 'authelia') ...[
|
||||
Text(
|
||||
S.of(context)!.authServerUrlOptional,
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
S.of(context)!.authServerUrlDescription,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onBackground.withOpacity(0.6),
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
TextField(
|
||||
controller: _authServerUrlController,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
decoration: InputDecoration(
|
||||
hintText: S.of(context)!.authServerUrlHint,
|
||||
hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
|
||||
filled: true,
|
||||
fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
prefixIcon: Icon(
|
||||
Icons.shield_rounded,
|
||||
color: colorScheme.onSurface.withOpacity(0.54),
|
||||
),
|
||||
),
|
||||
enabled: !_isConnecting,
|
||||
textInputAction: TextInputAction.next,
|
||||
),
|
||||
|
||||
const SizedBox(height: 24),
|
||||
],
|
||||
|
||||
Text(
|
||||
S.of(context)!.username,
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
TextField(
|
||||
controller: _usernameController,
|
||||
focusNode: _usernameFocusNode,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
decoration: InputDecoration(
|
||||
hintText: S.of(context)!.username,
|
||||
hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
|
||||
filled: true,
|
||||
fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
prefixIcon: Icon(
|
||||
Icons.person_rounded,
|
||||
color: colorScheme.onSurface.withOpacity(0.54),
|
||||
),
|
||||
),
|
||||
enabled: !_isConnecting,
|
||||
textInputAction: TextInputAction.next,
|
||||
),
|
||||
|
||||
const SizedBox(height: 16),
|
||||
|
||||
Text(
|
||||
S.of(context)!.password,
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
|
||||
TextField(
|
||||
controller: _passwordController,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
decoration: InputDecoration(
|
||||
hintText: S.of(context)!.password,
|
||||
hintStyle: TextStyle(color: colorScheme.onSurface.withOpacity(0.38)),
|
||||
filled: true,
|
||||
fillColor: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
prefixIcon: Icon(
|
||||
Icons.lock_rounded,
|
||||
color: colorScheme.onSurface.withOpacity(0.54),
|
||||
),
|
||||
),
|
||||
obscureText: true,
|
||||
enabled: !_isConnecting,
|
||||
textInputAction: TextInputAction.done,
|
||||
onSubmitted: (_) => _connect(),
|
||||
),
|
||||
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// Error message
|
||||
if (_error != null)
|
||||
@@ -375,14 +893,16 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
if (_showDebug) ...[
|
||||
const SizedBox(height: 16),
|
||||
DebugConsole(
|
||||
onClear: () {},
|
||||
onClear: () => setState(() => _debugLogs.clear()),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
|
||||
// Connect button
|
||||
// Connect button (changes based on state)
|
||||
ElevatedButton(
|
||||
onPressed: _isConnecting ? null : _connect,
|
||||
onPressed: (_isConnecting || _isDetectingAuth)
|
||||
? null
|
||||
: (_detectedAuthStrategy == null ? _detectAuthRequirements : _connect),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: colorScheme.primary,
|
||||
foregroundColor: colorScheme.onPrimary,
|
||||
@@ -392,22 +912,44 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
),
|
||||
elevation: 0,
|
||||
),
|
||||
child: _isConnecting
|
||||
? SizedBox(
|
||||
height: 20,
|
||||
width: 20,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
valueColor: AlwaysStoppedAnimation<Color>(colorScheme.onPrimary),
|
||||
),
|
||||
child: _isDetectingAuth
|
||||
? Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
SizedBox(
|
||||
height: 20,
|
||||
width: 20,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
valueColor: AlwaysStoppedAnimation<Color>(colorScheme.onPrimary),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Text(
|
||||
S.of(context)!.detectingAuth,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
],
|
||||
)
|
||||
: Text(
|
||||
S.of(context)!.connect,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
: _isConnecting
|
||||
? SizedBox(
|
||||
height: 20,
|
||||
width: 20,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
valueColor: AlwaysStoppedAnimation<Color>(colorScheme.onPrimary),
|
||||
),
|
||||
)
|
||||
: Text(
|
||||
_detectedAuthStrategy == null ? S.of(context)!.detectAndConnect : S.of(context)!.connect,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
+663
-2539
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,4 @@
|
||||
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 '../models/media_item.dart';
|
||||
@@ -10,9 +9,7 @@ import '../theme/theme_provider.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../services/recently_played_service.dart';
|
||||
import '../widgets/global_player_overlay.dart';
|
||||
import '../widgets/provider_icon.dart';
|
||||
import '../widgets/hires_badge.dart';
|
||||
import '../widgets/media_context_menu.dart';
|
||||
import '../widgets/player_picker_sheet.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import '../theme/design_tokens.dart';
|
||||
|
||||
@@ -44,9 +41,9 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
List<Track> _tracks = [];
|
||||
bool _isLoading = true;
|
||||
bool _isFavorite = false;
|
||||
late bool _isInLibrary;
|
||||
ColorScheme? _lightColorScheme;
|
||||
ColorScheme? _darkColorScheme;
|
||||
int? _expandedTrackIndex;
|
||||
|
||||
String get _heroTagSuffix => widget.heroTagSuffix != null ? '_${widget.heroTagSuffix}' : '';
|
||||
|
||||
@@ -58,15 +55,15 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
void initState() {
|
||||
super.initState();
|
||||
_isFavorite = widget.playlist.favorite ?? false;
|
||||
_isInLibrary = widget.playlist.inLibrary;
|
||||
_loadTracks();
|
||||
|
||||
// Mark that we're on a detail screen and extract colors immediately
|
||||
// Defer color extraction until after hero animation completes
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) {
|
||||
markDetailScreenEntered(context);
|
||||
_extractColors(); // Extract colors immediately - async so won't block
|
||||
}
|
||||
Future.delayed(const Duration(milliseconds: 350), () {
|
||||
if (mounted) {
|
||||
_extractColors();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -77,18 +74,15 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
if (imageUrl == null) return;
|
||||
|
||||
try {
|
||||
// Use isolate-based extraction to avoid blocking the main thread
|
||||
final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(imageUrl);
|
||||
final colorSchemes = await PaletteHelper.extractColorSchemes(
|
||||
CachedNetworkImageProvider(imageUrl),
|
||||
);
|
||||
|
||||
if (colorSchemes != null && mounted) {
|
||||
setState(() {
|
||||
_lightColorScheme = colorSchemes.$1;
|
||||
_darkColorScheme = colorSchemes.$2;
|
||||
});
|
||||
|
||||
// Update ThemeProvider so nav bar uses adaptive colors
|
||||
final themeProvider = context.read<ThemeProvider>();
|
||||
themeProvider.updateAdaptiveColors(colorSchemes.$1, colorSchemes.$2, isFromDetailScreen: true);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Failed to extract colors for playlist: $e');
|
||||
@@ -233,86 +227,6 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _toggleLibrary() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final newState = !_isInLibrary;
|
||||
|
||||
try {
|
||||
if (newState) {
|
||||
String? actualProvider;
|
||||
String? actualItemId;
|
||||
|
||||
if (widget.playlist.providerMappings != null && widget.playlist.providerMappings!.isNotEmpty) {
|
||||
final nonLibraryMapping = widget.playlist.providerMappings!.where(
|
||||
(m) => m.providerInstance != 'library' && m.providerDomain != 'library',
|
||||
).firstOrNull;
|
||||
|
||||
if (nonLibraryMapping != null) {
|
||||
actualProvider = nonLibraryMapping.providerDomain;
|
||||
actualItemId = nonLibraryMapping.itemId;
|
||||
}
|
||||
}
|
||||
|
||||
if (actualProvider == null || actualItemId == null) {
|
||||
if (widget.playlist.provider != 'library') {
|
||||
actualProvider = widget.playlist.provider;
|
||||
actualItemId = widget.playlist.itemId;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
setState(() => _isInLibrary = newState);
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.addedToLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
|
||||
maProvider.addToLibrary(
|
||||
mediaType: 'playlist',
|
||||
provider: actualProvider,
|
||||
itemId: actualItemId,
|
||||
).catchError((e) {
|
||||
if (mounted) setState(() => _isInLibrary = !newState);
|
||||
});
|
||||
} else {
|
||||
int? libraryItemId;
|
||||
if (widget.playlist.provider == 'library') {
|
||||
libraryItemId = int.tryParse(widget.playlist.itemId);
|
||||
} else if (widget.playlist.providerMappings != null) {
|
||||
final libraryMapping = widget.playlist.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => widget.playlist.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId == null) return;
|
||||
|
||||
setState(() => _isInLibrary = newState);
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.removedFromLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
|
||||
maProvider.removeFromLibrary(
|
||||
mediaType: 'playlist',
|
||||
libraryItemId: libraryItemId,
|
||||
).catchError((e) {
|
||||
if (mounted) setState(() => _isInLibrary = !newState);
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
// Silent failure
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _toggleTrackFavorite(int trackIndex) async {
|
||||
if (trackIndex < 0 || trackIndex >= _tracks.length) return;
|
||||
|
||||
@@ -410,89 +324,6 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _toggleTrackLibrary(int trackIndex) async {
|
||||
if (trackIndex < 0 || trackIndex >= _tracks.length) return;
|
||||
|
||||
final track = _tracks[trackIndex];
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final currentInLibrary = track.inLibrary;
|
||||
|
||||
try {
|
||||
if (!currentInLibrary) {
|
||||
// Add to library
|
||||
String? actualProvider;
|
||||
String? actualItemId;
|
||||
|
||||
if (track.providerMappings != null && track.providerMappings!.isNotEmpty) {
|
||||
final nonLibraryMapping = track.providerMappings!.where(
|
||||
(m) => m.providerInstance != 'library' && m.providerDomain != 'library',
|
||||
).firstOrNull;
|
||||
|
||||
if (nonLibraryMapping != null) {
|
||||
actualProvider = nonLibraryMapping.providerDomain;
|
||||
actualItemId = nonLibraryMapping.itemId;
|
||||
}
|
||||
}
|
||||
|
||||
if (actualProvider == null || actualItemId == null) {
|
||||
if (track.provider != 'library') {
|
||||
actualProvider = track.provider;
|
||||
actualItemId = track.itemId;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
await maProvider.addToLibrary(
|
||||
mediaType: 'track',
|
||||
provider: actualProvider,
|
||||
itemId: actualItemId,
|
||||
);
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.addedToLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
} else {
|
||||
// Remove from library
|
||||
int? libraryItemId;
|
||||
if (track.provider == 'library') {
|
||||
libraryItemId = int.tryParse(track.itemId);
|
||||
} else if (track.providerMappings != null) {
|
||||
final libraryMapping = track.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => track.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId == null) return;
|
||||
|
||||
await maProvider.removeFromLibrary(
|
||||
mediaType: 'track',
|
||||
libraryItemId: libraryItemId,
|
||||
);
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.removedFromLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error toggling track library: $e');
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _playPlaylist() async {
|
||||
if (_tracks.isEmpty) return;
|
||||
|
||||
@@ -547,152 +378,194 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
void _showPlayOnMenu(BuildContext context) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
|
||||
GlobalPlayerOverlay.showPlayerSelectorForAction(
|
||||
contextHint: S.of(context)!.selectPlayerToPlayPlaylist,
|
||||
GlobalPlayerOverlay.hidePlayer();
|
||||
|
||||
showPlayerPickerSheet(
|
||||
context: context,
|
||||
title: S.of(context)!.playOn,
|
||||
players: maProvider.availablePlayers,
|
||||
selectedPlayer: maProvider.selectedPlayer,
|
||||
onPlayerSelected: (player) async {
|
||||
maProvider.selectPlayer(player);
|
||||
await maProvider.playTracks(player.playerId, _tracks);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
void _showMoreMenu(BuildContext context, ColorScheme colorScheme) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
backgroundColor: colorScheme.surface,
|
||||
shape: const RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
|
||||
),
|
||||
builder: (context) => SafeArea(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const SizedBox(height: 8),
|
||||
Container(
|
||||
width: 32,
|
||||
height: 4,
|
||||
decoration: BoxDecoration(
|
||||
color: colorScheme.onSurfaceVariant.withOpacity(0.4),
|
||||
borderRadius: BorderRadius.circular(2),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
ListTile(
|
||||
leading: Icon(Icons.speaker_group_outlined, color: colorScheme.onSurface),
|
||||
title: Text(S.of(context)!.playOn, style: TextStyle(color: colorScheme.onSurface)),
|
||||
onTap: () {
|
||||
Navigator.pop(context);
|
||||
_showPlayOnMenu(context);
|
||||
},
|
||||
),
|
||||
ListTile(
|
||||
leading: Icon(Icons.playlist_add, color: colorScheme.onSurface),
|
||||
title: Text(S.of(context)!.addToQueue, style: TextStyle(color: colorScheme.onSurface)),
|
||||
onTap: () {
|
||||
Navigator.pop(context);
|
||||
// Add to queue on selected player
|
||||
final player = maProvider.selectedPlayer;
|
||||
if (player != null) {
|
||||
maProvider.addTracksToQueue(player.playerId, _tracks).then((_) {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.tracksAddedToQueue),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
_showError(S.of(context)!.noPlayerSelected);
|
||||
}
|
||||
},
|
||||
),
|
||||
ListTile(
|
||||
leading: Icon(Icons.queue_music, color: colorScheme.onSurface),
|
||||
title: Text(S.of(context)!.addToQueueOn, style: TextStyle(color: colorScheme.onSurface)),
|
||||
onTap: () {
|
||||
Navigator.pop(context);
|
||||
_addPlaylistToQueue();
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
).whenComplete(() {
|
||||
GlobalPlayerOverlay.showPlayer();
|
||||
});
|
||||
}
|
||||
|
||||
void _addPlaylistToQueue() {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final players = maProvider.availablePlayers;
|
||||
|
||||
GlobalPlayerOverlay.showPlayerSelectorForAction(
|
||||
contextHint: S.of(context)!.addToQueueOn,
|
||||
onPlayerSelected: (player) async {
|
||||
try {
|
||||
_logger.log('Adding playlist to queue on ${player.name}');
|
||||
await maProvider.addTracksToQueue(
|
||||
player.playerId,
|
||||
_tracks,
|
||||
);
|
||||
_logger.log('Playlist added to queue on ${player.name}');
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.tracksAddedToQueue),
|
||||
duration: const Duration(seconds: 1),
|
||||
GlobalPlayerOverlay.hidePlayer();
|
||||
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
backgroundColor: Colors.transparent,
|
||||
builder: (context) => Container(
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).colorScheme.surface,
|
||||
borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
|
||||
),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Spacing.vGap16,
|
||||
Text(
|
||||
S.of(context)!.addToQueueOn,
|
||||
style: Theme.of(context).textTheme.titleLarge,
|
||||
),
|
||||
Spacing.vGap16,
|
||||
if (players.isEmpty)
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(32.0),
|
||||
child: Text(S.of(context)!.noPlayersAvailable),
|
||||
)
|
||||
else
|
||||
Flexible(
|
||||
child: ListView.builder(
|
||||
shrinkWrap: true,
|
||||
itemCount: players.length,
|
||||
itemBuilder: (context, playerIndex) {
|
||||
final player = players[playerIndex];
|
||||
return ListTile(
|
||||
leading: Icon(
|
||||
Icons.speaker,
|
||||
color: Theme.of(context).colorScheme.onSurface,
|
||||
),
|
||||
title: Text(player.name),
|
||||
onTap: () async {
|
||||
Navigator.pop(context);
|
||||
try {
|
||||
_logger.log('Adding playlist to queue on ${player.name}');
|
||||
await maProvider.playTracks(
|
||||
player.playerId,
|
||||
_tracks,
|
||||
startIndex: 0,
|
||||
clearQueue: false,
|
||||
);
|
||||
_logger.log('Playlist added to queue on ${player.name}');
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.tracksAddedToQueue),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error adding playlist to queue: $e');
|
||||
_showError('Failed to add playlist to queue: $e');
|
||||
}
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error adding playlist to queue: $e');
|
||||
_showError('Failed to add playlist to queue: $e');
|
||||
}
|
||||
},
|
||||
);
|
||||
SizedBox(height: MediaQuery.of(context).padding.bottom + 16),
|
||||
],
|
||||
),
|
||||
),
|
||||
).whenComplete(() {
|
||||
GlobalPlayerOverlay.showPlayer();
|
||||
});
|
||||
}
|
||||
|
||||
void _addTrackToQueue(BuildContext context, int index) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final players = maProvider.availablePlayers;
|
||||
|
||||
GlobalPlayerOverlay.showPlayerSelectorForAction(
|
||||
contextHint: S.of(context)!.addToQueueOn,
|
||||
onPlayerSelected: (player) async {
|
||||
try {
|
||||
await maProvider.addTracksToQueue(
|
||||
player.playerId,
|
||||
_tracks,
|
||||
startIndex: index,
|
||||
);
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.tracksAddedToQueue),
|
||||
duration: const Duration(seconds: 1),
|
||||
GlobalPlayerOverlay.hidePlayer();
|
||||
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
backgroundColor: Colors.transparent,
|
||||
builder: (context) => Container(
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).colorScheme.surface,
|
||||
borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
|
||||
),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Spacing.vGap16,
|
||||
Text(
|
||||
S.of(context)!.addToQueueOn,
|
||||
style: Theme.of(context).textTheme.titleLarge,
|
||||
),
|
||||
Spacing.vGap16,
|
||||
if (players.isEmpty)
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(32.0),
|
||||
child: Text(S.of(context)!.noPlayersAvailable),
|
||||
)
|
||||
else
|
||||
Flexible(
|
||||
child: ListView.builder(
|
||||
shrinkWrap: true,
|
||||
itemCount: players.length,
|
||||
itemBuilder: (context, playerIndex) {
|
||||
final player = players[playerIndex];
|
||||
return ListTile(
|
||||
leading: Icon(
|
||||
Icons.speaker,
|
||||
color: Theme.of(context).colorScheme.onSurface,
|
||||
),
|
||||
title: Text(player.name),
|
||||
onTap: () async {
|
||||
Navigator.pop(context);
|
||||
try {
|
||||
await maProvider.playTracks(
|
||||
player.playerId,
|
||||
_tracks,
|
||||
startIndex: index,
|
||||
clearQueue: false,
|
||||
);
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.tracksAddedToQueue),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error adding to queue: $e');
|
||||
_showError('Failed to add to queue: $e');
|
||||
}
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error adding to queue: $e');
|
||||
_showError('Failed to add to queue: $e');
|
||||
}
|
||||
},
|
||||
);
|
||||
SizedBox(height: MediaQuery.of(context).padding.bottom + 16),
|
||||
],
|
||||
),
|
||||
),
|
||||
).whenComplete(() {
|
||||
GlobalPlayerOverlay.showPlayer();
|
||||
});
|
||||
}
|
||||
|
||||
void _showPlayRadioMenu(BuildContext context, int trackIndex) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final track = _tracks[trackIndex];
|
||||
|
||||
GlobalPlayerOverlay.showPlayerSelectorForAction(
|
||||
contextHint: S.of(context)!.selectPlayerForRadio,
|
||||
GlobalPlayerOverlay.hidePlayer();
|
||||
|
||||
showPlayerPickerSheet(
|
||||
context: context,
|
||||
title: S.of(context)!.playOn,
|
||||
players: maProvider.availablePlayers,
|
||||
selectedPlayer: maProvider.selectedPlayer,
|
||||
onPlayerSelected: (player) async {
|
||||
maProvider.selectPlayer(player);
|
||||
await maProvider.playRadio(player.playerId, track);
|
||||
},
|
||||
);
|
||||
).whenComplete(() {
|
||||
GlobalPlayerOverlay.showPlayer();
|
||||
});
|
||||
}
|
||||
|
||||
void _showError(String message) {
|
||||
@@ -833,44 +706,30 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
tag: HeroTags.playlistCover + (widget.playlist.uri ?? widget.playlist.itemId) + _heroTagSuffix,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
child: SizedBox(
|
||||
child: Container(
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
child: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
Container(
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: imageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
memCacheWidth: 256,
|
||||
memCacheHeight: 256,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => const SizedBox(),
|
||||
errorWidget: (_, __, ___) => Icon(
|
||||
Icons.playlist_play_rounded,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
: Icon(
|
||||
Icons.playlist_play_rounded,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
// Provider icon overlay
|
||||
if (widget.playlist.providerMappings?.isNotEmpty == true)
|
||||
ProviderIconOverlay(
|
||||
domain: widget.playlist.providerMappings!.first.providerDomain,
|
||||
size: 24,
|
||||
margin: 8,
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: imageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
memCacheWidth: 256,
|
||||
memCacheHeight: 256,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => const SizedBox(),
|
||||
errorWidget: (_, __, ___) => Icon(
|
||||
Icons.playlist_play_rounded,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
: Icon(
|
||||
Icons.playlist_play_rounded,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -923,6 +782,7 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
children: [
|
||||
// Main Play Button
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: SizedBox(
|
||||
height: 50,
|
||||
child: ElevatedButton.icon(
|
||||
@@ -942,6 +802,42 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
|
||||
// "Play on..." Button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: _isLoading || _tracks.isEmpty ? null : () => _showPlayOnMenu(context),
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.speaker_group_outlined),
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(width: 12),
|
||||
|
||||
// "Add to Queue" Button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: _isLoading || _tracks.isEmpty ? null : _addPlaylistToQueue,
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.playlist_add),
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(width: 12),
|
||||
|
||||
// Favorite Button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
@@ -955,53 +851,10 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
),
|
||||
),
|
||||
child: Icon(
|
||||
Icons.favorite,
|
||||
size: 25,
|
||||
_isFavorite ? Icons.favorite : Icons.favorite_border,
|
||||
color: _isFavorite
|
||||
? colorScheme.error
|
||||
: Colors.white70,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(width: 12),
|
||||
|
||||
// Three-dot Menu Button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: Builder(
|
||||
builder: (buttonContext) => FilledButton.tonal(
|
||||
onPressed: () {
|
||||
if (_isLoading || _tracks.isEmpty) return;
|
||||
final RenderBox box = buttonContext.findRenderObject() as RenderBox;
|
||||
final Offset position = box.localToGlobal(Offset(box.size.width / 2, box.size.height));
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: position,
|
||||
mediaType: ContextMenuMediaType.playlist,
|
||||
item: widget.playlist,
|
||||
isFavorite: _isFavorite,
|
||||
isInLibrary: _isInLibrary,
|
||||
onToggleFavorite: _toggleFavorite,
|
||||
onToggleLibrary: _toggleLibrary,
|
||||
adaptiveColorScheme: adaptiveScheme,
|
||||
showTopRow: false,
|
||||
);
|
||||
},
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: Icon(
|
||||
Icons.more_vert,
|
||||
size: 25,
|
||||
color: _isLoading || _tracks.isEmpty
|
||||
? Colors.white70.withOpacity(0.38)
|
||||
: Colors.white70,
|
||||
),
|
||||
: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -1035,108 +888,168 @@ class _PlaylistDetailsScreenState extends State<PlaylistDetailsScreen> with Sing
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
final track = _tracks[index];
|
||||
final isExpanded = _expandedTrackIndex == index;
|
||||
final trackImageUrl = context.read<MusicAssistantProvider>().getImageUrl(track, size: 80);
|
||||
|
||||
return GestureDetector(
|
||||
onLongPressStart: (details) {
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
mediaType: ContextMenuMediaType.track,
|
||||
item: track,
|
||||
isFavorite: track.favorite ?? false,
|
||||
isInLibrary: track.inLibrary,
|
||||
onToggleFavorite: () => _toggleTrackFavorite(index),
|
||||
onToggleLibrary: () => _toggleTrackLibrary(index),
|
||||
adaptiveColorScheme: adaptiveScheme,
|
||||
);
|
||||
},
|
||||
child: ListTile(
|
||||
leading: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// Track number
|
||||
SizedBox(
|
||||
width: 28,
|
||||
child: Text(
|
||||
'${index + 1}',
|
||||
style: textTheme.bodyMedium?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
textAlign: TextAlign.right,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
// Track artwork
|
||||
ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
child: Container(
|
||||
width: 48,
|
||||
height: 48,
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: trackImageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: trackImageUrl,
|
||||
fit: BoxFit.cover,
|
||||
memCacheWidth: 96,
|
||||
memCacheHeight: 96,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => const SizedBox(),
|
||||
errorWidget: (_, __, ___) => Icon(
|
||||
Icons.music_note,
|
||||
size: 24,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
: Icon(
|
||||
Icons.music_note,
|
||||
size: 24,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
title: Text(
|
||||
track.name,
|
||||
style: textTheme.bodyLarge?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
subtitle: Text(
|
||||
track.artistsString,
|
||||
style: textTheme.bodyMedium?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
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)
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
ListTile(
|
||||
leading: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// Track number
|
||||
SizedBox(
|
||||
width: 40,
|
||||
width: 28,
|
||||
child: Text(
|
||||
_formatDuration(track.duration!),
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
'${index + 1}',
|
||||
style: textTheme.bodyMedium?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
textAlign: TextAlign.right,
|
||||
),
|
||||
),
|
||||
],
|
||||
const SizedBox(width: 12),
|
||||
// Track artwork
|
||||
ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
child: Container(
|
||||
width: 48,
|
||||
height: 48,
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: trackImageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: trackImageUrl,
|
||||
fit: BoxFit.cover,
|
||||
memCacheWidth: 96,
|
||||
memCacheHeight: 96,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => const SizedBox(),
|
||||
errorWidget: (_, __, ___) => Icon(
|
||||
Icons.music_note,
|
||||
size: 24,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
: Icon(
|
||||
Icons.music_note,
|
||||
size: 24,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
title: Text(
|
||||
track.name,
|
||||
style: textTheme.bodyLarge?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
subtitle: Text(
|
||||
track.artistsString,
|
||||
style: textTheme.bodyMedium?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
trailing: track.duration != null
|
||||
? Text(
|
||||
_formatDuration(track.duration!),
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
)
|
||||
: null,
|
||||
onTap: () {
|
||||
if (isExpanded) {
|
||||
setState(() {
|
||||
_expandedTrackIndex = null;
|
||||
});
|
||||
} else {
|
||||
_playTrack(index);
|
||||
}
|
||||
},
|
||||
onLongPress: () {
|
||||
setState(() {
|
||||
_expandedTrackIndex = isExpanded ? null : index;
|
||||
});
|
||||
},
|
||||
),
|
||||
onTap: () => _playTrack(index),
|
||||
),
|
||||
// Expandable action buttons
|
||||
AnimatedSize(
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.easeInOut,
|
||||
child: isExpanded
|
||||
? Padding(
|
||||
padding: const EdgeInsets.only(right: 16.0, bottom: 12.0, top: 4.0),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
// Radio button
|
||||
SizedBox(
|
||||
height: 44,
|
||||
width: 44,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: () => _showPlayRadioMenu(context, index),
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.radio, size: 20),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
// Add to queue button
|
||||
SizedBox(
|
||||
height: 44,
|
||||
width: 44,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: () => _addTrackToQueue(context, index),
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.playlist_add, size: 20),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
// Favorite button
|
||||
SizedBox(
|
||||
height: 44,
|
||||
width: 44,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: () => _toggleTrackFavorite(index),
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(Radii.xxl),
|
||||
),
|
||||
),
|
||||
child: Icon(
|
||||
track.favorite == true ? Icons.favorite : Icons.favorite_border,
|
||||
size: 20,
|
||||
color: track.favorite == true
|
||||
? colorScheme.error
|
||||
: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
: const SizedBox.shrink(),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
childCount: _tracks.length,
|
||||
|
||||
@@ -1,23 +1,16 @@
|
||||
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 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
|
||||
import 'package:material_symbols_icons/symbols.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../widgets/global_player_overlay.dart';
|
||||
import '../widgets/provider_icon.dart';
|
||||
import '../widgets/media_context_menu.dart';
|
||||
import '../widgets/player_picker_sheet.dart';
|
||||
import '../theme/palette_helper.dart';
|
||||
import '../theme/theme_provider.dart';
|
||||
import '../theme/design_tokens.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../constants/hero_tags.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import '../utils/page_transitions.dart';
|
||||
import 'podcast_episode_detail_screen.dart';
|
||||
|
||||
class PodcastDetailScreen extends StatefulWidget {
|
||||
final MediaItem podcast;
|
||||
@@ -43,8 +36,7 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
bool _isLoadingEpisodes = false;
|
||||
bool _isDescriptionExpanded = false;
|
||||
bool _isInLibrary = false;
|
||||
bool _isFavorite = false;
|
||||
String _sortOrder = 'newest'; // 'newest', 'oldest', 'alpha', 'duration'
|
||||
String? _expandedEpisodeId; // Track which episode is expanded for actions
|
||||
|
||||
String get _heroTagSuffix => widget.heroTagSuffix != null ? '_${widget.heroTagSuffix}' : '';
|
||||
|
||||
@@ -52,109 +44,16 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
void initState() {
|
||||
super.initState();
|
||||
_isInLibrary = _checkIfInLibrary(widget.podcast);
|
||||
_isFavorite = widget.podcast.favorite ?? false;
|
||||
_loadSortPreference();
|
||||
|
||||
// Mark that we're on a detail screen and extract colors immediately
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) {
|
||||
markDetailScreenEntered(context);
|
||||
_extractColors(); // Extract colors immediately - async so won't block
|
||||
}
|
||||
Future.delayed(const Duration(milliseconds: 350), () {
|
||||
if (mounted) {
|
||||
_extractColors();
|
||||
}
|
||||
});
|
||||
_loadEpisodes();
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _loadSortPreference() async {
|
||||
final sortOrder = await SettingsService.getPodcastEpisodesSortOrder();
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_sortOrder = sortOrder;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void _toggleSortOrder() {
|
||||
// Cycle through sort orders: newest -> oldest -> alpha -> duration -> newest
|
||||
String newOrder;
|
||||
switch (_sortOrder) {
|
||||
case 'newest':
|
||||
newOrder = 'oldest';
|
||||
break;
|
||||
case 'oldest':
|
||||
newOrder = 'alpha';
|
||||
break;
|
||||
case 'alpha':
|
||||
newOrder = 'duration';
|
||||
break;
|
||||
default:
|
||||
newOrder = 'newest';
|
||||
}
|
||||
setState(() {
|
||||
_sortOrder = newOrder;
|
||||
_sortEpisodes();
|
||||
});
|
||||
SettingsService.setPodcastEpisodesSortOrder(newOrder);
|
||||
}
|
||||
|
||||
void _sortEpisodes() {
|
||||
switch (_sortOrder) {
|
||||
case 'newest':
|
||||
_episodes.sort((a, b) {
|
||||
final aDate = _getPublishDate(a.metadata);
|
||||
final bDate = _getPublishDate(b.metadata);
|
||||
if (aDate == null && bDate == null) return 0;
|
||||
if (aDate == null) return 1;
|
||||
if (bDate == null) return -1;
|
||||
return bDate.compareTo(aDate); // Newest first
|
||||
});
|
||||
break;
|
||||
case 'oldest':
|
||||
_episodes.sort((a, b) {
|
||||
final aDate = _getPublishDate(a.metadata);
|
||||
final bDate = _getPublishDate(b.metadata);
|
||||
if (aDate == null && bDate == null) return 0;
|
||||
if (aDate == null) return 1;
|
||||
if (bDate == null) return -1;
|
||||
return aDate.compareTo(bDate); // Oldest first
|
||||
});
|
||||
break;
|
||||
case 'alpha':
|
||||
_episodes.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
|
||||
break;
|
||||
case 'duration':
|
||||
_episodes.sort((a, b) {
|
||||
final aDur = a.duration ?? Duration.zero;
|
||||
final bDur = b.duration ?? Duration.zero;
|
||||
return aDur.compareTo(bDur); // Shortest first
|
||||
});
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
DateTime? _getPublishDate(Map<String, dynamic>? metadata) {
|
||||
if (metadata == null) return null;
|
||||
|
||||
dynamic dateValue = metadata['published'] ??
|
||||
metadata['pub_date'] ??
|
||||
metadata['release_date'] ??
|
||||
metadata['aired'] ??
|
||||
metadata['timestamp'];
|
||||
|
||||
if (dateValue == null) return null;
|
||||
|
||||
try {
|
||||
if (dateValue is String) {
|
||||
return DateTime.tryParse(dateValue);
|
||||
} else if (dateValue is int) {
|
||||
return DateTime.fromMillisecondsSinceEpoch(dateValue * 1000);
|
||||
}
|
||||
} catch (e) {
|
||||
// Silent failure
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Check if podcast is in library
|
||||
bool _checkIfInLibrary(MediaItem podcast) {
|
||||
if (podcast.provider == 'library') return true;
|
||||
@@ -167,6 +66,7 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
|
||||
try {
|
||||
final newState = !_isInLibrary;
|
||||
bool success;
|
||||
|
||||
if (newState) {
|
||||
// Add to library - MUST use non-library provider
|
||||
@@ -197,35 +97,12 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
// OPTIMISTIC UPDATE: Update UI immediately
|
||||
setState(() {
|
||||
_isInLibrary = newState;
|
||||
});
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.addedToLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
_logger.log('Adding podcast to library: provider=$actualProvider, itemId=$actualItemId');
|
||||
// Fire and forget - API call happens in background
|
||||
maProvider.addToLibrary(
|
||||
success = await maProvider.addToLibrary(
|
||||
mediaType: 'podcast',
|
||||
provider: actualProvider,
|
||||
itemId: actualItemId,
|
||||
).catchError((e) {
|
||||
_logger.log('❌ Failed to add podcast to library: $e');
|
||||
// Revert on failure
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isInLibrary = !newState;
|
||||
});
|
||||
}
|
||||
});
|
||||
);
|
||||
} else {
|
||||
// Remove from library
|
||||
int? libraryItemId;
|
||||
@@ -246,7 +123,13 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
return;
|
||||
}
|
||||
|
||||
// OPTIMISTIC UPDATE: Update UI immediately
|
||||
success = await maProvider.removeFromLibrary(
|
||||
mediaType: 'podcast',
|
||||
libraryItemId: libraryItemId,
|
||||
);
|
||||
}
|
||||
|
||||
if (success) {
|
||||
setState(() {
|
||||
_isInLibrary = newState;
|
||||
});
|
||||
@@ -254,25 +137,13 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.removedFromLibrary),
|
||||
content: Text(
|
||||
_isInLibrary ? S.of(context)!.addedToLibrary : S.of(context)!.removedFromLibrary,
|
||||
),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
// Fire and forget - API call happens in background
|
||||
maProvider.removeFromLibrary(
|
||||
mediaType: 'podcast',
|
||||
libraryItemId: libraryItemId,
|
||||
).catchError((e) {
|
||||
_logger.log('❌ Failed to remove podcast from library: $e');
|
||||
// Revert on failure
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_isInLibrary = !newState;
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error toggling podcast library: $e');
|
||||
@@ -287,71 +158,6 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Toggle favorite status
|
||||
Future<void> _toggleFavorite() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final newState = !_isFavorite;
|
||||
|
||||
try {
|
||||
bool success;
|
||||
if (newState) {
|
||||
String actualProvider = widget.podcast.provider;
|
||||
String actualItemId = widget.podcast.itemId;
|
||||
|
||||
if (widget.podcast.providerMappings != null && widget.podcast.providerMappings!.isNotEmpty) {
|
||||
final mapping = widget.podcast.providerMappings!.firstWhere(
|
||||
(m) => m.available && m.providerInstance != 'library',
|
||||
orElse: () => widget.podcast.providerMappings!.firstWhere(
|
||||
(m) => m.available,
|
||||
orElse: () => widget.podcast.providerMappings!.first,
|
||||
),
|
||||
);
|
||||
actualProvider = mapping.providerDomain;
|
||||
actualItemId = mapping.itemId;
|
||||
}
|
||||
|
||||
success = await maProvider.addToFavorites(
|
||||
mediaType: 'podcast',
|
||||
itemId: actualItemId,
|
||||
provider: actualProvider,
|
||||
);
|
||||
} else {
|
||||
int? libraryItemId;
|
||||
if (widget.podcast.provider == 'library') {
|
||||
libraryItemId = int.tryParse(widget.podcast.itemId);
|
||||
} else if (widget.podcast.providerMappings != null) {
|
||||
final libraryMapping = widget.podcast.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => widget.podcast.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId == null) return;
|
||||
|
||||
success = await maProvider.removeFromFavorites(
|
||||
mediaType: 'podcast',
|
||||
libraryItemId: libraryItemId,
|
||||
);
|
||||
}
|
||||
|
||||
if (success && mounted) {
|
||||
setState(() => _isFavorite = newState);
|
||||
maProvider.invalidateHomeCache();
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(_isFavorite ? S.of(context)!.addedToFavorites : S.of(context)!.removedFromFavorites),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error toggling podcast favorite: $e');
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _extractColors() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
// Use initialImageUrl first for consistency with hero animation
|
||||
@@ -359,17 +165,14 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
|
||||
if (imageUrl != null) {
|
||||
try {
|
||||
// Use isolate-based extraction to avoid blocking the main thread
|
||||
final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(imageUrl);
|
||||
final colorSchemes = await PaletteHelper.extractColorSchemes(
|
||||
CachedNetworkImageProvider(imageUrl),
|
||||
);
|
||||
if (mounted && colorSchemes != null) {
|
||||
setState(() {
|
||||
_lightColorScheme = colorSchemes.$1;
|
||||
_darkColorScheme = colorSchemes.$2;
|
||||
});
|
||||
|
||||
// Update ThemeProvider so nav bar uses adaptive colors
|
||||
final themeProvider = context.read<ThemeProvider>();
|
||||
themeProvider.updateAdaptiveColors(colorSchemes.$1, colorSchemes.$2, isFromDetailScreen: true);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('🎙️ Error extracting colors: $e');
|
||||
@@ -387,38 +190,10 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
try {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
if (maProvider.api != null) {
|
||||
List<MediaItem> episodes = [];
|
||||
|
||||
// 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.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');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
final episodes = await maProvider.api!.getPodcastEpisodes(
|
||||
widget.podcast.itemId,
|
||||
provider: widget.podcast.provider,
|
||||
);
|
||||
|
||||
if (mounted) {
|
||||
_logger.log('🎙️ Loaded ${episodes.length} episodes for ${widget.podcast.name}');
|
||||
@@ -430,7 +205,6 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
}
|
||||
setState(() {
|
||||
_episodes = episodes;
|
||||
_sortEpisodes();
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -478,15 +252,22 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
void _showPlayOnMenu(BuildContext context, MediaItem episode) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
|
||||
GlobalPlayerOverlay.showPlayerSelectorForAction(
|
||||
contextHint: S.of(context)!.selectPlayerForEpisode,
|
||||
GlobalPlayerOverlay.hidePlayer();
|
||||
|
||||
showPlayerPickerSheet(
|
||||
context: context,
|
||||
title: S.of(context)!.playOn,
|
||||
players: maProvider.availablePlayers,
|
||||
selectedPlayer: maProvider.selectedPlayer,
|
||||
onPlayerSelected: (player) async {
|
||||
maProvider.selectPlayer(player);
|
||||
// Set podcast context before playing so player UI shows correct podcast name
|
||||
maProvider.setCurrentPodcastName(widget.podcast.name);
|
||||
await maProvider.api?.playPodcastEpisode(player.playerId, episode);
|
||||
},
|
||||
);
|
||||
).whenComplete(() {
|
||||
GlobalPlayerOverlay.showPlayer();
|
||||
});
|
||||
}
|
||||
|
||||
String _formatDuration(Duration? duration) {
|
||||
@@ -576,35 +357,6 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Show context menu for an episode
|
||||
void _showEpisodeContextMenu(BuildContext context, Offset position, MediaItem episode, String? episodeImageUrl) {
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: position,
|
||||
mediaType: ContextMenuMediaType.podcastEpisode,
|
||||
item: episode,
|
||||
isFavorite: false,
|
||||
isInLibrary: false,
|
||||
onPlay: () => _playEpisode(episode),
|
||||
onPlayOn: () => _showPlayOnMenu(context, episode),
|
||||
onAddToQueue: () => _addToQueue(episode),
|
||||
onViewDetails: () {
|
||||
final maProvider = this.context.read<MusicAssistantProvider>();
|
||||
final initialImageUrl = episodeImageUrl ?? maProvider.getPodcastImageUrl(widget.podcast);
|
||||
Navigator.push(
|
||||
this.context,
|
||||
FadeSlidePageRoute(
|
||||
child: PodcastEpisodeDetailScreen(
|
||||
episode: episode,
|
||||
podcast: widget.podcast,
|
||||
initialImageUrl: initialImageUrl,
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// CRITICAL FIX: Use select() instead of watch() to prevent rebuilds during Hero animation
|
||||
@@ -678,55 +430,41 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
// Match audiobook pattern: ClipRRect + CachedNetworkImage for smooth hero
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
child: SizedBox(
|
||||
child: Container(
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
child: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
Container(
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: imageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
// Match source memCacheWidth for smooth Hero animation
|
||||
memCacheWidth: 256,
|
||||
memCacheHeight: 256,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => Center(
|
||||
child: Icon(
|
||||
MdiIcons.podcast,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
errorWidget: (_, __, ___) => Center(
|
||||
child: Icon(
|
||||
MdiIcons.podcast,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
)
|
||||
: Center(
|
||||
child: Icon(
|
||||
MdiIcons.podcast,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
// Provider icon overlay
|
||||
if (widget.podcast.providerMappings?.isNotEmpty == true)
|
||||
ProviderIconOverlay(
|
||||
domain: widget.podcast.providerMappings!.first.providerDomain,
|
||||
size: 24,
|
||||
margin: 8,
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: imageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
// Match source memCacheWidth for smooth Hero animation
|
||||
memCacheWidth: 256,
|
||||
memCacheHeight: 256,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => Center(
|
||||
child: Icon(
|
||||
MdiIcons.podcast,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
errorWidget: (_, __, ___) => Center(
|
||||
child: Icon(
|
||||
MdiIcons.podcast,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
)
|
||||
: Center(
|
||||
child: Icon(
|
||||
MdiIcons.podcast,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -768,6 +506,7 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
children: [
|
||||
// Main Play Latest Episode Button
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: SizedBox(
|
||||
height: 50,
|
||||
child: ElevatedButton.icon(
|
||||
@@ -789,6 +528,24 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
// "Play on..." Button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: _isLoadingEpisodes || _episodes.isEmpty
|
||||
? null
|
||||
: () => _showPlayOnMenu(context, _episodes.first),
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.speaker_group_outlined),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
// Library button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
@@ -802,76 +559,10 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
),
|
||||
),
|
||||
child: Icon(
|
||||
Symbols.book_2,
|
||||
size: 25,
|
||||
fill: _isInLibrary ? 1 : 0,
|
||||
_isInLibrary ? Icons.library_add_check : Icons.library_add,
|
||||
color: _isInLibrary
|
||||
? colorScheme.primary
|
||||
: Colors.white70,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
// Favorite button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: _toggleFavorite,
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(Radii.xxl),
|
||||
),
|
||||
),
|
||||
child: Icon(
|
||||
Icons.favorite,
|
||||
size: 25,
|
||||
color: _isFavorite
|
||||
? colorScheme.error
|
||||
: Colors.white70,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
// Three-dot Menu Button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: Builder(
|
||||
builder: (buttonContext) => FilledButton.tonal(
|
||||
onPressed: () {
|
||||
if (_isLoadingEpisodes || _episodes.isEmpty) return;
|
||||
final RenderBox box = buttonContext.findRenderObject() as RenderBox;
|
||||
final Offset position = box.localToGlobal(Offset(box.size.width / 2, box.size.height));
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: position,
|
||||
mediaType: ContextMenuMediaType.podcast,
|
||||
item: widget.podcast,
|
||||
isFavorite: _isFavorite,
|
||||
isInLibrary: _isInLibrary,
|
||||
onToggleFavorite: _toggleFavorite,
|
||||
onToggleLibrary: _toggleLibrary,
|
||||
adaptiveColorScheme: adaptiveScheme,
|
||||
showTopRow: false,
|
||||
sortOrder: _sortOrder,
|
||||
onToggleSort: _toggleSortOrder,
|
||||
);
|
||||
},
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: Icon(
|
||||
Icons.more_vert,
|
||||
size: 25,
|
||||
color: _isLoadingEpisodes || _episodes.isEmpty
|
||||
? Colors.white70.withOpacity(0.38)
|
||||
: Colors.white70,
|
||||
),
|
||||
: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -978,126 +669,190 @@ class _PodcastDetailScreenState extends State<PodcastDetailScreen> {
|
||||
final episode = _episodes[index];
|
||||
final episodeDescription = episode.metadata?['description'] as String?;
|
||||
final duration = episode.duration;
|
||||
final episodeId = episode.uri ?? episode.itemId;
|
||||
final isExpanded = _expandedEpisodeId == episodeId;
|
||||
final episodeImageUrl = context.read<MusicAssistantProvider>().getImageUrl(episode, size: 256);
|
||||
|
||||
// Try to get release date from metadata
|
||||
final releaseDate = _formatReleaseDate(episode.metadata);
|
||||
|
||||
return GestureDetector(
|
||||
onTap: () => _playEpisode(episode),
|
||||
onLongPressStart: (details) => _showEpisodeContextMenu(
|
||||
context,
|
||||
details.globalPosition,
|
||||
episode,
|
||||
episodeImageUrl,
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// Episode cover
|
||||
Hero(
|
||||
tag: HeroTags.podcastEpisodeCover + (episode.uri ?? episode.itemId),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
child: Container(
|
||||
width: 72,
|
||||
height: 72,
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: episodeImageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: episodeImageUrl,
|
||||
fit: BoxFit.cover,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => Icon(
|
||||
return Column(
|
||||
children: [
|
||||
InkWell(
|
||||
onTap: () => _playEpisode(episode),
|
||||
onLongPress: () {
|
||||
setState(() {
|
||||
_expandedEpisodeId = isExpanded ? null : episodeId;
|
||||
});
|
||||
},
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// Episode cover (bigger than before)
|
||||
ClipRRect(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
child: Container(
|
||||
width: 72,
|
||||
height: 72,
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: episodeImageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: episodeImageUrl,
|
||||
fit: BoxFit.cover,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (_, __) => Icon(
|
||||
MdiIcons.podcast,
|
||||
size: 32,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
errorWidget: (_, __, ___) => Icon(
|
||||
MdiIcons.podcast,
|
||||
size: 32,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
: Icon(
|
||||
MdiIcons.podcast,
|
||||
size: 32,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
errorWidget: (_, __, ___) => Icon(
|
||||
MdiIcons.podcast,
|
||||
size: 32,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
)
|
||||
: Icon(
|
||||
MdiIcons.podcast,
|
||||
size: 32,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
// Episode info
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
episode.name,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
if (episodeDescription != null && episodeDescription.isNotEmpty) ...[
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
episodeDescription,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
),
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 6),
|
||||
// Duration and release date row
|
||||
Row(
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
// Episode info
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
if (duration != null && duration > Duration.zero) ...[
|
||||
Icon(
|
||||
Icons.access_time,
|
||||
size: 14,
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
Text(
|
||||
episode.name,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
if (episodeDescription != null && episodeDescription.isNotEmpty) ...[
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
_formatDuration(duration),
|
||||
episodeDescription,
|
||||
maxLines: isExpanded ? 100 : 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
),
|
||||
),
|
||||
],
|
||||
if (duration != null && duration > Duration.zero && releaseDate != null)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8),
|
||||
child: Text(
|
||||
'•',
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
const SizedBox(height: 6),
|
||||
// Duration and release date row
|
||||
Row(
|
||||
children: [
|
||||
if (duration != null && duration > Duration.zero) ...[
|
||||
Icon(
|
||||
Icons.access_time,
|
||||
size: 14,
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
),
|
||||
),
|
||||
if (releaseDate != null)
|
||||
Text(
|
||||
releaseDate,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
_formatDuration(duration),
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
),
|
||||
],
|
||||
if (duration != null && duration > Duration.zero && releaseDate != null)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8),
|
||||
child: Text(
|
||||
'•',
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
),
|
||||
),
|
||||
if (releaseDate != null)
|
||||
Text(
|
||||
releaseDate,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
// Expanded action buttons (matching album track style)
|
||||
AnimatedCrossFade(
|
||||
firstChild: const SizedBox.shrink(),
|
||||
secondChild: Padding(
|
||||
padding: const EdgeInsets.only(left: 100, right: 16, bottom: 12),
|
||||
child: Row(
|
||||
children: [
|
||||
// Play button
|
||||
SizedBox(
|
||||
height: 44,
|
||||
width: 44,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: () => _playEpisode(episode),
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.play_arrow, size: 20),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
// Play on... button
|
||||
SizedBox(
|
||||
height: 44,
|
||||
width: 44,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: () => _showPlayOnMenu(context, episode),
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.speaker_group_outlined, size: 20),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
// Add to queue button
|
||||
SizedBox(
|
||||
height: 44,
|
||||
width: 44,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: () => _addToQueue(episode),
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.playlist_add, size: 20),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
crossFadeState: isExpanded
|
||||
? CrossFadeState.showSecond
|
||||
: CrossFadeState.showFirst,
|
||||
duration: const Duration(milliseconds: 200),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
childCount: _episodes.length,
|
||||
|
||||
@@ -1,504 +0,0 @@
|
||||
import 'package:flutter/material.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 '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../widgets/global_player_overlay.dart';
|
||||
import '../widgets/provider_icon.dart';
|
||||
import '../theme/palette_helper.dart';
|
||||
import '../theme/theme_provider.dart';
|
||||
import '../theme/design_tokens.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../constants/hero_tags.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
|
||||
class PodcastEpisodeDetailScreen extends StatefulWidget {
|
||||
final MediaItem episode;
|
||||
final MediaItem podcast;
|
||||
final String? heroTagSuffix;
|
||||
final String? initialImageUrl;
|
||||
|
||||
const PodcastEpisodeDetailScreen({
|
||||
super.key,
|
||||
required this.episode,
|
||||
required this.podcast,
|
||||
this.heroTagSuffix,
|
||||
this.initialImageUrl,
|
||||
});
|
||||
|
||||
@override
|
||||
State<PodcastEpisodeDetailScreen> createState() => _PodcastEpisodeDetailScreenState();
|
||||
}
|
||||
|
||||
class _PodcastEpisodeDetailScreenState extends State<PodcastEpisodeDetailScreen> {
|
||||
final _logger = DebugLogger();
|
||||
ColorScheme? _lightColorScheme;
|
||||
ColorScheme? _darkColorScheme;
|
||||
|
||||
String get _heroTagSuffix => widget.heroTagSuffix != null ? '_${widget.heroTagSuffix}' : '';
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted) {
|
||||
markDetailScreenEntered(context);
|
||||
_extractColors();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> _extractColors() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
// Try episode image first, fallback to podcast image
|
||||
final imageUrl = widget.initialImageUrl ??
|
||||
maProvider.getImageUrl(widget.episode, size: 512) ??
|
||||
maProvider.getPodcastImageUrl(widget.podcast);
|
||||
|
||||
if (imageUrl != null) {
|
||||
try {
|
||||
final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(imageUrl);
|
||||
if (mounted && colorSchemes != null) {
|
||||
setState(() {
|
||||
_lightColorScheme = colorSchemes.$1;
|
||||
_darkColorScheme = colorSchemes.$2;
|
||||
});
|
||||
|
||||
final themeProvider = context.read<ThemeProvider>();
|
||||
themeProvider.updateAdaptiveColors(colorSchemes.$1, colorSchemes.$2, isFromDetailScreen: true);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error extracting colors for episode: $e');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void _playEpisode() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final selectedPlayer = maProvider.selectedPlayer;
|
||||
|
||||
if (selectedPlayer != null) {
|
||||
try {
|
||||
maProvider.setCurrentPodcastName(widget.podcast.name);
|
||||
await maProvider.api?.playPodcastEpisode(selectedPlayer.playerId, widget.episode);
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text('Playing: ${widget.episode.name}'),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error playing episode: $e');
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Failed to play episode: $e')),
|
||||
);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
_showPlayOnMenu();
|
||||
}
|
||||
}
|
||||
|
||||
void _showPlayOnMenu() {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
|
||||
GlobalPlayerOverlay.showPlayerSelectorForAction(
|
||||
contextHint: S.of(context)!.selectPlayerForEpisode,
|
||||
onPlayerSelected: (player) async {
|
||||
maProvider.selectPlayer(player);
|
||||
maProvider.setCurrentPodcastName(widget.podcast.name);
|
||||
await maProvider.api?.playPodcastEpisode(player.playerId, widget.episode);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _addToQueue() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final selectedPlayer = maProvider.selectedPlayer;
|
||||
|
||||
if (selectedPlayer == null) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text(S.of(context)!.noPlayerSelected)),
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
final track = Track(
|
||||
itemId: widget.episode.itemId,
|
||||
provider: widget.episode.provider,
|
||||
name: widget.episode.name,
|
||||
uri: widget.episode.uri,
|
||||
duration: widget.episode.duration,
|
||||
metadata: widget.episode.metadata,
|
||||
);
|
||||
await maProvider.addTrackToQueue(selectedPlayer.playerId, track);
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.addedToQueue),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error adding episode to queue: $e');
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text(S.of(context)!.failedToAddToQueue(e.toString()))),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
String _formatDuration(Duration? duration) {
|
||||
if (duration == null || duration == Duration.zero) return '';
|
||||
final hours = duration.inHours;
|
||||
final minutes = duration.inMinutes.remainder(60);
|
||||
|
||||
if (hours > 0) {
|
||||
return '${hours}h ${minutes}m';
|
||||
}
|
||||
return '$minutes min';
|
||||
}
|
||||
|
||||
String? _formatPublishDate(Map<String, dynamic>? metadata) {
|
||||
if (metadata == null) return null;
|
||||
|
||||
dynamic dateValue = metadata['published'] ??
|
||||
metadata['pub_date'] ??
|
||||
metadata['release_date'] ??
|
||||
metadata['aired'] ??
|
||||
metadata['timestamp'];
|
||||
|
||||
if (dateValue == null) return null;
|
||||
|
||||
try {
|
||||
DateTime? date;
|
||||
if (dateValue is String) {
|
||||
date = DateTime.tryParse(dateValue);
|
||||
} else if (dateValue is int) {
|
||||
date = DateTime.fromMillisecondsSinceEpoch(dateValue * 1000);
|
||||
}
|
||||
|
||||
if (date != null) {
|
||||
final months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
|
||||
return '${months[date.month - 1]} ${date.day}, ${date.year}';
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('Error parsing release date: $e');
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
String _stripHtml(String htmlText) {
|
||||
final withoutTags = htmlText.replaceAll(RegExp(r'<[^>]*>'), '');
|
||||
final decoded = withoutTags
|
||||
.replaceAll(' ', ' ')
|
||||
.replaceAll('&', '&')
|
||||
.replaceAll('<', '<')
|
||||
.replaceAll('>', '>')
|
||||
.replaceAll('"', '"')
|
||||
.replaceAll(''', "'");
|
||||
return decoded.replaceAll(RegExp(r'\s+'), ' ').trim();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final episodeImageUrl = maProvider.getImageUrl(widget.episode, size: 512);
|
||||
final podcastImageUrl = maProvider.getPodcastImageUrl(widget.podcast);
|
||||
final imageUrl = widget.initialImageUrl ?? episodeImageUrl ?? podcastImageUrl;
|
||||
|
||||
final adaptiveTheme = context.select<ThemeProvider, bool>(
|
||||
(provider) => provider.adaptiveTheme,
|
||||
);
|
||||
final adaptiveLightScheme = context.select<ThemeProvider, ColorScheme?>(
|
||||
(provider) => provider.adaptiveLightScheme,
|
||||
);
|
||||
final adaptiveDarkScheme = context.select<ThemeProvider, ColorScheme?>(
|
||||
(provider) => provider.adaptiveDarkScheme,
|
||||
);
|
||||
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
|
||||
ColorScheme? adaptiveScheme;
|
||||
if (adaptiveTheme) {
|
||||
adaptiveScheme = isDark
|
||||
? (_darkColorScheme ?? adaptiveDarkScheme)
|
||||
: (_lightColorScheme ?? adaptiveLightScheme);
|
||||
}
|
||||
final colorScheme = adaptiveScheme ?? Theme.of(context).colorScheme;
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
|
||||
final description = widget.episode.metadata?['description'] as String?;
|
||||
final duration = widget.episode.duration;
|
||||
final publishDate = _formatPublishDate(widget.episode.metadata);
|
||||
|
||||
return PopScope(
|
||||
canPop: true,
|
||||
onPopInvokedWithResult: (didPop, result) {
|
||||
if (didPop) {
|
||||
clearAdaptiveColorsOnBack(context);
|
||||
}
|
||||
},
|
||||
child: Scaffold(
|
||||
backgroundColor: colorScheme.surface,
|
||||
body: LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
final coverSize = (constraints.maxWidth * 0.6).clamp(180.0, 280.0);
|
||||
final expandedHeight = coverSize + 70;
|
||||
|
||||
return CustomScrollView(
|
||||
slivers: [
|
||||
SliverAppBar(
|
||||
expandedHeight: expandedHeight,
|
||||
pinned: true,
|
||||
backgroundColor: colorScheme.surface,
|
||||
leading: IconButton(
|
||||
icon: const Icon(Icons.arrow_back_rounded),
|
||||
onPressed: () {
|
||||
clearAdaptiveColorsOnBack(context);
|
||||
Navigator.pop(context);
|
||||
},
|
||||
color: colorScheme.onSurface,
|
||||
),
|
||||
flexibleSpace: FlexibleSpaceBar(
|
||||
background: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
const SizedBox(height: 60),
|
||||
Hero(
|
||||
tag: HeroTags.podcastEpisodeCover +
|
||||
(widget.episode.uri ?? widget.episode.itemId) + _heroTagSuffix,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
child: SizedBox(
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
child: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
Container(
|
||||
color: colorScheme.surfaceContainerHighest,
|
||||
child: imageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
memCacheWidth: 256,
|
||||
memCacheHeight: 256,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
errorWidget: (_, __, ___) => Center(
|
||||
child: Icon(
|
||||
MdiIcons.podcast,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
)
|
||||
: Center(
|
||||
child: Icon(
|
||||
MdiIcons.podcast,
|
||||
size: coverSize * 0.43,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
if (widget.episode.providerMappings?.isNotEmpty == true)
|
||||
ProviderIconOverlay(
|
||||
domain: widget.episode.providerMappings!.first.providerDomain,
|
||||
size: 24,
|
||||
margin: 8,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// Header content with title, podcast name, metadata, and actions
|
||||
SliverToBoxAdapter(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// Episode title
|
||||
Text(
|
||||
widget.episode.name,
|
||||
style: textTheme.headlineMedium?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
Spacing.vGap8,
|
||||
|
||||
// Podcast name (tappable to go back)
|
||||
InkWell(
|
||||
onTap: () => Navigator.pop(context),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 4.0),
|
||||
child: Text(
|
||||
widget.podcast.name,
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.primary,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
Spacing.vGap16,
|
||||
|
||||
// Duration and publish date
|
||||
Row(
|
||||
children: [
|
||||
if (duration != null && duration > Duration.zero) ...[
|
||||
Icon(
|
||||
Icons.access_time,
|
||||
size: 16,
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
_formatDuration(duration),
|
||||
style: textTheme.bodyMedium?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
),
|
||||
),
|
||||
],
|
||||
if (duration != null && duration > Duration.zero && publishDate != null)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8),
|
||||
child: Text(
|
||||
'•',
|
||||
style: textTheme.bodyMedium?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.5),
|
||||
),
|
||||
),
|
||||
),
|
||||
if (publishDate != null)
|
||||
Text(
|
||||
publishDate,
|
||||
style: textTheme.bodyMedium?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
const SizedBox(height: 24),
|
||||
|
||||
// Action buttons row
|
||||
Row(
|
||||
children: [
|
||||
// Main Play Button
|
||||
Expanded(
|
||||
child: SizedBox(
|
||||
height: 50,
|
||||
child: ElevatedButton.icon(
|
||||
onPressed: _playEpisode,
|
||||
icon: const Icon(Icons.play_arrow_rounded),
|
||||
label: Text(S.of(context)!.play),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: colorScheme.primary,
|
||||
foregroundColor: colorScheme.onPrimary,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
|
||||
// Play On... Button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: _showPlayOnMenu,
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.speaker_group_outlined, size: 25),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
|
||||
// Add to Queue Button
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: FilledButton.tonal(
|
||||
onPressed: _addToQueue,
|
||||
style: FilledButton.styleFrom(
|
||||
padding: EdgeInsets.zero,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.playlist_add, size: 25),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// Full scrollable description (key feature)
|
||||
if (description != null && description.isNotEmpty)
|
||||
SliverToBoxAdapter(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(24.0, 0, 24.0, 24.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
S.of(context)!.about,
|
||||
style: textTheme.titleLarge?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
Spacing.vGap12,
|
||||
// Full description - no maxLines, fully scrollable with selectable text
|
||||
SelectableText(
|
||||
_stripHtml(description),
|
||||
style: textTheme.bodyLarge?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.8),
|
||||
height: 1.5,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
// Bottom spacing for mini player
|
||||
SliverToBoxAdapter(
|
||||
child: SizedBox(height: BottomSpacing.withMiniPlayer),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -85,9 +85,9 @@ class _QueueScreenState extends State<QueueScreen> {
|
||||
|
||||
if (targetPlayers.isEmpty) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.noOtherPlayersAvailable),
|
||||
duration: const Duration(seconds: 2),
|
||||
const SnackBar(
|
||||
content: Text('No other players available to transfer to'),
|
||||
duration: Duration(seconds: 2),
|
||||
),
|
||||
);
|
||||
return;
|
||||
@@ -96,7 +96,7 @@ class _QueueScreenState extends State<QueueScreen> {
|
||||
// Show player picker sheet
|
||||
await showPlayerPickerSheet(
|
||||
context: context,
|
||||
title: S.of(context)!.transferQueueTo,
|
||||
title: 'Transfer Queue To',
|
||||
players: targetPlayers,
|
||||
onPlayerSelected: (targetPlayer) async {
|
||||
try {
|
||||
@@ -109,7 +109,7 @@ class _QueueScreenState extends State<QueueScreen> {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.queueTransferredTo(targetPlayer.name)),
|
||||
content: Text('Queue transferred to ${targetPlayer.name}'),
|
||||
duration: const Duration(seconds: 2),
|
||||
),
|
||||
);
|
||||
@@ -119,7 +119,7 @@ class _QueueScreenState extends State<QueueScreen> {
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.failedToTransferQueue(e.toString())),
|
||||
content: Text('Failed to transfer queue: $e'),
|
||||
backgroundColor: Colors.red.shade700,
|
||||
duration: const Duration(seconds: 3),
|
||||
),
|
||||
@@ -132,8 +132,8 @@ class _QueueScreenState extends State<QueueScreen> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// Use select to only rebuild when selectedPlayer changes
|
||||
final player = context.select<MusicAssistantProvider, dynamic>((p) => p.selectedPlayer);
|
||||
final maProvider = context.watch<MusicAssistantProvider>();
|
||||
final player = maProvider.selectedPlayer;
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: const Color(0xFF1a1a1a),
|
||||
@@ -152,8 +152,8 @@ class _QueueScreenState extends State<QueueScreen> {
|
||||
actions: [
|
||||
IconButton(
|
||||
icon: const Icon(Icons.swap_horiz_rounded),
|
||||
tooltip: S.of(context)!.transferQueue,
|
||||
onPressed: () => _handleTransferQueue(context.read<MusicAssistantProvider>()),
|
||||
tooltip: 'Transfer queue',
|
||||
onPressed: () => _handleTransferQueue(maProvider),
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(Icons.refresh),
|
||||
@@ -161,12 +161,11 @@ class _QueueScreenState extends State<QueueScreen> {
|
||||
),
|
||||
],
|
||||
),
|
||||
body: _buildBody(context),
|
||||
body: _buildBody(maProvider),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildBody(BuildContext context) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
Widget _buildBody(MusicAssistantProvider maProvider) {
|
||||
if (_isLoading) {
|
||||
return const Center(child: CircularProgressIndicator());
|
||||
}
|
||||
|
||||
+1263
-604
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,6 @@ import '../services/music_assistant_api.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../theme/theme_provider.dart';
|
||||
import '../theme/app_theme.dart';
|
||||
import '../utils/page_transitions.dart';
|
||||
import '../widgets/global_player_overlay.dart';
|
||||
import 'debug_log_screen.dart';
|
||||
import 'login_screen.dart';
|
||||
@@ -39,13 +38,19 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
bool _showDiscoverSeries = false;
|
||||
// Home row order
|
||||
List<String> _homeRowOrder = List.from(SettingsService.defaultHomeRowOrder);
|
||||
// Audiobook libraries
|
||||
List<Map<String, String>> _discoveredLibraries = [];
|
||||
Map<String, bool> _libraryEnabled = {};
|
||||
// Player settings
|
||||
bool _preferLocalPlayer = false;
|
||||
bool _smartSortPlayers = false;
|
||||
bool _volumePrecisionMode = true;
|
||||
// Hint settings
|
||||
bool _showHints = true;
|
||||
// Display settings
|
||||
bool _showProviderIcons = true;
|
||||
// Library settings
|
||||
bool _showOnlyArtistsWithAlbums = false;
|
||||
// Music provider filter settings
|
||||
List<String> _disabledProviders = [];
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
@@ -83,15 +88,29 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
// Load home row order
|
||||
final rowOrder = await SettingsService.getHomeRowOrder();
|
||||
|
||||
// Load audiobook library settings
|
||||
final discovered = await SettingsService.getDiscoveredAbsLibraries() ?? [];
|
||||
final enabled = await SettingsService.getEnabledAbsLibraries();
|
||||
final libraryEnabled = <String, bool>{};
|
||||
for (final lib in discovered) {
|
||||
final path = lib['path'] ?? '';
|
||||
// null means all enabled
|
||||
libraryEnabled[path] = enabled == null || enabled.contains(path);
|
||||
}
|
||||
|
||||
// Load player settings
|
||||
final preferLocal = await SettingsService.getPreferLocalPlayer();
|
||||
final smartSort = await SettingsService.getSmartSortPlayers();
|
||||
final volumePrecision = await SettingsService.getVolumePrecisionMode();
|
||||
|
||||
// Load hint settings
|
||||
final showHints = await SettingsService.getShowHints();
|
||||
|
||||
// Load display settings
|
||||
final showProviderIcons = await SettingsService.getShowProviderIcons();
|
||||
// Load library settings
|
||||
final showOnlyArtistsWithAlbums = await SettingsService.getShowOnlyArtistsWithAlbums();
|
||||
|
||||
// Load music provider filter settings
|
||||
final disabledProviders = await SettingsService.getDisabledMusicProviders();
|
||||
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
@@ -108,10 +127,14 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
_showDiscoverAudiobooks = showDiscAudiobooks;
|
||||
_showDiscoverSeries = showDiscSeries;
|
||||
_homeRowOrder = rowOrder;
|
||||
_discoveredLibraries = discovered;
|
||||
_libraryEnabled = libraryEnabled;
|
||||
_preferLocalPlayer = preferLocal;
|
||||
_smartSortPlayers = smartSort;
|
||||
_volumePrecisionMode = volumePrecision;
|
||||
_showHints = showHints;
|
||||
_showProviderIcons = showProviderIcons;
|
||||
_showOnlyArtistsWithAlbums = showOnlyArtistsWithAlbums;
|
||||
_disabledProviders = disabledProviders;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -262,8 +285,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// Use select to only rebuild when connectionState changes
|
||||
final connectionState = context.select<MusicAssistantProvider, MAConnectionState>((p) => p.connectionState);
|
||||
final provider = context.watch<MusicAssistantProvider>();
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
|
||||
@@ -291,7 +313,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
onPressed: () {
|
||||
Navigator.push(
|
||||
context,
|
||||
FadeSlidePageRoute(child: const DebugLogScreen()),
|
||||
MaterialPageRoute(
|
||||
builder: (context) => const DebugLogScreen(),
|
||||
),
|
||||
);
|
||||
},
|
||||
color: colorScheme.onBackground,
|
||||
@@ -339,15 +363,15 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(
|
||||
_getStatusIcon(connectionState),
|
||||
color: _getStatusColor(connectionState, colorScheme),
|
||||
_getStatusIcon(provider.connectionState),
|
||||
color: _getStatusColor(provider.connectionState, colorScheme),
|
||||
size: 20,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Text(
|
||||
_getStatusText(connectionState),
|
||||
_getStatusText(provider.connectionState),
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: _getStatusColor(connectionState, colorScheme),
|
||||
color: _getStatusColor(provider.connectionState, colorScheme),
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
@@ -631,7 +655,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
children: [
|
||||
RadioListTile<String?>(
|
||||
title: Text(S.of(context)!.system),
|
||||
subtitle: Text(S.of(context)!.auto),
|
||||
subtitle: const Text('Auto'),
|
||||
value: null,
|
||||
groupValue: localeProvider.locale?.languageCode,
|
||||
onChanged: (value) {
|
||||
@@ -640,7 +664,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
},
|
||||
),
|
||||
RadioListTile<String?>(
|
||||
title: Text(S.of(context)!.english),
|
||||
title: const Text('English'),
|
||||
value: 'en',
|
||||
groupValue: localeProvider.locale?.languageCode,
|
||||
onChanged: (value) {
|
||||
@@ -649,7 +673,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
},
|
||||
),
|
||||
RadioListTile<String?>(
|
||||
title: Text(S.of(context)!.german),
|
||||
title: const Text('Deutsch'),
|
||||
value: 'de',
|
||||
groupValue: localeProvider.locale?.languageCode,
|
||||
onChanged: (value) {
|
||||
@@ -658,7 +682,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
},
|
||||
),
|
||||
RadioListTile<String?>(
|
||||
title: Text(S.of(context)!.spanish),
|
||||
title: const Text('Español'),
|
||||
value: 'es',
|
||||
groupValue: localeProvider.locale?.languageCode,
|
||||
onChanged: (value) {
|
||||
@@ -667,7 +691,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
},
|
||||
),
|
||||
RadioListTile<String?>(
|
||||
title: Text(S.of(context)!.french),
|
||||
title: const Text('Français'),
|
||||
value: 'fr',
|
||||
groupValue: localeProvider.locale?.languageCode,
|
||||
onChanged: (value) {
|
||||
@@ -687,6 +711,66 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
|
||||
const SizedBox(height: 32),
|
||||
|
||||
// Music Providers section
|
||||
if (provider.musicProviders.isNotEmpty) ...[
|
||||
Text(
|
||||
'Music Providers',
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'Filter content shown in Home, Library, and Search',
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onBackground.withOpacity(0.6),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
decoration: BoxDecoration(
|
||||
color: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Column(
|
||||
children: provider.musicProviders.map((musicProvider) {
|
||||
final isEnabled = !_disabledProviders.contains(musicProvider.instanceId);
|
||||
return SwitchListTile(
|
||||
title: Text(
|
||||
musicProvider.name,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
),
|
||||
subtitle: musicProvider.isStreamingProvider
|
||||
? Text(
|
||||
'Streaming',
|
||||
style: TextStyle(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
fontSize: 12,
|
||||
),
|
||||
)
|
||||
: null,
|
||||
value: isEnabled,
|
||||
onChanged: (value) async {
|
||||
await provider.toggleProviderEnabled(musicProvider.instanceId, value);
|
||||
setState(() {
|
||||
if (value) {
|
||||
_disabledProviders.remove(musicProvider.instanceId);
|
||||
} else {
|
||||
_disabledProviders.add(musicProvider.instanceId);
|
||||
}
|
||||
});
|
||||
},
|
||||
activeColor: colorScheme.primary,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
);
|
||||
}).toList(),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
],
|
||||
|
||||
// Player section
|
||||
Text(
|
||||
S.of(context)!.players,
|
||||
@@ -697,6 +781,33 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
decoration: BoxDecoration(
|
||||
color: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: SwitchListTile(
|
||||
title: Text(
|
||||
S.of(context)!.preferLocalPlayer,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
),
|
||||
subtitle: Text(
|
||||
S.of(context)!.preferLocalPlayerDescription,
|
||||
style: TextStyle(color: colorScheme.onSurface.withOpacity(0.6), fontSize: 12),
|
||||
),
|
||||
value: _preferLocalPlayer,
|
||||
onChanged: (value) {
|
||||
setState(() => _preferLocalPlayer = value);
|
||||
SettingsService.setPreferLocalPlayer(value);
|
||||
},
|
||||
activeColor: colorScheme.primary,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(height: 16),
|
||||
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
decoration: BoxDecoration(
|
||||
@@ -721,7 +832,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
contentPadding: EdgeInsets.zero,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
const SizedBox(height: 8),
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
decoration: BoxDecoration(
|
||||
@@ -730,11 +841,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
),
|
||||
child: SwitchListTile(
|
||||
title: Text(
|
||||
S.of(context)!.volumePrecisionMode,
|
||||
'Volume precision mode',
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
),
|
||||
subtitle: Text(
|
||||
S.of(context)!.volumePrecisionModeDescription,
|
||||
'Hold still while adjusting volume for fine control',
|
||||
style: TextStyle(color: colorScheme.onSurface.withOpacity(0.6), fontSize: 12),
|
||||
),
|
||||
value: _volumePrecisionMode,
|
||||
@@ -787,18 +898,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(height: 24),
|
||||
const SizedBox(height: 32),
|
||||
|
||||
// Display section
|
||||
// Library section
|
||||
Text(
|
||||
S.of(context)!.display,
|
||||
S.of(context)!.library,
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
decoration: BoxDecoration(
|
||||
@@ -807,19 +917,24 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
),
|
||||
child: SwitchListTile(
|
||||
title: Text(
|
||||
S.of(context)!.showProviderIcons,
|
||||
'Show only artists with albums',
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
),
|
||||
subtitle: Text(
|
||||
S.of(context)!.showProviderIconsDescription,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
'Hide artists that have no albums in your library',
|
||||
style: TextStyle(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
value: _showProviderIcons,
|
||||
onChanged: (value) {
|
||||
setState(() => _showProviderIcons = value);
|
||||
SettingsService.setShowProviderIcons(value);
|
||||
value: _showOnlyArtistsWithAlbums,
|
||||
onChanged: (value) async {
|
||||
setState(() => _showOnlyArtistsWithAlbums = value);
|
||||
await SettingsService.setShowOnlyArtistsWithAlbums(value);
|
||||
// Force sync library to apply the new filter at API level
|
||||
if (mounted) {
|
||||
context.read<MusicAssistantProvider>().forceLibrarySync();
|
||||
}
|
||||
},
|
||||
activeColor: colorScheme.primary,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
@@ -1004,6 +1119,76 @@ class _SettingsScreenState extends State<SettingsScreen> {
|
||||
|
||||
const SizedBox(height: 32),
|
||||
|
||||
// Audiobook Libraries section
|
||||
if (_discoveredLibraries.isNotEmpty) ...[
|
||||
Text(
|
||||
S.of(context)!.audiobookLibraries,
|
||||
style: textTheme.titleMedium?.copyWith(
|
||||
color: colorScheme.onBackground,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
S.of(context)!.chooseAudiobookLibraries,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onBackground.withOpacity(0.6),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
Container(
|
||||
decoration: BoxDecoration(
|
||||
color: colorScheme.surfaceVariant.withOpacity(0.3),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Column(
|
||||
children: _discoveredLibraries.asMap().entries.map((entry) {
|
||||
final index = entry.key;
|
||||
final library = entry.value;
|
||||
final path = library['path'] ?? '';
|
||||
final name = library['name'] ?? S.of(context)!.unknownLibrary;
|
||||
final isEnabled = _libraryEnabled[path] ?? true;
|
||||
|
||||
return Column(
|
||||
children: [
|
||||
SwitchListTile(
|
||||
title: Text(
|
||||
name,
|
||||
style: TextStyle(color: colorScheme.onSurface),
|
||||
),
|
||||
value: isEnabled,
|
||||
onChanged: (value) async {
|
||||
setState(() {
|
||||
_libraryEnabled[path] = value;
|
||||
});
|
||||
await SettingsService.toggleAbsLibrary(path, value);
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.pullToRefresh),
|
||||
duration: const Duration(seconds: 2),
|
||||
),
|
||||
);
|
||||
}
|
||||
},
|
||||
activeColor: colorScheme.primary,
|
||||
),
|
||||
if (index < _discoveredLibraries.length - 1)
|
||||
Divider(
|
||||
height: 1,
|
||||
indent: 16,
|
||||
endIndent: 16,
|
||||
color: colorScheme.onSurface.withOpacity(0.1),
|
||||
),
|
||||
],
|
||||
);
|
||||
}).toList(),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
],
|
||||
|
||||
SizedBox(
|
||||
width: double.infinity,
|
||||
height: 50,
|
||||
|
||||
@@ -157,17 +157,6 @@ class MassivAudioHandler extends BaseAudioHandler with SeekHandler {
|
||||
// Note: We don't actually stop playback - this button is repurposed for player switching
|
||||
}
|
||||
|
||||
/// Fully stop the foreground service and release resources
|
||||
/// Called after idle timeout to save battery
|
||||
Future<void> stopService() async {
|
||||
_logger.log('MassivAudioHandler: Stopping foreground service (idle timeout)');
|
||||
_isRemoteMode = false;
|
||||
_currentMediaItem = null;
|
||||
await _player.stop();
|
||||
// Call the base stop() to properly stop the foreground service
|
||||
await super.stop();
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> seek(Duration position) => _player.seek(position);
|
||||
|
||||
|
||||
+410
-128
@@ -1,186 +1,468 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'auth_strategy.dart';
|
||||
import 'no_auth_strategy.dart';
|
||||
import 'basic_auth_strategy.dart';
|
||||
import 'authelia_strategy.dart';
|
||||
import 'ma_auth_strategy.dart';
|
||||
import '../debug_logger.dart';
|
||||
|
||||
/// Simple authentication manager for Music Assistant
|
||||
/// MA now uses its own built-in authentication system
|
||||
/// Central authentication manager
|
||||
/// Manages auth strategy selection, auto-detection, and credential lifecycle
|
||||
class AuthManager {
|
||||
final _logger = DebugLogger();
|
||||
|
||||
String? _accessToken;
|
||||
String? _longLivedToken;
|
||||
// Available auth strategies
|
||||
final List<AuthStrategy> _strategies = [
|
||||
NoAuthStrategy(),
|
||||
BasicAuthStrategy(),
|
||||
AutheliaStrategy(),
|
||||
MusicAssistantAuthStrategy(),
|
||||
];
|
||||
|
||||
/// Get the best available token (prefer long-lived)
|
||||
String? get token => _longLivedToken ?? _accessToken;
|
||||
AuthStrategy? _currentStrategy;
|
||||
AuthCredentials? _currentCredentials;
|
||||
|
||||
/// Check if we have valid credentials
|
||||
bool get hasCredentials => token != null;
|
||||
/// Get current auth strategy (null if none selected)
|
||||
AuthStrategy? get currentStrategy => _currentStrategy;
|
||||
|
||||
/// Login to Music Assistant and get an access token
|
||||
Future<String?> login(String serverUrl, String username, String password) async {
|
||||
try {
|
||||
final apiUrl = _buildApiUrl(serverUrl);
|
||||
_logger.log('🔐 Logging in to Music Assistant at $apiUrl');
|
||||
/// Get current credentials (null if none stored)
|
||||
AuthCredentials? get currentCredentials => _currentCredentials;
|
||||
|
||||
final response = await http.post(
|
||||
apiUrl,
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: jsonEncode({
|
||||
'command': 'auth/login',
|
||||
'args': {
|
||||
'username': username,
|
||||
'password': password,
|
||||
},
|
||||
}),
|
||||
).timeout(const Duration(seconds: 10));
|
||||
/// Auto-detect authentication requirements for a server
|
||||
/// Returns null if server is unreachable or auth method unknown
|
||||
/// Also returns the final URL used (in case of HTTP fallback) via the callback
|
||||
String? _lastSuccessfulUrl;
|
||||
String? get lastSuccessfulUrl => _lastSuccessfulUrl;
|
||||
|
||||
_logger.log('Auth response status: ${response.statusCode}');
|
||||
Future<AuthStrategy?> detectAuthStrategy(String serverUrl) async {
|
||||
_logger.log('🔍 Auto-detecting auth strategy for $serverUrl');
|
||||
_lastSuccessfulUrl = null;
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final data = jsonDecode(response.body) as Map<String, dynamic>;
|
||||
// Normalize URL
|
||||
var baseUrl = _normalizeUrl(serverUrl);
|
||||
_logger.log('Normalized URL: $baseUrl');
|
||||
|
||||
if (data.containsKey('error_code')) {
|
||||
_logger.log('✗ Login failed: ${data['error_code']} - ${data['details']}');
|
||||
return null;
|
||||
}
|
||||
// Try detection with the initial URL
|
||||
var result = await _tryDetectAuth(baseUrl);
|
||||
|
||||
final result = data['result'] as Map<String, dynamic>?;
|
||||
_accessToken = result?['access_token'] as String?;
|
||||
|
||||
if (_accessToken != null) {
|
||||
_logger.log('✓ Got access token from MA');
|
||||
|
||||
// Try to create a long-lived token
|
||||
_longLivedToken = await _createLongLivedToken(apiUrl, _accessToken!);
|
||||
|
||||
return _longLivedToken ?? _accessToken;
|
||||
}
|
||||
|
||||
_logger.log('✗ No access token in response');
|
||||
return null;
|
||||
// If HTTPS failed and we haven't tried HTTP yet, try HTTP fallback
|
||||
if (result == null && baseUrl.startsWith('https://')) {
|
||||
final httpUrl = baseUrl.replaceFirst('https://', 'http://');
|
||||
_logger.log('🔄 HTTPS failed, trying HTTP fallback: $httpUrl');
|
||||
result = await _tryDetectAuth(httpUrl);
|
||||
if (result != null) {
|
||||
baseUrl = httpUrl;
|
||||
}
|
||||
|
||||
_logger.log('✗ Authentication failed: ${response.statusCode}');
|
||||
return null;
|
||||
} catch (e) {
|
||||
_logger.log('✗ Login error: $e');
|
||||
return null;
|
||||
}
|
||||
|
||||
if (result != null) {
|
||||
_lastSuccessfulUrl = baseUrl;
|
||||
_logger.log('✅ Auth detection successful with URL: $baseUrl');
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// Create a long-lived token for persistent authentication
|
||||
Future<String?> _createLongLivedToken(Uri apiUrl, String accessToken) async {
|
||||
try {
|
||||
_logger.log('Creating long-lived token...');
|
||||
/// Normalize a server URL with appropriate protocol
|
||||
String _normalizeUrl(String url) {
|
||||
var baseUrl = url;
|
||||
if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
|
||||
// Use http for local IPs, https for domains
|
||||
if (baseUrl.startsWith('192.') ||
|
||||
baseUrl.startsWith('10.') ||
|
||||
baseUrl.startsWith('172.') ||
|
||||
baseUrl == 'localhost' ||
|
||||
baseUrl.startsWith('127.')) {
|
||||
baseUrl = 'http://$baseUrl';
|
||||
} else if (baseUrl.endsWith('.ts.net') || baseUrl.contains('.ts.net:')) {
|
||||
// Tailscale URLs - default to http:// since VPN tunnel is already encrypted
|
||||
baseUrl = 'http://$baseUrl';
|
||||
_logger.log('🔗 Detected Tailscale URL, using HTTP');
|
||||
} else {
|
||||
baseUrl = 'https://$baseUrl';
|
||||
}
|
||||
}
|
||||
return baseUrl;
|
||||
}
|
||||
|
||||
final response = await http.post(
|
||||
apiUrl,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': 'Bearer $accessToken',
|
||||
},
|
||||
body: jsonEncode({
|
||||
'command': 'auth/create_token',
|
||||
'args': {
|
||||
'name': 'Ensemble Mobile App',
|
||||
},
|
||||
}),
|
||||
/// Check if a hostname is a local/private IP address
|
||||
bool _isLocalIpAddress(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');
|
||||
}
|
||||
|
||||
/// Try to detect auth strategy for a given URL
|
||||
/// Returns the strategy if successful, null if connection failed
|
||||
Future<AuthStrategy?> _tryDetectAuth(String baseUrl) async {
|
||||
// First, check if this is a Music Assistant server with native auth
|
||||
_logger.log('Checking for Music Assistant native auth at $baseUrl...');
|
||||
final maAuthResult = await _checkMusicAssistantAuth(baseUrl);
|
||||
if (maAuthResult != null) {
|
||||
if (maAuthResult == 'required') {
|
||||
_logger.log('✓ Detected Music Assistant native authentication');
|
||||
return _strategies.firstWhere((s) => s.name == 'music_assistant');
|
||||
} else if (maAuthResult == 'none') {
|
||||
_logger.log('✓ Music Assistant server - no auth required');
|
||||
return _strategies.firstWhere((s) => s.name == 'none');
|
||||
}
|
||||
}
|
||||
|
||||
// Try no-auth (direct connection without any auth)
|
||||
_logger.log('Testing no-auth strategy...');
|
||||
final canConnect = await _canConnectWithoutAuth(baseUrl);
|
||||
_logger.log('No-auth result: $canConnect');
|
||||
|
||||
if (canConnect) {
|
||||
_logger.log('✓ Server does not require authentication');
|
||||
return _strategies.firstWhere((s) => s.name == 'none');
|
||||
}
|
||||
|
||||
// Probe server for auth requirements (reverse proxy scenarios)
|
||||
try {
|
||||
_logger.log('Probing server for auth headers...');
|
||||
// Test root endpoint
|
||||
final probeUrl = baseUrl;
|
||||
_logger.log('Probe URL: $probeUrl');
|
||||
|
||||
final response = await http.get(
|
||||
Uri.parse(probeUrl),
|
||||
).timeout(const Duration(seconds: 10));
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final data = jsonDecode(response.body) as Map<String, dynamic>;
|
||||
_logger.log('Probe status: ${response.statusCode}');
|
||||
|
||||
if (!data.containsKey('error_code')) {
|
||||
final result = data['result'] as Map<String, dynamic>?;
|
||||
final token = result?['token'] as String?;
|
||||
// Check for redirect (common with reverse proxy auth)
|
||||
if (response.statusCode == 302 || response.statusCode == 307) {
|
||||
final location = response.headers['location'];
|
||||
_logger.log('Redirect to: $location');
|
||||
|
||||
if (token != null) {
|
||||
_logger.log('✓ Created long-lived token');
|
||||
return token;
|
||||
// If redirects to Authelia login, it's Authelia
|
||||
if (location != null && location.contains('authelia')) {
|
||||
_logger.log('✓ Detected Authelia (redirect)');
|
||||
return _strategies.firstWhere((s) => s.name == 'authelia');
|
||||
}
|
||||
}
|
||||
|
||||
// Server returned 401 Unauthorized - check WWW-Authenticate header
|
||||
if (response.statusCode == 401) {
|
||||
final wwwAuth = response.headers['www-authenticate']?.toLowerCase();
|
||||
_logger.log('401 with WWW-Authenticate: $wwwAuth');
|
||||
|
||||
// Check for Basic Auth
|
||||
if (wwwAuth != null && wwwAuth.contains('basic')) {
|
||||
_logger.log('✓ Detected Basic Authentication');
|
||||
return _strategies.firstWhere((s) => s.name == 'basic');
|
||||
}
|
||||
|
||||
// Check for Bearer token - could be MA native auth
|
||||
if (wwwAuth != null && wwwAuth.contains('bearer')) {
|
||||
_logger.log('✓ Detected Bearer auth - likely Music Assistant native');
|
||||
return _strategies.firstWhere((s) => s.name == 'music_assistant');
|
||||
}
|
||||
}
|
||||
|
||||
// If we got here and there's any auth challenge, assume Authelia
|
||||
// (since we're behind a reverse proxy that requires auth)
|
||||
if (response.statusCode >= 300) {
|
||||
_logger.log('Server requires authentication (status ${response.statusCode})');
|
||||
_logger.log('Assuming Authelia (default for authenticated reverse proxy)');
|
||||
return _strategies.firstWhere((s) => s.name == 'authelia');
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('✗ Auth detection error: $e');
|
||||
return null; // Return null to trigger fallback
|
||||
}
|
||||
|
||||
_logger.log('⚠️ Could not determine auth method');
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Check if server is a Music Assistant server with native auth
|
||||
/// Returns 'required' if auth needed, 'none' if no auth, null if not MA or error
|
||||
Future<String?> _checkMusicAssistantAuth(String baseUrl) async {
|
||||
try {
|
||||
final uri = Uri.parse(baseUrl);
|
||||
// Use the port from URL if specified, otherwise use default ports (80/443)
|
||||
// Don't default to 8095 here - that's only for direct connections without reverse proxy
|
||||
final apiUrl = Uri(
|
||||
scheme: uri.scheme,
|
||||
host: uri.host,
|
||||
port: uri.hasPort ? uri.port : null,
|
||||
path: '/api',
|
||||
);
|
||||
|
||||
_logger.log('Checking MA API at: $apiUrl');
|
||||
|
||||
// Use IOClient to control redirect behavior for local IPs
|
||||
final isLocalIp = _isLocalIpAddress(uri.host);
|
||||
http.Response response;
|
||||
|
||||
if (isLocalIp) {
|
||||
// For local IPs, don't follow redirects - handle them explicitly
|
||||
final client = HttpClient();
|
||||
try {
|
||||
final request = await client.postUrl(apiUrl);
|
||||
request.followRedirects = false;
|
||||
request.headers.set('Content-Type', 'application/json');
|
||||
request.write(jsonEncode({'command': 'info'}));
|
||||
final ioResponse = await request.close().timeout(const Duration(seconds: 5));
|
||||
|
||||
// Check for redirect to HTTPS
|
||||
if (ioResponse.statusCode == 308 || ioResponse.statusCode == 301 || ioResponse.statusCode == 302) {
|
||||
final location = ioResponse.headers.value('location');
|
||||
_logger.log('Local IP redirects to: $location');
|
||||
if (location != null && location.startsWith('https://')) {
|
||||
_logger.log('⚠️ Server redirects HTTP to HTTPS - this may cause certificate issues for local IP');
|
||||
// Don't follow the redirect - it will likely fail with cert error
|
||||
// Instead, return null to trigger fallback logic
|
||||
client.close();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
final body = await ioResponse.transform(utf8.decoder).join();
|
||||
response = http.Response(body, ioResponse.statusCode);
|
||||
client.close();
|
||||
} catch (e) {
|
||||
client.close();
|
||||
rethrow;
|
||||
}
|
||||
} else {
|
||||
// For non-local URLs, use standard http.post which follows redirects
|
||||
response = await http.post(
|
||||
apiUrl,
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: jsonEncode({
|
||||
'command': 'info',
|
||||
}),
|
||||
).timeout(const Duration(seconds: 5));
|
||||
}
|
||||
|
||||
_logger.log('⚠️ Could not create long-lived token (non-fatal)');
|
||||
return null;
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Long-lived token creation failed: $e (non-fatal)');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
_logger.log('MA API response: ${response.statusCode}');
|
||||
_logger.log('MA API body: ${response.body}');
|
||||
|
||||
/// Validate a stored token
|
||||
Future<bool> validateToken(String serverUrl, String storedToken) async {
|
||||
try {
|
||||
final apiUrl = _buildApiUrl(serverUrl);
|
||||
// 401/403 means auth required - check this first
|
||||
if (response.statusCode == 401 || response.statusCode == 403) {
|
||||
_logger.log('MA API returned ${response.statusCode} - auth required');
|
||||
return 'required';
|
||||
}
|
||||
|
||||
final response = await http.post(
|
||||
apiUrl,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': 'Bearer $storedToken',
|
||||
},
|
||||
body: jsonEncode({
|
||||
'command': 'server/info',
|
||||
}),
|
||||
).timeout(const Duration(seconds: 5));
|
||||
// Also check for "Authentication required" text response
|
||||
if (response.body.toLowerCase().contains('authentication required')) {
|
||||
_logger.log('MA API returned auth required message');
|
||||
return 'required';
|
||||
}
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final data = jsonDecode(response.body) as Map<String, dynamic>;
|
||||
if (!data.containsKey('error_code')) {
|
||||
_longLivedToken = storedToken;
|
||||
return true;
|
||||
// Try to parse as JSON
|
||||
try {
|
||||
final data = jsonDecode(response.body) as Map<String, dynamic>;
|
||||
|
||||
// Check if we got server info successfully (no auth required)
|
||||
if (data.containsKey('result')) {
|
||||
final result = data['result'] as Map<String, dynamic>?;
|
||||
final serverVersion = result?['server_version'] as String?;
|
||||
final schemaVersion = result?['schema_version'] as int?;
|
||||
|
||||
if (serverVersion != null) {
|
||||
_logger.log('MA server version: $serverVersion, schema: $schemaVersion');
|
||||
|
||||
// Schema 28+ requires auth, but if we got here without auth, it's not enabled
|
||||
return 'none';
|
||||
}
|
||||
}
|
||||
|
||||
// Check for auth error in JSON
|
||||
if (data.containsKey('error_code')) {
|
||||
final errorCode = data['error_code'] as int?;
|
||||
// Error 50 = AuthenticationRequired
|
||||
if (errorCode == 50) {
|
||||
_logger.log('MA server requires authentication (error 50)');
|
||||
return 'required';
|
||||
}
|
||||
}
|
||||
} catch (jsonError) {
|
||||
_logger.log('MA API response not JSON: $jsonError');
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
} catch (e) {
|
||||
_logger.log('MA auth check error: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Test if server is accessible without authentication
|
||||
Future<bool> _canConnectWithoutAuth(String serverUrl) async {
|
||||
try {
|
||||
final uri = Uri.parse(serverUrl);
|
||||
_logger.log('No-auth test URL: $serverUrl');
|
||||
|
||||
final isLocalIp = _isLocalIpAddress(uri.host);
|
||||
int statusCode;
|
||||
|
||||
if (isLocalIp) {
|
||||
// For local IPs, don't follow redirects to avoid HTTPS cert issues
|
||||
final client = HttpClient();
|
||||
try {
|
||||
final request = await client.getUrl(uri);
|
||||
request.followRedirects = false;
|
||||
final response = await request.close().timeout(const Duration(seconds: 10));
|
||||
statusCode = response.statusCode;
|
||||
|
||||
// Check for redirect to HTTPS
|
||||
if (statusCode == 308 || statusCode == 301 || statusCode == 302) {
|
||||
final location = response.headers.value('location');
|
||||
if (location != null && location.startsWith('https://')) {
|
||||
_logger.log('⚠️ Local IP redirects to HTTPS: $location');
|
||||
client.close();
|
||||
return false; // Can't connect - would need HTTPS which has cert issues
|
||||
}
|
||||
}
|
||||
client.close();
|
||||
} catch (e) {
|
||||
client.close();
|
||||
rethrow;
|
||||
}
|
||||
} else {
|
||||
// For non-local URLs, use standard http.get
|
||||
final response = await http.get(uri).timeout(const Duration(seconds: 10));
|
||||
statusCode = response.statusCode;
|
||||
}
|
||||
|
||||
_logger.log('No-auth status: $statusCode');
|
||||
|
||||
// 200 = no auth required
|
||||
// 302/307/308 = redirect (probably to auth or HTTPS)
|
||||
// 401 = auth required
|
||||
if (statusCode == 200) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
} catch (e) {
|
||||
_logger.log('Token validation failed: $e');
|
||||
_logger.log('No-auth error: $e');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// Build headers for WebSocket connection
|
||||
/// Attempt login with specified strategy
|
||||
/// Returns true if login successful and credentials stored
|
||||
/// authServerUrl is optional - only used for Authelia when auth is on a different domain
|
||||
Future<bool> login(
|
||||
String serverUrl,
|
||||
String username,
|
||||
String password,
|
||||
AuthStrategy strategy, {
|
||||
String? authServerUrl,
|
||||
}) async {
|
||||
_logger.log('Attempting login with ${strategy.name} strategy');
|
||||
|
||||
// Use auth server URL if provided, otherwise use main server URL
|
||||
final loginUrl = authServerUrl?.isNotEmpty == true ? authServerUrl! : serverUrl;
|
||||
_logger.log('Login URL: $loginUrl');
|
||||
|
||||
final credentials = await strategy.login(loginUrl, username, password);
|
||||
|
||||
if (credentials != null) {
|
||||
_currentStrategy = strategy;
|
||||
_currentCredentials = credentials;
|
||||
_logger.log('✓ Login successful with ${strategy.name}');
|
||||
return true;
|
||||
}
|
||||
|
||||
_logger.log('✗ Login failed with ${strategy.name}');
|
||||
return false;
|
||||
}
|
||||
|
||||
/// Validate current credentials are still valid
|
||||
Future<bool> validateCurrentCredentials(String serverUrl) async {
|
||||
if (_currentStrategy == null || _currentCredentials == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return await _currentStrategy!.validateCredentials(
|
||||
serverUrl,
|
||||
_currentCredentials!,
|
||||
);
|
||||
}
|
||||
|
||||
/// Get WebSocket connection headers for current credentials
|
||||
Map<String, dynamic> getWebSocketHeaders() {
|
||||
if (token != null) {
|
||||
return {'Authorization': 'Bearer $token'};
|
||||
if (_currentStrategy == null || _currentCredentials == null) {
|
||||
return {};
|
||||
}
|
||||
return {};
|
||||
|
||||
return _currentStrategy!.buildWebSocketHeaders(_currentCredentials!);
|
||||
}
|
||||
|
||||
/// Build headers for HTTP streaming requests
|
||||
/// Get HTTP streaming headers for current credentials
|
||||
Map<String, String> getStreamingHeaders() {
|
||||
if (token != null) {
|
||||
return {'Authorization': 'Bearer $token'};
|
||||
if (_currentStrategy == null || _currentCredentials == null) {
|
||||
return {};
|
||||
}
|
||||
return {};
|
||||
|
||||
return _currentStrategy!.buildStreamingHeaders(_currentCredentials!);
|
||||
}
|
||||
|
||||
/// Set token from external source (e.g., restored from settings)
|
||||
void setToken(String? storedToken) {
|
||||
_longLivedToken = storedToken;
|
||||
/// Serialize current credentials for persistent storage
|
||||
Map<String, dynamic>? serializeCredentials() {
|
||||
if (_currentStrategy == null || _currentCredentials == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return {
|
||||
'strategy': _currentStrategy!.name,
|
||||
'data': _currentStrategy!.serializeCredentials(_currentCredentials!),
|
||||
};
|
||||
}
|
||||
|
||||
/// Clear authentication state
|
||||
/// Deserialize and restore credentials from persistent storage
|
||||
void deserializeCredentials(Map<String, dynamic> stored) {
|
||||
final strategyName = stored['strategy'] as String?;
|
||||
final data = stored['data'] as Map<String, dynamic>?;
|
||||
|
||||
if (strategyName == null || data == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Find matching strategy
|
||||
try {
|
||||
final strategy = _strategies.firstWhere((s) => s.name == strategyName);
|
||||
_currentStrategy = strategy;
|
||||
_currentCredentials = strategy.deserializeCredentials(data);
|
||||
_logger.log('✓ Restored ${strategy.name} credentials from storage');
|
||||
} catch (e) {
|
||||
_logger.log('✗ Could not restore credentials: $e');
|
||||
}
|
||||
}
|
||||
|
||||
/// Clear current authentication state
|
||||
void logout() {
|
||||
_accessToken = null;
|
||||
_longLivedToken = null;
|
||||
_currentStrategy = null;
|
||||
_currentCredentials = null;
|
||||
_logger.log('Logged out - cleared auth state');
|
||||
}
|
||||
|
||||
/// Build API URL from server URL
|
||||
Uri _buildApiUrl(String serverUrl) {
|
||||
var baseUrl = serverUrl;
|
||||
if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
|
||||
baseUrl = 'http://$baseUrl';
|
||||
/// Get strategy by name (for manual selection)
|
||||
AuthStrategy? getStrategyByName(String name) {
|
||||
try {
|
||||
return _strategies.firstWhere((s) => s.name == name);
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final uri = Uri.parse(baseUrl);
|
||||
return Uri(
|
||||
scheme: uri.scheme,
|
||||
host: uri.host,
|
||||
port: uri.hasPort ? uri.port : (uri.scheme == 'https' ? null : 8095),
|
||||
path: '/api',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
/// Authentication credentials container
|
||||
class AuthCredentials {
|
||||
final String strategyName;
|
||||
final Map<String, dynamic> data;
|
||||
|
||||
AuthCredentials(this.strategyName, this.data);
|
||||
}
|
||||
|
||||
/// Abstract authentication strategy interface
|
||||
/// Implementations handle different auth methods (none, basic, Authelia, HA, etc.)
|
||||
abstract class AuthStrategy {
|
||||
/// Strategy name identifier (e.g., 'none', 'basic', 'authelia')
|
||||
String get name;
|
||||
|
||||
/// Attempt login and return auth credentials/token
|
||||
/// Returns null if login fails
|
||||
Future<AuthCredentials?> login(
|
||||
String serverUrl,
|
||||
String username,
|
||||
String password,
|
||||
);
|
||||
|
||||
/// Test if current credentials are still valid
|
||||
Future<bool> validateCredentials(
|
||||
String serverUrl,
|
||||
AuthCredentials credentials,
|
||||
);
|
||||
|
||||
/// Build headers for WebSocket connection
|
||||
/// Example: {'Authorization': 'Basic xyz'} or {'Cookie': 'session=abc'}
|
||||
Map<String, dynamic> buildWebSocketHeaders(AuthCredentials credentials);
|
||||
|
||||
/// Build headers for HTTP streaming requests
|
||||
/// Example: {'Authorization': 'Basic xyz'}
|
||||
Map<String, String> buildStreamingHeaders(AuthCredentials credentials);
|
||||
|
||||
/// Serialize credentials for persistent storage
|
||||
Map<String, dynamic> serializeCredentials(AuthCredentials credentials);
|
||||
|
||||
/// Deserialize credentials from persistent storage
|
||||
AuthCredentials deserializeCredentials(Map<String, dynamic> data);
|
||||
}
|
||||
@@ -0,0 +1,172 @@
|
||||
import 'dart:convert';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'auth_strategy.dart';
|
||||
import '../debug_logger.dart';
|
||||
|
||||
/// Authelia authentication strategy
|
||||
/// Used when Music Assistant is behind Authelia reverse proxy authentication
|
||||
/// Authelia-specific endpoints: /api/firstfactor, /api/verify
|
||||
class AutheliaStrategy implements AuthStrategy {
|
||||
final _logger = DebugLogger();
|
||||
|
||||
@override
|
||||
String get name => 'authelia';
|
||||
|
||||
@override
|
||||
Future<AuthCredentials?> login(
|
||||
String serverUrl,
|
||||
String username,
|
||||
String password,
|
||||
) async {
|
||||
try {
|
||||
// Normalize server URL
|
||||
var baseUrl = serverUrl;
|
||||
if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
|
||||
baseUrl = 'https://$baseUrl';
|
||||
}
|
||||
|
||||
_logger.log('🔐 Attempting Authelia login to $baseUrl');
|
||||
|
||||
// Parse URL and construct Authelia firstfactor endpoint
|
||||
final uri = Uri.parse(baseUrl);
|
||||
final authUrl = Uri(
|
||||
scheme: uri.scheme,
|
||||
host: uri.host,
|
||||
port: uri.hasPort ? uri.port : null,
|
||||
path: '/api/firstfactor',
|
||||
);
|
||||
|
||||
_logger.log('Auth URL: $authUrl');
|
||||
|
||||
// POST to Authelia's firstfactor endpoint
|
||||
final response = await http.post(
|
||||
authUrl,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: jsonEncode({
|
||||
'username': username,
|
||||
'password': password,
|
||||
'keepMeLoggedIn': true,
|
||||
}),
|
||||
).timeout(const Duration(seconds: 10));
|
||||
|
||||
_logger.log('Auth response status: ${response.statusCode}');
|
||||
|
||||
// Check for successful authentication
|
||||
if (response.statusCode == 200) {
|
||||
_logger.log('✓ Authentication successful');
|
||||
|
||||
// Extract session cookie from Set-Cookie header
|
||||
final cookies = response.headers['set-cookie'];
|
||||
if (cookies != null && cookies.isNotEmpty) {
|
||||
_logger.log('✓ Received session cookie');
|
||||
|
||||
final sessionCookie = _extractSessionCookie(cookies);
|
||||
if (sessionCookie != null) {
|
||||
_logger.log('✓ Extracted session cookie');
|
||||
return AuthCredentials('authelia', {
|
||||
'session_cookie': sessionCookie,
|
||||
'username': username,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// If 200 but no cookie, something is wrong
|
||||
_logger.log('✗ No session cookie in response');
|
||||
return null;
|
||||
}
|
||||
|
||||
_logger.log('✗ Authentication failed: ${response.statusCode}');
|
||||
_logger.log('Response body: ${response.body}');
|
||||
return null;
|
||||
} catch (e) {
|
||||
_logger.log('✗ Login error: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Future<bool> validateCredentials(
|
||||
String serverUrl,
|
||||
AuthCredentials credentials,
|
||||
) async {
|
||||
final sessionCookie = credentials.data['session_cookie'] as String?;
|
||||
if (sessionCookie == null) return false;
|
||||
|
||||
try {
|
||||
// Normalize server URL
|
||||
var baseUrl = serverUrl;
|
||||
if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
|
||||
baseUrl = 'https://$baseUrl';
|
||||
}
|
||||
|
||||
// Parse URL and construct Authelia verify endpoint
|
||||
final uri = Uri.parse(baseUrl);
|
||||
final verifyUrl = Uri(
|
||||
scheme: uri.scheme,
|
||||
host: uri.host,
|
||||
port: uri.hasPort ? uri.port : null,
|
||||
path: '/api/verify',
|
||||
);
|
||||
|
||||
final response = await http.get(
|
||||
verifyUrl,
|
||||
headers: {
|
||||
'Cookie': 'authelia_session=$sessionCookie',
|
||||
},
|
||||
).timeout(const Duration(seconds: 5));
|
||||
|
||||
return response.statusCode == 200;
|
||||
} catch (e) {
|
||||
_logger.log('Auth validation failed: $e');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, dynamic> buildWebSocketHeaders(AuthCredentials credentials) {
|
||||
final sessionCookie = credentials.data['session_cookie'] as String;
|
||||
return {
|
||||
'Cookie': 'authelia_session=$sessionCookie',
|
||||
};
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, String> buildStreamingHeaders(AuthCredentials credentials) {
|
||||
final sessionCookie = credentials.data['session_cookie'] as String;
|
||||
return {
|
||||
'Cookie': 'authelia_session=$sessionCookie',
|
||||
};
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, dynamic> serializeCredentials(AuthCredentials credentials) {
|
||||
return credentials.data;
|
||||
}
|
||||
|
||||
@override
|
||||
AuthCredentials deserializeCredentials(Map<String, dynamic> data) {
|
||||
return AuthCredentials('authelia', data);
|
||||
}
|
||||
|
||||
/// Extract authelia_session cookie value from Set-Cookie header
|
||||
/// Migrated from auth_service.dart:81-98
|
||||
String? _extractSessionCookie(String setCookieHeader) {
|
||||
final cookies = setCookieHeader.split(',');
|
||||
|
||||
for (final cookie in cookies) {
|
||||
if (cookie.trim().startsWith('authelia_session=')) {
|
||||
final parts = cookie.split(';');
|
||||
if (parts.isNotEmpty) {
|
||||
final value = parts[0].trim();
|
||||
if (value.startsWith('authelia_session=')) {
|
||||
return value.substring('authelia_session='.length);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
import 'dart:convert';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'auth_strategy.dart';
|
||||
|
||||
/// Basic HTTP Authentication strategy
|
||||
/// Used by reverse proxies (nginx, Apache, Caddy, etc.) configured with basic auth
|
||||
/// Example: Authorization: Basic base64(username:password)
|
||||
class BasicAuthStrategy implements AuthStrategy {
|
||||
@override
|
||||
String get name => 'basic';
|
||||
|
||||
@override
|
||||
Future<AuthCredentials?> login(
|
||||
String serverUrl,
|
||||
String username,
|
||||
String password,
|
||||
) async {
|
||||
// Encode credentials to base64
|
||||
final credentials = base64Encode(utf8.encode('$username:$password'));
|
||||
|
||||
// Test credentials against server root endpoint
|
||||
// (Music Assistant doesn't have /api/info)
|
||||
try {
|
||||
final response = await http.get(
|
||||
Uri.parse(serverUrl),
|
||||
headers: {'Authorization': 'Basic $credentials'},
|
||||
).timeout(const Duration(seconds: 5));
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
return AuthCredentials('basic', {
|
||||
'credentials': credentials,
|
||||
'username': username, // Store for re-login if needed
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<bool> validateCredentials(
|
||||
String serverUrl,
|
||||
AuthCredentials credentials,
|
||||
) async {
|
||||
final base64Creds = credentials.data['credentials'] as String?;
|
||||
if (base64Creds == null) return false;
|
||||
|
||||
try {
|
||||
final response = await http.get(
|
||||
Uri.parse(serverUrl),
|
||||
headers: {'Authorization': 'Basic $base64Creds'},
|
||||
).timeout(const Duration(seconds: 5));
|
||||
|
||||
return response.statusCode == 200;
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, dynamic> buildWebSocketHeaders(AuthCredentials credentials) {
|
||||
final base64Creds = credentials.data['credentials'] as String;
|
||||
return {'Authorization': 'Basic $base64Creds'};
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, String> buildStreamingHeaders(AuthCredentials credentials) {
|
||||
final base64Creds = credentials.data['credentials'] as String;
|
||||
return {'Authorization': 'Basic $base64Creds'};
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, dynamic> serializeCredentials(AuthCredentials credentials) {
|
||||
return credentials.data;
|
||||
}
|
||||
|
||||
@override
|
||||
AuthCredentials deserializeCredentials(Map<String, dynamic> data) {
|
||||
return AuthCredentials('basic', data);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,254 @@
|
||||
import 'dart:convert';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'auth_strategy.dart';
|
||||
import '../debug_logger.dart';
|
||||
|
||||
/// Music Assistant native authentication strategy
|
||||
/// Used when MA server has built-in authentication enabled (schema 28+)
|
||||
///
|
||||
/// Flow:
|
||||
/// 1. Connect WebSocket (receives server_info with auth requirements)
|
||||
/// 2. If auth required, login with username/password to get access token
|
||||
/// 3. Send 'auth' command with token to authenticate the session
|
||||
/// 4. Optionally create long-lived token for persistent storage
|
||||
class MusicAssistantAuthStrategy implements AuthStrategy {
|
||||
final _logger = DebugLogger();
|
||||
|
||||
@override
|
||||
String get name => 'music_assistant';
|
||||
|
||||
/// Login to Music Assistant and get an access token
|
||||
/// This is called AFTER WebSocket connection is established
|
||||
/// Returns credentials containing the access token
|
||||
@override
|
||||
Future<AuthCredentials?> login(
|
||||
String serverUrl,
|
||||
String username,
|
||||
String password,
|
||||
) async {
|
||||
try {
|
||||
// Normalize server URL
|
||||
var baseUrl = serverUrl;
|
||||
if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
|
||||
// Determine protocol based on URL pattern
|
||||
if (baseUrl.startsWith('192.') ||
|
||||
baseUrl.startsWith('10.') ||
|
||||
baseUrl.startsWith('172.') ||
|
||||
baseUrl == 'localhost' ||
|
||||
baseUrl.startsWith('127.')) {
|
||||
baseUrl = 'http://$baseUrl';
|
||||
} else {
|
||||
baseUrl = 'https://$baseUrl';
|
||||
}
|
||||
}
|
||||
|
||||
_logger.log('🔐 Attempting Music Assistant login to $baseUrl');
|
||||
|
||||
// MA auth endpoint - POST /api with JSON-RPC style command
|
||||
final uri = Uri.parse(baseUrl);
|
||||
final apiUrl = Uri(
|
||||
scheme: uri.scheme,
|
||||
host: uri.host,
|
||||
port: uri.hasPort ? uri.port : (uri.scheme == 'https' ? null : 8095),
|
||||
path: '/api',
|
||||
);
|
||||
|
||||
_logger.log('Auth API URL: $apiUrl');
|
||||
|
||||
// Login request to get access token
|
||||
final response = await http.post(
|
||||
apiUrl,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: jsonEncode({
|
||||
'command': 'auth/login',
|
||||
'args': {
|
||||
'username': username,
|
||||
'password': password,
|
||||
},
|
||||
}),
|
||||
).timeout(const Duration(seconds: 10));
|
||||
|
||||
_logger.log('Auth response status: ${response.statusCode}');
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final data = jsonDecode(response.body) as Map<String, dynamic>;
|
||||
|
||||
// Check for error in response
|
||||
if (data.containsKey('error_code')) {
|
||||
_logger.log('✗ Login failed: ${data['error_code']} - ${data['details']}');
|
||||
return null;
|
||||
}
|
||||
|
||||
// Extract access token from result
|
||||
final result = data['result'] as Map<String, dynamic>?;
|
||||
final accessToken = result?['access_token'] as String?;
|
||||
|
||||
if (accessToken != null) {
|
||||
_logger.log('✓ Got access token from MA');
|
||||
|
||||
// Now try to create a long-lived token for persistent auth
|
||||
final longLivedToken = await _createLongLivedToken(apiUrl, accessToken);
|
||||
|
||||
return AuthCredentials('music_assistant', {
|
||||
'access_token': accessToken,
|
||||
'long_lived_token': longLivedToken,
|
||||
'username': username,
|
||||
'server_url': baseUrl,
|
||||
});
|
||||
}
|
||||
|
||||
_logger.log('✗ No access token in response');
|
||||
return null;
|
||||
}
|
||||
|
||||
_logger.log('✗ Authentication failed: ${response.statusCode}');
|
||||
_logger.log('Response body: ${response.body}');
|
||||
return null;
|
||||
} catch (e) {
|
||||
_logger.log('✗ Login error: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Create a long-lived token for persistent authentication
|
||||
Future<String?> _createLongLivedToken(Uri apiUrl, String accessToken) async {
|
||||
try {
|
||||
_logger.log('Creating long-lived token...');
|
||||
|
||||
final response = await http.post(
|
||||
apiUrl,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': 'Bearer $accessToken',
|
||||
},
|
||||
body: jsonEncode({
|
||||
'command': 'auth/create_token',
|
||||
'args': {
|
||||
'name': 'Ensemble Mobile App',
|
||||
},
|
||||
}),
|
||||
).timeout(const Duration(seconds: 10));
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final data = jsonDecode(response.body) as Map<String, dynamic>;
|
||||
|
||||
if (!data.containsKey('error_code')) {
|
||||
final result = data['result'] as Map<String, dynamic>?;
|
||||
final token = result?['token'] as String?;
|
||||
|
||||
if (token != null) {
|
||||
_logger.log('✓ Created long-lived token');
|
||||
return token;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_logger.log('⚠️ Could not create long-lived token (non-fatal)');
|
||||
return null;
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Long-lived token creation failed: $e (non-fatal)');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Future<bool> validateCredentials(
|
||||
String serverUrl,
|
||||
AuthCredentials credentials,
|
||||
) async {
|
||||
// Try long-lived token first, then access token
|
||||
final longLivedToken = credentials.data['long_lived_token'] as String?;
|
||||
final accessToken = credentials.data['access_token'] as String?;
|
||||
|
||||
final token = longLivedToken ?? accessToken;
|
||||
if (token == null) return false;
|
||||
|
||||
try {
|
||||
var baseUrl = serverUrl;
|
||||
if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
|
||||
baseUrl = 'https://$baseUrl';
|
||||
}
|
||||
|
||||
final uri = Uri.parse(baseUrl);
|
||||
final apiUrl = Uri(
|
||||
scheme: uri.scheme,
|
||||
host: uri.host,
|
||||
port: uri.hasPort ? uri.port : (uri.scheme == 'https' ? null : 8095),
|
||||
path: '/api',
|
||||
);
|
||||
|
||||
// Test token by getting server info
|
||||
final response = await http.post(
|
||||
apiUrl,
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': 'Bearer $token',
|
||||
},
|
||||
body: jsonEncode({
|
||||
'command': 'server/info',
|
||||
}),
|
||||
).timeout(const Duration(seconds: 5));
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final data = jsonDecode(response.body) as Map<String, dynamic>;
|
||||
return !data.containsKey('error_code');
|
||||
}
|
||||
|
||||
return false;
|
||||
} catch (e) {
|
||||
_logger.log('Token validation failed: $e');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, dynamic> buildWebSocketHeaders(AuthCredentials credentials) {
|
||||
// MA auth happens AFTER WebSocket connection, not via headers
|
||||
// But we can still include token if available for initial handshake
|
||||
final longLivedToken = credentials.data['long_lived_token'] as String?;
|
||||
final accessToken = credentials.data['access_token'] as String?;
|
||||
|
||||
final token = longLivedToken ?? accessToken;
|
||||
if (token != null) {
|
||||
return {
|
||||
'Authorization': 'Bearer $token',
|
||||
};
|
||||
}
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, String> buildStreamingHeaders(AuthCredentials credentials) {
|
||||
final longLivedToken = credentials.data['long_lived_token'] as String?;
|
||||
final accessToken = credentials.data['access_token'] as String?;
|
||||
|
||||
final token = longLivedToken ?? accessToken;
|
||||
if (token != null) {
|
||||
return {
|
||||
'Authorization': 'Bearer $token',
|
||||
};
|
||||
}
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, dynamic> serializeCredentials(AuthCredentials credentials) {
|
||||
return credentials.data;
|
||||
}
|
||||
|
||||
@override
|
||||
AuthCredentials deserializeCredentials(Map<String, dynamic> data) {
|
||||
return AuthCredentials('music_assistant', data);
|
||||
}
|
||||
|
||||
/// Get the best available token (prefer long-lived)
|
||||
String? getToken(AuthCredentials credentials) {
|
||||
final longLivedToken = credentials.data['long_lived_token'] as String?;
|
||||
final accessToken = credentials.data['access_token'] as String?;
|
||||
return longLivedToken ?? accessToken;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'auth_strategy.dart';
|
||||
|
||||
/// No authentication strategy for open Music Assistant servers
|
||||
/// Typical scenarios:
|
||||
/// - Local network deployment (http://192.168.1.100:8095)
|
||||
/// - Home network without reverse proxy
|
||||
/// - Development servers
|
||||
class NoAuthStrategy implements AuthStrategy {
|
||||
@override
|
||||
String get name => 'none';
|
||||
|
||||
@override
|
||||
Future<AuthCredentials?> login(
|
||||
String serverUrl,
|
||||
String username,
|
||||
String password,
|
||||
) async {
|
||||
// No authentication required - just test server connectivity
|
||||
try {
|
||||
final response = await http.get(
|
||||
Uri.parse('$serverUrl/api/info'),
|
||||
).timeout(const Duration(seconds: 5));
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
return AuthCredentials('none', {});
|
||||
}
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<bool> validateCredentials(
|
||||
String serverUrl,
|
||||
AuthCredentials credentials,
|
||||
) async {
|
||||
// Always valid for no-auth
|
||||
return true;
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, dynamic> buildWebSocketHeaders(AuthCredentials credentials) {
|
||||
// No auth headers needed
|
||||
return {};
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, String> buildStreamingHeaders(AuthCredentials credentials) {
|
||||
// No auth headers needed
|
||||
return {};
|
||||
}
|
||||
|
||||
@override
|
||||
Map<String, dynamic> serializeCredentials(AuthCredentials credentials) {
|
||||
return {};
|
||||
}
|
||||
|
||||
@override
|
||||
AuthCredentials deserializeCredentials(Map<String, dynamic> data) {
|
||||
return AuthCredentials('none', {});
|
||||
}
|
||||
}
|
||||
@@ -213,20 +213,6 @@ class CacheService {
|
||||
_logger.log('🗑️ Home artist caches invalidated');
|
||||
}
|
||||
|
||||
/// Clear discover caches (call when provider filter changes)
|
||||
/// This ensures discover rows are refetched with the new provider filter
|
||||
void clearDiscoverCaches() {
|
||||
_cachedDiscoverArtists = null;
|
||||
_discoverArtistsLastFetched = null;
|
||||
_cachedDiscoverAlbums = null;
|
||||
_discoverAlbumsLastFetched = null;
|
||||
_cachedRecentAlbums = null;
|
||||
_recentAlbumsLastFetched = null;
|
||||
_searchCache.clear();
|
||||
_searchCacheTime.clear();
|
||||
_logger.log('🗑️ Discover caches cleared for provider filter change');
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// DETAIL SCREEN CACHING
|
||||
// ============================================================================
|
||||
|
||||
@@ -107,18 +107,15 @@ class DatabaseService {
|
||||
// ============================================
|
||||
|
||||
/// Cache an item with JSON serialization
|
||||
/// [sourceProvider] - optional provider instance ID that provided this item (for client-side filtering)
|
||||
Future<void> cacheItem<T>({
|
||||
required String itemType,
|
||||
required String itemId,
|
||||
required Map<String, dynamic> data,
|
||||
String? sourceProvider,
|
||||
}) {
|
||||
return db.cacheItem(
|
||||
itemType: itemType,
|
||||
itemId: itemId,
|
||||
data: jsonEncode(data),
|
||||
sourceProvider: sourceProvider,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -135,29 +132,6 @@ class DatabaseService {
|
||||
}).where((item) => item.isNotEmpty).toList();
|
||||
}
|
||||
|
||||
/// Get cached items with source provider info for client-side filtering
|
||||
/// Returns list of (data, sourceProviders) tuples
|
||||
Future<List<(Map<String, dynamic>, List<String>)>> getCachedItemsWithProviders(String itemType) async {
|
||||
final items = await db.getCachedItems(itemType);
|
||||
return items.map((item) {
|
||||
try {
|
||||
final data = jsonDecode(item.data) as Map<String, dynamic>;
|
||||
List<String> providers = [];
|
||||
try {
|
||||
if (item.sourceProviders.isNotEmpty && item.sourceProviders != '[]') {
|
||||
providers = List<String>.from(
|
||||
jsonDecode(item.sourceProviders) as List,
|
||||
);
|
||||
}
|
||||
} catch (_) {}
|
||||
return (data, providers);
|
||||
} catch (e) {
|
||||
_logger.log('Error decoding cached item: $e');
|
||||
return (<String, dynamic>{}, <String>[]);
|
||||
}
|
||||
}).where((item) => item.$1.isNotEmpty).toList();
|
||||
}
|
||||
|
||||
/// Get a single cached item
|
||||
Future<Map<String, dynamic>?> getCachedItem(String itemType, String itemId) async {
|
||||
final item = await db.getCachedItem(itemType, itemId);
|
||||
@@ -193,40 +167,6 @@ class DatabaseService {
|
||||
return db.markItemsDeleted(itemType, [itemId]);
|
||||
}
|
||||
|
||||
/// Mark a cached item as deleted by searching for library ID in the data
|
||||
/// This handles cases where itemId is different from library ID
|
||||
Future<void> markCachedItemDeletedByLibraryId(String itemType, String libraryId) async {
|
||||
// First try direct match (for provider=library items)
|
||||
await db.markItemsDeleted(itemType, [libraryId]);
|
||||
|
||||
// Also search through cached items to find any with matching library mapping
|
||||
final items = await db.getCachedItems(itemType);
|
||||
for (final item in items) {
|
||||
try {
|
||||
// Check if this item's data contains a library mapping with this ID
|
||||
if (item.data.contains('"provider_instance":"library"') &&
|
||||
item.data.contains('"item_id":"$libraryId"')) {
|
||||
// Found a match - extract the actual cache key's itemId
|
||||
final cacheKey = item.cacheKey;
|
||||
final parts = cacheKey.split('_');
|
||||
if (parts.length >= 2) {
|
||||
final actualItemId = parts.sublist(1).join('_');
|
||||
await db.markItemsDeleted(itemType, [actualItemId]);
|
||||
}
|
||||
}
|
||||
} catch (_) {
|
||||
// Ignore parse errors, continue checking other items
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Batch cache multiple items efficiently
|
||||
/// Uses drift's batch API for much better performance on large datasets.
|
||||
/// Items are automatically chunked into batches of 500.
|
||||
Future<void> batchCacheItems(List<BatchCacheItem> items) {
|
||||
return db.batchCacheItems(items);
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Player Cache Convenience Methods
|
||||
// ============================================
|
||||
|
||||
@@ -1,177 +0,0 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
/// Centralized service for tracking library and favorite status of media items.
|
||||
///
|
||||
/// This service implements the "single source of truth" pattern:
|
||||
/// - All widgets query this service instead of maintaining local state
|
||||
/// - Status changes notify all listeners immediately (optimistic updates)
|
||||
/// - API failures trigger rollback notifications
|
||||
///
|
||||
/// Usage:
|
||||
/// ```dart
|
||||
/// // Check status
|
||||
/// final isInLibrary = LibraryStatusService.instance.isInLibrary(itemKey);
|
||||
///
|
||||
/// // Listen to changes
|
||||
/// LibraryStatusService.instance.addListener(() {
|
||||
/// // Rebuild UI
|
||||
/// });
|
||||
///
|
||||
/// // Update status (optimistically)
|
||||
/// LibraryStatusService.instance.setLibraryStatus(itemKey, true);
|
||||
/// ```
|
||||
class LibraryStatusService extends ChangeNotifier {
|
||||
LibraryStatusService._();
|
||||
static final LibraryStatusService instance = LibraryStatusService._();
|
||||
|
||||
// Status maps: itemKey -> status
|
||||
// itemKey format: "mediaType:provider:itemId" for uniqueness
|
||||
final Map<String, bool> _libraryStatus = {};
|
||||
final Map<String, bool> _favoriteStatus = {};
|
||||
|
||||
// Pending operations for rollback on failure
|
||||
final Map<String, bool> _pendingLibraryOps = {};
|
||||
final Map<String, bool> _pendingFavoriteOps = {};
|
||||
|
||||
/// Generate a unique key for an item
|
||||
static String makeKey(String mediaType, String provider, String itemId) {
|
||||
return '$mediaType:$provider:$itemId';
|
||||
}
|
||||
|
||||
/// Check if item is in library
|
||||
bool isInLibrary(String key) => _libraryStatus[key] ?? false;
|
||||
|
||||
/// Check if item is favorite
|
||||
bool isFavorite(String key) => _favoriteStatus[key] ?? false;
|
||||
|
||||
/// Set library status (optimistic update)
|
||||
/// Call this immediately when user taps the button
|
||||
void setLibraryStatus(String key, bool inLibrary) {
|
||||
if (_libraryStatus[key] == inLibrary) return;
|
||||
|
||||
_libraryStatus[key] = inLibrary;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Set favorite status (optimistic update)
|
||||
void setFavoriteStatus(String key, bool favorite) {
|
||||
if (_favoriteStatus[key] == favorite) return;
|
||||
|
||||
_favoriteStatus[key] = favorite;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Mark operation as pending (for rollback tracking)
|
||||
void markLibraryPending(String key, bool previousValue) {
|
||||
_pendingLibraryOps[key] = previousValue;
|
||||
}
|
||||
|
||||
void markFavoritePending(String key, bool previousValue) {
|
||||
_pendingFavoriteOps[key] = previousValue;
|
||||
}
|
||||
|
||||
/// Complete operation successfully (clear pending)
|
||||
void completeLibraryOperation(String key) {
|
||||
_pendingLibraryOps.remove(key);
|
||||
}
|
||||
|
||||
void completeFavoriteOperation(String key) {
|
||||
_pendingFavoriteOps.remove(key);
|
||||
}
|
||||
|
||||
/// Rollback operation on failure
|
||||
void rollbackLibraryOperation(String key) {
|
||||
final previousValue = _pendingLibraryOps.remove(key);
|
||||
if (previousValue != null) {
|
||||
_libraryStatus[key] = previousValue;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
void rollbackFavoriteOperation(String key) {
|
||||
final previousValue = _pendingFavoriteOps.remove(key);
|
||||
if (previousValue != null) {
|
||||
_favoriteStatus[key] = previousValue;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
/// Bulk update from provider's library data
|
||||
/// Called when library is loaded/refreshed
|
||||
void syncFromLibrary({
|
||||
required String mediaType,
|
||||
required List<dynamic> items,
|
||||
required bool Function(dynamic item) getInLibrary,
|
||||
required bool Function(dynamic item) getFavorite,
|
||||
required String Function(dynamic item) getProvider,
|
||||
required String Function(dynamic item) getItemId,
|
||||
}) {
|
||||
bool changed = false;
|
||||
|
||||
for (final item in items) {
|
||||
final key = makeKey(mediaType, getProvider(item), getItemId(item));
|
||||
final inLibrary = getInLibrary(item);
|
||||
final favorite = getFavorite(item);
|
||||
|
||||
// Only update if not pending (don't overwrite optimistic updates)
|
||||
if (!_pendingLibraryOps.containsKey(key)) {
|
||||
if (_libraryStatus[key] != inLibrary) {
|
||||
_libraryStatus[key] = inLibrary;
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!_pendingFavoriteOps.containsKey(key)) {
|
||||
if (_favoriteStatus[key] != favorite) {
|
||||
_favoriteStatus[key] = favorite;
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (changed) {
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
/// Update a single item's status from fresh data
|
||||
void syncSingleItem({
|
||||
required String key,
|
||||
required bool inLibrary,
|
||||
required bool favorite,
|
||||
}) {
|
||||
bool changed = false;
|
||||
|
||||
if (!_pendingLibraryOps.containsKey(key) && _libraryStatus[key] != inLibrary) {
|
||||
_libraryStatus[key] = inLibrary;
|
||||
changed = true;
|
||||
}
|
||||
|
||||
if (!_pendingFavoriteOps.containsKey(key) && _favoriteStatus[key] != favorite) {
|
||||
_favoriteStatus[key] = favorite;
|
||||
changed = true;
|
||||
}
|
||||
|
||||
if (changed) {
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
/// Clear all status (on logout/disconnect)
|
||||
void clear() {
|
||||
_libraryStatus.clear();
|
||||
_favoriteStatus.clear();
|
||||
_pendingLibraryOps.clear();
|
||||
_pendingFavoriteOps.clear();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Get debug info
|
||||
Map<String, dynamic> get debugInfo => {
|
||||
'libraryCount': _libraryStatus.length,
|
||||
'favoriteCount': _favoriteStatus.length,
|
||||
'pendingLibrary': _pendingLibraryOps.length,
|
||||
'pendingFavorite': _pendingFavoriteOps.length,
|
||||
};
|
||||
}
|
||||
@@ -2,19 +2,14 @@ import 'dart:convert';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'debug_logger.dart';
|
||||
import 'settings_service.dart';
|
||||
import '../utils/lru_cache.dart';
|
||||
|
||||
class MetadataService {
|
||||
static final _logger = DebugLogger();
|
||||
// Cache to avoid repeated API calls for the same artist/album
|
||||
static final Map<String, String> _cache = {};
|
||||
|
||||
// LRU caches to avoid repeated API calls and prevent unbounded memory growth
|
||||
// Using NullableLruCache for caches that store null values (failed lookups)
|
||||
|
||||
/// Cache for artist/album descriptions (100 entries)
|
||||
static final LruCache<String, String> _descriptionCache = LruCache(maxSize: 100);
|
||||
|
||||
/// Cache for artist images - includes null entries for failed lookups (200 entries)
|
||||
static final NullableLruCache<String, String> _artistImageCache = NullableLruCache(maxSize: 200);
|
||||
// Cache for artist images
|
||||
static final Map<String, String?> _artistImageCache = {};
|
||||
|
||||
/// Fetches artist biography/description with fallback chain:
|
||||
/// 1. Music Assistant metadata (passed in)
|
||||
@@ -39,8 +34,8 @@ class MetadataService {
|
||||
|
||||
// Check cache
|
||||
final cacheKey = 'artist:$artistName';
|
||||
if (_descriptionCache.containsKey(cacheKey)) {
|
||||
return _descriptionCache[cacheKey];
|
||||
if (_cache.containsKey(cacheKey)) {
|
||||
return _cache[cacheKey];
|
||||
}
|
||||
|
||||
// Try Last.fm API
|
||||
@@ -48,7 +43,7 @@ class MetadataService {
|
||||
if (lastFmKey != null && lastFmKey.isNotEmpty) {
|
||||
final lastFmDesc = await _fetchFromLastFm(artistName, null, lastFmKey);
|
||||
if (lastFmDesc != null) {
|
||||
_descriptionCache[cacheKey] = lastFmDesc;
|
||||
_cache[cacheKey] = lastFmDesc;
|
||||
return lastFmDesc;
|
||||
}
|
||||
}
|
||||
@@ -58,7 +53,7 @@ class MetadataService {
|
||||
if (audioDbKey != null && audioDbKey.isNotEmpty) {
|
||||
final audioDbDesc = await _fetchFromTheAudioDb(artistName, audioDbKey);
|
||||
if (audioDbDesc != null) {
|
||||
_descriptionCache[cacheKey] = audioDbDesc;
|
||||
_cache[cacheKey] = audioDbDesc;
|
||||
return audioDbDesc;
|
||||
}
|
||||
}
|
||||
@@ -88,8 +83,8 @@ class MetadataService {
|
||||
|
||||
// Check cache
|
||||
final cacheKey = 'album:$artistName:$albumName';
|
||||
if (_descriptionCache.containsKey(cacheKey)) {
|
||||
return _descriptionCache[cacheKey];
|
||||
if (_cache.containsKey(cacheKey)) {
|
||||
return _cache[cacheKey];
|
||||
}
|
||||
|
||||
// Try Last.fm API (TheAudioDB doesn't have good album info)
|
||||
@@ -97,7 +92,7 @@ class MetadataService {
|
||||
if (lastFmKey != null && lastFmKey.isNotEmpty) {
|
||||
final lastFmDesc = await _fetchFromLastFm(artistName, albumName, lastFmKey);
|
||||
if (lastFmDesc != null) {
|
||||
_descriptionCache[cacheKey] = lastFmDesc;
|
||||
_cache[cacheKey] = lastFmDesc;
|
||||
return lastFmDesc;
|
||||
}
|
||||
}
|
||||
@@ -256,11 +251,11 @@ class MetadataService {
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Cache for album images - includes null entries for failed lookups (200 entries)
|
||||
static final NullableLruCache<String, String> _albumImageCache = NullableLruCache(maxSize: 200);
|
||||
// Cache for album images
|
||||
static final Map<String, String?> _albumImageCache = {};
|
||||
|
||||
/// Cache for author images (audiobooks) - includes null entries for failed lookups (100 entries)
|
||||
static final NullableLruCache<String, String> _authorImageCache = NullableLruCache(maxSize: 100);
|
||||
// Cache for author images (audiobooks)
|
||||
static final Map<String, String?> _authorImageCache = {};
|
||||
|
||||
/// Fetches album cover URL from Deezer (free, no API key required)
|
||||
/// Returns the image URL if found, null otherwise
|
||||
@@ -745,90 +740,11 @@ class MetadataService {
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Cache for lyrics - uses bounded Map with manual size limiting (500 entries max)
|
||||
/// Stores (plainLyrics, syncedLyrics) tuples or null for failed lookups
|
||||
static final Map<String, (String?, String?)?> _lyricsCache = {};
|
||||
static const int _lyricsCacheMaxSize = 500;
|
||||
|
||||
/// Fetches lyrics from LRCLIB (free, no API key required)
|
||||
/// Returns a tuple of (plainLyrics, syncedLyrics) or null if not found
|
||||
/// LRCLIB provides both synced (LRC format) and plain lyrics
|
||||
static Future<(String?, String?)?> getTrackLyrics({
|
||||
required String trackName,
|
||||
required String artistName,
|
||||
String? albumName,
|
||||
int? durationSeconds,
|
||||
}) async {
|
||||
// Build cache key
|
||||
final cacheKey = 'lyrics:$artistName:$trackName';
|
||||
if (_lyricsCache.containsKey(cacheKey)) {
|
||||
return _lyricsCache[cacheKey];
|
||||
}
|
||||
|
||||
// Try LRCLIB API
|
||||
try {
|
||||
final params = <String, String>{
|
||||
'track_name': trackName,
|
||||
'artist_name': artistName,
|
||||
};
|
||||
if (albumName != null && albumName.isNotEmpty) {
|
||||
params['album_name'] = albumName;
|
||||
}
|
||||
if (durationSeconds != null && durationSeconds > 0) {
|
||||
params['duration'] = durationSeconds.toString();
|
||||
}
|
||||
|
||||
final uri = Uri.https('lrclib.net', '/api/get', params);
|
||||
_logger.log('🎤 Fetching lyrics from LRCLIB: $trackName by $artistName');
|
||||
|
||||
final response = await http.get(
|
||||
uri,
|
||||
headers: {
|
||||
'User-Agent': 'Ensemble Music Player (https://github.com/ensemble-app)',
|
||||
},
|
||||
).timeout(const Duration(seconds: 5));
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final data = json.decode(response.body);
|
||||
final plainLyrics = data['plainLyrics'] as String?;
|
||||
final syncedLyrics = data['syncedLyrics'] as String?;
|
||||
|
||||
if ((plainLyrics != null && plainLyrics.isNotEmpty) ||
|
||||
(syncedLyrics != null && syncedLyrics.isNotEmpty)) {
|
||||
_logger.log('🎤 LRCLIB found lyrics: plain=${plainLyrics?.length ?? 0} chars, synced=${syncedLyrics?.length ?? 0} chars');
|
||||
final result = (plainLyrics, syncedLyrics);
|
||||
_evictLyricsCacheIfNeeded();
|
||||
_lyricsCache[cacheKey] = result;
|
||||
return result;
|
||||
}
|
||||
} else if (response.statusCode == 404) {
|
||||
_logger.log('🎤 LRCLIB: No lyrics found for $trackName');
|
||||
} else {
|
||||
_logger.log('🎤 LRCLIB error: ${response.statusCode}');
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.warning('LRCLIB API error: $e', context: 'Metadata');
|
||||
}
|
||||
|
||||
// Cache the null result to avoid repeated failed lookups
|
||||
_evictLyricsCacheIfNeeded();
|
||||
_lyricsCache[cacheKey] = null;
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Evict oldest entries from lyrics cache if over max size
|
||||
static void _evictLyricsCacheIfNeeded() {
|
||||
while (_lyricsCache.length >= _lyricsCacheMaxSize) {
|
||||
_lyricsCache.remove(_lyricsCache.keys.first);
|
||||
}
|
||||
}
|
||||
|
||||
/// Clears all metadata caches
|
||||
/// Clears the metadata cache
|
||||
static void clearCache() {
|
||||
_descriptionCache.clear();
|
||||
_cache.clear();
|
||||
_artistImageCache.clear();
|
||||
_albumImageCache.clear();
|
||||
_authorImageCache.clear();
|
||||
_lyricsCache.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,9 +7,8 @@ import 'package:uuid/uuid.dart';
|
||||
import '../constants/network.dart';
|
||||
import '../constants/timings.dart' show Timings, LibraryConstants;
|
||||
import '../models/media_item.dart';
|
||||
import '../models/music_provider.dart';
|
||||
import '../models/player.dart';
|
||||
import '../models/provider_instance.dart';
|
||||
import '../models/provider_manifest.dart';
|
||||
import 'debug_logger.dart';
|
||||
import 'settings_service.dart';
|
||||
import 'device_id_service.dart';
|
||||
@@ -54,6 +53,10 @@ class MusicAssistantAPI {
|
||||
bool _authRequired = false;
|
||||
int? _schemaVersion;
|
||||
|
||||
// Music providers (type == "music")
|
||||
List<MusicProvider> _musicProviders = [];
|
||||
List<MusicProvider> get musicProviders => _musicProviders;
|
||||
|
||||
// Auth state
|
||||
bool _isAuthenticated = false;
|
||||
bool get isAuthenticated => _isAuthenticated;
|
||||
@@ -61,10 +64,6 @@ class MusicAssistantAPI {
|
||||
int? get schemaVersion => _schemaVersion;
|
||||
Map<String, dynamic>? get serverInfo => _serverInfo;
|
||||
|
||||
// Provider manifests (contains icons)
|
||||
final Map<String, ProviderManifest> _providerManifests = {};
|
||||
Map<String, ProviderManifest> get providerManifests => _providerManifests;
|
||||
|
||||
MusicAssistantAPI(this.serverUrl, this.authManager);
|
||||
|
||||
// Guard to prevent multiple simultaneous connection attempts
|
||||
@@ -85,15 +84,13 @@ class MusicAssistantAPI {
|
||||
return;
|
||||
}
|
||||
|
||||
// Atomic check-and-set: create new completer first, then check if one exists
|
||||
// This ensures no async operations happen between check and set
|
||||
final newCompleter = Completer<void>();
|
||||
// If connection is in progress, wait for it instead of starting another
|
||||
if (_connectionInProgress != null && !_connectionInProgress!.isCompleted) {
|
||||
_logger.log('Connection already in progress, waiting...');
|
||||
return _connectionInProgress!.future;
|
||||
}
|
||||
// Set immediately before any async operations to close the race window
|
||||
_connectionInProgress = newCompleter;
|
||||
|
||||
_connectionInProgress = Completer<void>();
|
||||
|
||||
try {
|
||||
_updateConnectionState(MAConnectionState.connecting);
|
||||
@@ -352,14 +349,6 @@ class MusicAssistantAPI {
|
||||
}
|
||||
}
|
||||
|
||||
// Prevent memory leaks by limiting pending requests
|
||||
if (_pendingRequests.length >= NetworkConstants.maxPendingRequests) {
|
||||
throw Exception(
|
||||
'Too many pending requests (${_pendingRequests.length}). '
|
||||
'Please wait for existing requests to complete.',
|
||||
);
|
||||
}
|
||||
|
||||
final messageId = _uuid.v4();
|
||||
final completer = Completer<Map<String, dynamic>>();
|
||||
_pendingRequests[messageId] = completer;
|
||||
@@ -393,7 +382,7 @@ class MusicAssistantAPI {
|
||||
bool? favoriteOnly,
|
||||
bool albumArtistsOnly = true,
|
||||
String? orderBy,
|
||||
List<String>? providerInstanceIds,
|
||||
String? provider, // Filter to specific provider instance
|
||||
}) async {
|
||||
try {
|
||||
final args = {
|
||||
@@ -403,8 +392,7 @@ class MusicAssistantAPI {
|
||||
if (favoriteOnly != null) 'favorite': favoriteOnly,
|
||||
'album_artists_only': albumArtistsOnly,
|
||||
if (orderBy != null) 'order_by': orderBy,
|
||||
if (providerInstanceIds != null && providerInstanceIds.isNotEmpty)
|
||||
'provider': providerInstanceIds,
|
||||
if (provider != null) 'provider': provider,
|
||||
};
|
||||
_logger.log('🔍 API getArtists args: $args');
|
||||
final response = await _sendCommand(
|
||||
@@ -426,11 +414,7 @@ class MusicAssistantAPI {
|
||||
}
|
||||
}
|
||||
|
||||
Future<List<Artist>> getRandomArtists({
|
||||
int limit = 10,
|
||||
bool albumArtistsOnly = true,
|
||||
List<String>? providerInstanceIds,
|
||||
}) async {
|
||||
Future<List<Artist>> getRandomArtists({int limit = 10, bool albumArtistsOnly = true, String? provider}) async {
|
||||
try {
|
||||
final response = await _sendCommand(
|
||||
'music/artists/library_items',
|
||||
@@ -438,8 +422,7 @@ class MusicAssistantAPI {
|
||||
'limit': limit,
|
||||
'order_by': 'random',
|
||||
'album_artists_only': albumArtistsOnly,
|
||||
if (providerInstanceIds != null && providerInstanceIds.isNotEmpty)
|
||||
'provider': providerInstanceIds,
|
||||
if (provider != null) 'provider': provider,
|
||||
},
|
||||
);
|
||||
|
||||
@@ -462,7 +445,7 @@ class MusicAssistantAPI {
|
||||
bool? favoriteOnly,
|
||||
String? artistId,
|
||||
String? orderBy,
|
||||
List<String>? providerInstanceIds,
|
||||
String? provider, // Filter to specific provider instance
|
||||
}) async {
|
||||
try {
|
||||
final args = <String, dynamic>{
|
||||
@@ -472,8 +455,7 @@ class MusicAssistantAPI {
|
||||
if (favoriteOnly != null) 'favorite': favoriteOnly,
|
||||
if (artistId != null) 'artist_id': artistId,
|
||||
if (orderBy != null) 'order_by': orderBy,
|
||||
if (providerInstanceIds != null && providerInstanceIds.isNotEmpty)
|
||||
'provider': providerInstanceIds,
|
||||
if (provider != null) 'provider': provider,
|
||||
};
|
||||
_logger.log('🔍 API getAlbums args: $args');
|
||||
|
||||
@@ -503,7 +485,7 @@ class MusicAssistantAPI {
|
||||
String? artistId,
|
||||
String? albumId,
|
||||
String? orderBy,
|
||||
List<String>? providerInstanceIds,
|
||||
String? provider, // Filter to specific provider instance
|
||||
}) async {
|
||||
try {
|
||||
final response = await _sendCommand(
|
||||
@@ -512,12 +494,11 @@ class MusicAssistantAPI {
|
||||
if (limit != null) 'limit': limit,
|
||||
if (offset != null) 'offset': offset,
|
||||
if (search != null) 'search': search,
|
||||
if (provider != null) 'provider': provider,
|
||||
if (favoriteOnly != null) 'favorite': favoriteOnly,
|
||||
if (artistId != null) 'artist': artistId,
|
||||
if (albumId != null) 'album': albumId,
|
||||
if (orderBy != null) 'order_by': orderBy,
|
||||
if (providerInstanceIds != null && providerInstanceIds.isNotEmpty)
|
||||
'provider': providerInstanceIds,
|
||||
},
|
||||
);
|
||||
|
||||
@@ -765,125 +746,48 @@ class MusicAssistantAPI {
|
||||
String? search,
|
||||
bool? favoriteOnly,
|
||||
String? authorId,
|
||||
List<String>? providerInstanceIds,
|
||||
}) async {
|
||||
try {
|
||||
final allAudiobooks = <Audiobook>[];
|
||||
final seenIds = <String>{};
|
||||
|
||||
// Check if library filtering is enabled (for ABS providers)
|
||||
// Check if library filtering is enabled
|
||||
final enabledLibraries = await SettingsService.getEnabledAbsLibraries();
|
||||
|
||||
// Extract ABS provider IDs from library paths
|
||||
final absProviderIds = <String>{};
|
||||
// If specific libraries are enabled, use browse API for filtering
|
||||
if (enabledLibraries != null && enabledLibraries.isNotEmpty) {
|
||||
for (final libPath in enabledLibraries) {
|
||||
final providerEnd = libPath.indexOf('://');
|
||||
if (providerEnd != -1) {
|
||||
absProviderIds.add(libPath.substring(0, providerEnd));
|
||||
}
|
||||
}
|
||||
return await _getAudiobooksFromBrowse(enabledLibraries, favoriteOnly: favoriteOnly);
|
||||
}
|
||||
|
||||
_logger.log('📚 getAudiobooks: absProviderIds=$absProviderIds, providerInstanceIds=$providerInstanceIds');
|
||||
// Otherwise use the faster MA API (returns all audiobooks)
|
||||
final args = <String, dynamic>{
|
||||
if (limit != null) 'limit': limit,
|
||||
if (offset != null) 'offset': offset,
|
||||
if (search != null) 'search': search,
|
||||
if (favoriteOnly != null) 'favorite': favoriteOnly,
|
||||
if (authorId != null) 'author_id': authorId,
|
||||
};
|
||||
|
||||
// PART 1: Fetch from ABS providers using browse API (for library filtering support)
|
||||
if (enabledLibraries != null && enabledLibraries.isNotEmpty) {
|
||||
// If specific providers are requested, filter libraries to only matching ABS providers
|
||||
var librariesToBrowse = enabledLibraries;
|
||||
if (providerInstanceIds != null && providerInstanceIds.isNotEmpty) {
|
||||
librariesToBrowse = enabledLibraries.where((libPath) {
|
||||
final providerEnd = libPath.indexOf('://');
|
||||
if (providerEnd == -1) return false;
|
||||
final providerId = libPath.substring(0, providerEnd);
|
||||
return providerInstanceIds.contains(providerId);
|
||||
}).toList();
|
||||
}
|
||||
final response = await _sendCommand(
|
||||
'music/audiobooks/library_items',
|
||||
args: args,
|
||||
);
|
||||
|
||||
if (librariesToBrowse.isNotEmpty) {
|
||||
final browseBooks = await _getAudiobooksFromBrowse(librariesToBrowse, favoriteOnly: favoriteOnly);
|
||||
for (final book in browseBooks) {
|
||||
if (!seenIds.contains(book.itemId)) {
|
||||
seenIds.add(book.itemId);
|
||||
allAudiobooks.add(book);
|
||||
}
|
||||
}
|
||||
_logger.log('📚 Got ${browseBooks.length} audiobooks from ABS browse API');
|
||||
|
||||
// If browse returned nothing, the saved library paths may be stale
|
||||
// (e.g., after provider was removed and re-added with new instance ID)
|
||||
// Clear the stale settings so we fall back to library_items API
|
||||
if (browseBooks.isEmpty) {
|
||||
_logger.log('📚 Browse returned 0 books - clearing stale library settings');
|
||||
await SettingsService.clearEnabledAbsLibraries();
|
||||
await SettingsService.setDiscoveredAbsLibraries([]);
|
||||
}
|
||||
}
|
||||
// Check for error in response
|
||||
if (response.containsKey('error_code')) {
|
||||
return [];
|
||||
}
|
||||
|
||||
// PART 2: Fetch from non-ABS providers using library_items API
|
||||
// This gets audiobooks from Spotify, Plex, Jellyfin, etc.
|
||||
List<String>? nonAbsProviders;
|
||||
if (providerInstanceIds != null && providerInstanceIds.isNotEmpty) {
|
||||
// Filter to only non-ABS providers from the requested list
|
||||
nonAbsProviders = providerInstanceIds.where((id) => !absProviderIds.contains(id)).toList();
|
||||
} else if (absProviderIds.isNotEmpty) {
|
||||
// No specific providers requested, but we have ABS - need to also fetch from non-ABS
|
||||
// Pass null to get all, then we'll deduplicate
|
||||
nonAbsProviders = null; // Will fetch all
|
||||
}
|
||||
final items = response['result'] as List<dynamic>?;
|
||||
if (items == null) return [];
|
||||
|
||||
// Only call library_items API if:
|
||||
// 1. No ABS libraries configured (traditional mode), OR
|
||||
// 2. We have specific non-ABS providers to query, OR
|
||||
// 3. ABS browse returned 0 items (stale paths were cleared above)
|
||||
// NOTE: Do NOT call when ABS filtering is active but no non-ABS providers exist,
|
||||
// as library_items API would return all audiobooks bypassing the library filter
|
||||
final shouldFetchFromApi = enabledLibraries == null ||
|
||||
enabledLibraries.isEmpty ||
|
||||
allAudiobooks.isEmpty || // Fall back if browse got nothing
|
||||
(nonAbsProviders != null && nonAbsProviders.isNotEmpty);
|
||||
|
||||
if (shouldFetchFromApi) {
|
||||
final args = <String, dynamic>{
|
||||
if (limit != null) 'limit': limit,
|
||||
if (offset != null) 'offset': offset,
|
||||
if (search != null) 'search': search,
|
||||
if (favoriteOnly != null) 'favorite': favoriteOnly,
|
||||
if (authorId != null) 'author_id': authorId,
|
||||
if (nonAbsProviders != null && nonAbsProviders.isNotEmpty)
|
||||
'provider': nonAbsProviders,
|
||||
};
|
||||
|
||||
final response = await _sendCommand(
|
||||
'music/audiobooks/library_items',
|
||||
args: args,
|
||||
);
|
||||
|
||||
if (!response.containsKey('error_code')) {
|
||||
final items = response['result'] as List<dynamic>?;
|
||||
if (items != null) {
|
||||
int addedCount = 0;
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
try {
|
||||
final book = Audiobook.fromJson(items[i] as Map<String, dynamic>);
|
||||
// Deduplicate by itemId
|
||||
if (!seenIds.contains(book.itemId)) {
|
||||
seenIds.add(book.itemId);
|
||||
allAudiobooks.add(book);
|
||||
addedCount++;
|
||||
}
|
||||
} catch (e) {
|
||||
// Skip items that fail to parse
|
||||
}
|
||||
}
|
||||
_logger.log('📚 Got $addedCount audiobooks from library_items API');
|
||||
}
|
||||
final audiobooks = <Audiobook>[];
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
try {
|
||||
final book = Audiobook.fromJson(items[i] as Map<String, dynamic>);
|
||||
audiobooks.add(book);
|
||||
} catch (e) {
|
||||
// Skip items that fail to parse
|
||||
}
|
||||
}
|
||||
|
||||
_logger.log('📚 Total audiobooks: ${allAudiobooks.length}');
|
||||
return allAudiobooks;
|
||||
return audiobooks;
|
||||
} catch (e, stack) {
|
||||
_logger.log('Error getting audiobooks: $e');
|
||||
_logger.log('Stack: $stack');
|
||||
@@ -1111,51 +1015,6 @@ class MusicAssistantAPI {
|
||||
}
|
||||
}
|
||||
|
||||
/// Get lyrics for a track
|
||||
/// Returns the lyrics text if available, null otherwise
|
||||
/// Uses the dedicated metadata/get_track_lyrics endpoint
|
||||
Future<String?> getTrackLyrics(Map<String, dynamic> track) async {
|
||||
try {
|
||||
_logger.log('🎤 Getting lyrics for track: ${track['name']}');
|
||||
|
||||
// Use the dedicated lyrics endpoint
|
||||
final response = await _sendCommand(
|
||||
'metadata/get_track_lyrics',
|
||||
args: {
|
||||
'track': track,
|
||||
},
|
||||
);
|
||||
|
||||
if (response.containsKey('error_code')) {
|
||||
_logger.log('🎤 Error getting lyrics: ${response['error_code']}');
|
||||
return null;
|
||||
}
|
||||
|
||||
// Result is a tuple: [plain_lyrics, synced_lyrics]
|
||||
// We prefer synced lyrics if available, otherwise plain
|
||||
final result = response['result'];
|
||||
if (result is List && result.length >= 2) {
|
||||
final plainLyrics = result[0] as String?;
|
||||
final syncedLyrics = result[1] as String?;
|
||||
|
||||
if (syncedLyrics != null && syncedLyrics.isNotEmpty) {
|
||||
_logger.log('🎤 Found synced lyrics: ${syncedLyrics.length} chars');
|
||||
return syncedLyrics;
|
||||
}
|
||||
if (plainLyrics != null && plainLyrics.isNotEmpty) {
|
||||
_logger.log('🎤 Found plain lyrics: ${plainLyrics.length} chars');
|
||||
return plainLyrics;
|
||||
}
|
||||
}
|
||||
|
||||
_logger.log('🎤 No lyrics found in result: $result');
|
||||
return null;
|
||||
} catch (e) {
|
||||
_logger.log('🎤 Error getting lyrics: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Browse Music Assistant content by path
|
||||
/// Returns a list of browse items (folders or media items)
|
||||
Future<List<dynamic>> browse(String? path) async {
|
||||
@@ -1506,18 +1365,14 @@ class MusicAssistantAPI {
|
||||
}
|
||||
|
||||
/// Get random albums
|
||||
Future<List<Album>> getRandomAlbums({
|
||||
int limit = 10,
|
||||
List<String>? providerInstanceIds,
|
||||
}) async {
|
||||
Future<List<Album>> getRandomAlbums({int limit = 10, String? provider}) async {
|
||||
try {
|
||||
final response = await _sendCommand(
|
||||
'music/albums/library_items',
|
||||
args: {
|
||||
'limit': limit,
|
||||
'order_by': 'random',
|
||||
if (providerInstanceIds != null && providerInstanceIds.isNotEmpty)
|
||||
'provider': providerInstanceIds,
|
||||
if (provider != null) 'provider': provider,
|
||||
},
|
||||
);
|
||||
|
||||
@@ -1634,7 +1489,6 @@ class MusicAssistantAPI {
|
||||
String? search,
|
||||
bool? favoriteOnly,
|
||||
String? orderBy,
|
||||
List<String>? providerInstanceIds,
|
||||
}) async {
|
||||
try {
|
||||
final response = await _sendCommand(
|
||||
@@ -1645,8 +1499,6 @@ class MusicAssistantAPI {
|
||||
if (search != null) 'search': search,
|
||||
if (favoriteOnly != null) 'favorite': favoriteOnly,
|
||||
if (orderBy != null) 'order_by': orderBy,
|
||||
if (providerInstanceIds != null && providerInstanceIds.isNotEmpty)
|
||||
'provider': providerInstanceIds,
|
||||
},
|
||||
);
|
||||
|
||||
@@ -2076,37 +1928,6 @@ class MusicAssistantAPI {
|
||||
}
|
||||
}
|
||||
|
||||
/// Add multiple tracks to queue without interrupting playback
|
||||
Future<void> addTracksToQueue(String playerId, List<Track> tracks, {int startIndex = 0}) async {
|
||||
try {
|
||||
final tracksToAdd = startIndex > 0 ? tracks.sublist(startIndex) : tracks;
|
||||
|
||||
// Filter to only tracks with available provider mappings
|
||||
final playableTracks = tracksToAdd.where((track) {
|
||||
if (track.providerMappings == null || track.providerMappings!.isEmpty) {
|
||||
return false;
|
||||
}
|
||||
return track.providerMappings!.any((m) => m.available);
|
||||
}).toList();
|
||||
|
||||
if (playableTracks.isEmpty) return;
|
||||
|
||||
final uris = playableTracks.map((track) => _buildTrackUri(track)).toList();
|
||||
|
||||
await _sendCommand(
|
||||
'player_queues/play_media',
|
||||
args: {
|
||||
'queue_id': playerId,
|
||||
'media': uris,
|
||||
'option': 'add', // Add to queue without starting playback
|
||||
},
|
||||
);
|
||||
} catch (e) {
|
||||
_logger.log('Error adding tracks to queue: $e');
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
/// Play album on player
|
||||
Future<void> playAlbum(String playerId, Album album) async {
|
||||
try {
|
||||
@@ -3470,26 +3291,34 @@ class MusicAssistantAPI {
|
||||
try {
|
||||
_logger.log('📥 Fetching initial state...');
|
||||
|
||||
// Fetch provider manifests (available providers with icons)
|
||||
// Fetch provider manifests (available providers)
|
||||
try {
|
||||
final manifestResponse = await _sendCommand('providers/manifests');
|
||||
final manifests = manifestResponse['result'];
|
||||
if (manifests is List) {
|
||||
_providerManifests.clear();
|
||||
for (final manifestData in manifests) {
|
||||
if (manifestData is Map<String, dynamic>) {
|
||||
final manifest = ProviderManifest.fromJson(manifestData);
|
||||
if (manifest.domain.isNotEmpty) {
|
||||
_providerManifests[manifest.domain] = manifest;
|
||||
}
|
||||
}
|
||||
}
|
||||
_logger.log('✓ Provider manifests loaded: ${_providerManifests.length} providers with ${_providerManifests.values.where((m) => m.hasSvgIcon).length} icons');
|
||||
}
|
||||
await _sendCommand('providers/manifests');
|
||||
_logger.log('✓ Provider manifests loaded');
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Could not load provider manifests: $e');
|
||||
}
|
||||
|
||||
// Fetch provider instances (active providers) and extract music providers
|
||||
try {
|
||||
final response = await _sendCommand('providers');
|
||||
final providers = response['result'] as List<dynamic>?;
|
||||
if (providers != null) {
|
||||
_musicProviders = providers
|
||||
.where((p) => (p as Map<String, dynamic>)['type'] == 'music')
|
||||
.map((p) => MusicProvider.fromJson(p as Map<String, dynamic>))
|
||||
.where((p) => p.available) // Only include available providers
|
||||
.where((p) => p.domain != 'music_assistant') // Exclude MA itself
|
||||
.toList();
|
||||
_logger.log('✓ Found ${_musicProviders.length} music providers:');
|
||||
for (final p in _musicProviders) {
|
||||
_logger.log(' - ${p.name}: instanceId="${p.instanceId}", domain="${p.domain}"');
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Could not load provider instances: $e');
|
||||
}
|
||||
|
||||
_logger.log('✅ Initial state fetch complete');
|
||||
} catch (e) {
|
||||
_logger.log('❌ Error fetching state: $e');
|
||||
@@ -3497,51 +3326,6 @@ class MusicAssistantAPI {
|
||||
}
|
||||
}
|
||||
|
||||
/// Get all music provider instances configured in Music Assistant
|
||||
/// Returns only music providers (spotify, tidal, filesystem, etc.) not player/metadata providers
|
||||
Future<List<ProviderInstance>> getMusicProviders() async {
|
||||
try {
|
||||
final response = await _sendCommand('providers');
|
||||
|
||||
final result = response['result'];
|
||||
if (result == null) {
|
||||
_logger.log('⚠️ providers command returned no result');
|
||||
return [];
|
||||
}
|
||||
|
||||
final List<dynamic> providers = result is List ? result : [];
|
||||
final musicProviders = <ProviderInstance>[];
|
||||
|
||||
for (final providerData in providers) {
|
||||
if (providerData is Map<String, dynamic>) {
|
||||
final instance = ProviderInstance.fromJson(providerData);
|
||||
// Only include music providers (not player providers, metadata providers, etc.)
|
||||
if (instance.isMusicProvider) {
|
||||
musicProviders.add(instance);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_logger.log('🎵 Found ${musicProviders.length} music providers: ${musicProviders.map((p) => p.name).join(", ")}');
|
||||
return musicProviders;
|
||||
} catch (e) {
|
||||
_logger.log('❌ Error getting music providers: $e');
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
/// Get provider manifest by domain
|
||||
ProviderManifest? getProviderManifest(String domain) {
|
||||
return _providerManifests[domain];
|
||||
}
|
||||
|
||||
/// Get SVG icon for a provider domain
|
||||
/// Returns null if no icon is available
|
||||
String? getProviderIconSvg(String domain, {bool isDark = false}) {
|
||||
final manifest = _providerManifests[domain];
|
||||
return manifest?.getSvgIcon(isDark: isDark);
|
||||
}
|
||||
|
||||
/// Get current authenticated user's profile
|
||||
/// Returns user info including display_name, username, groups, etc.
|
||||
Future<Map<String, dynamic>?> getCurrentUserInfo() async {
|
||||
@@ -3677,9 +3461,6 @@ class MusicAssistantAPI {
|
||||
return;
|
||||
}
|
||||
|
||||
// Cancel all pending requests before reconnecting to prevent memory leaks
|
||||
_cancelPendingRequests('Connection lost, reconnecting');
|
||||
|
||||
await Future.delayed(Timings.reconnectDelay);
|
||||
|
||||
// Check again after delay
|
||||
|
||||
@@ -100,7 +100,6 @@ class PositionTracker {
|
||||
Duration? duration,
|
||||
double? serverTimestamp,
|
||||
}) {
|
||||
_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;
|
||||
@@ -156,34 +155,17 @@ class PositionTracker {
|
||||
// 3. Position jumped significantly (seek or track change) - BUT NOT if it's a suspicious reset
|
||||
// AND NOT if the timestamp is stale (stale data shouldn't override interpolated position)
|
||||
// 4. We're not playing (paused state should reflect server position)
|
||||
// 5. Anchor is getting stale (> 20 seconds old) - prevents position freezing at _maxAnchorAge cap
|
||||
//
|
||||
// Key insight: When timestamp is stale, the raw position from server is likely outdated.
|
||||
// Our interpolated position is probably more accurate, so don't let stale data override it.
|
||||
// HOWEVER, if our anchor itself is getting old, we need to refresh it to prevent freezing.
|
||||
final anchorAge = DateTime.now().difference(_anchorTime);
|
||||
final anchorIsGettingStale = anchorAge.inSeconds > 20;
|
||||
// When anchor is stale, always refresh it - the suspicious reset check should
|
||||
// only prevent us from trusting the SERVER's position, not from refreshing
|
||||
// our own interpolated anchor. The newAnchorPos logic below handles using
|
||||
// interpolated position for stale anchors with suspicious server data.
|
||||
final shouldUpdateAnchor = playerChanged
|
||||
|| playStateChanged
|
||||
|| (positionDiff > 2 && !isSuspiciousReset && !hasStaleTimestamp)
|
||||
|| !isPlaying
|
||||
|| anchorIsGettingStale;
|
||||
|| !isPlaying;
|
||||
|
||||
if (shouldUpdateAnchor) {
|
||||
// When refreshing due to stale anchor (not player/state change), use interpolated position
|
||||
// to avoid backward jumps from outdated server data
|
||||
final newAnchorPos = anchorIsGettingStale && !playerChanged && !playStateChanged && isPlaying
|
||||
? currentInterpolated // Keep our interpolated position, just refresh the anchor time
|
||||
: anchorPos; // Use server position for other cases
|
||||
_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;
|
||||
_anchorPosition = anchorPos;
|
||||
_anchorTime = DateTime.now();
|
||||
} else if (positionDiff > 2) {
|
||||
_logger.log('⏱️ PositionTracker: Anchor NOT updated (suspiciousReset=$isSuspiciousReset, staleTimestamp=$hasStaleTimestamp, interpolated=${currentInterpolated.toStringAsFixed(1)}s)');
|
||||
}
|
||||
|
||||
_isPlaying = isPlaying;
|
||||
@@ -227,7 +209,6 @@ class PositionTracker {
|
||||
|
||||
/// Clear tracker state (e.g., when disconnecting)
|
||||
void clear() {
|
||||
_logger.log('⏱️ PositionTracker.clear() called');
|
||||
_stopInterpolationTimer();
|
||||
_playerId = null;
|
||||
_isPlaying = false;
|
||||
@@ -237,20 +218,9 @@ class PositionTracker {
|
||||
}
|
||||
|
||||
void _startInterpolationTimer() {
|
||||
if (_interpolationTimer != null) {
|
||||
_logger.log('⏱️ PositionTracker: Timer already running, skipping start');
|
||||
return;
|
||||
}
|
||||
if (_interpolationTimer != null) return;
|
||||
|
||||
_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.log('⏱️ PositionTracker: Timer tick ${timer.tick}, pos=${pos.inSeconds}s unchanged');
|
||||
}
|
||||
}
|
||||
_interpolationTimer = Timer.periodic(const Duration(milliseconds: 250), (_) {
|
||||
_emitPosition();
|
||||
});
|
||||
|
||||
@@ -259,7 +229,6 @@ class PositionTracker {
|
||||
}
|
||||
|
||||
void _stopInterpolationTimer() {
|
||||
_logger.log('⏱️ PositionTracker: Stopping interpolation timer (was ${_interpolationTimer != null ? "running" : "null"})');
|
||||
_interpolationTimer?.cancel();
|
||||
_interpolationTimer = null;
|
||||
}
|
||||
@@ -271,7 +240,6 @@ class PositionTracker {
|
||||
// Only emit if second changed (reduces unnecessary updates)
|
||||
if (seconds != _lastEmittedSeconds) {
|
||||
_lastEmittedSeconds = seconds;
|
||||
_logger.log('⏱️ PositionTracker: Emitting position ${seconds}s (anchor=${_anchorPosition.toStringAsFixed(1)}s, playing=$_isPlaying)');
|
||||
_positionController.add(pos);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -154,8 +154,7 @@ class SendspinService {
|
||||
}
|
||||
|
||||
/// Connect with a specific WebSocket URL (called by provider with local_ws_url)
|
||||
/// If useProxyAuth is true, will authenticate with MA token (needed for proxy connections)
|
||||
Future<bool> connectWithUrl(String wsUrl, {bool useProxyAuth = false}) async {
|
||||
Future<bool> connectWithUrl(String wsUrl) async {
|
||||
if (_isDisposed) return false;
|
||||
if (_state == SendspinConnectionState.connected) return true;
|
||||
|
||||
@@ -174,7 +173,7 @@ class SendspinService {
|
||||
|
||||
_logger.log('Sendspin: Connecting with URL: $wsUrl');
|
||||
|
||||
final connected = await _tryConnect(wsUrl, timeout: const Duration(seconds: 5), useProxyAuth: useProxyAuth);
|
||||
final connected = await _tryConnect(wsUrl, timeout: const Duration(seconds: 5));
|
||||
|
||||
if (!connected) {
|
||||
_updateState(SendspinConnectionState.error);
|
||||
|
||||
@@ -90,6 +90,7 @@ class SettingsService {
|
||||
static const String _keyLocalPlayerName = 'local_player_name';
|
||||
static const String _keyOwnerName = 'owner_name';
|
||||
static const String _keyLastSelectedPlayerId = 'last_selected_player_id';
|
||||
static const String _keyPreferLocalPlayer = 'prefer_local_player';
|
||||
static const String _keySmartSortPlayers = 'smart_sort_players';
|
||||
static const String _keyShowRecentAlbums = 'show_recent_albums';
|
||||
static const String _keyShowDiscoverArtists = 'show_discover_artists';
|
||||
@@ -150,7 +151,6 @@ class SettingsService {
|
||||
static const String _keyLibrarySeriesSortOrder = 'library_series_sort_order'; // 'alpha', 'alpha_desc', 'books'
|
||||
static const String _keyLibraryRadioSortOrder = 'library_radio_sort_order'; // 'alpha', 'alpha_desc'
|
||||
static const String _keyLibraryPodcastsSortOrder = 'library_podcasts_sort_order'; // 'alpha', 'alpha_desc'
|
||||
static const String _keyPodcastEpisodesSortOrder = 'podcast_episodes_sort_order'; // 'newest', 'oldest', 'alpha', 'duration'
|
||||
|
||||
// Audiobookshelf Direct Integration Settings
|
||||
static const String _keyAbsServerUrl = 'abs_server_url';
|
||||
@@ -161,13 +161,8 @@ class SettingsService {
|
||||
static const String _keyEnabledAbsLibraries = 'enabled_abs_libraries'; // JSON list of library paths
|
||||
static const String _keyDiscoveredAbsLibraries = 'discovered_abs_libraries'; // JSON list of {path, name}
|
||||
|
||||
// Music Provider Filter Settings
|
||||
static const String _keyEnabledMusicProviders = 'enabled_music_providers'; // JSON list of provider instance IDs
|
||||
static const String _keyDiscoveredMusicProviders = 'discovered_music_providers'; // JSON list of {instanceId, domain, name}
|
||||
|
||||
// Hint System Settings
|
||||
static const String _keyShowHints = 'show_hints'; // Master toggle for hints
|
||||
static const String _keyShowProviderIcons = 'show_provider_icons'; // Show provider icons on album art
|
||||
static const String _keyHasUsedPlayerReveal = 'has_used_player_reveal'; // Track if user has pulled to reveal players
|
||||
static const String _keyHasCompletedOnboarding = 'has_completed_onboarding'; // Track if user has seen welcome screen
|
||||
|
||||
@@ -177,6 +172,9 @@ class SettingsService {
|
||||
// Podcast Cover Cache (iTunes URLs for high-res artwork)
|
||||
static const String _keyPodcastCoverCache = 'podcast_cover_cache';
|
||||
|
||||
// Music provider filter
|
||||
static const String _keyDisabledMusicProviders = 'disabled_music_providers'; // JSON list of disabled provider instance IDs
|
||||
|
||||
static Future<String?> getServerUrl() async {
|
||||
final prefs = await _getPrefs();
|
||||
return prefs.getString(_keyServerUrl);
|
||||
@@ -353,6 +351,10 @@ class SettingsService {
|
||||
static Future<void> setLastSelectedPlayerId(String? playerId) =>
|
||||
_setString(_keyLastSelectedPlayerId, playerId, removeIfEmpty: true);
|
||||
|
||||
// Prefer Local Player - always select local player first when available
|
||||
static Future<bool> getPreferLocalPlayer() => _getBool(_keyPreferLocalPlayer, defaultValue: false);
|
||||
static Future<void> setPreferLocalPlayer(bool prefer) => _setBool(_keyPreferLocalPlayer, prefer);
|
||||
|
||||
// Smart Sort Players - sort by status (playing > on > off) instead of alphabetically
|
||||
static Future<bool> getSmartSortPlayers() => _getBool(_keySmartSortPlayers, defaultValue: false);
|
||||
static Future<void> setSmartSortPlayers(bool smartSort) => _setBool(_keySmartSortPlayers, smartSort);
|
||||
@@ -683,17 +685,6 @@ class SettingsService {
|
||||
await prefs.setString(_keyLibraryPodcastsSortOrder, order);
|
||||
}
|
||||
|
||||
// Podcast Episode Sort Order (within podcast detail screen)
|
||||
static Future<String> getPodcastEpisodesSortOrder() async {
|
||||
final prefs = await _getPrefs();
|
||||
return prefs.getString(_keyPodcastEpisodesSortOrder) ?? 'newest';
|
||||
}
|
||||
|
||||
static Future<void> setPodcastEpisodesSortOrder(String order) async {
|
||||
final prefs = await _getPrefs();
|
||||
await prefs.setString(_keyPodcastEpisodesSortOrder, order);
|
||||
}
|
||||
|
||||
// Audiobookshelf Settings
|
||||
static Future<String?> getAbsServerUrl() async {
|
||||
final prefs = await _getPrefs();
|
||||
@@ -801,81 +792,6 @@ class SettingsService {
|
||||
await setEnabledAbsLibraries(enabled);
|
||||
}
|
||||
|
||||
// Music Provider Filter Settings
|
||||
|
||||
/// Get list of enabled music provider instance IDs (null = all enabled)
|
||||
/// Returns null if no filter is set (all providers enabled by default)
|
||||
static Future<List<String>?> getEnabledMusicProviders() async {
|
||||
final prefs = await _getPrefs();
|
||||
final json = prefs.getString(_keyEnabledMusicProviders);
|
||||
if (json == null) return null; // null means all providers are enabled
|
||||
try {
|
||||
final list = jsonDecode(json) as List<dynamic>;
|
||||
return list.cast<String>();
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Set list of enabled music provider instance IDs
|
||||
/// Pass null or call clearEnabledMusicProviders() to enable all providers
|
||||
static Future<void> setEnabledMusicProviders(List<String> providerIds) async {
|
||||
final prefs = await _getPrefs();
|
||||
await prefs.setString(_keyEnabledMusicProviders, jsonEncode(providerIds));
|
||||
}
|
||||
|
||||
/// Clear enabled providers (reverts to all enabled)
|
||||
static Future<void> clearEnabledMusicProviders() async {
|
||||
final prefs = await _getPrefs();
|
||||
await prefs.remove(_keyEnabledMusicProviders);
|
||||
}
|
||||
|
||||
/// Get discovered music providers [{instanceId, domain, name}]
|
||||
static Future<List<Map<String, String>>?> getDiscoveredMusicProviders() async {
|
||||
final prefs = await _getPrefs();
|
||||
final json = prefs.getString(_keyDiscoveredMusicProviders);
|
||||
if (json == null) return null;
|
||||
try {
|
||||
final list = jsonDecode(json) as List<dynamic>;
|
||||
return list.map((e) => Map<String, String>.from(e as Map)).toList();
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Save discovered music providers
|
||||
static Future<void> setDiscoveredMusicProviders(List<Map<String, String>> providers) async {
|
||||
final prefs = await _getPrefs();
|
||||
await prefs.setString(_keyDiscoveredMusicProviders, jsonEncode(providers));
|
||||
}
|
||||
|
||||
/// Check if a specific music provider is enabled
|
||||
static Future<bool> isMusicProviderEnabled(String instanceId) async {
|
||||
final enabled = await getEnabledMusicProviders();
|
||||
if (enabled == null) return true; // All enabled by default
|
||||
return enabled.contains(instanceId);
|
||||
}
|
||||
|
||||
/// Toggle a specific music provider
|
||||
/// allProviderIds should contain all available provider instance IDs
|
||||
static Future<void> toggleMusicProvider(String instanceId, bool enable, List<String> allProviderIds) async {
|
||||
var enabled = await getEnabledMusicProviders();
|
||||
// If null (all enabled), initialize with all provider IDs
|
||||
enabled ??= List.from(allProviderIds);
|
||||
|
||||
if (enable && !enabled.contains(instanceId)) {
|
||||
enabled.add(instanceId);
|
||||
} else if (!enable && enabled.contains(instanceId)) {
|
||||
// Prevent disabling the last provider
|
||||
if (enabled.length <= 1) {
|
||||
return; // Don't allow disabling the last provider
|
||||
}
|
||||
enabled.remove(instanceId);
|
||||
}
|
||||
|
||||
await setEnabledMusicProviders(enabled);
|
||||
}
|
||||
|
||||
// Hint System Settings
|
||||
|
||||
/// Get whether hints are enabled (default: true)
|
||||
@@ -890,24 +806,6 @@ class SettingsService {
|
||||
await prefs.setBool(_keyShowHints, show);
|
||||
}
|
||||
|
||||
/// Get whether provider icons are shown on album art (default: true)
|
||||
static Future<bool> getShowProviderIcons() async {
|
||||
final prefs = await _getPrefs();
|
||||
return prefs.getBool(_keyShowProviderIcons) ?? true;
|
||||
}
|
||||
|
||||
/// Synchronous getter for provider icons setting (uses cached prefs)
|
||||
/// Returns true if prefs not yet initialized
|
||||
static bool getShowProviderIconsSync() {
|
||||
return _prefsCache?.getBool(_keyShowProviderIcons) ?? true;
|
||||
}
|
||||
|
||||
/// Set whether provider icons are shown on album art
|
||||
static Future<void> setShowProviderIcons(bool show) async {
|
||||
final prefs = await _getPrefs();
|
||||
await prefs.setBool(_keyShowProviderIcons, show);
|
||||
}
|
||||
|
||||
/// Check if user has ever used the player reveal gesture
|
||||
static Future<bool> getHasUsedPlayerReveal() async {
|
||||
final prefs = await _getPrefs();
|
||||
@@ -976,4 +874,48 @@ class SettingsService {
|
||||
cache[podcastId] = url;
|
||||
await setPodcastCoverCache(cache);
|
||||
}
|
||||
|
||||
// ============ MUSIC PROVIDER FILTER ============
|
||||
|
||||
/// Get list of disabled music provider instance IDs
|
||||
/// Returns empty list if none disabled (all providers enabled)
|
||||
static Future<List<String>> getDisabledMusicProviders() async {
|
||||
final prefs = await _getPrefs();
|
||||
final json = prefs.getString(_keyDisabledMusicProviders);
|
||||
if (json == null || json.isEmpty) return [];
|
||||
try {
|
||||
return (jsonDecode(json) as List<dynamic>).cast<String>();
|
||||
} catch (_) {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
/// Set list of disabled music provider instance IDs
|
||||
static Future<void> setDisabledMusicProviders(List<String> disabledIds) async {
|
||||
final prefs = await _getPrefs();
|
||||
if (disabledIds.isEmpty) {
|
||||
await prefs.remove(_keyDisabledMusicProviders);
|
||||
} else {
|
||||
await prefs.setString(_keyDisabledMusicProviders, jsonEncode(disabledIds));
|
||||
}
|
||||
}
|
||||
|
||||
/// Check if a specific provider is disabled
|
||||
static Future<bool> isProviderDisabled(String instanceId) async {
|
||||
final disabled = await getDisabledMusicProviders();
|
||||
return disabled.contains(instanceId);
|
||||
}
|
||||
|
||||
/// Toggle a provider's enabled/disabled state
|
||||
static Future<void> toggleProviderEnabled(String instanceId, bool enabled) async {
|
||||
final disabled = await getDisabledMusicProviders();
|
||||
if (enabled) {
|
||||
disabled.remove(instanceId);
|
||||
} else {
|
||||
if (!disabled.contains(instanceId)) {
|
||||
disabled.add(instanceId);
|
||||
}
|
||||
}
|
||||
await setDisabledMusicProviders(disabled);
|
||||
}
|
||||
}
|
||||
|
||||
+110
-469
@@ -1,7 +1,6 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import '../database/database.dart' show BatchCacheItem;
|
||||
import '../models/media_item.dart';
|
||||
import 'database_service.dart';
|
||||
import 'debug_logger.dart';
|
||||
@@ -18,7 +17,6 @@ enum SyncStatus {
|
||||
|
||||
/// Service for background library synchronization
|
||||
/// Loads from database cache first, then syncs from MA API in background
|
||||
/// Supports per-provider sync for accurate client-side filtering
|
||||
class SyncService with ChangeNotifier {
|
||||
static SyncService? _instance;
|
||||
static final _logger = DebugLogger();
|
||||
@@ -44,13 +42,6 @@ class SyncService with ChangeNotifier {
|
||||
List<Audiobook> _cachedAudiobooks = [];
|
||||
List<Playlist> _cachedPlaylists = [];
|
||||
|
||||
// Source provider tracking for client-side filtering
|
||||
// Maps itemId -> list of provider instance IDs that provided the item
|
||||
Map<String, List<String>> _albumSourceProviders = {};
|
||||
Map<String, List<String>> _artistSourceProviders = {};
|
||||
Map<String, List<String>> _audiobookSourceProviders = {};
|
||||
Map<String, List<String>> _playlistSourceProviders = {};
|
||||
|
||||
// Getters
|
||||
SyncStatus get status => _status;
|
||||
String? get lastError => _lastError;
|
||||
@@ -63,15 +54,8 @@ class SyncService with ChangeNotifier {
|
||||
bool get hasCache => _cachedAlbums.isNotEmpty || _cachedArtists.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
|
||||
Future<void> loadFromCache() async {
|
||||
if (!_db.isInitialized) {
|
||||
_logger.log('⚠️ Database not initialized, skipping cache load');
|
||||
@@ -81,73 +65,52 @@ class SyncService with ChangeNotifier {
|
||||
try {
|
||||
_logger.log('📦 Loading library from database cache...');
|
||||
|
||||
// Load albums from cache with source providers
|
||||
final albumDataWithProviders = await _db.getCachedItemsWithProviders('album');
|
||||
_cachedAlbums = [];
|
||||
_albumSourceProviders = {};
|
||||
for (final (data, providers) in albumDataWithProviders) {
|
||||
// Load albums from cache
|
||||
final albumData = await _db.getCachedItems('album');
|
||||
_cachedAlbums = albumData.map((data) {
|
||||
try {
|
||||
final album = Album.fromJson(data);
|
||||
_cachedAlbums.add(album);
|
||||
if (providers.isNotEmpty) {
|
||||
_albumSourceProviders[album.itemId] = providers;
|
||||
}
|
||||
return Album.fromJson(data);
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to parse cached album: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}).whereType<Album>().toList();
|
||||
|
||||
// Load artists from cache with source providers
|
||||
final artistDataWithProviders = await _db.getCachedItemsWithProviders('artist');
|
||||
_cachedArtists = [];
|
||||
_artistSourceProviders = {};
|
||||
for (final (data, providers) in artistDataWithProviders) {
|
||||
// Load artists from cache
|
||||
final artistData = await _db.getCachedItems('artist');
|
||||
_cachedArtists = artistData.map((data) {
|
||||
try {
|
||||
final artist = Artist.fromJson(data);
|
||||
_cachedArtists.add(artist);
|
||||
if (providers.isNotEmpty) {
|
||||
_artistSourceProviders[artist.itemId] = providers;
|
||||
}
|
||||
return Artist.fromJson(data);
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to parse cached artist: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}).whereType<Artist>().toList();
|
||||
|
||||
// Load audiobooks from cache with source providers
|
||||
final audiobookDataWithProviders = await _db.getCachedItemsWithProviders('audiobook');
|
||||
_cachedAudiobooks = [];
|
||||
_audiobookSourceProviders = {};
|
||||
for (final (data, providers) in audiobookDataWithProviders) {
|
||||
// Load audiobooks from cache
|
||||
final audiobookData = await _db.getCachedItems('audiobook');
|
||||
_cachedAudiobooks = audiobookData.map((data) {
|
||||
try {
|
||||
final audiobook = Audiobook.fromJson(data);
|
||||
_cachedAudiobooks.add(audiobook);
|
||||
if (providers.isNotEmpty) {
|
||||
_audiobookSourceProviders[audiobook.itemId] = providers;
|
||||
}
|
||||
return Audiobook.fromJson(data);
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to parse cached audiobook: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}).whereType<Audiobook>().toList();
|
||||
|
||||
// Load playlists from cache with source providers
|
||||
final playlistDataWithProviders = await _db.getCachedItemsWithProviders('playlist');
|
||||
_cachedPlaylists = [];
|
||||
_playlistSourceProviders = {};
|
||||
for (final (data, providers) in playlistDataWithProviders) {
|
||||
// Load playlists from cache
|
||||
final playlistData = await _db.getCachedItems('playlist');
|
||||
_cachedPlaylists = playlistData.map((data) {
|
||||
try {
|
||||
final playlist = Playlist.fromJson(data);
|
||||
_cachedPlaylists.add(playlist);
|
||||
if (providers.isNotEmpty) {
|
||||
_playlistSourceProviders[playlist.itemId] = providers;
|
||||
}
|
||||
return Playlist.fromJson(data);
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to parse cached playlist: $e');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}).whereType<Playlist>().toList();
|
||||
|
||||
_logger.log('📦 Loaded ${_cachedAlbums.length} albums, ${_cachedArtists.length} artists, '
|
||||
'${_cachedAudiobooks.length} audiobooks, ${_cachedPlaylists.length} playlists from cache');
|
||||
_logger.log('📦 Source providers: ${_albumSourceProviders.length} albums, ${_artistSourceProviders.length} artists tracked');
|
||||
notifyListeners();
|
||||
} catch (e) {
|
||||
_logger.log('❌ Failed to load from cache: $e');
|
||||
@@ -156,12 +119,8 @@ class SyncService with ChangeNotifier {
|
||||
|
||||
/// Sync library data from MA API in background
|
||||
/// Updates database cache and notifies listeners when complete
|
||||
/// [providerInstanceIds] - list of provider IDs to sync (fetches each provider separately for accurate source tracking)
|
||||
Future<void> syncFromApi(
|
||||
MusicAssistantAPI api, {
|
||||
bool force = false,
|
||||
List<String>? providerInstanceIds,
|
||||
}) async {
|
||||
/// If provider is specified, only fetch items from that provider (server-side filtering)
|
||||
Future<void> syncFromApi(MusicAssistantAPI api, {bool force = false, String? provider}) async {
|
||||
if (_isSyncing) {
|
||||
_logger.log('🔄 Sync already in progress, skipping');
|
||||
return;
|
||||
@@ -191,146 +150,40 @@ class SyncService with ChangeNotifier {
|
||||
notifyListeners();
|
||||
|
||||
try {
|
||||
_logger.log('🔄 Starting background library sync...');
|
||||
_logger.log('🔄 Starting background library sync (provider=$provider)...');
|
||||
|
||||
// Read artist filter setting - when ON, only fetch artists that have albums
|
||||
final showOnlyArtistsWithAlbums = await SettingsService.getShowOnlyArtistsWithAlbums();
|
||||
_logger.log('🎨 Sync using albumArtistsOnly: $showOnlyArtistsWithAlbums');
|
||||
_logger.log('🎨 Sync using albumArtistsOnly: $showOnlyArtistsWithAlbums, provider: $provider');
|
||||
|
||||
// Only clear cache for full syncs (no specific providers)
|
||||
// Partial syncs preserve items from disabled providers for instant toggle-on
|
||||
final isPartialSync = providerInstanceIds != null && providerInstanceIds.isNotEmpty;
|
||||
if (!isPartialSync) {
|
||||
await _db.clearCacheForType('album');
|
||||
await _db.clearCacheForType('artist');
|
||||
await _db.clearCacheForType('audiobook');
|
||||
await _db.clearCacheForType('playlist');
|
||||
}
|
||||
// Fetch fresh data from MA API (in parallel for speed)
|
||||
// If provider is specified, filter to only that provider's library items
|
||||
final results = await Future.wait([
|
||||
api.getAlbums(limit: 1000, provider: provider),
|
||||
api.getArtists(limit: 1000, albumArtistsOnly: showOnlyArtistsWithAlbums, provider: provider),
|
||||
api.getAudiobooks(limit: 1000),
|
||||
api.getPlaylists(limit: 1000),
|
||||
]);
|
||||
|
||||
// Build NEW source tracking maps - don't modify existing until sync is complete
|
||||
// This prevents UI flicker from partial tracking during sync
|
||||
final syncingProviders = providerInstanceIds?.toSet() ?? <String>{};
|
||||
final newAlbumSourceProviders = <String, List<String>>{};
|
||||
final newArtistSourceProviders = <String, List<String>>{};
|
||||
final newAudiobookSourceProviders = <String, List<String>>{};
|
||||
final newPlaylistSourceProviders = <String, List<String>>{};
|
||||
final albums = results[0] as List<Album>;
|
||||
final artists = results[1] as List<Artist>;
|
||||
final audiobooks = results[2] as List<Audiobook>;
|
||||
final playlists = results[3] as List<Playlist>;
|
||||
|
||||
// For partial syncs, copy tracking from non-syncing providers
|
||||
if (isPartialSync) {
|
||||
for (final entry in _albumSourceProviders.entries) {
|
||||
final preserved = entry.value.where((p) => !syncingProviders.contains(p)).toList();
|
||||
if (preserved.isNotEmpty) newAlbumSourceProviders[entry.key] = preserved;
|
||||
}
|
||||
for (final entry in _artistSourceProviders.entries) {
|
||||
final preserved = entry.value.where((p) => !syncingProviders.contains(p)).toList();
|
||||
if (preserved.isNotEmpty) newArtistSourceProviders[entry.key] = preserved;
|
||||
}
|
||||
for (final entry in _audiobookSourceProviders.entries) {
|
||||
final preserved = entry.value.where((p) => !syncingProviders.contains(p)).toList();
|
||||
if (preserved.isNotEmpty) newAudiobookSourceProviders[entry.key] = preserved;
|
||||
}
|
||||
for (final entry in _playlistSourceProviders.entries) {
|
||||
final preserved = entry.value.where((p) => !syncingProviders.contains(p)).toList();
|
||||
if (preserved.isNotEmpty) newPlaylistSourceProviders[entry.key] = preserved;
|
||||
}
|
||||
}
|
||||
_logger.log('📥 Fetched ${albums.length} albums, ${artists.length} artists, '
|
||||
'${audiobooks.length} audiobooks, ${playlists.length} playlists from MA');
|
||||
|
||||
// Collect all items (deduped by itemId, but tracking all source providers)
|
||||
final albumMap = <String, Album>{};
|
||||
final artistMap = <String, Artist>{};
|
||||
final audiobookMap = <String, Audiobook>{};
|
||||
final playlistMap = <String, Playlist>{};
|
||||
// Clear old cache before saving fresh data (removes stale items)
|
||||
await _db.clearCacheForType('album');
|
||||
await _db.clearCacheForType('artist');
|
||||
await _db.clearCacheForType('audiobook');
|
||||
await _db.clearCacheForType('playlist');
|
||||
|
||||
// If specific providers are requested, sync each separately for accurate source tracking
|
||||
if (providerInstanceIds != null && providerInstanceIds.isNotEmpty) {
|
||||
_logger.log('🔒 Per-provider sync for ${providerInstanceIds.length} providers');
|
||||
|
||||
for (final providerId in providerInstanceIds) {
|
||||
_logger.log(' 📡 Syncing provider: $providerId');
|
||||
|
||||
// Fetch from this specific provider
|
||||
final results = await Future.wait([
|
||||
api.getAlbums(limit: 1000, providerInstanceIds: [providerId]),
|
||||
api.getArtists(limit: 1000, albumArtistsOnly: showOnlyArtistsWithAlbums, providerInstanceIds: [providerId]),
|
||||
api.getAudiobooks(limit: 1000, providerInstanceIds: [providerId]),
|
||||
api.getPlaylists(limit: 1000, providerInstanceIds: [providerId]),
|
||||
]);
|
||||
|
||||
final albums = results[0] as List<Album>;
|
||||
final artists = results[1] as List<Artist>;
|
||||
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 from $providerId');
|
||||
|
||||
// Add to maps and track source provider in NEW tracking maps
|
||||
for (final album in albums) {
|
||||
albumMap[album.itemId] = album;
|
||||
newAlbumSourceProviders.putIfAbsent(album.itemId, () => []);
|
||||
if (!newAlbumSourceProviders[album.itemId]!.contains(providerId)) {
|
||||
newAlbumSourceProviders[album.itemId]!.add(providerId);
|
||||
}
|
||||
}
|
||||
for (final artist in artists) {
|
||||
artistMap[artist.itemId] = artist;
|
||||
newArtistSourceProviders.putIfAbsent(artist.itemId, () => []);
|
||||
if (!newArtistSourceProviders[artist.itemId]!.contains(providerId)) {
|
||||
newArtistSourceProviders[artist.itemId]!.add(providerId);
|
||||
}
|
||||
}
|
||||
for (final audiobook in audiobooks) {
|
||||
audiobookMap[audiobook.itemId] = audiobook;
|
||||
newAudiobookSourceProviders.putIfAbsent(audiobook.itemId, () => []);
|
||||
if (!newAudiobookSourceProviders[audiobook.itemId]!.contains(providerId)) {
|
||||
newAudiobookSourceProviders[audiobook.itemId]!.add(providerId);
|
||||
}
|
||||
}
|
||||
for (final playlist in playlists) {
|
||||
playlistMap[playlist.itemId] = playlist;
|
||||
newPlaylistSourceProviders.putIfAbsent(playlist.itemId, () => []);
|
||||
if (!newPlaylistSourceProviders[playlist.itemId]!.contains(providerId)) {
|
||||
newPlaylistSourceProviders[playlist.itemId]!.add(providerId);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// No provider filter - fetch all at once (faster, but no source tracking)
|
||||
_logger.log('📡 Fetching from all providers (no source tracking)');
|
||||
|
||||
final results = await Future.wait([
|
||||
api.getAlbums(limit: 1000),
|
||||
api.getArtists(limit: 1000, albumArtistsOnly: showOnlyArtistsWithAlbums),
|
||||
api.getAudiobooks(limit: 1000),
|
||||
api.getPlaylists(limit: 1000),
|
||||
]);
|
||||
|
||||
for (final album in results[0] as List<Album>) {
|
||||
albumMap[album.itemId] = album;
|
||||
}
|
||||
for (final artist in results[1] as List<Artist>) {
|
||||
artistMap[artist.itemId] = artist;
|
||||
}
|
||||
for (final audiobook in results[2] as List<Audiobook>) {
|
||||
audiobookMap[audiobook.itemId] = audiobook;
|
||||
}
|
||||
for (final playlist in results[3] as List<Playlist>) {
|
||||
playlistMap[playlist.itemId] = playlist;
|
||||
}
|
||||
}
|
||||
|
||||
final albums = albumMap.values.toList();
|
||||
final artists = artistMap.values.toList();
|
||||
final audiobooks = audiobookMap.values.toList();
|
||||
final playlists = playlistMap.values.toList();
|
||||
|
||||
_logger.log('📥 Total: ${albums.length} albums, ${artists.length} artists, '
|
||||
'${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);
|
||||
// Save to database cache
|
||||
await _saveAlbumsToCache(albums);
|
||||
await _saveArtistsToCache(artists);
|
||||
await _saveAudiobooksToCache(audiobooks);
|
||||
await _savePlaylistsToCache(playlists);
|
||||
|
||||
// Update sync metadata
|
||||
await _db.updateSyncMetadata('albums', albums.length);
|
||||
@@ -339,49 +192,14 @@ class SyncService with ChangeNotifier {
|
||||
await _db.updateSyncMetadata('playlists', playlists.length);
|
||||
|
||||
// Update in-memory cache
|
||||
if (isPartialSync) {
|
||||
// Partial sync: merge with existing cache to preserve items from disabled providers
|
||||
final albumIds = albums.map((a) => a.itemId).toSet();
|
||||
final artistIds = artists.map((a) => a.itemId).toSet();
|
||||
final audiobookIds = audiobooks.map((a) => a.itemId).toSet();
|
||||
final playlistIds = playlists.map((p) => p.itemId).toSet();
|
||||
|
||||
// Keep items not in current sync, add/update items from sync
|
||||
_cachedAlbums = [
|
||||
..._cachedAlbums.where((a) => !albumIds.contains(a.itemId)),
|
||||
...albums,
|
||||
];
|
||||
_cachedArtists = [
|
||||
..._cachedArtists.where((a) => !artistIds.contains(a.itemId)),
|
||||
...artists,
|
||||
];
|
||||
_cachedAudiobooks = [
|
||||
..._cachedAudiobooks.where((a) => !audiobookIds.contains(a.itemId)),
|
||||
...audiobooks,
|
||||
];
|
||||
_cachedPlaylists = [
|
||||
..._cachedPlaylists.where((p) => !playlistIds.contains(p.itemId)),
|
||||
...playlists,
|
||||
];
|
||||
} else {
|
||||
// Full sync: replace entire cache
|
||||
_cachedAlbums = albums;
|
||||
_cachedArtists = artists;
|
||||
_cachedAudiobooks = audiobooks;
|
||||
_cachedPlaylists = playlists;
|
||||
}
|
||||
// Atomically swap in the new source tracking maps
|
||||
// This ensures filtering always sees complete data, never partial
|
||||
_albumSourceProviders = newAlbumSourceProviders;
|
||||
_artistSourceProviders = newArtistSourceProviders;
|
||||
_audiobookSourceProviders = newAudiobookSourceProviders;
|
||||
_playlistSourceProviders = newPlaylistSourceProviders;
|
||||
|
||||
_cachedAlbums = albums;
|
||||
_cachedArtists = artists;
|
||||
_cachedAudiobooks = audiobooks;
|
||||
_cachedPlaylists = playlists;
|
||||
_lastSyncTime = DateTime.now();
|
||||
_status = SyncStatus.completed;
|
||||
|
||||
_logger.log('✅ Library sync complete');
|
||||
_logger.log('📊 Source tracking: ${_albumSourceProviders.length} albums, ${_artistSourceProviders.length} artists, ${_audiobookSourceProviders.length} audiobooks have provider info');
|
||||
} catch (e) {
|
||||
_logger.log('❌ Library sync failed: $e');
|
||||
_status = SyncStatus.error;
|
||||
@@ -392,93 +210,77 @@ class SyncService with ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
/// Save albums to database cache with source provider tracking (batched)
|
||||
Future<void> _saveAlbumsToCache(List<Album> albums, Map<String, List<String>> sourceProviders) async {
|
||||
final batchItems = <BatchCacheItem>[];
|
||||
/// Save albums to database cache
|
||||
Future<void> _saveAlbumsToCache(List<Album> albums) async {
|
||||
for (final album in albums) {
|
||||
final providers = sourceProviders[album.itemId] ?? <String>[];
|
||||
batchItems.add(BatchCacheItem(
|
||||
itemType: 'album',
|
||||
itemId: album.itemId,
|
||||
data: jsonEncode(album.toJson()),
|
||||
sourceProviders: providers,
|
||||
));
|
||||
}
|
||||
try {
|
||||
await _db.batchCacheItems(batchItems);
|
||||
_logger.log('💾 Batch saved ${albums.length} albums to cache');
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to batch cache albums: $e');
|
||||
try {
|
||||
await _db.cacheItem(
|
||||
itemType: 'album',
|
||||
itemId: album.itemId,
|
||||
data: album.toJson(),
|
||||
);
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to cache album ${album.name}: $e');
|
||||
}
|
||||
}
|
||||
_logger.log('💾 Saved ${albums.length} albums to cache');
|
||||
}
|
||||
|
||||
/// Save artists to database cache with source provider tracking (batched)
|
||||
Future<void> _saveArtistsToCache(List<Artist> artists, Map<String, List<String>> sourceProviders) async {
|
||||
final batchItems = <BatchCacheItem>[];
|
||||
/// Save artists to database cache
|
||||
Future<void> _saveArtistsToCache(List<Artist> artists) async {
|
||||
for (final artist in artists) {
|
||||
final providers = sourceProviders[artist.itemId] ?? <String>[];
|
||||
batchItems.add(BatchCacheItem(
|
||||
itemType: 'artist',
|
||||
itemId: artist.itemId,
|
||||
data: jsonEncode(artist.toJson()),
|
||||
sourceProviders: providers,
|
||||
));
|
||||
}
|
||||
try {
|
||||
await _db.batchCacheItems(batchItems);
|
||||
_logger.log('💾 Batch saved ${artists.length} artists to cache');
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to batch cache artists: $e');
|
||||
try {
|
||||
await _db.cacheItem(
|
||||
itemType: 'artist',
|
||||
itemId: artist.itemId,
|
||||
data: artist.toJson(),
|
||||
);
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to cache artist ${artist.name}: $e');
|
||||
}
|
||||
}
|
||||
_logger.log('💾 Saved ${artists.length} artists to cache');
|
||||
}
|
||||
|
||||
/// Save audiobooks to database cache with source provider tracking (batched)
|
||||
Future<void> _saveAudiobooksToCache(List<Audiobook> audiobooks, Map<String, List<String>> sourceProviders) async {
|
||||
final batchItems = <BatchCacheItem>[];
|
||||
/// Save audiobooks to database cache
|
||||
Future<void> _saveAudiobooksToCache(List<Audiobook> audiobooks) async {
|
||||
for (final audiobook in audiobooks) {
|
||||
final providers = sourceProviders[audiobook.itemId] ?? <String>[];
|
||||
batchItems.add(BatchCacheItem(
|
||||
itemType: 'audiobook',
|
||||
itemId: audiobook.itemId,
|
||||
data: jsonEncode(audiobook.toJson()),
|
||||
sourceProviders: providers,
|
||||
));
|
||||
}
|
||||
try {
|
||||
await _db.batchCacheItems(batchItems);
|
||||
_logger.log('💾 Batch saved ${audiobooks.length} audiobooks to cache');
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to batch cache audiobooks: $e');
|
||||
try {
|
||||
await _db.cacheItem(
|
||||
itemType: 'audiobook',
|
||||
itemId: audiobook.itemId,
|
||||
data: audiobook.toJson(),
|
||||
);
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to cache audiobook ${audiobook.name}: $e');
|
||||
}
|
||||
}
|
||||
_logger.log('💾 Saved ${audiobooks.length} audiobooks to cache');
|
||||
}
|
||||
|
||||
/// Save playlists to database cache with source provider tracking (batched)
|
||||
Future<void> _savePlaylistsToCache(List<Playlist> playlists, Map<String, List<String>> sourceProviders) async {
|
||||
final batchItems = <BatchCacheItem>[];
|
||||
/// Save playlists to database cache
|
||||
Future<void> _savePlaylistsToCache(List<Playlist> playlists) async {
|
||||
for (final playlist in playlists) {
|
||||
final providers = sourceProviders[playlist.itemId] ?? <String>[];
|
||||
batchItems.add(BatchCacheItem(
|
||||
itemType: 'playlist',
|
||||
itemId: playlist.itemId,
|
||||
data: jsonEncode(playlist.toJson()),
|
||||
sourceProviders: providers,
|
||||
));
|
||||
}
|
||||
try {
|
||||
await _db.batchCacheItems(batchItems);
|
||||
_logger.log('💾 Batch saved ${playlists.length} playlists to cache');
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to batch cache playlists: $e');
|
||||
try {
|
||||
await _db.cacheItem(
|
||||
itemType: 'playlist',
|
||||
itemId: playlist.itemId,
|
||||
data: playlist.toJson(),
|
||||
);
|
||||
} catch (e) {
|
||||
_logger.log('⚠️ Failed to cache playlist ${playlist.name}: $e');
|
||||
}
|
||||
}
|
||||
_logger.log('💾 Saved ${playlists.length} playlists to cache');
|
||||
}
|
||||
|
||||
/// 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 {
|
||||
await syncFromApi(api, force: true, providerInstanceIds: providerInstanceIds);
|
||||
Future<void> forceSync(MusicAssistantAPI api, {String? provider}) async {
|
||||
await syncFromApi(api, force: true, provider: provider);
|
||||
}
|
||||
|
||||
/// Clear all cached data
|
||||
/// Clear all cached data and reset sync state
|
||||
/// This allows a fresh sync to start even if one was in progress
|
||||
Future<void> clearCache() async {
|
||||
if (!_db.isInitialized) return;
|
||||
|
||||
@@ -487,79 +289,13 @@ class SyncService with ChangeNotifier {
|
||||
_cachedArtists = [];
|
||||
_cachedAudiobooks = [];
|
||||
_cachedPlaylists = [];
|
||||
_albumSourceProviders = {};
|
||||
_artistSourceProviders = {};
|
||||
_audiobookSourceProviders = {};
|
||||
_playlistSourceProviders = {};
|
||||
_lastSyncTime = null;
|
||||
_isSyncing = false; // Reset so a new sync can start
|
||||
_status = SyncStatus.idle;
|
||||
notifyListeners();
|
||||
_logger.log('🗑️ Library cache cleared');
|
||||
_logger.log('🗑️ Library cache cleared (sync state reset)');
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Client-side filtering methods
|
||||
// ============================================
|
||||
|
||||
/// Filter albums by source provider (instant, no network)
|
||||
/// Empty enabledProviderIds = all providers enabled, show everything
|
||||
/// Items without source tracking are HIDDEN (strict mode) to ensure accurate filtering
|
||||
List<Album> getAlbumsFilteredByProviders(Set<String> enabledProviderIds) {
|
||||
if (enabledProviderIds.isEmpty) {
|
||||
return _cachedAlbums;
|
||||
}
|
||||
return _cachedAlbums.where((album) {
|
||||
final sources = _albumSourceProviders[album.itemId];
|
||||
if (sources == null || sources.isEmpty) return false;
|
||||
return sources.any((s) => enabledProviderIds.contains(s));
|
||||
}).toList();
|
||||
}
|
||||
|
||||
/// Filter artists by source provider (instant, no network)
|
||||
List<Artist> getArtistsFilteredByProviders(Set<String> enabledProviderIds) {
|
||||
if (enabledProviderIds.isEmpty) {
|
||||
return _cachedArtists;
|
||||
}
|
||||
return _cachedArtists.where((artist) {
|
||||
final sources = _artistSourceProviders[artist.itemId];
|
||||
if (sources == null || sources.isEmpty) return false;
|
||||
return sources.any((s) => enabledProviderIds.contains(s));
|
||||
}).toList();
|
||||
}
|
||||
|
||||
/// Filter audiobooks by source provider (instant, no network)
|
||||
List<Audiobook> getAudiobooksFilteredByProviders(Set<String> enabledProviderIds) {
|
||||
if (enabledProviderIds.isEmpty) {
|
||||
return _cachedAudiobooks;
|
||||
}
|
||||
return _cachedAudiobooks.where((audiobook) {
|
||||
final sources = _audiobookSourceProviders[audiobook.itemId];
|
||||
// STRICT MODE: Hide items without tracking
|
||||
if (sources == null || sources.isEmpty) return false;
|
||||
return sources.any((s) => enabledProviderIds.contains(s));
|
||||
}).toList();
|
||||
}
|
||||
|
||||
/// Filter playlists by source provider (instant, no network)
|
||||
List<Playlist> getPlaylistsFilteredByProviders(Set<String> enabledProviderIds) {
|
||||
if (enabledProviderIds.isEmpty) {
|
||||
return _cachedPlaylists;
|
||||
}
|
||||
return _cachedPlaylists.where((playlist) {
|
||||
final sources = _playlistSourceProviders[playlist.itemId];
|
||||
// STRICT MODE: Hide items without tracking
|
||||
if (sources == null || sources.isEmpty) return false;
|
||||
return sources.any((s) => enabledProviderIds.contains(s));
|
||||
}).toList();
|
||||
}
|
||||
|
||||
/// Check if we have source provider tracking data
|
||||
bool get hasSourceTracking =>
|
||||
_albumSourceProviders.isNotEmpty ||
|
||||
_artistSourceProviders.isNotEmpty ||
|
||||
_audiobookSourceProviders.isNotEmpty ||
|
||||
_playlistSourceProviders.isNotEmpty;
|
||||
|
||||
/// Get albums (from cache or empty if not loaded)
|
||||
List<Album> getAlbums() => _cachedAlbums;
|
||||
|
||||
@@ -575,99 +311,4 @@ class SyncService with ChangeNotifier {
|
||||
/// Check if we have data available (from cache or sync)
|
||||
bool get hasData => _cachedAlbums.isNotEmpty || _cachedArtists.isNotEmpty ||
|
||||
_cachedAudiobooks.isNotEmpty || _cachedPlaylists.isNotEmpty;
|
||||
|
||||
/// Update cached albums with sorted data from provider
|
||||
/// Used when sort order changes - preserves source provider tracking
|
||||
void updateCachedAlbums(List<Album> albums) {
|
||||
_cachedAlbums = albums;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Update cached artists with sorted data from provider
|
||||
/// Used when sort order changes - preserves source provider tracking
|
||||
void updateCachedArtists(List<Artist> artists) {
|
||||
_cachedArtists = artists;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Update cached playlists with sorted data from provider
|
||||
/// Used when sort order changes - preserves source provider tracking
|
||||
void updateCachedPlaylists(List<Playlist> playlists) {
|
||||
_cachedPlaylists = playlists;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Remove an item from in-memory cache by library ID
|
||||
/// Called when an item is removed from library to keep SyncService in sync
|
||||
void removeFromCacheByLibraryId(String mediaType, int libraryItemId) {
|
||||
final libraryIdStr = libraryItemId.toString();
|
||||
bool updated = false;
|
||||
|
||||
// Helper to check if item matches the library ID being removed
|
||||
bool matchesLibraryId(String? provider, String? itemId, List<ProviderMapping>? mappings) {
|
||||
if (provider == 'library' && itemId == libraryIdStr) return true;
|
||||
if (mappings != null) {
|
||||
for (final m in mappings) {
|
||||
if ((m.providerInstance == 'library' || m.providerDomain == 'library') &&
|
||||
m.itemId == libraryIdStr) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
switch (mediaType) {
|
||||
case 'album':
|
||||
final before = _cachedAlbums.length;
|
||||
_cachedAlbums = _cachedAlbums.where((a) =>
|
||||
!matchesLibraryId(a.provider, a.itemId, a.providerMappings)
|
||||
).toList();
|
||||
updated = _cachedAlbums.length != before;
|
||||
// Also remove from source provider tracking
|
||||
if (updated) {
|
||||
_albumSourceProviders.removeWhere((key, _) =>
|
||||
_cachedAlbums.every((a) => a.itemId != key));
|
||||
}
|
||||
break;
|
||||
case 'artist':
|
||||
final before = _cachedArtists.length;
|
||||
_cachedArtists = _cachedArtists.where((a) =>
|
||||
!matchesLibraryId(a.provider, a.itemId, a.providerMappings)
|
||||
).toList();
|
||||
updated = _cachedArtists.length != before;
|
||||
if (updated) {
|
||||
_artistSourceProviders.removeWhere((key, _) =>
|
||||
_cachedArtists.every((a) => a.itemId != key));
|
||||
}
|
||||
break;
|
||||
case 'audiobook':
|
||||
final before = _cachedAudiobooks.length;
|
||||
_cachedAudiobooks = _cachedAudiobooks.where((a) =>
|
||||
!matchesLibraryId(a.provider, a.itemId, a.providerMappings)
|
||||
).toList();
|
||||
updated = _cachedAudiobooks.length != before;
|
||||
if (updated) {
|
||||
_audiobookSourceProviders.removeWhere((key, _) =>
|
||||
_cachedAudiobooks.every((a) => a.itemId != key));
|
||||
}
|
||||
break;
|
||||
case 'playlist':
|
||||
final before = _cachedPlaylists.length;
|
||||
_cachedPlaylists = _cachedPlaylists.where((p) =>
|
||||
!matchesLibraryId(p.provider, p.itemId, p.providerMappings)
|
||||
).toList();
|
||||
updated = _cachedPlaylists.length != before;
|
||||
if (updated) {
|
||||
_playlistSourceProviders.removeWhere((key, _) =>
|
||||
_cachedPlaylists.every((p) => p.itemId != key));
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (updated) {
|
||||
_logger.log('🗑️ Removed $mediaType with libraryId=$libraryItemId from SyncService cache');
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ class AppTheme {
|
||||
foregroundColor: scheme.onBackground,
|
||||
iconTheme: IconThemeData(color: scheme.onBackground),
|
||||
),
|
||||
cardTheme: CardThemeData(
|
||||
cardTheme: CardTheme(
|
||||
color: scheme.surface,
|
||||
elevation: 2,
|
||||
),
|
||||
@@ -91,7 +91,7 @@ class AppTheme {
|
||||
foregroundColor: scheme.onBackground,
|
||||
iconTheme: IconThemeData(color: scheme.onBackground),
|
||||
),
|
||||
cardTheme: CardThemeData(
|
||||
cardTheme: CardTheme(
|
||||
color: scheme.surface,
|
||||
elevation: 2,
|
||||
),
|
||||
|
||||
@@ -129,31 +129,13 @@ class Durations {
|
||||
class ButtonSizes {
|
||||
ButtonSizes._();
|
||||
|
||||
// Touch target sizes
|
||||
// WCAG 2.1 Level AA requires minimum 44x44, Level AAA requires 48x48
|
||||
// Material Design recommends 48x48 minimum
|
||||
// WARNING: sm and md are below WCAG minimum - use only for non-interactive elements
|
||||
|
||||
/// 32x32 - NOT WCAG compliant, use only for decorative/non-interactive elements
|
||||
@Deprecated('Use xl (48x48) for touch targets to meet WCAG accessibility guidelines')
|
||||
// Touch target sizes (Material Design minimum: 48x48)
|
||||
static const double sm = 32.0;
|
||||
|
||||
/// 36x36 - NOT WCAG compliant, use only for dense layouts where space is critical
|
||||
@Deprecated('Use xl (48x48) for touch targets to meet WCAG accessibility guidelines')
|
||||
static const double md = 36.0;
|
||||
|
||||
/// 44x44 - Meets WCAG Level AA minimum
|
||||
static const double lg = 44.0;
|
||||
|
||||
/// 48x48 - Meets WCAG Level AAA and Material Design recommended minimum
|
||||
static const double xl = 48.0;
|
||||
|
||||
/// 56x56 - Comfortable touch target for primary actions
|
||||
static const double xxl = 56.0;
|
||||
|
||||
/// Minimum WCAG-compliant touch target size (48x48)
|
||||
static const double minAccessible = 48.0;
|
||||
|
||||
// Icon sizes within buttons
|
||||
static const double iconSm = 16.0;
|
||||
static const double iconMd = 18.0;
|
||||
|
||||
+49
-470
@@ -1,25 +1,9 @@
|
||||
import 'dart:math' as math;
|
||||
import 'dart:typed_data';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:material_color_utilities/material_color_utilities.dart';
|
||||
import 'package:palette_generator/palette_generator.dart';
|
||||
import 'package:image/image.dart' as img;
|
||||
import 'package:http/http.dart' as http;
|
||||
import '../services/debug_logger.dart';
|
||||
|
||||
final _logger = DebugLogger();
|
||||
|
||||
/// Minimum contrast ratio for UI components (WCAG 2.1 Level AA)
|
||||
const double _minContrastRatio = 3.0;
|
||||
|
||||
/// Minimum chroma for primary colors to ensure they're visually distinct
|
||||
/// Material Design 3 uses 48 for vibrant, but we use 36 as a balance
|
||||
const double _minPrimaryChroma = 36.0;
|
||||
|
||||
/// Minimum chroma for surface/container colors (lower is fine for backgrounds)
|
||||
const double _minSurfaceChroma = 6.0;
|
||||
|
||||
/// Extracted adaptive colors from album art
|
||||
class AdaptiveColors {
|
||||
final Color primary; // Main accent color (vibrant)
|
||||
@@ -42,398 +26,15 @@ class AdaptiveColors {
|
||||
);
|
||||
}
|
||||
|
||||
/// Data class to pass color extraction results from isolate
|
||||
/// (Color objects can't be passed directly between isolates)
|
||||
class _ExtractedColors {
|
||||
final int vibrantColor;
|
||||
final int lightVibrantColor;
|
||||
final int dominantColor;
|
||||
final int darkMutedColor;
|
||||
final int mutedColor;
|
||||
final int lightMutedColor;
|
||||
|
||||
const _ExtractedColors({
|
||||
required this.vibrantColor,
|
||||
required this.lightVibrantColor,
|
||||
required this.dominantColor,
|
||||
required this.darkMutedColor,
|
||||
required this.mutedColor,
|
||||
required this.lightMutedColor,
|
||||
});
|
||||
}
|
||||
|
||||
/// Calculate WCAG 2.1 contrast ratio between two colors
|
||||
double _contrastRatio(Color c1, Color c2) {
|
||||
final l1 = c1.computeLuminance();
|
||||
final l2 = c2.computeLuminance();
|
||||
final lighter = math.max(l1, l2);
|
||||
final darker = math.min(l1, l2);
|
||||
return (lighter + 0.05) / (darker + 0.05);
|
||||
}
|
||||
|
||||
/// Helper to get contrasting text color based on WCAG contrast ratio
|
||||
/// Helper to get contrasting text color based on background luminance
|
||||
Color getContrastingTextColor(Color backgroundColor) {
|
||||
// Calculate contrast with both black and white, pick the one with better contrast
|
||||
final contrastWithWhite = _contrastRatio(backgroundColor, Colors.white);
|
||||
final contrastWithBlack = _contrastRatio(backgroundColor, Colors.black);
|
||||
return contrastWithWhite >= contrastWithBlack ? Colors.white : Colors.black;
|
||||
}
|
||||
|
||||
/// Adjust a color's tone using HCT to ensure minimum contrast against a background
|
||||
/// Uses binary search to find the MINIMUM tone adjustment needed (preserves color identity)
|
||||
Color _ensureContrastHct(Color foreground, Color background, {double minRatio = _minContrastRatio}) {
|
||||
final fgHct = Hct.fromInt(foreground.value);
|
||||
final bgHct = Hct.fromInt(background.value);
|
||||
|
||||
// Ensure foreground has enough chroma to be visually distinct
|
||||
final chroma = math.max(fgHct.chroma, _minPrimaryChroma);
|
||||
|
||||
final currentRatio = _contrastRatio(foreground, background);
|
||||
if (currentRatio >= minRatio) {
|
||||
// Already has sufficient contrast, just ensure chroma
|
||||
if (fgHct.chroma < _minPrimaryChroma) {
|
||||
return Color(Hct.from(fgHct.hue, chroma, fgHct.tone).toInt());
|
||||
}
|
||||
return foreground;
|
||||
}
|
||||
|
||||
// For dark backgrounds (tone < 50), we need lighter foreground
|
||||
// For light backgrounds (tone >= 50), we need darker foreground
|
||||
final bgIsDark = bgHct.tone < 50;
|
||||
|
||||
// Binary search for the minimum tone that achieves target contrast
|
||||
double lo, hi;
|
||||
if (bgIsDark) {
|
||||
// Search upward from current tone toward white
|
||||
lo = fgHct.tone;
|
||||
hi = 100.0;
|
||||
} else {
|
||||
// Search downward from current tone toward black
|
||||
lo = 0.0;
|
||||
hi = fgHct.tone;
|
||||
}
|
||||
|
||||
double bestTone = bgIsDark ? hi : lo; // Fallback to extreme if needed
|
||||
|
||||
for (int i = 0; i < 20; i++) {
|
||||
final mid = (lo + hi) / 2;
|
||||
final testColor = Hct.from(fgHct.hue, chroma, mid);
|
||||
final testRatio = _contrastRatio(Color(testColor.toInt()), background);
|
||||
|
||||
if (bgIsDark) {
|
||||
// We want lighter - if mid works, try lower (closer to original)
|
||||
if (testRatio >= minRatio) {
|
||||
bestTone = mid;
|
||||
hi = mid; // Try to find a lower tone that still works
|
||||
} else {
|
||||
lo = mid; // Need to go lighter
|
||||
}
|
||||
} else {
|
||||
// We want darker - if mid works, try higher (closer to original)
|
||||
if (testRatio >= minRatio) {
|
||||
bestTone = mid;
|
||||
lo = mid; // Try to find a higher tone that still works
|
||||
} else {
|
||||
hi = mid; // Need to go darker
|
||||
}
|
||||
}
|
||||
|
||||
if (hi - lo < 0.5) break; // Precision reached
|
||||
}
|
||||
|
||||
return Color(Hct.from(fgHct.hue, chroma, bestTone).toInt());
|
||||
}
|
||||
|
||||
/// Ensure a color has minimum chroma (colorfulness) for primary use
|
||||
Color _ensureMinChroma(Color color) {
|
||||
final hct = Hct.fromInt(color.value);
|
||||
if (hct.chroma >= _minPrimaryChroma) {
|
||||
return color;
|
||||
}
|
||||
final adjusted = Hct.from(hct.hue, _minPrimaryChroma, hct.tone);
|
||||
return Color(adjusted.toInt());
|
||||
}
|
||||
|
||||
/// Top-level function for isolate-based color extraction
|
||||
/// Must be top-level or static to work with compute()
|
||||
_ExtractedColors? _extractColorsInIsolate(Uint8List imageBytes) {
|
||||
try {
|
||||
// Decode image using pure Dart image package
|
||||
final image = img.decodeImage(imageBytes);
|
||||
if (image == null) return null;
|
||||
|
||||
// Resize for faster processing (max 100x100)
|
||||
final resized = img.copyResize(
|
||||
image,
|
||||
width: image.width > 100 ? 100 : image.width,
|
||||
height: image.height > 100 ? 100 : image.height,
|
||||
interpolation: img.Interpolation.average,
|
||||
);
|
||||
|
||||
// Extract color histogram
|
||||
final colorCounts = <int, int>{};
|
||||
for (int y = 0; y < resized.height; y++) {
|
||||
for (int x = 0; x < resized.width; x++) {
|
||||
final pixel = resized.getPixel(x, y);
|
||||
// Quantize to reduce color space (shift off lower 4 bits)
|
||||
final r = (pixel.r.toInt() >> 4) << 4;
|
||||
final g = (pixel.g.toInt() >> 4) << 4;
|
||||
final b = (pixel.b.toInt() >> 4) << 4;
|
||||
final quantized = (0xFF << 24) | (r << 16) | (g << 8) | b;
|
||||
colorCounts[quantized] = (colorCounts[quantized] ?? 0) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
// Sort colors by frequency
|
||||
final sortedColors = colorCounts.entries.toList()
|
||||
..sort((a, b) => b.value.compareTo(a.value));
|
||||
|
||||
if (sortedColors.isEmpty) return null;
|
||||
|
||||
// Categorize colors by HSL properties
|
||||
int? vibrant, lightVibrant, dominant, darkMuted, muted, lightMuted;
|
||||
|
||||
for (final entry in sortedColors.take(32)) {
|
||||
final color = entry.key;
|
||||
final r = (color >> 16) & 0xFF;
|
||||
final g = (color >> 8) & 0xFF;
|
||||
final b = color & 0xFF;
|
||||
|
||||
// Calculate HSL manually
|
||||
final rf = r / 255.0;
|
||||
final gf = g / 255.0;
|
||||
final bf = b / 255.0;
|
||||
final maxC = [rf, gf, bf].reduce((a, b) => a > b ? a : b);
|
||||
final minC = [rf, gf, bf].reduce((a, b) => a < b ? a : b);
|
||||
final lightness = (maxC + minC) / 2;
|
||||
final saturation = maxC == minC ? 0.0 :
|
||||
(lightness > 0.5
|
||||
? (maxC - minC) / (2 - maxC - minC)
|
||||
: (maxC - minC) / (maxC + minC));
|
||||
|
||||
// Categorize based on saturation and lightness
|
||||
if (saturation > 0.5 && lightness > 0.3 && lightness < 0.7) {
|
||||
vibrant ??= color;
|
||||
}
|
||||
if (saturation > 0.4 && lightness > 0.6) {
|
||||
lightVibrant ??= color;
|
||||
}
|
||||
if (saturation < 0.4 && lightness < 0.3) {
|
||||
darkMuted ??= color;
|
||||
}
|
||||
if (saturation < 0.4 && lightness > 0.3 && lightness < 0.7) {
|
||||
muted ??= color;
|
||||
}
|
||||
if (saturation < 0.4 && lightness > 0.7) {
|
||||
lightMuted ??= color;
|
||||
}
|
||||
|
||||
// First color is dominant
|
||||
dominant ??= color;
|
||||
}
|
||||
|
||||
// Fallback to dominant for any missing colors
|
||||
final defaultColor = dominant ?? sortedColors.first.key;
|
||||
|
||||
return _ExtractedColors(
|
||||
vibrantColor: vibrant ?? defaultColor,
|
||||
lightVibrantColor: lightVibrant ?? vibrant ?? defaultColor,
|
||||
dominantColor: dominant ?? defaultColor,
|
||||
darkMutedColor: darkMuted ?? defaultColor,
|
||||
mutedColor: muted ?? defaultColor,
|
||||
lightMutedColor: lightMuted ?? muted ?? defaultColor,
|
||||
);
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
// Use relative luminance to determine if we need light or dark text
|
||||
// Standard threshold is 0.179 based on WCAG guidelines
|
||||
return backgroundColor.computeLuminance() > 0.4 ? Colors.black : Colors.white;
|
||||
}
|
||||
|
||||
class PaletteHelper {
|
||||
/// Cache for downloaded image bytes to avoid re-downloading
|
||||
static final Map<String, Uint8List> _imageCache = {};
|
||||
static const int _maxCacheSize = 20;
|
||||
|
||||
/// Cache for extracted color schemes to avoid re-processing
|
||||
static final Map<String, (ColorScheme, ColorScheme)> _colorSchemeCache = {};
|
||||
static const int _maxColorSchemeCacheSize = 30;
|
||||
|
||||
/// Extract color schemes from a URL using isolate-based processing
|
||||
/// This is the preferred method as it doesn't block the main thread
|
||||
/// Results are cached for instant retrieval on subsequent calls
|
||||
static Future<(ColorScheme, ColorScheme)?> extractColorSchemesFromUrl(String imageUrl) async {
|
||||
try {
|
||||
// Check color scheme cache first for instant return
|
||||
final cachedSchemes = _colorSchemeCache[imageUrl];
|
||||
if (cachedSchemes != null) {
|
||||
return cachedSchemes;
|
||||
}
|
||||
|
||||
// Check image bytes cache
|
||||
Uint8List? imageBytes = _imageCache[imageUrl];
|
||||
|
||||
if (imageBytes == null) {
|
||||
// Download image bytes
|
||||
final response = await http.get(Uri.parse(imageUrl));
|
||||
if (response.statusCode != 200) {
|
||||
_logger.warning('Failed to download image: ${response.statusCode}', context: 'Palette');
|
||||
return null;
|
||||
}
|
||||
imageBytes = response.bodyBytes;
|
||||
|
||||
// Cache the bytes
|
||||
if (_imageCache.length >= _maxCacheSize) {
|
||||
_imageCache.remove(_imageCache.keys.first);
|
||||
}
|
||||
_imageCache[imageUrl] = imageBytes;
|
||||
}
|
||||
|
||||
// Extract colors in isolate
|
||||
final extractedColors = await compute(_extractColorsInIsolate, imageBytes);
|
||||
if (extractedColors == null) return null;
|
||||
|
||||
// Convert to ColorSchemes on main thread
|
||||
final colorSchemes = _buildColorSchemes(extractedColors);
|
||||
|
||||
// Cache the color schemes for instant access next time
|
||||
if (_colorSchemeCache.length >= _maxColorSchemeCacheSize) {
|
||||
_colorSchemeCache.remove(_colorSchemeCache.keys.first);
|
||||
}
|
||||
_colorSchemeCache[imageUrl] = colorSchemes;
|
||||
|
||||
return colorSchemes;
|
||||
} catch (e) {
|
||||
_logger.warning('Failed to extract colors from URL: $e', context: 'Palette');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// Build ColorSchemes from extracted color data using HCT color space
|
||||
static (ColorScheme, ColorScheme) _buildColorSchemes(_ExtractedColors colors) {
|
||||
// Convert int colors to Color objects
|
||||
final vibrant = Color(colors.vibrantColor);
|
||||
final lightVibrant = Color(colors.lightVibrantColor);
|
||||
final dominant = Color(colors.dominantColor);
|
||||
final darkMuted = Color(colors.darkMutedColor);
|
||||
final muted = Color(colors.mutedColor);
|
||||
final lightMuted = Color(colors.lightMutedColor);
|
||||
|
||||
// Get primary color - prefer vibrant, then lightVibrant, then dominant
|
||||
Color primary = vibrant;
|
||||
final vibrantHct = Hct.fromInt(vibrant.value);
|
||||
if (vibrantHct.tone < 20 || vibrantHct.chroma < 8) {
|
||||
primary = lightVibrant;
|
||||
}
|
||||
final primaryHct = Hct.fromInt(primary.value);
|
||||
if (primaryHct.tone < 20 || primaryHct.chroma < 8) {
|
||||
primary = dominant;
|
||||
}
|
||||
|
||||
// Use HCT for perceptually accurate color adjustment
|
||||
// Ensure minimum chroma (colorfulness) so colors aren't muddy
|
||||
Color adjustedPrimary = _ensureMinChroma(primary);
|
||||
|
||||
// Build dark mode colors using HCT
|
||||
final darkMutedHct = Hct.fromInt(darkMuted.value);
|
||||
final darkSurface = Color(Hct.from(
|
||||
darkMutedHct.hue,
|
||||
math.min(darkMutedHct.chroma, _minSurfaceChroma), // Low chroma for surface
|
||||
math.max(darkMutedHct.tone * 0.3, 5.0).clamp(5.0, 15.0), // Very dark
|
||||
).toInt());
|
||||
final darkMiniPlayer = Color(Hct.from(
|
||||
darkMutedHct.hue,
|
||||
(darkMutedHct.chroma * 1.2).clamp(4, 16),
|
||||
30, // Fixed tone for consistency
|
||||
).toInt());
|
||||
|
||||
// Build light mode colors using HCT
|
||||
final lightMutedHct = Hct.fromInt(lightMuted.value);
|
||||
final lightSurface = Color(Hct.from(
|
||||
lightMutedHct.hue,
|
||||
math.min(lightMutedHct.chroma, _minSurfaceChroma),
|
||||
95, // Very light
|
||||
).toInt());
|
||||
final lightMiniPlayer = Color(Hct.from(
|
||||
lightMutedHct.hue,
|
||||
(lightMutedHct.chroma * 1.2).clamp(4, 16),
|
||||
75,
|
||||
).toInt());
|
||||
|
||||
// Generate secondary container colors using HCT
|
||||
// Dark secondary container at tone 25 for tonal buttons
|
||||
final primaryHctFinal = Hct.fromInt(adjustedPrimary.value);
|
||||
final darkSecondaryContainer = Color(Hct.from(
|
||||
primaryHctFinal.hue,
|
||||
(primaryHctFinal.chroma * 0.4).clamp(4, 16),
|
||||
25, // Fixed tone for dark mode tonal buttons
|
||||
).toInt());
|
||||
final lightSecondaryContainer = Color(Hct.from(
|
||||
primaryHctFinal.hue,
|
||||
(primaryHctFinal.chroma * 0.3).clamp(4, 12),
|
||||
90, // Fixed tone for light mode tonal buttons
|
||||
).toInt());
|
||||
|
||||
// CRITICAL: Ensure primary has sufficient contrast against secondaryContainer
|
||||
// This guarantees highlighted icons are visible on tonal buttons
|
||||
final darkAdjustedPrimary = _ensureContrastHct(
|
||||
adjustedPrimary,
|
||||
darkSecondaryContainer,
|
||||
minRatio: _minContrastRatio,
|
||||
);
|
||||
final lightAdjustedPrimary = _ensureContrastHct(
|
||||
adjustedPrimary,
|
||||
lightSecondaryContainer,
|
||||
minRatio: _minContrastRatio,
|
||||
);
|
||||
|
||||
// Determine contrasting text colors
|
||||
final lightOnPrimary = getContrastingTextColor(lightAdjustedPrimary);
|
||||
final darkOnPrimary = getContrastingTextColor(darkAdjustedPrimary);
|
||||
final lightOnMiniPlayer = getContrastingTextColor(lightMiniPlayer);
|
||||
final darkOnMiniPlayer = getContrastingTextColor(darkMiniPlayer);
|
||||
|
||||
final lightScheme = ColorScheme(
|
||||
brightness: Brightness.light,
|
||||
primary: lightAdjustedPrimary,
|
||||
onPrimary: lightOnPrimary,
|
||||
secondary: lightAdjustedPrimary.withOpacity(0.8),
|
||||
onSecondary: lightOnPrimary,
|
||||
secondaryContainer: lightSecondaryContainer,
|
||||
onSecondaryContainer: Colors.black87,
|
||||
error: Colors.red,
|
||||
onError: Colors.white,
|
||||
surface: lightSurface,
|
||||
onSurface: Colors.black87,
|
||||
primaryContainer: lightMiniPlayer,
|
||||
onPrimaryContainer: lightOnMiniPlayer,
|
||||
);
|
||||
|
||||
final darkScheme = ColorScheme(
|
||||
brightness: Brightness.dark,
|
||||
primary: darkAdjustedPrimary,
|
||||
onPrimary: darkOnPrimary,
|
||||
secondary: darkAdjustedPrimary.withOpacity(0.8),
|
||||
onSecondary: darkOnPrimary,
|
||||
secondaryContainer: darkSecondaryContainer,
|
||||
onSecondaryContainer: Colors.white,
|
||||
error: Colors.redAccent,
|
||||
onError: Colors.black,
|
||||
surface: darkSurface,
|
||||
onSurface: Colors.white,
|
||||
primaryContainer: darkMiniPlayer,
|
||||
onPrimaryContainer: darkOnMiniPlayer,
|
||||
);
|
||||
|
||||
return (lightScheme, darkScheme);
|
||||
}
|
||||
|
||||
/// Clear all caches (image bytes and color schemes)
|
||||
static void clearCache() {
|
||||
_imageCache.clear();
|
||||
_colorSchemeCache.clear();
|
||||
}
|
||||
|
||||
/// Extract a color palette from an image with higher color count for better variety
|
||||
/// NOTE: This runs on the main thread. Prefer extractColorSchemesFromUrl for better performance.
|
||||
static Future<PaletteGenerator?> extractPalette(ImageProvider imageProvider) async {
|
||||
try {
|
||||
final palette = await PaletteGenerator.fromImageProvider(
|
||||
@@ -447,7 +48,7 @@ class PaletteHelper {
|
||||
}
|
||||
}
|
||||
|
||||
/// Extract actual colors from the palette using HCT color space
|
||||
/// Extract actual colors from the palette (not seed-based)
|
||||
static AdaptiveColors? extractAdaptiveColors(PaletteGenerator? palette, {required bool isDark}) {
|
||||
if (palette == null) return null;
|
||||
|
||||
@@ -457,9 +58,22 @@ class PaletteHelper {
|
||||
palette.dominantColor?.color ??
|
||||
const Color(0xFF604CEC);
|
||||
|
||||
// Use HCT for perceptually accurate color adjustment
|
||||
// Ensure minimum chroma (colorfulness) so colors aren't muddy
|
||||
Color adjustedPrimary = _ensureMinChroma(primary);
|
||||
// Ensure primary has enough saturation to be visually distinct
|
||||
// AND enough lightness for white text to be readable on it
|
||||
final HSLColor hslPrimary = HSLColor.fromColor(primary);
|
||||
Color adjustedPrimary = primary;
|
||||
|
||||
// Adjust saturation if too low
|
||||
if (hslPrimary.saturation < 0.3) {
|
||||
adjustedPrimary = hslPrimary.withSaturation(0.5).toColor();
|
||||
}
|
||||
|
||||
// Ensure minimum lightness for contrast with white text
|
||||
// If primary is too dark (luminance < 0.15), lighten it
|
||||
if (adjustedPrimary.computeLuminance() < 0.15) {
|
||||
final hsl = HSLColor.fromColor(adjustedPrimary);
|
||||
adjustedPrimary = hsl.withLightness((hsl.lightness + 0.25).clamp(0.3, 0.6)).toColor();
|
||||
}
|
||||
|
||||
if (isDark) {
|
||||
// Dark mode: use dark muted colors for background
|
||||
@@ -467,19 +81,18 @@ class PaletteHelper {
|
||||
palette.mutedColor?.color ??
|
||||
const Color(0xFF121212);
|
||||
|
||||
// Build surface colors using HCT
|
||||
final surfaceHct = Hct.fromInt(surfaceBase.value);
|
||||
final Color surface = Color(Hct.from(
|
||||
surfaceHct.hue,
|
||||
math.min(surfaceHct.chroma, _minSurfaceChroma),
|
||||
math.max(surfaceHct.tone * 0.3, 5.0).clamp(5.0, 15.0),
|
||||
).toInt());
|
||||
// Darken the surface color significantly for the expanded background
|
||||
final HSLColor hslSurface = HSLColor.fromColor(surfaceBase);
|
||||
final Color surface = hslSurface
|
||||
.withLightness((hslSurface.lightness * 0.3).clamp(0.05, 0.15))
|
||||
.toColor();
|
||||
|
||||
final Color miniPlayer = Color(Hct.from(
|
||||
surfaceHct.hue,
|
||||
(surfaceHct.chroma * 1.2).clamp(4, 16),
|
||||
30,
|
||||
).toInt());
|
||||
// Mini player should be medium brightness - noticeably tinted but readable
|
||||
// Use the muted color but at medium lightness (0.25-0.35 range)
|
||||
final Color miniPlayer = hslSurface
|
||||
.withLightness(0.3.clamp(0.25, 0.38))
|
||||
.withSaturation((hslSurface.saturation * 1.2).clamp(0.15, 0.5))
|
||||
.toColor();
|
||||
|
||||
return AdaptiveColors(
|
||||
primary: adjustedPrimary,
|
||||
@@ -493,18 +106,16 @@ class PaletteHelper {
|
||||
palette.mutedColor?.color ??
|
||||
Colors.white;
|
||||
|
||||
final surfaceHct = Hct.fromInt(surfaceBase.value);
|
||||
final Color surface = Color(Hct.from(
|
||||
surfaceHct.hue,
|
||||
math.min(surfaceHct.chroma, _minSurfaceChroma),
|
||||
95,
|
||||
).toInt());
|
||||
final HSLColor hslSurface = HSLColor.fromColor(surfaceBase);
|
||||
final Color surface = hslSurface
|
||||
.withLightness((hslSurface.lightness).clamp(0.92, 0.98))
|
||||
.toColor();
|
||||
|
||||
final Color miniPlayer = Color(Hct.from(
|
||||
surfaceHct.hue,
|
||||
(surfaceHct.chroma * 1.2).clamp(4, 16),
|
||||
75,
|
||||
).toInt());
|
||||
// Mini player in light mode - medium tinted
|
||||
final Color miniPlayer = hslSurface
|
||||
.withLightness(0.75.clamp(0.65, 0.8))
|
||||
.withSaturation((hslSurface.saturation * 1.2).clamp(0.15, 0.5))
|
||||
.toColor();
|
||||
|
||||
return AdaptiveColors(
|
||||
primary: adjustedPrimary,
|
||||
@@ -515,7 +126,7 @@ class PaletteHelper {
|
||||
}
|
||||
}
|
||||
|
||||
/// Generate color schemes from a palette using HCT color space
|
||||
/// Generate color schemes from a palette (kept for backward compatibility)
|
||||
static (ColorScheme, ColorScheme)? generateColorSchemes(PaletteGenerator? palette) {
|
||||
if (palette == null) return null;
|
||||
|
||||
@@ -524,47 +135,18 @@ class PaletteHelper {
|
||||
|
||||
if (lightColors == null || darkColors == null) return null;
|
||||
|
||||
// Generate secondary container colors using HCT
|
||||
final lightPrimaryHct = Hct.fromInt(lightColors.primary.value);
|
||||
final lightSecondaryContainer = Color(Hct.from(
|
||||
lightPrimaryHct.hue,
|
||||
(lightPrimaryHct.chroma * 0.3).clamp(4, 12),
|
||||
90, // Fixed tone for light mode tonal buttons
|
||||
).toInt());
|
||||
|
||||
final darkPrimaryHct = Hct.fromInt(darkColors.primary.value);
|
||||
final darkSecondaryContainer = Color(Hct.from(
|
||||
darkPrimaryHct.hue,
|
||||
(darkPrimaryHct.chroma * 0.4).clamp(4, 16),
|
||||
25, // Fixed tone for dark mode tonal buttons
|
||||
).toInt());
|
||||
|
||||
// CRITICAL: Ensure primary has sufficient contrast against secondaryContainer
|
||||
final lightAdjustedPrimary = _ensureContrastHct(
|
||||
lightColors.primary,
|
||||
lightSecondaryContainer,
|
||||
minRatio: _minContrastRatio,
|
||||
);
|
||||
final darkAdjustedPrimary = _ensureContrastHct(
|
||||
darkColors.primary,
|
||||
darkSecondaryContainer,
|
||||
minRatio: _minContrastRatio,
|
||||
);
|
||||
|
||||
// Determine contrasting text colors
|
||||
final lightOnPrimary = getContrastingTextColor(lightAdjustedPrimary);
|
||||
final darkOnPrimary = getContrastingTextColor(darkAdjustedPrimary);
|
||||
// Determine contrasting text colors based on primary color luminance
|
||||
final lightOnPrimary = getContrastingTextColor(lightColors.primary);
|
||||
final darkOnPrimary = getContrastingTextColor(darkColors.primary);
|
||||
final lightOnMiniPlayer = getContrastingTextColor(lightColors.miniPlayer);
|
||||
final darkOnMiniPlayer = getContrastingTextColor(darkColors.miniPlayer);
|
||||
|
||||
final lightScheme = ColorScheme(
|
||||
brightness: Brightness.light,
|
||||
primary: lightAdjustedPrimary,
|
||||
primary: lightColors.primary,
|
||||
onPrimary: lightOnPrimary,
|
||||
secondary: lightAdjustedPrimary.withOpacity(0.8),
|
||||
secondary: lightColors.primary.withOpacity(0.8),
|
||||
onSecondary: lightOnPrimary,
|
||||
secondaryContainer: lightSecondaryContainer,
|
||||
onSecondaryContainer: Colors.black87,
|
||||
error: Colors.red,
|
||||
onError: Colors.white,
|
||||
surface: lightColors.surface,
|
||||
@@ -575,12 +157,10 @@ class PaletteHelper {
|
||||
|
||||
final darkScheme = ColorScheme(
|
||||
brightness: Brightness.dark,
|
||||
primary: darkAdjustedPrimary,
|
||||
primary: darkColors.primary,
|
||||
onPrimary: darkOnPrimary,
|
||||
secondary: darkAdjustedPrimary.withOpacity(0.8),
|
||||
secondary: darkColors.primary.withOpacity(0.8),
|
||||
onSecondary: darkOnPrimary,
|
||||
secondaryContainer: darkSecondaryContainer,
|
||||
onSecondaryContainer: Colors.white,
|
||||
error: Colors.redAccent,
|
||||
onError: Colors.black,
|
||||
surface: darkColors.surface,
|
||||
@@ -593,7 +173,6 @@ class PaletteHelper {
|
||||
}
|
||||
|
||||
/// Extract color schemes from an image provider in one call
|
||||
/// NOTE: This runs on the main thread. Prefer extractColorSchemesFromUrl for better performance.
|
||||
static Future<(ColorScheme, ColorScheme)?> extractColorSchemes(ImageProvider imageProvider) async {
|
||||
final palette = await extractPalette(imageProvider);
|
||||
return generateColorSchemes(palette);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import '../services/settings_service.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import 'palette_helper.dart';
|
||||
@@ -9,13 +10,11 @@ final _themeLogger = DebugLogger();
|
||||
/// Global function to update adaptive colors from an image URL
|
||||
/// This can be called from anywhere in the app (e.g., when tapping an album/artist)
|
||||
/// Sets isOnDetailScreen=true so nav bar will also use adaptive colors
|
||||
/// Uses isolate-based extraction to avoid blocking the main thread
|
||||
Future<void> updateAdaptiveColorsFromImage(BuildContext context, String? imageUrl) async {
|
||||
if (imageUrl == null || imageUrl.isEmpty) return;
|
||||
|
||||
try {
|
||||
// Use isolate-based extraction for better performance
|
||||
final colorSchemes = await PaletteHelper.extractColorSchemesFromUrl(imageUrl);
|
||||
final colorSchemes = await PaletteHelper.extractColorSchemes(CachedNetworkImageProvider(imageUrl));
|
||||
if (colorSchemes != null && context.mounted) {
|
||||
final themeProvider = context.read<ThemeProvider>();
|
||||
themeProvider.updateAdaptiveColors(colorSchemes.$1, colorSchemes.$2, isFromDetailScreen: true);
|
||||
@@ -33,13 +32,6 @@ void clearAdaptiveColorsOnBack(BuildContext context) {
|
||||
themeProvider.clearAdaptiveColors();
|
||||
}
|
||||
|
||||
/// Mark that we're entering a detail screen (call this synchronously on init)
|
||||
/// This ensures the nav bar starts using adaptive colors immediately
|
||||
void markDetailScreenEntered(BuildContext context) {
|
||||
final themeProvider = context.read<ThemeProvider>();
|
||||
themeProvider.setOnDetailScreen(true);
|
||||
}
|
||||
|
||||
class ThemeProvider extends ChangeNotifier {
|
||||
ThemeMode _themeMode = ThemeMode.system;
|
||||
bool _useMaterialTheme = false;
|
||||
@@ -211,12 +203,4 @@ class ThemeProvider extends ChangeNotifier {
|
||||
_isOnDetailScreen = false;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
/// Set the detail screen flag (used for immediate synchronous updates)
|
||||
void setOnDetailScreen(bool value) {
|
||||
if (_isOnDetailScreen != value) {
|
||||
_isOnDetailScreen = value;
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
/// Extension methods for formatting Duration values.
|
||||
///
|
||||
/// Provides consistent duration formatting across the codebase,
|
||||
/// replacing duplicate _formatDuration() implementations.
|
||||
extension DurationFormatter on Duration {
|
||||
/// Format duration as "H:MM:SS" or "M:SS" depending on length.
|
||||
///
|
||||
/// Examples:
|
||||
/// - 45 seconds -> "0:45"
|
||||
/// - 3 minutes, 45 seconds -> "3:45"
|
||||
/// - 1 hour, 3 minutes, 45 seconds -> "1:03:45"
|
||||
String toFormattedString() {
|
||||
final hours = inHours;
|
||||
final minutes = inMinutes % 60;
|
||||
final seconds = inSeconds % 60;
|
||||
|
||||
if (hours > 0) {
|
||||
return '$hours:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
|
||||
}
|
||||
return '$minutes:${seconds.toString().padLeft(2, '0')}';
|
||||
}
|
||||
|
||||
/// Format duration as "M:SS" (no hours, minutes not padded).
|
||||
///
|
||||
/// Use this for shorter content like songs where hours are unlikely.
|
||||
String toMinutesSeconds() {
|
||||
final totalSeconds = inSeconds;
|
||||
final minutes = totalSeconds ~/ 60;
|
||||
final seconds = totalSeconds % 60;
|
||||
return '$minutes:${seconds.toString().padLeft(2, '0')}';
|
||||
}
|
||||
}
|
||||
|
||||
/// Format an integer number of seconds as "H:MM:SS" or "M:SS".
|
||||
///
|
||||
/// This is a standalone function for cases where you have raw seconds
|
||||
/// rather than a Duration object.
|
||||
String formatDurationSeconds(int seconds) {
|
||||
return Duration(seconds: seconds).toFormattedString();
|
||||
}
|
||||
|
||||
/// Format a nullable Duration, returning empty string if null.
|
||||
String formatDurationOrEmpty(Duration? duration) {
|
||||
if (duration == null) return '';
|
||||
return duration.toMinutesSeconds();
|
||||
}
|
||||
@@ -1,139 +0,0 @@
|
||||
import 'dart:collection';
|
||||
|
||||
/// A simple Least Recently Used (LRU) cache implementation.
|
||||
///
|
||||
/// When the cache reaches its maximum size, the least recently used entries
|
||||
/// are automatically evicted to make room for new entries.
|
||||
///
|
||||
/// Usage:
|
||||
/// ```dart
|
||||
/// final cache = LruCache<String, String>(maxSize: 100);
|
||||
/// cache.put('key', 'value');
|
||||
/// final value = cache.get('key');
|
||||
/// ```
|
||||
class LruCache<K, V> {
|
||||
/// Maximum number of entries to store
|
||||
final int maxSize;
|
||||
|
||||
/// Internal storage using LinkedHashMap for O(1) LRU operations
|
||||
final LinkedHashMap<K, V> _cache = LinkedHashMap<K, V>();
|
||||
|
||||
/// Creates an LRU cache with the specified maximum size.
|
||||
///
|
||||
/// [maxSize] must be greater than 0.
|
||||
LruCache({required this.maxSize}) : assert(maxSize > 0);
|
||||
|
||||
/// Returns the number of entries currently in the cache.
|
||||
int get length => _cache.length;
|
||||
|
||||
/// Returns true if the cache is empty.
|
||||
bool get isEmpty => _cache.isEmpty;
|
||||
|
||||
/// Returns true if the cache is not empty.
|
||||
bool get isNotEmpty => _cache.isNotEmpty;
|
||||
|
||||
/// Returns true if the cache contains an entry for [key].
|
||||
bool containsKey(K key) => _cache.containsKey(key);
|
||||
|
||||
/// Returns the value for [key], or null if not found.
|
||||
///
|
||||
/// This operation marks the entry as recently used.
|
||||
V? get(K key) {
|
||||
if (!_cache.containsKey(key)) {
|
||||
return null;
|
||||
}
|
||||
// Move to end (most recently used) by removing and re-adding
|
||||
final value = _cache.remove(key);
|
||||
_cache[key] = value as V;
|
||||
return value;
|
||||
}
|
||||
|
||||
/// Returns the value for [key] without marking it as recently used.
|
||||
///
|
||||
/// Use this when you need to check a value without affecting LRU order.
|
||||
V? peek(K key) => _cache[key];
|
||||
|
||||
/// Stores [value] for [key] in the cache.
|
||||
///
|
||||
/// If [key] already exists, the value is updated and marked as recently used.
|
||||
/// If the cache is full, the least recently used entry is evicted.
|
||||
void put(K key, V value) {
|
||||
// If key exists, remove it first (will be re-added at end)
|
||||
if (_cache.containsKey(key)) {
|
||||
_cache.remove(key);
|
||||
} else if (_cache.length >= maxSize) {
|
||||
// Cache is full, remove least recently used (first entry)
|
||||
_cache.remove(_cache.keys.first);
|
||||
}
|
||||
_cache[key] = value;
|
||||
}
|
||||
|
||||
/// Operator access for getting values (same as [get]).
|
||||
V? operator [](K key) => get(key);
|
||||
|
||||
/// Operator access for setting values (same as [put]).
|
||||
void operator []=(K key, V value) => put(key, value);
|
||||
|
||||
/// Removes the entry for [key] if it exists.
|
||||
///
|
||||
/// Returns the removed value, or null if [key] was not in the cache.
|
||||
V? remove(K key) => _cache.remove(key);
|
||||
|
||||
/// Removes all entries from the cache.
|
||||
void clear() => _cache.clear();
|
||||
|
||||
/// Returns all keys currently in the cache.
|
||||
Iterable<K> get keys => _cache.keys;
|
||||
|
||||
/// Returns all values currently in the cache.
|
||||
Iterable<V> get values => _cache.values;
|
||||
|
||||
/// Returns all entries currently in the cache.
|
||||
Iterable<MapEntry<K, V>> get entries => _cache.entries;
|
||||
}
|
||||
|
||||
/// An LRU cache that can store null values and distinguish them from missing entries.
|
||||
///
|
||||
/// Regular LruCache returns null for both missing keys and keys with null values.
|
||||
/// This class uses a wrapper to distinguish between the two cases.
|
||||
class NullableLruCache<K, V> {
|
||||
final LruCache<K, _CacheEntry<V>> _cache;
|
||||
|
||||
/// Creates a nullable LRU cache with the specified maximum size.
|
||||
NullableLruCache({required int maxSize}) : _cache = LruCache(maxSize: maxSize);
|
||||
|
||||
/// Returns the number of entries currently in the cache.
|
||||
int get length => _cache.length;
|
||||
|
||||
/// Returns true if the cache contains an entry for [key].
|
||||
bool containsKey(K key) => _cache.containsKey(key);
|
||||
|
||||
/// Returns the value for [key], or null if not found.
|
||||
///
|
||||
/// Note: This will also return null if the cached value is null.
|
||||
/// Use [containsKey] to distinguish between missing and null values.
|
||||
V? get(K key) => _cache.get(key)?.value;
|
||||
|
||||
/// Stores [value] for [key] in the cache.
|
||||
///
|
||||
/// The value can be null.
|
||||
void put(K key, V? value) => _cache.put(key, _CacheEntry(value));
|
||||
|
||||
/// Operator access for getting values.
|
||||
V? operator [](K key) => get(key);
|
||||
|
||||
/// Operator access for setting values.
|
||||
void operator []=(K key, V? value) => put(key, value);
|
||||
|
||||
/// Removes the entry for [key] if it exists.
|
||||
V? remove(K key) => _cache.remove(key)?.value;
|
||||
|
||||
/// Removes all entries from the cache.
|
||||
void clear() => _cache.clear();
|
||||
}
|
||||
|
||||
/// Wrapper to store nullable values in the cache
|
||||
class _CacheEntry<V> {
|
||||
final V? value;
|
||||
_CacheEntry(this.value);
|
||||
}
|
||||
+61
-270
@@ -1,6 +1,5 @@
|
||||
import 'dart:async';
|
||||
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 '../models/media_item.dart';
|
||||
@@ -11,11 +10,6 @@ import '../constants/timings.dart';
|
||||
import '../theme/theme_provider.dart';
|
||||
import '../utils/page_transitions.dart';
|
||||
import '../services/metadata_service.dart';
|
||||
import '../services/library_status_service.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import 'provider_icon.dart';
|
||||
import 'media_context_menu.dart';
|
||||
import 'library_status_builder.dart';
|
||||
|
||||
class AlbumCard extends StatefulWidget {
|
||||
final Album album;
|
||||
@@ -37,7 +31,7 @@ class AlbumCard extends StatefulWidget {
|
||||
State<AlbumCard> createState() => _AlbumCardState();
|
||||
}
|
||||
|
||||
class _AlbumCardState extends State<AlbumCard> with LibraryStatusMixin {
|
||||
class _AlbumCardState extends State<AlbumCard> {
|
||||
String? _fallbackImageUrl;
|
||||
bool _triedFallback = false;
|
||||
bool _maImageFailed = false;
|
||||
@@ -46,28 +40,11 @@ class _AlbumCardState extends State<AlbumCard> with LibraryStatusMixin {
|
||||
bool _isNavigating = false;
|
||||
|
||||
/// Delay before fetching fallback images to avoid requests during fast scroll
|
||||
/// PERF: Increased from 200ms to 400ms to reduce network requests during slow scroll
|
||||
static const _fallbackDelay = Duration(milliseconds: 400);
|
||||
|
||||
@override
|
||||
String get libraryItemKey => LibraryStatusService.makeKey(
|
||||
'album',
|
||||
widget.album.provider,
|
||||
widget.album.itemId,
|
||||
);
|
||||
static const _fallbackDelay = Duration(milliseconds: 200);
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
// Initialize status in centralized service from widget data
|
||||
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);
|
||||
}
|
||||
_initFallbackImage();
|
||||
}
|
||||
|
||||
@@ -123,176 +100,6 @@ class _AlbumCardState extends State<AlbumCard> with LibraryStatusMixin {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _toggleFavorite() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final currentFavorite = isFavorite;
|
||||
final newState = !currentFavorite;
|
||||
|
||||
// Optimistic update via centralized service
|
||||
setFavoriteStatus(newState);
|
||||
|
||||
try {
|
||||
bool success;
|
||||
if (newState) {
|
||||
String actualProvider = widget.album.provider;
|
||||
String actualItemId = widget.album.itemId;
|
||||
|
||||
if (widget.album.providerMappings != null && widget.album.providerMappings!.isNotEmpty) {
|
||||
final mapping = widget.album.providerMappings!.firstWhere(
|
||||
(m) => m.available && m.providerInstance != 'library',
|
||||
orElse: () => widget.album.providerMappings!.firstWhere(
|
||||
(m) => m.available,
|
||||
orElse: () => widget.album.providerMappings!.first,
|
||||
),
|
||||
);
|
||||
actualProvider = mapping.providerDomain;
|
||||
actualItemId = mapping.itemId;
|
||||
}
|
||||
|
||||
success = await maProvider.addToFavorites(
|
||||
mediaType: 'album',
|
||||
itemId: actualItemId,
|
||||
provider: actualProvider,
|
||||
);
|
||||
} else {
|
||||
int? libraryItemId;
|
||||
if (widget.album.provider == 'library') {
|
||||
libraryItemId = int.tryParse(widget.album.itemId);
|
||||
} else if (widget.album.providerMappings != null) {
|
||||
final libraryMapping = widget.album.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => widget.album.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId == null) {
|
||||
rollbackFavoriteOperation();
|
||||
return;
|
||||
}
|
||||
|
||||
success = await maProvider.removeFromFavorites(
|
||||
mediaType: 'album',
|
||||
libraryItemId: libraryItemId,
|
||||
);
|
||||
}
|
||||
|
||||
if (success && mounted) {
|
||||
completeFavoriteOperation();
|
||||
maProvider.invalidateHomeCache();
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(newState ? S.of(context)!.addedToFavorites : S.of(context)!.removedFromFavorites),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
rollbackFavoriteOperation();
|
||||
}
|
||||
} catch (e) {
|
||||
rollbackFavoriteOperation();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _toggleLibrary() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final currentInLibrary = isInLibrary;
|
||||
final newState = !currentInLibrary;
|
||||
|
||||
try {
|
||||
if (newState) {
|
||||
String? actualProvider;
|
||||
String? actualItemId;
|
||||
|
||||
if (widget.album.providerMappings != null && widget.album.providerMappings!.isNotEmpty) {
|
||||
final nonLibraryMapping = widget.album.providerMappings!.where(
|
||||
(m) => m.providerInstance != 'library' && m.providerDomain != 'library',
|
||||
).firstOrNull;
|
||||
|
||||
if (nonLibraryMapping != null) {
|
||||
actualProvider = nonLibraryMapping.providerDomain;
|
||||
actualItemId = nonLibraryMapping.itemId;
|
||||
}
|
||||
}
|
||||
|
||||
if (actualProvider == null || actualItemId == null) {
|
||||
if (widget.album.provider != 'library') {
|
||||
actualProvider = widget.album.provider;
|
||||
actualItemId = widget.album.itemId;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Optimistic update via centralized service
|
||||
setLibraryStatus(newState);
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.addedToLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final success = await maProvider.addToLibrary(
|
||||
mediaType: 'album',
|
||||
provider: actualProvider,
|
||||
itemId: actualItemId,
|
||||
);
|
||||
|
||||
if (success) {
|
||||
completeLibraryOperation();
|
||||
} else {
|
||||
rollbackLibraryOperation();
|
||||
}
|
||||
} else {
|
||||
int? libraryItemId;
|
||||
if (widget.album.provider == 'library') {
|
||||
libraryItemId = int.tryParse(widget.album.itemId);
|
||||
} else if (widget.album.providerMappings != null) {
|
||||
final libraryMapping = widget.album.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => widget.album.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId == null) return;
|
||||
|
||||
// Optimistic update via centralized service
|
||||
setLibraryStatus(newState);
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.removedFromLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final success = await maProvider.removeFromLibrary(
|
||||
mediaType: 'album',
|
||||
libraryItemId: libraryItemId,
|
||||
);
|
||||
|
||||
if (success) {
|
||||
completeLibraryOperation();
|
||||
} else {
|
||||
rollbackLibraryOperation();
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
rollbackLibraryOperation();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
@@ -316,13 +123,8 @@ class _AlbumCardState extends State<AlbumCard> with LibraryStatusMixin {
|
||||
if (_isNavigating) return;
|
||||
_isNavigating = true;
|
||||
|
||||
// Start color extraction immediately (fire-and-forget)
|
||||
// Runs in isolate so won't block Hero animation
|
||||
// Results are cached, so detail screen gets them instantly
|
||||
if (imageUrl != null) {
|
||||
updateAdaptiveColorsFromImage(context, imageUrl);
|
||||
}
|
||||
|
||||
// Update adaptive colors immediately on tap
|
||||
updateAdaptiveColorsFromImage(context, imageUrl);
|
||||
Navigator.push(
|
||||
context,
|
||||
FadeSlidePageRoute(
|
||||
@@ -339,18 +141,6 @@ class _AlbumCardState extends State<AlbumCard> with LibraryStatusMixin {
|
||||
});
|
||||
});
|
||||
},
|
||||
onLongPressStart: (details) {
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
mediaType: ContextMenuMediaType.album,
|
||||
item: widget.album,
|
||||
isFavorite: isFavorite,
|
||||
isInLibrary: isInLibrary,
|
||||
onToggleFavorite: _toggleFavorite,
|
||||
onToggleLibrary: _toggleLibrary,
|
||||
);
|
||||
},
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
@@ -361,71 +151,72 @@ class _AlbumCardState extends State<AlbumCard> with LibraryStatusMixin {
|
||||
tag: HeroTags.albumCover + (widget.album.uri ?? widget.album.itemId) + suffix,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(12.0),
|
||||
child: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
Container(
|
||||
color: colorScheme.surfaceVariant,
|
||||
child: imageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
memCacheWidth: cacheSize,
|
||||
memCacheHeight: cacheSize,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (context, url) => const SizedBox(),
|
||||
errorWidget: (context, url, error) {
|
||||
// Try fallback on error (only for MA URLs, not fallback URLs)
|
||||
if (!_maImageFailed && url == maImageUrl) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
_onImageError();
|
||||
});
|
||||
}
|
||||
return Icon(
|
||||
Icons.album_rounded,
|
||||
size: 64,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
);
|
||||
},
|
||||
)
|
||||
: Center(
|
||||
child: Icon(
|
||||
Icons.album_rounded,
|
||||
size: 64,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
// Provider icon overlay
|
||||
if (widget.album.providerMappings?.isNotEmpty == true)
|
||||
ProviderIconOverlay(
|
||||
domain: widget.album.providerMappings!.first.providerDomain,
|
||||
),
|
||||
],
|
||||
child: Container(
|
||||
color: colorScheme.surfaceVariant,
|
||||
child: imageUrl != null
|
||||
? CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
fit: BoxFit.cover,
|
||||
memCacheWidth: cacheSize,
|
||||
memCacheHeight: cacheSize,
|
||||
fadeInDuration: Duration.zero,
|
||||
fadeOutDuration: Duration.zero,
|
||||
placeholder: (context, url) => const SizedBox(),
|
||||
errorWidget: (context, url, error) {
|
||||
// Try fallback on error (only for MA URLs, not fallback URLs)
|
||||
if (!_maImageFailed && url == maImageUrl) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
_onImageError();
|
||||
});
|
||||
}
|
||||
return Icon(
|
||||
Icons.album_rounded,
|
||||
size: 64,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
);
|
||||
},
|
||||
)
|
||||
: Center(
|
||||
child: Icon(
|
||||
Icons.album_rounded,
|
||||
size: 64,
|
||||
color: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
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,
|
||||
Hero(
|
||||
tag: HeroTags.albumTitle + (widget.album.uri ?? widget.album.itemId) + suffix,
|
||||
child: Material(
|
||||
color: Colors.transparent,
|
||||
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),
|
||||
Hero(
|
||||
tag: HeroTags.artistName + (widget.album.uri ?? widget.album.itemId) + suffix,
|
||||
child: Material(
|
||||
color: Colors.transparent,
|
||||
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 '../l10n/app_localizations.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
@@ -106,7 +105,7 @@ class _AlbumRowState extends State<AlbumRow> with AutomaticKeepAliveClientMixin
|
||||
if (_albums.isEmpty) {
|
||||
return Center(
|
||||
child: Text(
|
||||
S.of(context)!.noAlbumsFound,
|
||||
'No albums found',
|
||||
style: TextStyle(color: colorScheme.onSurface.withOpacity(0.5)),
|
||||
),
|
||||
);
|
||||
|
||||
+20
-218
@@ -1,6 +1,5 @@
|
||||
import 'dart:async';
|
||||
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 '../models/media_item.dart';
|
||||
@@ -8,13 +7,10 @@ import '../providers/music_assistant_provider.dart';
|
||||
import '../screens/artist_details_screen.dart';
|
||||
import '../constants/hero_tags.dart';
|
||||
import '../constants/timings.dart';
|
||||
import '../theme/theme_provider.dart';
|
||||
import '../utils/page_transitions.dart';
|
||||
import '../services/metadata_service.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../services/library_status_service.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import 'media_context_menu.dart';
|
||||
import 'library_status_builder.dart';
|
||||
|
||||
class ArtistCard extends StatefulWidget {
|
||||
final Artist artist;
|
||||
@@ -36,7 +32,7 @@ class ArtistCard extends StatefulWidget {
|
||||
State<ArtistCard> createState() => _ArtistCardState();
|
||||
}
|
||||
|
||||
class _ArtistCardState extends State<ArtistCard> with LibraryStatusMixin {
|
||||
class _ArtistCardState extends State<ArtistCard> {
|
||||
static final _logger = DebugLogger();
|
||||
String? _fallbackImageUrl;
|
||||
bool _triedFallback = false;
|
||||
@@ -46,28 +42,11 @@ class _ArtistCardState extends State<ArtistCard> with LibraryStatusMixin {
|
||||
bool _isNavigating = false;
|
||||
|
||||
/// Delay before fetching fallback images to avoid requests during fast scroll
|
||||
/// PERF: Increased from 200ms to 400ms to reduce network requests during slow scroll
|
||||
static const _fallbackDelay = Duration(milliseconds: 400);
|
||||
|
||||
@override
|
||||
String get libraryItemKey => LibraryStatusService.makeKey(
|
||||
'artist',
|
||||
widget.artist.provider,
|
||||
widget.artist.itemId,
|
||||
);
|
||||
static const _fallbackDelay = Duration(milliseconds: 200);
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
// Initialize status in centralized service from widget data
|
||||
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);
|
||||
}
|
||||
// Fetch fallback image once in initState, not during build
|
||||
_initFallbackImage();
|
||||
}
|
||||
@@ -114,176 +93,6 @@ class _ArtistCardState extends State<ArtistCard> with LibraryStatusMixin {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _toggleFavorite() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final currentFavorite = isFavorite;
|
||||
final newState = !currentFavorite;
|
||||
|
||||
// Optimistic update via centralized service
|
||||
setFavoriteStatus(newState);
|
||||
|
||||
try {
|
||||
bool success;
|
||||
if (newState) {
|
||||
String actualProvider = widget.artist.provider;
|
||||
String actualItemId = widget.artist.itemId;
|
||||
|
||||
if (widget.artist.providerMappings != null && widget.artist.providerMappings!.isNotEmpty) {
|
||||
final mapping = widget.artist.providerMappings!.firstWhere(
|
||||
(m) => m.available && m.providerInstance != 'library',
|
||||
orElse: () => widget.artist.providerMappings!.firstWhere(
|
||||
(m) => m.available,
|
||||
orElse: () => widget.artist.providerMappings!.first,
|
||||
),
|
||||
);
|
||||
actualProvider = mapping.providerDomain;
|
||||
actualItemId = mapping.itemId;
|
||||
}
|
||||
|
||||
success = await maProvider.addToFavorites(
|
||||
mediaType: 'artist',
|
||||
itemId: actualItemId,
|
||||
provider: actualProvider,
|
||||
);
|
||||
} else {
|
||||
int? libraryItemId;
|
||||
if (widget.artist.provider == 'library') {
|
||||
libraryItemId = int.tryParse(widget.artist.itemId);
|
||||
} else if (widget.artist.providerMappings != null) {
|
||||
final libraryMapping = widget.artist.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => widget.artist.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId == null) {
|
||||
rollbackFavoriteOperation();
|
||||
return;
|
||||
}
|
||||
|
||||
success = await maProvider.removeFromFavorites(
|
||||
mediaType: 'artist',
|
||||
libraryItemId: libraryItemId,
|
||||
);
|
||||
}
|
||||
|
||||
if (success && mounted) {
|
||||
completeFavoriteOperation();
|
||||
maProvider.invalidateHomeCache();
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(newState ? S.of(context)!.addedToFavorites : S.of(context)!.removedFromFavorites),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
rollbackFavoriteOperation();
|
||||
}
|
||||
} catch (e) {
|
||||
rollbackFavoriteOperation();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _toggleLibrary() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final currentInLibrary = isInLibrary;
|
||||
final newState = !currentInLibrary;
|
||||
|
||||
try {
|
||||
if (newState) {
|
||||
String? actualProvider;
|
||||
String? actualItemId;
|
||||
|
||||
if (widget.artist.providerMappings != null && widget.artist.providerMappings!.isNotEmpty) {
|
||||
final nonLibraryMapping = widget.artist.providerMappings!.where(
|
||||
(m) => m.providerInstance != 'library' && m.providerDomain != 'library',
|
||||
).firstOrNull;
|
||||
|
||||
if (nonLibraryMapping != null) {
|
||||
actualProvider = nonLibraryMapping.providerDomain;
|
||||
actualItemId = nonLibraryMapping.itemId;
|
||||
}
|
||||
}
|
||||
|
||||
if (actualProvider == null || actualItemId == null) {
|
||||
if (widget.artist.provider != 'library') {
|
||||
actualProvider = widget.artist.provider;
|
||||
actualItemId = widget.artist.itemId;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Optimistic update via centralized service
|
||||
setLibraryStatus(newState);
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.addedToLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final success = await maProvider.addToLibrary(
|
||||
mediaType: 'artist',
|
||||
provider: actualProvider,
|
||||
itemId: actualItemId,
|
||||
);
|
||||
|
||||
if (success) {
|
||||
completeLibraryOperation();
|
||||
} else {
|
||||
rollbackLibraryOperation();
|
||||
}
|
||||
} else {
|
||||
int? libraryItemId;
|
||||
if (widget.artist.provider == 'library') {
|
||||
libraryItemId = int.tryParse(widget.artist.itemId);
|
||||
} else if (widget.artist.providerMappings != null) {
|
||||
final libraryMapping = widget.artist.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => widget.artist.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId == null) return;
|
||||
|
||||
// Optimistic update via centralized service
|
||||
setLibraryStatus(newState);
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.removedFromLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final success = await maProvider.removeFromLibrary(
|
||||
mediaType: 'artist',
|
||||
libraryItemId: libraryItemId,
|
||||
);
|
||||
|
||||
if (success) {
|
||||
completeLibraryOperation();
|
||||
} else {
|
||||
rollbackLibraryOperation();
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
rollbackLibraryOperation();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
@@ -307,8 +116,8 @@ class _ArtistCardState extends State<ArtistCard> with LibraryStatusMixin {
|
||||
if (_isNavigating) return;
|
||||
_isNavigating = true;
|
||||
|
||||
// PERF: Color extraction deferred to detail screen's initState
|
||||
// to avoid competing with Hero animation for GPU resources
|
||||
// Update adaptive colors immediately on tap
|
||||
updateAdaptiveColorsFromImage(context, imageUrl);
|
||||
Navigator.push(
|
||||
context,
|
||||
FadeSlidePageRoute(
|
||||
@@ -325,18 +134,6 @@ class _ArtistCardState extends State<ArtistCard> with LibraryStatusMixin {
|
||||
});
|
||||
});
|
||||
},
|
||||
onLongPressStart: (details) {
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
mediaType: ContextMenuMediaType.artist,
|
||||
item: widget.artist,
|
||||
isFavorite: isFavorite,
|
||||
isInLibrary: isInLibrary,
|
||||
onToggleFavorite: _toggleFavorite,
|
||||
onToggleLibrary: _toggleLibrary,
|
||||
);
|
||||
},
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
@@ -389,18 +186,23 @@ class _ArtistCardState extends State<ArtistCard> with LibraryStatusMixin {
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
// Artist name - fixed height container so image size is consistent
|
||||
// PERF: Removed Hero - text animations provide minimal benefit but add overhead
|
||||
SizedBox(
|
||||
height: 36, // Fixed height for 2 lines of text
|
||||
child: Text(
|
||||
widget.artist.name,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
textAlign: TextAlign.center,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
height: 1.15,
|
||||
child: Hero(
|
||||
tag: HeroTags.artistName + (widget.artist.uri ?? widget.artist.itemId) + suffix,
|
||||
child: Material(
|
||||
color: Colors.transparent,
|
||||
child: Text(
|
||||
widget.artist.name,
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
textAlign: TextAlign.center,
|
||||
style: textTheme.titleSmall?.copyWith(
|
||||
color: colorScheme.onSurface,
|
||||
fontWeight: FontWeight.w500,
|
||||
height: 1.15,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
@@ -106,7 +105,7 @@ class _ArtistRowState extends State<ArtistRow> with AutomaticKeepAliveClientMixi
|
||||
if (_artists.isEmpty) {
|
||||
return Center(
|
||||
child: Text(
|
||||
S.of(context)!.noArtistsFound,
|
||||
'No artists found',
|
||||
style: TextStyle(color: colorScheme.onSurface.withOpacity(0.5)),
|
||||
),
|
||||
);
|
||||
|
||||
+12
-230
@@ -1,19 +1,13 @@
|
||||
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 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
import '../models/media_item.dart';
|
||||
import '../providers/music_assistant_provider.dart';
|
||||
import '../services/debug_logger.dart';
|
||||
import '../utils/page_transitions.dart';
|
||||
import '../screens/audiobook_detail_screen.dart';
|
||||
import '../constants/hero_tags.dart';
|
||||
import '../services/library_status_service.dart';
|
||||
import 'provider_icon.dart';
|
||||
import 'media_context_menu.dart';
|
||||
import 'library_status_builder.dart';
|
||||
|
||||
class AudiobookRow extends StatefulWidget {
|
||||
final String title;
|
||||
@@ -99,6 +93,7 @@ class _AudiobookRowState extends State<AudiobookRow> with AutomaticKeepAliveClie
|
||||
context,
|
||||
).catchError((_) {
|
||||
// Silently ignore precache errors
|
||||
return false;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -115,7 +110,7 @@ class _AudiobookRowState extends State<AudiobookRow> with AutomaticKeepAliveClie
|
||||
if (_audiobooks.isEmpty) {
|
||||
return Center(
|
||||
child: Text(
|
||||
S.of(context)!.noAudiobooks,
|
||||
'No audiobooks found',
|
||||
style: TextStyle(color: colorScheme.onSurface.withOpacity(0.5)),
|
||||
),
|
||||
);
|
||||
@@ -193,7 +188,7 @@ class _AudiobookRowState extends State<AudiobookRow> with AutomaticKeepAliveClie
|
||||
}
|
||||
}
|
||||
|
||||
class _AudiobookCard extends StatefulWidget {
|
||||
class _AudiobookCard extends StatelessWidget {
|
||||
final Audiobook audiobook;
|
||||
final String heroTagSuffix;
|
||||
final MusicAssistantProvider maProvider;
|
||||
@@ -204,207 +199,11 @@ class _AudiobookCard extends StatefulWidget {
|
||||
required this.maProvider,
|
||||
});
|
||||
|
||||
@override
|
||||
State<_AudiobookCard> createState() => _AudiobookCardState();
|
||||
}
|
||||
|
||||
class _AudiobookCardState extends State<_AudiobookCard> with LibraryStatusMixin {
|
||||
@override
|
||||
String get libraryItemKey => LibraryStatusService.makeKey(
|
||||
'audiobook',
|
||||
widget.audiobook.provider,
|
||||
widget.audiobook.itemId,
|
||||
);
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
// Initialize status in centralized service from widget data
|
||||
final service = LibraryStatusService.instance;
|
||||
final key = libraryItemKey;
|
||||
if (!service.isInLibrary(key) && widget.audiobook.inLibrary) {
|
||||
service.setLibraryStatus(key, true);
|
||||
}
|
||||
if (!service.isFavorite(key) && (widget.audiobook.favorite ?? false)) {
|
||||
service.setFavoriteStatus(key, true);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _toggleFavorite() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final currentFavorite = isFavorite;
|
||||
final newState = !currentFavorite;
|
||||
|
||||
// Optimistic update via centralized service
|
||||
setFavoriteStatus(newState);
|
||||
|
||||
try {
|
||||
bool success;
|
||||
if (newState) {
|
||||
String actualProvider = widget.audiobook.provider;
|
||||
String actualItemId = widget.audiobook.itemId;
|
||||
|
||||
if (widget.audiobook.providerMappings != null && widget.audiobook.providerMappings!.isNotEmpty) {
|
||||
final mapping = widget.audiobook.providerMappings!.firstWhere(
|
||||
(m) => m.available && m.providerInstance != 'library',
|
||||
orElse: () => widget.audiobook.providerMappings!.firstWhere(
|
||||
(m) => m.available,
|
||||
orElse: () => widget.audiobook.providerMappings!.first,
|
||||
),
|
||||
);
|
||||
actualProvider = mapping.providerDomain;
|
||||
actualItemId = mapping.itemId;
|
||||
}
|
||||
|
||||
success = await maProvider.addToFavorites(
|
||||
mediaType: 'audiobook',
|
||||
itemId: actualItemId,
|
||||
provider: actualProvider,
|
||||
);
|
||||
} else {
|
||||
int? libraryItemId;
|
||||
if (widget.audiobook.provider == 'library') {
|
||||
libraryItemId = int.tryParse(widget.audiobook.itemId);
|
||||
} else if (widget.audiobook.providerMappings != null) {
|
||||
final libraryMapping = widget.audiobook.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => widget.audiobook.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId == null) {
|
||||
rollbackFavoriteOperation();
|
||||
return;
|
||||
}
|
||||
|
||||
success = await maProvider.removeFromFavorites(
|
||||
mediaType: 'audiobook',
|
||||
libraryItemId: libraryItemId,
|
||||
);
|
||||
}
|
||||
|
||||
if (success && mounted) {
|
||||
completeFavoriteOperation();
|
||||
maProvider.invalidateHomeCache();
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(newState ? S.of(context)!.addedToFavorites : S.of(context)!.removedFromFavorites),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
rollbackFavoriteOperation();
|
||||
}
|
||||
} catch (e) {
|
||||
rollbackFavoriteOperation();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _toggleLibrary() async {
|
||||
final maProvider = context.read<MusicAssistantProvider>();
|
||||
final currentInLibrary = isInLibrary;
|
||||
final newState = !currentInLibrary;
|
||||
|
||||
try {
|
||||
if (newState) {
|
||||
String? actualProvider;
|
||||
String? actualItemId;
|
||||
|
||||
if (widget.audiobook.providerMappings != null && widget.audiobook.providerMappings!.isNotEmpty) {
|
||||
final nonLibraryMapping = widget.audiobook.providerMappings!.where(
|
||||
(m) => m.providerInstance != 'library' && m.providerDomain != 'library',
|
||||
).firstOrNull;
|
||||
|
||||
if (nonLibraryMapping != null) {
|
||||
actualProvider = nonLibraryMapping.providerDomain;
|
||||
actualItemId = nonLibraryMapping.itemId;
|
||||
}
|
||||
}
|
||||
|
||||
if (actualProvider == null || actualItemId == null) {
|
||||
if (widget.audiobook.provider != 'library') {
|
||||
actualProvider = widget.audiobook.provider;
|
||||
actualItemId = widget.audiobook.itemId;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Optimistic update via centralized service
|
||||
setLibraryStatus(newState);
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.addedToLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final success = await maProvider.addToLibrary(
|
||||
mediaType: 'audiobook',
|
||||
provider: actualProvider,
|
||||
itemId: actualItemId,
|
||||
);
|
||||
|
||||
if (success) {
|
||||
completeLibraryOperation();
|
||||
} else {
|
||||
rollbackLibraryOperation();
|
||||
}
|
||||
} else {
|
||||
int? libraryItemId;
|
||||
if (widget.audiobook.provider == 'library') {
|
||||
libraryItemId = int.tryParse(widget.audiobook.itemId);
|
||||
} else if (widget.audiobook.providerMappings != null) {
|
||||
final libraryMapping = widget.audiobook.providerMappings!.firstWhere(
|
||||
(m) => m.providerInstance == 'library',
|
||||
orElse: () => widget.audiobook.providerMappings!.first,
|
||||
);
|
||||
if (libraryMapping.providerInstance == 'library') {
|
||||
libraryItemId = int.tryParse(libraryMapping.itemId);
|
||||
}
|
||||
}
|
||||
|
||||
if (libraryItemId == null) return;
|
||||
|
||||
// Optimistic update via centralized service
|
||||
setLibraryStatus(newState);
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.removedFromLibrary),
|
||||
duration: const Duration(seconds: 1),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final success = await maProvider.removeFromLibrary(
|
||||
mediaType: 'audiobook',
|
||||
libraryItemId: libraryItemId,
|
||||
);
|
||||
|
||||
if (success) {
|
||||
completeLibraryOperation();
|
||||
} else {
|
||||
rollbackLibraryOperation();
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
rollbackLibraryOperation();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final textTheme = Theme.of(context).textTheme;
|
||||
final imageUrl = widget.maProvider.getImageUrl(widget.audiobook, size: 256);
|
||||
final imageUrl = maProvider.getImageUrl(audiobook, size: 256);
|
||||
|
||||
return GestureDetector(
|
||||
onTap: () {
|
||||
@@ -412,25 +211,13 @@ class _AudiobookCardState extends State<_AudiobookCard> with LibraryStatusMixin
|
||||
context,
|
||||
FadeSlidePageRoute(
|
||||
child: AudiobookDetailScreen(
|
||||
audiobook: widget.audiobook,
|
||||
heroTagSuffix: widget.heroTagSuffix,
|
||||
audiobook: audiobook,
|
||||
heroTagSuffix: heroTagSuffix,
|
||||
initialImageUrl: imageUrl,
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
onLongPressStart: (details) {
|
||||
MediaContextMenu.show(
|
||||
context: context,
|
||||
position: details.globalPosition,
|
||||
mediaType: ContextMenuMediaType.audiobook,
|
||||
item: widget.audiobook,
|
||||
isFavorite: isFavorite,
|
||||
isInLibrary: isInLibrary,
|
||||
onToggleFavorite: _toggleFavorite,
|
||||
onToggleLibrary: _toggleLibrary,
|
||||
);
|
||||
},
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
@@ -438,7 +225,7 @@ class _AudiobookCardState extends State<_AudiobookCard> with LibraryStatusMixin
|
||||
child: Stack(
|
||||
children: [
|
||||
Hero(
|
||||
tag: HeroTags.audiobookCover + (widget.audiobook.uri ?? widget.audiobook.itemId) + '_${widget.heroTagSuffix}',
|
||||
tag: HeroTags.audiobookCover + (audiobook.uri ?? audiobook.itemId) + '_$heroTagSuffix',
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
child: Container(
|
||||
@@ -480,7 +267,7 @@ class _AudiobookCardState extends State<_AudiobookCard> with LibraryStatusMixin
|
||||
),
|
||||
),
|
||||
// Progress indicator
|
||||
if (widget.audiobook.progress > 0)
|
||||
if (audiobook.progress > 0)
|
||||
Positioned(
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
@@ -491,28 +278,23 @@ class _AudiobookCardState extends State<_AudiobookCard> with LibraryStatusMixin
|
||||
bottomRight: Radius.circular(8),
|
||||
),
|
||||
child: LinearProgressIndicator(
|
||||
value: widget.audiobook.progress,
|
||||
value: audiobook.progress,
|
||||
backgroundColor: Colors.black54,
|
||||
valueColor: AlwaysStoppedAnimation<Color>(colorScheme.primary),
|
||||
minHeight: 4,
|
||||
),
|
||||
),
|
||||
),
|
||||
// Provider icon overlay
|
||||
if (widget.audiobook.providerMappings?.isNotEmpty == true)
|
||||
ProviderIconOverlay(
|
||||
domain: widget.audiobook.providerMappings!.first.providerDomain,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Hero(
|
||||
tag: HeroTags.audiobookTitle + (widget.audiobook.uri ?? widget.audiobook.itemId) + '_${widget.heroTagSuffix}',
|
||||
tag: HeroTags.audiobookTitle + (audiobook.uri ?? audiobook.itemId) + '_$heroTagSuffix',
|
||||
child: Material(
|
||||
color: Colors.transparent,
|
||||
child: Text(
|
||||
widget.audiobook.name,
|
||||
audiobook.name,
|
||||
style: textTheme.bodyMedium?.copyWith(
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
@@ -522,7 +304,7 @@ class _AudiobookCardState extends State<_AudiobookCard> with LibraryStatusMixin
|
||||
),
|
||||
),
|
||||
Text(
|
||||
widget.audiobook.authorsString,
|
||||
audiobook.authorsString,
|
||||
style: textTheme.bodySmall?.copyWith(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
),
|
||||
|
||||
@@ -103,48 +103,39 @@ class EmptyState extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
|
||||
// Wrap in scrollable to allow PageView horizontal swipe detection
|
||||
return LayoutBuilder(
|
||||
builder: (context, constraints) => SingleChildScrollView(
|
||||
physics: const AlwaysScrollableScrollPhysics(),
|
||||
child: ConstrainedBox(
|
||||
constraints: BoxConstraints(minHeight: constraints.maxHeight),
|
||||
child: Center(
|
||||
child: Padding(
|
||||
padding: Spacing.paddingAll24,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(
|
||||
icon,
|
||||
size: iconSize,
|
||||
color: colorScheme.onSurface.withOpacity(0.38),
|
||||
),
|
||||
Spacing.vGap16,
|
||||
Text(
|
||||
message,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
fontSize: 16,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
if (actionLabel != null && onAction != null) ...[
|
||||
Spacing.vGap24,
|
||||
ElevatedButton.icon(
|
||||
onPressed: onAction,
|
||||
icon: const Icon(Icons.refresh_rounded),
|
||||
label: Text(actionLabel!),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: colorScheme.surfaceVariant,
|
||||
foregroundColor: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
return Center(
|
||||
child: Padding(
|
||||
padding: Spacing.paddingAll24,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(
|
||||
icon,
|
||||
size: iconSize,
|
||||
color: colorScheme.onSurface.withOpacity(0.38),
|
||||
),
|
||||
),
|
||||
Spacing.vGap16,
|
||||
Text(
|
||||
message,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
fontSize: 16,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
if (actionLabel != null && onAction != null) ...[
|
||||
Spacing.vGap24,
|
||||
ElevatedButton.icon(
|
||||
onPressed: onAction,
|
||||
icon: const Icon(Icons.refresh_rounded),
|
||||
label: Text(actionLabel!),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: colorScheme.surfaceVariant,
|
||||
foregroundColor: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -171,60 +162,51 @@ class _CustomEmptyState extends EmptyState {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
final s = S.of(context)!;
|
||||
|
||||
// Wrap in scrollable to allow PageView horizontal swipe detection
|
||||
return LayoutBuilder(
|
||||
builder: (context, constraints) => SingleChildScrollView(
|
||||
physics: const AlwaysScrollableScrollPhysics(),
|
||||
child: ConstrainedBox(
|
||||
constraints: BoxConstraints(minHeight: constraints.maxHeight),
|
||||
child: Center(
|
||||
child: Padding(
|
||||
padding: Spacing.paddingAll24,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(
|
||||
icon,
|
||||
size: iconSize,
|
||||
color: colorScheme.onSurface.withOpacity(0.38),
|
||||
),
|
||||
Spacing.vGap16,
|
||||
Text(
|
||||
title,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
if (subtitle != null) ...[
|
||||
Spacing.vGap8,
|
||||
Text(
|
||||
subtitle!,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onSurface.withOpacity(0.4),
|
||||
fontSize: 14,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
],
|
||||
if (onRefresh != null) ...[
|
||||
Spacing.vGap24,
|
||||
ElevatedButton.icon(
|
||||
onPressed: onRefresh,
|
||||
icon: const Icon(Icons.refresh_rounded),
|
||||
label: Text(s.refresh),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: colorScheme.surfaceVariant,
|
||||
foregroundColor: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
return Center(
|
||||
child: Padding(
|
||||
padding: Spacing.paddingAll24,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(
|
||||
icon,
|
||||
size: iconSize,
|
||||
color: colorScheme.onSurface.withOpacity(0.38),
|
||||
),
|
||||
),
|
||||
Spacing.vGap16,
|
||||
Text(
|
||||
title,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onSurface.withOpacity(0.6),
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
if (subtitle != null) ...[
|
||||
Spacing.vGap8,
|
||||
Text(
|
||||
subtitle!,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onSurface.withOpacity(0.4),
|
||||
fontSize: 14,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
],
|
||||
if (onRefresh != null) ...[
|
||||
Spacing.vGap24,
|
||||
ElevatedButton.icon(
|
||||
onPressed: onRefresh,
|
||||
icon: const Icon(Icons.refresh_rounded),
|
||||
label: Text(s.refresh),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: colorScheme.surfaceVariant,
|
||||
foregroundColor: colorScheme.onSurfaceVariant,
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import '../../l10n/app_localizations.dart';
|
||||
import '../../services/debug_logger.dart';
|
||||
import '../../theme/design_tokens.dart';
|
||||
|
||||
@@ -73,9 +72,9 @@ class DebugConsole extends StatelessWidget {
|
||||
padding: EdgeInsets.zero,
|
||||
minimumSize: const Size(40, 20),
|
||||
),
|
||||
child: Text(
|
||||
S.of(context)!.clear,
|
||||
style: const TextStyle(fontSize: 10, color: Colors.green),
|
||||
child: const Text(
|
||||
'Clear',
|
||||
style: TextStyle(fontSize: 10, color: Colors.green),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -87,17 +86,17 @@ class DebugConsole extends StatelessWidget {
|
||||
if (logs.isNotEmpty) {
|
||||
Clipboard.setData(ClipboardData(text: logs));
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.logsCopied),
|
||||
const SnackBar(
|
||||
content: Text('Logs copied to clipboard'),
|
||||
backgroundColor: Colors.green,
|
||||
duration: const Duration(seconds: 2),
|
||||
duration: Duration(seconds: 2),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(S.of(context)!.noLogsToCopy),
|
||||
duration: const Duration(seconds: 2),
|
||||
const SnackBar(
|
||||
content: Text('No logs to copy'),
|
||||
duration: Duration(seconds: 2),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
+188
-1363
File diff suppressed because it is too large
Load Diff
@@ -3,7 +3,6 @@ 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';
|
||||
@@ -94,9 +93,8 @@ class GlobalPlayerOverlay extends StatefulWidget {
|
||||
State<GlobalPlayerOverlay> createState() => _GlobalPlayerOverlayState();
|
||||
|
||||
/// Collapse the player if it's expanded
|
||||
/// [withHaptic]: Set to false for Android back gesture (system provides haptic)
|
||||
static void collapsePlayer({bool withHaptic = true}) {
|
||||
globalPlayerKey.currentState?.collapse(withHaptic: withHaptic);
|
||||
static void collapsePlayer() {
|
||||
globalPlayerKey.currentState?.collapse();
|
||||
}
|
||||
|
||||
/// Force collapse player to mini state, instantly closing queue panel if open.
|
||||
@@ -166,21 +164,6 @@ class GlobalPlayerOverlay extends StatefulWidget {
|
||||
/// Check if the player reveal is currently visible
|
||||
static bool get isPlayerRevealVisible =>
|
||||
_overlayStateKey.currentState?._isRevealVisible ?? false;
|
||||
|
||||
/// Show player selector for a "Play On" action.
|
||||
/// Instead of the default hints, shows a contextual hint like "Select player to play album".
|
||||
/// When a player is tapped, calls onPlayerSelected instead of switching to that player.
|
||||
static void showPlayerSelectorForAction({
|
||||
required String contextHint,
|
||||
required void Function(dynamic player) onPlayerSelected,
|
||||
IconData? hintIcon,
|
||||
}) {
|
||||
_overlayStateKey.currentState?._showPlayerSelectorForAction(
|
||||
contextHint: contextHint,
|
||||
onPlayerSelected: onPlayerSelected,
|
||||
hintIcon: hintIcon,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
@@ -225,11 +208,6 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
// Key for the reveal overlay
|
||||
final _revealKey = GlobalKey<PlayerRevealOverlayState>();
|
||||
|
||||
// State for "Play On" action - stored here so it can be passed to PlayerRevealOverlay
|
||||
void Function(dynamic player)? _pendingPlayerAction;
|
||||
String? _pendingContextHint;
|
||||
IconData? _pendingHintIcon;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
@@ -416,7 +394,6 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
void _hidePlayerReveal() {
|
||||
if (!_isRevealVisible) return;
|
||||
_bounceOffsetNotifier.value = 0;
|
||||
_clearPendingAction(); // Clear pending action when overlay is dismissed
|
||||
setState(() {
|
||||
_isRevealVisible = false;
|
||||
_isOnboardingReveal = false;
|
||||
@@ -436,29 +413,6 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
_singleBounceController.forward();
|
||||
}
|
||||
|
||||
/// Clear pending action state (called when overlay is dismissed)
|
||||
void _clearPendingAction() {
|
||||
_pendingPlayerAction = null;
|
||||
_pendingContextHint = null;
|
||||
_pendingHintIcon = null;
|
||||
}
|
||||
|
||||
/// Show player selector for a "Play On" action.
|
||||
/// Stores the pending action and shows the reveal overlay with context hint.
|
||||
void _showPlayerSelectorForAction({
|
||||
required String contextHint,
|
||||
required void Function(dynamic player) onPlayerSelected,
|
||||
IconData? hintIcon,
|
||||
}) {
|
||||
// Store pending action state
|
||||
_pendingPlayerAction = onPlayerSelected;
|
||||
_pendingContextHint = contextHint;
|
||||
_pendingHintIcon = hintIcon;
|
||||
|
||||
// Show the reveal overlay
|
||||
_showPlayerReveal();
|
||||
}
|
||||
|
||||
/// End hint mode (called when user taps skip button)
|
||||
void _endHintMode() {
|
||||
if (!_isHintModeActive) return;
|
||||
@@ -531,9 +485,10 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
child: widget.child,
|
||||
),
|
||||
// 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)
|
||||
// Hide when: not connected, no player selected, OR showing welcome screen
|
||||
// For first-time users, selectedPlayer becomes non-null at the same time
|
||||
// as shouldShowWelcomeBackdrop becomes true, preventing any gap.
|
||||
if (isConnected && hasSelectedPlayer && !shouldShowWelcomeBackdrop)
|
||||
Positioned(
|
||||
left: 0,
|
||||
right: 0,
|
||||
@@ -581,78 +536,62 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
}
|
||||
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,
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
color: navBgColor,
|
||||
boxShadow: expansionState.progress < 0.5
|
||||
? [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.1),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, -2),
|
||||
),
|
||||
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,
|
||||
),
|
||||
],
|
||||
),
|
||||
]
|
||||
: null,
|
||||
),
|
||||
child: BottomNavigationBar(
|
||||
currentIndex: navigationProvider.selectedIndex,
|
||||
onTap: (index) {
|
||||
if (GlobalPlayerOverlay.isPlayerExpanded) {
|
||||
GlobalPlayerOverlay.collapsePlayer();
|
||||
}
|
||||
navigationProvider.navigatorKey.currentState?.popUntil((route) => route.isFirst);
|
||||
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(Icons.library_music_outlined),
|
||||
activeIcon: const Icon(Icons.library_music_rounded),
|
||||
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,
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
@@ -688,15 +627,11 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
duration: const Duration(seconds: 3),
|
||||
curve: const Interval(0.67, 1.0, curve: Curves.easeOut),
|
||||
builder: (context, opacity, child) {
|
||||
// Use theme-appropriate background color for seamless transition
|
||||
final isDark = Theme.of(context).brightness == Brightness.dark;
|
||||
final backdropColor = isDark
|
||||
? const Color(0xFF1a1a1a) // Dark theme background
|
||||
: colorScheme.surface; // Light theme surface
|
||||
return BackdropFilter(
|
||||
filter: ImageFilter.blur(sigmaX: 8.0, sigmaY: 8.0),
|
||||
child: Container(
|
||||
color: backdropColor.withOpacity(opacity),
|
||||
// Use same dark color as connection screen for seamless transition
|
||||
color: const Color(0xFF1a1a1a).withOpacity(opacity),
|
||||
),
|
||||
);
|
||||
},
|
||||
@@ -792,10 +727,6 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
miniPlayerBottom: BottomSpacing.navBarHeight + MediaQuery.of(context).viewPadding.bottom + 12,
|
||||
miniPlayerHeight: 64,
|
||||
showOnboardingHints: _isOnboardingReveal,
|
||||
// Pass pending action parameters for "Play On" functionality
|
||||
onPlayerSelected: _pendingPlayerAction,
|
||||
contextHint: _pendingContextHint,
|
||||
contextHintIcon: _pendingHintIcon,
|
||||
),
|
||||
|
||||
// Global player overlay - renders ON TOP so cards slide behind it
|
||||
@@ -809,13 +740,6 @@ class _GlobalPlayerOverlayState extends State<GlobalPlayerOverlay>
|
||||
builder: (context, state, child) {
|
||||
// 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
|
||||
// disconnect, making nav bar opacity=0 and ignoring taps.
|
||||
if (playerExpansionNotifier.value.progress != 0.0) {
|
||||
playerExpansionNotifier.value = PlayerExpansionState(0.0, null, null);
|
||||
}
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,114 +0,0 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import '../models/media_item.dart';
|
||||
|
||||
/// Badge widget that displays a hi-res audio indicator for tracks
|
||||
/// with high quality audio (lossless codec + sample rate > 48kHz OR bit depth > 16)
|
||||
class HiResBadge extends StatelessWidget {
|
||||
final String? tooltip;
|
||||
final Color? primaryColor;
|
||||
|
||||
const HiResBadge({super.key, this.tooltip, this.primaryColor});
|
||||
|
||||
/// Lossless audio codecs that qualify for hi-res badge
|
||||
static const _losslessCodecs = [
|
||||
'flac',
|
||||
'wav',
|
||||
'aiff',
|
||||
'alac',
|
||||
'dsf',
|
||||
'wavpack',
|
||||
'ape',
|
||||
'tak',
|
||||
];
|
||||
|
||||
/// Check if track qualifies for hi-res badge, returns tooltip text if so
|
||||
static String? getTooltip(Track track) {
|
||||
// Find first available provider mapping with audio format info
|
||||
final mapping =
|
||||
track.providerMappings?.cast<ProviderMapping?>().firstWhere(
|
||||
(m) => m != null && m.available && m.audioFormat != null,
|
||||
orElse: () => null,
|
||||
);
|
||||
|
||||
final audioFormat = mapping?.audioFormat;
|
||||
if (audioFormat == null) return null;
|
||||
|
||||
final contentType =
|
||||
(audioFormat['content_type'] as String?)?.toLowerCase();
|
||||
final sampleRate = audioFormat['sample_rate'] as int?;
|
||||
final bitDepth = audioFormat['bit_depth'] as int?;
|
||||
|
||||
// Must be a lossless codec
|
||||
if (contentType == null) return null;
|
||||
final isLossless =
|
||||
_losslessCodecs.any((codec) => contentType.contains(codec));
|
||||
if (!isLossless) return null;
|
||||
|
||||
// Must be hi-res: sample_rate > 48000 OR bit_depth > 16
|
||||
final effectiveSampleRate = sampleRate ?? 44100;
|
||||
final effectiveBitDepth = bitDepth ?? 16;
|
||||
|
||||
if (effectiveSampleRate <= 48000 && effectiveBitDepth <= 16) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return '${effectiveSampleRate ~/ 1000}kHz $effectiveBitDepth-bit';
|
||||
}
|
||||
|
||||
/// Returns HiResBadge if track qualifies for hi-res, null otherwise
|
||||
static Widget? fromTrack(Track track, {Color? primaryColor}) {
|
||||
final tooltipText = getTooltip(track);
|
||||
if (tooltipText == null) return null;
|
||||
return HiResBadge(tooltip: tooltipText, primaryColor: primaryColor);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
// Use adaptive primary color muted with white, fallback to theme primary
|
||||
final baseColor = primaryColor ?? colorScheme.primary;
|
||||
final color = Color.lerp(baseColor, Colors.white, 0.5)!;
|
||||
|
||||
return Tooltip(
|
||||
message: tooltip ?? 'Hi-Res Audio',
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(2),
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(color: color, width: 1.5),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
'Hi-Res',
|
||||
style: TextStyle(
|
||||
color: color,
|
||||
fontSize: 9,
|
||||
fontWeight: FontWeight.w500,
|
||||
height: 1.1,
|
||||
),
|
||||
),
|
||||
Container(
|
||||
margin: const EdgeInsets.only(top: 1),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 3, vertical: 1),
|
||||
decoration: BoxDecoration(
|
||||
color: color,
|
||||
borderRadius: BorderRadius.circular(2),
|
||||
),
|
||||
child: Text(
|
||||
'AUDIO',
|
||||
style: TextStyle(
|
||||
color: colorScheme.surface,
|
||||
fontSize: 8,
|
||||
fontWeight: FontWeight.bold,
|
||||
height: 1.1,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,24 +1,10 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/// Display mode for the scrollbar popup indicator
|
||||
enum ScrollbarDisplayMode {
|
||||
/// Show first letter of item name (A, B, C, #)
|
||||
letter,
|
||||
/// Show year (2024, 2023, etc.)
|
||||
year,
|
||||
/// Show count number
|
||||
count,
|
||||
/// Hide the popup (just show scrollbar thumb)
|
||||
none,
|
||||
}
|
||||
|
||||
/// A scrollbar that shows a contextual popup when dragging, for fast navigation
|
||||
/// through sorted lists.
|
||||
/// A scrollbar that shows a letter popup when dragging, for fast navigation
|
||||
/// through alphabetically sorted lists.
|
||||
///
|
||||
/// Scrolls PROPORTIONALLY (like a normal scrollbar) and shows contextual info
|
||||
/// about the current position via a popup indicator. The popup content adapts
|
||||
/// based on the display mode (letters for alphabetical, years for date sorts,
|
||||
/// counts for play count sorts).
|
||||
/// Scrolls PROPORTIONALLY (like a normal scrollbar) and shows which letter
|
||||
/// section you're currently in via a popup indicator.
|
||||
class LetterScrollbar extends StatefulWidget {
|
||||
/// The scrollable child widget (ListView, GridView, etc.)
|
||||
final Widget child;
|
||||
@@ -30,14 +16,6 @@ class LetterScrollbar extends StatefulWidget {
|
||||
/// Each item's first character is used to determine the letter shown in the popup.
|
||||
final List<String> items;
|
||||
|
||||
/// Display mode for the popup indicator
|
||||
final ScrollbarDisplayMode displayMode;
|
||||
|
||||
/// Custom display labels for each item (optional).
|
||||
/// When provided, these are shown in the popup instead of extracting letters.
|
||||
/// Length must match [items] if provided.
|
||||
final List<String>? displayLabels;
|
||||
|
||||
/// Callback when user taps/drags to a specific index.
|
||||
final void Function(int index)? onScrollToIndex;
|
||||
|
||||
@@ -67,8 +45,6 @@ class LetterScrollbar extends StatefulWidget {
|
||||
required this.child,
|
||||
required this.controller,
|
||||
required this.items,
|
||||
this.displayMode = ScrollbarDisplayMode.letter,
|
||||
this.displayLabels,
|
||||
this.onScrollToIndex,
|
||||
this.onDragStateChanged,
|
||||
this.itemExtent,
|
||||
@@ -109,7 +85,7 @@ class _LetterScrollbarState extends State<LetterScrollbar> {
|
||||
if ((newFraction - _scrollFraction).abs() > 0.01) {
|
||||
setState(() {
|
||||
_scrollFraction = newFraction;
|
||||
_currentLetter = _getLabelAtFraction(newFraction);
|
||||
_currentLetter = _getLetterAtFraction(newFraction);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -126,32 +102,15 @@ class _LetterScrollbarState extends State<LetterScrollbar> {
|
||||
return '#';
|
||||
}
|
||||
|
||||
/// Get the display label at a given scroll fraction (0.0 to 1.0)
|
||||
String _getLabelAtFraction(double fraction) {
|
||||
/// Get the letter at a given scroll fraction (0.0 to 1.0)
|
||||
String _getLetterAtFraction(double fraction) {
|
||||
if (widget.items.isEmpty) return '';
|
||||
|
||||
final index = (fraction * (widget.items.length - 1)).round().clamp(0, widget.items.length - 1);
|
||||
|
||||
// Use custom display labels if provided
|
||||
if (widget.displayLabels != null && index < widget.displayLabels!.length) {
|
||||
return widget.displayLabels![index];
|
||||
}
|
||||
|
||||
// Otherwise extract from items based on display mode
|
||||
if (index < widget.items.length) {
|
||||
final item = widget.items[index];
|
||||
if (item.isNotEmpty) {
|
||||
switch (widget.displayMode) {
|
||||
case ScrollbarDisplayMode.letter:
|
||||
return _normalizeToLetter(item[0]);
|
||||
case ScrollbarDisplayMode.year:
|
||||
case ScrollbarDisplayMode.count:
|
||||
// For year/count modes, the item itself should be the display value
|
||||
return item;
|
||||
case ScrollbarDisplayMode.none:
|
||||
// No popup shown, return empty
|
||||
return '';
|
||||
}
|
||||
return _normalizeToLetter(item[0]);
|
||||
}
|
||||
}
|
||||
return '';
|
||||
@@ -195,7 +154,7 @@ class _LetterScrollbarState extends State<LetterScrollbar> {
|
||||
final fraction = clampedPosition / effectiveHeight;
|
||||
|
||||
// Get letter for display
|
||||
final letter = _getLabelAtFraction(fraction);
|
||||
final letter = _getLetterAtFraction(fraction);
|
||||
|
||||
// Scroll proportionally
|
||||
final maxScroll = widget.controller.position.maxScrollExtent;
|
||||
@@ -211,54 +170,6 @@ class _LetterScrollbarState extends State<LetterScrollbar> {
|
||||
widget.controller.jumpTo(targetScroll);
|
||||
}
|
||||
|
||||
/// Build the popup bubble with appropriate size and styling based on display mode
|
||||
Widget _buildPopupBubble(ColorScheme colorScheme) {
|
||||
// Determine size and font based on content length and display mode
|
||||
final double width;
|
||||
final double height;
|
||||
final double fontSize;
|
||||
|
||||
switch (widget.displayMode) {
|
||||
case ScrollbarDisplayMode.letter:
|
||||
case ScrollbarDisplayMode.none: // Fallback (none won't actually reach here)
|
||||
width = 56;
|
||||
height = 56;
|
||||
fontSize = 28;
|
||||
break;
|
||||
case ScrollbarDisplayMode.year:
|
||||
width = 72;
|
||||
height = 48;
|
||||
fontSize = 22;
|
||||
break;
|
||||
case ScrollbarDisplayMode.count:
|
||||
// Dynamic width based on count length
|
||||
final labelLength = _currentLetter.length;
|
||||
width = labelLength <= 2 ? 56 : (labelLength <= 4 ? 72 : 88);
|
||||
height = 48;
|
||||
fontSize = labelLength <= 3 ? 22 : 18;
|
||||
break;
|
||||
}
|
||||
|
||||
return Material(
|
||||
elevation: 4,
|
||||
color: colorScheme.primaryContainer,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
child: Container(
|
||||
width: width,
|
||||
height: height,
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
_currentLetter,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onPrimaryContainer,
|
||||
fontSize: fontSize,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final colorScheme = Theme.of(context).colorScheme;
|
||||
@@ -325,15 +236,32 @@ class _LetterScrollbarState extends State<LetterScrollbar> {
|
||||
),
|
||||
),
|
||||
|
||||
// The popup bubble (letter, year, or count) - hidden when displayMode is none
|
||||
if (_isDragging && _currentLetter.isNotEmpty && widget.displayMode != ScrollbarDisplayMode.none)
|
||||
// The letter popup bubble
|
||||
if (_isDragging && _currentLetter.isNotEmpty)
|
||||
Positioned(
|
||||
right: 48,
|
||||
top: (_dragPosition - 28).clamp(
|
||||
0.0,
|
||||
(context.findRenderObject() as RenderBox?)?.size.height ?? 500 - 56 - widget.bottomPadding,
|
||||
),
|
||||
child: _buildPopupBubble(colorScheme),
|
||||
child: Material(
|
||||
elevation: 4,
|
||||
color: colorScheme.primaryContainer,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
child: Container(
|
||||
width: 56,
|
||||
height: 56,
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
_currentLetter,
|
||||
style: TextStyle(
|
||||
color: colorScheme.onPrimaryContainer,
|
||||
fontSize: 28,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
@@ -1,166 +0,0 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import '../services/library_status_service.dart';
|
||||
|
||||
/// A widget that rebuilds when the library/favorite status of an item changes.
|
||||
///
|
||||
/// This widget listens to the centralized [LibraryStatusService] and only
|
||||
/// rebuilds when the status of the specified item changes.
|
||||
///
|
||||
/// Example:
|
||||
/// ```dart
|
||||
/// LibraryStatusBuilder(
|
||||
/// itemKey: LibraryStatusService.makeKey('album', album.provider, album.itemId),
|
||||
/// builder: (context, isInLibrary, isFavorite) {
|
||||
/// return IconButton(
|
||||
/// icon: Icon(isInLibrary ? Icons.library_add_check : Icons.library_add),
|
||||
/// onPressed: () => toggleLibrary(),
|
||||
/// );
|
||||
/// },
|
||||
/// )
|
||||
/// ```
|
||||
class LibraryStatusBuilder extends StatefulWidget {
|
||||
final String itemKey;
|
||||
final Widget Function(BuildContext context, bool isInLibrary, bool isFavorite) builder;
|
||||
|
||||
const LibraryStatusBuilder({
|
||||
super.key,
|
||||
required this.itemKey,
|
||||
required this.builder,
|
||||
});
|
||||
|
||||
@override
|
||||
State<LibraryStatusBuilder> createState() => _LibraryStatusBuilderState();
|
||||
}
|
||||
|
||||
class _LibraryStatusBuilderState extends State<LibraryStatusBuilder> {
|
||||
late bool _isInLibrary;
|
||||
late bool _isFavorite;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_updateStatus();
|
||||
LibraryStatusService.instance.addListener(_onStatusChanged);
|
||||
}
|
||||
|
||||
@override
|
||||
void didUpdateWidget(LibraryStatusBuilder oldWidget) {
|
||||
super.didUpdateWidget(oldWidget);
|
||||
if (oldWidget.itemKey != widget.itemKey) {
|
||||
_updateStatus();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
LibraryStatusService.instance.removeListener(_onStatusChanged);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _updateStatus() {
|
||||
_isInLibrary = LibraryStatusService.instance.isInLibrary(widget.itemKey);
|
||||
_isFavorite = LibraryStatusService.instance.isFavorite(widget.itemKey);
|
||||
}
|
||||
|
||||
void _onStatusChanged() {
|
||||
final newInLibrary = LibraryStatusService.instance.isInLibrary(widget.itemKey);
|
||||
final newFavorite = LibraryStatusService.instance.isFavorite(widget.itemKey);
|
||||
|
||||
if (newInLibrary != _isInLibrary || newFavorite != _isFavorite) {
|
||||
setState(() {
|
||||
_isInLibrary = newInLibrary;
|
||||
_isFavorite = newFavorite;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return widget.builder(context, _isInLibrary, _isFavorite);
|
||||
}
|
||||
}
|
||||
|
||||
/// Mixin for StatefulWidgets that need to track library/favorite status.
|
||||
///
|
||||
/// This provides a simpler API for widgets that already maintain other state.
|
||||
///
|
||||
/// Example:
|
||||
/// ```dart
|
||||
/// class _MyWidgetState extends State<MyWidget> with LibraryStatusMixin {
|
||||
/// @override
|
||||
/// String get libraryItemKey => LibraryStatusService.makeKey('album', widget.album.provider, widget.album.itemId);
|
||||
///
|
||||
/// @override
|
||||
/// Widget build(BuildContext context) {
|
||||
/// return IconButton(
|
||||
/// icon: Icon(isInLibrary ? Icons.check : Icons.add),
|
||||
/// onPressed: toggleLibrary,
|
||||
/// );
|
||||
/// }
|
||||
/// }
|
||||
/// ```
|
||||
mixin LibraryStatusMixin<T extends StatefulWidget> on State<T> {
|
||||
/// Override to provide the item key
|
||||
String get libraryItemKey;
|
||||
|
||||
/// Whether the item is currently in the library
|
||||
bool get isInLibrary => LibraryStatusService.instance.isInLibrary(libraryItemKey);
|
||||
|
||||
/// Whether the item is currently a favorite
|
||||
bool get isFavorite => LibraryStatusService.instance.isFavorite(libraryItemKey);
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
LibraryStatusService.instance.addListener(_onLibraryStatusChanged);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
LibraryStatusService.instance.removeListener(_onLibraryStatusChanged);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _onLibraryStatusChanged() {
|
||||
// Trigger rebuild to pick up new status values
|
||||
if (mounted) {
|
||||
setState(() {});
|
||||
}
|
||||
}
|
||||
|
||||
/// Set library status optimistically and return previous value for rollback
|
||||
bool setLibraryStatus(bool value) {
|
||||
final previous = isInLibrary;
|
||||
LibraryStatusService.instance.markLibraryPending(libraryItemKey, previous);
|
||||
LibraryStatusService.instance.setLibraryStatus(libraryItemKey, value);
|
||||
return previous;
|
||||
}
|
||||
|
||||
/// Set favorite status optimistically and return previous value for rollback
|
||||
bool setFavoriteStatus(bool value) {
|
||||
final previous = isFavorite;
|
||||
LibraryStatusService.instance.markFavoritePending(libraryItemKey, previous);
|
||||
LibraryStatusService.instance.setFavoriteStatus(libraryItemKey, value);
|
||||
return previous;
|
||||
}
|
||||
|
||||
/// Complete a successful library operation
|
||||
void completeLibraryOperation() {
|
||||
LibraryStatusService.instance.completeLibraryOperation(libraryItemKey);
|
||||
}
|
||||
|
||||
/// Complete a successful favorite operation
|
||||
void completeFavoriteOperation() {
|
||||
LibraryStatusService.instance.completeFavoriteOperation(libraryItemKey);
|
||||
}
|
||||
|
||||
/// Rollback a failed library operation
|
||||
void rollbackLibraryOperation() {
|
||||
LibraryStatusService.instance.rollbackLibraryOperation(libraryItemKey);
|
||||
}
|
||||
|
||||
/// Rollback a failed favorite operation
|
||||
void rollbackFavoriteOperation() {
|
||||
LibraryStatusService.instance.rollbackFavoriteOperation(libraryItemKey);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user