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

Update to BurnOutSharp 1.5.1

Browse Source
This commit is contained in:
Matt Nadareski
2021-01-22 12:03:12 -08:00
parent 5a2e4ca77e
commit 47b5bbe7e7
9 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -17,6 +17,7 @@
- Add hashing for UMDs from UIC outputs
- Fix information gathering for UIC outputs
- Fix issue with duplicate security sector data in XGD DiscImageCreator outputs
- Update to BurnOutSharp 1.5.1
### 1.18 (2020-11-10)
- Add more information extraction and generation for Aaru

2
MPF.Check/MPF.Check.csproj
View File

@@ -22,7 +22,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.0" GeneratePathProperty="true">
<PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.1" GeneratePathProperty="true">
<IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

4
MPF.Check/Program.cs
View File

@@ -123,7 +123,7 @@ namespace MPF.Check
// Make new Progress objects
var resultProgress = new Progress<Result>();
resultProgress.ProgressChanged += ProgressUpdated;
var protectionProgress = new Progress<FileProtection>();
var protectionProgress = new Progress<ProtectionProgress>();
protectionProgress.ProgressChanged += ProgressUpdated;
// If credentials are invalid, alert the user
@@ -261,7 +261,7 @@ namespace MPF.Check
/// <summary>
/// Simple process counter to write to console
/// </summary>
private static void ProgressUpdated(object sender, FileProtection value)
private static void ProgressUpdated(object sender, ProtectionProgress value)
{
Console.WriteLine($"{value.Percentage * 100:N2}%: {value.Filename} - {value.Protection}");
}

4
MPF.Library/MPF.Library.csproj
View File

@@ -67,11 +67,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.0" GeneratePathProperty="true">
<PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.1" GeneratePathProperty="true">
<IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Management" Version="4.7.0" />
<PackageReference Include="System.Management" Version="5.0.0" />
</ItemGroup>
<ItemGroup>

6
MPF.Library/Utilities/DumpEnvironment.cs
View File

@@ -501,7 +501,7 @@ namespace MPF.Utilities
/// <returns>Result instance with the outcome</returns>
public async Task<Result> VerifyAndSaveDumpOutput(
IProgress<Result> resultProgress = null,
IProgress<FileProtection> protectionProgress = null,
IProgress<ProtectionProgress> protectionProgress = null,
bool? ejectDisc = null,
bool resetDrive = false,
Func<SubmissionInfo, bool?> showUserPrompt = null)
@@ -631,7 +631,7 @@ namespace MPF.Utilities
/// <returns>SubmissionInfo populated based on outputs, null on error</returns>
private async Task<SubmissionInfo> ExtractOutputInformation(
IProgress<Result> resultProgress = null,
IProgress<FileProtection> protectionProgress = null)
IProgress<ProtectionProgress> protectionProgress = null)
{
// Ensure the current disc combination should exist
if (!Validators.GetValidMediaTypes(System).Contains(Type))
@@ -1369,7 +1369,7 @@ namespace MPF.Utilities
/// </summary>
/// <param name="progress">Optional progress callback</param>
/// <returns>Copy protection scheme if possible, null on error</returns>
private async Task<string> GetCopyProtection(IProgress<FileProtection> progress = null)
private async Task<string> GetCopyProtection(IProgress<ProtectionProgress> progress = null)
{
if (ScanForProtection)
return await Validators.RunProtectionScanOnPath($"{Drive.Letter}:\\", progress);

2
MPF.Library/Utilities/Validators.cs
View File

@@ -1007,7 +1007,7 @@ namespace MPF.Utilities
/// <param name="path">Path to scan for protection</param>
/// <param name="progress">Optional progress callback</param>
/// <returns>Copy protection detected in the envirionment, if any</returns>
public static async Task<string> RunProtectionScanOnPath(string path, IProgress<FileProtection> progress = null)
public static async Task<string> RunProtectionScanOnPath(string path, IProgress<ProtectionProgress> progress = null)
{
try
{

4
MPF.Test/MPF.Test.csproj
View File

@@ -17,8 +17,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeCoverage" Version="16.7.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Microsoft.CodeCoverage" Version="16.9.0-preview-20210106-01" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20210106-01" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />

4
MPF/MPF.csproj
View File

@@ -21,10 +21,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.0" GeneratePathProperty="true">
<PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.1" GeneratePathProperty="true">
<IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
</ItemGroup>
<ItemGroup>

8
MPF/Windows/MainWindow.xaml.cs
View File

@@ -492,7 +492,7 @@ namespace MPF.Windows
MediaScanButton.IsEnabled = false;
CopyProtectScanButton.IsEnabled = false;
var progress = new Progress<FileProtection>();
var progress = new Progress<ProtectionProgress>();
progress.ProgressChanged += ProgressUpdated;
string protections = await Validators.RunProtectionScanOnPath(drive.Letter + ":\\", progress);
@@ -620,7 +620,7 @@ namespace MPF.Windows
// Get progress indicators
var resultProgress = new Progress<Result>();
resultProgress.ProgressChanged += ProgressUpdated;
var protectionProgress = new Progress<FileProtection>();
var protectionProgress = new Progress<ProtectionProgress>();
protectionProgress.ProgressChanged += ProgressUpdated;
// Run the program with the parameters
@@ -882,9 +882,9 @@ namespace MPF.Windows
}
/// <summary>
/// Handler for FileProtection ProgressChanged event
/// Handler for ProtectionProgress ProgressChanged event
/// </summary>
private void ProgressUpdated(object sender, FileProtection value)
private void ProgressUpdated(object sender, ProtectionProgress value)
{
string message = $"{value.Percentage * 100:N2}%: {value.Filename} - {value.Protection}";
StatusLabel.Content = message;