Fix diagnostic dialog selection, loading missing directories

Author: bluesabre

menulibre/MenulibreApplication.py

@@ -308,18 +308,30 @@ def menu_load_failure(self):
                                     Gtk.ButtonsType.CLOSE, primary)
         dialog.format_secondary_markup(secondary)
 
-        try:
-            box = dialog.get_children()[0]
-            box = box.get_children()[0]
-            box = box.get_children()[1]
-            label = box.get_children()[1]
+        label = self.find_secondary_label(dialog)
+        if label is not None:
             label.set_selectable(True)
-        except AttributeError:
-            pass
 
         dialog.run()
         sys.exit(1)
 
+    def find_secondary_label(self, container = None):
+        try:
+            children = container.get_children()
+            if len(children) == 0:
+                return None
+            if isinstance(children[0], Gtk.Label):
+                return children[1]
+            for child in children:
+                label = self.find_secondary_label(child)
+                if label is not None:
+                    return label
+        except AttributeError:
+            pass
+        except IndexError:
+            pass
+        return None
+
     def configure_application_window(self, builder, app):
         """Glade is currently unable to create a GtkApplicationWindow.  This
         function takes the GtkWindow from the UI file and reparents the

menulibre/util.py

@@ -225,9 +225,12 @@ def getMenuDiagnostics():
         menu_dirs.append(os.path.join(path, 'menus'))
     menus = []
     for menu_dir in menu_dirs:
-        for filename in os.listdir(menu_dir):
-            if filename.endswith(".menu"):
-                menus.append(os.path.join(menu_dir, filename))
+        try:
+            for filename in os.listdir(menu_dir):
+                if filename.endswith(".menu"):
+                    menus.append(os.path.join(menu_dir, filename))
+        except FileNotFoundError:
+            pass
     menus.sort()
 
     diagnostics["MENUS"] = ", ".join(menus)