A cross platform Audiobookshelf client for Android and iOS
Dart
Show which beta a build is next to the version in Settings, the log header and the update prompt
Barnabas336cfe13f378
diff --git a/lib/build_info.dart b/lib/build_info.dartnew file mode 100644index 00000000..331208b3--- /dev/null+++ b/lib/build_info.dart@@ -0,0 +1,22 @@+/// Which beta of the current release cycle this build belongs to. Bump it in+/// the same commit as the version bump for each beta. Full releases use an+/// even patch number and never show it, so a stale value can't leak into a+/// stable build - it only has to be right during a beta cycle.+const int kBetaNumber = 6;++/// The beta number to show for [version] (`1.9.3+240` or `1.9.3`), or null+/// when this isn't a beta build. Odd patch = beta cycle, even = full release.+int? betaNumberFor(String version) {+ final parts = version.split('+').first.split('.');+ if (parts.length < 3) return null;+ final patch = int.tryParse(parts[2]);+ if (patch == null || patch.isEven || kBetaNumber <= 0) return null;+ return kBetaNumber;+}++/// `1.9.3+240 (Beta 6)` for logs and other unlocalized places; the settings+/// screen formats its own copy through l10n.+String versionWithBeta(String version) {+ final beta = betaNumberFor(version);+ return beta == null ? version : '$version (Beta $beta)';+}diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex f291daa6..7823255d 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -987,6 +987,15 @@}}},+ "betaLabel": "Beta {number}",+ "@betaLabel": {+ "description": "Shown after the version on beta builds, e.g. 1.9.3+240 (Beta 6)",+ "placeholders": {+ "number": {+ "type": "int"+ }+ }+ },"appVersionWithServerFormat": "Absorb v{version} - Server {serverVersion}","@appVersionWithServerFormat": {"placeholders": {diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 8dc34aa8..616f2d14 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -3874,6 +3874,12 @@ abstract class AppLocalizations {/// **'Absorb v{version}'**String appVersionFormat(String version);+ /// Shown after the version on beta builds, e.g. 1.9.3+240 (Beta 6)+ ///+ /// In en, this message translates to:+ /// **'Beta {number}'**+ String betaLabel(int number);+/// No description provided for @appVersionWithServerFormat.////// In en, this message translates to:diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 658f78f0..3f500fb4 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -2116,6 +2116,11 @@ class AppLocalizationsDe extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - Server $serverVersion';diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex d88a874e..ff75e1af 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -2091,6 +2091,11 @@ class AppLocalizationsEl extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - Server $serverVersion';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex dcb51894..4b09bc1e 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -2091,6 +2091,11 @@ class AppLocalizationsEn extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - Server $serverVersion';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex e1e2df68..98fb7a33 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -2093,6 +2093,11 @@ class AppLocalizationsEs extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - Server $serverVersion';diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex 6b612cb9..a54bd721 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -2128,6 +2128,11 @@ class AppLocalizationsFr extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - Serveur $serverVersion';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex c3a56f7e..5b7261e6 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -2091,6 +2091,11 @@ class AppLocalizationsIt extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - Server $serverVersion';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex dcdb52b0..113968ed 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -2091,6 +2091,11 @@ class AppLocalizationsJa extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - Server $serverVersion';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex 8612ae82..e094639b 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -2091,6 +2091,11 @@ class AppLocalizationsNo extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - Server $serverVersion';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex 418f8db4..8d02b054 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -2091,6 +2091,11 @@ class AppLocalizationsPt extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - Server $serverVersion';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex 3676a105..5dbeb642 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -2091,6 +2091,11 @@ class AppLocalizationsRo extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - Server $serverVersion';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex 65d1024e..86c807bb 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -2095,6 +2095,11 @@ class AppLocalizationsRu extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - Server $serverVersion';diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex 448c9757..3479d628 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -2040,6 +2040,11 @@ class AppLocalizationsZh extends AppLocalizations {return 'Absorb v$version';}+ @override+ String betaLabel(int number) {+ return 'Beta $number';+ }+@overrideString appVersionWithServerFormat(String version, String serverVersion) {return 'Absorb v$version - 服务器 $serverVersion';diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex 3b22d58d..a8cb9fe1 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -22,6 +22,7 @@ import '../services/scoped_prefs.dart';import '../services/socket_service.dart';import '../screens/login_screen.dart';import '../screens/app_shell.dart';+import '../build_info.dart';import '../services/update_checker_service.dart';import '../services/audiobookshelf_update_service.dart';import '../widgets/update_dialog.dart';@@ -61,6 +62,14 @@ class _SettingsScreenState extends State<SettingsScreen> {// neither define, so it falls through here.static String get _flavorLabel =>_isGithubBuild ? 'GitHub' : _isPlayStoreBuild ? 'Play Store' : 'F-Droid';++ String _versionLine(AppLocalizations l) {+ final base = Platform.isIOS+ ? l.appVersionFormat(_appVersion)+ : '$_flavorLabel - $_appVersion';+ final beta = betaNumberFor(_appVersion);+ return beta == null ? base : '$base (${l.betaLabel(beta)})';+ }AutoRewindSettings _rewindSettings = const AutoRewindSettings();double _defaultSpeed = 1.0;@@ -3940,10 +3949,9 @@ class _SettingsScreenState extends State<SettingsScreen> {Text(// Flavor prefix is an Android distribution concept// (GitHub / Play Store / F-Droid). iOS has no flavor, so- // it keeps the plain version.- Platform.isIOS- ? l.appVersionFormat(_appVersion)- : '$_flavorLabel - $_appVersion',+ // it keeps the plain version. Beta builds add which+ // beta of the cycle this is; full releases show nothing.+ _versionLine(l),style: tt.bodySmall?.copyWith(color: cs.onSurfaceVariant.withValues(alpha: 0.4)),),diff --git a/lib/services/log_service.dart b/lib/services/log_service.dartindex def966e9..b926c5ca 100644--- a/lib/services/log_service.dart+++ b/lib/services/log_service.dart@@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart';import 'package:path_provider/path_provider.dart';import 'package:share_plus/share_plus.dart';import 'package:url_launcher/url_launcher.dart';+import '../build_info.dart';import 'api_service.dart';class LogService {@@ -56,7 +57,7 @@ class LogService {// Start fresh - write device/server info headerfinal header = StringBuffer()..writeln('=== Absorb Log ===')- ..writeln('App Version: ${ApiService.appVersionFull}')+ ..writeln('App Version: ${versionWithBeta(ApiService.appVersionFull)}')..writeln('Device: ${ApiService.deviceManufacturer} ${ApiService.deviceModel}')..writeln('OS: ${Platform.operatingSystem} ${Platform.operatingSystemVersion}')..writeln('Created: ${DateTime.now().toIso8601String()}')@@ -74,7 +75,7 @@ class LogService {// stale across an app update in between.final now = DateTime.now().toIso8601String();await _logFile!.writeAsString(- '\n=== Session started $now (App Version: ${ApiService.appVersionFull}) ===\n',+ '\n=== Session started $now (App Version: ${versionWithBeta(ApiService.appVersionFull)}) ===\n',mode: FileMode.append,);@@ -148,7 +149,7 @@ class LogService {// still have device info (don't wait for next init/restart).final header = StringBuffer()..writeln('=== Absorb Log ===')- ..writeln('App Version: ${ApiService.appVersionFull}')+ ..writeln('App Version: ${versionWithBeta(ApiService.appVersionFull)}')..writeln('Device: ${ApiService.deviceManufacturer} ${ApiService.deviceModel}')..writeln('OS: ${Platform.operatingSystem} ${Platform.operatingSystemVersion}')..writeln('Created: ${DateTime.now().toIso8601String()}')@@ -168,7 +169,7 @@ class LogService {/// Build device info string used by both email methods.String _deviceInfo({String? serverVersion}) {final buf = StringBuffer()- ..writeln('App Version: ${ApiService.appVersionFull}')+ ..writeln('App Version: ${versionWithBeta(ApiService.appVersionFull)}')..writeln('Device: ${ApiService.deviceManufacturer} ${ApiService.deviceModel}')..writeln('Device ID: ${ApiService.deviceId}');if (serverVersion != null) {diff --git a/lib/services/update_checker_service.dart b/lib/services/update_checker_service.dartindex c9fc62ba..dd014eb1 100644--- a/lib/services/update_checker_service.dart+++ b/lib/services/update_checker_service.dart@@ -33,6 +33,17 @@ class UpdateInfo {bool get hasUpdate =>compareUpdateVersions(latestVersion, currentVersion) > 0;++ /// Which beta the release is, read from the "## Beta N" heading the release+ /// notes open with. Null for full releases or notes without that line.+ int? get latestBetaNumber => betaNumberFromReleaseNotes(releaseNotes);+}++/// Pulls N out of a "## Beta N" heading in GitHub release notes.+int? betaNumberFromReleaseNotes(String notes) {+ final m = RegExp(r'^#+\s*Beta\s+(\d+)\b', multiLine: true, caseSensitive: false)+ .firstMatch(notes);+ return m == null ? null : int.tryParse(m.group(1)!);}class UpdateCheckerService {diff --git a/lib/widgets/update_dialog.dart b/lib/widgets/update_dialog.dartindex 4f55ab64..b95045fe 100644--- a/lib/widgets/update_dialog.dart+++ b/lib/widgets/update_dialog.dart@@ -3,6 +3,7 @@ import 'dart:async';import 'package:flutter/material.dart';import 'package:url_launcher/url_launcher.dart';+import '../build_info.dart';import '../l10n/app_localizations.dart';import '../services/update_checker_service.dart';import 'overlay_toast.dart';@@ -14,6 +15,13 @@ class UpdateDialog {/// On any failure, falls back to launching the URL in the browser.static Future<void> show(BuildContext context, UpdateInfo info) async {final l = AppLocalizations.of(context)!;+ // "v1.9.3-240 (Beta 6)" / "1.9.3+237 (Beta 5)" during a beta cycle; the+ // remote number comes from the release notes, ours from this build.+ String withBeta(String version, int? beta) =>+ beta == null ? version : '$version (${l.betaLabel(beta)})';+ final latest = withBeta(info.latestVersion, info.latestBetaNumber);+ final current =+ withBeta(info.currentVersion, betaNumberFor(info.currentVersion));final go = await showDialog<bool>(context: context,builder: (ctx) => AlertDialog(@@ -24,8 +32,8 @@ class UpdateDialog {children: [Text(l.updateDialogContent(info.isPreRelease ? l.updateKindPreRelease : l.updateKindVersion,- info.latestVersion,- info.currentVersion,+ latest,+ current,)),if (info.packageLabel != null) ...[const SizedBox(height: 12),