-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added API setters & other API improvements:
- Increased default receiver disconnect timeout - Metering rate is now customisable through a command line option - Added command line parser - Converted serializable struct fields to properties - Improved API doc/Swagger - Fixed IP address and MAC address string constructor bugs - Default metering interval reduced to 50ms - Added generic web API setter methods for wireless mics and receivers
- Loading branch information
Showing
10 changed files
with
433 additions
and
152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| using System.Reflection; | ||
|
|
||
| namespace WirelessMicSuiteServer; | ||
|
|
||
| public class CommandLineOptions | ||
| { | ||
| private Dictionary<string, CommandLineOption> options; | ||
| private Dictionary<string, object?> parsedArgs; | ||
|
|
||
| public Dictionary<string, object?> ParsedArgs => parsedArgs; | ||
|
|
||
| public CommandLineOptions(CommandLineOption[] options, string[]? args) | ||
| { | ||
| this.parsedArgs = []; | ||
| this.options = new( | ||
| options.Select(x => new KeyValuePair<string, CommandLineOption>(x.key, x)) | ||
| .Concat( | ||
| options.Where(x=>x.alias != null) | ||
| .Select(x => new KeyValuePair<string, CommandLineOption>(x.alias!, x)))); | ||
|
|
||
| this.options.TryAdd("--help", new("--help", action: _=>PrintHelp())); | ||
|
|
||
| if (args != null ) | ||
| ParseArgs(args); | ||
| } | ||
|
|
||
| private readonly ILogger logger = Program.LoggerFac.CreateLogger<CommandLineOptions>(); | ||
| public void Log(string? message, LogSeverity severity = LogSeverity.Info) | ||
| { | ||
| logger.Log(message, severity); | ||
| } | ||
|
|
||
| public void ParseArgs(string[] args) | ||
| { | ||
| CommandLineOption? option = null; | ||
| List<object> tmpList = []; | ||
| foreach (var arg in args) | ||
| { | ||
| if (options.TryGetValue(arg, out var nOption)) | ||
| { | ||
| AddParsedArg(option, tmpList); | ||
|
|
||
| option = nOption; | ||
| continue; | ||
| } | ||
|
|
||
| if (option == null) | ||
| { | ||
| Log($"Unrecognised command line argument '{arg}'!", LogSeverity.Error); | ||
| Console.WriteLine(); | ||
| PrintHelp(); | ||
| return; | ||
| } | ||
|
|
||
| try | ||
| { | ||
| switch (option.Value.argType) | ||
| { | ||
| case CommandLineArgType.None: | ||
| break; | ||
| case CommandLineArgType.String: | ||
| tmpList.Add(arg); | ||
| break; | ||
| case CommandLineArgType.Int: | ||
| tmpList.Add(int.Parse(arg)); | ||
| break; | ||
| case CommandLineArgType.Uint: | ||
| tmpList.Add(uint.Parse(arg)); | ||
| break; | ||
| case CommandLineArgType.Path: | ||
| if (!Path.Exists(arg)) | ||
| throw new ArgumentException($"Path '{arg}' does not exist!"); | ||
| tmpList.Add(arg); | ||
| break; | ||
| } | ||
| } | ||
| catch | ||
| { | ||
| Log($"Couldn't parse '{arg}' as {option.Value.argType}!", LogSeverity.Error); | ||
| Console.WriteLine(); | ||
| PrintHelp(); | ||
| return; | ||
| } | ||
|
|
||
| if (!option.Value.multipleArguments) | ||
| option = null; | ||
| } | ||
|
|
||
| AddParsedArg(option, tmpList); | ||
|
|
||
| void AddParsedArg(CommandLineOption? option, List<object> tmpList) | ||
| { | ||
| if (option is CommandLineOption opt) | ||
| { | ||
| opt.action?.Invoke(opt.multipleArguments ? tmpList.ToArray() : tmpList.FirstOrDefault()); | ||
| parsedArgs.Add(option.Value.key, opt.multipleArguments ? tmpList.ToArray() : tmpList.FirstOrDefault()); | ||
| tmpList.Clear(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public void PrintHelp() | ||
| { | ||
| var assembly = Assembly.GetExecutingAssembly(); | ||
| Console.WriteLine($"##### Wireless Mic Suite Server #####"); | ||
| Console.WriteLine($"# version: {assembly.GetName().Version}"); | ||
| Console.WriteLine($"# "); | ||
| Console.WriteLine($"# Command line options: "); | ||
| foreach (var opt in options.Values) | ||
| { | ||
| Console.WriteLine($"\t{opt.key}{(opt.alias != null?", " + opt.alias:"")} " + | ||
| $"{(opt.argType != CommandLineArgType.None ? "<"+opt.argType+">":"")}{(opt.multipleArguments?", ...":"")}"); | ||
| Console.WriteLine($"\t\t{opt.help}"); | ||
| Console.WriteLine(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public struct CommandLineOption(string key, string? alias = null, string? help = null, | ||
| CommandLineArgType argType = CommandLineArgType.None, bool multipleArguments = false, | ||
| Action<object?>? action = null) | ||
| { | ||
| public string key = key; | ||
| public string? alias = alias; | ||
| public string? help = help; | ||
| public CommandLineArgType argType = argType; | ||
| public bool multipleArguments = multipleArguments; | ||
| //public bool positional; | ||
| public Action<object?>? action = action; | ||
| } | ||
|
|
||
| public enum CommandLineArgType | ||
| { | ||
| None, | ||
| String, | ||
| Int, | ||
| Uint, | ||
| Path | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.