From 583949b6865e46956387add144fbd267cca04bda Mon Sep 17 00:00:00 2001 From: jscampucci Date: Thu, 15 Aug 2024 15:35:55 +0200 Subject: [PATCH] [log] clean ffmpeg logging --- lib/dlForm/cubit/dl_form_cubit.dart | 4 +++- lib/services/converter.dart | 4 ++-- lib/services/download.dart | 18 ++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/dlForm/cubit/dl_form_cubit.dart b/lib/dlForm/cubit/dl_form_cubit.dart index 3fd26a9..311077f 100644 --- a/lib/dlForm/cubit/dl_form_cubit.dart +++ b/lib/dlForm/cubit/dl_form_cubit.dart @@ -6,6 +6,8 @@ import 'package:notube/constants.dart'; import 'package:notube/models/video.dart'; import 'package:notube/services/download.dart'; +import 'package:notube/services/file_logger.dart'; + part 'dl_form_state.dart'; class DlFormCubit extends Cubit { @@ -17,7 +19,7 @@ class DlFormCubit extends Cubit { emit(state.copyWith( format: newFormat, )); - print(newFormat); + FileLogger().e(newFormat.format); } void setUrl(String newUrl) { diff --git a/lib/services/converter.dart b/lib/services/converter.dart index b481fa0..d09879a 100644 --- a/lib/services/converter.dart +++ b/lib/services/converter.dart @@ -38,11 +38,11 @@ class ConverterService { try { var result = await Process.run(ffmpegPath, ['-version']); if (result.exitCode == 0) { - print('FFmpeg is installed.'); + FileLogger().d('FFmpeg is installed.'); return; } } catch (e) { - print('FFmpeg is not installed.'); + FileLogger().d('FFmpeg is not installed.'); } } diff --git a/lib/services/download.dart b/lib/services/download.dart index 28ef51a..3daf1d0 100644 --- a/lib/services/download.dart +++ b/lib/services/download.dart @@ -79,7 +79,7 @@ class DLServices { var completer = Completer(); try { shell.run(cmd).then((result) { - print('FFmpeg is already installed.'); + FileLogger().d('FFmpeg is already installed.'); completer.complete(true); result.map((e) { FileLogger().d('Analyse result: $e'); @@ -99,19 +99,17 @@ class DLServices { } Future checkFFmpeg() async { - var result = await futureShell('ffmpeg -version'); - FileLogger().d('$result'); - try { var result = await Process.run('ffmpeg', ['-version']); + FileLogger().d('$result'); if (result.exitCode == 0) { - print('FFmpeg is already installed.'); + FileLogger().d('FFmpeg is already installed.'); return; } FileLogger().d('RESULTS: $result'); - print('Installing FFmpeg...'); + FileLogger().d('Installing FFmpeg...'); if (Platform.isLinux) { result = await Process.run('sudo', ['-n', 'true']); bool hasSudo = result.exitCode == 0; @@ -119,12 +117,12 @@ class DLServices { result = await Process.run('sudo', ['apt-get', 'install', 'ffmpeg', '-y']); } else { - print('Cannot install FFmpeg without sudo privileges.'); + FileLogger().d('Cannot install FFmpeg without sudo privileges.'); } if (result.exitCode == 0) { - print('FFmpeg installed successfully.'); + FileLogger().d('FFmpeg installed successfully.'); } else { - print('Error installing FFmpeg: ${result.stderr}'); + FileLogger().d('Error installing FFmpeg: ${result.stderr}'); } } else if (Platform.isMacOS) { result = await Process.run('brew', ['install', 'ffmpeg']); @@ -137,7 +135,7 @@ class DLServices { ]); } } catch (e) { - print('An error occurred: $e'); + FileLogger().e('An error occurred: $e'); } }