move query code to different crate

Author: algorithmiker

Cargo.lock

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["example", "gui", "entrace_core", "bench"]
+members = ["example", "gui", "entrace_core", "bench", "entrace_query"]
 
 [profile.profiling]
 inherits = 'release'

Cargo.toml

@@ -1,3 +1,5 @@
+use std::{ops::Deref, sync::Arc};
+
 use crate::{
     Header, MetadataRefContainer,
     remote::{FileIETError, RemoteLogProviderError},

entrace_core/src/log_provider.rs

@@ -0,0 +1,11 @@
+[package]
+name = "entrace_query"
+version = "0.1.1"
+edition = "2024"
+
+[dependencies]
+mlua = { version = "0.10.5", features = ["error-send", "luajit"] }
+entrace_core = { version = "0.1.1", path = "../entrace_core/" }
+anyhow = "1.0.100"
+memchr = "2.7.6"
+thiserror = "2.0.17"

entrace_query/Cargo.toml

@@ -0,0 +1,23 @@
+use entrace_core::LogProvider;
+
+pub mod lua_api;
+pub mod lua_value;
+
+pub(crate) type TraceProvider = Box<dyn LogProvider + Send + Sync>;
+#[derive(thiserror::Error, Debug, Clone)]
+pub enum QueryError {
+    #[error("Index out of bounds. Tried to access element {index} of a container of size {actual}")]
+    OutOfBounds { index: u32, actual: u32 },
+    #[error(
+        "The thread running your query died. This usually means an error in entrace, and not in \
+         your code."
+    )]
+    QueryDied,
+    #[error("Error while running your query")]
+    LuaError(#[source] mlua::Error),
+    #[error(
+        "Failed to coerce the result of your query to Vec<u32>. Make sure to return a list from \
+         the query!"
+    )]
+    FailedToCoerce(#[source] mlua::Error),
+}

entrace_query/src/lib.rs

@@ -8,15 +8,23 @@ use std::{
 };
 
 use anyhow::bail;
-use entrace_core::{EnValue, EnValueRef, LogProviderError, MetadataRefContainer};
+use entrace_core::{EnValue, EnValueRef, LevelContainer, LogProviderError, MetadataRefContainer};
 use memchr::memmem::Finder;
 use mlua::{ExternalError, IntoLua, Lua, Table, Value};
 
 use crate::{
-    LevelRepr, TraceProvider,
-    search::{LuaValueRef, LuaValueRefRef, QueryError},
+    QueryError, TraceProvider,
+    lua_value::{LuaValueRef, LuaValueRefRef},
 };
-
+fn level_to_u8(level: &entrace_core::LevelContainer) -> u8 {
+    match level {
+        LevelContainer::Trace => 1,
+        LevelContainer::Debug => 2,
+        LevelContainer::Info => 3,
+        LevelContainer::Warn => 4,
+        LevelContainer::Error => 5,
+    }
+}
 fn make_oob_error(index: u32, len: usize) -> mlua::Error {
     let actual = len as u32;
     let e = QueryError::OutOfBounds { index, actual };
@@ -70,7 +78,7 @@ pub fn en_metadata(
 
         let table = lua.create_table()?;
         table.set("name", name)?;
-        table.set("level", level.index())?;
+        table.set("level", level_to_u8(&level))?;
         table.set("file", file)?;
         table.set("line", line)?;
         table.set("target", target)?;
@@ -97,7 +105,7 @@ pub fn en_metadata_level(
         let tcc = trace_provider.read().unwrap();
         let c = tcc.meta(id).map_err(to_lua_error)?;
         let MetadataRefContainer { level, .. } = c;
-        Ok(level.index())
+        Ok(level_to_u8(&level))
     }
 }
 

gui/src/search/lua_api.rs entrace_query/src/lua_api.rsgui/src/search/lua_api.rs renamed to entrace_query/src/lua_api.rs

@@ -17,6 +17,7 @@ egui = "0.32.0"
 egui_extras = { version = "0.32.0", features = ["all_loaders"] }
 egui_material_icons = "0.4.0"
 entrace_core = { version = "0.1.1", path = "../entrace_core/" }
+entrace_query = { version = "0.1.1", path = "../entrace_query/" }
 memchr = "2.7.5"
 mimalloc = "0.1.47"
 mlua = { version = "0.10.5", features = ["error-send", "luajit"] }

gui/src/search/lua_value.rs entrace_query/src/lua_value.rsgui/src/search/lua_value.rs renamed to entrace_query/src/lua_value.rs

@@ -1,6 +1,3 @@
-pub mod lua_api;
-mod lua_value;
-pub use lua_value::*;
 pub mod query_window;
 use std::{
     cell::RefCell,
@@ -14,18 +11,15 @@ use std::{
 };
 
 use crate::{
-    LogState, TraceProvider,
-    enbitvec::EnBitVec,
-    notifications::draw_x,
-    rect,
-    search::{lua_api::setup_lua, query_window::QueryLayoutCache},
-    spawn_task,
+    LogState, TraceProvider, enbitvec::EnBitVec, notifications::draw_x, rect,
+    search::query_window::QueryLayoutCache, spawn_task,
 };
 use crossbeam::channel::Receiver;
 use egui::{
     Color32, CornerRadius, Margin, Pos2, Rect, Response, RichText, Sense, Separator, Shape, Stroke,
     TextEdit, Ui, epaint::RectShape, pos2, vec2,
 };
+use entrace_query::lua_api::setup_lua;
 use mlua::{FromLua, Lua, Value};
 use tracing::{error, info};
 #[derive(Debug, Clone)]