ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Abstract the dialog from `AudioExtractor.Extract` and add skip option

This commit is contained in:
YoshiRulz 2021-11-02 21:36:42 +10:00
parent a439ea4970
commit 9bcedb2dab
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/BizHawk.Client.DiscoHawk/AudioExtractor.cs
View File

@ -1,4 +1,4 @@
using System.Windows.Forms;
using System;
using System.Threading.Tasks;
using System.IO;
using BizHawk.Emulation.DiscSystem;
@ -11,12 +11,12 @@ namespace BizHawk.Client.DiscoHawk
{
public static string FFmpegPath;
public static void Extract(Disc disc, string path, string fileBase)
public static void Extract(Disc disc, string path, string fileBase, Func<bool?> getOverwritePolicy)
{
var dsr = new DiscSectorReader(disc);
var shouldHalt = false;
bool? overwriteExisting = null; // true = overwrite, false = skip existing (unimplemented), null = unset
bool? overwriteExisting = null; // true = overwrite, false = skip existing, null = unset
var tracks = disc.Session1.Tracks;
Parallel.ForEach(tracks, track =>
@ -41,18 +41,18 @@ namespace BizHawk.Client.DiscoHawk
string mp3Path = $"{Path.Combine(path, fileBase)} - Track {track.Number:D2}.mp3";
if (File.Exists(mp3Path))
{
if (overwriteExisting is null)
overwriteExisting ??= getOverwritePolicy();
switch (overwriteExisting)
{
var dr = MessageBox.Show("This file already exists. Do you want extraction to proceed overwriting files, or cancel the entire operation immediately?", "File already exists", MessageBoxButtons.OKCancel);
if (dr == DialogResult.Cancel)
{
case true: // "Yes" -- overwrite
File.Delete(mp3Path);
break;
case false: // "No" -- skip
return;
case null: // "Cancel" -- halt
shouldHalt = true;
return;
}
overwriteExisting = true;
}
File.Delete(mp3Path);
}
string tempfile = Path.GetTempFileName();

12
src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs
View File

@ -122,7 +122,17 @@ namespace BizHawk.Client.DiscoHawk
using var disc = Disc.LoadAutomagic(file);
var path = Path.GetDirectoryName(file);
var filename = Path.GetFileNameWithoutExtension(file);
AudioExtractor.Extract(disc, path, filename);
static bool? PromptForOverwrite()
=> MessageBox.Show(
"Do you want to overwrite existing files? Choosing \"No\" will simply skip those. You could also \"Cancel\" the extraction entirely.",
"File to extract already exists",
MessageBoxButtons.YesNoCancel) switch
{
DialogResult.Yes => true,
DialogResult.No => false,
_ => null
};
AudioExtractor.Extract(disc, path, filename, PromptForOverwrite);
}
}