[tracker-miners/sam/test-fixes: 4/8] Add TRACKER_DEBUG=status

[Sam Thursfield <sthursfield src gnome org>]

commit a00c06f381eb45592ad12e4529d5dac0b37fd384
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri May 1 17:01:26 2020 +0200

    Add TRACKER_DEBUG=status

 docs/manpages/tracker-extract.1.txt          |  1 +
 docs/manpages/tracker-miner-fs.1.txt         |  1 +
 src/libtracker-miner/tracker-miner-object.c  | 10 ++++------
 src/libtracker-miners-common/tracker-debug.c |  1 +
 src/libtracker-miners-common/tracker-debug.h |  1 +
 5 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/docs/manpages/tracker-extract.1.txt b/docs/manpages/tracker-extract.1.txt
index 2f1d934af..2915e3531 100644
--- a/docs/manpages/tracker-extract.1.txt
+++ b/docs/manpages/tracker-extract.1.txt
@@ -46,6 +46,7 @@ $ tracker extract /path/to/some/file.mp3
   list of one or more keywords:
     config::: extractor configuration
     statistics::: show statistics about how many files were processed
+    status:: log the status messages that are published over D-Bus
 
 == SEE ALSO
 
diff --git a/docs/manpages/tracker-miner-fs.1.txt b/docs/manpages/tracker-miner-fs.1.txt
index d1c5c04ec..e98c0c7ad 100644
--- a/docs/manpages/tracker-miner-fs.1.txt
+++ b/docs/manpages/tracker-miner-fs.1.txt
@@ -52,6 +52,7 @@ than one instance of this at the same time.
     miner-fs-events::: internal processing of tracker-miner-fs
     monitors::: change events from filesystem monitors
     statistics::: show statistics about how many files were processed
+    status:: log the status messages that are published over D-Bus
 
 == SEE ALSO
 
diff --git a/src/libtracker-miner/tracker-miner-object.c b/src/libtracker-miner/tracker-miner-object.c
index a4c79f8b4..733b54f2a 100644
--- a/src/libtracker-miner/tracker-miner-object.c
+++ b/src/libtracker-miner/tracker-miner-object.c
@@ -24,6 +24,7 @@
 #include <glib/gi18n.h>
 
 #include <libtracker-miners-common/tracker-dbus.h>
+#include <libtracker-miners-common/tracker-debug.h>
 #include <libtracker-miners-common/tracker-type-utils.h>
 
 #include "tracker-miner-object.h"
@@ -37,9 +38,8 @@
  */
 #define PROGRESS_ROUNDED(x) ((x) < 0.01 ? 0.00 : (ceil (((x) * 100) - 0.49) / 100))
 
-#ifdef MINER_STATUS_ENABLE_TRACE
-#warning Miner status traces are enabled
-#define trace(message, ...) g_debug (message, ##__VA_ARGS__)
+#ifdef G_ENABLE_DEBUG
+#define trace(message, ...) TRACKER_NOTE (STATUS, g_message (message, ##__VA_ARGS__))
 #else
 #define trace(...)
 #endif /* MINER_STATUS_ENABLE_TRACE */
@@ -318,8 +318,6 @@ miner_update_progress_cb (gpointer data)
 {
        TrackerMiner *miner = data;
 
-       trace ("(Miner:'%s') UPDATE PROGRESS SIGNAL", G_OBJECT_TYPE_NAME (miner));
-
        g_signal_emit (miner, signals[PROGRESS], 0,
                       miner->priv->status,
                       miner->priv->progress,
@@ -353,7 +351,7 @@ miner_set_property (GObject      *object,
 
                new_status = g_value_get_string (value);
 
-               trace ("(Miner:'%s') Set property:'status' to '%s'",
+               trace ("(Miner:'%s') set property:'status' to '%s'",
                       G_OBJECT_TYPE_NAME (miner),
                       new_status);
 
diff --git a/src/libtracker-miners-common/tracker-debug.c b/src/libtracker-miners-common/tracker-debug.c
index 426fc3314..061b99373 100644
--- a/src/libtracker-miners-common/tracker-debug.c
+++ b/src/libtracker-miners-common/tracker-debug.c
@@ -27,6 +27,7 @@ static const GDebugKey tracker_miners_debug_keys[] = {
   { "miner-fs-events", TRACKER_DEBUG_MINER_FS_EVENTS },
   { "monitors", TRACKER_DEBUG_MONITORS },
   { "statistics", TRACKER_DEBUG_STATISTICS },
+  { "status", TRACKER_DEBUG_STATUS },
 };
 #endif /* G_ENABLE_DEBUG */
 
diff --git a/src/libtracker-miners-common/tracker-debug.h b/src/libtracker-miners-common/tracker-debug.h
index 7b76f1447..2377aa48a 100644
--- a/src/libtracker-miners-common/tracker-debug.h
+++ b/src/libtracker-miners-common/tracker-debug.h
@@ -33,6 +33,7 @@ typedef enum {
   TRACKER_DEBUG_MINER_FS_EVENTS     = 1 <<  2,
   TRACKER_DEBUG_MONITORS            = 1 <<  3,
   TRACKER_DEBUG_STATISTICS          = 1 <<  4,
+  TRACKER_DEBUG_STATUS              = 1 <<  5,
 } TrackerDebugFlag;
 
 #ifdef G_ENABLE_DEBUG