A cross platform Audiobookshelf client for Android and iOS
Dart
Add more ways to sort podcast episodes
Barnabasa3768a09db71
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex 03d5d34d..8b4ab96e 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -2714,6 +2714,13 @@"episodeListExplicitChip": "Explicit","episodeListSortNewest": "Newest","episodeListSortOldest": "Oldest",+ "episodeListSortBy": "Sort episodes",+ "episodeListSortPubDate": "Publish date",+ "episodeListSortTitle": "Title",+ "episodeListSortSeason": "Season",+ "episodeListSortEpisode": "Episode number",+ "episodeListSortFileName": "File name",+ "episodeListSortReverseHint": "Tap again to reverse the order","episodeListAddedToAbsorbing": "Added \"{title}\" to Absorbing","@episodeListAddedToAbsorbing": {"placeholders": {diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 8ccf0f19..7491e097 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -8888,6 +8888,48 @@ abstract class AppLocalizations {/// **'Oldest'**String get episodeListSortOldest;+ /// No description provided for @episodeListSortBy.+ ///+ /// In en, this message translates to:+ /// **'Sort episodes'**+ String get episodeListSortBy;++ /// No description provided for @episodeListSortPubDate.+ ///+ /// In en, this message translates to:+ /// **'Publish date'**+ String get episodeListSortPubDate;++ /// No description provided for @episodeListSortTitle.+ ///+ /// In en, this message translates to:+ /// **'Title'**+ String get episodeListSortTitle;++ /// No description provided for @episodeListSortSeason.+ ///+ /// In en, this message translates to:+ /// **'Season'**+ String get episodeListSortSeason;++ /// No description provided for @episodeListSortEpisode.+ ///+ /// In en, this message translates to:+ /// **'Episode number'**+ String get episodeListSortEpisode;++ /// No description provided for @episodeListSortFileName.+ ///+ /// In en, this message translates to:+ /// **'File name'**+ String get episodeListSortFileName;++ /// No description provided for @episodeListSortReverseHint.+ ///+ /// In en, this message translates to:+ /// **'Tap again to reverse the order'**+ String get episodeListSortReverseHint;+/// No description provided for @episodeListAddedToAbsorbing.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 587534c8..c2b73d47 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -5046,6 +5046,27 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get episodeListSortOldest => 'Älteste';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return '\"$title\" zu Absorbing hinzugefügt';diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex 9ab68902..f9f9d673 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -4978,6 +4978,27 @@ class AppLocalizationsEl extends AppLocalizations {@overrideString get episodeListSortOldest => 'Oldest';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return 'Added \"$title\" to Absorbing';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 02ed6263..b5e8d1ca 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -4978,6 +4978,27 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get episodeListSortOldest => 'Oldest';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return 'Added \"$title\" to Absorbing';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex 0232f578..20828c63 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -4980,6 +4980,27 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get episodeListSortOldest => 'Oldest';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return 'Added \"$title\" to Absorbing';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex 79659fd0..63382f78 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -5025,6 +5025,27 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get episodeListSortOldest => 'Les plus anciens';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return 'Added \"$title\" to Absorbing';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex b963a015..92b8559b 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -4978,6 +4978,27 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get episodeListSortOldest => 'Oldest';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return 'Added \"$title\" to Absorbing';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex f7df02a2..496a0e2b 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -4978,6 +4978,27 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get episodeListSortOldest => 'Oldest';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return 'Added \"$title\" to Absorbing';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex 0991083c..20d43684 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -4978,6 +4978,27 @@ class AppLocalizationsNo extends AppLocalizations {@overrideString get episodeListSortOldest => 'Oldest';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return 'Added \"$title\" to Absorbing';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex ca66ec5f..571f7087 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -4978,6 +4978,27 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get episodeListSortOldest => 'Oldest';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return 'Added \"$title\" to Absorbing';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex bb070a96..2855548f 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -4978,6 +4978,27 @@ class AppLocalizationsRo extends AppLocalizations {@overrideString get episodeListSortOldest => 'Oldest';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return 'Added \"$title\" to Absorbing';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex e032c50d..cf30cc1c 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -4982,6 +4982,27 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get episodeListSortOldest => 'Oldest';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return 'Added \"$title\" to Absorbing';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex 2c3403ef..c560668d 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -4897,6 +4897,27 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get episodeListSortOldest => 'Oldest';+ @override+ String get episodeListSortBy => 'Sort episodes';++ @override+ String get episodeListSortPubDate => 'Publish date';++ @override+ String get episodeListSortTitle => 'Title';++ @override+ String get episodeListSortSeason => 'Season';++ @override+ String get episodeListSortEpisode => 'Episode number';++ @override+ String get episodeListSortFileName => 'File name';++ @override+ String get episodeListSortReverseHint => 'Tap again to reverse the order';+@overrideString episodeListAddedToAbsorbing(String title) {return 'Added \"$title\" to Absorbing';diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dartindex 65737fb0..87d95b1b 100644--- a/lib/services/backup_service.dart+++ b/lib/services/backup_service.dart@@ -314,6 +314,7 @@ class BackupService {}}collectPodcast('podcast_sort_newest_', 'sortNewest', (k) => prefs.getBool(k));+ collectPodcast('podcast_sort_mode_', 'sortMode', (k) => prefs.getString(k));collectPodcast('podcast_hide_finished_', 'hideFinished', (k) => prefs.getBool(k));collectPodcast('podcast_advance_dir_', 'advanceDir', (k) => prefs.getString(k));@@ -852,6 +853,7 @@ class BackupService {final itemId = entry.key;final p = entry.value as Map<String, dynamic>;if (p['sortNewest'] != null) await prefs.setBool('podcast_sort_newest_$itemId', p['sortNewest'] as bool);+ if (p['sortMode'] != null) await prefs.setString('podcast_sort_mode_$itemId', p['sortMode'] as String);if (p['hideFinished'] != null) await prefs.setBool('podcast_hide_finished_$itemId', p['hideFinished'] as bool);if (p['advanceDir'] != null) await prefs.setString('podcast_advance_dir_$itemId', p['advanceDir'] as String);}diff --git a/lib/services/scoped_prefs.dart b/lib/services/scoped_prefs.dartindex 1da0cac6..b83e0801 100644--- a/lib/services/scoped_prefs.dart+++ b/lib/services/scoped_prefs.dart@@ -59,6 +59,7 @@ class ScopedPrefs {if (key.startsWith('flutter.')) continue;// Skip per-podcast sort keys (global, keyed by item ID)if (key.startsWith('podcast_sort_newest_')) continue;+ if (key.startsWith('podcast_sort_mode_')) continue;final scopedKey = '$scope:$key';if (prefs.containsKey(scopedKey)) continue; // already existsdiff --git a/lib/widgets/episode_list_sheet.dart b/lib/widgets/episode_list_sheet.dartindex 4559c674..24874e01 100644--- a/lib/widgets/episode_list_sheet.dart+++ b/lib/widgets/episode_list_sheet.dart@@ -81,7 +81,8 @@ class _EpisodeListSheetState extends State<EpisodeListSheet> {bool _autoDownloadEnabled = false;bool _subscribed = false;String _newEpisodePosition = 'start';- bool _newestFirst = true;+ String _sortMode = 'pubDate';+ bool _sortAscending = false;bool _hideFinished = false;bool _selectMode = false;final Set<String> _selectedEpisodeIds = {};@@ -169,10 +170,24 @@ class _EpisodeListSheetState extends State<EpisodeListSheet> {void _loadSortOrder() async {final prefs = await SharedPreferences.getInstance();- final saved = prefs.getBool('podcast_sort_newest_$_itemId');- if (saved != null && mounted) {+ var mode = 'pubDate';+ var ascending = false;+ final saved = prefs.getString('podcast_sort_mode_$_itemId');+ if (saved != null) {+ final split = saved.lastIndexOf('_');+ if (split > 0) {+ mode = saved.substring(0, split);+ ascending = saved.substring(split + 1) == 'asc';+ }+ } else {+ final legacy = prefs.getBool('podcast_sort_newest_$_itemId');+ if (legacy == null) return;+ ascending = !legacy;+ }+ if (mounted) {setState(() {- _newestFirst = saved;+ _sortMode = mode;+ _sortAscending = ascending;_episodes = _sortEpisodes(_episodes);});}@@ -226,13 +241,49 @@ class _EpisodeListSheetState extends State<EpisodeListSheet> {}}- /// Sort episodes by publishedAt according to current sort order.+ /// Sort episodes by the current mode; ties fall back to newest first so+ /// shows with missing numbers or identical dates keep a sensible order.List<dynamic> _sortEpisodes(List<dynamic> episodes) {+ int epInt(Map<String, dynamic> ep, String key) =>+ int.tryParse((ep[key] as String? ?? '').trim()) ?? 0;+ String fileName(Map<String, dynamic> ep) =>+ (((ep['audioFile'] as Map<String, dynamic>?)?['metadata']+ as Map<String, dynamic>?)?['filename'] as String? ??+ '')+ .toLowerCase();+ int published(Map<String, dynamic> ep) =>+ (ep['publishedAt'] as num?)?.toInt() ?? 0;+final sorted = List<dynamic>.from(episodes);sorted.sort((a, b) {- final aTime = (a['publishedAt'] as num?)?.toInt() ?? 0;- final bTime = (b['publishedAt'] as num?)?.toInt() ?? 0;- return _newestFirst ? bTime.compareTo(aTime) : aTime.compareTo(bTime);+ final ma = a as Map<String, dynamic>;+ final mb = b as Map<String, dynamic>;+ int c;+ switch (_sortMode) {+ case 'title':+ c = (ma['title'] as String? ?? '')+ .toLowerCase()+ .compareTo((mb['title'] as String? ?? '').toLowerCase());+ break;+ case 'season':+ c = epInt(ma, 'season').compareTo(epInt(mb, 'season'));+ if (c == 0) c = epInt(ma, 'episode').compareTo(epInt(mb, 'episode'));+ break;+ case 'episode':+ c = epInt(ma, 'episode').compareTo(epInt(mb, 'episode'));+ break;+ case 'fileName':+ c = fileName(ma).compareTo(fileName(mb));+ break;+ default:+ c = published(ma).compareTo(published(mb));+ }+ if (!_sortAscending) c = -c;+ if (c == 0) c = published(mb).compareTo(published(ma));+ if (c == 0) {+ c = (ma['id'] as String? ?? '').compareTo(mb['id'] as String? ?? '');+ }+ return c;});return sorted;}@@ -250,16 +301,102 @@ class _EpisodeListSheetState extends State<EpisodeListSheet> {});}- void _toggleSortOrder() {+ void _applySort(String mode) {setState(() {- _newestFirst = !_newestFirst;+ if (_sortMode == mode) {+ _sortAscending = !_sortAscending;+ } else {+ _sortMode = mode;+ _sortAscending = mode != 'pubDate';+ }_episodes = _sortEpisodes(_episodes);});SharedPreferences.getInstance().then((prefs) {- prefs.setBool('podcast_sort_newest_$_itemId', _newestFirst);+ prefs.setString('podcast_sort_mode_$_itemId',+ '${_sortMode}_${_sortAscending ? 'asc' : 'desc'}');});}+ String _sortLabel(AppLocalizations l) {+ switch (_sortMode) {+ case 'title':+ return l.episodeListSortTitle;+ case 'season':+ return l.episodeListSortSeason;+ case 'episode':+ return l.episodeListSortEpisode;+ case 'fileName':+ return l.episodeListSortFileName;+ default:+ return _sortAscending ? l.episodeListSortOldest : l.episodeListSortNewest;+ }+ }++ void _showSortPicker() {+ final l = AppLocalizations.of(context)!;+ final cs = Theme.of(context).colorScheme;+ final options = <String, String>{+ 'pubDate': l.episodeListSortPubDate,+ 'title': l.episodeListSortTitle,+ 'season': l.episodeListSortSeason,+ 'episode': l.episodeListSortEpisode,+ 'fileName': l.episodeListSortFileName,+ };+ showModalBottomSheet(+ context: context,+ backgroundColor: Theme.of(context).bottomSheetTheme.backgroundColor,+ shape: const RoundedRectangleBorder(+ borderRadius: BorderRadius.vertical(top: Radius.circular(24)),+ ),+ builder: (ctx) => SafeArea(+ child: Padding(+ padding: const EdgeInsets.fromLTRB(8, 8, 8, 16),+ child: Column(mainAxisSize: MainAxisSize.min, children: [+ Center(child: Container(width: 40, height: 4, margin: const EdgeInsets.only(bottom: 8),+ decoration: BoxDecoration(color: cs.onSurface.withValues(alpha: 0.24), borderRadius: BorderRadius.circular(2)))),+ Padding(+ padding: const EdgeInsets.fromLTRB(16, 8, 16, 12),+ child: Align(+ alignment: Alignment.centerLeft,+ child: Text(l.episodeListSortBy,+ style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600)),+ ),+ ),+ for (final entry in options.entries)+ ListTile(+ leading: Icon(+ _sortMode == entry.key+ ? Icons.radio_button_checked_rounded+ : Icons.radio_button_unchecked_rounded,+ color: _sortMode == entry.key ? cs.primary : cs.onSurfaceVariant,+ ),+ title: Text(entry.value),+ subtitle: _sortMode == entry.key+ ? Text(l.episodeListSortReverseHint,+ style: Theme.of(context)+ .textTheme+ .bodySmall+ ?.copyWith(color: cs.onSurfaceVariant))+ : null,+ trailing: _sortMode == entry.key+ ? Icon(+ _sortAscending+ ? Icons.arrow_upward_rounded+ : Icons.arrow_downward_rounded,+ size: 18,+ color: cs.primary)+ : null,+ onTap: () {+ Navigator.pop(ctx);+ _applySort(entry.key);+ },+ ),+ ]),+ ),+ ),+ );+ }+String? _playlistSourceForEpisode(String episodeId) {if (widget.sourcePlaylistEpisodeId != episodeId) return null;return widget.sourcePlaylistId;@@ -831,14 +968,14 @@ class _EpisodeListSheetState extends State<EpisodeListSheet> {),const SizedBox(width: 4),GestureDetector(- onTap: _toggleSortOrder,+ onTap: _showSortPicker,child: Row(mainAxisSize: MainAxisSize.min,children: [- Text(_newestFirst ? l.episodeListSortNewest : l.episodeListSortOldest,+ Text(_sortLabel(l),style: TextStyle(fontSize: 11, color: cs.onSurfaceVariant.withValues(alpha: 0.6))),const SizedBox(width: 2),- Icon(_newestFirst ? Icons.arrow_downward_rounded : Icons.arrow_upward_rounded,+ Icon(_sortAscending ? Icons.arrow_upward_rounded : Icons.arrow_downward_rounded,size: 14, color: cs.onSurfaceVariant.withValues(alpha: 0.6)),],),