[tracker-miners/wip/carlosg/better-extractor-errors: 2/5] tracker-extract: Propagate errors from modules

[Carlos Garnacho <carlosg src gnome org>]

commit 53cbc8aa8490698a3420c912269a04ca86cb6d92
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Nov 9 00:39:32 2020 +0100

    tracker-extract: Propagate errors from modules
    
    Those that already dealt with GErrors, at least.

 src/tracker-extract/tracker-extract-iso.c          | 4 +---
 src/tracker-extract/tracker-extract-msoffice-xml.c | 5 ++---
 src/tracker-extract/tracker-extract-pdf.c          | 6 +-----
 src/tracker-extract/tracker-extract-raw.c          | 3 +--
 src/tracker-extract/tracker-extract-text.c         | 3 +--
 src/tracker-extract/tracker-extract-xps.c          | 6 ++----
 6 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-iso.c b/src/tracker-extract/tracker-extract-iso.c
index 292e6dadf..c4c70900b 100644
--- a/src/tracker-extract/tracker-extract-iso.c
+++ b/src/tracker-extract/tracker-extract-iso.c
@@ -66,10 +66,8 @@ tracker_extract_get_metadata (TrackerExtractInfo  *info_,
        if (inner_error != NULL) {
                if (inner_error->code != OSINFO_MEDIA_ERROR_NOT_BOOTABLE) {
                        g_object_unref (metadata);
-                       g_debug ("Could not extract iso info from '%s': %s",
-                                filename, inner_error->message);
                        g_free (filename);
-                       g_error_free (inner_error);
+                       g_propagate_prefixed_error (error, inner_error, "Could not extract ISO info:");
                        return FALSE;
                }
                bootable = FALSE;
diff --git a/src/tracker-extract/tracker-extract-msoffice-xml.c 
b/src/tracker-extract/tracker-extract-msoffice-xml.c
index 463abf5d9..31d8a7880 100644
--- a/src/tracker-extract/tracker-extract-msoffice-xml.c
+++ b/src/tracker-extract/tracker-extract-msoffice-xml.c
@@ -856,9 +856,8 @@ tracker_extract_get_metadata (TrackerExtractInfo  *extract_info,
                                      context,
                                      &inner_error);
        if (inner_error) {
-               g_debug ("Parsing the content-types file gave an error: '%s'",
-                        inner_error->message);
-               g_error_free (inner_error);
+               g_propagate_prefixed_error (error, inner_error, "Could not open:");
+               return FALSE;
        }
 
        extract_content (&info);
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index 1133d0b59..ca15c5c2e 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -360,11 +360,7 @@ tracker_extract_get_metadata (TrackerExtractInfo  *info,
 
                        return TRUE;
                } else {
-                       g_warning ("Couldn't create PopplerDocument from uri:'%s', %s",
-                                  uri,
-                                  inner_error->message);
-
-                       g_error_free (inner_error);
+                       g_propagate_prefixed_error (error, inner_error, "Couldn't open PopplerDocument:");
                        g_free (uri);
                        close (fd);
 
diff --git a/src/tracker-extract/tracker-extract-raw.c b/src/tracker-extract/tracker-extract-raw.c
index c1e6a1889..7f775ef63 100644
--- a/src/tracker-extract/tracker-extract-raw.c
+++ b/src/tracker-extract/tracker-extract-raw.c
@@ -341,8 +341,7 @@ tracker_extract_get_metadata (TrackerExtractInfo  *info,
        filename = g_file_get_path (file);
 
        if (!gexiv2_metadata_open_path (metadata, filename, &inner_error)) {
-               g_warning ("Could not open %s for reading metadata: %s", filename, inner_error->message);
-               g_error_free (inner_error);
+               g_propagate_prefixed_error (error, inner_error, "Could not open: ");
                goto out;
        }
 
diff --git a/src/tracker-extract/tracker-extract-text.c b/src/tracker-extract/tracker-extract-text.c
index 5333e02a3..4d51ec560 100644
--- a/src/tracker-extract/tracker-extract-text.c
+++ b/src/tracker-extract/tracker-extract-text.c
@@ -119,8 +119,7 @@ tracker_extract_get_metadata (TrackerExtractInfo  *info,
 
                if (inner_error != NULL) {
                        /* An error occurred, perhaps the file was deleted. */
-                       g_debug ("Error extracting content: %s", inner_error->message);
-                       g_error_free (inner_error);
+                       g_propagate_prefixed_error (error, inner_error, "Could not open:");
                        return FALSE;
                }
 
diff --git a/src/tracker-extract/tracker-extract-xps.c b/src/tracker-extract/tracker-extract-xps.c
index d089dee1d..f59c6e8d8 100644
--- a/src/tracker-extract/tracker-extract-xps.c
+++ b/src/tracker-extract/tracker-extract-xps.c
@@ -40,8 +40,7 @@ tracker_extract_get_metadata (TrackerExtractInfo  *info,
        filename = g_file_get_path (file);
 
        if (inner_error != NULL) {
-               g_warning ("Unable to open '%s': %s", filename, inner_error->message);
-               g_error_free (inner_error);
+               g_propagate_prefixed_error (error, inner_error, "Unable to open: ");
                g_free (filename);
                return FALSE;
        }
@@ -50,8 +49,7 @@ tracker_extract_get_metadata (TrackerExtractInfo  *info,
        g_object_unref (xps_file);
 
        if (inner_error != NULL) {
-               g_warning ("Unable to read '%s': %s", filename, inner_error->message);
-               g_error_free (inner_error);
+               g_propagate_prefixed_error (error, inner_error, "Unable to read: ");
                g_free (filename);
                return FALSE;
        }