Better mkvmerge logging

Author: n00mkrad

ff-utils-winforms/IO/Logger.cs

@@ -19,6 +19,8 @@ class Logger
         public const string defaultLogName = "sessionlog";
         public static long id;
 
+        public static string LastLine { get { return GetLastLine(); } }
+
         public struct LogEntry
         {
             public string logMessage;
@@ -147,11 +149,13 @@ public static void ClearLogBox()
             textbox.Text = "";
         }
 
-        public static string GetLastLine()
+        private static string GetLastLine()
         {
             string[] lines = textbox.Text.SplitIntoLines();
+
             if (lines.Length < 1)
                 return "";
+
             return lines.Last();
         }
 

ff-utils-winforms/Media/Av1anOutputHandler.cs

@@ -97,7 +97,7 @@ public static async Task ParseProgressLoop()
 
                     string etaStr = encodedChunks > workers ? $" ETA: <{FormatUtils.Time(new TimeSpan(0, 0, etaSecs), false)}" : "";
 
-                    Logger.Log($"AV1AN is running - Encoded {encodedChunks}/{currentQueueSize} chunks ({ratio}%).{etaStr}", false, Logger.GetLastLine().Contains("Encoded"));
+                    Logger.Log($"AV1AN is running - Encoded {encodedChunks}/{currentQueueSize} chunks ({ratio}%).{etaStr}", false, Logger.LastLine.Contains("Encoded"));
 
                     for (int i = 100; i > 0; i--)
                     {

ff-utils-winforms/Media/AvProcess.cs

@@ -274,8 +274,17 @@ public static async Task<string> RunMkvMerge(string args, bool log = false)
 
                 Logger.Log($"mkvmerge {args}", true, false, "mkvmerge");
 
-                mkvm.OutputDataReceived += (sender, outLine) => { processOutput += Environment.NewLine + outLine.Data; Logger.Log($"[mkvmerge] {outLine.Data}", !log, false, "mkvmerge"); };
-                mkvm.ErrorDataReceived += (sender, outLine) => { processOutput += Environment.NewLine + outLine.Data; };
+                mkvm.OutputDataReceived += (sender, outLine) => {
+                    string s = (outLine != null && outLine.Data != null) ? outLine.Data : "";
+                    processOutput += Environment.NewLine + s;
+                    Logger.Log($"[mkvmerge] {s}", !log || s.Trim().Length < 1, Logger.LastLine.Trim().EndsWith("%"), "mkvmerge");
+                };
+
+                mkvm.ErrorDataReceived += (sender, outLine) => {
+                    string s = (outLine != null && outLine.Data != null) ? outLine.Data : "";
+                    processOutput += Environment.NewLine + s;
+                    Logger.Log($"[mkvmerge] [E] {s}", !log || s.Trim().Length < 1, false, "mkvmerge");
+                };
 
                 mkvm.Start();
                 mkvm.PriorityClass = ProcessPriorityClass.BelowNormal;

ff-utils-winforms/Media/FfmpegCommands.cs

@@ -39,7 +39,7 @@ public static async Task ConcatVideos(string concatFile, string outPath, int loo
             Logger.Log($"ConcatVideos('{Path.GetFileName(concatFile)}', '{outPath}', {looptimes})", true, false, "ffmpeg");
 
             if(showLog)
-                Logger.Log($"Merging videos...", false, Logger.GetLastLine().Contains("frame"));
+                Logger.Log($"Merging videos...", false, Logger.LastLine.Contains("frame"));
 
             IoUtils.RenameExistingFile(outPath);
             string loopStr = (looptimes > 0) ? $"-stream_loop {looptimes}" : "";

ff-utils-winforms/Media/FfmpegUtils.cs

@@ -203,7 +203,7 @@ public static async Task<string> GetCurrentAutoCrop(string path, bool quiet)
             string chosen = commonCertainty > 85 ? mostCommon : largest; // Use most common if it's >85% common, otherwise use largest to be safe (thanks Nolan)
             Logger.Log($"GetCurrentAutoCrop - Largest: {largest} - Smallest: {detectedCrops.Last()} - Most Common: {mostCommon} ({commonCertainty}%) - Chosen: {chosen} [T = {sw}]", true);
             string[] cropVals = chosen.Split(':');
-            bool repl = Logger.GetLastLine().Contains(msg);
+            bool repl = Logger.LastLine.Contains(msg);
             Logger.Log($"Automatically detected crop: {cropVals[0]}x{cropVals[1]} (X = {cropVals[2]}, Y = {cropVals[3]})", quiet, !quiet && repl);
 
             return $"crop={chosen}";

ff-utils-winforms/Media/OcrProcess.cs

@@ -96,7 +96,7 @@ public static void LogOutput(string line, bool hidden, bool trackProg, string ar
 
                 if (!hidden)
                 {
-                    Logger.Log($"Running Optical Character Recognition: {percent}%", false, Logger.GetLastLine().EndsWith("%"));
+                    Logger.Log($"Running Optical Character Recognition: {percent}%", false, Logger.LastLine.EndsWith("%"));
                     Program.mainForm.SetProgress(percent);
                 }
 

ff-utils-winforms/Media/OcrUtils.cs

@@ -52,7 +52,7 @@ public static async Task<bool> RunOcrOnStreams(string inPath, List<SubtitleStrea
                     int progSum = progressTracker.Select(x => x.Value).Sum();
                     int avgProg = ((float)progSum / progressTracker.Count).RoundToInt();
                     int running = progressTracker.Where(x => x.Value < 100).Count();
-                    Logger.Log($"Running {running} OCR Instances - Average Progress: {avgProg}%", false, Logger.GetLastLine().EndsWith("%"));
+                    Logger.Log($"Running {running} OCR Instances - Average Progress: {avgProg}%", false, Logger.LastLine.EndsWith("%"));
                     Program.mainForm.SetProgress(avgProg);
 
                     if (RunTask.canceled)
@@ -62,7 +62,7 @@ public static async Task<bool> RunOcrOnStreams(string inPath, List<SubtitleStrea
                 await Task.Delay(100);
             }
 
-            Logger.Log($"All OCR processes have finished.", false, Logger.GetLastLine().EndsWith("%"));
+            Logger.Log($"All OCR processes have finished.", false, Logger.LastLine.EndsWith("%"));
 
             return true;
         }
@@ -169,7 +169,7 @@ static void PostprocessAndMove(FileInfo file, int subIndex, SubtitleStream ss, s
         //                int progSum = progressTracker.Select(x => x.Value).Sum();
         //                int avgProg = ((float)progSum / progressTracker.Count).RoundToInt();
         //                int running = progressTracker.Where(x => x.Value < 100).Count();
-        //                Logger.Log($"Running {running} OCR Instances - Progress: {avgProg}%", false, Logger.GetLastLine().EndsWith("%"));
+        //                Logger.Log($"Running {running} OCR Instances - Progress: {avgProg}%", false, Logger.LastLine.EndsWith("%"));
         //                Program.mainForm.SetProgress(avgProg);
         //
         //                if (RunTask.canceled || progressTracker.All(x => x.Value == 100))
@@ -180,7 +180,7 @@ static void PostprocessAndMove(FileInfo file, int subIndex, SubtitleStream ss, s
         //        }
         //
         //        double speed = ((double)mediaFile.DurationMs / sw.ElapsedMs);
-        //        Logger.Log($"Finished OCR conversion in {sw} ({speed.ToString("0.0")}x Realtime).", false, Logger.GetLastLine().EndsWith("%"));
+        //        Logger.Log($"Finished OCR conversion in {sw} ({speed.ToString("0.0")}x Realtime).", false, Logger.LastLine.EndsWith("%"));
         //
         //        if (RunTask.canceled)
         //            return false;

ff-utils-winforms/UI/Tasks/UtilGetMetrics.cs

@@ -116,7 +116,7 @@ public static async Task Run(bool fixRate = true)
 
         static bool ReplaceLastLine ()
         {
-            return (new[] { "...", FfmpegOutputHandler.prefix }).Any(c => Logger.GetLastLine().Contains(c));
+            return (new[] { "...", FfmpegOutputHandler.prefix }).Any(c => Logger.LastLine.Contains(c));
         }
 
         private static async Task<string> GetAlignFilters ()