diff --git a/DICUI/DICUI.csproj b/DICUI/DICUI.csproj
index 26183ea0..2c79be4b 100644
--- a/DICUI/DICUI.csproj
+++ b/DICUI/DICUI.csproj
@@ -67,8 +67,8 @@
-
- ..\packages\BurnOutSharp.1.3.6\lib\net461\BurnOutSharp.dll
+
+ ..\packages\BurnOutSharp.1.3.7.1\lib\net461\BurnOutSharp.dll
..\packages\LessIO.0.5.0\lib\net40\LessIO.dll
@@ -92,8 +92,8 @@
4.0
-
- ..\packages\UnshieldSharp.1.4.2.1\lib\net461\UnshieldSharp.dll
+
+ ..\packages\UnshieldSharp.1.4.2.2\lib\net461\UnshieldSharp.dll
diff --git a/DICUI/Data/Enumerations.cs b/DICUI/Data/Enumerations.cs
index 790408ba..181a9ebe 100644
--- a/DICUI/Data/Enumerations.cs
+++ b/DICUI/Data/Enumerations.cs
@@ -185,6 +185,7 @@
PhilipsCDiDigitalVideo,
PhotoCD,
PlayStationGameSharkUpdates,
+ RainbowDisc,
TaoiKTV,
TomyKissSite,
VideoCD,
diff --git a/DICUI/MainWindow.xaml.cs b/DICUI/MainWindow.xaml.cs
index 238e77c1..f7c89124 100644
--- a/DICUI/MainWindow.xaml.cs
+++ b/DICUI/MainWindow.xaml.cs
@@ -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");
}
///
diff --git a/DICUI/Utilities/Converters.cs b/DICUI/Utilities/Converters.cs
index 00d1aec1..fbaa3377 100644
--- a/DICUI/Utilities/Converters.cs
+++ b/DICUI/Utilities/Converters.cs
@@ -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:
diff --git a/DICUI/Utilities/DumpEnvironment.cs b/DICUI/Utilities/DumpEnvironment.cs
index cbea2c6b..7d5dc459 100644
--- a/DICUI/Utilities/DumpEnvironment.cs
+++ b/DICUI/Utilities/DumpEnvironment.cs
@@ -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!");
}
///
@@ -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:
diff --git a/DICUI/Utilities/Validators.cs b/DICUI/Utilities/Validators.cs
index 7d6f3899..e4fde132 100644
--- a/DICUI/Utilities/Validators.cs
+++ b/DICUI/Utilities/Validators.cs
@@ -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;
diff --git a/DICUI/packages.config b/DICUI/packages.config
index 88d23189..b3cbc6ff 100644
--- a/DICUI/packages.config
+++ b/DICUI/packages.config
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file