[brasero] Detect unneeded operations which end up to an infinite wait

[Philippe Rouquier <philippr src gnome org>]

commit 9cd652d75142cc4dce505fd5b90f13da51bbf998
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Fri Aug 21 14:16:55 2009 +0200

    Detect unneeded operations which end up to an infinite wait

 plugins/libburnia/burn-libburn-common.c |   37 ++++++++++++++++++++++++++++--
 plugins/libburnia/burn-libburn-common.h |    2 +
 2 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/plugins/libburnia/burn-libburn-common.c b/plugins/libburnia/burn-libburn-common.c
index 9fb4ce7..21dead3 100644
--- a/plugins/libburnia/burn-libburn-common.c
+++ b/plugins/libburnia/burn-libburn-common.c
@@ -108,6 +108,11 @@ brasero_libburn_common_ctx_free (BraseroLibburnCtx *ctx)
 {
 	enum burn_drive_status status;
 
+	if (ctx->op_start) {
+		g_timer_destroy (ctx->op_start);
+		ctx->op_start = NULL;
+	}
+
 	BRASERO_BURN_LOG ("Stopping Drive");
 
 	/* try to properly cancel the drive */
@@ -316,8 +321,35 @@ brasero_libburn_common_status (BraseroJob *self,
 
 	status = burn_drive_get_status (ctx->drive, &progress);
 
-	/* FIXME! for some operations that libburn can't perform the drive stays
-	 * idle and we've got no way to tell that kind of use case */
+	/* For some operations that libburn can't perform
+	 * the drive stays idle and we've got no way to tell
+	 * that kind of use cases. For example, this 
+	 * happens when fast blanking a blank DVD-RW */
+	if (ctx->status == BURN_DRIVE_IDLE && status == BURN_DRIVE_IDLE) {
+		BRASERO_BURN_LOG ("Waiting for operation to start");
+		if (ctx->op_start == NULL) {
+			/* wait for action for 2 seconds until we timeout */
+			ctx->op_start = g_timer_new ();
+			g_timer_start (ctx->op_start);
+		}
+		else {
+			gdouble elapsed = 0.0;
+
+			/* See how long elapsed since we started.
+			 * NOTE: we do not consider this as an error. 
+			 * since it can be because of an unneeded 
+			 * operation like blanking on a blank disc. */
+			elapsed = g_timer_elapsed (ctx->op_start, NULL);
+			if (elapsed > 2.0)
+				return BRASERO_BURN_OK;
+		}
+	}
+	else if (ctx->op_start) {
+		BRASERO_BURN_LOG ("Operation started");
+		g_timer_destroy (ctx->op_start);
+		ctx->op_start = NULL;
+	}
+
 	if (ctx->status != status) {
 		gboolean running;
 
@@ -334,7 +366,6 @@ brasero_libburn_common_status (BraseroJob *self,
 	||  !progress.sectors
 	||  !progress.sector) {
 		ctx->sectors = 0;
-
 		ctx->track_num = progress.track;
 		ctx->track_sectors = progress.sectors;
 		return BRASERO_BURN_RETRY;
diff --git a/plugins/libburnia/burn-libburn-common.h b/plugins/libburnia/burn-libburn-common.h
index e744620..5f3d2cd 100644
--- a/plugins/libburnia/burn-libburn-common.h
+++ b/plugins/libburnia/burn-libburn-common.h
@@ -56,6 +56,8 @@ struct _BraseroLibburnCtx {
 	gint64 track_sectors;
 
 	gint has_leadin;
+
+	GTimer *op_start;
 };
 typedef struct _BraseroLibburnCtx BraseroLibburnCtx;