dimitar/BoerseDataConvert
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/CapitalRhino/itkariera-m9 into main

Browse Source
This commit is contained in:
lastvoidtemplar
2021-07-09 10:19:47 +03:00
parent ae6699c2ff 879eb3766b
commit 378fbf06e0
3 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BoerseDataConvert/BoerseDataConvert/Controller/RecordController.cs
View File

@@ -12,11 +12,11 @@ namespace BoerseDataConvert
private static int count; private static int count;
private static string cur_fileName; private static string cur_fileName;
private TagsTable tagsTable; private TagsTable tagsTable;
public RecordController(string fileName) public RecordController(string fileName, string tags)
{ {
count = 1; count = 1;
cur_fileName = fileName; cur_fileName = fileName;
tagsTable = new TagsTable(); tagsTable = new TagsTable(tags);
} }
public static void NextFile(string fileName) public static void NextFile(string fileName)
{ {

4
BoerseDataConvert/BoerseDataConvert/Model/TagsTable.cs
View File

@@ -11,9 +11,9 @@ namespace BoerseDataConvert
{ {
StreamReader reader ; StreamReader reader ;
Dictionary<string, string[]> table; Dictionary<string, string[]> table;
public TagsTable() public TagsTable(string tags)
{ {
reader = new StreamReader(@"..\..\..\..\tags.txt"); reader = new StreamReader(tags);
table = new Dictionary<string, string[]>(); table = new Dictionary<string, string[]>();
LoadInfo(); LoadInfo();
} }

41
BoerseDataConvert/BoerseDataConvert/Views/Program.cs
View File

@@ -15,7 +15,7 @@ namespace BoerseDataConvert
// -d directory or --dir directory // -d directory or --dir directory
// -o directory or --output direcory // -o directory or --output direcory
// -h - help // -h - help
/*
FileStream ostrm; FileStream ostrm;
StreamWriter writer1; StreamWriter writer1;
TextWriter oldOut = Console.Out; TextWriter oldOut = Console.Out;
@@ -30,11 +30,11 @@ namespace BoerseDataConvert
return; return;
} }
Console.SetOut(writer1); Console.SetOut(writer1);
*/
// input handling // input handling
string[] input = InputValidate(args); string[] input = InputValidate(args);
string zipFile = input[0], inputDir = input[1], outputDir = input[2]; string zipFile = input[0], inputDir = input[1], outputDir = input[2], tags = input[3];
CheckFreeDisk(outputDir); CheckFreeDisk(outputDir);
ZipExtract(zipFile, inputDir); ZipExtract(zipFile, inputDir);
@@ -44,7 +44,7 @@ namespace BoerseDataConvert
Reader reader = new Reader(inputDir, fileNames); Reader reader = new Reader(inputDir, fileNames);
Writer writer = new Writer(outputDir, fileNames[0]); Writer writer = new Writer(outputDir, fileNames[0]);
RecordController a = new RecordController(fileNames[0]); RecordController a = new RecordController(fileNames[0], tags);
while (true) while (true)
{ {
@@ -72,6 +72,7 @@ namespace BoerseDataConvert
Console.WriteLine("-i <input zip file> or --input <input zip file>"); Console.WriteLine("-i <input zip file> or --input <input zip file>");
Console.WriteLine("-d <working directory> or --directory <working directory>"); Console.WriteLine("-d <working directory> or --directory <working directory>");
Console.WriteLine("-o <output directory> or --output <output directory>"); Console.WriteLine("-o <output directory> or --output <output directory>");
Console.WriteLine("-t <tags file> or --tags <tags file>");
Console.WriteLine("-h or --help - Prints this message"); Console.WriteLine("-h or --help - Prints this message");
Environment.Exit(0); Environment.Exit(0);
} }
@@ -89,22 +90,46 @@ namespace BoerseDataConvert
} }
static string[] InputValidate(string[] args) static string[] InputValidate(string[] args)
{ {
string[] output = new string[3]; string[] output = new string[4];
// check input zipfile parameter // check input zipfile parameter
if (args.Contains("-i") || args.Contains("--input")) if (args.Contains("-i"))
{ {
output[0] = args[Array.IndexOf(args, "-i") + 1]; output[0] = args[Array.IndexOf(args, "-i") + 1];
} }
if (args.Contains("--input"))
{
output[0] = args[Array.IndexOf(args, "--input") + 1];
}
// check input directory parameter // check input directory parameter
if (args.Contains("-d") || args.Contains("--directory")) if (args.Contains("-d"))
{ {
output[1] = args[Array.IndexOf(args, "-d") + 1]; output[1] = args[Array.IndexOf(args, "-d") + 1];
} }
if (args.Contains("--directory"))
{
output[1] = args[Array.IndexOf(args, "--directory") + 1];
}
// check output directory parameter // check output directory parameter
if (args.Contains("-o") || args.Contains("--output")) if (args.Contains("-o"))
{ {
output[2] = args[Array.IndexOf(args, "-o") + 1]; output[2] = args[Array.IndexOf(args, "-o") + 1];
} }
if (args.Contains("--output"))
{
output[2] = args[Array.IndexOf(args, "-output") + 1];
}
if (args.Contains("-t"))
{
output[3] = args[Array.IndexOf(args, "-t") + 1];
}
if (args.Contains("--tags"))
{
output[3] = args[Array.IndexOf(args, "--tags") + 1];
}
if (!args.Contains("-t") || !args.Contains("--tags"))
{
output[3] = "tags.txt";
}
// check help parameter // check help parameter
if (args.Contains("-h") || args.Contains("--help")) if (args.Contains("-h") || args.Contains("--help"))
{ {