diff --git a/DICUI.Library/Data/Constants.cs b/DICUI.Library/Data/Constants.cs index dd269887..8388ba4a 100644 --- a/DICUI.Library/Data/Constants.cs +++ b/DICUI.Library/Data/Constants.cs @@ -3,7 +3,7 @@ /// /// Top-level commands for DiscImageCreator /// - public static class DICCommandStrings + public static class CreatorCommandStrings { public const string Audio = "audio"; public const string BluRay = "bd"; @@ -33,7 +33,7 @@ /// /// Dumping flags for DiscImageCreator /// - public static class DICFlagStrings + public static class CreatorFlagStrings { public const string AddOffset = "/a"; public const string AMSF = "/p"; diff --git a/DICUI.Library/Data/Enumerations.cs b/DICUI.Library/Data/Enumerations.cs index 893f7811..6e3f3508 100644 --- a/DICUI.Library/Data/Enumerations.cs +++ b/DICUI.Library/Data/Enumerations.cs @@ -19,9 +19,9 @@ } /// - /// Supported DIC commands + /// Supported DiscImageCreator commands /// - public enum DICCommand + public enum CreatorCommand { NONE = 0, Audio, @@ -50,9 +50,9 @@ } /// - /// Supported DIC flags + /// Supported DiscImageCreator flags /// - public enum DICFlag + public enum CreatorFlag { NONE = 0, AddOffset, diff --git a/DICUI.Library/Utilities/Converters.cs b/DICUI.Library/Utilities/Converters.cs index de579356..c89f69ce 100644 --- a/DICUI.Library/Utilities/Converters.cs +++ b/DICUI.Library/Utilities/Converters.cs @@ -34,32 +34,32 @@ namespace DICUI.Utilities /// /// Get the most common known system for a given MediaType /// - /// DICCommand value to check + /// CreatorCommand value to check /// KnownSystem if possible, null on error - public static KnownSystem? ToKnownSystem(this DICCommand baseCommand) + public static KnownSystem? ToKnownSystem(this CreatorCommand baseCommand) { switch (baseCommand) { - case DICCommand.Audio: + case CreatorCommand.Audio: return KnownSystem.AudioCD; - case DICCommand.CompactDisc: - case DICCommand.Data: - case DICCommand.DigitalVideoDisc: - case DICCommand.Disk: - case DICCommand.Floppy: + case CreatorCommand.CompactDisc: + case CreatorCommand.Data: + case CreatorCommand.DigitalVideoDisc: + case CreatorCommand.Disk: + case CreatorCommand.Floppy: return KnownSystem.IBMPCCompatible; - case DICCommand.GDROM: - case DICCommand.Swap: + case CreatorCommand.GDROM: + case CreatorCommand.Swap: return KnownSystem.SegaDreamcast; - case DICCommand.BluRay: + case CreatorCommand.BluRay: return KnownSystem.SonyPlayStation3; - case DICCommand.SACD: + case CreatorCommand.SACD: return KnownSystem.SuperAudioCD; - case DICCommand.XBOX: - case DICCommand.XBOXSwap: + case CreatorCommand.XBOX: + case CreatorCommand.XBOXSwap: return KnownSystem.MicrosoftXBOX; - case DICCommand.XGD2Swap: - case DICCommand.XGD3Swap: + case CreatorCommand.XGD2Swap: + case CreatorCommand.XGD3Swap: return KnownSystem.MicrosoftXBOX360; default: return null; @@ -234,34 +234,34 @@ namespace DICUI.Utilities /// /// Get the MediaType associated with a given base command /// - /// DICCommand value to check + /// CreatorCommand value to check /// MediaType if possible, null on error /// This takes the "safe" route by assuming the larger of any given format - public static MediaType? ToMediaType(this DICCommand baseCommand) + public static MediaType? ToMediaType(this CreatorCommand baseCommand) { switch (baseCommand) { - case DICCommand.Audio: - case DICCommand.CompactDisc: - case DICCommand.Data: - case DICCommand.SACD: + case CreatorCommand.Audio: + case CreatorCommand.CompactDisc: + case CreatorCommand.Data: + case CreatorCommand.SACD: return MediaType.CDROM; - case DICCommand.GDROM: - case DICCommand.Swap: + case CreatorCommand.GDROM: + case CreatorCommand.Swap: return MediaType.GDROM; - case DICCommand.DigitalVideoDisc: - case DICCommand.XBOX: - case DICCommand.XBOXSwap: - case DICCommand.XGD2Swap: - case DICCommand.XGD3Swap: + case CreatorCommand.DigitalVideoDisc: + case CreatorCommand.XBOX: + case CreatorCommand.XBOXSwap: + case CreatorCommand.XGD2Swap: + case CreatorCommand.XGD3Swap: return MediaType.DVD; - case DICCommand.BluRay: + case CreatorCommand.BluRay: return MediaType.BluRay; // Non-optical - case DICCommand.Floppy: + case CreatorCommand.Floppy: return MediaType.FloppyDisk; - case DICCommand.Disk: + case CreatorCommand.Disk: return MediaType.HardDisk; default: return null; @@ -541,132 +541,132 @@ namespace DICUI.Utilities } /// - /// Get the string representation of the DICCommand enum values + /// Get the string representation of the CreatorCommand enum values /// - /// DICCommand value to convert + /// CreatorCommand value to convert /// String representing the value, if possible - public static string LongName(this DICCommand command) + public static string LongName(this CreatorCommand command) { switch (command) { - case DICCommand.Audio: - return DICCommandStrings.Audio; - case DICCommand.BluRay: - return DICCommandStrings.BluRay; - case DICCommand.Close: - return DICCommandStrings.Close; - case DICCommand.CompactDisc: - return DICCommandStrings.CompactDisc; - case DICCommand.Data: - return DICCommandStrings.Data; - case DICCommand.DigitalVideoDisc: - return DICCommandStrings.DigitalVideoDisc; - case DICCommand.Disk: - return DICCommandStrings.Disk; - case DICCommand.DriveSpeed: - return DICCommandStrings.DriveSpeed; - case DICCommand.Eject: - return DICCommandStrings.Eject; - case DICCommand.Floppy: - return DICCommandStrings.Floppy; - case DICCommand.GDROM: - return DICCommandStrings.GDROM; - case DICCommand.MDS: - return DICCommandStrings.MDS; - case DICCommand.Merge: - return DICCommandStrings.Merge; - case DICCommand.Reset: - return DICCommandStrings.Reset; - case DICCommand.SACD: - return DICCommandStrings.SACD; - case DICCommand.Start: - return DICCommandStrings.Start; - case DICCommand.Stop: - return DICCommandStrings.Stop; - case DICCommand.Sub: - return DICCommandStrings.Sub; - case DICCommand.Swap: - return DICCommandStrings.Swap; - case DICCommand.XBOX: - return DICCommandStrings.XBOX; - case DICCommand.XBOXSwap: - return DICCommandStrings.XBOXSwap; - case DICCommand.XGD2Swap: - return DICCommandStrings.XGD2Swap; - case DICCommand.XGD3Swap: - return DICCommandStrings.XGD3Swap; + case CreatorCommand.Audio: + return CreatorCommandStrings.Audio; + case CreatorCommand.BluRay: + return CreatorCommandStrings.BluRay; + case CreatorCommand.Close: + return CreatorCommandStrings.Close; + case CreatorCommand.CompactDisc: + return CreatorCommandStrings.CompactDisc; + case CreatorCommand.Data: + return CreatorCommandStrings.Data; + case CreatorCommand.DigitalVideoDisc: + return CreatorCommandStrings.DigitalVideoDisc; + case CreatorCommand.Disk: + return CreatorCommandStrings.Disk; + case CreatorCommand.DriveSpeed: + return CreatorCommandStrings.DriveSpeed; + case CreatorCommand.Eject: + return CreatorCommandStrings.Eject; + case CreatorCommand.Floppy: + return CreatorCommandStrings.Floppy; + case CreatorCommand.GDROM: + return CreatorCommandStrings.GDROM; + case CreatorCommand.MDS: + return CreatorCommandStrings.MDS; + case CreatorCommand.Merge: + return CreatorCommandStrings.Merge; + case CreatorCommand.Reset: + return CreatorCommandStrings.Reset; + case CreatorCommand.SACD: + return CreatorCommandStrings.SACD; + case CreatorCommand.Start: + return CreatorCommandStrings.Start; + case CreatorCommand.Stop: + return CreatorCommandStrings.Stop; + case CreatorCommand.Sub: + return CreatorCommandStrings.Sub; + case CreatorCommand.Swap: + return CreatorCommandStrings.Swap; + case CreatorCommand.XBOX: + return CreatorCommandStrings.XBOX; + case CreatorCommand.XBOXSwap: + return CreatorCommandStrings.XBOXSwap; + case CreatorCommand.XGD2Swap: + return CreatorCommandStrings.XGD2Swap; + case CreatorCommand.XGD3Swap: + return CreatorCommandStrings.XGD3Swap; - case DICCommand.NONE: + case CreatorCommand.NONE: default: return ""; } } /// - /// Get the string representation of the DICFlag enum values + /// Get the string representation of the CreatorFlag enum values /// - /// DICFlag value to convert + /// CreatorFlag value to convert /// String representing the value, if possible - public static string LongName(this DICFlag flag) + public static string LongName(this CreatorFlag flag) { switch (flag) { - case DICFlag.AddOffset: - return DICFlagStrings.AddOffset; - case DICFlag.AMSF: - return DICFlagStrings.AMSF; - case DICFlag.AtariJaguar: - return DICFlagStrings.AtariJaguar; - case DICFlag.BEOpcode: - return DICFlagStrings.BEOpcode; - case DICFlag.C2Opcode: - return DICFlagStrings.C2Opcode; - case DICFlag.CopyrightManagementInformation: - return DICFlagStrings.CopyrightManagementInformation; - case DICFlag.D8Opcode: - return DICFlagStrings.D8Opcode; - case DICFlag.DisableBeep: - return DICFlagStrings.DisableBeep; - case DICFlag.ForceUnitAccess: - return DICFlagStrings.ForceUnitAccess; - case DICFlag.MCN: - return DICFlagStrings.MCN; - case DICFlag.MultiSession: - return DICFlagStrings.MultiSession; - case DICFlag.NoFixSubP: - return DICFlagStrings.NoFixSubP; - case DICFlag.NoFixSubQ: - return DICFlagStrings.NoFixSubQ; - case DICFlag.NoFixSubQLibCrypt: - return DICFlagStrings.NoFixSubQLibCrypt; - case DICFlag.NoFixSubRtoW: - return DICFlagStrings.NoFixSubRtoW; - case DICFlag.NoFixSubQSecuROM: - return DICFlagStrings.NoFixSubQSecuROM; - case DICFlag.NoSkipSS: - return DICFlagStrings.NoSkipSS; - case DICFlag.Raw: - return DICFlagStrings.Raw; - case DICFlag.Reverse: - return DICFlagStrings.Reverse; - case DICFlag.ScanAntiMod: - return DICFlagStrings.ScanAntiMod; - case DICFlag.ScanFileProtect: - return DICFlagStrings.ScanFileProtect; - case DICFlag.ScanSectorProtect: - return DICFlagStrings.ScanSectorProtect; - case DICFlag.SeventyFour: - return DICFlagStrings.SeventyFour; - case DICFlag.SkipSector: - return DICFlagStrings.SkipSector; - case DICFlag.SubchannelReadLevel: - return DICFlagStrings.SubchannelReadLevel; - case DICFlag.VideoNow: - return DICFlagStrings.VideoNow; - case DICFlag.VideoNowColor: - return DICFlagStrings.VideoNowColor; + case CreatorFlag.AddOffset: + return CreatorFlagStrings.AddOffset; + case CreatorFlag.AMSF: + return CreatorFlagStrings.AMSF; + case CreatorFlag.AtariJaguar: + return CreatorFlagStrings.AtariJaguar; + case CreatorFlag.BEOpcode: + return CreatorFlagStrings.BEOpcode; + case CreatorFlag.C2Opcode: + return CreatorFlagStrings.C2Opcode; + case CreatorFlag.CopyrightManagementInformation: + return CreatorFlagStrings.CopyrightManagementInformation; + case CreatorFlag.D8Opcode: + return CreatorFlagStrings.D8Opcode; + case CreatorFlag.DisableBeep: + return CreatorFlagStrings.DisableBeep; + case CreatorFlag.ForceUnitAccess: + return CreatorFlagStrings.ForceUnitAccess; + case CreatorFlag.MCN: + return CreatorFlagStrings.MCN; + case CreatorFlag.MultiSession: + return CreatorFlagStrings.MultiSession; + case CreatorFlag.NoFixSubP: + return CreatorFlagStrings.NoFixSubP; + case CreatorFlag.NoFixSubQ: + return CreatorFlagStrings.NoFixSubQ; + case CreatorFlag.NoFixSubQLibCrypt: + return CreatorFlagStrings.NoFixSubQLibCrypt; + case CreatorFlag.NoFixSubRtoW: + return CreatorFlagStrings.NoFixSubRtoW; + case CreatorFlag.NoFixSubQSecuROM: + return CreatorFlagStrings.NoFixSubQSecuROM; + case CreatorFlag.NoSkipSS: + return CreatorFlagStrings.NoSkipSS; + case CreatorFlag.Raw: + return CreatorFlagStrings.Raw; + case CreatorFlag.Reverse: + return CreatorFlagStrings.Reverse; + case CreatorFlag.ScanAntiMod: + return CreatorFlagStrings.ScanAntiMod; + case CreatorFlag.ScanFileProtect: + return CreatorFlagStrings.ScanFileProtect; + case CreatorFlag.ScanSectorProtect: + return CreatorFlagStrings.ScanSectorProtect; + case CreatorFlag.SeventyFour: + return CreatorFlagStrings.SeventyFour; + case CreatorFlag.SkipSector: + return CreatorFlagStrings.SkipSector; + case CreatorFlag.SubchannelReadLevel: + return CreatorFlagStrings.SubchannelReadLevel; + case CreatorFlag.VideoNow: + return CreatorFlagStrings.VideoNow; + case CreatorFlag.VideoNowColor: + return CreatorFlagStrings.VideoNowColor; - case DICFlag.NONE: + case CreatorFlag.NONE: default: return ""; } diff --git a/DICUI.Library/Utilities/Parameters.cs b/DICUI.Library/Utilities/CreatorParameters.cs similarity index 62% rename from DICUI.Library/Utilities/Parameters.cs rename to DICUI.Library/Utilities/CreatorParameters.cs index 15ed3d86..09806404 100644 --- a/DICUI.Library/Utilities/Parameters.cs +++ b/DICUI.Library/Utilities/CreatorParameters.cs @@ -10,12 +10,12 @@ namespace DICUI.Utilities /// /// Represents a generic set of DiscImageCreator parameters /// - public class Parameters + public class CreatorParameters { /// /// Base DiscImageCreator command to run /// - public DICCommand Command { get; set; } + public CreatorCommand Command { get; set; } /// /// Drive letter or path to pass to DiscImageCreator @@ -50,8 +50,8 @@ namespace DICUI.Utilities /// /// Set of flags to pass to DiscImageCreator /// - private Dictionary _flags = new Dictionary(); - public bool this[DICFlag key] + private Dictionary _flags = new Dictionary(); + public bool this[CreatorFlag key] { get { @@ -64,7 +64,7 @@ namespace DICUI.Utilities _flags[key] = value; } } - internal IEnumerable Keys => _flags.Keys; + internal IEnumerable Keys => _flags.Keys; #region DIC Flag Values @@ -125,12 +125,12 @@ namespace DICUI.Utilities /// Populate a Parameters object from a param string /// /// String possibly representing a set of parameters - public Parameters(string parameters) + public CreatorParameters(string parameters) { // If any parameters are not valid, wipe out everything if (!ValidateAndSetParameters(parameters)) { - Command = DICCommand.NONE; + Command = CreatorCommand.NONE; DriveLetter = null; DriveSpeed = null; @@ -140,7 +140,7 @@ namespace DICUI.Utilities StartLBAValue = null; EndLBAValue = null; - _flags = new Dictionary(); + _flags = new Dictionary(); AddOffsetValue = null; BEOpcodeValue = null; @@ -163,7 +163,7 @@ namespace DICUI.Utilities /// Drive speed to use /// Enable paranoid mode (safer dumping) /// User-defined reread count - public Parameters(KnownSystem? system, MediaType? type, char driveLetter, string filename, int? driveSpeed, bool paranoid, int rereadCount) + public CreatorParameters(KnownSystem? system, MediaType? type, char driveLetter, string filename, int? driveSpeed, bool paranoid, int rereadCount) { SetBaseCommand(system, type); DriveLetter = driveLetter.ToString(); @@ -198,29 +198,29 @@ namespace DICUI.Utilities // Determine what the commandline should look like given the first item switch (Command) { - case DICCommand.Audio: - case DICCommand.CompactDisc: - case DICCommand.Data: - case DICCommand.DigitalVideoDisc: - case DICCommand.GDROM: - case DICCommand.Swap: + case CreatorCommand.Audio: + case CreatorCommand.CompactDisc: + case CreatorCommand.Data: + case CreatorCommand.DigitalVideoDisc: + case CreatorCommand.GDROM: + case CreatorCommand.Swap: // GameCube and Wii - if (this[DICFlag.Raw]) + if (this[CreatorFlag.Raw]) { type = MediaType.NintendoGameCubeGameDisc; system = KnownSystem.NintendoGameCube; } // PlayStation - else if (this[DICFlag.NoFixSubQLibCrypt] - || this[DICFlag.ScanAntiMod]) + else if (this[CreatorFlag.NoFixSubQLibCrypt] + || this[CreatorFlag.ScanAntiMod]) { type = MediaType.CDROM; system = KnownSystem.SonyPlayStation; } // Saturn - else if (this[DICFlag.SeventyFour]) + else if (this[CreatorFlag.SeventyFour]) { type = MediaType.CDROM; system = KnownSystem.SegaSaturn; @@ -240,32 +240,32 @@ namespace DICUI.Utilities { List parameters = new List(); - if (Command != DICCommand.NONE) + if (Command != CreatorCommand.NONE) parameters.Add(Command.LongName()); else return null; // Drive Letter - if (Command == DICCommand.Audio - || Command == DICCommand.BluRay - || Command == DICCommand.Close - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.DigitalVideoDisc - || Command == DICCommand.Disk - || Command == DICCommand.DriveSpeed - || Command == DICCommand.Eject - || Command == DICCommand.Floppy - || Command == DICCommand.GDROM - || Command == DICCommand.Reset - || Command == DICCommand.SACD - || Command == DICCommand.Start - || Command == DICCommand.Stop - || Command == DICCommand.Swap - || Command == DICCommand.XBOX - || Command == DICCommand.XBOXSwap - || Command == DICCommand.XGD2Swap - || Command == DICCommand.XGD3Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.BluRay + || Command == CreatorCommand.Close + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.DigitalVideoDisc + || Command == CreatorCommand.Disk + || Command == CreatorCommand.DriveSpeed + || Command == CreatorCommand.Eject + || Command == CreatorCommand.Floppy + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.Reset + || Command == CreatorCommand.SACD + || Command == CreatorCommand.Start + || Command == CreatorCommand.Stop + || Command == CreatorCommand.Swap + || Command == CreatorCommand.XBOX + || Command == CreatorCommand.XBOXSwap + || Command == CreatorCommand.XGD2Swap + || Command == CreatorCommand.XGD3Swap) { if (DriveLetter != null) parameters.Add(DriveLetter); @@ -274,23 +274,23 @@ namespace DICUI.Utilities } // Filename - if (Command == DICCommand.Audio - || Command == DICCommand.BluRay - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.DigitalVideoDisc - || Command == DICCommand.Disk - || Command == DICCommand.Floppy - || Command == DICCommand.GDROM - || Command == DICCommand.MDS - || Command == DICCommand.Merge - || Command == DICCommand.SACD - || Command == DICCommand.Swap - || Command == DICCommand.Sub - || Command == DICCommand.XBOX - || Command == DICCommand.XBOXSwap - || Command == DICCommand.XGD2Swap - || Command == DICCommand.XGD3Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.BluRay + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.DigitalVideoDisc + || Command == CreatorCommand.Disk + || Command == CreatorCommand.Floppy + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.MDS + || Command == CreatorCommand.Merge + || Command == CreatorCommand.SACD + || Command == CreatorCommand.Swap + || Command == CreatorCommand.Sub + || Command == CreatorCommand.XBOX + || Command == CreatorCommand.XBOXSwap + || Command == CreatorCommand.XGD2Swap + || Command == CreatorCommand.XGD3Swap) { if (Filename != null) parameters.Add("\"" + Filename.Trim('"') + "\""); @@ -299,7 +299,7 @@ namespace DICUI.Utilities } // Optiarc Filename - if (Command == DICCommand.Merge) + if (Command == CreatorCommand.Merge) { if (OptiarcFilename != null) parameters.Add("\"" + OptiarcFilename.Trim('"') + "\""); @@ -308,18 +308,18 @@ namespace DICUI.Utilities } // Drive Speed - if (Command == DICCommand.Audio - || Command == DICCommand.BluRay - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.DigitalVideoDisc - || Command == DICCommand.GDROM - || Command == DICCommand.SACD - || Command == DICCommand.Swap - || Command == DICCommand.XBOX - || Command == DICCommand.XBOXSwap - || Command == DICCommand.XGD2Swap - || Command == DICCommand.XGD3Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.BluRay + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.DigitalVideoDisc + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.SACD + || Command == CreatorCommand.Swap + || Command == CreatorCommand.XBOX + || Command == CreatorCommand.XBOXSwap + || Command == CreatorCommand.XGD2Swap + || Command == CreatorCommand.XGD3Swap) { if (DriveSpeed != null) parameters.Add(DriveSpeed.ToString()); @@ -328,8 +328,8 @@ namespace DICUI.Utilities } // LBA Markers - if (Command == DICCommand.Audio - || Command == DICCommand.Data) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.Data) { if (StartLBAValue != null && StartLBAValue > 0 && EndLBAValue != null && EndLBAValue > 0) @@ -342,12 +342,12 @@ namespace DICUI.Utilities } // Add Offset - if (Command == DICCommand.Audio - || Command == DICCommand.CompactDisc) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.CompactDisc) { - if (this[DICFlag.AddOffset]) + if (this[CreatorFlag.AddOffset]) { - parameters.Add(DICFlag.AddOffset.LongName()); + parameters.Add(CreatorFlag.AddOffset.LongName()); if (AddOffsetValue != null) parameters.Add(AddOffsetValue.ToString()); else @@ -356,29 +356,29 @@ namespace DICUI.Utilities } // AMSF Dumping - if (Command == DICCommand.CompactDisc) + if (Command == CreatorCommand.CompactDisc) { - if (this[DICFlag.AMSF]) - parameters.Add(DICFlag.AMSF.LongName()); + if (this[CreatorFlag.AMSF]) + parameters.Add(CreatorFlag.AMSF.LongName()); } // Atari Jaguar CD - if (Command == DICCommand.CompactDisc) + if (Command == CreatorCommand.CompactDisc) { - if (this[DICFlag.AtariJaguar]) - parameters.Add(DICFlag.AtariJaguar.LongName()); + if (this[CreatorFlag.AtariJaguar]) + parameters.Add(CreatorFlag.AtariJaguar.LongName()); } // BE Opcode - if (Command == DICCommand.Audio - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.GDROM - || Command == DICCommand.Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.Swap) { - if (this[DICFlag.BEOpcode] && !this[DICFlag.D8Opcode]) + if (this[CreatorFlag.BEOpcode] && !this[CreatorFlag.D8Opcode]) { - parameters.Add(DICFlag.BEOpcode.LongName()); + parameters.Add(CreatorFlag.BEOpcode.LongName()); if (BEOpcodeValue != null && (BEOpcodeValue == "raw" || BEOpcodeValue == "pack")) parameters.Add(BEOpcodeValue); @@ -386,15 +386,15 @@ namespace DICUI.Utilities } // C2 Opcode - if (Command == DICCommand.Audio - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.GDROM - || Command == DICCommand.Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.Swap) { - if (this[DICFlag.C2Opcode]) + if (this[CreatorFlag.C2Opcode]) { - parameters.Add(DICFlag.C2Opcode.LongName()); + parameters.Add(CreatorFlag.C2Opcode.LongName()); if (C2OpcodeValue[0] != null) { if (C2OpcodeValue[0] > 0) @@ -427,171 +427,171 @@ namespace DICUI.Utilities } // Copyright Management Information - if (Command == DICCommand.DigitalVideoDisc) + if (Command == CreatorCommand.DigitalVideoDisc) { - if (this[DICFlag.CopyrightManagementInformation]) - parameters.Add(DICFlag.CopyrightManagementInformation.LongName()); + if (this[CreatorFlag.CopyrightManagementInformation]) + parameters.Add(CreatorFlag.CopyrightManagementInformation.LongName()); } // D8 Opcode - if (Command == DICCommand.Audio - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.GDROM - || Command == DICCommand.Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.Swap) { - if (this[DICFlag.D8Opcode]) - parameters.Add(DICFlag.D8Opcode.LongName()); + if (this[CreatorFlag.D8Opcode]) + parameters.Add(CreatorFlag.D8Opcode.LongName()); } // Disable Beep - if (Command == DICCommand.Audio - || Command == DICCommand.BluRay - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.DigitalVideoDisc - || Command == DICCommand.GDROM - || Command == DICCommand.Swap - || Command == DICCommand.XBOX) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.BluRay + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.DigitalVideoDisc + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.Swap + || Command == CreatorCommand.XBOX) { - if (this[DICFlag.DisableBeep]) - parameters.Add(DICFlag.DisableBeep.LongName()); + if (this[CreatorFlag.DisableBeep]) + parameters.Add(CreatorFlag.DisableBeep.LongName()); } // Force Unit Access - if (Command == DICCommand.Audio - || Command == DICCommand.BluRay - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.DigitalVideoDisc - || Command == DICCommand.Swap - || Command == DICCommand.XBOX) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.BluRay + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.DigitalVideoDisc + || Command == CreatorCommand.Swap + || Command == CreatorCommand.XBOX) { - if (this[DICFlag.ForceUnitAccess]) + if (this[CreatorFlag.ForceUnitAccess]) { - parameters.Add(DICFlag.ForceUnitAccess.LongName()); + parameters.Add(CreatorFlag.ForceUnitAccess.LongName()); if (ForceUnitAccessValue != null) parameters.Add(ForceUnitAccessValue.ToString()); } } // MCN - if (Command == DICCommand.CompactDisc) + if (Command == CreatorCommand.CompactDisc) { - if (this[DICFlag.MCN]) - parameters.Add(DICFlag.MCN.LongName()); + if (this[CreatorFlag.MCN]) + parameters.Add(CreatorFlag.MCN.LongName()); } // Multi-Session - if (Command == DICCommand.CompactDisc) + if (Command == CreatorCommand.CompactDisc) { - if (this[DICFlag.MultiSession]) - parameters.Add(DICFlag.MultiSession.LongName()); + if (this[CreatorFlag.MultiSession]) + parameters.Add(CreatorFlag.MultiSession.LongName()); } // Not fix SubP - if (Command == DICCommand.Audio - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.GDROM - || Command == DICCommand.Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.Swap) { - if (this[DICFlag.NoFixSubP]) - parameters.Add(DICFlag.NoFixSubP.LongName()); + if (this[CreatorFlag.NoFixSubP]) + parameters.Add(CreatorFlag.NoFixSubP.LongName()); } // Not fix SubQ - if (Command == DICCommand.Audio - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.GDROM - || Command == DICCommand.Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.Swap) { - if (this[DICFlag.NoFixSubQ]) - parameters.Add(DICFlag.NoFixSubQ.LongName()); + if (this[CreatorFlag.NoFixSubQ]) + parameters.Add(CreatorFlag.NoFixSubQ.LongName()); } // Not fix SubQ (PlayStation LibCrypt) - if (Command == DICCommand.Audio - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.GDROM - || Command == DICCommand.Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.Swap) { - if (this[DICFlag.NoFixSubQLibCrypt]) - parameters.Add(DICFlag.NoFixSubQLibCrypt.LongName()); + if (this[CreatorFlag.NoFixSubQLibCrypt]) + parameters.Add(CreatorFlag.NoFixSubQLibCrypt.LongName()); } // Not fix SubQ (SecuROM) - if (Command == DICCommand.Audio - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.GDROM - || Command == DICCommand.Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.Swap) { - if (this[DICFlag.NoFixSubQSecuROM]) - parameters.Add(DICFlag.NoFixSubQSecuROM.LongName()); + if (this[CreatorFlag.NoFixSubQSecuROM]) + parameters.Add(CreatorFlag.NoFixSubQSecuROM.LongName()); } // Not fix SubRtoW - if (Command == DICCommand.Audio - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.GDROM - || Command == DICCommand.Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.Swap) { - if (this[DICFlag.NoFixSubRtoW]) - parameters.Add(DICFlag.NoFixSubRtoW.LongName()); + if (this[CreatorFlag.NoFixSubRtoW]) + parameters.Add(CreatorFlag.NoFixSubRtoW.LongName()); } // Not skip security sectors - if (Command == DICCommand.XBOX - || Command == DICCommand.XBOXSwap - || Command == DICCommand.XGD2Swap - || Command == DICCommand.XGD3Swap) + if (Command == CreatorCommand.XBOX + || Command == CreatorCommand.XBOXSwap + || Command == CreatorCommand.XGD2Swap + || Command == CreatorCommand.XGD3Swap) { - if (this[DICFlag.NoSkipSS]) + if (this[CreatorFlag.NoSkipSS]) { - parameters.Add(DICFlag.NoSkipSS.LongName()); + parameters.Add(CreatorFlag.NoSkipSS.LongName()); if (NoSkipSecuritySectorValue != null) parameters.Add(NoSkipSecuritySectorValue.ToString()); } } // Raw read (2064 byte/sector) - if (Command == DICCommand.DigitalVideoDisc) + if (Command == CreatorCommand.DigitalVideoDisc) { - if (this[DICFlag.Raw]) - parameters.Add(DICFlag.Raw.LongName()); + if (this[CreatorFlag.Raw]) + parameters.Add(CreatorFlag.Raw.LongName()); } // Reverse read - if (Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.DigitalVideoDisc) + if (Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.DigitalVideoDisc) { - if (this[DICFlag.Reverse]) - parameters.Add(DICFlag.Reverse.LongName()); + if (this[CreatorFlag.Reverse]) + parameters.Add(CreatorFlag.Reverse.LongName()); } // Scan PlayStation anti-mod strings - if (Command == DICCommand.CompactDisc - || Command == DICCommand.Data) + if (Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data) { - if (this[DICFlag.ScanAntiMod]) - parameters.Add(DICFlag.ScanAntiMod.LongName()); + if (this[CreatorFlag.ScanAntiMod]) + parameters.Add(CreatorFlag.ScanAntiMod.LongName()); } // Scan file to detect protect - if (Command == DICCommand.Audio - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.DigitalVideoDisc - || Command == DICCommand.Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.DigitalVideoDisc + || Command == CreatorCommand.Swap) { - if (this[DICFlag.ScanFileProtect]) + if (this[CreatorFlag.ScanFileProtect]) { - parameters.Add(DICFlag.ScanFileProtect.LongName()); + parameters.Add(CreatorFlag.ScanFileProtect.LongName()); if (ScanFileProtectValue != null) { if (ScanFileProtectValue > 0) @@ -603,29 +603,29 @@ namespace DICUI.Utilities } // Scan file to detect protect - if (Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.Swap) + if (Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.Swap) { - if (this[DICFlag.ScanSectorProtect]) - parameters.Add(DICFlag.ScanSectorProtect.LongName()); + if (this[CreatorFlag.ScanSectorProtect]) + parameters.Add(CreatorFlag.ScanSectorProtect.LongName()); } // Scan 74:00:00 (Saturn) - if (Command == DICCommand.Swap) + if (Command == CreatorCommand.Swap) { - if (this[DICFlag.SeventyFour]) - parameters.Add(DICFlag.SeventyFour.LongName()); + if (this[CreatorFlag.SeventyFour]) + parameters.Add(CreatorFlag.SeventyFour.LongName()); } // Skip sectors - if (Command == DICCommand.Data) + if (Command == CreatorCommand.Data) { - if (this[DICFlag.SkipSector]) + if (this[CreatorFlag.SkipSector]) { if (SkipSectorValue[0] != null && SkipSectorValue[1] != null) { - parameters.Add(DICFlag.SkipSector.LongName()); + parameters.Add(CreatorFlag.SkipSector.LongName()); if (SkipSectorValue[0] >= 0 && SkipSectorValue[1] >= 0) { parameters.Add(SkipSectorValue[0].ToString()); @@ -640,15 +640,15 @@ namespace DICUI.Utilities } // Set Subchannel read level - if (Command == DICCommand.Audio - || Command == DICCommand.CompactDisc - || Command == DICCommand.Data - || Command == DICCommand.GDROM - || Command == DICCommand.Swap) + if (Command == CreatorCommand.Audio + || Command == CreatorCommand.CompactDisc + || Command == CreatorCommand.Data + || Command == CreatorCommand.GDROM + || Command == CreatorCommand.Swap) { - if (this[DICFlag.SubchannelReadLevel]) + if (this[CreatorFlag.SubchannelReadLevel]) { - parameters.Add(DICFlag.SubchannelReadLevel.LongName()); + parameters.Add(CreatorFlag.SubchannelReadLevel.LongName()); if (SubchannelReadLevelValue != null) { if (SubchannelReadLevelValue >= 0 && SubchannelReadLevelValue <= 2) @@ -660,11 +660,11 @@ namespace DICUI.Utilities } // VideoNow - if (Command == DICCommand.CompactDisc) + if (Command == CreatorCommand.CompactDisc) { - if (this[DICFlag.VideoNow]) + if (this[CreatorFlag.VideoNow]) { - parameters.Add(DICFlag.VideoNow.LongName()); + parameters.Add(CreatorFlag.VideoNow.LongName()); if (VideoNowValue != null) { if (VideoNowValue >= 0) @@ -676,10 +676,10 @@ namespace DICUI.Utilities } // VideoNow Color - if (Command == DICCommand.CompactDisc) + if (Command == CreatorCommand.CompactDisc) { - if (this[DICFlag.VideoNowColor]) - parameters.Add(DICFlag.VideoNowColor.LongName()); + if (this[CreatorFlag.VideoNowColor]) + parameters.Add(CreatorFlag.VideoNowColor.LongName()); } return string.Join(" ", parameters); @@ -717,7 +717,7 @@ namespace DICUI.Utilities int index = -1; switch (parts[0]) { - case DICCommandStrings.Audio: + case CreatorCommandStrings.Audio: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -743,11 +743,11 @@ namespace DICUI.Utilities else EndLBAValue = Int32.Parse(parts[5]); - Command = DICCommand.Audio; + Command = CreatorCommand.Audio; index = 6; break; - case DICCommandStrings.BluRay: + case CreatorCommandStrings.BluRay: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -763,11 +763,11 @@ namespace DICUI.Utilities else DriveSpeed = Int32.Parse(parts[3]); - Command = DICCommand.BluRay; + Command = CreatorCommand.BluRay; index = 4; break; - case DICCommandStrings.Close: + case CreatorCommandStrings.Close: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -776,10 +776,10 @@ namespace DICUI.Utilities if (parts.Count > 2) return false; - Command = DICCommand.Close; + Command = CreatorCommand.Close; break; - case DICCommandStrings.CompactDisc: + case CreatorCommandStrings.CompactDisc: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -795,11 +795,11 @@ namespace DICUI.Utilities else DriveSpeed = Int32.Parse(parts[3]); - Command = DICCommand.CompactDisc; + Command = CreatorCommand.CompactDisc; index = 4; break; - case DICCommandStrings.Data: + case CreatorCommandStrings.Data: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -825,11 +825,11 @@ namespace DICUI.Utilities else EndLBAValue = Int32.Parse(parts[5]); - Command = DICCommand.Data; + Command = CreatorCommand.Data; index = 6; break; - case DICCommandStrings.DigitalVideoDisc: + case CreatorCommandStrings.DigitalVideoDisc: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -845,11 +845,11 @@ namespace DICUI.Utilities else DriveSpeed = Int32.Parse(parts[3]); - Command = DICCommand.DigitalVideoDisc; + Command = CreatorCommand.DigitalVideoDisc; index = 4; break; - case DICCommandStrings.Disk: + case CreatorCommandStrings.Disk: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -863,10 +863,10 @@ namespace DICUI.Utilities if (parts.Count > 3) return false; - Command = DICCommand.Disk; + Command = CreatorCommand.Disk; break; - case DICCommandStrings.DriveSpeed: + case CreatorCommandStrings.DriveSpeed: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -875,10 +875,10 @@ namespace DICUI.Utilities if (parts.Count > 2) return false; - Command = DICCommand.DriveSpeed; + Command = CreatorCommand.DriveSpeed; break; - case DICCommandStrings.Eject: + case CreatorCommandStrings.Eject: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -887,10 +887,10 @@ namespace DICUI.Utilities if (parts.Count > 2) return false; - Command = DICCommand.Eject; + Command = CreatorCommand.Eject; break; - case DICCommandStrings.Floppy: + case CreatorCommandStrings.Floppy: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -904,10 +904,10 @@ namespace DICUI.Utilities if (parts.Count > 3) return false; - Command = DICCommand.Floppy; + Command = CreatorCommand.Floppy; break; - case DICCommandStrings.GDROM: + case CreatorCommandStrings.GDROM: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -923,11 +923,11 @@ namespace DICUI.Utilities else DriveSpeed = Int32.Parse(parts[3]); - Command = DICCommand.GDROM; + Command = CreatorCommand.GDROM; index = 4; break; - case DICCommandStrings.MDS: + case CreatorCommandStrings.MDS: if (!DoesExist(parts, 1) || IsFlag(parts[1]) || !File.Exists(parts[1])) return false; else @@ -936,10 +936,10 @@ namespace DICUI.Utilities if (parts.Count > 2) return false; - Command = DICCommand.MDS; + Command = CreatorCommand.MDS; break; - case DICCommandStrings.Merge: + case CreatorCommandStrings.Merge: if (!DoesExist(parts, 1) || IsFlag(parts[1]) || !File.Exists(parts[1])) return false; else @@ -953,10 +953,10 @@ namespace DICUI.Utilities if (parts.Count > 3) return false; - Command = DICCommand.Merge; + Command = CreatorCommand.Merge; break; - case DICCommandStrings.Reset: + case CreatorCommandStrings.Reset: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -965,10 +965,10 @@ namespace DICUI.Utilities if (parts.Count > 2) return false; - Command = DICCommand.Reset; + Command = CreatorCommand.Reset; break; - case DICCommandStrings.SACD: + case CreatorCommandStrings.SACD: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -987,10 +987,10 @@ namespace DICUI.Utilities if (parts.Count > 4) return false; - Command = DICCommand.SACD; + Command = CreatorCommand.SACD; break; - case DICCommandStrings.Start: + case CreatorCommandStrings.Start: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -999,10 +999,10 @@ namespace DICUI.Utilities if (parts.Count > 2) return false; - Command = DICCommand.Start; + Command = CreatorCommand.Start; break; - case DICCommandStrings.Stop: + case CreatorCommandStrings.Stop: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -1011,10 +1011,10 @@ namespace DICUI.Utilities if (parts.Count > 2) return false; - Command = DICCommand.Stop; + Command = CreatorCommand.Stop; break; - case DICCommandStrings.Sub: + case CreatorCommandStrings.Sub: if (!DoesExist(parts, 1) || IsFlag(parts[1]) || !File.Exists(parts[1])) return false; else @@ -1023,10 +1023,10 @@ namespace DICUI.Utilities if (parts.Count > 2) return false; - Command = DICCommand.Sub; + Command = CreatorCommand.Sub; break; - case DICCommandStrings.Swap: + case CreatorCommandStrings.Swap: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -1042,11 +1042,11 @@ namespace DICUI.Utilities else DriveSpeed = Int32.Parse(parts[3]); - Command = DICCommand.Swap; + Command = CreatorCommand.Swap; index = 4; break; - case DICCommandStrings.XBOX: + case CreatorCommandStrings.XBOX: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -1062,13 +1062,13 @@ namespace DICUI.Utilities else DriveSpeed = Int32.Parse(parts[3]); - Command = DICCommand.XBOX; + Command = CreatorCommand.XBOX; index = 4; break; - case DICCommandStrings.XBOXSwap: - case DICCommandStrings.XGD2Swap: - case DICCommandStrings.XGD3Swap: + case CreatorCommandStrings.XBOXSwap: + case CreatorCommandStrings.XGD2Swap: + case CreatorCommandStrings.XGD3Swap: if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1])) return false; else @@ -1102,66 +1102,66 @@ namespace DICUI.Utilities { switch (parts[i]) { - case DICFlagStrings.AddOffset: - if (parts[0] != DICCommandStrings.Audio - && parts[0] != DICCommandStrings.CompactDisc) + case CreatorFlagStrings.AddOffset: + if (parts[0] != CreatorCommandStrings.Audio + && parts[0] != CreatorCommandStrings.CompactDisc) return false; else if (!DoesExist(parts, i + 1)) return false; else if (!IsValidNumber(parts[i + 1])) return false; - this[DICFlag.AddOffset] = true; + this[CreatorFlag.AddOffset] = true; AddOffsetValue = Int32.Parse(parts[i + 1]); i++; break; - case DICFlagStrings.AMSF: - if (parts[0] != DICCommandStrings.CompactDisc) + case CreatorFlagStrings.AMSF: + if (parts[0] != CreatorCommandStrings.CompactDisc) return false; - this[DICFlag.AMSF] = true; + this[CreatorFlag.AMSF] = true; break; - case DICFlagStrings.AtariJaguar: - if (parts[0] != DICCommandStrings.CompactDisc) + case CreatorFlagStrings.AtariJaguar: + if (parts[0] != CreatorCommandStrings.CompactDisc) return false; - this[DICFlag.AtariJaguar] = true; + this[CreatorFlag.AtariJaguar] = true; break; - case DICFlagStrings.BEOpcode: - if (parts[0] != DICCommandStrings.Audio - && parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.GDROM) + case CreatorFlagStrings.BEOpcode: + if (parts[0] != CreatorCommandStrings.Audio + && parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.GDROM) return false; else if (!DoesExist(parts, i + 1)) { - this[DICFlag.BEOpcode] = true; + this[CreatorFlag.BEOpcode] = true; break; } else if (IsFlag(parts[i + 1])) { - this[DICFlag.BEOpcode] = true; + this[CreatorFlag.BEOpcode] = true; break; } else if (parts[i + 1] != "raw" && (parts[i + 1] != "pack")) return false; - this[DICFlag.BEOpcode] = true; + this[CreatorFlag.BEOpcode] = true; BEOpcodeValue = parts[i + 1]; i++; break; - case DICFlagStrings.C2Opcode: - if (parts[0] != DICCommandStrings.Audio - && parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.GDROM) + case CreatorFlagStrings.C2Opcode: + if (parts[0] != CreatorCommandStrings.Audio + && parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.GDROM) return false; - this[DICFlag.C2Opcode] = true; + this[CreatorFlag.C2Opcode] = true; for (int j = 0; j < 4; j++) { if (!DoesExist(parts, i + 1)) @@ -1179,211 +1179,211 @@ namespace DICUI.Utilities break; - case DICFlagStrings.CopyrightManagementInformation: - if (parts[0] != DICCommandStrings.DigitalVideoDisc) + case CreatorFlagStrings.CopyrightManagementInformation: + if (parts[0] != CreatorCommandStrings.DigitalVideoDisc) return false; - this[DICFlag.CopyrightManagementInformation] = true; + this[CreatorFlag.CopyrightManagementInformation] = true; break; - case DICFlagStrings.D8Opcode: - if (parts[0] != DICCommandStrings.Audio - && parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.GDROM) + case CreatorFlagStrings.D8Opcode: + if (parts[0] != CreatorCommandStrings.Audio + && parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.GDROM) return false; - this[DICFlag.D8Opcode] = true; + this[CreatorFlag.D8Opcode] = true; break; - case DICFlagStrings.DisableBeep: - if (parts[0] != DICCommandStrings.Audio - && parts[0] != DICCommandStrings.BluRay - && parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.DigitalVideoDisc - && parts[0] != DICCommandStrings.GDROM - && parts[0] != DICCommandStrings.XBOX) + case CreatorFlagStrings.DisableBeep: + if (parts[0] != CreatorCommandStrings.Audio + && parts[0] != CreatorCommandStrings.BluRay + && parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.DigitalVideoDisc + && parts[0] != CreatorCommandStrings.GDROM + && parts[0] != CreatorCommandStrings.XBOX) return false; - this[DICFlag.DisableBeep] = true; + this[CreatorFlag.DisableBeep] = true; break; - case DICFlagStrings.ForceUnitAccess: - if (parts[0] != DICCommandStrings.Audio - && parts[0] != DICCommandStrings.BluRay - && parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.DigitalVideoDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.GDROM - && parts[0] != DICCommandStrings.XBOX) + case CreatorFlagStrings.ForceUnitAccess: + if (parts[0] != CreatorCommandStrings.Audio + && parts[0] != CreatorCommandStrings.BluRay + && parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.DigitalVideoDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.GDROM + && parts[0] != CreatorCommandStrings.XBOX) return false; else if (!DoesExist(parts, i + 1)) { - this[DICFlag.ForceUnitAccess] = true; + this[CreatorFlag.ForceUnitAccess] = true; break; } else if (IsFlag(parts[i + 1])) { - this[DICFlag.ForceUnitAccess] = true; + this[CreatorFlag.ForceUnitAccess] = true; break; } else if (!IsValidNumber(parts[i + 1], lowerBound: 0)) return false; - this[DICFlag.ForceUnitAccess] = true; + this[CreatorFlag.ForceUnitAccess] = true; ForceUnitAccessValue = Int32.Parse(parts[i + 1]); i++; break; - case DICFlagStrings.MCN: - if (parts[0] != DICCommandStrings.CompactDisc) + case CreatorFlagStrings.MCN: + if (parts[0] != CreatorCommandStrings.CompactDisc) return false; - this[DICFlag.MCN] = true; + this[CreatorFlag.MCN] = true; break; - case DICFlagStrings.MultiSession: - if (parts[0] != DICCommandStrings.CompactDisc) + case CreatorFlagStrings.MultiSession: + if (parts[0] != CreatorCommandStrings.CompactDisc) return false; - this[DICFlag.MultiSession] = true; + this[CreatorFlag.MultiSession] = true; break; - case DICFlagStrings.NoFixSubP: - if (parts[0] != DICCommandStrings.Audio - && parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.GDROM) + case CreatorFlagStrings.NoFixSubP: + if (parts[0] != CreatorCommandStrings.Audio + && parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.GDROM) return false; - this[DICFlag.NoFixSubP] = true; + this[CreatorFlag.NoFixSubP] = true; break; - case DICFlagStrings.NoFixSubQ: - if (parts[0] != DICCommandStrings.Audio - && parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.GDROM) + case CreatorFlagStrings.NoFixSubQ: + if (parts[0] != CreatorCommandStrings.Audio + && parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.GDROM) return false; - this[DICFlag.NoFixSubQ] = true; + this[CreatorFlag.NoFixSubQ] = true; break; - case DICFlagStrings.NoFixSubQLibCrypt: - if (parts[0] != DICCommandStrings.CompactDisc) + case CreatorFlagStrings.NoFixSubQLibCrypt: + if (parts[0] != CreatorCommandStrings.CompactDisc) return false; - this[DICFlag.NoFixSubQLibCrypt] = true; + this[CreatorFlag.NoFixSubQLibCrypt] = true; break; - case DICFlagStrings.NoFixSubRtoW: - if (parts[0] != DICCommandStrings.Audio - && parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.GDROM) + case CreatorFlagStrings.NoFixSubRtoW: + if (parts[0] != CreatorCommandStrings.Audio + && parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.GDROM) return false; - this[DICFlag.NoFixSubRtoW] = true; + this[CreatorFlag.NoFixSubRtoW] = true; break; - case DICFlagStrings.NoFixSubQSecuROM: - if (parts[0] != DICCommandStrings.Audio - && parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.GDROM) + case CreatorFlagStrings.NoFixSubQSecuROM: + if (parts[0] != CreatorCommandStrings.Audio + && parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.GDROM) return false; - this[DICFlag.NoFixSubQSecuROM] = true; + this[CreatorFlag.NoFixSubQSecuROM] = true; break; - case DICFlagStrings.NoSkipSS: - if (parts[0] != DICCommandStrings.XBOX - && parts[0] != DICCommandStrings.XBOXSwap - && parts[0] != DICCommandStrings.XGD2Swap - && parts[0] != DICCommandStrings.XGD3Swap) + case CreatorFlagStrings.NoSkipSS: + if (parts[0] != CreatorCommandStrings.XBOX + && parts[0] != CreatorCommandStrings.XBOXSwap + && parts[0] != CreatorCommandStrings.XGD2Swap + && parts[0] != CreatorCommandStrings.XGD3Swap) return false; else if (!DoesExist(parts, i + 1)) { - this[DICFlag.NoSkipSS] = true; + this[CreatorFlag.NoSkipSS] = true; break; } else if (IsFlag(parts[i + 1])) { - this[DICFlag.NoSkipSS] = true; + this[CreatorFlag.NoSkipSS] = true; break; } else if (!IsValidNumber(parts[i + 1], lowerBound: 0)) return false; - this[DICFlag.NoSkipSS] = true; + this[CreatorFlag.NoSkipSS] = true; ForceUnitAccessValue = Int32.Parse(parts[i + 1]); i++; break; - case DICFlagStrings.Raw: - if (parts[0] != DICCommandStrings.DigitalVideoDisc) + case CreatorFlagStrings.Raw: + if (parts[0] != CreatorCommandStrings.DigitalVideoDisc) return false; - this[DICFlag.Raw] = true; + this[CreatorFlag.Raw] = true; break; - case DICFlagStrings.Reverse: - if (parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.DigitalVideoDisc) + case CreatorFlagStrings.Reverse: + if (parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.DigitalVideoDisc) return false; - this[DICFlag.Reverse] = true; + this[CreatorFlag.Reverse] = true; break; - case DICFlagStrings.ScanAntiMod: - if (parts[0] != DICCommandStrings.CompactDisc) + case CreatorFlagStrings.ScanAntiMod: + if (parts[0] != CreatorCommandStrings.CompactDisc) return false; - this[DICFlag.ScanAntiMod] = true; + this[CreatorFlag.ScanAntiMod] = true; break; - case DICFlagStrings.ScanFileProtect: - if (parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.DigitalVideoDisc) + case CreatorFlagStrings.ScanFileProtect: + if (parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.DigitalVideoDisc) return false; else if (!DoesExist(parts, i + 1)) { - this[DICFlag.ScanFileProtect] = true; + this[CreatorFlag.ScanFileProtect] = true; break; } else if (IsFlag(parts[i + 1])) { - this[DICFlag.ScanFileProtect] = true; + this[CreatorFlag.ScanFileProtect] = true; break; } else if (!IsValidNumber(parts[i + 1], lowerBound: 0)) return false; - this[DICFlag.ScanFileProtect] = true; + this[CreatorFlag.ScanFileProtect] = true; ScanFileProtectValue = Int32.Parse(parts[i + 1]); i++; break; - case DICFlagStrings.ScanSectorProtect: - if (parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data) + case CreatorFlagStrings.ScanSectorProtect: + if (parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data) return false; - this[DICFlag.ScanSectorProtect] = true; + this[CreatorFlag.ScanSectorProtect] = true; break; - case DICFlagStrings.SeventyFour: - if (parts[0] != DICCommandStrings.Swap) + case CreatorFlagStrings.SeventyFour: + if (parts[0] != CreatorCommandStrings.Swap) return false; - this[DICFlag.SeventyFour] = true; + this[CreatorFlag.SeventyFour] = true; break; - case DICFlagStrings.SkipSector: - if (parts[0] != DICCommandStrings.Data) + case CreatorFlagStrings.SkipSector: + if (parts[0] != CreatorCommandStrings.Data) return false; else if (!DoesExist(parts, i + 1) || !DoesExist(parts, i + 2)) return false; @@ -1392,62 +1392,62 @@ namespace DICUI.Utilities else if (!IsValidNumber(parts[i + 1], lowerBound: 0) || !IsValidNumber(parts[i + 2], lowerBound: 0)) return false; - this[DICFlag.SkipSector] = true; + this[CreatorFlag.SkipSector] = true; SkipSectorValue[0] = Int32.Parse(parts[i + 1]); SkipSectorValue[1] = Int32.Parse(parts[i + 2]); i += 2; break; - case DICFlagStrings.SubchannelReadLevel: - if (parts[0] != DICCommandStrings.Audio - && parts[0] != DICCommandStrings.CompactDisc - && parts[0] != DICCommandStrings.Data - && parts[0] != DICCommandStrings.GDROM) + case CreatorFlagStrings.SubchannelReadLevel: + if (parts[0] != CreatorCommandStrings.Audio + && parts[0] != CreatorCommandStrings.CompactDisc + && parts[0] != CreatorCommandStrings.Data + && parts[0] != CreatorCommandStrings.GDROM) return false; else if (!DoesExist(parts, i + 1)) { - this[DICFlag.SubchannelReadLevel] = true; + this[CreatorFlag.SubchannelReadLevel] = true; break; } else if (IsFlag(parts[i + 1])) { - this[DICFlag.SubchannelReadLevel] = true; + this[CreatorFlag.SubchannelReadLevel] = true; break; } else if (!IsValidNumber(parts[i + 1], lowerBound: 0, upperBound: 2)) return false; - this[DICFlag.SubchannelReadLevel] = true; + this[CreatorFlag.SubchannelReadLevel] = true; SubchannelReadLevelValue = Int32.Parse(parts[i + 1]); i++; break; - case DICFlagStrings.VideoNow: - if (parts[0] != DICCommandStrings.CompactDisc) + case CreatorFlagStrings.VideoNow: + if (parts[0] != CreatorCommandStrings.CompactDisc) return false; else if (!DoesExist(parts, i + 1)) { - this[DICFlag.VideoNow] = true; + this[CreatorFlag.VideoNow] = true; break; } else if (IsFlag(parts[i + 1])) { - this[DICFlag.VideoNow] = true; + this[CreatorFlag.VideoNow] = true; break; } else if (!IsValidNumber(parts[i + 1], lowerBound: 0)) return false; - this[DICFlag.VideoNow] = true; + this[CreatorFlag.VideoNow] = true; VideoNowValue = Int32.Parse(parts[i + 1]); i++; break; - case DICFlagStrings.VideoNowColor: - if (parts[0] != DICCommandStrings.CompactDisc) + case CreatorFlagStrings.VideoNowColor: + if (parts[0] != CreatorCommandStrings.CompactDisc) return false; - this[DICFlag.VideoNowColor] = true; + this[CreatorFlag.VideoNowColor] = true; break; default: @@ -1528,7 +1528,7 @@ namespace DICUI.Utilities // If we have an invalid combination, we should Command = null if (!Validators.GetValidMediaTypes(system).Contains(type)) { - Command = DICCommand.NONE; + Command = CreatorCommand.NONE; return; } @@ -1536,43 +1536,43 @@ namespace DICUI.Utilities { case MediaType.CDROM: if (system == KnownSystem.SuperAudioCD) - Command = DICCommand.SACD; + Command = CreatorCommand.SACD; else - Command = DICCommand.CompactDisc; + Command = CreatorCommand.CompactDisc; return; case MediaType.DVD: if (system == KnownSystem.MicrosoftXBOX || system == KnownSystem.MicrosoftXBOX360) { - Command = DICCommand.XBOX; + Command = CreatorCommand.XBOX; return; } - Command = DICCommand.DigitalVideoDisc; + Command = CreatorCommand.DigitalVideoDisc; return; case MediaType.GDROM: - Command = DICCommand.GDROM; + Command = CreatorCommand.GDROM; return; case MediaType.HDDVD: - Command = DICCommand.DigitalVideoDisc; + Command = CreatorCommand.DigitalVideoDisc; return; case MediaType.BluRay: - Command = DICCommand.BluRay; + Command = CreatorCommand.BluRay; return; case MediaType.NintendoGameCubeGameDisc: - Command = DICCommand.DigitalVideoDisc; + Command = CreatorCommand.DigitalVideoDisc; return; case MediaType.NintendoWiiOpticalDisc: - Command = DICCommand.DigitalVideoDisc; + Command = CreatorCommand.DigitalVideoDisc; return; case MediaType.FloppyDisk: - Command = DICCommand.Floppy; + Command = CreatorCommand.Floppy; return; case MediaType.HardDisk: - Command = DICCommand.Disk; + Command = CreatorCommand.Disk; return; default: - Command = DICCommand.NONE; + Command = CreatorCommand.NONE; return; } } @@ -1609,59 +1609,59 @@ namespace DICUI.Utilities switch (type) { case MediaType.CDROM: - this[DICFlag.C2Opcode] = true; + this[CreatorFlag.C2Opcode] = true; switch (system) { case KnownSystem.AppleMacintosh: case KnownSystem.IBMPCCompatible: - this[DICFlag.NoFixSubQSecuROM] = true; - this[DICFlag.ScanFileProtect] = true; + this[CreatorFlag.NoFixSubQSecuROM] = true; + this[CreatorFlag.ScanFileProtect] = true; if (paranoid) { - this[DICFlag.ScanSectorProtect] = true; - this[DICFlag.SubchannelReadLevel] = true; + this[CreatorFlag.ScanSectorProtect] = true; + this[CreatorFlag.SubchannelReadLevel] = true; SubchannelReadLevelValue = 2; } break; case KnownSystem.AtariJaguarCD: - this[DICFlag.AtariJaguar] = true; + this[CreatorFlag.AtariJaguar] = true; break; case KnownSystem.HasbroVideoNow: case KnownSystem.HasbroVideoNowJr: - this[DICFlag.VideoNow] = true; + this[CreatorFlag.VideoNow] = true; this.VideoNowValue = 18032; break; case KnownSystem.HasbroVideoNowColor: - this[DICFlag.VideoNowColor] = true; + this[CreatorFlag.VideoNowColor] = true; break; case KnownSystem.HasbroVideoNowXP: - this[DICFlag.VideoNow] = true; + this[CreatorFlag.VideoNow] = true; this.VideoNowValue = 20832; break; case KnownSystem.NECPCEngineTurboGrafxCD: - this[DICFlag.MCN] = true; + this[CreatorFlag.MCN] = true; break; case KnownSystem.SonyPlayStation: - this[DICFlag.ScanAntiMod] = true; - this[DICFlag.NoFixSubQLibCrypt] = true; + this[CreatorFlag.ScanAntiMod] = true; + this[CreatorFlag.NoFixSubQLibCrypt] = true; break; } break; case MediaType.DVD: if (paranoid) { - this[DICFlag.CopyrightManagementInformation] = true; - this[DICFlag.ScanFileProtect] = true; + this[CreatorFlag.CopyrightManagementInformation] = true; + this[CreatorFlag.ScanFileProtect] = true; } break; case MediaType.GDROM: - this[DICFlag.C2Opcode] = true; + this[CreatorFlag.C2Opcode] = true; break; case MediaType.HDDVD: if (paranoid) - this[DICFlag.CopyrightManagementInformation] = true; + this[CreatorFlag.CopyrightManagementInformation] = true; break; case MediaType.BluRay: // Currently no defaults set @@ -1669,10 +1669,10 @@ namespace DICUI.Utilities // Special Formats case MediaType.NintendoGameCubeGameDisc: - this[DICFlag.Raw] = true; + this[CreatorFlag.Raw] = true; break; case MediaType.NintendoWiiOpticalDisc: - this[DICFlag.Raw] = true; + this[CreatorFlag.Raw] = true; break; // Non-optical diff --git a/DICUI.Library/Utilities/DumpEnvironment.cs b/DICUI.Library/Utilities/DumpEnvironment.cs index f744e0d0..89db768e 100644 --- a/DICUI.Library/Utilities/DumpEnvironment.cs +++ b/DICUI.Library/Utilities/DumpEnvironment.cs @@ -66,7 +66,7 @@ namespace DICUI.Utilities /// /// Parameters object representing what to send to DiscImageCreator /// - public Parameters DICParameters { get; set; } + public CreatorParameters CreatorParameters { get; set; } /// /// Determines if placeholder values should be set for fields @@ -158,9 +158,9 @@ namespace DICUI.Utilities if (!File.Exists(DICPath)) return false; - Parameters parameters = new Parameters(string.Empty) + CreatorParameters parameters = new CreatorParameters(string.Empty) { - Command = DICCommand.DriveSpeed, + Command = CreatorCommand.DriveSpeed, DriveLetter = Drive.Letter.ToString(), }; @@ -189,9 +189,9 @@ namespace DICUI.Utilities if (Drive.InternalDriveType != InternalDriveType.Optical) return; - Parameters parameters = new Parameters(string.Empty) + CreatorParameters parameters = new CreatorParameters(string.Empty) { - Command = DICCommand.Eject, + Command = CreatorCommand.Eject, DriveLetter = Drive.Letter.ToString(), }; @@ -342,12 +342,12 @@ namespace DICUI.Utilities // Set the proper parameters string filename = OutputDirectory + Path.DirectorySeparatorChar + OutputFilename; - DICParameters = new Parameters(System, Type, Drive.Letter, filename, driveSpeed, ParanoidMode, RereadAmountC2); + CreatorParameters = new CreatorParameters(System, Type, Drive.Letter, filename, driveSpeed, ParanoidMode, RereadAmountC2); if (QuietMode) - DICParameters[DICFlag.DisableBeep] = true; + CreatorParameters[CreatorFlag.DisableBeep] = true; // Generate and return the param string - return DICParameters.GenerateParameters(); + return CreatorParameters.GenerateParameters(); } return null; @@ -369,9 +369,9 @@ namespace DICUI.Utilities if (Drive.InternalDriveType != InternalDriveType.Optical) return; - Parameters parameters = new Parameters(string.Empty) + CreatorParameters parameters = new CreatorParameters(string.Empty) { - Command = DICCommand.Reset, + Command = CreatorCommand.Reset, DriveLetter = Drive.Letter.ToString(), }; @@ -470,7 +470,7 @@ namespace DICUI.Utilities /// True if the configuration is valid, false otherwise internal bool ParametersValid() { - return DICParameters.IsValid() + return CreatorParameters.IsValid() && !(Drive.InternalDriveType == InternalDriveType.Floppy ^ Type == MediaType.FloppyDisk) && !(Drive.InternalDriveType == InternalDriveType.HardDisk ^ Type == MediaType.HardDisk) && !(Drive.InternalDriveType == InternalDriveType.Removable ^ (Type == MediaType.CompactFlash || Type == MediaType.SDCard || Type == MediaType.FlashDrive)); @@ -510,7 +510,7 @@ namespace DICUI.Utilities StartInfo = new ProcessStartInfo() { FileName = DICPath, - Arguments = DICParameters.GenerateParameters() ?? "", + Arguments = CreatorParameters.GenerateParameters() ?? "", }, }; dicProcess.Start(); @@ -522,7 +522,7 @@ namespace DICUI.Utilities /// /// /// Standard output from commandline window - private async Task ExecuteDiscImageCreatorWithParameters(Parameters parameters) + private async Task ExecuteDiscImageCreatorWithParameters(CreatorParameters parameters) { Process childProcess; string output = await Task.Run(() => diff --git a/DICUI.Test/Utilities/ConvertersTest.cs b/DICUI.Test/Utilities/ConvertersTest.cs index 793dbddc..09fecb3f 100644 --- a/DICUI.Test/Utilities/ConvertersTest.cs +++ b/DICUI.Test/Utilities/ConvertersTest.cs @@ -8,48 +8,48 @@ namespace DICUI.Test.Utilities public class ConvertersTest { [Theory] - [InlineData(DICCommand.Audio, MediaType.CDROM)] - [InlineData(DICCommand.BluRay, MediaType.BluRay)] - [InlineData(DICCommand.Close, null)] - [InlineData(DICCommand.CompactDisc, MediaType.CDROM)] - [InlineData(DICCommand.Data, MediaType.CDROM)] - [InlineData(DICCommand.DigitalVideoDisc, MediaType.DVD)] - [InlineData(DICCommand.Eject, null)] - [InlineData(DICCommand.Floppy, MediaType.FloppyDisk)] - [InlineData(DICCommand.GDROM, MediaType.GDROM)] - [InlineData(DICCommand.MDS, null)] - [InlineData(DICCommand.Reset, null)] - [InlineData(DICCommand.SACD, MediaType.CDROM)] - [InlineData(DICCommand.Start, null)] - [InlineData(DICCommand.Stop, null)] - [InlineData(DICCommand.Sub, null)] - [InlineData(DICCommand.Swap, MediaType.GDROM)] - [InlineData(DICCommand.XBOX, MediaType.DVD)] - public void BaseCommandToMediaTypeTest(DICCommand command, MediaType? expected) + [InlineData(CreatorCommand.Audio, MediaType.CDROM)] + [InlineData(CreatorCommand.BluRay, MediaType.BluRay)] + [InlineData(CreatorCommand.Close, null)] + [InlineData(CreatorCommand.CompactDisc, MediaType.CDROM)] + [InlineData(CreatorCommand.Data, MediaType.CDROM)] + [InlineData(CreatorCommand.DigitalVideoDisc, MediaType.DVD)] + [InlineData(CreatorCommand.Eject, null)] + [InlineData(CreatorCommand.Floppy, MediaType.FloppyDisk)] + [InlineData(CreatorCommand.GDROM, MediaType.GDROM)] + [InlineData(CreatorCommand.MDS, null)] + [InlineData(CreatorCommand.Reset, null)] + [InlineData(CreatorCommand.SACD, MediaType.CDROM)] + [InlineData(CreatorCommand.Start, null)] + [InlineData(CreatorCommand.Stop, null)] + [InlineData(CreatorCommand.Sub, null)] + [InlineData(CreatorCommand.Swap, MediaType.GDROM)] + [InlineData(CreatorCommand.XBOX, MediaType.DVD)] + public void BaseCommandToMediaTypeTest(CreatorCommand command, MediaType? expected) { MediaType? actual = command.ToMediaType(); Assert.Equal(expected, actual); } [Theory] - [InlineData(DICCommand.Audio, KnownSystem.AudioCD)] - [InlineData(DICCommand.BluRay, KnownSystem.SonyPlayStation3)] - [InlineData(DICCommand.Close, null)] - [InlineData(DICCommand.CompactDisc, KnownSystem.IBMPCCompatible)] - [InlineData(DICCommand.Data, KnownSystem.IBMPCCompatible)] - [InlineData(DICCommand.DigitalVideoDisc, KnownSystem.IBMPCCompatible)] - [InlineData(DICCommand.Eject, null)] - [InlineData(DICCommand.Floppy, KnownSystem.IBMPCCompatible)] - [InlineData(DICCommand.GDROM, KnownSystem.SegaDreamcast)] - [InlineData(DICCommand.MDS, null)] - [InlineData(DICCommand.Reset, null)] - [InlineData(DICCommand.SACD, KnownSystem.SuperAudioCD)] - [InlineData(DICCommand.Start, null)] - [InlineData(DICCommand.Stop, null)] - [InlineData(DICCommand.Sub, null)] - [InlineData(DICCommand.Swap, KnownSystem.SegaDreamcast)] - [InlineData(DICCommand.XBOX, KnownSystem.MicrosoftXBOX)] - public void BaseCommandToKnownSystemTest(DICCommand command, KnownSystem? expected) + [InlineData(CreatorCommand.Audio, KnownSystem.AudioCD)] + [InlineData(CreatorCommand.BluRay, KnownSystem.SonyPlayStation3)] + [InlineData(CreatorCommand.Close, null)] + [InlineData(CreatorCommand.CompactDisc, KnownSystem.IBMPCCompatible)] + [InlineData(CreatorCommand.Data, KnownSystem.IBMPCCompatible)] + [InlineData(CreatorCommand.DigitalVideoDisc, KnownSystem.IBMPCCompatible)] + [InlineData(CreatorCommand.Eject, null)] + [InlineData(CreatorCommand.Floppy, KnownSystem.IBMPCCompatible)] + [InlineData(CreatorCommand.GDROM, KnownSystem.SegaDreamcast)] + [InlineData(CreatorCommand.MDS, null)] + [InlineData(CreatorCommand.Reset, null)] + [InlineData(CreatorCommand.SACD, KnownSystem.SuperAudioCD)] + [InlineData(CreatorCommand.Start, null)] + [InlineData(CreatorCommand.Stop, null)] + [InlineData(CreatorCommand.Sub, null)] + [InlineData(CreatorCommand.Swap, KnownSystem.SegaDreamcast)] + [InlineData(CreatorCommand.XBOX, KnownSystem.MicrosoftXBOX)] + public void BaseCommandToKnownSystemTest(CreatorCommand command, KnownSystem? expected) { KnownSystem? actual = Converters.ToKnownSystem(command); Assert.Equal(expected, actual); diff --git a/DICUI.Test/Utilities/DumpEnvironmentTest.cs b/DICUI.Test/Utilities/DumpEnvironmentTest.cs index 5a58bbba..fe315803 100644 --- a/DICUI.Test/Utilities/DumpEnvironmentTest.cs +++ b/DICUI.Test/Utilities/DumpEnvironmentTest.cs @@ -18,7 +18,7 @@ namespace DICUI.Test { var env = new DumpEnvironment { - DICParameters = new Parameters(parameters), + CreatorParameters = new CreatorParameters(parameters), Drive = isFloppy ? new Drive(InternalDriveType.Floppy, new DriveInfo(letter.ToString())) : new Drive(InternalDriveType.Optical, new DriveInfo(letter.ToString())), diff --git a/DICUI.Test/Utilities/ParametersTest.cs b/DICUI.Test/Utilities/ParametersTest.cs index 2e2d622a..fd5b6280 100644 --- a/DICUI.Test/Utilities/ParametersTest.cs +++ b/DICUI.Test/Utilities/ParametersTest.cs @@ -9,39 +9,39 @@ namespace DICUI.Test.Utilities public class ParametersTest { [Theory] - [InlineData(KnownSystem.MicrosoftXBOX, MediaType.CDROM, DICCommand.CompactDisc)] - [InlineData(KnownSystem.MicrosoftXBOX, MediaType.DVD, DICCommand.XBOX)] - [InlineData(KnownSystem.MicrosoftXBOX, MediaType.LaserDisc, DICCommand.NONE)] - [InlineData(KnownSystem.SegaNu, MediaType.BluRay, DICCommand.BluRay)] - [InlineData(KnownSystem.AppleMacintosh, MediaType.FloppyDisk, DICCommand.Floppy)] - [InlineData(KnownSystem.RawThrillsVarious, MediaType.GDROM, DICCommand.NONE)] - public void ParametersFromSystemAndTypeTest(KnownSystem? knownSystem, MediaType? mediaType, DICCommand expected) + [InlineData(KnownSystem.MicrosoftXBOX, MediaType.CDROM, CreatorCommand.CompactDisc)] + [InlineData(KnownSystem.MicrosoftXBOX, MediaType.DVD, CreatorCommand.XBOX)] + [InlineData(KnownSystem.MicrosoftXBOX, MediaType.LaserDisc, CreatorCommand.NONE)] + [InlineData(KnownSystem.SegaNu, MediaType.BluRay, CreatorCommand.BluRay)] + [InlineData(KnownSystem.AppleMacintosh, MediaType.FloppyDisk, CreatorCommand.Floppy)] + [InlineData(KnownSystem.RawThrillsVarious, MediaType.GDROM, CreatorCommand.NONE)] + public void ParametersFromSystemAndTypeTest(KnownSystem? knownSystem, MediaType? mediaType, CreatorCommand expected) { - Parameters actual = new Parameters(knownSystem, mediaType, 'D', "disc.bin", 16, true, -1); + CreatorParameters actual = new CreatorParameters(knownSystem, mediaType, 'D', "disc.bin", 16, true, -1); Assert.Equal(expected, actual.Command); } [Theory] [InlineData(KnownSystem.AppleMacintosh, MediaType.LaserDisc, true, 20, null, null)] - [InlineData(KnownSystem.NintendoGameCube, MediaType.NintendoGameCubeGameDisc, false, 20, null, new DICFlag[] { DICFlag.Raw })] - [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, false, 20, null, new DICFlag[] { })] + [InlineData(KnownSystem.NintendoGameCube, MediaType.NintendoGameCubeGameDisc, false, 20, null, new CreatorFlag[] { CreatorFlag.Raw })] + [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, false, 20, null, new CreatorFlag[] { })] /* paranoid mode tests */ - [InlineData(KnownSystem.IBMPCCompatible, MediaType.CDROM, true, 1000, 2, new DICFlag[] { DICFlag.C2Opcode, DICFlag.NoFixSubQSecuROM, DICFlag.ScanFileProtect, DICFlag.ScanSectorProtect, DICFlag.SubchannelReadLevel })] - [InlineData(KnownSystem.AppleMacintosh, MediaType.CDROM, false, 20, null, new DICFlag[] { DICFlag.C2Opcode, DICFlag.NoFixSubQSecuROM, DICFlag.ScanFileProtect })] - [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, true, 500, null, new DICFlag[] { DICFlag.CopyrightManagementInformation, DICFlag.ScanFileProtect })] - [InlineData(KnownSystem.HDDVDVideo, MediaType.HDDVD, true, 500, null, new DICFlag[] { DICFlag.CopyrightManagementInformation })] - [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, false, 500, null, new DICFlag[] { })] - [InlineData(KnownSystem.HDDVDVideo, MediaType.HDDVD, false, 500, null, new DICFlag[] { })] + [InlineData(KnownSystem.IBMPCCompatible, MediaType.CDROM, true, 1000, 2, new CreatorFlag[] { CreatorFlag.C2Opcode, CreatorFlag.NoFixSubQSecuROM, CreatorFlag.ScanFileProtect, CreatorFlag.ScanSectorProtect, CreatorFlag.SubchannelReadLevel })] + [InlineData(KnownSystem.AppleMacintosh, MediaType.CDROM, false, 20, null, new CreatorFlag[] { CreatorFlag.C2Opcode, CreatorFlag.NoFixSubQSecuROM, CreatorFlag.ScanFileProtect })] + [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, true, 500, null, new CreatorFlag[] { CreatorFlag.CopyrightManagementInformation, CreatorFlag.ScanFileProtect })] + [InlineData(KnownSystem.HDDVDVideo, MediaType.HDDVD, true, 500, null, new CreatorFlag[] { CreatorFlag.CopyrightManagementInformation })] + [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, false, 500, null, new CreatorFlag[] { })] + [InlineData(KnownSystem.HDDVDVideo, MediaType.HDDVD, false, 500, null, new CreatorFlag[] { })] /* reread c2 */ - [InlineData(KnownSystem.SegaDreamcast, MediaType.GDROM, false, 1000, null, new DICFlag[] { DICFlag.C2Opcode })] - [InlineData(KnownSystem.SegaDreamcast, MediaType.GDROM, false, -1, null, new DICFlag[] { DICFlag.C2Opcode })] + [InlineData(KnownSystem.SegaDreamcast, MediaType.GDROM, false, 1000, null, new CreatorFlag[] { CreatorFlag.C2Opcode })] + [InlineData(KnownSystem.SegaDreamcast, MediaType.GDROM, false, -1, null, new CreatorFlag[] { CreatorFlag.C2Opcode })] - public void ParametersFromOptionsTest(KnownSystem? knownSystem, MediaType? mediaType, bool paranoid, int rereadC2, int? subchannelLevel, DICFlag[] expected) + public void ParametersFromOptionsTest(KnownSystem? knownSystem, MediaType? mediaType, bool paranoid, int rereadC2, int? subchannelLevel, CreatorFlag[] expected) { - Parameters actual = new Parameters(knownSystem, mediaType, 'D', "disc.bin", 16, paranoid, rereadC2); + CreatorParameters actual = new CreatorParameters(knownSystem, mediaType, 'D', "disc.bin", 16, paranoid, rereadC2); - HashSet expectedSet = new HashSet(expected ?? new DICFlag[0]); - HashSet actualSet = new HashSet(actual.Keys ?? new DICFlag[0]); + HashSet expectedSet = new HashSet(expected ?? new CreatorFlag[0]); + HashSet actualSet = new HashSet(actual.Keys ?? new CreatorFlag[0]); Assert.Equal(expectedSet, actualSet); if (rereadC2 == -1 || !Validators.GetValidMediaTypes(knownSystem).Contains(mediaType)) Assert.Null(actual.C2OpcodeValue[0]); @@ -59,7 +59,7 @@ namespace DICUI.Test.Utilities [InlineData("stop D", null, null, "D", null)] public void DetermineFlagsTest(string parameters, MediaType? expectedMediaType, KnownSystem? expectedKnownSystem, string expectedDriveLetter, string expectedPath) { - Parameters actualParams = new Parameters(parameters); + CreatorParameters actualParams = new CreatorParameters(parameters); bool actual = actualParams.DetermineFlags(out MediaType? actualMediaType, out KnownSystem? actualKnownSystem, out string actualDriveLetter, out string actualPath); Assert.Equal(expectedMediaType, actualMediaType); Assert.Equal(expectedKnownSystem, actualKnownSystem); @@ -78,7 +78,7 @@ namespace DICUI.Test.Utilities [InlineData("ls", false)] public void ValidateParametersTest(string parameters, bool expected) { - Parameters actual = new Parameters(parameters); + CreatorParameters actual = new CreatorParameters(parameters); Assert.Equal(expected, actual.IsValid()); } } diff --git a/DICUI/EnumDescriptionConverter.cs b/DICUI/EnumDescriptionConverter.cs index 7490d3c8..589ce24f 100644 --- a/DICUI/EnumDescriptionConverter.cs +++ b/DICUI/EnumDescriptionConverter.cs @@ -13,10 +13,10 @@ namespace DICUI { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - if (value is DICCommand) - return ((DICCommand)value).LongName(); - else if (value is DICFlag) - return ((DICFlag)value).LongName(); + if (value is CreatorCommand) + return ((CreatorCommand)value).LongName(); + else if (value is CreatorFlag) + return ((CreatorFlag)value).LongName(); else if (value is MediaType?) return ((MediaType?)value).LongName(); else if (value is KnownSystem?) diff --git a/DICUI/Windows/MainWindow.xaml.cs b/DICUI/Windows/MainWindow.xaml.cs index e15f1236..1ff01f43 100644 --- a/DICUI/Windows/MainWindow.xaml.cs +++ b/DICUI/Windows/MainWindow.xaml.cs @@ -453,7 +453,7 @@ namespace DICUI.Windows // Get the currently selected options Drive = DriveLetterComboBox.SelectedItem as Drive, - DICParameters = new Parameters(ParametersTextBox.Text), + CreatorParameters = new CreatorParameters(ParametersTextBox.Text), QuietMode = _options.QuietMode, ParanoidMode = _options.ParanoidMode, @@ -670,8 +670,8 @@ namespace DICUI.Windows // If SmartE is detected on the current disc, remove `/sf` from the flags if (protections.Contains("SmartE")) { - _env.DICParameters[DICFlag.ScanFileProtect] = false; - ViewModels.LoggerViewModel.VerboseLogLn($"SmartE detected, removing {DICFlagStrings.ScanFileProtect} from parameters"); + _env.CreatorParameters[CreatorFlag.ScanFileProtect] = false; + ViewModels.LoggerViewModel.VerboseLogLn($"SmartE detected, removing {CreatorFlagStrings.ScanFileProtect} from parameters"); } if (!ViewModels.LoggerViewModel.WindowVisible) @@ -763,19 +763,19 @@ namespace DICUI.Windows /// private void ProcessCustomParameters() { - _env.DICParameters = new Parameters(ParametersTextBox.Text); + _env.CreatorParameters = new CreatorParameters(ParametersTextBox.Text); - int driveIndex = _drives.Select(d => d.Letter).ToList().IndexOf(_env.DICParameters.DriveLetter[0]); + int driveIndex = _drives.Select(d => d.Letter).ToList().IndexOf(_env.CreatorParameters.DriveLetter[0]); if (driveIndex > -1) DriveLetterComboBox.SelectedIndex = driveIndex; - int driveSpeed = _env.DICParameters.DriveSpeed ?? -1; + int driveSpeed = _env.CreatorParameters.DriveSpeed ?? -1; if (driveSpeed > 0) DriveSpeedComboBox.SelectedValue = driveSpeed; else - _env.DICParameters.DriveSpeed = (int?)DriveSpeedComboBox.SelectedValue; + _env.CreatorParameters.DriveSpeed = (int?)DriveSpeedComboBox.SelectedValue; - string trimmedPath = _env.DICParameters.Filename?.Trim('"') ?? string.Empty; + string trimmedPath = _env.CreatorParameters.Filename?.Trim('"') ?? string.Empty; string outputDirectory = Path.GetDirectoryName(trimmedPath); string outputFilename = Path.GetFileName(trimmedPath); if (!string.IsNullOrWhiteSpace(outputDirectory)) @@ -787,7 +787,7 @@ namespace DICUI.Windows else outputFilename = OutputFilenameTextBox.Text; - MediaType? mediaType = _env.DICParameters.Command.ToMediaType(); + MediaType? mediaType = _env.CreatorParameters.Command.ToMediaType(); int mediaTypeIndex = _mediaTypes.IndexOf(mediaType); if (mediaTypeIndex > -1) MediaTypeComboBox.SelectedIndex = mediaTypeIndex;