A cross platform Audiobookshelf client for Android and iOS
Dart
Add books to the upcoming releases page
Barnabas9d2a99ffb7e9
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex cd95930d..3c2eb9f4 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -2731,6 +2731,9 @@"audibleSeriesRegionTitle": "Audible Region","audibleSeriesOpenOnAudible": "Open on Audible","audibleSeriesAddToCalendar": "Add to Calendar",+ "audibleSeriesAddToUpcoming": "Add to upcoming releases",+ "audibleSeriesAddedToUpcoming": "Added to upcoming releases",+ "audibleSeriesAlreadyInUpcoming": "Already on the upcoming page","audibleSeriesCouldNotOpenAudible": "Could not open Audible","audibleSeriesCouldNotOpenCalendar": "Could not open calendar","audibleSeriesCalendarDescription": "New audiobook release in the {seriesName} series",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 02b802bf..93fa28c1 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -8052,6 +8052,24 @@ abstract class AppLocalizations {/// **'Add to Calendar'**String get audibleSeriesAddToCalendar;+ /// No description provided for @audibleSeriesAddToUpcoming.+ ///+ /// In en, this message translates to:+ /// **'Add to upcoming releases'**+ String get audibleSeriesAddToUpcoming;++ /// No description provided for @audibleSeriesAddedToUpcoming.+ ///+ /// In en, this message translates to:+ /// **'Added to upcoming releases'**+ String get audibleSeriesAddedToUpcoming;++ /// No description provided for @audibleSeriesAlreadyInUpcoming.+ ///+ /// In en, this message translates to:+ /// **'Already on the upcoming page'**+ String get audibleSeriesAlreadyInUpcoming;+/// No description provided for @audibleSeriesCouldNotOpenAudible.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex d87df8ca..3ad3a8c0 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -4584,6 +4584,15 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Zum Kalender hinzufügen';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible =>'Audible konnte nicht geöffnet werden';diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex 03f7c727..46e6f20c 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -4530,6 +4530,15 @@ class AppLocalizationsEl extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Add to Calendar';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible => 'Could not open Audible';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex ade5d603..f020414d 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -4530,6 +4530,15 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Add to Calendar';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible => 'Could not open Audible';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex bd7c67ab..6739fb2e 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -4530,6 +4530,15 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Add to Calendar';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible => 'Could not open Audible';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex 0ca84778..86881ac7 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -4532,6 +4532,15 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Add to Calendar';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible => 'Could not open Audible';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex 179f1805..5f69c955 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -4530,6 +4530,15 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Add to Calendar';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible => 'Could not open Audible';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 86962b52..bfbb6075 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -4530,6 +4530,15 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Add to Calendar';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible => 'Could not open Audible';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex c3fd53bb..aee8a533 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -4530,6 +4530,15 @@ class AppLocalizationsNo extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Add to Calendar';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible => 'Could not open Audible';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex 3f8e29de..6746db95 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -4530,6 +4530,15 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Add to Calendar';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible => 'Could not open Audible';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex 55f01a22..db0d328a 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -4530,6 +4530,15 @@ class AppLocalizationsRo extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Add to Calendar';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible => 'Could not open Audible';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex d2f733c7..794604fb 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -4533,6 +4533,15 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Add to Calendar';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible => 'Could not open Audible';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex ff32d3e8..b650ae62 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -4456,6 +4456,15 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get audibleSeriesAddToCalendar => 'Add to Calendar';+ @override+ String get audibleSeriesAddToUpcoming => 'Add to upcoming releases';++ @override+ String get audibleSeriesAddedToUpcoming => 'Added to upcoming releases';++ @override+ String get audibleSeriesAlreadyInUpcoming => 'Already on the upcoming page';+@overrideString get audibleSeriesCouldNotOpenAudible => 'Could not open Audible';diff --git a/lib/services/upcoming_releases_service.dart b/lib/services/upcoming_releases_service.dartindex 5af8ea81..72179c25 100644--- a/lib/services/upcoming_releases_service.dart+++ b/lib/services/upcoming_releases_service.dart@@ -480,6 +480,75 @@ class UpcomingReleasesService extends ChangeNotifier {await _saveCache();}+ /// Manually add a single discovered Audible book to the upcoming page,+ /// grouping it under [seriesName] / [audibleAsin]. Lets the user surface a+ /// freshly-added series' release without rescanning the whole library.+ ///+ /// Only upcoming or recently-released (last 30 days) books are accepted -+ /// anything else doesn't belong on this page. Returns true if added, false+ /// if the book is already present or not eligible.+ Future<bool> addBook(+ Map<String, dynamic> book, {+ required String seriesName,+ required String audibleAsin,+ required String region,+ bool owned = false,+ }) async {+ final asin = book['asin'] as String? ?? '';+ if (asin.isEmpty) return false;++ final upcoming = _isUpcoming(book);+ final recent = !upcoming && _isRecentRelease(book);+ if (!upcoming && !recent) return false;++ // If the upcoming page hasn't been opened this session our in-memory list+ // is empty even though a previous scan sits on disk. Load it first so we+ // append to the existing set instead of clobbering it on the next save.+ if (_results.isEmpty && !_isRunning) {+ _region = region;+ await loadCache();+ }++ // Skip if the book is already on the page anywhere.+ for (final r in _results) {+ if (r.upcomingBooks.any((b) => b['asin'] == asin) ||+ r.recentBooks.any((b) => b['asin'] == asin)) {+ return false;+ }+ }++ // Reuse this series' bucket if it's already on the page, else start one.+ UpcomingSeriesResult? target;+ for (final r in _results) {+ if ((audibleAsin.isNotEmpty && r.audibleAsin == audibleAsin) ||+ r.seriesName == seriesName) {+ target = r;+ break;+ }+ }+ if (target == null) {+ target = UpcomingSeriesResult(+ seriesId: '',+ seriesName: seriesName,+ audibleAsin: audibleAsin,+ upcomingBooks: [],+ recentBooks: [],+ );+ _results.add(target);+ }++ if (upcoming) {+ target.upcomingBooks.add(Map<String, dynamic>.from(book));+ } else {+ target.recentBooks.add({...book, '_owned': owned});+ }++ if (!_isRunning) _isComplete = true;+ notifyListeners();+ await _saveCache();+ return true;+ }+/// Try to find the Audible series ASIN from the books' metadata ASINs via Audnexus./// Only checks up to [_maxAsinAttempts] books to avoid excessive API calls on huge series.static const _maxAsinAttempts = 5;diff --git a/lib/widgets/audible_series_sheet.dart b/lib/widgets/audible_series_sheet.dartindex a0c5a221..c0d7b48d 100644--- a/lib/widgets/audible_series_sheet.dart+++ b/lib/widgets/audible_series_sheet.dart@@ -7,6 +7,7 @@ import '../services/api_service.dart';import '../services/player_settings.dart';import '../services/rmab_service.dart';import '../services/scoped_prefs.dart';+import '../services/upcoming_releases_service.dart';import 'overlay_toast.dart';import 'rmab_book_detail_sheet.dart';import 'rmab_config_sheet.dart' show kRmabBaseUrlKey, kRmabApiTokenKey;@@ -165,12 +166,29 @@ class _AudibleSeriesSheetState extends State<AudibleSeriesSheet> {// Surface the RMAB Request action only for missing-but-released books,// and only when the user has RMAB configured.final showRequest = _rmabConfigured && !owned && !upcoming;+ // Let upcoming or recently-released books be pushed onto the upcoming page+ // without rescanning the whole library.+ final canAddToUpcoming = upcoming || _isRecent(book);showAudibleBookMenu(context,book: book,seriesName: widget.seriesName,region: _region,extraActions: [+ if (canAddToUpcoming)+ ListTile(+ leading: Icon(Icons.event_available_rounded,+ color: cs.primary, size: 22),+ title: Text(l.audibleSeriesAddToUpcoming,+ style: const TextStyle(+ fontSize: 14, fontWeight: FontWeight.w500)),+ dense: true,+ visualDensity: VisualDensity.compact,+ onTap: () {+ Navigator.pop(context);+ _addToUpcoming(book, owned: owned);+ },+ ),if (showRequest)ListTile(leading: Icon(Icons.menu_book_rounded,@@ -196,6 +214,35 @@ class _AudibleSeriesSheetState extends State<AudibleSeriesSheet> {);}+ Future<void> _addToUpcoming(Map<String, dynamic> book, {required bool owned}) async {+ final l = AppLocalizations.of(context)!;+ final added = await UpcomingReleasesService().addBook(+ book,+ seriesName: widget.seriesName,+ audibleAsin: widget.seriesAsin,+ region: _region,+ owned: owned,+ );+ if (!mounted) return;+ showOverlayToast(+ context,+ added ? l.audibleSeriesAddedToUpcoming : l.audibleSeriesAlreadyInUpcoming,+ icon: added ? Icons.event_available_rounded : Icons.info_outline_rounded,+ );+ }++ /// Released within the last 30 days - mirrors UpcomingReleasesService so the+ /// "Add to upcoming releases" action only shows for books that page accepts.+ bool _isRecent(Map<String, dynamic> book) {+ final dateStr = book['releaseDate'] as String? ?? '';+ if (dateStr.isEmpty) return false;+ final date = DateTime.tryParse(dateStr);+ if (date == null) return false;+ final now = DateTime.now();+ if (date.isAfter(now)) return false;+ return now.difference(date).inDays <= 30;+ }+String _formatRuntime(dynamic minutes) {final mins = (minutes is num) ? minutes.toInt() : 0;if (mins <= 0) return '';