Fixing some logging issues.

Added debugging every time we execute an external program.
maxpiva · Nov 29, 2023 · 999611d · 999611d
1 parent 4a647ae
commit 999611d
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/Sushi.Net.Library/Sushi.Net.Library.csproj b/Sushi.Net.Library/Sushi.Net.Library.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <Authors>Máximo Piva</Authors>
     <Company />
     <Product />
@@ -17,8 +17,8 @@ Or it can shift in chunks a foreign/original audio stream to match another forei
     <PackageIcon>sushi.png</PackageIcon>
     <RepositoryUrl>https://github.com/maxpiva/Sushi.Net</RepositoryUrl>
     <PackageTags>.net sushi subtitle audio shifter</PackageTags>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.0.0.0</FileVersion>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
+    <FileVersion>1.0.1.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/Sushi.Net.Library/Tools/FFMpeg.cs b/Sushi.Net.Library/Tools/FFMpeg.cs
@@ -180,7 +180,7 @@ public async Task ShiftAudioAsync(Decoding.AudioMedia stream, string path, List<
           catch(Exception e)
 
           {
-                _logger.LogDebug("Exception Error: "+e.ToString(),e);
+                _logger.LogError("Exception Error: "+e.ToString(),e);
                 throw new SushiException("Couldn't invoke ffmpeg, check that it's installed");
           }
       }
@@ -252,9 +252,10 @@ public async Task ShiftAudioAsync(AudioMedia stream, string path, List<Split> sp
                 Command cmd = Command.WithArguments(arguments);
                 await ExecuteAsync(cmd,true,new FFMpegPercentageProcessor()).ConfigureAwait(false);
             }
-            catch
+            catch(Exception e)
 
             {
+                _logger.LogError("Exception Error: " + e.ToString(), e);
                 throw new SushiException("Couldn't invoke ffmpeg, check that it's installed");
             }
         }
@@ -372,8 +373,9 @@ public async Task DeMux(Mux mux)
                 }
 
             }
-            catch
+            catch(Exception e)
             {
+                _logger.LogError("Exception Error: " + e.ToString(), e);
                 throw new SushiException("Couldn't invoke ffmpeg, check that it's installed");
             }
         }

diff --git a/Sushi.Net.Library/Tools/FFProbe.cs b/Sushi.Net.Library/Tools/FFProbe.cs
@@ -47,7 +47,7 @@ public async Task PopulateMediaInfoAsync(Mux r, string file)
             }
             catch (Exception e)
             {
-                Console.WriteLine(e);
+                _logger.LogError("Error getting media information. Exception: "+e);
                 throw;
             }
             if (b.chapters != null && b.chapters.Count > 0)

diff --git a/Sushi.Net.Library/Tools/SCXviD.cs b/Sushi.Net.Library/Tools/SCXviD.cs
@@ -30,6 +30,7 @@ public async Task MakeKeyframes(string video_path, string log_path)
             _ffmpeg.CheckIfRequired(false);
             _logger.LogInformation($"Generating keyframes for {video_path}...");
             Command ffmpeg = _ffmpeg.Command.WithArguments("-i " + video_path.Quote() + " -f yuv4mpegpipe -vf scale=640:360 -pix_fmt yuv420p -vsync drop -").WithStandardErrorPipe(PipeTarget.ToStringBuilder(bld));
+            _logger.LogDebug("CMD: " + ffmpeg.ToString());
             IPercentageProcessor p = new FFMpeg.FFMpegPercentageProcessor();
             IProgress<int> pro = CreateProgress(p);
             ffmpeg = AddStandardErrorLogging(ffmpeg, p,pro);

diff --git a/Sushi.Net.Library/Tools/Tool.cs b/Sushi.Net.Library/Tools/Tool.cs
@@ -61,6 +61,7 @@ public async Task<string> ExecuteAsync(Command cmd, bool useStdError=true, IPerc
         {
             try
             {
+                _logger.LogDebug("CMD: "+cmd.ToString());
                 IProgress<int> pro = CreateProgress(percentageProcessor);
                 return await cmd.WithLogger(_logger, _cancellation.GetToken(), useStdError,percentageProcessor, pro, enc).ConfigureAwait(false);
             }

diff --git a/Sushi.Net/ConsoleFormatter/SushiFormatter.cs b/Sushi.Net/ConsoleFormatter/SushiFormatter.cs
@@ -48,6 +48,8 @@ public override void Write<TState>(in LogEntry<TState> logEntry, IExternalScopeP
                 return;
             }
 
+            if (string.IsNullOrEmpty(message))
+                return;
             string nline = firstwrite ? "" : "\n";
             if (message == nline)
             {

diff --git a/Sushi.Net/Sushi.Net.csproj b/Sushi.Net/Sushi.Net.csproj
@@ -10,15 +10,15 @@
     <PackageProjectUrl>https://github.com/maxpiva/Sushi.Net</PackageProjectUrl>
     <RepositoryUrl>https://github.com/maxpiva/Sushi.Net</RepositoryUrl>
     <PackageTags>.net sushi subtitle audio shifter</PackageTags>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <FileVersion>1.0.0.0</FileVersion>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
+    <FileVersion>1.0.1.0</FileVersion>
     <Description>Sushi.Net Library
 Automatic Subtitle &amp; Audio Shifter
 It can shift subtitles based on two different audio streams using pattern matching.
 Or it can shift in chunks a foreign/original audio stream to match another foreign/original audio stream using the ambience sound pattern matching.</Description>
     <Copyright>Copyright © 2023 Máximo Piva</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 try
                 {
+                    _logger.LogDebug("CMD: "+cmd.ToString());
                     IProgress<int> pro = CreateProgress(percentageProcessor);
                     return await cmd.WithLogger(_logger, _cancellation.GetToken(), useStdError,percentageProcessor, pro, enc).ConfigureAwait(false);
                 }
@@ Expand Down @@