[gnome-software/wip/kalev/gnome-3-22-prep: 41/52] trivial: Use gs_plugin_download_file() helper



commit 53a5c0a828fb4b347605d4522f732c6b830877df
Author: Richard Hughes <richard hughsie com>
Date:   Fri Oct 21 14:31:36 2016 +0100

    trivial: Use gs_plugin_download_file() helper
    
    (cherry picked from commit 93c721c8d55a84824bab64b9c791756dcc8e1ec7)

 src/plugins/gs-plugin-fwupd.c |   29 ++++++++---------------------
 1 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/src/plugins/gs-plugin-fwupd.c b/src/plugins/gs-plugin-fwupd.c
index a2f0f2f..e048ccb 100644
--- a/src/plugins/gs-plugin-fwupd.c
+++ b/src/plugins/gs-plugin-fwupd.c
@@ -697,11 +697,9 @@ gs_plugin_refresh (GsPlugin *plugin,
 
        /* download the files to the cachedir */
        for (i = 0; i < priv->to_download->len; i++) {
-               guint status_code;
                g_autoptr(GError) error_local = NULL;
                g_autofree gchar *basename = NULL;
                g_autofree gchar *filename_cache = NULL;
-               g_autoptr(SoupMessage) msg = NULL;
 
                tmp = g_ptr_array_index (priv->to_download, i);
                basename = g_path_get_basename (tmp);
@@ -711,31 +709,20 @@ gs_plugin_refresh (GsPlugin *plugin,
                                                              error);
                if (filename_cache == NULL)
                        return FALSE;
-               g_debug ("downloading %s to %s", tmp, filename_cache);
 
-               /* set sync request */
-               msg = soup_message_new (SOUP_METHOD_GET, tmp);
-               status_code = soup_session_send_message (gs_plugin_get_soup_session (plugin), msg);
-               if (status_code != SOUP_STATUS_OK) {
+               /* download file */
+               if (!gs_plugin_download_file (plugin,
+                                             NULL, /* app */
+                                             tmp, /* url */
+                                             filename_cache,
+                                             cancellable,
+                                             &error_local)) {
                        g_warning ("Failed to download %s, ignoring: %s",
-                                  tmp, soup_status_get_phrase (status_code));
+                                  tmp, error_local->message);
                        g_ptr_array_remove_index (priv->to_download, i--);
                        g_ptr_array_add (priv->to_ignore, g_strdup (tmp));
                        continue;
                }
-
-               /* save binary file */
-               if (!g_file_set_contents (filename_cache,
-                                         msg->response_body->data,
-                                         msg->response_body->length,
-                                         &error_local)) {
-                       g_set_error (error,
-                                    GS_PLUGIN_ERROR,
-                                    GS_PLUGIN_ERROR_WRITE_FAILED,
-                                    "Failed to save firmware: %s",
-                                    error_local->message);
-                       return FALSE;
-               }
        }
 
        return TRUE;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]