extractor is now called filesystem-device-match

hack/dev/configs/kernel.sprout.toml

@@ -1,7 +1,7 @@
 version = 1
 
-[extractors.boot.filesystem]
-item = "\\EFI\\BOOT\\kernel.efi"
+[extractors.boot.filesystem-device-match]
+has-item = "\\EFI\\BOOT\\kernel.efi"
 
 [actions.chainload-kernel]
 chainload.path = "$boot\\EFI\\BOOT\\kernel.efi"

src/extractors.rs

@@ -1,19 +1,20 @@
 use crate::context::SproutContext;
-use crate::extractors::filesystem::FileSystemExtractorConfiguration;
+use crate::extractors::filesystem_device_match::FilesystemDeviceMatchExtractor;
 use anyhow::{Result, bail};
 use serde::{Deserialize, Serialize};
 use std::rc::Rc;
 
-pub mod filesystem;
+pub mod filesystem_device_match;
 
 #[derive(Serialize, Deserialize, Default, Clone)]
 pub struct ExtractorDeclaration {
-    pub filesystem: Option<FileSystemExtractorConfiguration>,
+    #[serde(default, rename = "filesystem-device-match")]
+    pub filesystem_device_match: Option<FilesystemDeviceMatchExtractor>,
 }
 
 pub fn extract(context: Rc<SproutContext>, extractor: &ExtractorDeclaration) -> Result<String> {
-    if let Some(filesystem) = &extractor.filesystem {
-        filesystem::extract(context, filesystem)
+    if let Some(filesystem) = &extractor.filesystem_device_match {
+        filesystem_device_match::extract(context, filesystem)
     } else {
         bail!("unknown extractor configuration");
     }

src/extractors/filesystem_device_match.rs

@@ -11,14 +11,16 @@ use uefi::proto::media::file::{File, FileSystemVolumeLabel};
 use uefi::proto::media::fs::SimpleFileSystem;
 
 #[derive(Serialize, Deserialize, Default, Clone)]
-pub struct FileSystemExtractorConfiguration {
-    pub label: Option<String>,
-    pub item: Option<String>,
+pub struct FilesystemDeviceMatchExtractor {
+    #[serde(default, rename = "has-label")]
+    pub has_label: Option<String>,
+    #[serde(default, rename = "has-item")]
+    pub has_item: Option<String>,
 }
 
 pub fn extract(
     context: Rc<SproutContext>,
-    device: &FileSystemExtractorConfiguration,
+    extractor: &FilesystemDeviceMatchExtractor,
 ) -> Result<String> {
     let handles = uefi::boot::find_handles::<SimpleFileSystem>()
         .context("failed to find filesystem handles")?;
@@ -26,7 +28,7 @@ pub fn extract(
         let mut filesystem = uefi::boot::open_protocol_exclusive::<SimpleFileSystem>(handle)
             .context("failed to open filesystem protocol")?;
 
-        if let Some(ref label) = device.label {
+        if let Some(ref label) = extractor.has_label {
             let want_label = CString16::try_from(context.stamp(label).as_str())
                 .context("failed to convert label to CString16")?;
             let mut root = filesystem
@@ -41,7 +43,7 @@ pub fn extract(
             }
         }
 
-        if let Some(ref item) = device.item {
+        if let Some(ref item) = extractor.has_item {
             let want_item = CString16::try_from(context.stamp(item).as_str())
                 .context("failed to convert item to CString16")?;
             let mut filesystem = FileSystem::new(filesystem);