Search: Allow TryExec to be a list of programs.

Author: mtwebster

libnemo-private/nemo-search-engine-advanced.c

@@ -132,7 +132,7 @@ process_search_helper_file (const gchar *path)
 {
     GKeyFile *key_file;
     gchar *exec_format = NULL;
-    gchar *try_exec = NULL;
+    gchar **try_exec_list = NULL;
     gchar *abs_try_path = NULL;
     gchar **mime_types = NULL;
     gint priority = 100;
@@ -158,10 +158,24 @@ process_search_helper_file (const gchar *path)
         goto done;
     }
 
-    try_exec = g_key_file_get_string (key_file, SEARCH_HELPER_GROUP, "TryExec", NULL);
-    abs_try_path = g_find_program_in_path (try_exec);
-    if (!abs_try_path) {
-        DEBUG ("Skipping search helper '%s' - program is not available (%s)", path, try_exec);
+    try_exec_list = g_key_file_get_string_list (key_file, SEARCH_HELPER_GROUP, "TryExec", NULL, NULL);
+    gboolean try_failed = FALSE;
+
+    for (i = 0; i < g_strv_length (try_exec_list); i++) {
+        abs_try_path = g_find_program_in_path (try_exec_list[i]);
+
+        if (!abs_try_path) {
+            DEBUG ("Skipping search helper '%s' - program is not available (%s)", path, try_exec_list[i]);
+            try_failed = TRUE;
+            break;
+        }
+
+        g_free (abs_try_path);
+    }
+
+    g_strfreev (try_exec_list);
+
+    if (try_failed) {
         goto done;
     }
 
@@ -215,8 +229,6 @@ process_search_helper_file (const gchar *path)
 done:
     g_key_file_free (key_file);
     g_free (exec_format);
-    g_free (try_exec);
-    g_free (abs_try_path);
 
     if (mime_types != NULL) {
         g_strfreev (mime_types);

search-helpers/mso.nemo_search_helper

@@ -1,5 +1,5 @@
 [Nemo Search Helper]
-TryExec=nemo-mso-to-txt
+TryExec=nemo-mso-to-txt;
 Exec=nemo-mso-to-txt %s
 MimeType=application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.presentationml.presentation;
 priority=100

search-helpers/third-party/exif.nemo_search_helper

@@ -1,5 +1,5 @@
 [Nemo Search Helper]
-TryExec=exif
+TryExec=exif;
 Exec=exif -m %s
 MimeType=image/jpeg;image/png;image/gif;image/bmp;image/tiff;
 Priority=100

search-helpers/third-party/id3.nemo_search_helper

@@ -1,5 +1,5 @@
 [Nemo Search Helper]
-TryExec=id3
+TryExec=id3;
 Exec=id3 -l %s
 MimeType=audio/mpeg;
 Priority=100

search-helpers/third-party/libreoffice.nemo_search_helper

@@ -1,5 +1,5 @@
 [Nemo Search Helper]
-TryExec=odt2txt
+TryExec=odt2txt;
 Exec=odt2txt %s
 MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.graphics;
 priority=100

search-helpers/third-party/pdf2txt.nemo_search_helper

@@ -1,5 +1,5 @@
 [Nemo Search Helper]
-TryExec=pdf2txt
+TryExec=pdf2txt;
 Exec=pdf2txt %s
 MimeType=application/pdf;
 Priority=100

search-helpers/third-party/pdftotext.nemo_search_helper

@@ -1,5 +1,5 @@
 [Nemo Search Helper]
-TryExec=pdftotext
+TryExec=pdftotext;
 Exec=pdftotext %s -
 MimeType=application/pdf;
 Priority=200

search-helpers/third-party/ps2ascii.nemo_search_helper

@@ -1,5 +1,5 @@
 [Nemo Search Helper]
-TryExec=ps2ascii
+TryExec=ps2ascii;
 Exec=ps2ascii %s
 MimeType=application/ps;
 Priority=100;