SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Simplify direct package references

Browse Source
This commit is contained in:
Matt Nadareski
2024-12-18 22:55:53 -05:00
parent 5035f2dcc2
commit c4d981350f
10 changed files with 27 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -80,6 +80,7 @@
- Use proper base path for redumper output check
- Verify securom sector count
- Update packages
- Simplify direct package references
### 3.2.4 (2024-11-24)

1
MPF.CLI/MPF.CLI.csproj
View File

@@ -42,7 +42,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BinaryObjectScanner" Version="3.3.3" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.6.2" />
</ItemGroup>

11
MPF.CLI/Program.cs
View File

@@ -3,7 +3,6 @@ using System.IO;
#if NET40
using System.Threading.Tasks;
#endif
using BinaryObjectScanner;
using MPF.Frontend;
using MPF.Frontend.Tools;
using SabreTools.RedumpLib.Data;
@@ -124,15 +123,9 @@ namespace MPF.CLI
}
env.SetExecutionContext(paramStr);
// Make new Progress objects
var resultProgress = new Progress<ResultEventArgs>();
resultProgress.ProgressChanged += ConsoleLogger.ProgressUpdated;
var protectionProgress = new Progress<ProtectionProgress>();
protectionProgress.ProgressChanged += ConsoleLogger.ProgressUpdated;
// Invoke the dumping program
Console.WriteLine($"Invoking {options.InternalProgram} using '{paramStr}'");
var dumpResult = env.Run(resultProgress).GetAwaiter().GetResult();
var dumpResult = env.Run().GetAwaiter().GetResult();
Console.WriteLine(dumpResult.Message);
if (!dumpResult)
return;
@@ -158,7 +151,7 @@ namespace MPF.CLI
}
// Finally, attempt to do the output dance
var verifyResult = env.VerifyAndSaveDumpOutput(resultProgress, protectionProgress)
var verifyResult = env.VerifyAndSaveDumpOutput()
.ConfigureAwait(false).GetAwaiter().GetResult();
Console.WriteLine(verifyResult.Message);
}

25
MPF.Check/ConsoleLogger.cs
View File

@@ -1,25 +0,0 @@
using System;
using BinaryObjectScanner;
using MPF.Frontend;
namespace MPF.Check
{
public static class ConsoleLogger
{
/// <summary>
/// Simple process counter to write to console
/// </summary>
public static void ProgressUpdated(object? sender, ResultEventArgs value)
{
Console.WriteLine(value.Message);
}
/// <summary>
/// Simple process counter to write to console
/// </summary>
public static void ProgressUpdated(object? sender, ProtectionProgress value)
{
Console.WriteLine($"{value.Percentage * 100:N2}%: {value.Filename} - {value.Protection}");
}
}
}

1
MPF.Check/MPF.Check.csproj
View File

@@ -46,7 +46,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BinaryObjectScanner" Version="3.3.3" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.6.2" />
</ItemGroup>

9
MPF.Check/Program.cs
View File

@@ -3,7 +3,6 @@ using System.IO;
#if NET40
using System.Threading.Tasks;
#endif
using BinaryObjectScanner;
using MPF.Frontend;
using MPF.Frontend.Tools;
using SabreTools.RedumpLib;
@@ -69,12 +68,6 @@ namespace MPF.Check
return;
}
// Make new Progress objects
var resultProgress = new Progress<ResultEventArgs>();
resultProgress.ProgressChanged += ConsoleLogger.ProgressUpdated;
var protectionProgress = new Progress<ProtectionProgress>();
protectionProgress.ProgressChanged += ConsoleLogger.ProgressUpdated;
// Validate the supplied credentials
bool? validated = RedumpClient.ValidateCredentials(options.RedumpUsername ?? string.Empty, options.RedumpPassword ?? string.Empty).GetAwaiter().GetResult();
string message = validated switch
@@ -108,7 +101,7 @@ namespace MPF.Check
var env = new DumpEnvironment(options, filepath, drive, knownSystem, mediaType, internalProgram: null, parameters: null);
// Finally, attempt to do the output dance
var result = env.VerifyAndSaveDumpOutput(resultProgress, protectionProgress, seedInfo: opts.Seed)
var result = env.VerifyAndSaveDumpOutput(seedInfo: opts.Seed)
.ConfigureAwait(false).GetAwaiter().GetResult();
Console.WriteLine(result.Message);
}

7
MPF.Check/launchSettings.json
View File

@@ -1,7 +0,0 @@
{
"profiles": {
"MPF.Check": {
"commandName": "Project"
}
}
}

3
MPF.CLI/ConsoleLogger.cs → MPF.Frontend/ConsoleLogger.cs
View File

@@ -1,8 +1,7 @@
using System;
using BinaryObjectScanner;
using MPF.Frontend;
namespace MPF.CLI
namespace MPF.Frontend
{
public static class ConsoleLogger
{

22
MPF.Frontend/DumpEnvironment.cs
View File

@@ -389,6 +389,14 @@ namespace MPF.Frontend
if (_executionContext == null)
return ResultEventArgs.Failure("Error! Current configuration is not supported!");
// Build default console progress indicators if none exist
if (progress == null)
{
var temp = new Progress<ResultEventArgs>();
temp.ProgressChanged += ConsoleLogger.ProgressUpdated;
progress = temp;
}
// Check that we have the basics for dumping
ResultEventArgs result = IsValidForDump();
if (!result)
@@ -428,6 +436,20 @@ namespace MPF.Frontend
if (_processor == null)
return ResultEventArgs.Failure("Error! Current configuration is not supported!");
// Build default console progress indicators if none exist
if (resultProgress == null)
{
var temp = new Progress<ResultEventArgs>();
temp.ProgressChanged += ConsoleLogger.ProgressUpdated;
resultProgress = temp;
}
if (protectionProgress == null)
{
var temp = new Progress<ProtectionProgress>();
temp.ProgressChanged += ConsoleLogger.ProgressUpdated;
protectionProgress = temp;
}
resultProgress?.Report(ResultEventArgs.Success("Gathering submission information... please wait!"));
// Get the output directory and filename separately

1
MPF.UI/MPF.UI.csproj
View File

@@ -69,7 +69,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BinaryObjectScanner" Version="3.3.3" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.6.2" />
</ItemGroup>