Unify config stuff

hook/src/hooks/pak/file.rs

@@ -10,6 +10,11 @@ pub struct PlainFileProviderConfig {
     path: PathBuf,
     globs: Vec<String>,
 }
+impl PlainFileProviderConfig {
+    pub fn build(self) -> Result<PlainFileProvider> {
+        PlainFileProvider::new(self)
+    }
+}
 
 pub struct PlainFileProvider {
     path: PathBuf,

hook/src/hooks/pak/mod.rs

@@ -10,8 +10,8 @@ use std::sync::{Mutex, OnceLock};
 use crate::globals;
 use crate::ue::{FString, TArray};
 
-use self::file::{PlainFileProvider, PlainFileProviderConfig};
-use self::network::{EditorNetworkConfig, EditorNetworkFileProvider};
+use self::file::PlainFileProviderConfig;
+use self::network::EditorNetworkConfig;
 
 #[derive(Debug, Default)]
 pub struct FileInfo {
@@ -55,6 +55,17 @@ enum LayerConfig {
     File(PlainFileProviderConfig),
     EditorNetwork(EditorNetworkConfig),
 }
+impl LayerConfig {
+    fn build(self) -> Result<Box<dyn FileProvider>> {
+        fn map(p: Result<impl FileProvider + 'static>) -> Result<Box<dyn FileProvider>> {
+            p.map(|p| Box::new(p) as Box<dyn FileProvider>)
+        }
+        match self {
+            LayerConfig::File(c) => map(c.build()),
+            LayerConfig::EditorNetwork(c) => map(c.build()),
+        }
+    }
+}
 
 #[repr(C)]
 pub struct IFileHandle<S: Read + Write + Seek> {
@@ -320,10 +331,7 @@ impl LayeredFileProvider {
 
         for l in config.layers {
             if l.enable {
-                layers.push(match l.config {
-                    LayerConfig::File(c) => Box::new(PlainFileProvider::new(c)?),
-                    LayerConfig::EditorNetwork(c) => Box::new(EditorNetworkFileProvider::new(c)?),
-                })
+                layers.push(l.config.build()?);
             }
         }
 

hook/src/hooks/pak/network.rs

@@ -29,6 +29,11 @@ impl Default for EditorNetworkConfig {
         }
     }
 }
+impl EditorNetworkConfig {
+    pub fn build(self) -> Result<EditorNetworkFileProvider> {
+        EditorNetworkFileProvider::new(self)
+    }
+}
 
 pub struct EditorNetworkFileProvider {
     input: BufReader<TcpStream>,