diff --git a/CUETools.AccurateRip/CDRepair.cs b/CUETools.AccurateRip/CDRepair.cs index 463c234..3457c52 100644 --- a/CUETools.AccurateRip/CDRepair.cs +++ b/CUETools.AccurateRip/CDRepair.cs @@ -304,7 +304,7 @@ namespace CUETools.AccurateRip return count; } - public string GetAffectedSectors(int min, int max, int offs = 0) + public string GetAffectedSectors(int min, int max, int offs = 0, int coalesce = 2 * 588 * 5) { min = Math.Max(2 * min, 2 * pregap + stride - 2 * ActualOffset); max = Math.Min(2 * max, 2 * finalSampleCount - laststride - 2 * ActualOffset); @@ -315,7 +315,7 @@ namespace CUETools.AccurateRip { int j; for (j = i + 1; j < correctableErrors; j++) - if (erroffsorted[j] - erroffsorted[j - 1] > 2 * 588 * 5) + if (erroffsorted[j] - erroffsorted[j - 1] >= coalesce) break; uint sec1 = (uint)(erroffsorted[i] - offs) / 2 / 588; uint sec2 = (uint)(erroffsorted[j - 1] - offs) / 2 / 588; diff --git a/CUETools.CTDB.EACPlugin/FormSubmitParity.cs b/CUETools.CTDB.EACPlugin/FormSubmitParity.cs index 3df9b0f..32ac07d 100644 --- a/CUETools.CTDB.EACPlugin/FormSubmitParity.cs +++ b/CUETools.CTDB.EACPlugin/FormSubmitParity.cs @@ -46,7 +46,7 @@ namespace CUETools.CTDB.EACPlugin if (resp == null) { #if DEBUG - string server = "hq.cuetools.net"; + string server = "db.cuetools.net"; #else string server = null; #endif diff --git a/CUETools.CTDB/CUEToolsDB.cs b/CUETools.CTDB/CUEToolsDB.cs index 23a1ae4..d6e59b0 100644 --- a/CUETools.CTDB/CUEToolsDB.cs +++ b/CUETools.CTDB/CUEToolsDB.cs @@ -609,10 +609,14 @@ namespace CUETools.CTDB string ifmt = this.Total < 10 ? "1" : this.Total < 100 ? "2" : "3"; for (int iTrack = 0; iTrack < this.TOC.AudioTracks; iTrack++) { - int conf = 0; - List resConfidence = new List(); - List resStatus = new List(); - foreach (DBEntry entry in this.Entries) + int coalesce = 2 * 588 * 5; + string line; + do + { + int conf = 0; + List resConfidence = new List(); + List resStatus = new List(); + foreach (DBEntry entry in this.Entries) { if (!entry.hasErrors) { @@ -633,7 +637,10 @@ namespace CUETools.CTDB } resConfidence.Add(entry.conf); - resStatus.Add(string.Format("differs in {0} samples @{1}", diffCount, entry.repair.GetAffectedSectors(min, max, min))); + if (coalesce >= 64 * 588 * 5) + resStatus.Add(string.Format("differs in {0} samples", diffCount)); + else + resStatus.Add(string.Format("differs in {0} samples @{1}", diffCount, entry.repair.GetAffectedSectors(min, max, min, coalesce))); continue; } if (entry.trackcrcs != null) @@ -668,7 +675,13 @@ namespace CUETools.CTDB { resStatus[i] = string.Format("({0}/{1}) {2}", resConfidence[i], this.Total, resStatus[i]); } - sw.WriteLine(string.Format(" {0,2} | {1}", iTrack + 1, string.Join(", or ", resStatus.ToArray()))); + + coalesce *= 2; + line = string.Join(", or ", resStatus.ToArray()); + } + while (line.Length > 1024 && coalesce < 128 * 588 * 5); + if (line.Length > 1024) line = line.Substring(0, 1024) + "..."; + sw.WriteLine(string.Format(" {0,2} | {1}", iTrack + 1, line)); } }