Skip to content

Commit ff58e48

Browse files
mnadareskimnadareski
committed
Further cleanup in Options
1 parent 90f808b commit ff58e48

8 files changed

Lines changed: 78 additions & 71 deletions

File tree

‎CHANGELIST.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
- Replace original Options object
3232
- Clean up options serialization and ordering
3333
- Add placeholder CLI media info methods
34+
- Further cleanup in Options
3435

3536
### 3.6.0 (2025-11-28)
3637

‎MPF.CLI/Features/BaseFeature.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ protected BaseFeature(string name, string[] flags, string description, string? d
7777
Options.Processing.ProtectionScanning.HideDriveLetters = false;
7878

7979
// Redump Login Information
80-
Options.Processing.Login.RetrieveMatchInformation = true;
80+
Options.Processing.Login.PullAllInformation = false;
8181
Options.Processing.Login.RedumpUsername = null;
8282
Options.Processing.Login.RedumpPassword = null;
83+
Options.Processing.Login.RetrieveMatchInformation = true;
8384

8485
// Media Information
8586
Options.Processing.MediaInformation.AddPlaceholders = true;
86-
Options.Processing.MediaInformation.PullAllInformation = false;
8787

8888
// Post-Information Options
8989
Options.Processing.AddFilenameSuffix = false;

‎MPF.Check/Features/BaseFeature.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ protected BaseFeature(string name, string[] flags, string description, string? d
5252
Options.Processing.ProtectionScanning.HideDriveLetters = false;
5353

5454
// Redump Login Information
55-
Options.Processing.Login.RetrieveMatchInformation = true;
55+
Options.Processing.Login.PullAllInformation = false;
5656
Options.Processing.Login.RedumpUsername = null;
5757
Options.Processing.Login.RedumpPassword = null;
58+
Options.Processing.Login.RetrieveMatchInformation = true;
5859

5960
// Media Information
6061
Options.Processing.MediaInformation.AddPlaceholders = true;
61-
Options.Processing.MediaInformation.PullAllInformation = false;
6262

6363
// Post-Information Options
6464
Options.Processing.AddFilenameSuffix = false;

‎MPF.Check/Features/InteractiveFeature.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ public override bool ProcessArgs(string[] args, int index)
5050
Options.Processing.ProtectionScanning.HideDriveLetters = false;
5151

5252
// Redump Login Information
53-
Options.Processing.Login.RetrieveMatchInformation = true;
53+
Options.Processing.Login.PullAllInformation = false;
5454
Options.Processing.Login.RedumpUsername = null;
5555
Options.Processing.Login.RedumpPassword = null;
56+
Options.Processing.Login.RetrieveMatchInformation = true;
5657

5758
// Media Information
5859
Options.Processing.MediaInformation.AddPlaceholders = true;
59-
Options.Processing.MediaInformation.PullAllInformation = false;
6060

6161
// Post-Information Options
6262
Options.Processing.AddFilenameSuffix = false;
@@ -92,7 +92,7 @@ public override bool ProcessArgs(string[] args, int index)
9292
Console.WriteLine($"5) Create IRD (Currently '{Options.Processing.CreateIRDAfterDumping}')");
9393
Console.WriteLine($"6) Attempt Redump matches (Currently '{Options.Processing.Login.RetrieveMatchInformation}')");
9494
Console.WriteLine($"7) Redump credentials (Currently '{Options.Processing.Login.RedumpUsername}')");
95-
Console.WriteLine($"8) Pull all information (Currently '{Options.Processing.MediaInformation.PullAllInformation}')");
95+
Console.WriteLine($"8) Pull all information (Currently '{Options.Processing.Login.PullAllInformation}')");
9696
Console.WriteLine($"9) Set device path (Currently '{DevicePath}')");
9797
Console.WriteLine($"A) Scan for protection (Currently '{scan}')");
9898
Console.WriteLine($"B) Scan archives for protection (Currently '{enableArchives}')");
@@ -130,7 +130,7 @@ public override bool ProcessArgs(string[] args, int index)
130130
case "7":
131131
goto redumpCredentials;
132132
case "8":
133-
Options.Processing.MediaInformation.PullAllInformation = !Options.Processing.MediaInformation.PullAllInformation;
133+
Options.Processing.Login.PullAllInformation = !Options.Processing.Login.PullAllInformation;
134134
goto root;
135135
case "9":
136136
goto devicePath;

‎MPF.Check/Features/MainFeature.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ public override bool ProcessArgs(string[] args, int index)
135135
Options.Processing.ProtectionScanning.HideDriveLetters = false;
136136

137137
// Redump Login Information
138-
Options.Processing.Login.RetrieveMatchInformation = true;
138+
Options.Processing.Login.PullAllInformation = false;
139139
Options.Processing.Login.RedumpUsername = null;
140140
Options.Processing.Login.RedumpPassword = null;
141+
Options.Processing.Login.RetrieveMatchInformation = true;
141142

142143
// Media Information
143144
Options.Processing.MediaInformation.AddPlaceholders = true;
144-
Options.Processing.MediaInformation.PullAllInformation = false;
145145

146146
// Post-Information Options
147147
Options.Processing.AddFilenameSuffix = false;
@@ -211,7 +211,7 @@ public override bool ProcessArgs(string[] args, int index)
211211

212212
// Pull all information (requires Redump login)
213213
else if (PullAllInput.ProcessInput(args, ref index))
214-
Options.Processing.MediaInformation.PullAllInformation = !Options.Processing.MediaInformation.PullAllInformation;
214+
Options.Processing.Login.PullAllInformation = !Options.Processing.Login.PullAllInformation;
215215

216216
// Use a device path for physical checks
217217
else if (PathInput.ProcessInput(args, ref index))

‎MPF.Frontend/Features/ListConfigFeature.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -118,36 +118,36 @@ public override bool Execute()
118118
Console.WriteLine("Protection Scanning Options:");
119119
Console.WriteLine($" Scan for Protection = {options.Processing.ProtectionScanning.ScanForProtection}");
120120
Console.WriteLine($" Scan Archives for Protection = {options.Processing.ProtectionScanning.ScanArchivesForProtection}");
121-
Console.WriteLine($" Include Debug Protection Information = {options.Processing.ProtectionScanning.IncludeDebugProtectionInformation}");
122121
Console.WriteLine($" Hide Drive Letters = {options.Processing.ProtectionScanning.HideDriveLetters}");
122+
Console.WriteLine($" Include Debug Protection Information = {options.Processing.ProtectionScanning.IncludeDebugProtectionInformation}");
123123
Console.WriteLine();
124124

125125
// Redump Login Information
126126
Console.WriteLine("Redump Login Information:");
127-
Console.WriteLine($" Retrieve Match Information = {options.Processing.Login.RetrieveMatchInformation}");
127+
Console.WriteLine($" Pull All Information = {options.Processing.Login.PullAllInformation}");
128128
Console.WriteLine($" Redump Username = {options.Processing.Login.RedumpUsername}");
129129
Console.WriteLine($" Redump Password = {(string.IsNullOrEmpty(options.Processing.Login.RedumpPassword) ? "[UNSET]" : "[SET]")}");
130+
Console.WriteLine($" Retrieve Match Information = {options.Processing.Login.RetrieveMatchInformation}");
130131
Console.WriteLine();
131132

132133
// Media Information
133134
Console.WriteLine("Media Information:");
134135
Console.WriteLine($" Add Placeholders = {options.Processing.MediaInformation.AddPlaceholders}");
135-
Console.WriteLine($" Prompt for Media Information = {options.Processing.MediaInformation.PromptForDiscInformation}");
136-
Console.WriteLine($" Pull All Information = {options.Processing.MediaInformation.PullAllInformation}");
137-
Console.WriteLine($" Enable Tabs in Input Fields = {options.Processing.MediaInformation.EnableTabsInInputFields}");
138136
Console.WriteLine($" Enable Redump Compatibility = {options.Processing.MediaInformation.EnableRedumpCompatibility}");
137+
Console.WriteLine($" Enable Tabs in Input Fields = {options.Processing.MediaInformation.EnableTabsInInputFields}");
138+
Console.WriteLine($" Prompt for Media Information = {options.Processing.MediaInformation.PromptForDiscInformation}");
139139
Console.WriteLine();
140140

141-
// Output Options
142-
Console.WriteLine("Output Options:");
143-
Console.WriteLine($" Show Disc Eject Reminder = {options.Processing.ShowDiscEjectReminder}");
141+
// Post-Information Options
142+
Console.WriteLine("Post-Information Options:");
144143
Console.WriteLine($" Add Filename Suffix = {options.Processing.AddFilenameSuffix}");
144+
Console.WriteLine($" Compress Log Files = {options.Processing.CompressLogFiles}");
145145
Console.WriteLine($" Create IRD After Dumping = {options.Processing.CreateIRDAfterDumping}");
146-
Console.WriteLine($" Output Submission JSON = {options.Processing.OutputSubmissionJSON}");
146+
Console.WriteLine($" Delete Unnecessary Files = {options.Processing.DeleteUnnecessaryFiles}");
147147
Console.WriteLine($" Include Artifacts = {options.Processing.IncludeArtifacts}");
148-
Console.WriteLine($" Compress Log Files = {options.Processing.CompressLogFiles}");
149148
Console.WriteLine($" Log Compression = {options.Processing.LogCompression.LongName()}");
150-
Console.WriteLine($" Delete Unnecessary Files = {options.Processing.DeleteUnnecessaryFiles}");
149+
Console.WriteLine($" Output Submission JSON = {options.Processing.OutputSubmissionJSON}");
150+
Console.WriteLine($" Show Disc Eject Reminder = {options.Processing.ShowDiscEjectReminder}");
151151
Console.WriteLine();
152152

153153
return true;

0 commit comments

Comments
 (0)