fixed encoding of autogenerated cuesheets (allows utf8 now)

not catching exceptions in debug version
This commit is contained in:
chudov
2008-11-05 03:58:08 +00:00
parent 98e7815244
commit 39c7b52add

View File

@@ -355,6 +355,7 @@ namespace JDP {
MessageBoxIcon.Exclamation); MessageBoxIcon.Exclamation);
}); });
} }
#if !DEBUG
catch (Exception ex) { catch (Exception ex) {
this.Invoke((MethodInvoker)delegate() { this.Invoke((MethodInvoker)delegate() {
if (_batchPaths.Count == 0) SetupControls(false); if (_batchPaths.Count == 0) SetupControls(false);
@@ -364,6 +365,7 @@ namespace JDP {
} }
}); });
} }
#endif
if (_batchPaths.Count != 0) { if (_batchPaths.Count != 0) {
_batchPaths.RemoveAt(0); _batchPaths.RemoveAt(0);
@@ -862,7 +864,7 @@ namespace JDP {
Array.Sort (audioFiles); Array.Sort (audioFiles);
string cueName = Path.GetFileName(dir) + ".cuetools" + audioExts[i].Substring(1) + ".cue"; string cueName = Path.GetFileName(dir) + ".cuetools" + audioExts[i].Substring(1) + ".cue";
cueName = Path.Combine(dir, cueName); cueName = Path.Combine(dir, cueName);
StreamWriter sw = new StreamWriter(cueName, false, CUESheet.Encoding); StringWriter sw = new StringWriter();
sw.WriteLine(String.Format("REM COMMENT \"CUETools generated dummy CUE sheet\"")); sw.WriteLine(String.Format("REM COMMENT \"CUETools generated dummy CUE sheet\""));
for (int iFile = 0; iFile < audioFiles.Length; iFile++) for (int iFile = 0; iFile < audioFiles.Length; iFile++)
{ {
@@ -871,6 +873,10 @@ namespace JDP {
sw.WriteLine(String.Format(" INDEX 01 00:00:00")); sw.WriteLine(String.Format(" INDEX 01 00:00:00"));
} }
sw.Close(); sw.Close();
bool utf8Required = CUESheet.Encoding.GetString(CUESheet.Encoding.GetBytes(sw.ToString())) != sw.ToString();
StreamWriter sw1 = new StreamWriter(cueName, false, utf8Required ? Encoding.UTF8 : CUESheet.Encoding);
sw1.Write(sw.ToString());
sw1.Close();
break; break;
} }
} }