Merge pull request #6 from maquinas07/add-show-in-file-manager

Show in file manager when clicking on the success notification

Author: maquinas07

Makefile

@@ -5,8 +5,8 @@ CFLAGS_XEXTENSIONS=-DHAVE_XEXTENSIONS `pkg-config --cflags xfixes`
 LDFLAGS_XEXTENSIONS=`pkg-config --libs xfixes`
 
 # Comment if you want to disable the dependency to libnotify. Errors will be printed to stderr.
-CFLAGS_NOTIFY:=-DHAVE_NOTIFY `pkg-config --cflags libnotify`
-LDFLAGS_NOTIFY:=`pkg-config --libs libnotify`
+CFLAGS_NOTIFY:=-DHAVE_NOTIFY `pkg-config --cflags libnotify gio-2.0`
+LDFLAGS_NOTIFY:=`pkg-config --libs libnotify gio-2.0`
 
 # Uncomment if you want to be able to select the output folder via zenity
 # CFLAGS_ZENITY=-DHAVE_ZENITY

src/evid.c

@@ -26,6 +26,7 @@
 #include "xrectsel.h"
 
 #ifdef HAVE_NOTIFY
+#include <libnotify/notification.h>
 #include <libnotify/notify.h>
 #endif
 
@@ -366,11 +367,42 @@ static int notify_cancel() {
            "%s: %s", PROGRAM_NAME, "recording was cancelled");
   NotifyNotification *success_notification =
       notify_notification_new(success_notification_summary, NULL, NULL);
-  return notify_notification_show(success_notification, NULL);
+  int result = notify_notification_show(success_notification, NULL);
+  g_object_unref(success_notification);
+  return result;
 #endif
   return 0;
 }
 
+#ifdef HAVE_NOTIFY
+
+typedef struct ActionPayload ActionPayload;
+struct ActionPayload {
+  GMainLoop *loop;
+  const char *target_file;
+};
+
+static void show_in_file_manager_callback(NotifyNotification *notification,
+                                          char *action, gpointer payload) {
+  ActionPayload p = (*(ActionPayload *)payload);
+  if (p.target_file != NULL) {
+    show_file_in_default_file_manager(p.target_file);
+  }
+  g_main_loop_quit(p.loop);
+}
+
+static int on_notification_closed(NotifyNotification *notification,
+                                  gpointer loop) {
+  g_main_loop_quit(*((GMainLoop **)loop));
+  return 0;
+}
+
+static int on_notification_timeout(gpointer loop) {
+  g_main_loop_quit(*((GMainLoop **)loop));
+  return 0;
+}
+#endif
+
 int main(int argc, char *argv[]) {
 #ifdef HAVE_NOTIFY
   notify_init(PROGRAM_NAME);
@@ -475,13 +507,27 @@ int main(int argc, char *argv[]) {
 
         remove_file(tmp_file);
 #ifdef HAVE_NOTIFY
+        GMainLoop *main_loop = g_main_loop_new(0, 1);
+        ActionPayload action_payload = {.loop = main_loop,
+                                        .target_file = new_file};
         char success_notification_summary[50];
         snprintf(success_notification_summary,
                  ARR_SIZE(success_notification_summary), "%s: %s", PROGRAM_NAME,
                  "recording saved successfuly");
         NotifyNotification *success_notification = notify_notification_new(
             success_notification_summary, new_file, NULL);
+        notify_notification_add_action(
+            success_notification, "default", "Show in file manager",
+            show_in_file_manager_callback, &action_payload, NULL);
         notify_notification_show(success_notification, NULL);
+        int timeout = 5000;
+        notify_notification_set_timeout(success_notification, timeout);
+        g_signal_connect(success_notification, "closed",
+                         G_CALLBACK(on_notification_closed), &main_loop);
+        g_timeout_add(timeout, on_notification_timeout, &main_loop);
+        g_main_loop_run(main_loop);
+        g_main_loop_unref(main_loop);
+        g_object_unref(success_notification);
 #endif
         break;
       }
@@ -495,6 +541,7 @@ int main(int argc, char *argv[]) {
           NotifyNotification *success_notification =
               notify_notification_new(success_notification_summary, NULL, NULL);
           notify_notification_show(success_notification, NULL);
+          g_object_unref(success_notification);
 #endif
           break;
         }

src/file.c

@@ -34,6 +34,10 @@
 
 #include <linux/limits.h>
 
+#ifdef HAVE_NOTIFY
+#include <gio/gio.h>
+#endif
+
 void get_default_file_name(char *default_file_name, Args *args) {
   time_t rawtime = time(NULL);
   struct tm *tm = localtime(&rawtime);
@@ -185,3 +189,48 @@ int mkdirp(const char *dir) {
   }
   return 0;
 }
+
+#ifdef HAVE_NOTIFY
+int show_file_in_default_file_manager(const char *file) {
+  GError *err = NULL;
+  GDBusProxy *proxy = g_dbus_proxy_new_for_bus_sync(
+      G_BUS_TYPE_SESSION,
+      G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS |
+          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+      NULL, "org.freedesktop.FileManager1", "/org/freedesktop/FileManager1",
+      "org.freedesktop.FileManager1", NULL, &err);
+  if (!proxy) {
+    error("failed to create DBUS proxy for FileManager1: %s\n", err->message);
+    g_error_free(err);
+    return -1;
+  }
+
+  gchar *uri = g_filename_to_uri(file, NULL, &err);
+  if (!uri) {
+    error("failed to convert to uri: %s\n", err->message);
+    g_error_free(err);
+    return -1;
+  }
+
+  GVariantBuilder builder;
+  g_variant_builder_init(&builder, G_VARIANT_TYPE("as"));
+  g_variant_builder_add(&builder, "s", uri);
+
+  g_free(uri);
+
+  const char *startupId = "";
+  GVariant *result = g_dbus_proxy_call_sync(
+      proxy, "ShowItems", g_variant_new("(ass)", &builder, startupId),
+      G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+
+  g_object_unref(proxy);
+  if (!result) {
+    error("failed to query file manager: %s\n", err->message);
+    g_error_free(err);
+    return -1;
+  }
+  g_variant_unref(result);
+
+  return 0;
+}
+#endif

src/file.h

@@ -30,4 +30,8 @@ void move_file(const char *source_file, const char *dest_file);
 int remove_file(const char *file);
 int mkdirp(const char *dir);
 
+#ifdef HAVE_NOTIFY
+int show_file_in_default_file_manager(const char *file);
+#endif
+
 #endif