diff --git a/BoerseDataConvert/BoerseDataConvert/Controller/RecordController.cs b/BoerseDataConvert/BoerseDataConvert/Controller/RecordController.cs index 7be46e1..da44107 100644 --- a/BoerseDataConvert/BoerseDataConvert/Controller/RecordController.cs +++ b/BoerseDataConvert/BoerseDataConvert/Controller/RecordController.cs @@ -25,7 +25,7 @@ namespace BoerseDataConvert public string ConvertToXml(Record record) { StringBuilder xmlRecord = new StringBuilder(); - xmlRecord.Append($" \n"); + xmlRecord.Append($" \n"); foreach (var tagValue in record.TagsValues) { try diff --git a/BoerseDataConvert/BoerseDataConvert/Views/Program.cs b/BoerseDataConvert/BoerseDataConvert/Views/Program.cs index a935d06..4eef1a8 100644 --- a/BoerseDataConvert/BoerseDataConvert/Views/Program.cs +++ b/BoerseDataConvert/BoerseDataConvert/Views/Program.cs @@ -15,8 +15,27 @@ namespace BoerseDataConvert // -d directory or --dir directory // -o directory or --output direcory // -h - help + // Console.OutputEncoding = System.Text.Encoding.UTF8; Console.WriteLine(); - Reader reader = new Reader(@"E:\Downloads\TestData-2021_07_02", new string[1] { "subtype910.txt" }); + if (args.Contains("-i") || args.Contains("--input")) + { + string zipfile = args[Array.IndexOf(args, "-i") + 1]; + } + if (args.Contains("-d") || args.Contains("--directory")) + { + string inputDir = args[Array.IndexOf(args, "-d" + 1)]; + } + if (args.Contains("-o") || args.Contains("--output")) + { + string outputDir = args[Array.IndexOf(args, "-o" + 1)]; + } + if (args.Contains("-h") || args.Contains("--help")) + { + Help(); + return; + } + // Reader reader = new Reader(@"E:\Downloads\TestData-2021_07_02", new string[1] { "subtype910.txt" }); + Reader reader = new Reader(@"D:\Code\ИТ Кариера\Стаж\задача\TestData-2021_07_02", new string[1] { "subtype910.txt" }); RecordController a = new RecordController(""); while (true) { @@ -32,5 +51,14 @@ namespace BoerseDataConvert } } + static void Help() + { + Console.WriteLine("BoerseDataConvert v1.0.0"); + Console.WriteLine("D. Delchev and D. Byalkov, 2021"); + Console.WriteLine("---"); + Console.WriteLine("-i or --input "); + Console.WriteLine("-d or --directory "); + Console.WriteLine("-o or --output "); + } } } diff --git a/BoerseDataConvert/BoerseDataConvert/Views/Reader.cs b/BoerseDataConvert/BoerseDataConvert/Views/Reader.cs index bb97e97..a7b02af 100644 --- a/BoerseDataConvert/BoerseDataConvert/Views/Reader.cs +++ b/BoerseDataConvert/BoerseDataConvert/Views/Reader.cs @@ -16,7 +16,7 @@ namespace BoerseDataConvert public Reader(string adr, string[] filesNames) { fileInd = 0; - reader = new StreamReader($@"{adr}/{filesNames[fileInd]}", CodePagesEncodingProvider.Instance.GetEncoding(1252), true); + reader = new StreamReader($@"{adr}/{filesNames[fileInd]}", CodePagesEncodingProvider.Instance.GetEncoding(1252)); this.adr = adr; this.filesNames = filesNames; reader.ReadLine(); @@ -28,7 +28,7 @@ namespace BoerseDataConvert { fileInd++; reader.Close(); - reader = new StreamReader($@"{adr}/{filesNames[fileInd]}", CodePagesEncodingProvider.Instance.GetEncoding(1252), true); + reader = new StreamReader($@"{adr}/{filesNames[fileInd]}", CodePagesEncodingProvider.Instance.GetEncoding(1252)); RecordController.NextFile(filesNames[fileInd]); s = reader.ReadLine(); s = reader.ReadLine();