Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Fix series count badge, range sequence parsing, and GitHub update checker

Nathan Poulson7ea48bc2a6da
diff --git a/lib/providers/library_provider.dart b/lib/providers/library_provider.dart
index 6c3b36ad..635c0335 100644
--- a/lib/providers/library_provider.dart
+++ b/lib/providers/library_provider.dart
@@ -2772,6 +2772,15 @@ class LibraryProvider extends ChangeNotifier {
/// Extract series metadata from an item map (cache entry or session libraryItem).
/// Returns (seriesId, sequence) for the first series found, or (null, null).
+ static final _leadingNumber = RegExp(r'^[\d.]+');
+
+ static double? _parseSequence(String? raw) {
+ if (raw == null || raw.isEmpty) return null;
+ final match = _leadingNumber.firstMatch(raw.trim());
+ if (match == null) return null;
+ return double.tryParse(match.group(0)!);
+ }
+
static (String?, double?) _extractSeries(Map<String, dynamic> item) {
final media = item['media'] as Map<String, dynamic>? ?? {};
final metadata = media['metadata'] as Map<String, dynamic>? ?? {};
@@ -2780,13 +2789,13 @@ class LibraryProvider extends ChangeNotifier {
for (final s in seriesRaw) {
if (s is Map<String, dynamic>) {
final id = s['id'] as String?;
- final seq = double.tryParse((s['sequence'] ?? '').toString());
+ final seq = _parseSequence((s['sequence'] ?? '').toString());
if (id != null && seq != null) return (id, seq);
}
}
} else if (seriesRaw is Map<String, dynamic>) {
final id = seriesRaw['id'] as String?;
- final seq = double.tryParse((seriesRaw['sequence'] ?? '').toString());
+ final seq = _parseSequence((seriesRaw['sequence'] ?? '').toString());
if (id != null && seq != null) return (id, seq);
}
return (null, null);
@@ -3321,11 +3330,11 @@ class LibraryProvider extends ChangeNotifier {
final seriesRaw = metadata['series'];
double? seq;
if (seriesRaw is Map<String, dynamic> && seriesRaw['id'] == seriesId) {
- seq = double.tryParse((seriesRaw['sequence'] ?? '').toString());
+ seq = _parseSequence((seriesRaw['sequence'] ?? '').toString());
} else if (seriesRaw is List) {
for (final s in seriesRaw) {
if (s is Map<String, dynamic> && s['id'] == seriesId) {
- seq = double.tryParse((s['sequence'] ?? '').toString());
+ seq = _parseSequence((s['sequence'] ?? '').toString());
break;
}
}
diff --git a/lib/screens/app_shell.dart b/lib/screens/app_shell.dart
index 22c42a98..693f8eb6 100644
--- a/lib/screens/app_shell.dart
+++ b/lib/screens/app_shell.dart
@@ -349,6 +349,7 @@ class _AppShellState extends State<AppShell> with WidgetsBindingObserver, Ticker
_refreshDataForTab(_currentIndex);
// Check auto sleep in case we resumed into the window
SleepTimerService().checkAutoSleep();
+ _checkForUpdate();
} else if (state == AppLifecycleState.paused) {
context.read<LibraryProvider>().onAppBackgrounded();
} else if (state == AppLifecycleState.detached) {
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 8540f466..baed474d 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -18,6 +18,7 @@ import '../services/backup_service.dart';
import '../services/log_service.dart';
import '../screens/login_screen.dart';
import '../screens/app_shell.dart';
+import '../services/update_checker_service.dart';
import '../screens/admin_screen.dart';
import '../screens/downloads_screen.dart';
import '../screens/bookmarks_screen.dart';
@@ -2017,24 +2018,66 @@ class _SettingsScreenState extends State<SettingsScreen> {
mainAxisSize: MainAxisSize.min,
children: [
Text(
- auth.serverVersion != null
- ? 'Absorb v$_appVersion · Server ${auth.serverVersion}'
- : 'Absorb v$_appVersion',
+ 'Absorb v$_appVersion',
style: tt.bodySmall?.copyWith(
color: cs.onSurfaceVariant.withValues(alpha: 0.4)),
),
- const SizedBox(width: 6),
+ const SizedBox(width: 4),
Icon(
_isGithubBuild ? Icons.code_rounded : Icons.store_rounded,
size: 14,
color: cs.onSurfaceVariant.withValues(alpha: 0.3),
),
+ if (auth.serverVersion != null)
+ Text(
+ ' · Server ${auth.serverVersion}',
+ style: tt.bodySmall?.copyWith(
+ color: cs.onSurfaceVariant.withValues(alpha: 0.4)),
+ ),
],
),
],
),
),
+ if (_isGithubBuild) ...[
+ const SizedBox(height: 8),
+ TextButton.icon(
+ onPressed: () async {
+ final info = await UpdateCheckerService.check(force: true);
+ if (!mounted) return;
+ if (info == null || !info.hasUpdate) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(content: Text('You\'re on the latest version')),
+ );
+ return;
+ }
+ showDialog(
+ context: context,
+ builder: (ctx) => AlertDialog(
+ title: const Text('Update available'),
+ content: Text('A new version of Absorb is available: ${info.latestVersion}\n\nYou are on ${info.currentVersion}.'),
+ actions: [
+ TextButton(
+ onPressed: () => Navigator.pop(ctx),
+ child: const Text('Later'),
+ ),
+ FilledButton(
+ onPressed: () {
+ Navigator.pop(ctx);
+ launchUrl(Uri.parse(info.downloadUrl), mode: LaunchMode.externalApplication);
+ },
+ child: const Text('Download'),
+ ),
+ ],
+ ),
+ );
+ },
+ icon: const Icon(Icons.system_update_rounded, size: 16),
+ label: const Text('Check for update'),
+ ),
+ ],
+
const SizedBox(height: 16),
// ── Backup & Restore ──
diff --git a/lib/widgets/library_grid_tiles.dart b/lib/widgets/library_grid_tiles.dart
index 70ffec3b..35888eb2 100644
--- a/lib/widgets/library_grid_tiles.dart
+++ b/lib/widgets/library_grid_tiles.dart
@@ -454,7 +454,6 @@ class GridSeriesTile extends StatelessWidget {
final collapsedSeries = item['collapsedSeries'] as Map<String, dynamic>? ?? {};
final seriesName = collapsedSeries['name'] as String? ?? 'Unknown Series';
final seriesId = collapsedSeries['id'] as String? ?? '';
- final numBooks = collapsedSeries['numBooks'] as int? ?? 0;
final media = item['media'] as Map<String, dynamic>? ?? {};
final metadata = media['metadata'] as Map<String, dynamic>? ?? {};
final author = metadata['authorName'] as String? ?? '';
@@ -463,6 +462,7 @@ class GridSeriesTile extends StatelessWidget {
final itemIds = (collapsedSeries['libraryItemIds'] as List<dynamic>?)
?.map((e) => e as String)
.toList() ?? [item['id'] as String? ?? ''];
+ final numBooks = collapsedSeries['numBooks'] as int? ?? itemIds.length;
final coverUrls = itemIds
.take(4)
.map((id) => lib.getCoverUrl(id))
diff --git a/lib/widgets/series_books_sheet.dart b/lib/widgets/series_books_sheet.dart
index 0e48af07..f97bb650 100644
--- a/lib/widgets/series_books_sheet.dart
+++ b/lib/widgets/series_books_sheet.dart
@@ -176,44 +176,48 @@ class _SeriesBooksSheetState extends State<SeriesBooksSheet> {
});
}
- double? _getSequence(Map<String, dynamic> book) {
- // Top-level sequence (from unwrapping)
+ /// Extract the raw sequence string from the book data.
+ String? _getRawSequence(Map<String, dynamic> book) {
final seq = book['sequence'];
- if (seq != null) {
- final v = double.tryParse(seq.toString());
- if (v != null) return v;
- }
- // Nested in metadata.series
+ if (seq != null) return seq.toString();
final media = book['media'] as Map<String, dynamic>? ?? {};
final metadata = media['metadata'] as Map<String, dynamic>? ?? {};
final seriesRaw = metadata['series'];
if (seriesRaw is List) {
for (final s in seriesRaw) {
- if (s is Map<String, dynamic>) {
- final v = s['sequence'];
- if (v != null) {
- final d = double.tryParse(v.toString());
- if (d != null) return d;
- }
+ if (s is Map<String, dynamic> && s['sequence'] != null) {
+ return s['sequence'].toString();
}
}
- } else if (seriesRaw is Map<String, dynamic>) {
- final v = seriesRaw['sequence'];
- if (v != null) {
- final d = double.tryParse(v.toString());
- if (d != null) return d;
- }
+ } else if (seriesRaw is Map<String, dynamic> && seriesRaw['sequence'] != null) {
+ return seriesRaw['sequence'].toString();
}
final fallback = metadata['seriesSequence'];
- if (fallback != null) return double.tryParse(fallback.toString());
- return null;
+ return fallback?.toString();
+ }
+
+ /// Parse a sortable number from a sequence string.
+ /// Handles plain numbers ("3", "1.5") and ranges ("1-2", "8-10")
+ /// by extracting the first number.
+ static final _leadingNumber = RegExp(r'^[\d.]+');
+
+ double? _getSequence(Map<String, dynamic> book) {
+ final raw = _getRawSequence(book);
+ if (raw == null) return null;
+ final match = _leadingNumber.firstMatch(raw.trim());
+ if (match == null) return null;
+ return double.tryParse(match.group(0)!);
}
String? _getSequenceString(Map<String, dynamic> book) {
- final v = _getSequence(book);
- if (v == null) return null;
- // Show as int if whole number, otherwise decimal
- return v == v.roundToDouble() ? v.toInt().toString() : v.toString();
+ final raw = _getRawSequence(book);
+ if (raw == null || raw.trim().isEmpty) return null;
+ final v = double.tryParse(raw.trim());
+ if (v != null) {
+ return v == v.roundToDouble() ? v.toInt().toString() : v.toString();
+ }
+ // Range or non-numeric sequence (e.g. "1-2") - show as-is
+ return raw.trim();
}
Future<void> _fetchFromApi() async {