Simpler trace output files

Author: benbierens

Tools/TraceContract/Output.cs

@@ -1,5 +1,4 @@
-using System.IO.Compression;
-using System.Numerics;
+using System.Numerics;
 using CodexContractsPlugin.ChainMonitor;
 using CodexContractsPlugin.Marketplace;
 using Logging;
@@ -24,18 +23,16 @@ public Entry(DateTime utc, string msg)
         private readonly ILog log;
         private readonly List<Entry> entries = new();
         private readonly string folder;
-        private readonly List<string> files = new();
         private readonly Input input;
         private readonly Config config;
 
         public Output(ILog log, Input input, Config config)
         {
-            folder = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+            folder = config.GetOuputFolder();
             Directory.CreateDirectory(folder);
 
             var filename = Path.Combine(folder, $"contract_{input.PurchaseId}");
             var fileLog = new FileLog(filename);
-            files.Add(fileLog.FullFilename + ".log");
             foreach (var pair in config.LogReplacements)
             {
                 fileLog.AddStringReplace(pair.Key, pair.Value);
@@ -101,9 +98,14 @@ public void WriteContractEvents()
 
         public LogFile CreateNodeLogTargetFile(string node)
         {
-            var file = log.CreateSubfile(node);
-            files.Add(file.Filename);
-            return file;
+            return log.CreateSubfile(node);
+        }
+
+        public void ShowOutputFiles(ILog console)
+        {
+            console.Log("Files in output folder:");
+            var files = Directory.GetFiles(folder);
+            foreach (var file in files) console.Log(file);
         }
 
         private void Write(Entry e)
@@ -116,16 +118,6 @@ private void LogReserveSlotCall(ReserveSlotFunction call)
             Add(call.Block.Utc, $"Reserve-slot called. Index: {call.SlotIndex} Host: '{call.FromAddress}'");
         }
 
-        public string Package()
-        {
-            var outputFolder = config.GetOuputFolder();
-            Directory.CreateDirectory(outputFolder);
-            var filename = Path.Combine(outputFolder, $"contract_{input.PurchaseId}.zip");
-
-            ZipFile.CreateFromDirectory(folder, filename);
-            return filename;
-        }
-
         private void Add(DateTime utc, string msg)
         {
             entries.Add(new Entry(utc, msg));

Tools/TraceContract/Program.cs

@@ -55,9 +55,7 @@ private void TracePurchase()
             Log("Downloading storage nodes logs for the request timerange...");
             DownloadStorageNodeLogs(requestTimeRange, entryPoint.Tools);
 
-            Log("Packaging...");
-            var zipFilename = output.Package();
-            Log($"Saved to '{zipFilename}'");
+            output.ShowOutputFiles(log);
 
             entryPoint.Decommission(false, false, false);
             Log("Done");