cuqmbr/netxml2kml
1
0
Fork 0
Code Issues Pull Requests Activity

refactor: move arguments validation to CLI parser option declaration place

Browse Source
This commit is contained in:
cuqmbr 2022-08-16 11:15:02 +03:00
parent feead5bba2
commit 93cf58b356
2 changed files with 81 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
netxml2kml/Methods/CliOptionsHandlers.cs
View File

@ -10,56 +10,6 @@ public static class CliOptionsHandlers
public static void UniversalHandler(FileInfo? inputFile,
FileInfo? outputFile, bool useDatabase, string? sqlQuery)
{
// Validate input file
if (inputFile != null)
{
if (!inputFile.Exists)
{
Console.WriteLine("Input file doesn't exist.");
return;
}
}
// Validate output file
if (outputFile != null)
{
if (!Directory.Exists(outputFile.DirectoryName))
{
Console.WriteLine("Output directory doesn't exist.");
return;
}
// If output file with the same name already exists –
// prompt user to change a name of the file
while (outputFile.Exists)
{
Console.Write("Output file already exists. Do you want to overwrite it? [y/N] ");
var opt = Console.ReadLine();
if (String.IsNullOrEmpty(opt) || opt.ToLower() == "no" ||
opt.ToLower() == "n")
{
Console.Write("Enter a <new_name>[.kml]: ");
var name = Console.ReadLine();
if (String.IsNullOrEmpty(name))
{
continue;
}
outputFile = new FileInfo(
Path.Join(outputFile.DirectoryName, name));
continue;
}
if (opt.ToLower() == "yes" ||
opt.ToLower() == "y")
{
break;
}
}
}
// Run some logic based on options combination
if (inputFile != null && outputFile != null)
{

86
netxml2kml/Program.cs
View File

@ -5,7 +5,7 @@ namespace netxml2kml;
class Program
{
static async Task<int> Main(string[] args)
static int Main(string[] args)
{
// Define CLI parser options, commands & handlers
@ -16,16 +16,91 @@ class Program
Arity = ArgumentArity.ZeroOrOne
};
inputOption.AddValidator(result =>
{
var inputFile = result.GetValueForOption(inputOption);
if (inputFile == null)
{
result.ErrorMessage =
"Argument for input option is not specified.";
return;
}
if (!inputFile.Exists)
{
result.ErrorMessage = "Input file doesn't exist.";
return;
}
});
var outputOption = new Option<FileInfo?>(
aliases: new[] {"-o", "--output"},
description: "The name of the file to be created.")
description: "The name of the file to be created.",
parseArgument: result =>
{
// If output file with the same name already exists –
// prompt user to change a name of the file
var outputFile = new FileInfo(result.Tokens.Single().Value);
while (outputFile.Exists)
{
Console.Write(
"Output file already exists. Do you want to overwrite it? [y/N] ");
var opt = Console.ReadLine();
if (String.IsNullOrEmpty(opt) || opt.ToLower() == "no" ||
opt.ToLower() == "n")
{
Console.Write("Enter a <new_name>[.kml]: ");
var name = Console.ReadLine();
if (String.IsNullOrEmpty(name))
{
continue;
}
outputFile =
new FileInfo(Path.Join(outputFile.DirectoryName,
name));
continue;
}
if (opt.ToLower() == "yes" ||
opt.ToLower() == "y")
{
break;
}
}
return outputFile;
})
{
Arity = ArgumentArity.ZeroOrOne
};
outputOption.AddValidator(result =>
{
var outputFile = result.GetValueForOption(outputOption);
if (outputFile == null)
{
result.ErrorMessage =
"Argument for output option is not specified.";
return;
}
if (!Directory.Exists(outputFile.DirectoryName))
{
result.ErrorMessage = "Output directory doesn't exist.";
return;
}
});
var databaseOption = new Option<bool>(
aliases: new[] {"-d", "--use-database"},
description: "Use database. Save/retrieve wireless networks and clients to/from sqlite database.")
description:
"Use database. Save/retrieve wireless networks and clients to/from sqlite database.")
{
Arity = ArgumentArity.ZeroOrOne
};
@ -37,7 +112,8 @@ class Program
Arity = ArgumentArity.ZeroOrOne
};
var rootCommand = new RootCommand("netxml2kml – .netxml to .kml converter.");
var rootCommand =
new RootCommand("netxml2kml – .netxml to .kml converter.");
rootCommand.AddOption(inputOption);
rootCommand.AddOption(outputOption);
rootCommand.AddOption(databaseOption);
@ -46,6 +122,6 @@ class Program
rootCommand.SetHandler(CliOptionsHandlers.UniversalHandler,
inputOption, outputOption, databaseOption, queryOption);
return await rootCommand.InvokeAsync(args);
return rootCommand.Invoke(args);
}
}