diff --git a/SabreTools.Helper/Data/Build.cs b/SabreTools.Helper/Data/Build.cs index d126630b..bd59b1ea 100644 --- a/SabreTools.Helper/Data/Build.cs +++ b/SabreTools.Helper/Data/Build.cs @@ -115,10 +115,12 @@ namespace SabreTools.Helper helptext.Add(" -od, --output-dc Output in DOSCenter format"); helptext.Add(" -om, --output-miss Output in Missfile format"); helptext.Add(" -omd5, --output-md5 Output in MD5 format"); + helptext.Add(" -ool, --output-ol Output in OfflineList format"); helptext.Add(" -or, --output-rc Output in RomCenter format"); helptext.Add(" -os, --output-sd Output in SabreDAT format"); helptext.Add(" -osfv, --ouput-sfv Output in SFV format"); helptext.Add(" -osha1, --output-sha1 Output in SHA-1 format"); + helptext.Add(" -osl, --output-sl Output in Softwarelist format"); helptext.Add(" -ox, --output-xml Output in Logiqx XML format"); helptext.Add(" -gz, --gz-files Allow reading of GZIP files as archives"); helptext.Add(" -ro, --romba Read files from a Romba input"); @@ -169,10 +171,15 @@ namespace SabreTools.Helper helptext.Add(" -tsv, --tsv Output in Tab-Separated Value format"); helptext.Add(" -csv, --csv Output in Comma-Separated Value format"); helptext.Add(" -omd5, --output-md5 Output in MD5 format"); + helptext.Add(" -gp, --game-prefix Add game name as a prefix"); + helptext.Add(" -ool, --output-ol Output in OfflineList format"); helptext.Add(" -or, --output-rc Output in RomCenter format"); helptext.Add(" -os, --output-sd Output in SabreDAT format"); helptext.Add(" -osfv, --ouput-sfv Output in SFV format"); + helptext.Add(" -gp, --game-prefix Add game name as a prefix"); helptext.Add(" -osha1, --output-sha1 Output in SHA-1 format"); + helptext.Add(" -gp, --game-prefix Add game name as a prefix"); + helptext.Add(" -osl, --output-sl Output in Softwarelist format"); helptext.Add(" -ox, --output-xml Output in Logiqx XML format"); helptext.Add(" -f=, --filename= Set a new filename"); helptext.Add(" -n=, --name= Set a new internal name"); diff --git a/SabreTools.Helper/Objects/Dat/DatFile.cs b/SabreTools.Helper/Objects/Dat/DatFile.cs index 7b244cca..10eb1083 100644 --- a/SabreTools.Helper/Objects/Dat/DatFile.cs +++ b/SabreTools.Helper/Objects/Dat/DatFile.cs @@ -4091,27 +4091,27 @@ namespace SabreTools.Helper case OutputFormat.RedumpMD5: if (rom.Type == ItemType.Rom) { - state += ((Rom)rom).MD5 + " *" + rom.Name + "\n"; + state += ((Rom)rom).MD5 + " *" + (GameName ? rom.MachineName + Path.DirectorySeparatorChar : "") + rom.Name + "\n"; } else if (rom.Type == ItemType.Disk) { - state += ((Disk)rom).MD5 + " *" + rom.Name + "\n"; + state += ((Disk)rom).MD5 + " *" + (GameName ? rom.MachineName + Path.DirectorySeparatorChar : "") + rom.Name + "\n"; } break; case OutputFormat.RedumpSFV: if (rom.Type == ItemType.Rom) { - state += rom.Name + " " + ((Rom)rom).CRC + "\n"; + state += (GameName ? rom.MachineName + Path.DirectorySeparatorChar : "") + rom.Name + " " + ((Rom)rom).CRC + "\n"; } break; case OutputFormat.RedumpSHA1: if (rom.Type == ItemType.Rom) { - state += ((Rom)rom).SHA1 + " *" + rom.Name + "\n"; + state += ((Rom)rom).SHA1 + " *" + (GameName ? rom.MachineName + Path.DirectorySeparatorChar : "") + rom.Name + "\n"; } else if (rom.Type == ItemType.Disk) { - state += ((Disk)rom).SHA1 + " *" + rom.Name + "\n"; + state += ((Disk)rom).SHA1 + " *" + (GameName ? rom.MachineName + Path.DirectorySeparatorChar : "") + rom.Name + "\n"; } break; case OutputFormat.RomCenter: diff --git a/SabreTools.Helper/README.1ST b/SabreTools.Helper/README.1ST index 5319b669..5a81ecd6 100644 --- a/SabreTools.Helper/README.1ST +++ b/SabreTools.Helper/README.1ST @@ -420,6 +420,9 @@ Options: -omd5, --output-md5 Output in MD5 format Add outputting the created DAT to MD5 format + -gp, --game-prefix Add game name as a prefix + This allows for the name of the game to be used as a prefix to each file + -ool, --output-ol Output in OfflineList format Add outputting the created DAT to OfflineList XML format @@ -432,9 +435,15 @@ Options: -osfv, --output-sfv Output in SFV format Add outputting the created DAT to SFV format + -gp, --game-prefix Add game name as a prefix + This allows for the name of the game to be used as a prefix to each file + -osha1, -output-sha1 Output in SHA-1 format Add outputting the created DAT to SHA1 format + -gp, --game-prefix Add game name as a prefix + This allows for the name of the game to be used as a prefix to each file + -osl, --output-sl Output in Software List format Add outputting the created DAT to Software List XML format @@ -900,9 +909,6 @@ Below are originally from SabreTools / DATabase - -oc, --output-cmp Output in CMP format Add outputting the created DAT to clrmamepro format - - -od, --output-dc Output in DOSCenter format - Add outputting the created DAT to DOSCenter format -om, --output-miss Output in Missfile format Add outputting the created DAT to GoodTools miss format @@ -910,9 +916,6 @@ Below are originally from SabreTools / DATabase - -omd5, --output-md5 Output in MD5 format Add outputting the created DAT to MD5 format - -ool, --output-ol Output in OfflineList format - Add outputting the created DAT to OfflineList XML format - -or, --output-rc Output in RomCenter format Add outputting the created DAT to RomCenter format @@ -925,9 +928,6 @@ Below are originally from SabreTools / DATabase - -osha1, -output-sha1 Output in SHA-1 format Add outputting the created DAT to SHA1 format - -osl, --output-sl Output in Software List format - Add outputting the created DAT to Software List XML format - -ox, -output-xml Output in Logiqx XML format (default) Add outputting the created DAT to Logiqx XML format