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

Disable nonstandard BD-ROM sizes

Browse Source
This commit is contained in:
Matt Nadareski
2022-07-08 22:05:24 -07:00
parent 7621ef1a13
commit d3ae372903
7 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -97,6 +97,7 @@
- Add files for XBONE
- Update to DIC 20220707
- Fix .bin file paths; update internal filename generation
- Disable nonstandard BD-ROM sizes
### 2.3 (2022-02-05)
- Start overhauling Redump information pulling, again

20
MPF.Library/InfoTool.cs
View File

@@ -863,12 +863,12 @@ namespace MPF.Library
return $"{mediaType.LongName()}-128";
else if (layerbreak2 != default)
return $"{mediaType.LongName()}-100";
else if (layerbreak != default && size > 53_687_063_712)
return $"{mediaType.LongName()}-66";
//else if (layerbreak != default && size > 53_687_063_712)
// return $"{mediaType.LongName()}-66";
else if (layerbreak != default)
return $"{mediaType.LongName()}-50";
else if (size > 26_843_531_856)
return $"{mediaType.LongName()}-33";
//else if (size > 26_843_531_856)
// return $"{mediaType.LongName()}-33";
else
return $"{mediaType.LongName()}-25";
@@ -1149,21 +1149,21 @@ namespace MPF.Library
switch (info.CommonDiscInfo.Media)
{
case DiscType.BD25:
case DiscType.BD33:
//case DiscType.BD33:
case DiscType.BD50:
case DiscType.BD66:
//case DiscType.BD66:
case DiscType.BD100:
case DiscType.BD128:
if (info.SizeAndChecksums.Layerbreak3 != default)
info.CommonDiscInfo.Media = DiscType.BD128;
else if (info.SizeAndChecksums.Layerbreak2 != default)
info.CommonDiscInfo.Media = DiscType.BD100;
else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.Size > 53_687_063_712)
info.CommonDiscInfo.Media = DiscType.BD66;
//else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.Size > 53_687_063_712)
// info.CommonDiscInfo.Media = DiscType.BD66;
else if (info.SizeAndChecksums.Layerbreak != default)
info.CommonDiscInfo.Media = DiscType.BD50;
else if (info.SizeAndChecksums.Size > 26_843_531_856)
info.CommonDiscInfo.Media = DiscType.BD33;
//else if (info.SizeAndChecksums.Size > 26_843_531_856)
// info.CommonDiscInfo.Media = DiscType.BD33;
else
info.CommonDiscInfo.Media = DiscType.BD25;
break;

4
MPF.Test/Library/InfoToolTests.cs
View File

@@ -25,9 +25,9 @@ namespace MPF.Test.Library
[InlineData(MediaType.DVD, 12345, 1, 2, 3, "DVD-ROM-9")]
[InlineData(MediaType.BluRay, 0, 0, 0, 0, "BD-ROM-25")]
[InlineData(MediaType.BluRay, 12345, 0, 0, 0, "BD-ROM-25")]
[InlineData(MediaType.BluRay, 26_843_531_857, 0, 0, 0, "BD-ROM-33")]
//[InlineData(MediaType.BluRay, 26_843_531_857, 0, 0, 0, "BD-ROM-33")]
[InlineData(MediaType.BluRay, 12345, 1, 0, 0, "BD-ROM-50")]
[InlineData(MediaType.BluRay, 53_687_063_713, 1, 0, 0, "BD-ROM-66")]
//[InlineData(MediaType.BluRay, 53_687_063_713, 1, 0, 0, "BD-ROM-66")]
[InlineData(MediaType.BluRay, 12345, 1, 2, 0, "BD-ROM-100")]
[InlineData(MediaType.BluRay, 12345, 1, 2, 3, "BD-ROM-128")]
[InlineData(MediaType.UMD, 0, 0, 0, 0, "UMD-SL")]

4
MPF.Test/RedumpLib/ExtensionsTests.cs
View File

@@ -18,9 +18,9 @@ namespace MPF.Test.RedumpLib
private static readonly DiscType?[] _mappableDiscTypes = new DiscType?[]
{
DiscType.BD25,
DiscType.BD33,
//DiscType.BD33,
DiscType.BD50,
DiscType.BD66,
//DiscType.BD66,
DiscType.BD100,
DiscType.BD128,
DiscType.CD,

4
MPF.UI.Core/ViewModels/DiscInformationViewModel.cs
View File

@@ -654,9 +654,9 @@ namespace MPF.UI.Core.ViewModels
case DiscType.HDDVDSL:
case DiscType.HDDVDDL:
case DiscType.BD25:
case DiscType.BD33:
//case DiscType.BD33:
case DiscType.BD50:
case DiscType.BD66:
//case DiscType.BD66:
case DiscType.BD100:
case DiscType.BD128:
case DiscType.NintendoGameCubeGameDisc:

8
RedumpLib/Data/Enumerations.cs
View File

@@ -56,14 +56,14 @@ namespace RedumpLib.Data
[HumanReadable(LongName = "BD-25")]
BD25,
[HumanReadable(LongName = "BD-33")]
BD33,
//[HumanReadable(LongName = "BD-33")]
//BD33,
[HumanReadable(LongName = "BD-50")]
BD50,
[HumanReadable(LongName = "BD-66")]
BD66,
//[HumanReadable(LongName = "BD-66")]
//BD66,
[HumanReadable(LongName = "BD-100")]
BD100,

16
RedumpLib/Data/Extensions.cs
View File

@@ -747,9 +747,9 @@ namespace RedumpLib.Data
switch (discType)
{
case DiscType.BD25:
case DiscType.BD33:
//case DiscType.BD33:
case DiscType.BD50:
case DiscType.BD66:
//case DiscType.BD66:
case DiscType.BD100:
case DiscType.BD128:
return MediaType.BluRay;
@@ -852,15 +852,15 @@ namespace RedumpLib.Data
case "bd25":
case "bd-25":
return DiscType.BD25;
case "bd33":
case "bd-33":
return DiscType.BD33;
//case "bd33":
//case "bd-33":
// return DiscType.BD33;
case "bd50":
case "bd-50":
return DiscType.BD50;
case "bd66":
case "bd-66":
return DiscType.BD66;
//case "bd66":
//case "bd-66":
// return DiscType.BD66;
case "bd100":
case "bd-100":
return DiscType.BD100;