From 91bf49434d3ecb265f2b6a88ba26383bef452480 Mon Sep 17 00:00:00 2001 From: N00MKRAD Date: Sun, 25 Apr 2021 21:12:45 +0200 Subject: [PATCH] Logging improvements --- Code/Form1.cs | 2 +- Code/IO/Logger.cs | 12 ++++++++++-- Code/OS/AiProcess.cs | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Code/Form1.cs b/Code/Form1.cs index c419906..c8430d6 100644 --- a/Code/Form1.cs +++ b/Code/Form1.cs @@ -382,7 +382,7 @@ namespace Flowframes else { SetTab("interpolation"); - Logger.Log("Selected video/directory: " + Path.GetFileName(files[0])); + Logger.Log("Selected video/directory: " + Path.GetFileName(files[0]), true); inputTbox.Text = files[0]; bool resume = (IOUtils.GetAmountOfFiles(Path.Combine(files[0], Paths.resumeDir), true) > 0); diff --git a/Code/IO/Logger.cs b/Code/IO/Logger.cs index e1d671d..07040bb 100644 --- a/Code/IO/Logger.cs +++ b/Code/IO/Logger.cs @@ -30,7 +30,8 @@ namespace Flowframes if (replaceLastLine) { textbox.Suspend(); - textbox.Text = textbox.Text.Remove(textbox.Text.LastIndexOf(Environment.NewLine)); + string[] lines = textbox.Text.SplitIntoLines(); + textbox.Text = string.Join(Environment.NewLine, lines.Take(lines.Count() - 1).ToArray()); } } catch { } @@ -40,7 +41,14 @@ namespace Flowframes if (!hidden && textbox != null) textbox.AppendText((textbox.Text.Length > 1 ? Environment.NewLine : "") + s); - textbox.Resume(); + if (replaceLastLine) + { + textbox.Resume(); + s = "[REPL] " + s; + } + + if (!hidden) + s = "[UI] " + s; LogToFile(s, false, filename); } diff --git a/Code/OS/AiProcess.cs b/Code/OS/AiProcess.cs index 980c8e2..385eae1 100644 --- a/Code/OS/AiProcess.cs +++ b/Code/OS/AiProcess.cs @@ -413,7 +413,7 @@ namespace Flowframes return; } - Logger.LogToFile(line, false, logFilename); + Logger.Log(line, true, false, logFilename); if (line.Contains("ff:nocuda-cpu")) Logger.Log("WARNING: CUDA-capable GPU device is not available, running on CPU instead!");