From 5aa3214ce508dd47d268946c2ffb8dc938420b14 Mon Sep 17 00:00:00 2001
From: glax <johanna@bernloehr.eu>
Date: Mon, 22 May 2023 21:37:02 +0200
Subject: [PATCH] TrangaTask.ToString() rewrite for logs-readability.
 LogMessages only include class-name without path

---
 Logging/LoggerBase.cs    | 2 +-
 Tranga-CLI/Tranga_Cli.cs | 8 ++++++--
 Tranga/TrangaTask.cs     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Logging/LoggerBase.cs b/Logging/LoggerBase.cs
index 0fb1b62..8e8a72a 100644
--- a/Logging/LoggerBase.cs
+++ b/Logging/LoggerBase.cs
@@ -52,7 +52,7 @@ public abstract class LoggerBase : TextWriter
         public override string ToString()
         {
             string dateTimeString = $"{logTime.ToShortDateString()} {logTime.ToLongTimeString()}";
-            return $"[{dateTimeString}] {caller,30} | {value}";
+            return $"[{dateTimeString}] {caller.Split(new char[]{'.','+'}).Last(),15} | {value}";
         }
     }
 }
\ No newline at end of file
diff --git a/Tranga-CLI/Tranga_Cli.cs b/Tranga-CLI/Tranga_Cli.cs
index 480c9c7..94c3c92 100644
--- a/Tranga-CLI/Tranga_Cli.cs
+++ b/Tranga-CLI/Tranga_Cli.cs
@@ -209,8 +209,12 @@ public static class Tranga_Cli
             $"{"",-5}{"Task",-20} | {"Last Executed",-20} | {"Reoccurrence",-12} | {"State",-10} | {"Connector",-15} | Publication/Manga";
         Console.WriteLine(header);
         Console.WriteLine(new string('-', header.Length));
-        foreach(TrangaTask trangaTask in tasks)
-            Console.WriteLine($"{tIndex++:000}: {trangaTask}");
+        foreach (TrangaTask trangaTask in tasks)
+        {
+            string[] taskSplit = trangaTask.ToString().Split(", ");
+            Console.WriteLine($"{tIndex++:000}: {taskSplit[0],-20} | {taskSplit[1],-20} | {taskSplit[2],-12} | {taskSplit[3],-10} | {(taskSplit.Length > 4 ? taskSplit[4] : ""),-15} | {(taskSplit.Length > 5 ? taskSplit[5] : "")}");
+        }
+            
     }
 
     private static TrangaTask? SelectTask(TrangaTask[] tasks, Logger logger)
diff --git a/Tranga/TrangaTask.cs b/Tranga/TrangaTask.cs
index d8b7788..7aec2d8 100644
--- a/Tranga/TrangaTask.cs
+++ b/Tranga/TrangaTask.cs
@@ -56,6 +56,6 @@ public class TrangaTask
 
     public override string ToString()
     {
-        return $"{task,-20} | {lastExecuted,-20} | {reoccurrence,-12} | {state,-10} | {connectorName,-15} | {publication?.sortName}";
+        return $"{task}, {lastExecuted}, {reoccurrence}, {state} {(connectorName is not null ? $", {connectorName}" : "" )} {(publication is not null ? $", {publication?.sortName}": "")}";
     }
 }
\ No newline at end of file