N0VA/BeamMeUp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] fix wrong download folder and filename, [refactor] clean up code

Browse Source
This commit is contained in:
Julian Sparber
2017-09-11 12:55:08 +02:00
parent 0687d7877b
commit 768b9c8a36
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/get.c
View File

@@ -17,18 +17,19 @@
static SoupSession *session; static SoupSession *session;
static gboolean debug; static gboolean debug;
static gchar *output_direcotry;
int callback (SoupMessage *msg, const gchar *output_file_path); int saveFile (SoupMessage *msg, const gchar *output_file_path);
static void static void
finished (SoupSession *session, SoupMessage *msg, gpointer target) finished (SoupSession *session, SoupMessage *msg, gpointer target)
{ {
//GVariant *target array: {originDevice, url, filename} //GVariant *target array: {originDevice, url, filename}
callback(msg, saveFile(msg,
(char *) g_variant_get_string ( (char *) g_variant_get_string (
g_variant_get_child_value ((GVariant *) target, 0), NULL)); g_variant_get_child_value ((GVariant *) target, 2), NULL));
create_finished_notification ((char *) g_variant_get_string ( create_finished_notification ((char *) g_variant_get_string (
g_variant_get_child_value ((GVariant *) target, 0), NULL), g_variant_get_child_value ((GVariant *) target, 0), NULL),
0, 0,
@@ -38,7 +39,7 @@ finished (SoupSession *session, SoupMessage *msg, gpointer target)
} }
int int
get (char *url, const gchar *output_file_path) get (char *url, const gchar *outputFilename)
{ {
GError *error = NULL; GError *error = NULL;
SoupLogger *logger = NULL; SoupLogger *logger = NULL;
@@ -74,7 +75,7 @@ get (char *url, const gchar *output_file_path)
builder = g_variant_builder_new (G_VARIANT_TYPE ("as")); builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
g_variant_builder_add (builder, "s", "devicename"); g_variant_builder_add (builder, "s", "devicename");
g_variant_builder_add (builder, "s", url); g_variant_builder_add (builder, "s", url);
g_variant_builder_add (builder, "s", output_file_path); g_variant_builder_add (builder, "s", outputFilename);
target = g_variant_new ("as", builder); target = g_variant_new ("as", builder);
g_variant_builder_unref (builder); g_variant_builder_unref (builder);
@@ -83,9 +84,11 @@ get (char *url, const gchar *output_file_path)
return 0; return 0;
} }
int callback (SoupMessage *msg, const gchar *output_file_path) { int saveFile (SoupMessage *msg, const gchar *outputFilename) {
const char *name; const char *name;
FILE *output_file = NULL; FILE *output_file = NULL;
//get (g_strdup(url), g_strdup_printf("./test_download/%s", g_uri_escape_string(filename, NULL, TRUE)));
name = soup_message_get_uri (msg)->path; name = soup_message_get_uri (msg)->path;
if (SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code)) if (SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code))
@@ -95,13 +98,16 @@ int callback (SoupMessage *msg, const gchar *output_file_path) {
g_print ("%s: %d %s\n", name, msg->status_code, msg->reason_phrase); g_print ("%s: %d %s\n", name, msg->status_code, msg->reason_phrase);
} else if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { } else if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
//if there is no file name and path the page will not get saved //if there is no file name and path the page will not get saved
if (output_file_path == NULL) { if (outputFilename == NULL) {
//g_print ("%s: Got a file offered form a other peer. Will not save anything.\n", name); //g_print ("%s: Got a file offered form a other peer. Will not save anything.\n", name);
} }
else { else {
output_file = fopen (output_file_path, "w"); output_file = fopen (g_strdup_printf("%s%s", output_direcotry,
g_uri_escape_string(outputFilename, NULL, TRUE)),
"w");
if (!output_file) if (!output_file)
g_printerr ("Error trying to create file %s.\n", output_file_path); g_printerr ("Error trying to create file %s.\n", outputFilename);
if (output_file) { if (output_file) {
fwrite (msg->response_body->data, fwrite (msg->response_body->data,
@@ -127,7 +133,8 @@ int do_client_notify (char *url)
int int
do_downloading (const char *originDevice, const char *url, const char *filename) do_downloading (const char *originDevice, const char *url, const char *filename)
{ {
output_direcotry = "./test_download/";
g_print("Downloading %s to %s\n", url, g_uri_escape_string(filename, NULL, TRUE)); g_print("Downloading %s to %s\n", url, g_uri_escape_string(filename, NULL, TRUE));
get (g_strdup(url), g_strdup_printf("./test_download/%s", g_uri_escape_string(filename, NULL, TRUE))); get (g_strdup(url), filename);
return 0; return 0;
} }