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

efibootdude/main.py

@@ -18,7 +18,7 @@ from types import SimpleNamespace
 import subprocess
 import traceback
 import curses as cs
-import xml.etree.ElementTree as ET
+# import xml.etree.ElementTree as ET
 from efibootdude.PowerWindow import Window, OptionSpinner
 
 
@@ -26,20 +26,21 @@ class EfiBootDude:
     """ Main class for curses atop efibootmgr"""
     singleton = None
 
-    def __init__(self):
+    def __init__(self, testfile=None):
         # self.cmd_loop = CmdLoop(db=False) # just running as command
         assert not EfiBootDude.singleton
         EfiBootDude.singleton = self
+        self.testfile = testfile
 
         spin = self.spin = OptionSpinner()
         spin.add_key('help_mode', '? - toggle help screen', vals=[False, True])
         spin.add_key('verbose', 'v - toggle verbose', vals=[False, True])
 
         # FIXME: keys
-        other = 'tudrnmwf*zqx'
+        other = 'tudrnmw*zqx'
         other_keys = set(ord(x) for x in other)
         other_keys.add(cs.KEY_ENTER)
-        # other_keys.add(27) # ESCAPE
+        other_keys.add(27) # ESCAPE
         other_keys.add(10) # another form of ENTER
         self.opts = spin.default_obj
 
@@ -88,35 +89,50 @@ 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 = {}
-        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
+        partuuid_path = '/dev/disk/by-partuuid/'
+
+        if not os.path.exists(partuuid_path):
+            return uuids
+        for entry in os.listdir(partuuid_path):
+            full_path = os.path.join(partuuid_path, entry)
+            if os.path.islink(full_path):
+                device_path = os.path.realpath(full_path)
+                uuids[entry] = device_path
         return uuids
 
     @staticmethod
