More snapshot updates

* Set Kernel -> Add -> [#] -> Comment to kext name
* Set UEFI -> Drivers -> [#] -> Comment to .efi driver name only if "Comment" exists in driver_add (for 0.7.3 vs 0.7.4)
* Don't consider ignored values for the to_add list when forcing snapshot schema

Author: corpnewt

Scripts/plistwindow.py

@@ -1029,7 +1029,7 @@ def oc_snapshot(self, event = None, clean = False):
                 kdict = {
                     # "Arch":"Any",
                     "BundlePath":os.path.join(path,name)[len(oc_kexts):].replace("\\", "/").lstrip("/"),
-                    "Comment":"",
+                    "Comment":name,
                     "Enabled":True,
                     # "MaxKernel":"",
                     # "MinKernel":"",
@@ -1231,8 +1231,8 @@ def oc_snapshot(self, event = None, clean = False):
                                 "Enabled":True,
                                 "Path":os.path.join(path,name)[len(oc_drivers):].replace("\\", "/").lstrip("/") # Strip the /Volumes/EFI/
                             }
-                            # Add our snapshot custom entries, if any
-                            for x in driver_add: new_driver_entry[x] = driver_add[x]
+                            # Add our snapshot custom entries, if any - include the name of the .efi driver if the Comment
+                            for x in driver_add: new_driver_entry[x] = name if x.lower() == "comment" else driver_add[x]
                             drivers_list.append(new_driver_entry)
             drivers = [] if clean else tree_dict["UEFI"]["Drivers"]
             for driver in sorted(drivers_list, key=lambda x: x.get("Path","").lower() if driver_add else x):
@@ -1266,11 +1266,12 @@ def oc_snapshot(self, event = None, clean = False):
         # Check if we're forcing schema - and ensure values line up
         if self.controller.settings.get("force_snapshot_schema",False):
             ignored = ["Comment","Enabled","Path","BundlePath","ExecutablePath","PlistPath","Name"]
-            for entries,values in ((tree_dict["ACPI"]["Add"],acpi_add),(tree_dict["Kernel"]["Add"],kext_add),(tree_dict["Misc"]["Tools"],tool_add)):
+            for entries,values in ((tree_dict["ACPI"]["Add"],acpi_add),(tree_dict["Kernel"]["Add"],kext_add),(tree_dict["Misc"]["Tools"],tool_add),(tree_dict["UEFI"]["Drivers"],driver_add)):
+                if not values: continue # Skip if nothing to check
                 for entry in entries:
                     to_remove = [x for x in entry if not x in values and not x in ignored]
-                    to_add =    [x for x in values if not x in entry and not x in ignored]
-                    for add in to_add:    entry[add] = values[add]
+                    to_add =    [x for x in values if not x in entry]
+                    for add in to_add:    entry[add] = os.path.basename(entry.get("Path",values[add])) if add.lower() == "comment" else values[add]
                     for rem in to_remove: entry.pop(rem,None)
 
         # Now we remove the original tree - then replace it