From 238ac391758ea5037e109f4f6dde8a99acedd683 Mon Sep 17 00:00:00 2001 From: Dimitar Byalkov Date: Mon, 12 Jul 2021 17:35:55 +0300 Subject: [PATCH] Conforming stdout and stderr messages --- .../BoerseDataConvert/Controller/RecordController.cs | 8 ++++---- BoerseDataConvert/BoerseDataConvert/Model/Params.cs | 1 - .../BoerseDataConvert/Model/WarningStat.cs | 6 +++--- BoerseDataConvert/BoerseDataConvert/Views/Program.cs | 2 +- BoerseDataConvert/BoerseDataConvert/Views/Reader.cs | 12 ++++++------ 5 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 BoerseDataConvert/BoerseDataConvert/Model/Params.cs diff --git a/BoerseDataConvert/BoerseDataConvert/Controller/RecordController.cs b/BoerseDataConvert/BoerseDataConvert/Controller/RecordController.cs index 08f4f2a..aafbe29 100644 --- a/BoerseDataConvert/BoerseDataConvert/Controller/RecordController.cs +++ b/BoerseDataConvert/BoerseDataConvert/Controller/RecordController.cs @@ -41,7 +41,7 @@ namespace BoerseDataConvert warning = new WarningStat(fileName); cur_fileName = fileName.Split('.').First(); count = 1; - Console.WriteLine(cur_fileName + " start"); + Console.WriteLine($"INFO: Converting {cur_fileName}"); XmlWriterSettings settings = new XmlWriterSettings(); settings.Indent = true; settings.CheckCharacters = false; @@ -89,7 +89,7 @@ namespace BoerseDataConvert { if (tagsTable.CheckStringLengthToBig(tag, value.Length)) { - Console.WriteLine($"WARN: Too long value \"{tag}\", \"{value}\", max allowed \"{tagsTable.GetTagName(tag)}\", {cur_fileName} line {count + 1}"); + Console.Error.WriteLine($"WARN: Too long value \"{tag}\", \"{value}\", max allowed \"{tagsTable.GetTagName(tag)}\", {cur_fileName} line {count + 1}"); return null; } } @@ -102,7 +102,7 @@ namespace BoerseDataConvert } catch (FormatException) { - Console.WriteLine($"WARN: Value is not in a valid format for number \"{tag}\", \"{value}\", {cur_fileName} line {count + 1}"); + Console.Error.WriteLine($"WARN: Value is not in a valid format for number \"{tag}\", \"{value}\", {cur_fileName} line {count + 1}"); return null; } } @@ -111,7 +111,7 @@ namespace BoerseDataConvert { if (!tagsTable.CheckValidValue(tag, value)) { - Console.WriteLine($"WARN: Value not in range \"{tag}\", \"{value}\", {cur_fileName} line {count + 1}"); + Console.Error.WriteLine($"WARN: Value not in range \"{tag}\", \"{value}\", {cur_fileName} line {count + 1}"); return null; } } diff --git a/BoerseDataConvert/BoerseDataConvert/Model/Params.cs b/BoerseDataConvert/BoerseDataConvert/Model/Params.cs deleted file mode 100644 index 5f28270..0000000 --- a/BoerseDataConvert/BoerseDataConvert/Model/Params.cs +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/BoerseDataConvert/BoerseDataConvert/Model/WarningStat.cs b/BoerseDataConvert/BoerseDataConvert/Model/WarningStat.cs index 81a4e40..6aa5cba 100644 --- a/BoerseDataConvert/BoerseDataConvert/Model/WarningStat.cs +++ b/BoerseDataConvert/BoerseDataConvert/Model/WarningStat.cs @@ -30,16 +30,16 @@ namespace BoerseDataConvert { if (tableWarnings.Count == 0) { - Console.WriteLine($"There is no warnings in file {curFile}"); + Console.WriteLine($"INFO: No warnings in {curFile}"); } else { - Console.WriteLine($"Warnings in file {curFile}"); + Console.WriteLine($"INFO: Warnings in {curFile}"); foreach (var warning in tableWarnings) { int tag = warning.Key; int count = warning.Value; - Console.WriteLine($"Invalid tag \"{tag}\": {count} times."); + Console.WriteLine($"INFO: Invalid tag \"{tag}\": {count} times."); } } } diff --git a/BoerseDataConvert/BoerseDataConvert/Views/Program.cs b/BoerseDataConvert/BoerseDataConvert/Views/Program.cs index e3fe694..a45b1c5 100644 --- a/BoerseDataConvert/BoerseDataConvert/Views/Program.cs +++ b/BoerseDataConvert/BoerseDataConvert/Views/Program.cs @@ -88,7 +88,7 @@ namespace BoerseDataConvert break; } } - Console.WriteLine("INFO: Success, exiting"); + Console.WriteLine("INFO: Successful conversion, exiting"); Environment.Exit(0); } static void CheckFreeDisk(string zipFile, string outputDirectory) diff --git a/BoerseDataConvert/BoerseDataConvert/Views/Reader.cs b/BoerseDataConvert/BoerseDataConvert/Views/Reader.cs index 7803029..5a0278d 100644 --- a/BoerseDataConvert/BoerseDataConvert/Views/Reader.cs +++ b/BoerseDataConvert/BoerseDataConvert/Views/Reader.cs @@ -26,21 +26,21 @@ namespace BoerseDataConvert string s = reader.ReadLine(); if (s.Substring(0, 11) == "Datensaetze") { - Console.WriteLine($"File{ filesNames[fileInd]}.xml was converted successfully"); + Console.WriteLine($"INFO: { filesNames[fileInd] } was converted successfully"); fileInd++; - EndFile(); + EndFile(); reader = new StreamReader($@"{adr}/{filesNames[fileInd]}", CodePagesEncodingProvider.Instance.GetEncoding(1252)); RecordController.NextFile(filesNames[fileInd]); s = reader.ReadLine(); s = reader.ReadLine(); } - string[] sr = s.Split("|").ToArray(); + string[] sr = s.Split("|").ToArray(); Record record = new Record(); foreach (var item in sr) { - string[] d = item.Split('#',2).ToArray(); - record.Add(int.Parse(d[0]), d[1]); - } + string[] d = item.Split('#', 2).ToArray(); + record.Add(int.Parse(d[0]), d[1]); + } return record; } internal static void EndFile()