-    def extract_uuid(line):
+    def extract_uuids(line):
         """ 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
-        match = re.search(pattern, line, re.IGNORECASE)
-        return match.group(0).lower() if match else None
-
+        mats = re.findall(pattern, line, re.IGNORECASE)
+        return mats
 
     def digest_boots(self):
         """ Digest the output of 'efibootmgr'."""
         # Define the command to run
-        command = 'efibootmgr'.split()
-        # Run the command and capture the output
-        result = subprocess.run(command, stdout=subprocess.PIPE, text=True, check=True)
-        lines = result.stdout.splitlines()
+        lines = []
+        if self.testfile:
+            with open(self.testfile, 'r', encoding='utf-8') as fh:
+                lines = fh.readlines()
+        else:
+            command = 'efibootmgr'.split()
+            result = subprocess.run(command, stdout=subprocess.PIPE, text=True, check=True)
+            lines = result.stdout.splitlines()
         rv = []
         width1 = 0  # width of info1
         label_wid = 0
@@ -141,8 +157,8 @@ class EfiBootDude:
             )
 
             mat = re.match(r'\bBoot([0-9a-f]+)\b(\*?)' # Boot0024*
-                           + r'\s+(\w.*\w)\s+' # Linux Boot Manager
-                           + r'\b(\w+\(.*)$', # HD(4,GPT,cd15e3b1-...
+                           + r'\s+(\S.*\S|\S)\s*\t' # Linux Boot Manager
+                           + r'\s*(\S.*\S|\S)\s*$', # HD(4,GPT,cd15e3b1-...
                            line, re.IGNORECASE)
             if not mat:
                 ns.ident = key
@@ -160,16 +176,19 @@ class EfiBootDude:
             label_wid = max(label_wid, len(ns.label))
             other = mat.group(4)
 
-            mat = re.search(r'/?File\(([^)]*)\)', other, re.IGNORECASE)
+            pat = r'(?:/?\b\w*\(|/)(\\[^/()]+)(?:$|[()/])'
+            mat = re.search(pat, other, re.IGNORECASE)
             device, subpath = '', '' # e.g., /boot/efi, \EFI\UBUNTU\SHIMX64.EFI
             if mat:
                 subpath = mat.group(1) + ' '
                 start, end = mat.span()
                 other = other[:start] + other[end:]
 
-            uuid = self.extract_uuid(other)
-            if uuid and uuid in self.uuids:
-                device = self.uuids[uuid]
+            uuids = self.extract_uuids(other)
+            for uuid in uuids:
+                if uuid and uuid in self.uuids:
+                    device = self.uuids[uuid]
+                    break
 
             if device:
                 ns.info1 = device
@@ -227,7 +246,8 @@ class EfiBootDude:
             cmds.append(f'{prefix} --bootnum {ident} --label "{tag}"')
         if self.mods.order:
             orders = [ns.ident for ns in self.digests if ns.is_boot]
-            cmds.append(f'{prefix} --bootorder {','.join(orders)}')
+            orders = ','.join(orders)
+            cmds.append(f'{prefix} --bootorder {orders}')
         if self.mods.next:
             cmds.append(f'{prefix} --bootnext {self.mods.next}')
         if self.mods.timeout:
@@ -243,7 +263,7 @@ class EfiBootDude:
             os.system('/bin/echo; /bin/echo')
 
             for cmd in cmds:
-                os.system(f'set -x; {cmd}; /bin/echo "    <<<ExitCode=$?>>>"')
+                os.system(f'(set -x; {cmd}); /bin/echo "    <<<ExitCode=$?>>>"')
 
             os.system(r'/bin/echo -e "\n\n===== Press ENTER for menu ====> \c"; read FOO')
             self.reinit()
@@ -275,7 +295,7 @@ class EfiBootDude:
                     '   * - toggle whether entry is active'
                     '   m - modify - modify the value'
                     '   w - write - write the changes',
-                    '   f - freshen - clear changes and re-read boot state',
+                    '   ESC - abandon changes and re-read boot state',
                 ]
                 for line in lines:
                     self.win.put_body(line)
@@ -336,7 +356,6 @@ class EfiBootDude:
                 actions['m'] = 'modify'
             if self.mods.dirty:
                 actions['w'] = 'write'
-                actions['f'] = 'fresh'
 
         return actions
 
@@ -380,7 +399,7 @@ class EfiBootDude:
             answer = 'y'
             if self.mods.dirty:
                 answer = self.win.answer(
-                    prompt='Enter "y" to abandon edits and exit [then Enter]')
+                    prompt='Enter "y" to abandon edits and exit')
             if answer.strip().lower().startswith('y'):
                 self.win.stop_curses()
                 os.system('clear; stty sane')
@@ -394,7 +413,7 @@ class EfiBootDude:
                 seed = ns.label.split()[0]
                 while True:
                     answer = self.win.answer(
-                        prompt='Enter timeout seconds or clear to abort [then Enter]',
+                        prompt='Enter timeout seconds or clear to abort',
                         seed=seed, width=80)
                     seed = answer = answer.strip()
                     if not answer:
@@ -452,7 +471,7 @@ class EfiBootDude:
         if key == ord('t') and ns.is_boot:
             seed = ns.label
             while True:
-                answer = self.win.answer(prompt='Enter new label or clear to abort [then Enter], ',
+                answer = self.win.answer(prompt='Enter new label or clear to abort',
                     seed=seed, width=80)
                 seed = answer = answer.strip()
                 if not answer:
@@ -463,10 +482,13 @@ class EfiBootDude:
                     self.mods.dirty = True
                     break
 
-        if key == ord('f') and self.mods.dirty:
-            answer = self.win.answer(
-                prompt='Enter "y" to clear edits and refresh [then Enter]')
-            if answer.strip().lower().startswith('y'):
+        if key == 27:  # ESC
+            if self.mods.dirty:
+                answer = self.win.answer(
+                    prompt='Enter "y" to clear edits and refresh')
+                if answer.strip().lower().startswith('y'):
+                    self.reinit()
+            else:
                 self.reinit()
             return None
 
@@ -480,8 +502,12 @@ class EfiBootDude:
 
 def main():
     """ The program """
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument('testfile', nargs='?', default=None)
+    opts = parser.parse_args()
 
-    dude = EfiBootDude()
+    dude = EfiBootDude(testfile=opts.testfile)
     dude.main_loop()
 
 if __name__ == '__main__':

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: efibootdude
-Version: 0.0
+Version: 0.2
 Summary: A visual wrapper for efibootmgr
 Author-email: Joe Defen <joedef@google.com>
 License: MIT
@@ -32,21 +32,28 @@ boot menu and parameters while running Linux.
 * setting boot entries active or inactive, and
 * setting the boot menu timeout value (until it boots the default entry).
 
-To be sure, there are many other esoteric uses of `efibootmanager`.
+To be sure, there are many other esoteric uses of `efibootmanager` including adding
+a new boot entry; for such needs, just use `efibootmgr` directly.
   
 ## Usage
-After running `efibootdude`, you'll see a screen like this:
+After running `efibootdude` and making some changes, you'll see a screen comparable to this:
+
 ![efibootdude-screenshot](https://github.com/joedefen/efibootdude/blob/main/images/efibootdude-screenshot.png?raw=true).
+
 At this point
 * The current line starts with `>` and is highlighted.
-* The top line shows actions for the current line.
+* The top line shows actions for the current line; type the underscored letter
+  to effect the action.
 * Enter `?` for a more complete explanation of the keys, navigation keys, etc.
+  * **ALWAYS** view the help at least once if unfamiliar with this tool,
+    it navigation, and/or uncertain of keys not shown on top line.
 * With this current line, we can:
   * Use `u` or `d` to move it up or down in the boot order.
   * Use `t` to relabel the boot entry.
   * Use `r` to remove it.
   * And so forth.
-* When ready to write the changes to the BIOS, enter 'w'.
+* 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
   verify the underlying commands, error codes, and error messages.
 

efibootdude-0.2.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=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,,

efibootdude-0.0.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=xl6_bKWJVxzbN31SUWUAWWI5DH5F_iX5HpR-i23JjJ0,17609
-efibootdude-0.0.dist-info/LICENSE,sha256=qB9OdnyyF6WYHiEIXVm0rOSdcf8e2ctorrtWs6CC5lU,1062
-efibootdude-0.0.dist-info/METADATA,sha256=hNAKcQp31odNUlDLHVZ41ngqLq19Y0WuttYgXw08ZtY,2995
-efibootdude-0.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-efibootdude-0.0.dist-info/entry_points.txt,sha256=3KZ_86ZSy4f-weuSruTlMGaQ96jZUm7mjyITVnjE184,54
-efibootdude-0.0.dist-info/top_level.txt,sha256=BrMsK3JmOrVJUNkHX1dicqWrdjbm4itRtmXJMxte-VU,12
-efibootdude-0.0.dist-info/RECORD,,