A cross platform Audiobookshelf client for Android and iOS
Dart
Keep server activity updated on the admin page
Barnabasebeb0d4f0eea
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex be93164a..c4a54956 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -1045,6 +1045,31 @@"tipsAndHiddenFeatures": "Tips & Hidden Features","tipsSubtitle": "Get the most out of Absorb","adminTitle": "Server Admin",+ "adminTasksTitle": "Server activity",+ "adminTasksRunning": "{count, plural, =1{1 task running} other{{count} tasks running}}",+ "@adminTasksRunning": {+ "placeholders": {+ "count": {+ "type": "int"+ }+ }+ },+ "adminTasksRecent": "Recent server activity",+ "adminTasksEmpty": "No server tasks are running",+ "adminTaskScanSummary": "{added} added - {updated} updated - {missing} missing",+ "@adminTaskScanSummary": {+ "placeholders": {+ "added": {+ "type": "int"+ },+ "updated": {+ "type": "int"+ },+ "missing": {+ "type": "int"+ }+ }+ },"adminServer": "Server","adminVersion": "Version","adminUsers": "Users",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 2cc643ce..36023879 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -3796,6 +3796,36 @@ abstract class AppLocalizations {/// **'Server Admin'**String get adminTitle;+ /// No description provided for @adminTasksTitle.+ ///+ /// In en, this message translates to:+ /// **'Server activity'**+ String get adminTasksTitle;++ /// No description provided for @adminTasksRunning.+ ///+ /// In en, this message translates to:+ /// **'{count, plural, =1{1 task running} other{{count} tasks running}}'**+ String adminTasksRunning(int count);++ /// No description provided for @adminTasksRecent.+ ///+ /// In en, this message translates to:+ /// **'Recent server activity'**+ String get adminTasksRecent;++ /// No description provided for @adminTasksEmpty.+ ///+ /// In en, this message translates to:+ /// **'No server tasks are running'**+ String get adminTasksEmpty;++ /// No description provided for @adminTaskScanSummary.+ ///+ /// In en, this message translates to:+ /// **'{added} added - {updated} updated - {missing} missing'**+ String adminTaskScanSummary(int added, int updated, int missing);+/// No description provided for @adminServer.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex b40bce11..c5de7a03 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -2096,6 +2096,31 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get adminTitle => 'Server-Admin';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => 'Server';diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex 33f63d65..5f8b38c6 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -2077,6 +2077,31 @@ class AppLocalizationsEl extends AppLocalizations {@overrideString get adminTitle => 'Server Admin';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => 'Server';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 511a0012..0ddf17d1 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -2077,6 +2077,31 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get adminTitle => 'Server Admin';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => 'Server';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex 8eb9ab69..97d490d6 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -2077,6 +2077,31 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get adminTitle => 'Server Admin';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => 'Server';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex 02d0db05..e2b78dab 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -2079,6 +2079,31 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get adminTitle => 'Server Admin';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => 'Server';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex 5ca0e9e8..babd2809 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -2077,6 +2077,31 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get adminTitle => 'Server Admin';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => 'Server';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 46e1e77a..1d0f41ad 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -2077,6 +2077,31 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get adminTitle => 'Server Admin';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => 'Server';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex 94602218..54d65880 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -2077,6 +2077,31 @@ class AppLocalizationsNo extends AppLocalizations {@overrideString get adminTitle => 'Server Admin';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => 'Server';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex 3b9d446e..7281147e 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -2077,6 +2077,31 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get adminTitle => 'Server Admin';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => 'Server';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex 783fb4c6..909a856b 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -2077,6 +2077,31 @@ class AppLocalizationsRo extends AppLocalizations {@overrideString get adminTitle => 'Server Admin';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => 'Server';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex e52d18dd..fa4a73ea 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -2080,6 +2080,31 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get adminTitle => 'Server Admin';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => 'Server';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex c64399ba..25054178 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -2019,6 +2019,31 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get adminTitle => '服务器管理';+ @override+ String get adminTasksTitle => 'Server activity';++ @override+ String adminTasksRunning(int count) {+ String _temp0 = intl.Intl.pluralLogic(+ count,+ locale: localeName,+ other: '$count tasks running',+ one: '1 task running',+ );+ return '$_temp0';+ }++ @override+ String get adminTasksRecent => 'Recent server activity';++ @override+ String get adminTasksEmpty => 'No server tasks are running';++ @override+ String adminTaskScanSummary(int added, int updated, int missing) {+ return '$added added - $updated updated - $missing missing';+ }+@overrideString get adminServer => '服务器';diff --git a/lib/screens/admin_screen.dart b/lib/screens/admin_screen.dartindex 8f9784ef..fe3daefc 100644--- a/lib/screens/admin_screen.dart+++ b/lib/screens/admin_screen.dart@@ -3,7 +3,9 @@ import 'package:flutter/material.dart';import 'package:provider/provider.dart';import '../providers/auth_provider.dart';import '../services/scoped_prefs.dart';+import '../services/server_task_tracker.dart';import '../services/socket_service.dart';+import '../widgets/admin_task_indicator.dart';import '../widgets/absorb_page_header.dart';import '../widgets/rmab_config_sheet.dart';import '../l10n/app_localizations.dart';@@ -23,7 +25,7 @@ class AdminScreen extends StatefulWidget {@override State<AdminScreen> createState() => _AdminScreenState();}-class _AdminScreenState extends State<AdminScreen> {+class _AdminScreenState extends State<AdminScreen> with WidgetsBindingObserver {bool _loading = true;List<dynamic> _users = [];List<dynamic> _onlineUsers = [];@@ -40,23 +42,61 @@ class _AdminScreenState extends State<AdminScreen> {final Set<String> _matchingLibraries = {};bool _creatingBackup = false;bool _purgingCache = false;+ late final ServerTaskTracker _taskTracker;Timer? _issuesDebounce;+ Timer? _taskRefreshTimer;+ bool _refreshingTasks = false;@overridevoid initState() {super.initState();+ WidgetsBinding.instance.addObserver(this);+ _taskTracker = ServerTaskTracker();+ _startTaskRefreshTimer();_loadAll();SocketService().addItemsChangedListener(_onItemsChanged);}@overridevoid dispose() {+ WidgetsBinding.instance.removeObserver(this);SocketService().removeItemsChangedListener(_onItemsChanged);_issuesDebounce?.cancel();+ _taskRefreshTimer?.cancel();+ _taskTracker.dispose();super.dispose();}+ @override+ void didChangeAppLifecycleState(AppLifecycleState state) {+ if (state == AppLifecycleState.resumed) {+ _startTaskRefreshTimer();+ unawaited(_refreshServerTasks());+ } else {+ _taskRefreshTimer?.cancel();+ }+ }++ void _startTaskRefreshTimer() {+ _taskRefreshTimer?.cancel();+ _taskRefreshTimer = Timer.periodic(const Duration(seconds: 3), (_) {+ unawaited(_refreshServerTasks());+ });+ }++ Future<void> _refreshServerTasks() async {+ if (!mounted || _refreshingTasks) return;+ final service = context.read<AuthProvider>().apiService;+ if (service == null) return;+ _refreshingTasks = true;+ try {+ await _taskTracker.refresh(service);+ } finally {+ _refreshingTasks = false;+ }+ }+// 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() {@@ -82,9 +122,11 @@ class _AdminScreenState extends State<AdminScreen> {if (api == null) return;setState(() => _loading = true);+ final taskRefresh = _refreshServerTasks();final futures = await Future.wait([api.getUsers(), api.getOnlineUsers(), api.getLibraries(), api.getBackups(), api.getAllSessions(limit: 10),]);+ await taskRefresh;_users = futures[0];_onlineUsers = futures[1];_libraries = futures[2];@@ -137,6 +179,13 @@ class _AdminScreenState extends State<AdminScreen> {padding: const EdgeInsets.fromLTRB(20, 12, 8, 0),child: Row(children: [Expanded(child: AbsorbPageHeader(title: l.adminTitle, padding: EdgeInsets.zero)),+ ListenableBuilder(+ listenable: _taskTracker,+ builder: (_, __) => AdminTaskIndicator(+ tasks: _taskTracker.visibleTasks,+ onPressed: () => showAdminTasksSheet(context, _taskTracker),+ ),+ ),IconButton(icon: Icon(Icons.close_rounded, color: cs.onSurfaceVariant), onPressed: () => Navigator.pop(context)),]),),@@ -289,7 +338,14 @@ class _AdminScreenState extends State<AdminScreen> {// ── Libraries ──_section(cs, tt, l.adminLibraries),- ..._libraries.map((lib) => _libraryCard(cs, tt, lib)),+ ListenableBuilder(+ listenable: _taskTracker,+ builder: (_, __) => Column(+ children: _libraries+ .map((lib) => _libraryCard(cs, tt, lib))+ .toList(),+ ),+ ),],),),@@ -404,8 +460,10 @@ class _AdminScreenState extends State<AdminScreen> {final totalItems = stats?['totalItems'] ?? 0;final totalSize = stats?['totalSize'] as num?;final totalDur = stats?['totalDuration'] as num?;- final isScanning = _scanningLibraries.contains(id);- final isMatching = _matchingLibraries.contains(id);+ final isScanning = _scanningLibraries.contains(id) ||+ _taskTracker.isLibraryActionRunning('library-scan', id);+ final isMatching = _matchingLibraries.contains(id) ||+ _taskTracker.isLibraryActionRunning('library-match-all', id);return Padding(padding: const EdgeInsets.fromLTRB(16, 0, 16, 10),@@ -542,6 +600,7 @@ class _AdminScreenState extends State<AdminScreen> {final api = context.read<AuthProvider>().apiService; if (api == null) return;setState(() => _scanningLibraries.add(id));final ok = await api.scanLibrary(id);+ if (ok) await _refreshServerTasks();if (mounted) {final l = AppLocalizations.of(context)!;setState(() => _scanningLibraries.remove(id));@@ -561,6 +620,7 @@ class _AdminScreenState extends State<AdminScreen> {if (yes != true) return;setState(() => _matchingLibraries.add(id));final ok = await api.matchLibrary(id);+ if (ok) await _refreshServerTasks();if (mounted) {final l2 = AppLocalizations.of(context)!;setState(() => _matchingLibraries.remove(id));diff --git a/lib/services/api_service.dart b/lib/services/api_service.dartindex 444f614d..2cb3ca0c 100644--- a/lib/services/api_service.dart+++ b/lib/services/api_service.dart@@ -2157,6 +2157,27 @@ class ApiService {return [];}+ /// Get the server's currently running background tasks.+ Future<List<Map<String, dynamic>>?> getServerTasks() async {+ try {+ final r = await _authGet(Uri.parse('$_cleanBaseUrl/api/tasks'));+ if (r.statusCode == 200) {+ final data = jsonDecode(r.body);+ final rawTasks = data is Map ? data['tasks'] : data;+ if (rawTasks is List) {+ return rawTasks+ .whereType<Map>()+ .map((task) => Map<String, dynamic>.from(task))+ .toList();+ }+ }+ debugPrint('[API] getServerTasks failed: ${r.statusCode}');+ } catch (e) {+ debugPrint('[API] getServerTasks error: $e');+ }+ return null;+ }+/// Check whether Audiobookshelf's destination directory for an upload is/// already in use. The web client performs this check before POST /api/upload/// so files are not merged into an existing library item directory.diff --git a/lib/services/server_task_tracker.dart b/lib/services/server_task_tracker.dartnew file mode 100644index 00000000..0f54bc9b--- /dev/null+++ b/lib/services/server_task_tracker.dart@@ -0,0 +1,277 @@+import 'dart:async';++import 'package:flutter/foundation.dart';++import 'api_service.dart';+import 'socket_service.dart';++class ServerTask {+ final String id;+ final String action;+ final Map<String, dynamic> data;+ final String title;+ final String description;+ final String error;+ final bool showSuccess;+ final bool isFailed;+ final bool isFinished;+ final int startedAt;+ final int? finishedAt;+ final double? progress;++ const ServerTask({+ required this.id,+ required this.action,+ required this.data,+ required this.title,+ required this.description,+ required this.error,+ required this.showSuccess,+ required this.isFailed,+ required this.isFinished,+ required this.startedAt,+ required this.finishedAt,+ this.progress,+ });++ factory ServerTask.fromJson(Map<String, dynamic> json) {+ return ServerTask(+ id: json['id']?.toString() ?? '',+ action: json['action']?.toString() ?? '',+ data: _stringKeyedMap(json['data']),+ title: json['title']?.toString() ?? '',+ description: json['description']?.toString() ?? '',+ error: json['error']?.toString() ?? '',+ showSuccess: json['showSuccess'] == true,+ isFailed: json['isFailed'] == true,+ isFinished: json['isFinished'] == true,+ startedAt: (json['startedAt'] as num?)?.toInt() ?? 0,+ finishedAt: (json['finishedAt'] as num?)?.toInt(),+ );+ }++ bool get isRunning => !isFinished;+ String? get libraryItemId => _nonEmptyString(data['libraryItemId']);+ String? get libraryId => _nonEmptyString(data['libraryId']);++ Map<String, dynamic>? get scanResults {+ final results = data['scanResults'];+ return results is Map ? _stringKeyedMap(results) : null;+ }++ ServerTask withProgress(double value) => ServerTask(+ id: id,+ action: action,+ data: data,+ title: title,+ description: description,+ error: error,+ showSuccess: showSuccess,+ isFailed: isFailed,+ isFinished: isFinished,+ startedAt: startedAt,+ finishedAt: finishedAt,+ progress: value,+ );++ ServerTask preservingProgress(ServerTask? previous) => ServerTask(+ id: id,+ action: action,+ data: data,+ title: title,+ description: description,+ error: error,+ showSuccess: showSuccess,+ isFailed: isFailed,+ isFinished: isFinished,+ startedAt: startedAt,+ finishedAt: finishedAt,+ progress: progress ?? previous?.progress,+ );++ static Map<String, dynamic> _stringKeyedMap(Object? value) {+ if (value is! Map) return <String, dynamic>{};+ return value.map((key, item) => MapEntry(key.toString(), item));+ }++ static String? _nonEmptyString(Object? value) {+ final string = value?.toString() ?? '';+ return string.isEmpty ? null : string;+ }+}++class ServerTaskTracker extends ChangeNotifier {+ static const recentTaskDuration = Duration(minutes: 1);++ final SocketService _socketService;+ final Map<String, ServerTask> _tasks = {};+ final Map<String, Timer> _expiryTimers = {};+ final Set<String> _finishedTaskIds = {};+ var _eventRevision = 0;+ var _disposed = false;++ ServerTaskTracker({SocketService? socketService})+ : _socketService = socketService ?? SocketService() {+ _socketService+ ..addTaskStartedListener(_onTaskStarted)+ ..addTaskProgressListener(_onTaskProgress)+ ..addTaskFinishedListener(_onTaskFinished);+ }++ List<ServerTask> get visibleTasks {+ final cutoff =+ DateTime.now().millisecondsSinceEpoch -+ recentTaskDuration.inMilliseconds;+ final tasks = _tasks.values.where((task) {+ if (task.isRunning) return true;+ if (!task.isFailed && !task.showSuccess) return false;+ return (task.finishedAt ?? 0) > cutoff;+ }).toList()..sort((a, b) => b.startedAt.compareTo(a.startedAt));+ return tasks;+ }++ int get runningCount => _tasks.values.where((task) => task.isRunning).length;++ bool isLibraryActionRunning(String action, String libraryId) {+ return _tasks.values.any(+ (task) =>+ task.isRunning &&+ task.action == action &&+ task.libraryId == libraryId,+ );+ }++ Future<void> refresh(ApiService api) async {+ if (_disposed) return;+ final revisionBeforeRequest = _eventRevision;+ final rawTasks = await api.getServerTasks();+ if (_disposed || rawTasks == null) return;++ final fetched = rawTasks+ .map(ServerTask.fromJson)+ .where(+ (task) => task.id.isNotEmpty && !_finishedTaskIds.contains(task.id),+ )+ .toList();++ if (_eventRevision == revisionBeforeRequest) {+ final runningIds = _tasks.values+ .where((task) => task.isRunning)+ .map((task) => task.id)+ .toList();+ for (final id in runningIds) {+ _tasks.remove(id);+ }+ }++ for (final task in fetched) {+ _upsert(task, notify: false);+ }+ notifyListeners();+ }++ void _onTaskStarted(Map<String, dynamic> data) {+ _eventRevision++;+ final task = ServerTask.fromJson(data);+ if (task.id.isEmpty) return;+ if (task.isFinished) _finishedTaskIds.add(task.id);+ _upsert(task);+ }++ void _onTaskProgress(Map<String, dynamic> data) {+ final progress = _parseProgress(data['progress']);+ if (progress == null) return;+ final libraryItemId = data['libraryItemId']?.toString();+ final taskId = data['id']?.toString();+ var changed = false;+ for (final entry in _tasks.entries.toList()) {+ final matches = taskId != null && taskId.isNotEmpty+ ? entry.key == taskId+ : libraryItemId != null &&+ libraryItemId.isNotEmpty &&+ entry.value.libraryItemId == libraryItemId;+ if (!entry.value.isRunning || !matches) continue;+ _tasks[entry.key] = entry.value.withProgress(progress);+ changed = true;+ }+ if (changed) notifyListeners();+ }++ void _onTaskFinished(Map<String, dynamic> data) {+ _eventRevision++;+ final task = ServerTask.fromJson(data);+ if (task.id.isEmpty) return;+ _finishedTaskIds.add(task.id);+ _upsert(task);+ }++ void _upsert(ServerTask task, {bool notify = true}) {+ final previous = _tasks[task.id];+ final targetId = task.libraryItemId ?? task.libraryId;+ if (previous == null && targetId != null) {+ final duplicateIds = _tasks.values+ .where(+ (other) =>+ other.action == task.action &&+ (other.libraryItemId ?? other.libraryId) == targetId,+ )+ .map((other) => other.id)+ .toList();+ for (final id in duplicateIds) {+ _expiryTimers.remove(id)?.cancel();+ _tasks.remove(id);+ }+ }++ final next = task.preservingProgress(previous);+ if (next.isFinished && !next.isFailed && !next.showSuccess) {+ _expiryTimers.remove(next.id)?.cancel();+ _tasks.remove(next.id);+ } else {+ _tasks[next.id] = next;+ if (next.isFinished) _scheduleExpiry(next);+ }+ if (notify && !_disposed) notifyListeners();+ }++ void _scheduleExpiry(ServerTask task) {+ _expiryTimers.remove(task.id)?.cancel();+ final expiresAt =+ (task.finishedAt ?? DateTime.now().millisecondsSinceEpoch) ++ recentTaskDuration.inMilliseconds;+ final remaining = Duration(+ milliseconds: expiresAt - DateTime.now().millisecondsSinceEpoch,+ );+ if (remaining <= Duration.zero) {+ _tasks.remove(task.id);+ return;+ }+ _expiryTimers[task.id] = Timer(remaining, () {+ _expiryTimers.remove(task.id);+ if (_disposed) return;+ _tasks.remove(task.id);+ notifyListeners();+ });+ }++ static double? _parseProgress(Object? value) {+ final parsed = value is num+ ? value.toDouble()+ : double.tryParse(value?.toString().replaceAll('%', '') ?? '');+ return parsed?.clamp(0, 100).toDouble();+ }++ @override+ void dispose() {+ _disposed = true;+ _socketService+ ..removeTaskStartedListener(_onTaskStarted)+ ..removeTaskProgressListener(_onTaskProgress)+ ..removeTaskFinishedListener(_onTaskFinished);+ for (final timer in _expiryTimers.values) {+ timer.cancel();+ }+ _expiryTimers.clear();+ super.dispose();+ }+}diff --git a/lib/services/socket_service.dart b/lib/services/socket_service.dartindex 8954995b..040da843 100644--- a/lib/services/socket_service.dart+++ b/lib/services/socket_service.dart@@ -59,9 +59,10 @@ class SocketService {/// Payload: serialized Task object including action and data.libraryItemId.void Function(Map<String, dynamic> data)? onEncodeFinished;- // Task (encode-m4b / embed-metadata) event fan-out so screens can subscribe- // alongside the library provider's onEncodeFinished above. task_started and- // task_finished carry the action; task_progress is generic {libraryItemId, progress}.+ // Server task event fan-out so admin and item screens can subscribe alongside+ // the library provider's onEncodeFinished above. task_started and+ // task_finished carry the action; task_progress is generic+ // {libraryItemId, progress}.final List<void Function(Map<String, dynamic>)> _taskStartedListeners = [];final List<void Function(Map<String, dynamic>)> _taskProgressListeners = [];final List<void Function(Map<String, dynamic>)> _taskFinishedListeners = [];@@ -100,6 +101,35 @@ class SocketService {}}+ @visibleForTesting+ static Map<String, dynamic>? normalizeSocketMap(Object? data) {+ if (data is Map<String, dynamic>) return data;+ if (data is Map) {+ return data.map((key, value) => MapEntry(key.toString(), value));+ }+ return null;+ }++ void _handleTaskStarted(dynamic data) {+ final task = normalizeSocketMap(data);+ if (task == null) return;+ debugPrint('[Socket] Task started: ${task['action'] ?? task['id']}');+ _emitTaskStarted(task);+ }++ void _handleTaskProgress(dynamic data) {+ final progress = normalizeSocketMap(data);+ if (progress != null) _emitTaskProgress(progress);+ }++ void _handleTaskFinished(dynamic data) {+ final task = normalizeSocketMap(data);+ if (task == null) return;+ debugPrint('[Socket] Task finished: ${task['action'] ?? task['id']}');+ if (task['action'] == 'encode-m4b') onEncodeFinished?.call(task);+ _emitTaskFinished(task);+ }+// 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@@ -311,22 +341,11 @@ class SocketService {if (data is Map<String, dynamic>) onUserUpdated?.call(data);});- // Task lifecycle (encode-m4b / embed-metadata). task_started + finished- // carry the action; task_progress is generic {libraryItemId, progress}.- _socket!.on('task_started', (data) {- if (data is Map<String, dynamic>) _emitTaskStarted(data);- });- _socket!.on('task_progress', (data) {- if (data is Map<String, dynamic>) _emitTaskProgress(data);- });- _socket!.on('task_finished', (data) {- if (data is! Map<String, dynamic>) return;- if (data['action'] == 'encode-m4b') {- debugPrint('[Socket] Encode finished');- onEncodeFinished?.call(data);- }- _emitTaskFinished(data);- });+ // Server task lifecycle. task_started + finished carry the action;+ // task_progress is generic {libraryItemId, progress}.+ _socket!.on('task_started', _handleTaskStarted);+ _socket!.on('task_progress', _handleTaskProgress);+ _socket!.on('task_finished', _handleTaskFinished);// Ereader device list changed (admin-wide or per-user). Payload carries// the list already filtered for this connection's user.@@ -483,17 +502,9 @@ class SocketService {if (data is Map<String, dynamic>) onUserUpdated?.call(data);});- _socket!.on('task_started', (data) {- if (data is Map<String, dynamic>) _emitTaskStarted(data);- });- _socket!.on('task_progress', (data) {- if (data is Map<String, dynamic>) _emitTaskProgress(data);- });- _socket!.on('task_finished', (data) {- if (data is! Map<String, dynamic>) return;- if (data['action'] == 'encode-m4b') onEncodeFinished?.call(data);- _emitTaskFinished(data);- });+ _socket!.on('task_started', _handleTaskStarted);+ _socket!.on('task_progress', _handleTaskProgress);+ _socket!.on('task_finished', _handleTaskFinished);_socket!.on('ereader-devices-updated', (data) {if (data is! Map) return;diff --git a/lib/widgets/admin_task_indicator.dart b/lib/widgets/admin_task_indicator.dartnew file mode 100644index 00000000..ffdae4fd--- /dev/null+++ b/lib/widgets/admin_task_indicator.dart@@ -0,0 +1,314 @@+import 'package:flutter/material.dart';++import '../l10n/app_localizations.dart';+import '../services/server_task_tracker.dart';++class AdminTaskIndicator extends StatelessWidget {+ static const indicatorKey = Key('admin-task-indicator');++ final List<ServerTask> tasks;+ final VoidCallback onPressed;++ const AdminTaskIndicator({+ super.key,+ required this.tasks,+ required this.onPressed,+ });++ @override+ Widget build(BuildContext context) {+ if (tasks.isEmpty) return const SizedBox.shrink();+ final l = AppLocalizations.of(context)!;+ final cs = Theme.of(context).colorScheme;+ final runningCount = tasks.where((task) => task.isRunning).length;+ final hasFailure = tasks.any((task) => task.isFailed);+ final tooltip = runningCount > 0+ ? l.adminTasksRunning(runningCount)+ : l.adminTasksRecent;++ return IconButton(+ key: indicatorKey,+ onPressed: onPressed,+ tooltip: tooltip,+ icon: Stack(+ clipBehavior: Clip.none,+ children: [+ if (runningCount > 0)+ SizedBox(+ width: 20,+ height: 20,+ child: CircularProgressIndicator(+ strokeWidth: 2.2,+ color: cs.primary,+ ),+ )+ else+ Icon(+ hasFailure+ ? Icons.error_outline_rounded+ : Icons.notifications_rounded,+ color: hasFailure ? cs.error : cs.primary,+ ),+ if (runningCount > 1)+ Positioned(+ right: -8,+ top: -7,+ child: Container(+ constraints: const BoxConstraints(minWidth: 16, minHeight: 16),+ padding: const EdgeInsets.symmetric(horizontal: 4),+ decoration: BoxDecoration(+ color: cs.primary,+ borderRadius: BorderRadius.circular(8),+ border: Border.all(color: cs.surface, width: 1.5),+ ),+ alignment: Alignment.center,+ child: Text(+ '$runningCount',+ style: TextStyle(+ color: cs.onPrimary,+ fontSize: 9,+ fontWeight: FontWeight.w700,+ ),+ ),+ ),+ ),+ ],+ ),+ );+ }+}++Future<void> showAdminTasksSheet(+ BuildContext context,+ ServerTaskTracker tracker,+) {+ return showModalBottomSheet<void>(+ context: context,+ isScrollControlled: true,+ useSafeArea: true,+ backgroundColor: Colors.transparent,+ builder: (sheetContext) => ListenableBuilder(+ listenable: tracker,+ builder: (_, __) => AdminTasksSheet(tasks: tracker.visibleTasks),+ ),+ );+}++class AdminTasksSheet extends StatelessWidget {+ final List<ServerTask> tasks;++ const AdminTasksSheet({super.key, required this.tasks});++ @override+ Widget build(BuildContext context) {+ final l = AppLocalizations.of(context)!;+ final cs = Theme.of(context).colorScheme;+ final tt = Theme.of(context).textTheme;+ final runningCount = tasks.where((task) => task.isRunning).length;++ return Container(+ constraints: BoxConstraints(+ maxHeight: MediaQuery.sizeOf(context).height * 0.78,+ ),+ decoration: BoxDecoration(+ color: cs.surface,+ borderRadius: const BorderRadius.vertical(top: Radius.circular(24)),+ ),+ child: Column(+ mainAxisSize: MainAxisSize.min,+ children: [+ Container(+ width: 40,+ height: 4,+ margin: const EdgeInsets.only(top: 10),+ decoration: BoxDecoration(+ color: cs.onSurface.withValues(alpha: 0.2),+ borderRadius: BorderRadius.circular(2),+ ),+ ),+ Padding(+ padding: const EdgeInsets.fromLTRB(20, 14, 8, 12),+ child: Row(+ children: [+ Expanded(+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ Text(+ l.adminTasksTitle,+ style: tt.titleLarge?.copyWith(+ fontWeight: FontWeight.w700,+ ),+ ),+ const SizedBox(height: 2),+ Text(+ runningCount > 0+ ? l.adminTasksRunning(runningCount)+ : l.adminTasksRecent,+ style: tt.bodySmall?.copyWith(+ color: cs.onSurfaceVariant,+ ),+ ),+ ],+ ),+ ),+ IconButton(+ onPressed: () => Navigator.pop(context),+ icon: const Icon(Icons.close_rounded),+ ),+ ],+ ),+ ),+ Divider(height: 1, color: cs.outlineVariant.withValues(alpha: 0.5)),+ if (tasks.isEmpty)+ Padding(+ padding: const EdgeInsets.fromLTRB(24, 36, 24, 48),+ child: Column(+ children: [+ Icon(+ Icons.check_circle_outline_rounded,+ size: 36,+ color: cs.onSurfaceVariant.withValues(alpha: 0.55),+ ),+ const SizedBox(height: 12),+ Text(+ l.adminTasksEmpty,+ textAlign: TextAlign.center,+ style: tt.bodyMedium?.copyWith(color: cs.onSurfaceVariant),+ ),+ ],+ ),+ )+ else+ Flexible(+ child: ListView.separated(+ shrinkWrap: true,+ padding: const EdgeInsets.fromLTRB(16, 12, 16, 24),+ itemCount: tasks.length,+ separatorBuilder: (_, __) => const SizedBox(height: 10),+ itemBuilder: (_, index) => _ServerTaskCard(task: tasks[index]),+ ),+ ),+ ],+ ),+ );+ }+}++class _ServerTaskCard extends StatelessWidget {+ final ServerTask task;++ const _ServerTaskCard({required this.task});++ @override+ Widget build(BuildContext context) {+ final l = AppLocalizations.of(context)!;+ final cs = Theme.of(context).colorScheme;+ final tt = Theme.of(context).textTheme;+ final title = task.title.isNotEmpty+ ? task.title+ : task.action.replaceAll('-', ' ');+ final scanSummary = _scanSummary(l);++ return Container(+ padding: const EdgeInsets.all(14),+ decoration: BoxDecoration(+ color: cs.surfaceContainerHigh,+ borderRadius: BorderRadius.circular(14),+ ),+ child: Row(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ Padding(+ padding: const EdgeInsets.only(top: 2),+ child: _statusIcon(cs),+ ),+ const SizedBox(width: 12),+ Expanded(+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.start,+ children: [+ Text(+ title,+ style: tt.titleSmall?.copyWith(fontWeight: FontWeight.w700),+ ),+ if (task.description.isNotEmpty) ...[+ const SizedBox(height: 3),+ Text(+ task.description,+ style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant),+ ),+ ],+ if (scanSummary != null) ...[+ const SizedBox(height: 5),+ Text(+ scanSummary,+ style: tt.labelSmall?.copyWith(color: cs.onSurfaceVariant),+ ),+ ],+ if (task.isFailed && task.error.isNotEmpty) ...[+ const SizedBox(height: 5),+ Text(+ task.error,+ style: tt.bodySmall?.copyWith(color: cs.error),+ ),+ ],+ if (task.isRunning && task.progress != null) ...[+ const SizedBox(height: 10),+ Row(+ children: [+ Expanded(+ child: ClipRRect(+ borderRadius: BorderRadius.circular(3),+ child: LinearProgressIndicator(+ value: task.progress! / 100,+ minHeight: 5,+ backgroundColor: cs.onSurface.withValues(+ alpha: 0.08,+ ),+ ),+ ),+ ),+ const SizedBox(width: 10),+ Text(+ l.percentComplete(task.progress!.round().toString()),+ style: tt.labelSmall?.copyWith(+ color: cs.onSurfaceVariant,+ fontWeight: FontWeight.w600,+ ),+ ),+ ],+ ),+ ],+ ],+ ),+ ),+ ],+ ),+ );+ }++ Widget _statusIcon(ColorScheme cs) {+ if (task.isRunning) {+ return SizedBox(+ width: 20,+ height: 20,+ child: CircularProgressIndicator(strokeWidth: 2, color: cs.primary),+ );+ }+ return Icon(+ task.isFailed ? Icons.error_rounded : Icons.check_circle_rounded,+ size: 22,+ color: task.isFailed ? cs.error : Colors.green,+ );+ }++ String? _scanSummary(AppLocalizations l) {+ final results = task.scanResults;+ if (results == null) return null;+ final added = (results['added'] as num?)?.toInt() ?? 0;+ final updated = (results['updated'] as num?)?.toInt() ?? 0;+ final missing = (results['missing'] as num?)?.toInt() ?? 0;+ return l.adminTaskScanSummary(added, updated, missing);+ }+}diff --git a/lib/widgets/edit_metadata_sheet.dart b/lib/widgets/edit_metadata_sheet.dartindex ccdbdd0b..70295286 100644--- a/lib/widgets/edit_metadata_sheet.dart+++ b/lib/widgets/edit_metadata_sheet.dart@@ -133,6 +133,9 @@ class _MetadataEditViewState extends State<MetadataEditView>..addTaskStartedListener(_onTaskStarted)..addTaskProgressListener(_onTaskProgress)..addTaskFinishedListener(_onTaskFinished);+ WidgetsBinding.instance.addPostFrameCallback((_) {+ unawaited(_restoreRunningTask());+ });_loadFilterSuggestions();final m = widget.metadata;_titleCtrl = TextEditingController(text: m['title'] as String? ?? '');@@ -900,6 +903,29 @@ class _MetadataEditViewState extends State<MetadataEditView>});}+ Future<void> _restoreRunningTask() async {+ if (!mounted) return;+ final api = context.read<AuthProvider>().apiService;+ if (api == null) return;+ final tasks = await api.getServerTasks();+ if (!mounted || _runningAction != null || tasks == null) return;+ final matching = tasks.where((task) {+ final itemId = (task['data'] as Map?)?['libraryItemId']?.toString();+ final action = task['action'] as String?;+ return itemId == widget.itemId &&+ task['isFinished'] != true &&+ (action == 'encode-m4b' || action == 'embed-metadata');+ }).toList()+ ..sort((a, b) =>+ ((b['startedAt'] as num?)?.toInt() ?? 0)+ .compareTo((a['startedAt'] as num?)?.toInt() ?? 0));+ if (matching.isEmpty || !mounted || _runningAction != null) return;+ setState(() {+ _runningAction = matching.first['action'] as String?;+ _taskProgress = null;+ });+ }+void _onTaskProgress(Map<String, dynamic> data) {// task_progress is generic; only attribute it once we know what's running.if (!mounted || _runningAction == null) return;diff --git a/scripts/tighten_speed_badges.py b/scripts/tighten_speed_badges.pydeleted file mode 100644index bb2d58ae..00000000--- a/scripts/tighten_speed_badges.py+++ /dev/null@@ -1,52 +0,0 @@-#!/usr/bin/env python3-"""Shrink-wrap the ic_speed_*x vector badges to their glyph bounds.--The badges were generated on a fixed wide 277x98 canvas with large empty-margins, so when the media notification fits the drawable into the action-button the digits render small. This re-fits each badge's viewport tightly-around the actual text (with a little padding) and sets the displayed-width/height to the same aspect, so the glyphs fill the button while keeping-correct proportions. Re-runnable.-"""-import glob-import re--PAD = 8 # viewport-unit breathing room around the glyphs-NUM = re.compile(r'-?\d+\.?\d*')---def fmt(v):- return ('%f' % round(v, 1)).rstrip('0').rstrip('.')---for path in sorted(glob.glob('android/app/src/main/res/drawable/ic_speed_*.xml')):- with open(path, 'r', encoding='utf-8') as fh:- xml = fh.read()- data = re.search(r'android:pathData="([^"]*)"', xml).group(1)- nums = [float(n) for n in NUM.findall(data)]- xs, ys = nums[0::2], nums[1::2]- dx, dy = PAD - min(xs), PAD - min(ys)- vp_w = round((max(xs) - min(xs)) + 2 * PAD)- vp_h = round((max(ys) - min(ys)) + 2 * PAD)-- counter = {'i': 0}-- def repl(mo):- i = counter['i']- counter['i'] += 1- v = float(mo.group(0)) + (dx if i % 2 == 0 else dy)- return fmt(v)-- new_data = NUM.sub(repl, data)- width = 24 * vp_w / vp_h-- xml = re.sub(r'android:width="[^"]*"', 'android:width="%sdp"' % fmt(width), xml)- xml = re.sub(r'android:height="[^"]*"', 'android:height="24dp"', xml)- xml = re.sub(r'android:viewportWidth="[^"]*"', 'android:viewportWidth="%d"' % vp_w, xml)- xml = re.sub(r'android:viewportHeight="[^"]*"', 'android:viewportHeight="%d"' % vp_h, xml)- xml = re.sub(r'android:pathData="[^"]*"', lambda _: 'android:pathData="%s"' % new_data, xml)-- with open(path, 'w', encoding='utf-8') as fh:- fh.write(xml)--print('Tightened', len(glob.glob('android/app/src/main/res/drawable/ic_speed_*.xml')), 'badges')