CalvinBackup/SpotiFLAC-Mobile
1
0
Fork 0
mirror of https://github.com/zarzet/SpotiFLAC-Mobile.git synced 2026-09-03 08:40:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(download): preserve finalization metadata and library labels

Browse Source
This commit is contained in:
zarzet
2026-08-29 00:31:25 +07:00
parent c3b2214e2a
commit 5dac33dfa4
11 changed files with 264 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/providers/download_queue_provider_finalization.dart
+29 -6
View File
@@ -1114,15 +1114,22 @@ extension _DownloadQueueFinalization on DownloadQueueNotifier {
result['audio_codec']?.toString() ??
result['actual_audio_codec']?.toString(),
);
if (isLossyAudioFormat(resultAudioFormat)) {
final requiresContainerConversion =
result['requires_container_conversion'] == true ||
result['requiresContainerConversion'] == true ||
_shouldRequestContainerConversion(
context.item.service,
context.outputExt,
);
// M4A/MP4 identifies a container, not necessarily a lossy codec. When an
// extension explicitly requests conversion, probe the stream below rather
// than treating the container label as proof that its audio is lossy.
if (!requiresContainerConversion && isLossyAudioFormat(resultAudioFormat)) {
_log.d(
'Native-worker output is $resultAudioFormat; preserving native container.',
);
return filePath;
}
final requiresContainerConversion =
result['requires_container_conversion'] == true ||
result['requiresContainerConversion'] == true;
final resultOutputExt = _downloadResultOutputExt(
result,
filePath: filePath,
@@ -1180,6 +1187,13 @@ extension _DownloadQueueFinalization on DownloadQueueNotifier {
);
}
void markFinalOutputAsFlac() {
result['audio_codec'] = 'flac';
result['format'] = 'flac';
result['actual_extension'] = '.flac';
result['output_extension'] = '.flac';
}
if (context.storageMode == 'saf' && isContentUri(filePath)) {
final treeUri = context.downloadTreeUri;
if (treeUri == null || treeUri.isEmpty) {
@@ -1195,7 +1209,10 @@ extension _DownloadQueueFinalization on DownloadQueueNotifier {
final codec = await FFmpegService.probePrimaryAudioCodec(tempPath);
final isAlreadyNativeFlac =
codec == 'flac' && await FFmpegService.isNativeFlacFile(tempPath);
if (!FFmpegService.isLosslessAudioCodec(codec)) {
final shouldAttemptConversion =
FFmpegService.isLosslessAudioCodec(codec) ||
(requiresContainerConversion && isInconclusiveAudioCodec(codec));
if (!shouldAttemptConversion) {
_log.d(
'Preserving native container; audio codec is ${codec ?? 'unknown'}, '
'no FLAC container conversion needed.',
@@ -1241,13 +1258,17 @@ extension _DownloadQueueFinalization on DownloadQueueNotifier {
return null;
}
result['file_name'] = producedFileName;
markFinalOutputAsFlac();
return newUri;
}
final codec = await FFmpegService.probePrimaryAudioCodec(filePath);
final isAlreadyNativeFlac =
codec == 'flac' && await FFmpegService.isNativeFlacFile(filePath);
if (!FFmpegService.isLosslessAudioCodec(codec)) {
final shouldAttemptConversion =
FFmpegService.isLosslessAudioCodec(codec) ||
(requiresContainerConversion && isInconclusiveAudioCodec(codec));
if (!shouldAttemptConversion) {
_log.d(
'Preserving native container; audio codec is ${codec ?? 'unknown'}, '
'no FLAC container conversion needed.',
@@ -1265,6 +1286,7 @@ extension _DownloadQueueFinalization on DownloadQueueNotifier {
flacPath = targetPath;
}
await embedFlacMetadata(flacPath);
markFinalOutputAsFlac();
return flacPath;
}
final flacPath = await FFmpegService.convertM4aToFlac(filePath);
@@ -1272,6 +1294,7 @@ extension _DownloadQueueFinalization on DownloadQueueNotifier {
return null;
}
await embedFlacMetadata(flacPath);
markFinalOutputAsFlac();
return flacPath;
}
lib/providers/download_queue_provider_single_item.dart
+23 -4
View File
@@ -691,11 +691,13 @@ class _DownloadRun {
result['audio_codec']?.toString() ??
result['actual_audio_codec']?.toString(),
);
final resultIsLossyAudio = isLossyAudioFormat(resultAudioFormat);
final resultIsKnownLossyAudio =
isLossyAudioFormat(resultAudioFormat) &&
!isInconclusiveAudioCodec(resultAudioFormat);
final requiresContainerConversion =
result['requires_container_conversion'] == true ||
result['requiresContainerConversion'] == true ||
(!resultIsLossyAudio &&
(!resultIsKnownLossyAudio &&
n._shouldRequestContainerConversion(actualService, safOutputExt));
final preferredOutputExt = n._extensionPreferredOutputExt(actualService);
shouldPreserveNativeM4a =
@@ -987,6 +989,14 @@ class _DownloadRun {
}
}
void _markFinalOutputAsFlac() {
result['audio_codec'] = 'flac';
result['format'] = 'flac';
result['actual_extension'] = '.flac';
result['output_extension'] = '.flac';
resultOutputExt = '.flac';
}
Future<bool> _publishDeferredSafOutputOnce() async {
final localPath = filePath;
if (localPath == null || isContentUri(localPath)) return true;
@@ -1252,7 +1262,10 @@ class _DownloadRun {
final codec = await FFmpegService.probePrimaryAudioCodec(tempPath);
final isAlreadyNativeFlac =
codec == 'flac' && await FFmpegService.isNativeFlacFile(tempPath);
if (!FFmpegService.isLosslessAudioCodec(codec)) {
final shouldAttemptConversion =
FFmpegService.isLosslessAudioCodec(codec) ||
isInconclusiveAudioCodec(codec);
if (!shouldAttemptConversion) {
_log.d(
'Preserving native container; audio codec is ${codec ?? 'unknown'}, '
'no FLAC container conversion needed.',
@@ -1309,6 +1322,7 @@ class _DownloadRun {
if (newUri != null) {
filePath = newUri;
finalSafFileName = producedFileName;
_markFinalOutputAsFlac();
} else if (branch == 'nativeFlac') {
_log.w('Failed to write native FLAC to SAF');
} else if (branch == 'convert') {
@@ -1437,7 +1451,10 @@ class _DownloadRun {
final isAlreadyNativeFlac =
codec == 'flac' &&
await FFmpegService.isNativeFlacFile(currentFilePath);
if (!FFmpegService.isLosslessAudioCodec(codec)) {
final shouldAttemptConversion =
FFmpegService.isLosslessAudioCodec(codec) ||
isInconclusiveAudioCodec(codec);
if (!shouldAttemptConversion) {
_log.d(
'Preserving native container; audio codec is ${codec ?? 'unknown'}, '
'no FLAC container conversion needed.',
@@ -1462,6 +1479,7 @@ class _DownloadRun {
}
await _embedFinalMetadata(flacPath, format: 'flac');
_markFinalOutputAsFlac();
} else {
n.updateItemStatus(
item.id,
@@ -1474,6 +1492,7 @@ class _DownloadRun {
if (flacPath != null) {
filePath = flacPath;
_markFinalOutputAsFlac();
_log.d('Converted to FLAC: $flacPath');
_log.d('Embedding metadata and cover to converted FLAC...');