actions: Add new conversion token for a file's parent uri (with

selection_count > 0) and location uri (selection_count == 0).

Author: mtwebster

libnemo-private/nemo-action.c

@@ -1143,10 +1143,14 @@ find_token_type (const gchar *str, TokenType *token_type)
             *token_type = TOKEN_URI_LIST;
             return ptr;
         }
-        if (g_str_has_prefix (ptr, TOKEN_EXEC_PARENT)) {
+        if (g_str_has_prefix (ptr, TOKEN_EXEC_LOCATION_PATH)) {
             *token_type = TOKEN_PARENT_PATH;
             return ptr;
         }
+        if (g_str_has_prefix (ptr, TOKEN_EXEC_LOCATION_URI)) {
+            *token_type = TOKEN_PARENT_URI;
+            return ptr;
+        }
         if (g_str_has_prefix (ptr, TOKEN_EXEC_FILE_NAME)) {
             *token_type = TOKEN_FILE_DISPLAY_NAME;
             return ptr;
@@ -1322,7 +1326,7 @@ get_insertion_string (NemoAction *action,
                     first = FALSE;
                 }
             } else {
-                goto default_parent_path;
+                goto default_parent_uri;
             }
             break;
         case TOKEN_PARENT_PATH:
@@ -1343,6 +1347,33 @@ get_insertion_string (NemoAction *action,
             str = insert_quote (action, str);
             g_free (path);
             break;
+        case TOKEN_PARENT_URI:
+            ;
+default_parent_uri:
+            ;
+            gchar *uri;
+            gchar *name = nemo_file_get_display_name (parent);
+            if (g_strcmp0 (name, "x-nemo-desktop") == 0) {
+                gchar *real_desktop_path = nemo_get_desktop_directory ();
+                if (real_desktop_path) {
+                    GFile *file;
+                    file = g_file_new_for_path (real_desktop_path);
+                    uri = g_file_get_uri (file);
+                    g_object_unref (file);
+                    g_free (real_desktop_path);
+                } else {
+                    uri = NULL;
+                }
+            } else {
+                uri = nemo_file_get_uri (parent);
+            }
+
+            str = insert_quote (action, str);
+            str = score_append (action, str, uri);
+            str = insert_quote (action, str);
+            g_free (name);
+            g_free (uri);
+            break;
         case TOKEN_FILE_DISPLAY_NAME:
             if (g_list_length (selection) > 0) {
                 gchar *file_display_name = nemo_file_get_display_name (NEMO_FILE (selection->data));

libnemo-private/nemo-action.h

@@ -45,7 +45,8 @@
 
 #define TOKEN_EXEC_URI_LIST "%U"
 #define TOKEN_EXEC_FILE_LIST "%F"
-#define TOKEN_EXEC_PARENT "%P"
+#define TOKEN_EXEC_LOCATION_PATH "%P" // also parent path
+#define TOKEN_EXEC_LOCATION_URI "%R" //  and uri
 #define TOKEN_EXEC_FILE_NAME "%f"
 #define TOKEN_EXEC_PARENT_NAME "%p"
 #define TOKEN_EXEC_DEVICE "%D"
@@ -100,6 +101,7 @@ typedef enum {
     TOKEN_FILE_DISPLAY_NAME,
     TOKEN_PARENT_DISPLAY_NAME,
     TOKEN_PARENT_PATH,
+    TOKEN_PARENT_URI,
     TOKEN_DEVICE,
     TOKEN_FILE_DISPLAY_NAME_NO_EXT,
     TOKEN_LITERAL_PERCENT,