SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-02-04 05:35:52 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Decouple retieval from login

Browse Source
This commit is contained in:
Matt Nadareski
2025-06-02 09:35:26 -04:00
parent 3ffea60402
commit 8b00e3deed
4 changed files with 67 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -9,6 +9,7 @@
- Fix Redump default options
- Fix tests from last commit
- Remove unnecessary options property
- Decouple retieval from login
### 3.3.1 (2025-05-23)

63
MPF.Check/Program.cs
View File

@@ -38,6 +38,7 @@ namespace MPF.Check
HideDriveLetters = false,
// Redump Login Information
RetrieveMatchInformation = true,
RedumpUsername = null,
RedumpPassword = null,
};
@@ -155,7 +156,8 @@ namespace MPF.Check
Console.WriteLine(" --load-seed <path> Load a seed submission JSON for user information");
Console.WriteLine(" --no-placeholders Disable placeholder values in submission info");
Console.WriteLine(" --create-ird Create IRD from output files (PS3 only)");
Console.WriteLine("-c, --credentials <user> <pw> Redump username and password");
Console.WriteLine(" --no-retrieve Disable retrieving match information from Redump");
Console.WriteLine("-c, --credentials <user> <pw> Redump username and password (incompatible with --no-retrieve)");
Console.WriteLine(" --pull-all Pull all information from Redump (requires --credentials)");
Console.WriteLine("-p, --path <drivepath> Physical drive path for additional checks");
Console.WriteLine("-s, --scan Enable copy protection scan (requires --path)");
@@ -203,18 +205,19 @@ namespace MPF.Check
Console.WriteLine($"4) Set seed path (Currently '{opts.Seed}')");
Console.WriteLine($"5) Add placeholders (Currently '{options.AddPlaceholders}')");
Console.WriteLine($"6) Create IRD (Currently '{options.CreateIRDAfterDumping}')");
Console.WriteLine($"7) Redump credentials (Currently '{options.RedumpUsername}')");
Console.WriteLine($"8) Pull all information (Currently '{options.PullAllInformation}')");
Console.WriteLine($"9) Set device path (Currently '{opts.DevicePath}')");
Console.WriteLine($"A) Scan for protection (Currently '{scan}')");
Console.WriteLine($"B) Scan archives for protection (Currently '{enableArchives}')");
Console.WriteLine($"C) Debug protection scan output (Currently '{enableDebug}')");
Console.WriteLine($"D) Hide drive letters in protection output (Currently '{hideDriveLetters}')");
Console.WriteLine($"E) Hide filename suffix (Currently '{options.AddFilenameSuffix}')");
Console.WriteLine($"F) Output submission JSON (Currently '{options.OutputSubmissionJSON}')");
Console.WriteLine($"G) Include JSON artifacts (Currently '{options.IncludeArtifacts}')");
Console.WriteLine($"H) Compress logs (Currently '{options.CompressLogFiles}')");
Console.WriteLine($"I) Delete unnecessary files (Currently '{options.DeleteUnnecessaryFiles}')");
Console.WriteLine($"7) Attempt Redump matches (Currently '{options.RetrieveMatchInformation}')");
Console.WriteLine($"8) Redump credentials (Currently '{options.RedumpUsername}')");
Console.WriteLine($"9) Pull all information (Currently '{options.PullAllInformation}')");
Console.WriteLine($"A) Set device path (Currently '{opts.DevicePath}')");
Console.WriteLine($"B) Scan for protection (Currently '{scan}')");
Console.WriteLine($"C) Scan archives for protection (Currently '{enableArchives}')");
Console.WriteLine($"D) Debug protection scan output (Currently '{enableDebug}')");
Console.WriteLine($"E) Hide drive letters in protection output (Currently '{hideDriveLetters}')");
Console.WriteLine($"F) Hide filename suffix (Currently '{options.AddFilenameSuffix}')");
Console.WriteLine($"G) Output submission JSON (Currently '{options.OutputSubmissionJSON}')");
Console.WriteLine($"H) Include JSON artifacts (Currently '{options.IncludeArtifacts}')");
Console.WriteLine($"I) Compress logs (Currently '{options.CompressLogFiles}')");
Console.WriteLine($"J) Delete unnecessary files (Currently '{options.DeleteUnnecessaryFiles}')");
Console.WriteLine();
Console.WriteLine($"Q) Exit the program");
Console.WriteLine($"X) Start checking");
@@ -238,46 +241,50 @@ namespace MPF.Check
options.CreateIRDAfterDumping = !options.CreateIRDAfterDumping;
goto root;
case "7":
goto redumpCredentials;
options.RetrieveMatchInformation = !options.RetrieveMatchInformation;
goto root;
case "8":
goto redumpCredentials;
case "9":
options.PullAllInformation = !options.PullAllInformation;
goto root;
case "9":
goto devicePath;
case "a":
case "A":
scan = !scan;
goto root;
goto devicePath;
case "b":
case "B":
enableArchives = !enableArchives;
scan = !scan;
goto root;
case "c":
case "C":
enableDebug = !enableDebug;
enableArchives = !enableArchives;
goto root;
case "d":
case "D":
hideDriveLetters = !hideDriveLetters;
enableDebug = !enableDebug;
goto root;
case "e":
case "E":
options.AddFilenameSuffix = !options.AddFilenameSuffix;
hideDriveLetters = !hideDriveLetters;
goto root;
case "f":
case "F":
options.OutputSubmissionJSON = !options.OutputSubmissionJSON;
options.AddFilenameSuffix = !options.AddFilenameSuffix;
goto root;
case "g":
case "G":
options.IncludeArtifacts = !options.IncludeArtifacts;
options.OutputSubmissionJSON = !options.OutputSubmissionJSON;
goto root;
case "h":
case "H":
options.CompressLogFiles = !options.CompressLogFiles;
options.IncludeArtifacts = !options.IncludeArtifacts;
goto root;
case "i":
case "I":
options.CompressLogFiles = !options.CompressLogFiles;
goto root;
case "j":
case "J":
options.DeleteUnnecessaryFiles = !options.DeleteUnnecessaryFiles;
goto root;
@@ -436,6 +443,12 @@ namespace MPF.Check
options.CreateIRDAfterDumping = true;
}
// Retrieve Redump match information
else if (args[startIndex] == "--no-retrieve")
{
options.RetrieveMatchInformation = false;
}
// Redump login
else if (args[startIndex].StartsWith("-c=") || args[startIndex].StartsWith("--credentials="))
{

28
MPF.Frontend/Tools/SubmissionGenerator.cs
View File

@@ -164,27 +164,25 @@ namespace MPF.Frontend.Tools
if (!options.RetrieveMatchInformation)
return false;
// If credentials are not provided or incomplete
if (string.IsNullOrEmpty(options.RedumpUsername) || string.IsNullOrEmpty(options.RedumpPassword))
return false;
// Set the current dumper based on username
info.DumpersAndStatus ??= new DumpersAndStatusSection();
info.DumpersAndStatus.Dumpers = [options.RedumpUsername!];
info.DumpersAndStatus.Dumpers = [options.RedumpUsername ?? "Anonymous User"];
info.PartiallyMatchedIDs = [];
// Login to Redump
// Login to Redump, if possible
var wc = new RedumpClient();
bool? loggedIn = await wc.Login(options.RedumpUsername ?? string.Empty, options.RedumpPassword ?? string.Empty);
if (loggedIn == null)
if (options.RedumpUsername != null && options.RedumpPassword != null)
{
resultProgress?.Report(ResultEventArgs.Failure("There was an unknown error connecting to Redump"));
return false;
}
else if (loggedIn == false)
{
// Don't log the as a failure or error
return false;
bool? loggedIn = await wc.Login(options.RedumpUsername, options.RedumpPassword);
if (loggedIn == null)
{
resultProgress?.Report(ResultEventArgs.Failure("There was an unknown error connecting to Redump, skipping..."));
return false;
}
else if (loggedIn == false)
{
resultProgress?.Report(ResultEventArgs.Failure("Provided Redump credentials were invalid, not using..."));
}
}
// Setup the checks

17
MPF.UI/Windows/OptionsWindow.xaml
View File

@@ -453,17 +453,30 @@
<TabItem Header="Login Info" Style="{DynamicResource CustomTabItemStyle}">
<StackPanel>
<GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Retrieval">
<UniformGrid Columns="2" Rows="1">
<CheckBox VerticalAlignment="Center" Content="Retrieve Match Information"
IsChecked="{Binding Options.RetrieveMatchInformation}"
ToolTip="Attempts to retrieve match information from Redump"
Margin="0,4"
/>
<Label/> <!-- Empty label for padding -->
</UniformGrid>
</GroupBox>
<GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Redump">
<UniformGrid Columns="5">
<Label VerticalAlignment="Center" HorizontalAlignment="Right" Content="Username" />
<TextBox x:Name="RedumpUsernameTextBox" Height="22" HorizontalAlignment="Stretch"
Text="{Binding Options.RedumpUsername}" />
Text="{Binding Options.RedumpUsername}"
IsEnabled="{Binding Options.RetrieveMatchInformation}" />
<Label VerticalAlignment="Center" HorizontalAlignment="Right" Content="Password" />
<PasswordBox x:Name="RedumpPasswordBox" Height="22" HorizontalAlignment="Stretch" PasswordChar="*" />
<Button x:Name="RedumpLoginTestButton" Height="22" Width="80" Content="Test Login"
Style="{DynamicResource CustomButtonStyle}" />
Style="{DynamicResource CustomButtonStyle}"
IsEnabled="{Binding Options.RetrieveMatchInformation}" />
</UniformGrid>
</GroupBox>