efibootdude 0.1__tar.gz → 0.3__tar.gz

{efibootdude-0.1/src/efibootdude.egg-info → efibootdude-0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: efibootdude
-Version: 0.1
+Version: 0.3
 Summary: A visual wrapper for efibootmgr
 Author-email: Joe Defen <joedef@google.com>
 License: MIT
@@ -36,20 +36,26 @@ To be sure, there are many other esoteric uses of `efibootmanager` including add
 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'.
+* 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
   verify the underlying commands, error codes, and error messages.
 

{efibootdude-0.1 → efibootdude-0.3}/README.md

@@ -18,20 +18,26 @@ To be sure, there are many other esoteric uses of `efibootmanager` including add
 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'.
+* 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
   verify the underlying commands, error codes, and error messages.
 

{efibootdude-0.1 → efibootdude-0.3}/pyproject.toml

@@ -55,7 +55,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "efibootdude"
-version = "0.1"
+version = "0.3"
 description = "A visual wrapper for efibootmgr"
 authors = [
     { name = "Joe Defen", email = "joedef@google.com" }

{efibootdude-0.1 → efibootdude-0.3}/src/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
 
 
@@ -37,10 +37,10 @@ class EfiBootDude:
         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
 
@@ -90,35 +90,37 @@ 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
+        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
+                if device_path in self.mounts:
+                    uuids[entry] = self.mounts[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
         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()
@@ -165,16 +167,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
@@ -232,7 +237,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:
@@ -280,7 +286,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)
@@ -341,7 +347,6 @@ class EfiBootDude:
                 actions['m'] = 'modify'
             if self.mods.dirty:
                 actions['w'] = 'write'
-                actions['f'] = 'fresh'
 
         return actions
 
@@ -468,10 +473,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')
-            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
 

{efibootdude-0.1 → efibootdude-0.3/src/efibootdude.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: efibootdude
-Version: 0.1
+Version: 0.3
 Summary: A visual wrapper for efibootmgr
 Author-email: Joe Defen <joedef@google.com>
 License: MIT
@@ -36,20 +36,26 @@ To be sure, there are many other esoteric uses of `efibootmanager` including add
 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'.
+* 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
   verify the underlying commands, error codes, and error messages.