marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

builder: Use SoupRequest to simplify download helpers 

Also, this allows us to support data: uris, etc
tingping/wmclass
Alexander Larsson 2015-12-09 12:55:10 +01:00
parent 3fdfef7e40
commit f16cc44a30
3 changed files with 39 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
builder/builder-source-archive.c
View File

@ -220,54 +220,34 @@ get_download_location (BuilderSourceArchive *self,
}
static GBytes *
download_uri (const char *orig_url,
const char *base_name,
download_uri (const char *url,
BuilderContext *context,
GError **error)
{
SoupSession *session;
g_autoptr(SoupMessage) msg = NULL;
g_autofree char *url = g_strdup (orig_url);
g_autoptr(SoupRequest) req = NULL;
g_autoptr(GInputStream) input = NULL;
g_autoptr(GOutputStream) out = NULL;
session = builder_context_get_soup_session (context);
while (TRUE)
{
g_clear_object (&msg);
msg = soup_message_new ("GET", url);
g_debug ("GET %s", url);
g_print ("Downloading %s...", base_name);
soup_session_send_message (session, msg);
g_print ("done\n");
req = soup_session_request (session, url, error);
if (req == NULL)
return NULL;
g_debug ("response: %d %s", msg->status_code, msg->reason_phrase);
input = soup_request_send (req, NULL, error);
if (input == NULL)
return NULL;
if (SOUP_STATUS_IS_REDIRECTION (msg->status_code))
{
const char *header = soup_message_headers_get_one (msg->response_headers, "Location");
if (header)
{
g_autoptr(SoupURI) new_uri = soup_uri_new_with_base (soup_message_get_uri (msg), header);
g_free (url);
url = soup_uri_to_string (new_uri, FALSE);
g_debug (" -> %s", header);
continue;
}
}
else if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Failed to download %s (error %d): %s", base_name, msg->status_code, msg->reason_phrase);
return NULL;
}
out = g_memory_output_stream_new_resizable ();
if (!g_output_stream_splice (out,
input,
G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET | G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
NULL,
error))
return NULL;
break; /* No redirection */
}
return g_bytes_new_with_free_func (msg->response_body->data,
msg->response_body->length,
g_object_unref,
g_object_ref (msg));
return g_memory_output_stream_steal_as_bytes (G_MEMORY_OUTPUT_STREAM (out));
}
static gboolean
@ -290,15 +270,14 @@ builder_source_archive_download (BuilderSource *source,
if (g_file_query_exists (file, NULL))
return TRUE;
base_name = g_file_get_basename (file);
content = download_uri (self->url,
base_name,
context,
error);
if (content == NULL)
return FALSE;
base_name = g_file_get_basename (file);
sha256 = g_compute_checksum_for_string (G_CHECKSUM_SHA256,
g_bytes_get_data (content, NULL),
g_bytes_get_size (content));

57
builder/builder-source-file.c
View File

@ -212,54 +212,34 @@ get_source_file (BuilderSourceFile *self,
}
static GBytes *
download_uri (const char *orig_url,
const char *base_name,
download_uri (const char *url,
BuilderContext *context,
GError **error)
{
SoupSession *session;
g_autoptr(SoupMessage) msg = NULL;
g_autofree char *url = g_strdup (orig_url);
g_autoptr(SoupRequest) req = NULL;
g_autoptr(GInputStream) input = NULL;
g_autoptr(GOutputStream) out = NULL;
session = builder_context_get_soup_session (context);
while (TRUE)
{
g_clear_object (&msg);
msg = soup_message_new ("GET", url);
g_debug ("GET %s", url);
g_print ("Downloading %s...", base_name);
soup_session_send_message (session, msg);
g_print ("done\n");
req = soup_session_request (session, url, error);
if (req == NULL)
return NULL;
g_debug ("response: %d %s", msg->status_code, msg->reason_phrase);
input = soup_request_send (req, NULL, error);
if (input == NULL)
return NULL;
if (SOUP_STATUS_IS_REDIRECTION (msg->status_code))
{
const char *header = soup_message_headers_get_one (msg->response_headers, "Location");
if (header)
{
g_autoptr(SoupURI) new_uri = soup_uri_new_with_base (soup_message_get_uri (msg), header);
g_free (url);
url = soup_uri_to_string (new_uri, FALSE);
g_debug (" -> %s", header);
continue;
}
}
else if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Failed to download %s (error %d): %s", base_name, msg->status_code, msg->reason_phrase);
return NULL;
}
out = g_memory_output_stream_new_resizable ();
if (!g_output_stream_splice (out,
input,
G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET | G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
NULL,
error))
return NULL;
break; /* No redirection */
}
return g_bytes_new_with_free_func (msg->response_body->data,
msg->response_body->length,
g_object_unref,
g_object_ref (msg));
return g_memory_output_stream_steal_as_bytes (G_MEMORY_OUTPUT_STREAM (out));
}
static gboolean
@ -310,7 +290,6 @@ builder_source_file_download (BuilderSource *source,
}
content = download_uri (self->url,
base_name,
context,
error);
if (content == NULL)

1
common/xdg-app-utils.h
View File

@ -170,6 +170,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(OstreeGpgVerifyResult, g_object_unref)
#ifndef SOUP_AUTOCLEANUPS_H
G_DEFINE_AUTOPTR_CLEANUP_FUNC(SoupSession, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(SoupMessage, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(SoupRequest, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(SoupURI, soup_uri_free)
#endif