Adjusted desktop file validation for TryExec. An invalid value here is actually a valid state (LP #1754888)

Author: bluesabre

NEWS

@@ -7,6 +7,8 @@ MenuLibre                                                                  NEWS
   . Delay menu updates for 1 second to prevent file writing collisions
   . Added GTK to desktop entry categories
   . Added OnlyShowIn to desktop entry for known supported desktops
+  . Adjusted desktop file validation for "TryExec". An invalid value here
+    is actually a valid state. (LP #1754888)
 - Bug Fixes:
   . Fix infinite loop entered when deleting a file in search mode
     (by disabling deletions while in search mode) (LP: #1751616)

menulibre/util.py

@@ -567,7 +567,9 @@ def determine_bad_desktop_files():
     for line in result.stderr.decode().split('\n'):
         matches = re.match(r'^Failed to load "(.+\.desktop)"$', line)
         if matches:
-            bad_desktop_files.append(matches.groups()[0])
+            desktop_file = matches.groups()[0]
+            if validate_desktop_file(desktop_file):
+                bad_desktop_files.append(matches.groups()[0])
 
     # Alphabetical sort on bad desktop file paths
     bad_desktop_files.sort()
@@ -648,6 +650,9 @@ def validate_desktop_file(desktop_file):  # noqa
                 % ('Type', type_key, GLib.KEY_FILE_DESKTOP_TYPE_APPLICATION))
 
     # Validating 'try exec' if its present
+    # Invalid TryExec is a valid state. "If the file is not present or if it
+    # is not executable, the entry may be ignored (not be used in menus, for
+    # example)."
     try:
         try_exec = keyfile.get_string(start_group,
                                       GLib.KEY_FILE_DESKTOP_KEY_TRY_EXEC)
@@ -657,16 +662,9 @@ def validate_desktop_file(desktop_file):  # noqa
     else:
         try:
             if len(try_exec) > 0 and find_program(try_exec) is None:
-                # Translators: This error is displayed when a failing desktop
-                # file contains an invalid path to an executable file.
-                return (_('%s program \'%s\' has not been found in the'
-                          ' PATH') % ('TryExec', try_exec))
+                return False
         except Exception as e:
-            # Translators: This error is displayed when a failing desktop
-            # file contains an invalid command to execute.
-            return (_('%s program \'%s\' is not a valid shell command '
-                      'according to GLib.shell_parse_argv, error: %s')
-                    % ('TryExec', try_exec, e))
+            return False
 
     # Validating executable
     try:

po/menulibre.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-16 06:52-0400\n"
+"POT-Creation-Date: 2018-03-16 20:19-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -894,43 +894,39 @@ msgstr ""
 #. Translators: This error is displayed when a desktop file cannot
 #. be correctly read by MenuLibre. A (possibly untranslated) error
 #. code is displayed.
-#: ../menulibre/util.py:617
+#: ../menulibre/util.py:619
 #, python-format
 msgid "Unable to load desktop file due to the following error: %s"
 msgstr ""
 
 #. Translators: This error is displayed when the first group in a
 #. failing desktop file is incorrect. "Start group" can be safely
 #. translated.
-#: ../menulibre/util.py:632
+#: ../menulibre/util.py:634
 #, python-format
 msgid "Start group is invalid - currently '%s', should be '%s'"
 msgstr ""
 
 #. Translators: This error is displayed when a required key is
 #. missing in a failing desktop file.
-#: ../menulibre/util.py:642 ../menulibre/util.py:676
+#: ../menulibre/util.py:644 ../menulibre/util.py:674
 #, python-format
 msgid "%s key not found"
 msgstr ""
 
 #. Translators: This error is displayed when a failing desktop file
 #. has an invalid value for the provided key.
-#: ../menulibre/util.py:647
+#: ../menulibre/util.py:649
 #, python-format
 msgid "%s value is invalid - currently '%s', should be '%s'"
 msgstr ""
 
-#. Translators: This error is displayed when a failing desktop
-#. file contains an invalid path to an executable file.
-#: ../menulibre/util.py:662 ../menulibre/util.py:680
+#: ../menulibre/util.py:678
 #, python-format
 msgid "%s program '%s' has not been found in the PATH"
 msgstr ""
 
-#. Translators: This error is displayed when a failing desktop
-#. file contains an invalid command to execute.
-#: ../menulibre/util.py:667 ../menulibre/util.py:683
+#: ../menulibre/util.py:681
 #, python-format
 msgid ""
 "%s program '%s' is not a valid shell command according to GLib."
@@ -939,6 +935,6 @@ msgstr ""
 
 #. Translators: This error is displayed for a failing desktop file where
 #. errors were detected but the file seems otherwise valid.
-#: ../menulibre/util.py:689
+#: ../menulibre/util.py:687
 msgid "Unknown error. Desktop file appears to be are valid."
 msgstr ""