more refactoring

Author: Phil Cummins

src/prelink.rs

@@ -1,7 +1,7 @@
 #![deny(warnings)]
 
 use std::{
-    fs,
+    fs::{self},
     io::{self, Cursor},
 };
 
@@ -14,7 +14,7 @@ use crate::Library;
 
 pub fn embedded_python_standard_library() -> Result<TempDir, io::Error> {
     // Untar the embedded copy of the Python standard library into a temporary directory
-    let stdlib = tempfile::tempdir().expect("could not create temp dirfor python stnadard lib");
+    let stdlib = tempfile::tempdir()?;
 
     Archive::new(Decoder::new(Cursor::new(include_bytes!(concat!(
         env!("OUT_DIR"),
@@ -28,7 +28,7 @@ pub fn embedded_python_standard_library() -> Result<TempDir, io::Error> {
 
 pub fn embedded_helper_utils() -> Result<TempDir, io::Error> {
     // Untar the embedded copy of helper utilities into a temporary directory
-    let bundled = tempfile::tempdir().expect("could not create tempdir for embedded helper utils");
+    let bundled = tempfile::tempdir()?;
 
     Archive::new(Decoder::new(Cursor::new(include_bytes!(concat!(
         env!("OUT_DIR"),
@@ -44,78 +44,15 @@ pub fn bundle_libraries(
     library_path: Vec<(&str, Vec<std::path::PathBuf>)>,
 ) -> Result<Vec<Library>, io::Error> {
     let mut libraries = vec![
-        Library {
-            name: "libcomponentize_py_runtime.so".into(),
-            module: zstd::decode_all(Cursor::new(include_bytes!(concat!(
-                env!("OUT_DIR"),
-                "/libcomponentize_py_runtime.so.zst"
-            ))))?,
-            dl_openable: false,
-        },
-        Library {
-            name: "libpython3.12.so".into(),
-            module: zstd::decode_all(Cursor::new(include_bytes!(concat!(
-                env!("OUT_DIR"),
-                "/libpython3.12.so.zst"
-            ))))?,
-            dl_openable: false,
-        },
-        Library {
-            name: "libc.so".into(),
-            module: zstd::decode_all(Cursor::new(include_bytes!(concat!(
-                env!("OUT_DIR"),
-                "/libc.so.zst"
-            ))))?,
-            dl_openable: false,
-        },
-        Library {
-            name: "libwasi-emulated-mman.so".into(),
-            module: zstd::decode_all(Cursor::new(include_bytes!(concat!(
-                env!("OUT_DIR"),
-                "/libwasi-emulated-mman.so.zst"
-            ))))?,
-            dl_openable: false,
-        },
-        Library {
-            name: "libwasi-emulated-process-clocks.so".into(),
-            module: zstd::decode_all(Cursor::new(include_bytes!(concat!(
-                env!("OUT_DIR"),
-                "/libwasi-emulated-process-clocks.so.zst"
-            ))))?,
-            dl_openable: false,
-        },
-        Library {
-            name: "libwasi-emulated-getpid.so".into(),
-            module: zstd::decode_all(Cursor::new(include_bytes!(concat!(
-                env!("OUT_DIR"),
-                "/libwasi-emulated-getpid.so.zst"
-            ))))?,
-            dl_openable: false,
-        },
-        Library {
-            name: "libwasi-emulated-signal.so".into(),
-            module: zstd::decode_all(Cursor::new(include_bytes!(concat!(
-                env!("OUT_DIR"),
-                "/libwasi-emulated-signal.so.zst"
-            ))))?,
-            dl_openable: false,
-        },
-        Library {
-            name: "libc++.so".into(),
-            module: zstd::decode_all(Cursor::new(include_bytes!(concat!(
-                env!("OUT_DIR"),
-                "/libc++.so.zst"
-            ))))?,
-            dl_openable: false,
-        },
-        Library {
-            name: "libc++abi.so".into(),
-            module: zstd::decode_all(Cursor::new(include_bytes!(concat!(
-                env!("OUT_DIR"),
-                "/libc++abi.so.zst"
-            ))))?,
-            dl_openable: false,
-        },
+        library_from_so("libcomponentize_py_runtime.so")?,
+        library_from_so("libpython3.12.so")?,
+        library_from_so("libc.so")?,
+        library_from_so("libwasi-emulated-mman.so")?,
+        library_from_so("libwasi-emulated-process-clocks.so")?,
+        library_from_so("libwasi-emulated-getpid.so")?,
+        library_from_so("libwasi-emulated-signal.so")?,
+        library_from_so("libc++.so")?,
+        library_from_so("libc++abi.so")?,
     ];
 
     for (index, (path, libs)) in library_path.iter().enumerate() {
@@ -138,3 +75,16 @@ pub fn bundle_libraries(
 
     Ok(libraries)
 }
+
+fn library_from_so(library_name: &str) -> Result<Library, io::Error> {
+    let path = env!("OUT_DIR").to_owned();
+    let filepath = path + "/" + library_name + ".zst";
+    let bytes = fs::read(filepath)?;
+
+
+    return Ok(Library {
+        name: library_name.into(),
+        module: zstd::decode_all(Cursor::new(bytes))?,
+        dl_openable: false,
+    });
+}