Enable traits to all python modules

tinythings · Nov 25, 2024 · 1f96daa · 1f96daa
1 parent 423a0b5
commit 1f96daa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/libsysinspect/src/pylang/pvm.rs b/libsysinspect/src/pylang/pvm.rs
@@ -19,7 +19,7 @@ use std::{
     sync::Arc,
 };
 
-// use super::pylib::pysystem::syscore;
+use super::pylib::pysystem::syscore;
 
 pub struct PyVm {
     itp: Interpreter,
@@ -37,7 +37,7 @@ impl PyVm {
             .init_stdlib()
             .settings(cfg)
             .init_hook(Box::new(|vm| {
-                //vm.add_native_module("syscore".to_owned(), Box::new(syscore::make_module));
+                vm.add_native_module("syscore".to_owned(), Box::new(syscore::make_module));
             }))
             .interpreter();
 

diff --git a/libsysinspect/src/pylang/pylib/pysystem.rs b/libsysinspect/src/pylang/pylib/pysystem.rs
@@ -6,10 +6,12 @@ use rustpython_vm::pymodule;
 
 #[pymodule]
 pub mod syscore {
-    use crate::{cfg::mmconf::MinionConfig, traits::systraits::SystemTraits, util::dataconv};
+    use crate::{
+        traits::{self, systraits::SystemTraits},
+        util::dataconv,
+    };
     use rustpython_vm::PyResult;
     use rustpython_vm::{builtins::PyList, convert::ToPyObject, pyclass, PyObjectRef, PyPayload, VirtualMachine};
-    use std::path::PathBuf;
 
     #[derive(Debug, Clone)]
     struct StrVec(Vec<String>);
@@ -30,20 +32,7 @@ pub mod syscore {
     #[pyclass]
     impl MinionTraits {
         fn new() -> MinionTraits {
-            // This sucks big time. It always initialises traits for every script call
-            let cfg = match MinionConfig::new(PathBuf::from("/etc/sysinspect/sysinspect.conf")) {
-                Ok(c) => Some(c),
-                Err(err) => {
-                    log::debug!("Error initialising traits: {err}");
-                    None
-                }
-            };
-
-            if let Some(cfg) = cfg {
-                return MinionTraits { traits: Some(SystemTraits::new(cfg)) };
-            }
-
-            MinionTraits { ..Default::default() }
+            MinionTraits { traits: Some(traits::get_minion_traits(None)) }
         }
 
         #[pymethod]