A cross platform Audiobookshelf client for Android and iOS
Dart
Keep live updates on with Audiobookshelf 2.37 and offer Explicit and Abridged when matching
Barnabase5519b041418
diff --git a/lib/providers/auth_provider.dart b/lib/providers/auth_provider.dartindex b8a6b1a8..f4b0f330 100644--- a/lib/providers/auth_provider.dart+++ b/lib/providers/auth_provider.dart@@ -1692,6 +1692,7 @@ class AuthProvider extends ChangeNotifier {} catch (_) {}final token = _accessToken;if (token != null) {+ SocketService().onTokenExpired = () async => await apiService?.refreshAccessTokenNow() ?? false;SocketService().connect(activeServerUrl!,token,diff --git a/lib/screens/absorbing_screen.dart b/lib/screens/absorbing_screen.dartindex d22f60d8..84d945f9 100644--- a/lib/screens/absorbing_screen.dart+++ b/lib/screens/absorbing_screen.dart@@ -1190,6 +1190,7 @@ class _ReorderAbsorbingSheetState extends State<_ReorderAbsorbingSheet> {_seriesBooks = null;_seriesId = null;_seriesName = null;+ _seriesLibraryId = null;_showEpisodes = null;_showItem = null;_showName = null;@@ -1296,6 +1297,8 @@ class _ReorderAbsorbingSheetState extends State<_ReorderAbsorbingSheet> {List<Map<String, dynamic>>? _seriesBooks;String? _seriesId;String? _seriesName;+ // The series' own library: with libraries merged it can be another one.+ String? _seriesLibraryId;List<Map<String, dynamic>>? _playlistItems;String? _playlistId;String? _playlistName;@@ -1402,6 +1405,7 @@ class _ReorderAbsorbingSheetState extends State<_ReorderAbsorbingSheet> {_seriesBooks = books;_seriesId = sid;_seriesName = seriesName;+ _seriesLibraryId = libraryId;});_scrollToCurrent([for (final b in books) b['id'] as String? ?? ''],@@ -1693,7 +1697,7 @@ class _ReorderAbsorbingSheetState extends State<_ReorderAbsorbingSheet> {books: const [],serverUrl: auth.serverUrl,token: auth.token,- libraryId: widget.lib.selectedLibraryId,+ libraryId: _seriesLibraryId ?? widget.lib.selectedLibraryId,);},),diff --git a/lib/services/api_service.dart b/lib/services/api_service.dartindex 1fc4846d..ff814a5e 100644--- a/lib/services/api_service.dart+++ b/lib/services/api_service.dart@@ -796,6 +796,14 @@ class ApiService {}();}+ /// Gets a new access token now, whatever this phone makes of the old one's+ /// age: the server said it has run out. True once a new one is in hand.+ Future<bool> refreshAccessTokenNow() async {+ final outcome = await _refreshAccessToken();+ if (outcome == _RefreshOutcome.rejected) onAuthExpired?.call();+ return outcome == _RefreshOutcome.refreshed;+ }+/// Attempt to refresh the access token using the refresh token. A rejected/// refresh is kept distinct from a temporary network/server failure so only/// an explicit 401/403 can expire the local session.diff --git a/lib/services/socket_service.dart b/lib/services/socket_service.dartindex e7e2951e..4cbd1cb5 100644--- a/lib/services/socket_service.dart+++ b/lib/services/socket_service.dart@@ -20,6 +20,39 @@ class SocketService {String? _serverUrl;DateTime? _connectedAt;+ /// Set by the app: gets a new access token, which comes back through+ /// [updateToken]. True once there is one.+ Future<bool> Function()? onTokenExpired;+ bool _askedForToken = false;++ void _onAuthFailed(dynamic data) {+ final message = data is Map ? data['message'] : null;+ // Audiobookshelf 2.37 says when it's only the token's age. The socket+ // stays open, so a new token signs it in again; once per sign-in.+ final refresh = onTokenExpired;+ if (message == 'Token expired' && refresh != null && !_askedForToken) {+ _askedForToken = true;+ debugPrint('[Socket] Token expired - getting a new one');+ refresh().then((ok) {+ if (ok) return;+ debugPrint('[Socket] No new token - leaving live updates off');+ disconnect();+ }, onError: (Object e) {+ debugPrint('[Socket] New token failed: $e');+ disconnect();+ });+ return;+ }+ debugPrint('[Socket] Auth failed${message is String ? ': $message' : ''}');+ disconnect();+ }++ @visibleForTesting+ void debugAuthFailed(Object? data) => _onAuthFailed(data);++ @visibleForTesting+ void debugAuthenticated() => _askedForToken = false;+bool get isConnected => _socket?.connected ?? false;bool get hasSocket => _socket != null;@@ -375,14 +408,12 @@ class SocketService {_socket!.on('init', (_) {debugPrint('[Socket] Authenticated - user is online');+ _askedForToken = false;_syncServerLogSubscription();onAuthenticated?.call();});- _socket!.on('auth_failed', (_) {- debugPrint('[Socket] Auth failed');- disconnect();- });+ _socket!.on('auth_failed', _onAuthFailed);// Cross-device progress sync_socket!.on('user_item_progress_updated', (data) {@@ -592,14 +623,12 @@ class SocketService {_socket!.on('init', (_) {debugPrint('[Socket] Authenticated - user is online');+ _askedForToken = false;_syncServerLogSubscription();onAuthenticated?.call();});- _socket!.on('auth_failed', (_) {- debugPrint('[Socket] Auth failed');- disconnect();- });+ _socket!.on('auth_failed', _onAuthFailed);_socket!.on('user_item_progress_updated', (data) {if (data is Map<String, dynamic>) {diff --git a/lib/widgets/edit_metadata_sheet.dart b/lib/widgets/edit_metadata_sheet.dartindex e33e254d..e0304dea 100644--- a/lib/widgets/edit_metadata_sheet.dart+++ b/lib/widgets/edit_metadata_sheet.dart@@ -549,6 +549,8 @@ class _MetadataEditViewState extends State<MetadataEditView>add('asin', book['asin']);add('isbn', book['isbn']);add('language', book['language']);+ if (selected.contains('explicit') && book['explicit'] is bool) update['explicit'] = book['explicit'];+ if (selected.contains('abridged') && book['abridged'] is bool) update['abridged'] = book['abridged'];// Authors/narrators are arrays in ABSif (selected.contains('author')) {@@ -655,6 +657,13 @@ class _MetadataEditViewState extends State<MetadataEditView>? _safeString(book['cover']): _safeString(book['image']);if (cover.isNotEmpty) fields['cover'] = cover;+ // Audible results carry both since Audiobookshelf 2.37.+ if (book['explicit'] is bool) {+ fields['explicit'] = book['explicit'] == true ? l.matchExplicitYes : l.matchExplicitNo;+ }+ if (book['abridged'] is bool) {+ fields['abridged'] = book['abridged'] == true ? l.matchAbridgedYes : l.matchAbridgedNo;+ }if (fields.isEmpty) return;@@ -673,6 +682,8 @@ class _MetadataEditViewState extends State<MetadataEditView>'genres': l.genresLabel,'series': l.seriesLabel,'cover': l.metadataLookupCover,+ 'explicit': l.explicitContent,+ 'abridged': l.abridged,};showDialog(