diff --git a/integration_test/download_lossless_container_test.dart b/integration_test/download_lossless_container_test.dart index dad1839e0..eedbb2793 100644 --- a/integration_test/download_lossless_container_test.dart +++ b/integration_test/download_lossless_container_test.dart @@ -17,7 +17,7 @@ import 'package:mornye/providers/download_queue_provider.dart'; import 'package:mornye/providers/extension_provider.dart'; import 'package:mornye/providers/settings_provider.dart'; import 'package:mornye/services/app_state_database.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_probe.dart'; import 'package:mornye/services/platform_bridge.dart'; class _Paths extends PathProviderPlatform { @@ -187,12 +187,9 @@ registerExtension({ final item = await done.future.timeout(const Duration(seconds: 45)); expect(item.status, DownloadStatus.completed, reason: item.error); expect(item.filePath, endsWith(extension)); + expect(await FFmpegProbe.audioCodec(item.filePath!), codec); expect( - await FFmpegService.probePrimaryAudioCodec(item.filePath!), - codec, - ); - expect( - await FFmpegService.isNativeFlacFile(item.filePath!), + await FFmpegProbe.isNativeFlacFile(item.filePath!), codec == 'flac', ); final tags = await PlatformBridge.readFileMetadata(item.filePath!); diff --git a/integration_test/download_output_container_test.dart b/integration_test/download_output_container_test.dart index 491fdfa35..395cee7f5 100644 --- a/integration_test/download_output_container_test.dart +++ b/integration_test/download_output_container_test.dart @@ -12,7 +12,7 @@ import 'package:mornye/models/settings.dart'; import 'package:mornye/models/track.dart'; import 'package:mornye/services/download_metadata_embedding.dart'; import 'package:mornye/services/download_request_payload.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_probe.dart'; import 'package:mornye/services/platform_bridge.dart'; void main() { @@ -156,10 +156,7 @@ registerExtension({ expect(await File('${output.path}/$stem.flac').exists(), false); } final audioCodec = format == 'mp3' ? 'mp3' : codec; - expect( - await FFmpegService.probePrimaryAudioCodec(downloaded.path), - audioCodec, - ); + expect(await FFmpegProbe.audioCodec(downloaded.path), audioCodec); // The same tag writer used by the foreground queue must preserve // the native stream while embedding source credits into its container. await DownloadMetadataEmbedding(onReplayGain: (_, _, _) {}).embed( @@ -181,10 +178,7 @@ registerExtension({ expect(metadata['title'], 'Track'); expect(metadata['artist'], 'Artist & Guest'); expect(metadata['album'], 'Album'); - expect( - await FFmpegService.probePrimaryAudioCodec(downloaded.path), - audioCodec, - ); + expect(await FFmpegProbe.audioCodec(downloaded.path), audioCodec); }, ); } diff --git a/lib/controllers/batch_track_actions.dart b/lib/controllers/batch_track_actions.dart index 1115961af..094302796 100644 --- a/lib/controllers/batch_track_actions.dart +++ b/lib/controllers/batch_track_actions.dart @@ -9,7 +9,7 @@ import 'package:mornye/providers/download_history_provider.dart'; import 'package:mornye/providers/local_library_provider.dart'; import 'package:mornye/providers/settings_provider.dart'; import 'package:mornye/services/conversion_library_service.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_conversion.dart'; import 'package:mornye/services/library_database.dart'; import 'package:mornye/services/platform_bridge.dart'; import 'package:mornye/services/replaygain_service.dart'; @@ -446,7 +446,7 @@ Future convertLibraryTrack({ } failureStage = 'FFmpeg conversion'; - final newPath = await FFmpegService.convertAudioFormat( + final newPath = await FFmpegConversion.convertAudioFormat( inputPath: workingPath, targetFormat: targetFormat.toLowerCase(), bitrate: bitrate, diff --git a/lib/providers/download_queue_provider.dart b/lib/providers/download_queue_provider.dart index b347afa0c..e36210c26 100644 --- a/lib/providers/download_queue_provider.dart +++ b/lib/providers/download_queue_provider.dart @@ -34,7 +34,10 @@ import 'package:mornye/services/platform_bridge.dart'; import 'package:mornye/services/download_request_payload.dart'; import 'package:mornye/services/folder_path_template.dart'; import 'package:mornye/services/download_motion_artwork_source.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_conversion.dart'; +import 'package:mornye/services/ffmpeg_decryption.dart'; +import 'package:mornye/services/ffmpeg_models.dart'; +import 'package:mornye/services/ffmpeg_probe.dart'; import 'package:mornye/services/hires_check_service.dart'; import 'package:mornye/services/replaygain_service.dart'; import 'package:mornye/services/album_replaygain_readiness.dart'; diff --git a/lib/providers/download_queue_provider_finalization.dart b/lib/providers/download_queue_provider_finalization.dart index 56e5f6937..42f0c18ec 100644 --- a/lib/providers/download_queue_provider_finalization.dart +++ b/lib/providers/download_queue_provider_finalization.dart @@ -21,8 +21,8 @@ bool _isMp4Container(String path) { extension _DownloadQueueFinalization on DownloadQueueNotifier { DownloadFileFinalizer get _fileFinalizer => DownloadFileFinalizer( - decryptFile: FFmpegService.decryptWithDescriptor, - probeCodec: FFmpegService.probePrimaryAudioCodec, + decryptFile: FFmpegDecryption.decrypt, + probeCodec: FFmpegProbe.audioCodec, repairAc4: (path, source) async { await PlatformBridge.ensureAC4Config(path, source); }, @@ -32,7 +32,7 @@ extension _DownloadQueueFinalization on DownloadQueueNotifier { required targetFormat, required bitrate, required deleteOriginal, - }) => FFmpegService.convertAudioFormat( + }) => FFmpegConversion.convertAudioFormat( inputPath: inputPath, targetFormat: targetFormat, bitrate: bitrate, @@ -768,10 +768,10 @@ extension _DownloadQueueFinalization on DownloadQueueNotifier { required String filePath, }) => DownloadContainerFinalizer( - probeCodec: FFmpegService.probePrimaryAudioCodec, - isNativeFlac: FFmpegService.isNativeFlacFile, - ensureFlacExtension: FFmpegService.ensureNativeFlacExtension, - convertToFlac: FFmpegService.convertM4aToFlac, + probeCodec: FFmpegProbe.audioCodec, + isNativeFlac: FFmpegProbe.isNativeFlacFile, + ensureFlacExtension: FFmpegConversion.ensureNativeFlacExtension, + convertToFlac: FFmpegConversion.convertM4aToFlac, replaceSafFile: _replaceSafFileVia, debug: _log.d, ).finalize( diff --git a/lib/providers/download_queue_provider_single_item.dart b/lib/providers/download_queue_provider_single_item.dart index a98151ae3..a62a7a896 100644 --- a/lib/providers/download_queue_provider_single_item.dart +++ b/lib/providers/download_queue_provider_single_item.dart @@ -1222,9 +1222,9 @@ class _DownloadRun { branch = 'skip'; return null; } - final codec = await FFmpegService.probePrimaryAudioCodec(tempPath); + final codec = await FFmpegProbe.audioCodec(tempPath); final isAlreadyNativeFlac = - codec == 'flac' && await FFmpegService.isNativeFlacFile(tempPath); + codec == 'flac' && await FFmpegProbe.isNativeFlacFile(tempPath); final shouldAttemptConversion = shouldAttemptLosslessContainerConversion( forceConversion: forceContainerConversion, @@ -1268,7 +1268,7 @@ class _DownloadRun { DownloadStatus.finalizing, progress: 0.95, ); - final flacPath = await FFmpegService.convertM4aToFlac( + final flacPath = await FFmpegConversion.convertM4aToFlac( tempPath, sourceCodec: codec, ); @@ -1363,12 +1363,10 @@ class _DownloadRun { 'File is too small (<1KB), skipping conversion. Download might be corrupt.', ); } else { - final codec = await FFmpegService.probePrimaryAudioCodec( - currentFilePath, - ); + final codec = await FFmpegProbe.audioCodec(currentFilePath); final isAlreadyNativeFlac = codec == 'flac' && - await FFmpegService.isNativeFlacFile(currentFilePath); + await FFmpegProbe.isNativeFlacFile(currentFilePath); final shouldAttemptConversion = shouldAttemptLosslessContainerConversion( forceConversion: forceContainerConversion, @@ -1385,7 +1383,7 @@ class _DownloadRun { 'Native FLAC payload detected; ensuring .flac ' 'extension and embedding metadata.', ); - final flacPath = await FFmpegService.ensureNativeFlacExtension( + final flacPath = await FFmpegConversion.ensureNativeFlacExtension( currentFilePath, ); filePath = flacPath; @@ -1398,7 +1396,7 @@ class _DownloadRun { DownloadStatus.finalizing, progress: 0.95, ); - final flacPath = await FFmpegService.convertM4aToFlac( + final flacPath = await FFmpegConversion.convertM4aToFlac( currentFilePath, sourceCodec: codec, ); diff --git a/lib/screens/track_metadata_convert.dart b/lib/screens/track_metadata_convert.dart index 6faf3e84a..82cf903e6 100644 --- a/lib/screens/track_metadata_convert.dart +++ b/lib/screens/track_metadata_convert.dart @@ -640,7 +640,7 @@ extension _TrackMetadataConvertAndCueSplit on _TrackMetadataScreenState { 'date': date, }; - final outputPaths = await FFmpegService.splitCueToTracks( + final outputPaths = await FFmpegConversion.splitCueToTracks( audioPath: workingAudioPath, outputDir: outputDir, tracks: tracks, diff --git a/lib/screens/track_metadata_lyrics.dart b/lib/screens/track_metadata_lyrics.dart index c66241850..94e1eeb4c 100644 --- a/lib/screens/track_metadata_lyrics.dart +++ b/lib/screens/track_metadata_lyrics.dart @@ -562,19 +562,19 @@ extension _TrackMetadataLyricsAndSaving on _TrackMetadataScreenState { ); String? ffmpegResult; if (isMp3) { - ffmpegResult = await FFmpegService.embedMetadataToMp3( + ffmpegResult = await FFmpegMetadata.embedMetadataToMp3( mp3Path: workingPath, coverPath: coverPath, metadata: metadata, ); } else if (isM4A) { - ffmpegResult = await FFmpegService.embedMetadataToM4a( + ffmpegResult = await FFmpegMetadata.embedMetadataToM4a( m4aPath: workingPath, coverPath: coverPath, metadata: metadata, ); } else { - ffmpegResult = await FFmpegService.embedMetadataToOpus( + ffmpegResult = await FFmpegMetadata.embedMetadataToOpus( opusPath: workingPath, coverPath: coverPath, metadata: metadata, @@ -1008,21 +1008,21 @@ extension _TrackMetadataLyricsAndSaving on _TrackMetadataScreenState { String? ffmpegResult; if (lower.endsWith('.mp3')) { - ffmpegResult = await FFmpegService.embedMetadataToMp3( + ffmpegResult = await FFmpegMetadata.embedMetadataToMp3( mp3Path: ffmpegTarget, coverPath: effectiveCoverPath, metadata: metadata, artistTagMode: artistTagMode, ); } else if (lower.endsWith('.m4a') || lower.endsWith('.aac')) { - ffmpegResult = await FFmpegService.embedMetadataToM4a( + ffmpegResult = await FFmpegMetadata.embedMetadataToM4a( m4aPath: ffmpegTarget, coverPath: effectiveCoverPath, metadata: metadata, artistTagMode: artistTagMode, ); } else if (lower.endsWith('.opus') || lower.endsWith('.ogg')) { - ffmpegResult = await FFmpegService.embedMetadataToOpus( + ffmpegResult = await FFmpegMetadata.embedMetadataToOpus( opusPath: ffmpegTarget, coverPath: effectiveCoverPath, metadata: metadata, diff --git a/lib/screens/track_metadata_screen.dart b/lib/screens/track_metadata_screen.dart index 22278573b..dc0e13dc9 100644 --- a/lib/screens/track_metadata_screen.dart +++ b/lib/screens/track_metadata_screen.dart @@ -32,7 +32,10 @@ import 'package:mornye/services/platform_bridge.dart'; import 'package:mornye/services/music_player_service.dart' show readPlaybackFileMetadataWithRetry; import 'package:mornye/services/downloaded_embedded_cover_resolver.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_conversion.dart'; +import 'package:mornye/services/ffmpeg_metadata.dart'; +import 'package:mornye/services/ffmpeg_models.dart'; +import 'package:mornye/services/ffmpeg_probe.dart'; import 'package:mornye/services/replaygain_service.dart'; import 'package:mornye/l10n/l10n.dart'; import 'package:mornye/utils/adaptive_layout.dart'; diff --git a/lib/screens/track_metadata_screen_cover.dart b/lib/screens/track_metadata_screen_cover.dart index 116ed7596..193709793 100644 --- a/lib/screens/track_metadata_screen_cover.dart +++ b/lib/screens/track_metadata_screen_cover.dart @@ -147,9 +147,7 @@ extension _TrackMetadataCover on _TrackMetadataScreenState { if (cachedCover != null && cachedCover.previewPath == newPreviewPath) { newDimensions = cachedCover.dimensions; } else { - newDimensions = await FFmpegService.probeImageDimensions( - newPreviewPath, - ); + newDimensions = await FFmpegProbe.imageDimensions(newPreviewPath); await _cacheEmbeddedCoverPreview( cacheKey, sourcePath, diff --git a/lib/services/download_metadata_embedding.dart b/lib/services/download_metadata_embedding.dart index c2476c823..88c2a7f56 100644 --- a/lib/services/download_metadata_embedding.dart +++ b/lib/services/download_metadata_embedding.dart @@ -7,7 +7,9 @@ import 'package:mornye/models/metadata_separators.dart'; import 'package:mornye/models/track.dart'; import 'package:mornye/models/extension.dart'; import 'package:mornye/services/download_metadata_resolver.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_metadata.dart'; +import 'package:mornye/services/ffmpeg_models.dart'; +import 'package:mornye/services/ffmpeg_replaygain.dart'; import 'package:mornye/services/platform_bridge.dart'; import 'package:mornye/services/replaygain_service.dart'; import 'package:mornye/utils/artist_utils.dart'; @@ -57,7 +59,7 @@ class DownloadMetadataEmbedding { }) : _loadCover = loadCover ?? _downloadCover, _loadLyrics = loadLyrics ?? _fetchLyrics, _editMetadata = editMetadata ?? PlatformBridge.editFileMetadata, - _scanReplayGain = scanReplayGain ?? FFmpegService.scanReplayGain, + _scanReplayGain = scanReplayGain ?? FFmpegReplayGain.scan, _scanAndApplyReplayGain = scanAndApplyReplayGain ?? ReplayGainService.scanAndApplyToFile, _writeReplayGain = writeReplayGain ?? ReplayGainService.writeTrackTags, @@ -412,25 +414,25 @@ class DownloadMetadataEmbedding { Map metadata, String artistMode, ) => switch (format) { - 'flac' => FFmpegService.embedMetadata( + 'flac' => FFmpegMetadata.embedMetadata( flacPath: path, coverPath: cover, metadata: metadata, artistTagMode: artistMode, ), - 'm4a' => FFmpegService.embedMetadataToM4a( + 'm4a' => FFmpegMetadata.embedMetadataToM4a( m4aPath: path, coverPath: cover, metadata: metadata, artistTagMode: artistMode, ), - 'mp3' => FFmpegService.embedMetadataToMp3( + 'mp3' => FFmpegMetadata.embedMetadataToMp3( mp3Path: path, coverPath: cover, metadata: metadata, artistTagMode: artistMode, ), - _ => FFmpegService.embedMetadataToOpus( + _ => FFmpegMetadata.embedMetadataToOpus( opusPath: path, coverPath: cover, metadata: metadata, diff --git a/lib/services/ffmpeg_conversion.dart b/lib/services/ffmpeg_conversion.dart index ccacbe4ee..395a0d6b2 100644 --- a/lib/services/ffmpeg_conversion.dart +++ b/lib/services/ffmpeg_conversion.dart @@ -1,5 +1,6 @@ import 'dart:io'; +import 'package:flutter/foundation.dart'; import 'package:mornye/services/audio_metadata_mapper.dart'; import 'package:mornye/services/ffmpeg_metadata.dart'; import 'package:mornye/services/ffmpeg_models.dart'; @@ -107,7 +108,7 @@ abstract final class FFmpegConversion { static Future convertM4aToFlac( String inputPath, { String? sourceCodec, - Future Function(List)? execute, + @visibleForTesting Future Function(List)? execute, }) async { final plan = await FFmpegOutput.plan( inputPath, diff --git a/lib/services/ffmpeg_metadata.dart b/lib/services/ffmpeg_metadata.dart index dbfd4d3b0..f3b4157b5 100644 --- a/lib/services/ffmpeg_metadata.dart +++ b/lib/services/ffmpeg_metadata.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'dart:io'; import 'dart:isolate'; -import 'dart:typed_data'; +import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:mornye/services/audio_metadata_mapper.dart'; import 'package:mornye/services/ffmpeg_models.dart'; @@ -16,6 +16,7 @@ final _log = AppLogger('FFmpeg'); /// Container-specific metadata and artwork operations, independent of encoding. abstract final class FFmpegMetadata { + @visibleForTesting static List buildCoverResizeArguments({ required String inputPath, required String outputPath, @@ -267,7 +268,7 @@ abstract final class FFmpegMetadata { Map? metadata, String artistTagMode = artistTagModeJoined, bool preserveMetadata = false, - Future Function(List)? execute, + @visibleForTesting Future Function(List)? execute, }) async { final tempOutput = await FFmpegOutput.tempPath('.opus'); // Opus tags are on the audio stream. Copy to output globals, override the @@ -328,7 +329,7 @@ abstract final class FFmpegMetadata { Map? metadata, String artistTagMode = artistTagModeJoined, bool preserveMetadata = true, - Future Function(List)? execute, + @visibleForTesting Future Function(List)? execute, }) async { if (metadata != null) { metadata = applyArtistTagModeToMetadata(metadata, artistTagMode); diff --git a/lib/services/ffmpeg_probe.dart b/lib/services/ffmpeg_probe.dart index f3bffbdb0..b019709fb 100644 --- a/lib/services/ffmpeg_probe.dart +++ b/lib/services/ffmpeg_probe.dart @@ -1,5 +1,6 @@ import 'dart:io'; +import 'package:flutter/foundation.dart'; import 'package:mornye/services/ffmpeg_support.dart'; import 'package:mornye/utils/logger.dart'; import 'package:mornye/utils/audio_format_utils.dart' as audio; @@ -27,6 +28,7 @@ abstract final class FFmpegProbe { static void invalidate(String path) => _cache.remove(path); + @visibleForTesting static ({int width, int height})? imageDimensionsFromProperties( Map properties, ) { diff --git a/lib/services/ffmpeg_reenrich.dart b/lib/services/ffmpeg_reenrich.dart index da2c9d51d..16eced282 100644 --- a/lib/services/ffmpeg_reenrich.dart +++ b/lib/services/ffmpeg_reenrich.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_metadata.dart'; import 'package:mornye/services/library_database.dart'; import 'package:mornye/services/platform_bridge.dart'; import 'package:mornye/utils/file_access.dart'; @@ -89,7 +89,7 @@ Future applyFfmpegReEnrichResult({ String? ffmpegResult; if (isMp3) { - ffmpegResult = await FFmpegService.embedMetadataToMp3( + ffmpegResult = await FFmpegMetadata.embedMetadataToMp3( mp3Path: ffmpegTarget, coverPath: effectiveCoverPath, metadata: metadata, @@ -97,7 +97,7 @@ Future applyFfmpegReEnrichResult({ preserveMetadata: true, ); } else if (isM4A) { - ffmpegResult = await FFmpegService.embedMetadataToM4a( + ffmpegResult = await FFmpegMetadata.embedMetadataToM4a( m4aPath: ffmpegTarget, coverPath: effectiveCoverPath, metadata: metadata, @@ -105,7 +105,7 @@ Future applyFfmpegReEnrichResult({ preserveMetadata: true, ); } else if (isOpus) { - ffmpegResult = await FFmpegService.embedMetadataToOpus( + ffmpegResult = await FFmpegMetadata.embedMetadataToOpus( opusPath: ffmpegTarget, coverPath: effectiveCoverPath, metadata: metadata, diff --git a/lib/services/ffmpeg_replaygain.dart b/lib/services/ffmpeg_replaygain.dart index 9754efbcd..3084f3168 100644 --- a/lib/services/ffmpeg_replaygain.dart +++ b/lib/services/ffmpeg_replaygain.dart @@ -1,6 +1,7 @@ import 'dart:io'; import 'dart:math' as math; +import 'package:flutter/foundation.dart'; import 'package:mornye/services/ffmpeg_models.dart'; import 'package:mornye/services/ffmpeg_support.dart'; import 'package:mornye/utils/logger.dart'; @@ -38,6 +39,7 @@ abstract final class FFmpegReplayGain { return parseScan(result, onUnsupportedDecoder: onUnsupportedDecoder); } + @visibleForTesting static ReplayGainResult? parseScan( FFmpegResult result, { void Function()? onUnsupportedDecoder, diff --git a/lib/services/ffmpeg_service.dart b/lib/services/ffmpeg_service.dart deleted file mode 100644 index 1f54540e9..000000000 --- a/lib/services/ffmpeg_service.dart +++ /dev/null @@ -1,223 +0,0 @@ -import 'package:flutter/foundation.dart'; -import 'package:mornye/services/ffmpeg_conversion.dart'; -import 'package:mornye/services/ffmpeg_decryption.dart'; -import 'package:mornye/services/ffmpeg_metadata.dart'; -import 'package:mornye/services/ffmpeg_models.dart'; -import 'package:mornye/services/ffmpeg_probe.dart'; -import 'package:mornye/services/ffmpeg_replaygain.dart'; -import 'package:mornye/utils/artist_utils.dart'; -import 'package:mornye/utils/audio_conversion_utils.dart'; - -export 'package:mornye/services/ffmpeg_models.dart'; - -/// Compatibility entry point for callers; feature modules own the operations. -class FFmpegService { - @visibleForTesting - static List buildCoverResizeArguments({ - required String inputPath, - required String outputPath, - required int maxDimension, - }) => FFmpegMetadata.buildCoverResizeArguments( - inputPath: inputPath, - outputPath: outputPath, - maxDimension: maxDimension, - ); - - /// Preserves aspect ratio, allowing upscale to the explicitly chosen size. - static Future resizeCoverArt({ - required String inputPath, - required String outputPath, - required int maxDimension, - }) => FFmpegMetadata.resizeCoverArt( - inputPath: inputPath, - outputPath: outputPath, - maxDimension: maxDimension, - ); - - @visibleForTesting - static ({int width, int height})? imageDimensionsFromProperties( - Map properties, - ) => FFmpegProbe.imageDimensionsFromProperties(properties); - - /// Reads image dimensions without decoding a bitmap into Dart memory. - static Future<({int width, int height})?> probeImageDimensions( - String filePath, - ) => FFmpegProbe.imageDimensions(filePath); - - static Future probePrimaryAudioCodec(String filePath) => - FFmpegProbe.audioCodec(filePath); - - static bool isLosslessAudioCodec(String? codec) => - FFmpegProbe.isLosslessAudioCodec(codec); - - /// Checks the native FLAC magic, distinguishing FLAC-in-MP4 payloads. - static Future isNativeFlacFile(String filePath) => - FFmpegProbe.isNativeFlacFile(filePath); - - static Future convertM4aToFlac( - String inputPath, { - String? sourceCodec, - @visibleForTesting Future Function(List)? execute, - }) => FFmpegConversion.convertM4aToFlac( - inputPath, - sourceCodec: sourceCodec, - execute: execute, - ); - - /// Corrects the suffix without replacing an existing sibling file. - static Future ensureNativeFlacExtension(String inputPath) => - FFmpegConversion.ensureNativeFlacExtension(inputPath); - - static Future decryptWithDescriptor({ - required String inputPath, - required DownloadDecryptionDescriptor descriptor, - bool deleteOriginal = true, - Future Function(String)? prepareOutput, - }) => FFmpegDecryption.decrypt( - inputPath: inputPath, - descriptor: descriptor, - deleteOriginal: deleteOriginal, - prepareOutput: prepareOutput, - ); - - /// Measures EBU R128 loudness and true peak using a -18 LUFS reference. - static Future scanReplayGain( - String filePath, { - void Function()? onUnsupportedDecoder, - }) => FFmpegReplayGain.scan( - filePath, - onUnsupportedDecoder: onUnsupportedDecoder, - ); - - @visibleForTesting - static ReplayGainResult? parseReplayGainScan( - FFmpegResult result, { - void Function()? onUnsupportedDecoder, - }) => FFmpegReplayGain.parseScan( - result, - onUnsupportedDecoder: onUnsupportedDecoder, - ); - - /// With [returnTempPath], hands temp output to [onTempReady] for SAF write and - /// cleanup by the caller. Otherwise publishes to the local file. - static Future writeAlbumReplayGainTags( - String filePath, - String albumGain, - String albumPeak, { - bool returnTempPath = false, - void Function(String tempPath)? onTempReady, - }) => FFmpegReplayGain.writeAlbumTags( - filePath, - albumGain, - albumPeak, - returnTempPath: returnTempPath, - onTempReady: onTempReady, - ); - - static Future writeTrackReplayGainTags( - String filePath, - String trackGain, - String trackPeak, - ) => FFmpegReplayGain.writeTrackTags(filePath, trackGain, trackPeak); - - static Future embedMetadata({ - required String flacPath, - String? coverPath, - Map? metadata, - String artistTagMode = artistTagModeJoined, - }) => FFmpegMetadata.embedMetadata( - flacPath: flacPath, - coverPath: coverPath, - metadata: metadata, - artistTagMode: artistTagMode, - ); - - static Future embedMetadataToMp3({ - required String mp3Path, - String? coverPath, - Map? metadata, - String artistTagMode = artistTagModeJoined, - bool preserveMetadata = false, - }) => FFmpegMetadata.embedMetadataToMp3( - mp3Path: mp3Path, - coverPath: coverPath, - metadata: metadata, - artistTagMode: artistTagMode, - preserveMetadata: preserveMetadata, - ); - - static Future embedMetadataToOpus({ - required String opusPath, - String? coverPath, - Map? metadata, - String artistTagMode = artistTagModeJoined, - bool preserveMetadata = false, - @visibleForTesting Future Function(List)? execute, - }) => FFmpegMetadata.embedMetadataToOpus( - opusPath: opusPath, - coverPath: coverPath, - metadata: metadata, - artistTagMode: artistTagMode, - preserveMetadata: preserveMetadata, - execute: execute, - ); - - static Future embedMetadataToM4a({ - required String m4aPath, - String? coverPath, - Map? metadata, - String artistTagMode = artistTagModeJoined, - bool preserveMetadata = true, - @visibleForTesting Future Function(List)? execute, - }) => FFmpegMetadata.embedMetadataToM4a( - m4aPath: m4aPath, - coverPath: coverPath, - metadata: metadata, - artistTagMode: artistTagMode, - preserveMetadata: preserveMetadata, - execute: execute, - ); - - /// Converts with metadata and cover preservation; lossless caps never upscale. - static Future convertAudioFormat({ - required String inputPath, - required String targetFormat, - required String bitrate, - required Map metadata, - String? coverPath, - String artistTagMode = artistTagModeJoined, - bool deleteOriginal = true, - int? sourceBitDepth, - LosslessConversionQuality losslessQuality = - const LosslessConversionQuality(), - LosslessConversionProcessing losslessProcessing = - const LosslessConversionProcessing(), - }) => FFmpegConversion.convertAudioFormat( - inputPath: inputPath, - targetFormat: targetFormat, - bitrate: bitrate, - metadata: metadata, - coverPath: coverPath, - artistTagMode: artistTagMode, - deleteOriginal: deleteOriginal, - sourceBitDepth: sourceBitDepth, - losslessQuality: losslessQuality, - losslessProcessing: losslessProcessing, - ); - - static Future?> splitCueToTracks({ - required String audioPath, - required String outputDir, - required List tracks, - required Map albumMetadata, - String? coverPath, - void Function(int current, int total)? onProgress, - }) => FFmpegConversion.splitCueToTracks( - audioPath: audioPath, - outputDir: outputDir, - tracks: tracks, - albumMetadata: albumMetadata, - coverPath: coverPath, - onProgress: onProgress, - ); -} diff --git a/lib/services/metadata_cover_resources.dart b/lib/services/metadata_cover_resources.dart index 0fe164d8b..8e227398d 100644 --- a/lib/services/metadata_cover_resources.dart +++ b/lib/services/metadata_cover_resources.dart @@ -1,7 +1,8 @@ import 'dart:io'; import 'dart:typed_data'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_metadata.dart'; +import 'package:mornye/services/ffmpeg_probe.dart'; import 'package:mornye/services/platform_bridge.dart'; import 'package:mornye/utils/logger.dart'; @@ -70,7 +71,7 @@ class MetadataCoverResources { Future readDetails(String path) async { try { - final dimensions = await FFmpegService.probeImageDimensions(path); + final dimensions = await FFmpegProbe.imageDimensions(path); if (dimensions == null) return null; return ( width: dimensions.width, @@ -164,7 +165,7 @@ class MetadataCoverResources { Future resize(String source, int maxDimension) { return _create('metadata_resized_cover_', 'cover.jpg', (path) async { - final resized = await FFmpegService.resizeCoverArt( + final resized = await FFmpegMetadata.resizeCoverArt( inputPath: source, outputPath: path, maxDimension: maxDimension, diff --git a/lib/services/metadata_persistence_service.dart b/lib/services/metadata_persistence_service.dart index 4a3858c54..5ac080bb5 100644 --- a/lib/services/metadata_persistence_service.dart +++ b/lib/services/metadata_persistence_service.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_metadata.dart'; import 'package:mornye/services/metadata_cover_resources.dart'; import 'package:mornye/services/platform_bridge.dart'; import 'package:mornye/utils/artist_utils.dart'; @@ -219,19 +219,19 @@ class MetadataPersistenceService { Map metadata, String artistTagMode, ) => switch (codec) { - MetadataSaveCodec.mp3 => FFmpegService.embedMetadataToMp3( + MetadataSaveCodec.mp3 => FFmpegMetadata.embedMetadataToMp3( mp3Path: path, coverPath: coverPath, metadata: metadata, preserveMetadata: true, ), - MetadataSaveCodec.m4a => FFmpegService.embedMetadataToM4a( + MetadataSaveCodec.m4a => FFmpegMetadata.embedMetadataToM4a( m4aPath: path, coverPath: coverPath, metadata: metadata, preserveMetadata: true, ), - MetadataSaveCodec.opus => FFmpegService.embedMetadataToOpus( + MetadataSaveCodec.opus => FFmpegMetadata.embedMetadataToOpus( opusPath: path, coverPath: coverPath, metadata: metadata, diff --git a/lib/services/motion_artwork_store.dart b/lib/services/motion_artwork_store.dart index f6b1023ae..9b8d2e7cc 100644 --- a/lib/services/motion_artwork_store.dart +++ b/lib/services/motion_artwork_store.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:crypto/crypto.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_probe.dart'; import 'package:mornye/services/ffmpeg_support.dart'; import 'package:mornye/services/motion_artwork_download.dart'; import 'package:mornye/services/motion_artwork_proxy.dart'; @@ -253,7 +253,7 @@ class MotionArtworkStore { output, ], timeout: const Duration(seconds: 60)); if (!success) return null; - final dimensions = await FFmpegService.probeImageDimensions(output); + final dimensions = await FFmpegProbe.imageDimensions(output); return dimensions == null ? null : dimensions.width / dimensions.height; } diff --git a/lib/services/playlist_cover_store.dart b/lib/services/playlist_cover_store.dart index 34bebedab..af330b188 100644 --- a/lib/services/playlist_cover_store.dart +++ b/lib/services/playlist_cover_store.dart @@ -3,7 +3,8 @@ import 'dart:io'; import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_metadata.dart'; +import 'package:mornye/services/ffmpeg_probe.dart'; import 'package:mornye/utils/file_access.dart'; const _playlistCoverMaxDimension = 1024; @@ -41,9 +42,7 @@ class PlaylistCoverStore { '.$playlistId.${DateTime.now().microsecondsSinceEpoch}.jpg', ); try { - final dimensions = await FFmpegService.probeImageDimensions( - sourceFilePath, - ); + final dimensions = await FFmpegProbe.imageDimensions(sourceFilePath); final longestEdge = dimensions == null ? _playlistCoverMaxDimension : (dimensions.width > dimensions.height @@ -53,7 +52,7 @@ class PlaylistCoverStore { .clamp(64, _playlistCoverMaxDimension) .toInt(); while (true) { - final resized = await FFmpegService.resizeCoverArt( + final resized = await FFmpegMetadata.resizeCoverArt( inputPath: sourceFilePath, outputPath: tempPath, maxDimension: targetDimension, @@ -87,7 +86,7 @@ class PlaylistCoverStore { await file.length() > _playlistCoverMaxStoredBytes) { return true; } - final dimensions = await FFmpegService.probeImageDimensions(path); + final dimensions = await FFmpegProbe.imageDimensions(path); return dimensions == null || dimensions.width > _playlistCoverMaxDimension || dimensions.height > _playlistCoverMaxDimension; diff --git a/lib/services/replaygain_service.dart b/lib/services/replaygain_service.dart index 2b19ee97e..3965f9eb2 100644 --- a/lib/services/replaygain_service.dart +++ b/lib/services/replaygain_service.dart @@ -1,7 +1,8 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_models.dart'; +import 'package:mornye/services/ffmpeg_replaygain.dart'; import 'package:mornye/services/music_player_service.dart'; import 'package:mornye/services/platform_bridge.dart'; import 'package:mornye/utils/file_access.dart'; @@ -67,7 +68,7 @@ class ReplayGainService { final written = await _updateFile(filePath, (workingPath) async { final rg = scan != null ? await scan(workingPath) - : await FFmpegService.scanReplayGain( + : await FFmpegReplayGain.scan( workingPath, onUnsupportedDecoder: onUnsupportedDecoder, ); @@ -162,8 +163,8 @@ class ReplayGainService { final lower = path.toLowerCase(); if (lower.endsWith('.opus') || lower.endsWith('.ogg')) return false; written = album - ? await FFmpegService.writeAlbumReplayGainTags(path, gain, peak) - : await FFmpegService.writeTrackReplayGainTags(path, gain, peak); + ? await FFmpegReplayGain.writeAlbumTags(path, gain, peak) + : await FFmpegReplayGain.writeTrackTags(path, gain, peak); } if (!written) return false; diff --git a/test/download_metadata_embedding_test.dart b/test/download_metadata_embedding_test.dart index 26cdae98c..6b56c3ef9 100644 --- a/test/download_metadata_embedding_test.dart +++ b/test/download_metadata_embedding_test.dart @@ -9,7 +9,7 @@ import 'package:mornye/models/metadata_separators.dart'; import 'package:mornye/models/track.dart'; import 'package:mornye/providers/extension_provider.dart'; import 'package:mornye/services/download_metadata_embedding.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_models.dart'; import 'package:mornye/utils/artist_utils.dart'; class EmbeddingHarness { diff --git a/test/ffmpeg_conversion_output_test.dart b/test/ffmpeg_conversion_output_test.dart index 292d91379..351c0d337 100644 --- a/test/ffmpeg_conversion_output_test.dart +++ b/test/ffmpeg_conversion_output_test.dart @@ -2,7 +2,8 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_conversion.dart'; +import 'package:mornye/services/ffmpeg_models.dart'; void main() { late Directory directory; @@ -26,7 +27,7 @@ void main() { final sibling = await File( '${directory.path}/Song "live".flac', ).writeAsString('existing'); - final result = await FFmpegService.convertM4aToFlac( + final result = await FFmpegConversion.convertM4aToFlac( source.path, sourceCodec: 'alac', execute: (arguments) async { @@ -44,7 +45,7 @@ void main() { test('failed conversion removes partial output and retains source', () async { final source = await input('Song.m4a'); - final result = await FFmpegService.convertM4aToFlac( + final result = await FFmpegConversion.convertM4aToFlac( source.path, sourceCodec: 'alac', execute: (arguments) async { @@ -66,7 +67,7 @@ void main() { (_) async => FFmpegResult(success: true, returnCode: 0, output: ''), ]) { expect( - await FFmpegService.convertM4aToFlac( + await FFmpegConversion.convertM4aToFlac( source.path, sourceCodec: 'alac', execute: execute, @@ -81,7 +82,7 @@ void main() { test('same-suffix conversion stages output until it is complete', () async { final source = await input('Song.flac'); - final result = await FFmpegService.convertM4aToFlac( + final result = await FFmpegConversion.convertM4aToFlac( source.path, sourceCodec: 'alac', execute: (arguments) async { @@ -108,12 +109,12 @@ void main() { } final results = await Future.wait([ - FFmpegService.convertM4aToFlac( + FFmpegConversion.convertM4aToFlac( first.path, sourceCodec: 'alac', execute: execute, ), - FFmpegService.convertM4aToFlac( + FFmpegConversion.convertM4aToFlac( second.path, sourceCodec: 'alac', execute: execute, @@ -129,7 +130,7 @@ void main() { () async { final source = await input('Song.m4a'); final commands = >[]; - final result = await FFmpegService.convertM4aToFlac( + final result = await FFmpegConversion.convertM4aToFlac( source.path, sourceCodec: 'flac', execute: (arguments) async { @@ -168,7 +169,7 @@ void main() { () async { final source = await input('Song.m4a'); var encoded = false; - final result = await FFmpegService.convertM4aToFlac( + final result = await FFmpegConversion.convertM4aToFlac( source.path, sourceCodec: 'flac', execute: (arguments) async { @@ -206,14 +207,16 @@ void main() { final sibling = await File( '${directory.path}/Song.flac', ).writeAsString('existing'); - final result = await FFmpegService.ensureNativeFlacExtension(source.path); + final result = await FFmpegConversion.ensureNativeFlacExtension( + source.path, + ); expect(result, '${directory.path}/Song (2).flac'); expect(await sibling.readAsString(), 'existing'); expect(await File(result).readAsString(), 'source'); - expect(await FFmpegService.ensureNativeFlacExtension(result), result); + expect(await FFmpegConversion.ensureNativeFlacExtension(result), result); final noSuffix = await input('Other'); expect( - await FFmpegService.ensureNativeFlacExtension(noSuffix.path), + await FFmpegConversion.ensureNativeFlacExtension(noSuffix.path), '${noSuffix.path}.flac', ); }, @@ -221,7 +224,9 @@ void main() { test('failed native rename releases its reserved destination', () async { await expectLater( - FFmpegService.ensureNativeFlacExtension('${directory.path}/missing.m4a'), + FFmpegConversion.ensureNativeFlacExtension( + '${directory.path}/missing.m4a', + ), throwsA(isA()), ); expect(await directory.list().length, 0); diff --git a/test/ffmpeg_cover_resize_test.dart b/test/ffmpeg_cover_resize_test.dart index 5a2a9fe33..1584102e8 100644 --- a/test/ffmpeg_cover_resize_test.dart +++ b/test/ffmpeg_cover_resize_test.dart @@ -1,9 +1,10 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_metadata.dart'; +import 'package:mornye/services/ffmpeg_probe.dart'; void main() { test('cover resize uses safe arguments and preserves aspect ratio', () { - final arguments = FFmpegService.buildCoverResizeArguments( + final arguments = FFmpegMetadata.buildCoverResizeArguments( inputPath: '/tmp/input cover.jpg', outputPath: '/tmp/output cover.jpg', maxDimension: 1500, @@ -23,7 +24,7 @@ void main() { test('cover resize rejects unreasonable dimensions', () { expect( - () => FFmpegService.buildCoverResizeArguments( + () => FFmpegMetadata.buildCoverResizeArguments( inputPath: 'input.jpg', outputPath: 'output.jpg', maxDimension: 0, @@ -34,19 +35,16 @@ void main() { test('cover dimensions require positive width and height', () { expect( - FFmpegService.imageDimensionsFromProperties({ + FFmpegProbe.imageDimensionsFromProperties({ 'width': '1900', 'height': 1500, }), (width: 1900, height: 1500), ); expect( - FFmpegService.imageDimensionsFromProperties({'width': 0, 'height': 1500}), - isNull, - ); - expect( - FFmpegService.imageDimensionsFromProperties({'width': 1500}), + FFmpegProbe.imageDimensionsFromProperties({'width': 0, 'height': 1500}), isNull, ); + expect(FFmpegProbe.imageDimensionsFromProperties({'width': 1500}), isNull); }); } diff --git a/test/ffmpeg_lossy_conversion_test.dart b/test/ffmpeg_lossy_conversion_test.dart index b31b664d3..89ba81e1f 100644 --- a/test/ffmpeg_lossy_conversion_test.dart +++ b/test/ffmpeg_lossy_conversion_test.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mornye/services/ffmpeg_desktop.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_conversion.dart'; import 'package:mornye/utils/desktop_platform.dart'; Map _itunesAtoms(Uint8List file) { @@ -112,7 +112,7 @@ void main() { final sibling = File('${directory.path}/Song "live".$extension'); await sibling.writeAsString('existing file'); - final converted = await FFmpegService.convertAudioFormat( + final converted = await FFmpegConversion.convertAudioFormat( inputPath: path, targetFormat: format, bitrate: '128k', @@ -165,7 +165,7 @@ void main() { artist, metadata: explicitTags ? const {} : metadata, ); - final converted = await FFmpegService.convertAudioFormat( + final converted = await FFmpegConversion.convertAudioFormat( inputPath: path, targetFormat: 'aac', bitrate: '256k', @@ -194,7 +194,7 @@ void main() { final path = '${directory.path}/Invalid.flac'; await File(path).writeAsString('invalid audio'); - final converted = await FFmpegService.convertAudioFormat( + final converted = await FFmpegConversion.convertAudioFormat( inputPath: path, targetFormat: 'aac', bitrate: '256k', diff --git a/test/ffmpeg_m4a_metadata_test.dart b/test/ffmpeg_m4a_metadata_test.dart index 972bc7061..2737a3a1f 100644 --- a/test/ffmpeg_m4a_metadata_test.dart +++ b/test/ffmpeg_m4a_metadata_test.dart @@ -3,7 +3,8 @@ import 'dart:io'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_metadata.dart'; +import 'package:mornye/services/ffmpeg_models.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -93,7 +94,7 @@ void main() { var calls = 0; expect( - await FFmpegService.embedMetadataToM4a( + await FFmpegMetadata.embedMetadataToM4a( m4aPath: input.path, execute: (arguments) async { calls++; @@ -118,7 +119,7 @@ void main() { var calls = 0; String? outputPath; - final result = await FFmpegService.embedMetadataToM4a( + final result = await FFmpegMetadata.embedMetadataToM4a( m4aPath: input.path, execute: (arguments) async { calls++; @@ -166,7 +167,7 @@ void main() { String? outputPath; expect( - await FFmpegService.embedMetadataToM4a( + await FFmpegMetadata.embedMetadataToM4a( m4aPath: input.path, execute: (arguments) async { calls++; @@ -260,7 +261,7 @@ void main() { final beforeHash = await streamHash(path, '0:a:0'); var calls = 0; expect( - await FFmpegService.embedMetadataToM4a( + await FFmpegMetadata.embedMetadataToM4a( m4aPath: path, coverPath: replacementCover ?? diff --git a/test/ffmpeg_opus_metadata_test.dart b/test/ffmpeg_opus_metadata_test.dart index f6ce05854..476256b32 100644 --- a/test/ffmpeg_opus_metadata_test.dart +++ b/test/ffmpeg_opus_metadata_test.dart @@ -3,7 +3,8 @@ import 'dart:io'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_metadata.dart'; +import 'package:mornye/services/ffmpeg_models.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); @@ -118,7 +119,7 @@ void main() { List? pictureBytes; expect( - await FFmpegService.embedMetadataToOpus( + await FFmpegMetadata.embedMetadataToOpus( opusPath: opusPath, coverPath: coverFile.path, execute: (arguments) async { @@ -218,7 +219,7 @@ void main() { ); } expect( - await FFmpegService.embedMetadataToOpus( + await FFmpegMetadata.embedMetadataToOpus( opusPath: path, coverPath: coverPath, metadata: scenario.metadata, diff --git a/test/ffmpeg_replaygain_scan_test.dart b/test/ffmpeg_replaygain_scan_test.dart index af867d5c7..933d702b7 100644 --- a/test/ffmpeg_replaygain_scan_test.dart +++ b/test/ffmpeg_replaygain_scan_test.dart @@ -1,10 +1,11 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_models.dart'; +import 'package:mornye/services/ffmpeg_replaygain.dart'; void main() { test('missing decoder reports unsupported and rejects a default summary', () { var unsupported = false; - final result = FFmpegService.parseReplayGainScan( + final result = FFmpegReplayGain.parseScan( FFmpegResult( success: false, returnCode: 1, @@ -20,7 +21,7 @@ void main() { test('failed decoding cannot use a partial loudness measurement', () { var unsupported = false; - final result = FFmpegService.parseReplayGainScan( + final result = FFmpegReplayGain.parseScan( FFmpegResult( success: false, returnCode: 1, @@ -35,7 +36,7 @@ void main() { }); test('completed analysis uses the final summary and highest peak', () { - final result = FFmpegService.parseReplayGainScan( + final result = FFmpegReplayGain.parseScan( FFmpegResult( success: true, returnCode: 0, diff --git a/test/replaygain_service_test.dart b/test/replaygain_service_test.dart index 1693b6fe0..b10823d92 100644 --- a/test/replaygain_service_test.dart +++ b/test/replaygain_service_test.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:mornye/services/ffmpeg_service.dart'; +import 'package:mornye/services/ffmpeg_models.dart'; import 'package:mornye/services/replaygain_service.dart'; void main() {