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

Unblock and Update (#102)

Browse Source 
* RAINBOW

* Add to FormatOutputData

* Update BurnOutSharp

* Fix parameter creation

* Minor improvements

* Update package versions
This commit is contained in:
Matt Nadareski
2018-07-19 14:11:58 -07:00
committed by GitHub
parent 94c0564fe8
commit 3d058e633f
7 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DICUI/DICUI.csproj
View File

@@ -67,8 +67,8 @@
</PropertyGroup>
<PropertyGroup />
<ItemGroup>
<Reference Include="BurnOutSharp, Version=1.3.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\BurnOutSharp.1.3.6\lib\net461\BurnOutSharp.dll</HintPath>
<Reference Include="BurnOutSharp, Version=1.3.7.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\BurnOutSharp.1.3.7.1\lib\net461\BurnOutSharp.dll</HintPath>
</Reference>
<Reference Include="LessIO, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LessIO.0.5.0\lib\net40\LessIO.dll</HintPath>
@@ -92,8 +92,8 @@
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="UnshieldSharp, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UnshieldSharp.1.4.2.1\lib\net461\UnshieldSharp.dll</HintPath>
<Reference Include="UnshieldSharp, Version=1.4.2.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UnshieldSharp.1.4.2.2\lib\net461\UnshieldSharp.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />

1
DICUI/Data/Enumerations.cs
View File

@@ -185,6 +185,7 @@
PhilipsCDiDigitalVideo,
PhotoCD,
PlayStationGameSharkUpdates,
RainbowDisc,
TaoiKTV,
TomyKissSite,
VideoCD,

16
DICUI/MainWindow.xaml.cs
View File

@@ -470,20 +470,8 @@ namespace DICUI
KnownSystem? systemType = SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem;
MediaType? mediaType = MediaTypeComboBox.SelectedItem as MediaType?;
if (drive != null
&& !String.IsNullOrWhiteSpace(drive.VolumeLabel)
&& !drive.IsFloppy
&& systemType != null
&& mediaType != null)
{
OutputDirectoryTextBox.Text = Path.Combine(_options.DefaultOutputPath, drive.VolumeLabel);
OutputFilenameTextBox.Text = drive.VolumeLabel + mediaType.Extension();
}
else
{
OutputDirectoryTextBox.Text = _options.DefaultOutputPath;
OutputFilenameTextBox.Text = "disc" + mediaType.Extension();
}
OutputDirectoryTextBox.Text = Path.Combine(_options.DefaultOutputPath, drive?.VolumeLabel ?? string.Empty);
OutputFilenameTextBox.Text = (drive?.VolumeLabel ?? "disc") + (mediaType.Extension() ?? ".bin");
}
/// <summary>

2
DICUI/Utilities/Converters.cs
View File

@@ -548,6 +548,8 @@ namespace DICUI.Utilities
return "Photo CD";
case KnownSystem.PlayStationGameSharkUpdates:
return "PlayStation GameShark Updates";
case KnownSystem.RainbowDisc:
return "Rainbow Disc";
case KnownSystem.TaoiKTV:
return "Tao iKTV";
case KnownSystem.TomyKissSite:

24
DICUI/Utilities/DumpEnvironment.cs
View File

@@ -217,12 +217,12 @@ namespace DICUI.Utilities
// Execute additional tools
progress?.Report(Result.Success("Running any additional tools... please wait!"));
result = ExecuteAdditionalToolsAfterDIC();
result = await Task.Run(() => ExecuteAdditionalToolsAfterDIC());
progress?.Report(result);
// Verify dump output and save it
progress?.Report(Result.Success("Gathering submission information... please wait!"));
result = VerifyAndSaveDumpOutput();
result = await Task.Run(() => VerifyAndSaveDumpOutput());
progress?.Report(Result.Success("All submission information gathered!"));
return result;
@@ -294,10 +294,10 @@ namespace DICUI.Utilities
return Result.Failure("Error! Could not find subdump!");
ExecuteSubdump();
break;
return Result.Success("subdump has finished!");
}
return Result.Success();
return Result.Success("No external tools needed!");
}
/// <summary>
@@ -408,8 +408,10 @@ namespace DICUI.Utilities
case KnownSystem.EnhancedDVD:
case KnownSystem.EnhancedBD:
case KnownSystem.IBMPCCompatible:
case KnownSystem.RainbowDisc:
mappings[Template.ISBNField] = Template.OptionalValue;
mappings[Template.CopyProtectionField] = GetCopyProtection() ?? Template.RequiredIfExistsValue;
string protection = GetCopyProtection();
mappings[Template.CopyProtectionField] = (!String.IsNullOrWhiteSpace(protection) ? protection : Template.RequiredIfExistsValue);
if (File.Exists(combinedBase + "_subIntention.txt"))
{
FileInfo fi = new FileInfo(combinedBase + "_subIntention.txt");
@@ -507,8 +509,10 @@ namespace DICUI.Utilities
case KnownSystem.EnhancedDVD:
case KnownSystem.EnhancedBD:
case KnownSystem.IBMPCCompatible:
case KnownSystem.RainbowDisc:
mappings[Template.ISBNField] = Template.OptionalValue;
mappings[Template.CopyProtectionField] = GetCopyProtection() ?? Template.RequiredIfExistsValue;
string protection = GetCopyProtection();
mappings[Template.CopyProtectionField] = (!String.IsNullOrWhiteSpace(protection) ? protection : Template.RequiredIfExistsValue);
if (File.Exists(combinedBase + "_subIntention.txt"))
{
FileInfo fi = new FileInfo(combinedBase + "_subIntention.txt");
@@ -612,7 +616,11 @@ namespace DICUI.Utilities
switch (System)
{
case KnownSystem.AppleMacintosh:
case KnownSystem.EnhancedCD:
case KnownSystem.EnhancedDVD:
case KnownSystem.EnhancedBD:
case KnownSystem.IBMPCCompatible:
case KnownSystem.RainbowDisc:
output.Add(Template.ISBNField + ": " + info[Template.ISBNField]);
break;
}
@@ -655,7 +663,11 @@ namespace DICUI.Utilities
switch (System)
{
case KnownSystem.AppleMacintosh:
case KnownSystem.EnhancedCD:
case KnownSystem.EnhancedDVD:
case KnownSystem.EnhancedBD:
case KnownSystem.IBMPCCompatible:
case KnownSystem.RainbowDisc:
output.Add(Template.CopyProtectionField + ": " + info[Template.CopyProtectionField]); output.Add("");
break;
case KnownSystem.MicrosoftXBOX:

3
DICUI/Utilities/Validators.cs
View File

@@ -356,6 +356,9 @@ namespace DICUI.Utilities
case KnownSystem.PlayStationGameSharkUpdates:
types.Add(MediaType.CD);
break;
case KnownSystem.RainbowDisc:
types.Add(MediaType.CD);
break;
case KnownSystem.TaoiKTV:
types.Add(MediaType.CD);
break;

4
DICUI/packages.config
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BurnOutSharp" version="1.3.6" targetFramework="net461" />
<package id="BurnOutSharp" version="1.3.7.1" targetFramework="net461" />
<package id="LessIO" version="0.5.0" targetFramework="net461" />
<package id="libmspack4n" version="0.8.0" targetFramework="net461" />
<package id="UnshieldSharp" version="1.4.2.1" targetFramework="net461" />
<package id="UnshieldSharp" version="1.4.2.2" targetFramework="net461" />
<package id="zlib.net" version="1.0.4.0" targetFramework="net461" />
</packages>