Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Update the missing item flags live and let the admin podcast feed sort oldest first

Barnabas9706f101a30d
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 24ae47df..f405e152 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -2388,6 +2388,8 @@
"adminPodcastsFailedMatch": "Failed to match podcast",
"adminPodcastsSelectAll": "Select all",
"adminPodcastsSelectAllNew": "New only",
+ "adminPodcastsSortNewestFirst": "Newest first",
+ "adminPodcastsSortOldestFirst": "Oldest first",
"adminPodcastsEditInfo": "Edit Info",
"adminPodcastsEditInfoSubtitle": "Change title, description, cover and more",
"adminPodcastsEditTitle": "Edit Podcast",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index a6121b05..7aec6c50 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -7730,6 +7730,18 @@ abstract class AppLocalizations {
/// **'New only'**
String get adminPodcastsSelectAllNew;
+ /// No description provided for @adminPodcastsSortNewestFirst.
+ ///
+ /// In en, this message translates to:
+ /// **'Newest first'**
+ String get adminPodcastsSortNewestFirst;
+
+ /// No description provided for @adminPodcastsSortOldestFirst.
+ ///
+ /// In en, this message translates to:
+ /// **'Oldest first'**
+ String get adminPodcastsSortOldestFirst;
+
/// No description provided for @adminPodcastsEditInfo.
///
/// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index c6ef3678..00f1fad2 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -4338,6 +4338,12 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dart
index ffd80528..a6ba576d 100644
--- a/lib/l10n/app_localizations_el.dart
+++ b/lib/l10n/app_localizations_el.dart
@@ -4295,6 +4295,12 @@ class AppLocalizationsEl extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index 009668c9..b880068b 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -4295,6 +4295,12 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index 72e8ba7b..69384720 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -4295,6 +4295,12 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index deb579b5..1a5220e5 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -4297,6 +4297,12 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index 1287b634..56ac08af 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -4295,6 +4295,12 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
index 2d34c2c4..a7c14b75 100644
--- a/lib/l10n/app_localizations_ja.dart
+++ b/lib/l10n/app_localizations_ja.dart
@@ -4295,6 +4295,12 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dart
index 44ae896b..bfe94733 100644
--- a/lib/l10n/app_localizations_no.dart
+++ b/lib/l10n/app_localizations_no.dart
@@ -4295,6 +4295,12 @@ class AppLocalizationsNo extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index 8fe85d36..9617136c 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -4295,6 +4295,12 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dart
index 4c618e6d..c6cde879 100644
--- a/lib/l10n/app_localizations_ro.dart
+++ b/lib/l10n/app_localizations_ro.dart
@@ -4295,6 +4295,12 @@ class AppLocalizationsRo extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index ee9ed962..dccd2e96 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -4298,6 +4298,12 @@ class AppLocalizationsRu extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 10f5bae2..d8fb8ec0 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -4221,6 +4221,12 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get adminPodcastsSelectAllNew => 'New only';
+ @override
+ String get adminPodcastsSortNewestFirst => 'Newest first';
+
+ @override
+ String get adminPodcastsSortOldestFirst => 'Oldest first';
+
@override
String get adminPodcastsEditInfo => 'Edit Info';
diff --git a/lib/screens/admin_podcasts_screen.dart b/lib/screens/admin_podcasts_screen.dart
index acbbb4ad..5b23a6aa 100644
--- a/lib/screens/admin_podcasts_screen.dart
+++ b/lib/screens/admin_podcasts_screen.dart
@@ -1013,10 +1013,35 @@ class _PodcastDetailScreenState extends State<_PodcastDetailScreen> with SingleT
if (result != null) {
final podcast = result['podcast'] as Map<String, dynamic>? ?? result;
_feedEpisodes = podcast['episodes'] as List? ?? [];
+ if (!_feedNewestFirst) _applyFeedSort();
}
if (mounted) setState(() => _loadingFeed = false);
}
+ bool _feedNewestFirst = true;
+
+ // Sort by publish date when the feed provides one; otherwise fall back to
+ // reversing feed order (feeds are conventionally newest-first). The select
+ // mode tracks episodes by index, so selection is cleared on toggle.
+ void _applyFeedSort() {
+ num? dateOf(dynamic e) => (e as Map)['publishedAt'] as num? ?? e['pubDate'] as num?;
+ if (_feedEpisodes.every((e) => dateOf(e) != null)) {
+ _feedEpisodes.sort((a, b) => _feedNewestFirst
+ ? dateOf(b)!.compareTo(dateOf(a)!)
+ : dateOf(a)!.compareTo(dateOf(b)!));
+ } else {
+ _feedEpisodes = _feedEpisodes.reversed.toList();
+ }
+ }
+
+ void _toggleFeedSort() {
+ setState(() {
+ _feedNewestFirst = !_feedNewestFirst;
+ _selectedFeedIndices.clear();
+ _applyFeedSort();
+ });
+ }
+
Future<void> _pollDownloadQueue() async {
if (_pollingQueue) return;
_pollingQueue = true;
@@ -1100,6 +1125,16 @@ class _PodcastDetailScreenState extends State<_PodcastDetailScreen> with SingleT
child: Row(children: [
IconButton(icon: Icon(Icons.arrow_back_rounded, color: cs.onSurface.withValues(alpha: 0.54)), onPressed: () => Navigator.pop(context)),
const Spacer(),
+ if (_tabCtrl.index == 1 && _feedEpisodes.isNotEmpty)
+ IconButton(
+ icon: Icon(
+ _feedNewestFirst ? Icons.arrow_downward_rounded : Icons.arrow_upward_rounded,
+ color: cs.onSurface.withValues(alpha: 0.3),
+ size: 20,
+ ),
+ tooltip: _feedNewestFirst ? l.adminPodcastsSortNewestFirst : l.adminPodcastsSortOldestFirst,
+ onPressed: _toggleFeedSort,
+ ),
if ((_tabCtrl.index == 0 && _episodes.isNotEmpty) || (_tabCtrl.index == 1 && _feedEpisodes.isNotEmpty))
IconButton(
icon: Icon(
diff --git a/lib/screens/admin_screen.dart b/lib/screens/admin_screen.dart
index 7265e3c8..844265eb 100644
--- a/lib/screens/admin_screen.dart
+++ b/lib/screens/admin_screen.dart
@@ -1,7 +1,9 @@
+import 'dart:async';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../providers/auth_provider.dart';
import '../services/scoped_prefs.dart';
+import '../services/socket_service.dart';
import '../widgets/absorb_page_header.dart';
import '../widgets/rmab_config_sheet.dart';
import '../l10n/app_localizations.dart';
@@ -38,8 +40,41 @@ class _AdminScreenState extends State<AdminScreen> {
bool _creatingBackup = false;
bool _purgingCache = false;
+ Timer? _issuesDebounce;
+
+ @override
+ void initState() {
+ super.initState();
+ _loadAll();
+ SocketService().addItemsChangedListener(_onItemsChanged);
+ }
+
@override
- void initState() { super.initState(); _loadAll(); }
+ void dispose() {
+ SocketService().removeItemsChangedListener(_onItemsChanged);
+ _issuesDebounce?.cancel();
+ super.dispose();
+ }
+
+ // Scans flag items missing/invalid server-side and stream items_updated
+ // events in chunks, so wait for a quiet moment then re-count once.
+ void _onItemsChanged() {
+ if (!mounted) return;
+ _issuesDebounce?.cancel();
+ _issuesDebounce = Timer(const Duration(seconds: 2), _refreshIssueCounts);
+ }
+
+ Future<void> _refreshIssueCounts() async {
+ final api = context.read<AuthProvider>().apiService;
+ if (api == null || !mounted) return;
+ for (final lib in _libraries) {
+ final id = lib['id'] as String? ?? '';
+ if (id.isEmpty) continue;
+ _libraryIssues[id] = await api.getIssueItemCount(id);
+ if (!mounted) return;
+ }
+ setState(() {});
+ }
Future<void> _loadAll() async {
final api = context.read<AuthProvider>().apiService;
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 9d763fde..5af51680 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:flutter/material.dart';
@@ -18,6 +19,7 @@ import '../services/user_account_service.dart';
import '../services/backup_service.dart';
import '../services/log_service.dart';
import '../services/scoped_prefs.dart';
+import '../services/socket_service.dart';
import '../screens/login_screen.dart';
import '../screens/app_shell.dart';
import '../services/update_checker_service.dart';
@@ -198,12 +200,27 @@ class _SettingsScreenState extends State<SettingsScreen> {
_localServerController = TextEditingController();
_loadSettings();
_loadAdminIssueCount();
+ SocketService().addItemsChangedListener(_onServerItemsChanged);
PlayerSettings.settingsChanged.addListener(_onExternalSettingsChange);
}
+ // Keep the Server Admin badge current: scans flag items missing/invalid
+ // server-side and stream items_updated events, so re-count after a quiet
+ // moment instead of only once at screen creation (this screen is cached in
+ // the shell, so initState runs a single time per session).
+ Timer? _issueBadgeDebounce;
+ bool _issueCountFetched = false;
+
+ void _onServerItemsChanged() {
+ if (!mounted || !context.read<AuthProvider>().isAdmin) return;
+ _issueBadgeDebounce?.cancel();
+ _issueBadgeDebounce = Timer(const Duration(seconds: 3), _loadAdminIssueCount);
+ }
+
/// Sum missing/invalid item counts across all libraries so the Server Admin
/// button can show a badge when there's cleanup to do, without opening admin.
Future<void> _loadAdminIssueCount() async {
+ if (!mounted) return;
final auth = context.read<AuthProvider>();
if (!auth.isAdmin) return;
final api = auth.apiService;
@@ -215,6 +232,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
.where((s) => s.isNotEmpty)
.toList();
if (ids.isEmpty) return;
+ _issueCountFetched = true;
final counts = await Future.wait(ids.map(api.getIssueItemCount));
if (!mounted) return;
setState(() => _adminIssueCount = counts.fold<int>(0, (a, b) => a + b));
@@ -222,6 +240,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
@override
void dispose() {
+ SocketService().removeItemsChangedListener(_onServerItemsChanged);
+ _issueBadgeDebounce?.cancel();
PlayerSettings.settingsChanged.removeListener(_onExternalSettingsChange);
_localServerController.dispose();
super.dispose();
@@ -1069,6 +1089,14 @@ class _SettingsScreenState extends State<SettingsScreen> {
final auth = context.watch<AuthProvider>();
final lib = context.watch<LibraryProvider>();
final l = AppLocalizations.of(context)!;
+ // Libraries may not have loaded yet when initState fetched the admin issue
+ // badge; retry once they arrive.
+ if (!_issueCountFetched && auth.isAdmin && lib.libraries.isNotEmpty) {
+ _issueCountFetched = true;
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ if (mounted) _loadAdminIssueCount();
+ });
+ }
if (lib.selectedLibraryId != null && lib.selectedLibraryId != _curLibId) {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) _loadCurrentLibraryOverrides(lib.selectedLibraryId!);
diff --git a/lib/services/socket_service.dart b/lib/services/socket_service.dart
index f5032210..55f24413 100644
--- a/lib/services/socket_service.dart
+++ b/lib/services/socket_service.dart
@@ -97,6 +97,24 @@ class SocketService {
}
}
+ // Library-item change fan-out so screens can react to scan/watcher-driven
+ // changes (e.g. items flagged missing) without claiming the single-slot
+ // onItemUpdated callback. Fires for item_added/item_updated/item_removed and
+ // the scanner's bulk items_updated/items_added events.
+ final List<VoidCallback> _itemsChangedListeners = [];
+
+ void addItemsChangedListener(VoidCallback fn) {
+ if (!_itemsChangedListeners.contains(fn)) _itemsChangedListeners.add(fn);
+ }
+ void removeItemsChangedListener(VoidCallback fn) =>
+ _itemsChangedListeners.remove(fn);
+
+ void _emitItemsChanged() {
+ for (final fn in List.of(_itemsChangedListeners)) {
+ fn();
+ }
+ }
+
/// Called when ereader devices change. Server emits this both for the
/// per-user update (always) and admin-wide updates (only to admins).
/// Payload shape: { ereaderDevices: [...] } already filtered for this user.
@@ -151,14 +169,26 @@ class SocketService {
_socket!.on('item_added', (data) {
debugPrint('[Socket] Item added');
if (data is Map<String, dynamic>) onItemUpdated?.call(data);
+ _emitItemsChanged();
});
_socket!.on('item_updated', (data) {
debugPrint('[Socket] Item updated');
if (data is Map<String, dynamic>) onItemUpdated?.call(data);
+ _emitItemsChanged();
});
_socket!.on('item_removed', (data) {
debugPrint('[Socket] Item removed');
if (data is Map<String, dynamic>) onItemRemoved?.call(data);
+ _emitItemsChanged();
+ });
+ // Bulk events the scanner emits in chunks while a scan runs
+ _socket!.on('items_updated', (_) {
+ debugPrint('[Socket] Items updated (bulk)');
+ _emitItemsChanged();
+ });
+ _socket!.on('items_added', (_) {
+ debugPrint('[Socket] Items added (bulk)');
+ _emitItemsChanged();
});
// Series changes
@@ -322,13 +352,18 @@ class SocketService {
_socket!.on('item_added', (data) {
if (data is Map<String, dynamic>) onItemUpdated?.call(data);
+ _emitItemsChanged();
});
_socket!.on('item_updated', (data) {
if (data is Map<String, dynamic>) onItemUpdated?.call(data);
+ _emitItemsChanged();
});
_socket!.on('item_removed', (data) {
if (data is Map<String, dynamic>) onItemRemoved?.call(data);
+ _emitItemsChanged();
});
+ _socket!.on('items_updated', (_) => _emitItemsChanged());
+ _socket!.on('items_added', (_) => _emitItemsChanged());
_socket!.on('series_added', (_) => onSeriesUpdated?.call());
_socket!.on('series_updated', (_) => onSeriesUpdated?.call());