CalvinBackup/SpotiFLAC-Mobile
1
0
Fork 0
mirror of https://github.com/zarzet/SpotiFLAC-Mobile.git synced 2026-07-04 19:57:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(backend): add IDHS as fallback link resolver when SongLink fails

Browse Source
This commit is contained in:
zarzet
2026-01-31 12:54:11 +07:00
parent 6b61dbc2da
commit 7fc73b6038
9 changed files with 430 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/models/settings.dart
+4
View File
@@ -33,6 +33,7 @@ class AppSettings {
final String locale;
final bool enableLossyOption;
final String lossyFormat;
final String lossyBitrate; // e.g., 'mp3_320', 'mp3_256', 'mp3_192', 'mp3_128', 'opus_128', 'opus_96', 'opus_64'
final String lyricsMode;
const AppSettings({
@@ -65,6 +66,7 @@ class AppSettings {
this.locale = 'system',
this.enableLossyOption = false,
this.lossyFormat = 'mp3',
this.lossyBitrate = 'mp3_320',
this.lyricsMode = 'embed',
});
@@ -99,6 +101,7 @@ class AppSettings {
String? locale,
bool? enableLossyOption,
String? lossyFormat,
String? lossyBitrate,
String? lyricsMode,
}) {
return AppSettings(
@@ -131,6 +134,7 @@ class AppSettings {
locale: locale ?? this.locale,
enableLossyOption: enableLossyOption ?? this.enableLossyOption,
lossyFormat: lossyFormat ?? this.lossyFormat,
lossyBitrate: lossyBitrate ?? this.lossyBitrate,
lyricsMode: lyricsMode ?? this.lyricsMode,
);
}
lib/models/settings.g.dart
+2
View File
@@ -38,6 +38,7 @@ AppSettings _$AppSettingsFromJson(Map<String, dynamic> json) => AppSettings(
locale: json['locale'] as String? ?? 'system',
enableLossyOption: json['enableLossyOption'] as bool? ?? false,
lossyFormat: json['lossyFormat'] as String? ?? 'mp3',
lossyBitrate: json['lossyBitrate'] as String? ?? 'mp3_320',
lyricsMode: json['lyricsMode'] as String? ?? 'embed',
);
@@ -72,5 +73,6 @@ Map<String, dynamic> _$AppSettingsToJson(AppSettings instance) =>
'locale': instance.locale,
'enableLossyOption': instance.enableLossyOption,
'lossyFormat': instance.lossyFormat,
'lossyBitrate': instance.lossyBitrate,
'lyricsMode': instance.lyricsMode,
};
lib/providers/download_queue_provider.dart
+9 -3
View File
@@ -2111,7 +2111,8 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
_log.i('Lossy requested but existing FLAC found - skipping conversion to preserve original file');
} else {
final lossyFormat = settings.lossyFormat;
_log.i('Lossy quality selected, converting FLAC to $lossyFormat...');
final lossyBitrate = settings.lossyBitrate;
_log.i('Lossy quality selected, converting FLAC to $lossyFormat ($lossyBitrate)...');
updateItemStatus(
item.id,
DownloadStatus.downloading,
@@ -2122,13 +2123,18 @@ class DownloadQueueNotifier extends Notifier<DownloadQueueState> {
final convertedPath = await FFmpegService.convertFlacToLossy(
filePath,
format: lossyFormat,
bitrate: lossyBitrate,
deleteOriginal: true,
);
if (convertedPath != null) {
filePath = convertedPath;
actualQuality = lossyFormat == 'opus' ? 'Opus 128kbps' : 'MP3 320kbps';
_log.i('Successfully converted to $lossyFormat: $convertedPath');
// Extract bitrate for display (e.g., 'mp3_320' -> '320kbps')
final bitrateDisplay = lossyBitrate.contains('_')
? '${lossyBitrate.split('_').last}kbps'
: (lossyFormat == 'opus' ? '128kbps' : '320kbps');
actualQuality = '${lossyFormat.toUpperCase()} $bitrateDisplay';
_log.i('Successfully converted to $lossyFormat ($bitrateDisplay): $convertedPath');
// Embed metadata and cover for both MP3 and Opus
_log.i('Embedding metadata to $lossyFormat...');
lib/providers/settings_provider.dart
+7
View File
@@ -244,6 +244,13 @@ class SettingsNotifier extends Notifier<AppSettings> {
state = state.copyWith(lossyFormat: format);
_saveSettings();
}
void setLossyBitrate(String bitrate) {
// Extract format from bitrate (e.g., 'mp3_320' -> 'mp3')
final format = bitrate.split('_').first;
state = state.copyWith(lossyBitrate: bitrate, lossyFormat: format);
_saveSettings();
}
}
final settingsProvider = NotifierProvider<SettingsNotifier, AppSettings>(
lib/screens/settings/download_settings_page.dart
+142 -47
View File
@@ -114,10 +114,8 @@ class DownloadSettingsPage extends ConsumerWidget {
SettingsItem(
icon: Icons.tune,
title: context.l10n.lossyFormat,
subtitle: settings.lossyFormat == 'opus'
? 'Opus 128kbps'
: 'MP3 320kbps',
onTap: () => _showLossyFormatPicker(context, ref, settings.lossyFormat),
subtitle: _getLossyBitrateLabel(settings.lossyBitrate),
onTap: () => _showLossyBitratePicker(context, ref, settings.lossyBitrate),
),
if (!settings.askQualityBeforeDownload && isBuiltInService) ...[
_QualityOption(
@@ -733,7 +731,28 @@ class DownloadSettingsPage extends ConsumerWidget {
);
}
void _showLossyFormatPicker(
String _getLossyBitrateLabel(String bitrate) {
switch (bitrate) {
case 'mp3_320':
return 'MP3 320kbps (Best)';
case 'mp3_256':
return 'MP3 256kbps';
case 'mp3_192':
return 'MP3 192kbps';
case 'mp3_128':
return 'MP3 128kbps';
case 'opus_128':
return 'Opus 128kbps (Best)';
case 'opus_96':
return 'Opus 96kbps';
case 'opus_64':
return 'Opus 64kbps';
default:
return 'MP3 320kbps';
}
}
void _showLossyBitratePicker(
BuildContext context,
WidgetRef ref,
String current,
@@ -742,54 +761,130 @@ class DownloadSettingsPage extends ConsumerWidget {
showModalBottomSheet(
context: context,
backgroundColor: colorScheme.surfaceContainerHigh,
isScrollControlled: true,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(28)),
),
builder: (context) => SafeArea(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
child: Text(
context.l10n.lossyFormat,
style: Theme.of(
context,
).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
),
),
Padding(
padding: const EdgeInsets.fromLTRB(24, 0, 24, 16),
child: Text(
context.l10n.lossyFormatDescription,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: colorScheme.onSurfaceVariant,
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.fromLTRB(24, 24, 24, 8),
child: Text(
context.l10n.lossyFormat,
style: Theme.of(
context,
).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
),
),
),
ListTile(
leading: const Icon(Icons.audiotrack),
title: const Text('MP3'),
subtitle: Text(context.l10n.lossyFormatMp3Subtitle),
trailing: current == 'mp3' ? const Icon(Icons.check) : null,
onTap: () {
ref.read(settingsProvider.notifier).setLossyFormat('mp3');
Navigator.pop(context);
},
),
ListTile(
leading: const Icon(Icons.graphic_eq),
title: const Text('Opus'),
subtitle: Text(context.l10n.lossyFormatOpusSubtitle),
trailing: current == 'opus' ? const Icon(Icons.check) : null,
onTap: () {
ref.read(settingsProvider.notifier).setLossyFormat('opus');
Navigator.pop(context);
},
),
const SizedBox(height: 16),
],
Padding(
padding: const EdgeInsets.fromLTRB(24, 0, 24, 16),
child: Text(
context.l10n.lossyFormatDescription,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: colorScheme.onSurfaceVariant,
),
),
),
// MP3 Section
Padding(
padding: const EdgeInsets.fromLTRB(24, 8, 24, 4),
child: Text(
'MP3',
style: Theme.of(context).textTheme.titleSmall?.copyWith(
color: colorScheme.primary,
fontWeight: FontWeight.bold,
),
),
),
ListTile(
leading: const Icon(Icons.audiotrack),
title: const Text('320kbps'),
subtitle: const Text('Best quality, larger files'),
trailing: current == 'mp3_320' ? Icon(Icons.check, color: colorScheme.primary) : null,
onTap: () {
ref.read(settingsProvider.notifier).setLossyBitrate('mp3_320');
Navigator.pop(context);
},
),
ListTile(
leading: const Icon(Icons.audiotrack),
title: const Text('256kbps'),
subtitle: const Text('High quality'),
trailing: current == 'mp3_256' ? Icon(Icons.check, color: colorScheme.primary) : null,
onTap: () {
ref.read(settingsProvider.notifier).setLossyBitrate('mp3_256');
Navigator.pop(context);
},
),
ListTile(
leading: const Icon(Icons.audiotrack),
title: const Text('192kbps'),
subtitle: const Text('Good quality'),
trailing: current == 'mp3_192' ? Icon(Icons.check, color: colorScheme.primary) : null,
onTap: () {
ref.read(settingsProvider.notifier).setLossyBitrate('mp3_192');
Navigator.pop(context);
},
),
ListTile(
leading: const Icon(Icons.audiotrack),
title: const Text('128kbps'),
subtitle: const Text('Smaller files'),
trailing: current == 'mp3_128' ? Icon(Icons.check, color: colorScheme.primary) : null,
onTap: () {
ref.read(settingsProvider.notifier).setLossyBitrate('mp3_128');
Navigator.pop(context);
},
),
const Divider(indent: 24, endIndent: 24),
// Opus Section
Padding(
padding: const EdgeInsets.fromLTRB(24, 8, 24, 4),
child: Text(
'Opus',
style: Theme.of(context).textTheme.titleSmall?.copyWith(
color: colorScheme.primary,
fontWeight: FontWeight.bold,
),
),
),
ListTile(
leading: const Icon(Icons.graphic_eq),
title: const Text('128kbps'),
subtitle: const Text('Best quality, efficient codec'),
trailing: current == 'opus_128' ? Icon(Icons.check, color: colorScheme.primary) : null,
onTap: () {
ref.read(settingsProvider.notifier).setLossyBitrate('opus_128');
Navigator.pop(context);
},
),
ListTile(
leading: const Icon(Icons.graphic_eq),
title: const Text('96kbps'),
subtitle: const Text('Good quality'),
trailing: current == 'opus_96' ? Icon(Icons.check, color: colorScheme.primary) : null,
onTap: () {
ref.read(settingsProvider.notifier).setLossyBitrate('opus_96');
Navigator.pop(context);
},
),
ListTile(
leading: const Icon(Icons.graphic_eq),
title: const Text('64kbps'),
subtitle: const Text('Smallest files'),
trailing: current == 'opus_64' ? Icon(Icons.check, color: colorScheme.primary) : null,
onTap: () {
ref.read(settingsProvider.notifier).setLossyBitrate('opus_64');
Navigator.pop(context);
},
),
const SizedBox(height: 16),
],
),
),
),
);
lib/services/ffmpeg_service.dart
+15 -2
View File
@@ -99,17 +99,30 @@ class FFmpegService {
/// Convert FLAC to lossy format based on format parameter
/// format: 'mp3' or 'opus'
/// bitrate: e.g., 'mp3_320', 'opus_128' - extracts the kbps value
static Future<String?> convertFlacToLossy(
String inputPath, {
required String format,
String? bitrate,
bool deleteOriginal = true,
}) async {
// Extract bitrate value from format like 'mp3_320' -> '320k'
String bitrateValue = '320k'; // default for mp3
if (bitrate != null && bitrate.contains('_')) {
final parts = bitrate.split('_');
if (parts.length == 2) {
bitrateValue = '${parts[1]}k';
}
}
switch (format.toLowerCase()) {
case 'opus':
return convertFlacToOpus(inputPath, deleteOriginal: deleteOriginal);
final opusBitrate = bitrate?.startsWith('opus_') == true ? bitrateValue : '128k';
return convertFlacToOpus(inputPath, bitrate: opusBitrate, deleteOriginal: deleteOriginal);
case 'mp3':
default:
return convertFlacToMp3(inputPath, deleteOriginal: deleteOriginal);
final mp3Bitrate = bitrate?.startsWith('mp3_') == true ? bitrateValue : '320k';
return convertFlacToMp3(inputPath, bitrate: mp3Bitrate, deleteOriginal: deleteOriginal);
}
}