CTDB EAC Plugin: timeouts

This commit is contained in:
chudov
2011-05-28 15:03:49 +00:00
parent 9394fab3f3
commit 1b5336164c
7 changed files with 141 additions and 83 deletions

View File

@@ -44,6 +44,7 @@
// backgroundWorker1
//
this.backgroundWorker1.WorkerReportsProgress = true;
this.backgroundWorker1.WorkerSupportsCancellation = true;
this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork);
this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker1_RunWorkerCompleted);
this.backgroundWorker1.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.backgroundWorker1_ProgressChanged);
@@ -53,7 +54,6 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(349, 49);
this.ControlBox = false;
this.Controls.Add(this.progressBar1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.MaximizeBox = false;
@@ -63,6 +63,7 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Contacting CTDB...";
this.Load += new System.EventHandler(this.FormMetadata_Load);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormSubmitParity_FormClosing);
this.ResumeLayout(false);
}

View File

@@ -69,5 +69,15 @@ namespace CUETools.CTDB.EACPlugin
this.progressBar1.Style = e.ProgressPercentage != 0 ? ProgressBarStyle.Continuous : ProgressBarStyle.Marquee;
this.progressBar1.Value = Math.Max(0, Math.Min(100, e.ProgressPercentage));
}
private void FormSubmitParity_FormClosing(object sender, FormClosingEventArgs e)
{
if (this.backgroundWorker1.IsBusy)
{
e.Cancel = true;
this.progressBar1.Style = ProgressBarStyle.Marquee;
this.ctdb.CancelRequest();
}
}
}
}

View File

@@ -90,7 +90,7 @@ namespace MetadataPlugIn
public string GetPluginName()
{
return "CUETools DB Metadata Plugin V2.1.2";
return "CUETools DB Metadata Plugin V2.1.2b";
}
public void ShowOptions()

View File

@@ -54,7 +54,7 @@ namespace AudioDataPlugIn
// the plugin and for display in the log file
public string GetAudioTransferPluginName()
{
return "CUETools DB Plugin V2.1.2";
return "CUETools DB Plugin V2.1.2b";
}
// Each plugin should have its own options page.
@@ -219,7 +219,7 @@ namespace AudioDataPlugIn
m_data.AlbumArtist,
m_data.AlbumTitle);
form.ShowDialog();
sw.WriteLine("[CTDB TOCID: {0}] {1}{2}.",
sw.WriteLine("[CTDB TOCID: {0}] {1}{2}",
TOC.TOCID,
ctdb.DBStatus ?? "found",
(ctdb.SubStatus == null) ? "" : (", Submit result: " + ctdb.SubStatus));
@@ -245,7 +245,7 @@ namespace AudioDataPlugIn
status);
}
bool canFix = false;
if (ctdb.AccResult == HttpStatusCode.OK)
if (ctdb.QueryExceptionStatus == WebExceptionStatus.Success)
{
foreach (DBEntry entry in ctdb.Entries)
if (entry.hasErrors && entry.canRecover)