claunia/cuetools.net
1
0
Fork 0
mirror of https://github.com/claunia/cuetools.net.git synced 2025-12-16 18:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

EAC plugin for CTDB: Don't submit if test != copy

Browse Source
This commit is contained in:
chudov
2011-04-01 22:40:22 +00:00
parent e08e86fea5
commit 81004e9be4
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
CUETools.CTDB.EACPlugin/Plugin.cs
View File

@@ -31,6 +31,7 @@ namespace AudioDataPlugIn
CDImageLayout TOC; CDImageLayout TOC;
string ArId; string ArId;
AccurateRipVerify ar; AccurateRipVerify ar;
AccurateRipVerify arTest;
CUEToolsDB ctdb; CUEToolsDB ctdb;
bool sequence_ok = true; bool sequence_ok = true;
bool is_accurate; bool is_accurate;
@@ -150,6 +151,7 @@ namespace AudioDataPlugIn
TOC[1][0].Start = 0U; TOC[1][0].Start = 0U;
ArId = AccurateRipVerify.CalculateAccurateRipId(TOC); ArId = AccurateRipVerify.CalculateAccurateRipId(TOC);
ar = new AccurateRipVerify(TOC, null); ar = new AccurateRipVerify(TOC, null);
arTest = new AccurateRipVerify(TOC, null);
ctdb = new CUEToolsDB(TOC, null); ctdb = new CUEToolsDB(TOC, null);
ar.ContactAccurateRip(ArId); ar.ContactAccurateRip(ArId);
ctdb.ContactDB("EAC 1.0 CTDB 2.1.1: " + m_drivename); ctdb.ContactDB("EAC 1.0 CTDB 2.1.1: " + m_drivename);
@@ -175,7 +177,8 @@ namespace AudioDataPlugIn
m_test_mode = testmode; m_test_mode = testmode;
if (this.sequence_ok) if (this.sequence_ok)
{ {
if (this.m_start_pos * 588 != ar.Position) var thisAr = m_test_mode ? arTest : ar;
if (this.m_start_pos * 588 != thisAr.Position)
this.sequence_ok = false; this.sequence_ok = false;
} }
} }
@@ -190,11 +193,12 @@ namespace AudioDataPlugIn
public void TransferAudioData(Array audiodata) public void TransferAudioData(Array audiodata)
{ {
if (!this.m_test_mode && this.sequence_ok) if (this.sequence_ok)
{ {
byte[] ad = (byte[])audiodata; byte[] ad = (byte[])audiodata;
AudioBuffer buff = new AudioBuffer(AudioPCMConfig.RedBook, ad, ad.Length / 4); AudioBuffer buff = new AudioBuffer(AudioPCMConfig.RedBook, ad, ad.Length / 4);
ar.Write(buff); var thisAr = m_test_mode ? arTest : ar;
thisAr.Write(buff);
} }
} }
@@ -209,7 +213,8 @@ namespace AudioDataPlugIn
{ {
if (this.sequence_ok) if (this.sequence_ok)
{ {
if ((m_start_pos + m_length) * 588 != ar.Position) var thisAr = m_test_mode ? arTest : ar;
if ((m_start_pos + m_length) * 588 != thisAr.Position)
this.sequence_ok = false; this.sequence_ok = false;
} }
} }
@@ -227,13 +232,19 @@ namespace AudioDataPlugIn
{ {
if (TOC.AudioLength * 588 != ar.Position) if (TOC.AudioLength * 588 != ar.Position)
this.sequence_ok = false; this.sequence_ok = false;
if (ar.Position != arTest.Position && arTest.Position > 0)
this.sequence_ok = false;
} }
if (!this.sequence_ok) if (!this.sequence_ok)
return ""; return "";
if (this.sequence_ok) if (this.sequence_ok)
{ {
int rippingErrorsCount = 0; // TODO: !!! int rippingErrorsCount = 0; // TODO: !!!
if (arTest.Position > 0 && arTest.CRC32(0) != ar.CRC32(0))
rippingErrorsCount = 1;
DBEntry confirm = null; DBEntry confirm = null;
if (ctdb.AccResult == HttpStatusCode.OK)
ctdb.DoVerify();
if ((ctdb.AccResult == HttpStatusCode.NotFound || ctdb.AccResult == HttpStatusCode.OK) if ((ctdb.AccResult == HttpStatusCode.NotFound || ctdb.AccResult == HttpStatusCode.OK)
&& this.is_accurate && rippingErrorsCount == 0) && this.is_accurate && rippingErrorsCount == 0)
{ {
@@ -250,9 +261,10 @@ namespace AudioDataPlugIn
m_data.AlbumArtist, m_data.AlbumArtist,
m_data.AlbumTitle); m_data.AlbumTitle);
} }
sw.WriteLine("[CTDB TOCID: {0}] {1}.", TOC.TOCID, ctdb.DBStatus ?? "found"); sw.WriteLine("[CTDB TOCID: {0}] {1}{2}.",
if (ctdb.SubStatus != null && confirm == null) TOC.TOCID,
sw.WriteLine("Submit result: {0}.", ctdb.SubStatus); ctdb.DBStatus ?? "found",
(confirm != null || ctdb.SubStatus == null) ? "" : (", Submit result: " + ctdb.SubStatus));
foreach (DBEntry entry in ctdb.Entries) foreach (DBEntry entry in ctdb.Entries)
{ {
string confFormat = (ctdb.Total < 10) ? "{0:0}/{1:0}" : string confFormat = (ctdb.Total < 10) ? "{0:0}/{1:0}" :
@@ -269,7 +281,11 @@ namespace AudioDataPlugIn
entry.canRecover ? string.Format("Differs in {0} samples @{1}", entry.repair.CorrectableErrors, entry.repair.AffectedSectors) : entry.canRecover ? string.Format("Differs in {0} samples @{1}", entry.repair.CorrectableErrors, entry.repair.AffectedSectors) :
(entry.httpStatus == 0 || entry.httpStatus == HttpStatusCode.OK) ? "No match" : (entry.httpStatus == 0 || entry.httpStatus == HttpStatusCode.OK) ? "No match" :
entry.httpStatus.ToString()); entry.httpStatus.ToString());
sw.WriteLine("[{0:x8}] ({1}) {2}{3}", entry.crc, conf, status, entry != confirm || ctdb.SubStatus == null ? "" : (", Submit result: " + ctdb.SubStatus)); sw.WriteLine("[{0:x8}] ({1}) {2}{3}",
entry.crc,
conf,
status,
(confirm != entry || ctdb.SubStatus == null) ? "" : (", Submit result: " + ctdb.SubStatus));
} }
bool canFix = false; bool canFix = false;
if (ctdb.AccResult == HttpStatusCode.OK && rippingErrorsCount != 0) if (ctdb.AccResult == HttpStatusCode.OK && rippingErrorsCount != 0)