system variables

src/lib.rs

@@ -10,4 +10,6 @@ mod vm;
 #[path = "./luau/alias.rs"]
 mod alias;
 #[path = "./luau/terminal.rs"]
-mod terminal;
+mod terminal;
+#[path = "./luau/system.rs"]
+mod sytem;

src/luau/system.rs

@@ -0,0 +1,31 @@
+use mlua::{Result as lResult, Table};
+use whoami::fallible;
+use crate::vm::Vm;
+
+const DEFAULT_HOSTNAME: &str = "hostname";
+
+pub trait System {
+	fn details(&self, shell: &Table) -> lResult<()>;
+	fn global_shell(&self) -> lResult<()>;
+}
+impl System for Vm {
+	fn details(&self, shell: &Table) -> lResult<()> {
+		let system = self.0.create_table()?;
+		system.set("DESKTOP_ENV", whoami::desktop_env().to_string())?;
+		system.set("DEVICENAME", whoami::devicename().to_string())?;
+		system.set("USERNAME", whoami::username().to_string())?;
+		system.set("REALNAME", whoami::realname().to_string())?;
+		system.set("PLATFORM", whoami::platform().to_string())?;
+		system.set("DISTRO", whoami::distro().to_string())?;
+		system.set("HOSTNAME", fallible::hostname().unwrap_or(DEFAULT_HOSTNAME.to_owned()))?;
+		shell.set("SYSTEM", system)?;
+		Ok(())
+	}
+
+	fn global_shell(&self) -> lResult<()> {
+		let shell = self.0.create_table()?;
+		self.details(&shell)?;
+		self.0.globals().set("SHELL", shell)?;
+		Ok(())
+	}
+}

src/luau/vm.rs

@@ -1,17 +1,14 @@
 use mlua::{
 	Lua as Luau,
-	Result as lResult,
+	Result as lResult
-	MultiValue,
 };
 use crate::VERSION;
 use crate::terminal::TerminalColors;
+use crate::sytem::System;
 use core::fmt;
 use color_print::cprintln;
 
-fn display_none<T, E>(err: E) -> Option<T>
+fn display_none<T, E: fmt::Display>(err: E) -> Option<T> {
-where
-	E: fmt::Display
-{
 	println!("{err}");
 	None
 }
@@ -21,38 +18,10 @@ fn luau_error<T>(err: mlua::Error) -> Option<T> {
 	None
 }
 
-fn luau_out(luau_args: MultiValue) -> String {
-	let mut print = String::new();
-	luau_args.iter()
-		.map(|arg| arg.to_string().unwrap_or("<SHELL CONVERSION ERROR>".to_owned()))
-		.for_each(|arg| {
-			if !print.is_empty() {
-				print.push('\u{0009}');
-			};
-			print.push_str(&arg);
-		}
-	);
-	print
-}
-
 trait Globals {
-	fn print(&self) -> lResult<()>;
-	fn printraw(&self) -> lResult<()>;
 	fn version(&self) -> lResult<()>;
 }
 impl Globals for Vm {
-	fn print(&self) -> lResult<()> {
-		self.0.globals().set("print", self.0.create_function(|_this, args: MultiValue| -> lResult<()> {
-			println!("{}", luau_out(args));
-			Ok(())
-		})?)
-	}
-	fn printraw(&self) -> lResult<()> {
-		self.0.globals().set("printraw", self.0.create_function(|_this, args: MultiValue| -> lResult<()> {
-			println!("{}", luau_out(args));
-			Ok(())
-		})?)
-	}
 	fn version(&self) -> lResult<()> {
 		let luau_info = self.0.globals().get::<String>("_VERSION")?;
 		self.0.globals().set("_VERSION", format!("{}, liblambdashell {}", luau_info, VERSION))
@@ -66,10 +35,9 @@ impl Vm {
 	}
 
 	fn set_shell_globals(&self) -> mlua::Result<()> {
-		self.print()?;
-		self.printraw()?;
 		self.version()?;
 		self.terminal()?;
+		self.global_shell()?;
 		self.0.globals().set("getfenv", mlua::Nil)?;
 		self.0.globals().set("setfenv", mlua::Nil)?;
 		self.0.sandbox(true)?;
@@ -78,7 +46,7 @@ impl Vm {
 
 	pub fn exec(&self, source: String) {
 		self.set_shell_globals().map_or_else(display_none, |()| {
-			self.0.load(source).exec().map_or_else(luau_error, |()| Some(()))
+			self.0.load(source).exec().map_or_else(luau_error, Some)
 		});
 	}
 }