From 203bbd2cd5ef5a2344ed3e8a536dd364556b7542 Mon Sep 17 00:00:00 2001 From: James Ross Date: Sat, 13 Aug 2022 22:49:53 +0100 Subject: [PATCH] fix: Clean up Data Converter help output to match dotnet-style --- Source/Contrib/DataConverter/Program.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Source/Contrib/DataConverter/Program.cs b/Source/Contrib/DataConverter/Program.cs index 19e3b6c1c8..e948b5da8a 100644 --- a/Source/Contrib/DataConverter/Program.cs +++ b/Source/Contrib/DataConverter/Program.cs @@ -17,9 +17,11 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; using System.Runtime.Serialization; +using ORTS.Common; namespace Orts.DataConverter { @@ -85,22 +87,25 @@ static void Main(string[] args) static void ShowHelp(List converters) { - Console.WriteLine("Open Rails Data Converter utility"); + var version = FileVersionInfo.GetVersionInfo(typeof(Program).Assembly.Location); + Console.WriteLine("{0} {1}", version.FileDescription, VersionInfo.VersionOrBuild); Console.WriteLine(); - Console.WriteLine("{0} /input INPUT [/output] [OUTPUT [...]]", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName)); + Console.WriteLine("Usage:"); + Console.WriteLine(" {0} /input [/output] [ [...]]", Path.GetFileNameWithoutExtension(version.FileName)); Console.WriteLine(); - // "1234567890123456789012345678901234567890123456789012345678901234567890123456789" - Console.WriteLine(" INPUT Specifies the file to read."); - Console.WriteLine(" OUTPUT Specifies the file to generate."); + Console.WriteLine("Arguments:"); + Console.WriteLine(" Specifies the file to read"); + Console.WriteLine(" Specifies the file to generate"); Console.WriteLine(); - Console.WriteLine(" Multiple outputs may be specified for each input."); + Console.WriteLine("Multiple outputs may be specified for each input"); Console.WriteLine(); - Console.WriteLine(" Available file format conversions"); + Console.WriteLine("Available file format conversions:"); Console.WriteLine(" Input Output Description"); foreach (var converter in converters) { converter.ShowConversions(); } + Console.WriteLine(); } static List GetConversions(string[] args)