From a074dd001cb9487ebf9e12772f42e662648ade7b Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 4 May 2016 15:09:31 -0700 Subject: [PATCH] Have to make everything similar for inputs and flags --- DATabase/DATabase.cs | 16 ++++++++-------- OfflineMerge/OfflineMerge.cs | 6 +++--- SabreHelper/Build.cs | 36 ++++++++++++++++++------------------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs index f2dc028b..8b57a6ad 100644 --- a/DATabase/DATabase.cs +++ b/DATabase/DATabase.cs @@ -227,19 +227,19 @@ namespace SabreTools { desc = arg.Split('=')[1]; } - else if (arg.StartsWith("exta=")) + else if (arg.StartsWith("-exta=")) { exta = arg.Split('=')[1]; } - else if (arg.StartsWith("extb")) + else if (arg.StartsWith("-extb=")) { extb = arg.Split('=')[1]; } - else if (arg.StartsWith("input=")) + else if (arg.StartsWith("-input=")) { inputs.Add(arg.Split('=')[1].Replace("\"", "")); } - else if (arg.StartsWith("manu=") && manu == "") + else if (arg.StartsWith("-manu=") && manu == "") { manu = arg.Split('=')[1]; } @@ -247,7 +247,7 @@ namespace SabreTools { name = arg.Split('=')[1]; } - else if (arg.StartsWith("out=") && outdir == "") + else if (arg.StartsWith("-out=") && outdir == "") { outdir = arg.Split('=')[1]; } @@ -259,11 +259,11 @@ namespace SabreTools { prefix = arg.Split('=')[1]; } - else if (arg.StartsWith("source=") && sources == "") + else if (arg.StartsWith("-source=") && sources == "") { sources = arg.Split('=')[1]; } - else if (arg.StartsWith("system=") && systems == "") + else if (arg.StartsWith("-system=") && systems == "") { systems = arg.Split('=')[1]; } @@ -275,7 +275,7 @@ namespace SabreTools { repext = arg.Split('=')[1]; } - else if (arg.StartsWith("url=") && url == "") + else if (arg.StartsWith("-url=") && url == "") { url = arg.Split('=')[1]; } diff --git a/OfflineMerge/OfflineMerge.cs b/OfflineMerge/OfflineMerge.cs index 6493a9b2..70d8e9c9 100644 --- a/OfflineMerge/OfflineMerge.cs +++ b/OfflineMerge/OfflineMerge.cs @@ -84,15 +84,15 @@ namespace SabreTools break; default: string temparg = arg.Replace("\"", ""); - if (temparg.StartsWith("com=")) + if (temparg.StartsWith("-com=")) { currentAllMerged = temparg.Split('=')[1]; } - else if (temparg.StartsWith("fix=")) + else if (temparg.StartsWith("-fix=")) { currentMissingMerged = temparg.Split('=')[1]; } - else if (temparg.StartsWith("new=")) + else if (temparg.StartsWith("-new=")) { currentNewMerged = temparg.Split('=')[1]; } diff --git a/SabreHelper/Build.cs b/SabreHelper/Build.cs index 5017b997..d9352177 100644 --- a/SabreHelper/Build.cs +++ b/SabreHelper/Build.cs @@ -83,12 +83,12 @@ Usage: DATabase [option] [filename|dirname] ... Options: -?, -h, --help Show this help -a, --add Add a new system or source to the database - manu= Manufacturer name (system only) - system= System name (system only) - source= Source name (source only) - url= URL (source only) + -manu= Manufacturer name (system only) + -system= System name (system only) + -source= Source name (source only) + -url= URL (source only) -cc, --convert-cmp Convert an XML DAT to CMP - out= Output directory + -out= Output directory -cm, --convert-miss Convert from DAT to miss -r, --roms Output roms to miss instead of sets -gp, --game-prefix Add game name as a prefix to each item @@ -98,19 +98,19 @@ Options: -ae=, --add-ext= Add an extension to each item -re=, --rep-ext= Replace all extensions with specified -cx, --convert-xml Convert a CMP DAT to XML - out= Output directory + -out= Output directory -es, --ext-split Split a DAT by two file extensions - exta= First extension to split by - extb= Second extension to split by - out= Output directory + -exta= First extension to split by + -extb= Second extension to split by + -out= Output directory -g, --generate Start tool in generate mode - system= Comma-separated list of system IDs - source= Comma-separated list of source IDs - out= Output directory + -system= Comma-separated list of system IDs + -source= Comma-separated list of source IDs + -out= Output directory -nr, --no-rename Don't auto-rename games -o, --old Output DAT in CMP format instead of XML -ga, --generate-all Start tool in generate all mode - out= Output directory + -out= Output directory -nr, --no-rename Don't auto-rename games -o, --old Output DAT in CMP format instead of XML -i, --import Start tool in import mode @@ -130,8 +130,8 @@ Options: -v=, --version= Set the version of the DAT -au=, --author= Set the author of the DAT -rm, --remove Remove a system or source from the database - system= System ID - source= Source ID + -system= System ID + -source= Source ID -tm, --trim-merge Consolidate DAT into a single game and trim entries -rd=, --root-dir= Set the root directory for trimming calculation -nr, --no-rename Keep game names instead of using '!' @@ -181,9 +181,9 @@ Options: -f, --fake Replace all hashes and sizes by the default Inputs: - com= Complete current DAT - fix= Complete current Missing - new= New Complete DAT + -com= Complete current DAT + -fix= Complete current Missing + -new= New Complete DAT This program will output the following DATs: (a) Net New - (NewComplete)-(Complete)