From c4c50a468735c362ca9b597b750e825232227a7e Mon Sep 17 00:00:00 2001
From: Julian Sparber <julian@sparber.net>
Date: Mon, 11 Sep 2017 17:43:21 +0200
Subject: [PATCH] [feat] allow user to click on notification's open btn to open
 file

---
 src/.gitignore    |  1 +
 src/get.c         | 29 +++++++++++++++++------------
 src/teleportapp.c | 10 ++++++++--
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/.gitignore b/src/.gitignore
index b8a15c9..03b868a 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -27,3 +27,4 @@ _libs
 /teleportapp
 /teleportapp.o
 /teleportappwin.o
+test_download
diff --git a/src/get.c b/src/get.c
index c939bce..3ad75c8 100644
--- a/src/get.c
+++ b/src/get.c
@@ -17,16 +17,17 @@
 
 static SoupSession *session;
 static gboolean debug;
-static gchar *output_direcotry;
 
-
-int saveFile (SoupMessage *msg, const gchar *output_file_path);
+int saveFile (SoupMessage *, const gchar *, const gchar *);
+gchar * getFilePath (const gchar *, const gchar *);
 
   static void
 finished (SoupSession *session, SoupMessage *msg, gpointer target)
 {
-  //GVariant *target array: {originDevice, url, filename}
+  //GVariant *target array: {originDevice, url, filename, downloadDirectory}
   saveFile(msg,
+      (char *) g_variant_get_string (
+        g_variant_get_child_value ((GVariant *) target, 3), NULL),
       (char *) g_variant_get_string (
         g_variant_get_child_value ((GVariant *) target, 2), NULL));
 
@@ -39,7 +40,7 @@ finished (SoupSession *session, SoupMessage *msg, gpointer target)
 }
 
   int
-get (char *url, const gchar *outputFilename)
+get (char *url, const gchar *downloadDirectory, const gchar *outputFilename)
 {
   GError *error = NULL;
   SoupLogger *logger = NULL;
@@ -76,6 +77,7 @@ get (char *url, const gchar *outputFilename)
   g_variant_builder_add (builder, "s", "devicename");
   g_variant_builder_add (builder, "s", url);
   g_variant_builder_add (builder, "s", outputFilename);
+  g_variant_builder_add (builder, "s", downloadDirectory);
   target = g_variant_new ("as", builder);
   g_variant_builder_unref (builder);
 
@@ -84,7 +86,7 @@ get (char *url, const gchar *outputFilename)
   return 0;
 }
 
-int saveFile (SoupMessage *msg, const gchar *outputFilename) {
+int saveFile (SoupMessage *msg, const gchar *outputDirectory, const gchar *outputFilename) {
   const char *name;
   FILE *output_file = NULL;
 
@@ -102,9 +104,7 @@ int saveFile (SoupMessage *msg, const gchar *outputFilename) {
       //g_print ("%s: Got a file offered form a other peer. Will not save anything.\n", name);
     }
     else {
-      output_file = fopen (g_strdup_printf("%s%s", output_direcotry,
-                           g_uri_escape_string(outputFilename, NULL, TRUE)),
-                           "w");
+      output_file = fopen (getFilePath(outputDirectory, outputFilename), "w");
 
       if (!output_file)
         g_printerr ("Error trying to create file %s.\n", outputFilename);
@@ -125,16 +125,21 @@ int saveFile (SoupMessage *msg, const gchar *outputFilename) {
 
 int do_client_notify (char *url)
 {
-  get (g_strdup(url), NULL);
+  get (g_strdup(url), NULL, NULL);
   g_print("Offering selected file to other machine.\n");
   return 0;
 }
 
+
+gchar * getFilePath (const gchar *outputDirectory, const gchar *outputFilename) {
+    return g_strdup_printf("%s%s", outputDirectory,
+                           g_uri_escape_string(outputFilename, NULL, TRUE));
+}
   int 
 do_downloading (const char *originDevice, const char *url, const char *filename)
 {
-  output_direcotry = "./test_download/";
+  gchar *outputDirectory = "./test_download/";
   g_print("Downloading %s to %s\n", url, g_uri_escape_string(filename, NULL, TRUE));
-  get (g_strdup(url), filename);
+  get (g_strdup(url), outputDirectory, filename);
   return 0;
 }
diff --git a/src/teleportapp.c b/src/teleportapp.c
index 0370105..2830e8a 100644
--- a/src/teleportapp.c
+++ b/src/teleportapp.c
@@ -61,7 +61,13 @@ void do_nothing_callback (GSimpleAction *simple,
 void open_file_callback (GSimpleAction *simple,
     GVariant      *parameter,
     gpointer       user_data) {
-  g_print("Open file\n");
+  g_print("Open file\n %s%s",
+                 g_variant_get_string (g_variant_get_child_value (parameter, 3), NULL),
+                 g_variant_get_string (g_variant_get_child_value (parameter, 2), NULL));
+
+  g_spawn_command_line_async(g_strdup_printf("xdg-open /home/julian/Projects/teleport/src/%s%s",
+                 g_variant_get_string (g_variant_get_child_value (parameter, 3), NULL),
+                 g_variant_get_string (g_variant_get_child_value (parameter, 2), NULL)), NULL);
 }
 
 void create_user_notification (const char *file_name, const int file_size, const char *origin_device, GVariant *target) {
@@ -160,7 +166,7 @@ teleport_app_activate (GApplication *app) {
 
   create_finished_notification ("USER", 2000, "FILENAME", value);
   */
-  do_downloading("Julian", "https://sparber.net", "juliansfile");
+  do_downloading("Julian", "https://sparber.net", "juliansfile.txt");
 
   run_http_server();
   run_avahi_publish_service((char *) g_get_host_name());