efibootdude 0.2__py3-none-any.whl → 0.3__py3-none-any.whl

efibootdude/main.py

@@ -89,18 +89,6 @@ class EfiBootDude:
 
     def get_part_uuids(self):
         """ Get all the Partition UUIDS"""
-#       uuids = {}
-#       with open('/run/blkid/blkid.tab', encoding='utf8') as fh:
-#           # sample: <device ... TYPE="vfat"
-#           #   PARTUUID="25d2dea1-9f68-1644-91dd-4836c0b3a30a">/dev/nvme0n1p1</device>
-#           for xml_line in fh:
-#               element = ET.fromstring(xml_line)
-#               if 'PARTUUID' in element.attrib:
-#                   device=element.text.strip()
-#                   name = self.mounts.get(device, device)
-#                   uuids[element.attrib['PARTUUID'].lower()] = name
-#       return uuids
-
         uuids = {}
         partuuid_path = '/dev/disk/by-partuuid/'
 
@@ -111,6 +99,8 @@ class EfiBootDude:
             if os.path.islink(full_path):
                 device_path = os.path.realpath(full_path)
                 uuids[entry] = device_path
+                if device_path in self.mounts:
+                    uuids[entry] = self.mounts[device_path]
         return uuids
 
     @staticmethod
@@ -118,7 +108,6 @@ class EfiBootDude:
         """ Find uuid string in a line """
         # Define the regex pattern for UUID (e.g., 25d2dea1-9f68-1644-91dd-4836c0b3a30a)
         pattern = r'\b[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}\b'
-        # Search for the pattern in the line
         mats = re.findall(pattern, line, re.IGNORECASE)
         return mats
 
@@ -127,9 +116,11 @@ class EfiBootDude:
         # Define the command to run
         lines = []
         if self.testfile:
+            # if given a "testfile" (which should be just the
+            # raw output of 'efibootmgr'), then parse it
             with open(self.testfile, 'r', encoding='utf-8') as fh:
                 lines = fh.readlines()
-        else:
+        else: # run efibootmgr
             command = 'efibootmgr'.split()
             result = subprocess.run(command, stdout=subprocess.PIPE, text=True, check=True)
             lines = result.stdout.splitlines()

{efibootdude-0.2.dist-info → efibootdude-0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: efibootdude
-Version: 0.2
+Version: 0.3
 Summary: A visual wrapper for efibootmgr
 Author-email: Joe Defen <joedef@google.com>
 License: MIT
@@ -52,6 +52,8 @@ At this point
   * Use `t` to relabel the boot entry.
   * Use `r` to remove it.
   * And so forth.
+* The entries with `*` on the left are active boot entries; toggle whether
+  active by pressing `*`.
 * Use the `ESC` key to abandon any changes and reload the boot information.
 * When ready to write the changes to the BIOS, enter `w`.
 * When writing the changes, `efibootdude` drops out of menu mode so you can

efibootdude-0.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+efibootdude/PowerWindow.py,sha256=pQGXsAMeuiHn-vtEiVG0rgW1eCslh3ukC-VrPhH_j3k,28587
+efibootdude/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+efibootdude/main.py,sha256=jerAMq_p4xSkQLXN-UQVTqNCKOGK_afRVLggkpwUQaE,18110
+efibootdude-0.3.dist-info/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
+efibootdude-0.3.dist-info/METADATA,sha256=x9bOSka84F_ErvyjoMX-vYEUD1zPaZffT2JS9NqNnUk,3481
+efibootdude-0.3.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+efibootdude-0.3.dist-info/entry_points.txt,sha256=3KZ_86ZSy4f-weuSruTlMGaQ96jZUm7mjyITVnjE184,54
+efibootdude-0.3.dist-info/top_level.txt,sha256=BrMsK3JmOrVJUNkHX1dicqWrdjbm4itRtmXJMxte-VU,12
+efibootdude-0.3.dist-info/RECORD,,

efibootdude-0.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-efibootdude/PowerWindow.py,sha256=pQGXsAMeuiHn-vtEiVG0rgW1eCslh3ukC-VrPhH_j3k,28587
-efibootdude/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-efibootdude/main.py,sha256=opKAafTuw9BpwZl-Q99BmMGVarsf_fEgY-aLjbpeZtA,18460
-efibootdude-0.2.dist-info/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
-efibootdude-0.2.dist-info/METADATA,sha256=HuHORtrDzLH0ItVDm_UbRXsRVRSgBtyBcVEkzODKNCY,3380
-efibootdude-0.2.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-efibootdude-0.2.dist-info/entry_points.txt,sha256=3KZ_86ZSy4f-weuSruTlMGaQ96jZUm7mjyITVnjE184,54
-efibootdude-0.2.dist-info/top_level.txt,sha256=BrMsK3JmOrVJUNkHX1dicqWrdjbm4itRtmXJMxte-VU,12
-efibootdude-0.2.dist-info/RECORD,,