refactor: move util files to utils

src/cli/interactive/mod.rs

@@ -21,9 +21,9 @@ use serde::{de::DeserializeOwned, Serialize};
 use serde_json::Value;
 use tokio::sync::Mutex;
 
-use crate::{
-    runner::scripting::ScriptingResponse,
-    utils::tree::{tree_data, tree_node, TreeData, TreeNode},
+use crate::utils::{
+    scripting::{tree_data, tree_node, ScriptingResponse},
+    tree::{TreeData, TreeNode},
 };
 
 use super::opts::Opts;

src/runner/classic.rs

@@ -6,9 +6,9 @@ use std::{
 
 use crate::{
     cli::opts::Opts,
-    runner::scripting::ScriptingResponse,
     utils::{
         constants::{ERROR, PROGRESS_CHARS, PROGRESS_TEMPLATE, SUCCESS, WARNING},
+        scripting::{run_scripts, ScriptingResponse},
         tree::{Tree, TreeData, UrlType},
     },
 };
@@ -22,9 +22,7 @@ use reqwest::Client;
 use serde_json::json;
 use url::Url;
 
-use super::{
-    filters::utils::is_directory, scripting::run_scripts, wordlists::ParsedWordlist, Runner,
-};
+use super::{filters::utils::is_directory, wordlists::ParsedWordlist, Runner};
 
 pub struct Classic {
     url: String,

src/runner/filters/mod.rs

@@ -12,11 +12,10 @@ use crate::{
         check_range,
         constants::{ERROR, WARNING},
         parse_range_input,
+        scripting::ScriptingResponse,
     },
 };
 
-use super::scripting::ScriptingResponse;
-
 pub mod utils;
 
 // Returns true if the response should be kept

src/runner/filters/utils.rs

@@ -6,12 +6,13 @@ use rhai::plugin::*;
 
 use crate::{
     cli::opts::Opts,
-    utils::constants::{ERROR, WARNING},
+    utils::{
+        constants::{ERROR, WARNING},
+        scripting::ScriptingResponse,
+    },
 };
 use color_eyre::eyre::Result;
 
-use crate::runner::scripting::ScriptingResponse;
-
 pub fn print_error(
     opts: &Opts,
     print_fn: impl FnOnce(String) -> Result<()>,

src/runner/mod.rs

@@ -1,9 +1,7 @@
 pub mod classic;
 pub mod client;
-pub mod extract;
 pub mod filters;
 pub mod recursive;
-pub mod scripting;
 pub mod spider;
 pub mod wordlists;
 

src/runner/recursive.rs

@@ -15,11 +15,12 @@ use crate::{
     cli::opts::Opts,
     utils::{
         constants::{DEFAULT_DEPTH, ERROR, PROGRESS_CHARS, PROGRESS_TEMPLATE, SUCCESS, WARNING},
+        scripting::{run_scripts, ScriptingResponse},
         tree::{Tree, TreeData, TreeNode, UrlType},
     },
 };
 
-use super::{filters::utils::is_directory, scripting::run_scripts, scripting::ScriptingResponse};
+use super::filters::utils::is_directory;
 
 pub struct Recursive {
     opts: Opts,

src/runner/spider.rs

@@ -1,17 +1,13 @@
-use super::{
-    extract::{Document, LinkType},
-    filters::utils::is_directory,
-    scripting::ScriptingResponse,
-    Runner,
-};
+use super::{filters::utils::is_directory, Runner};
 use crate::{
     cli::opts::Opts,
     utils::{
         constants::{DEFAULT_DEPTH, ERROR, PROGRESS_CHARS, PROGRESS_TEMPLATE, SUCCESS, WARNING},
-        tree::{Tree, TreeData, UrlType},
+        extract::{Document, LinkType},
+        scripting::{run_scripts, ScriptingResponse},
+        tree::{Tree, TreeData, TreeNode, UrlType},
     },
 };
-use crate::{runner::scripting::run_scripts, utils::tree::TreeNode};
 use color_eyre::eyre::eyre;
 use color_eyre::eyre::{Context, Ok, Result};
 use colored::Colorize;

src/utils/mod.rs

@@ -11,7 +11,9 @@ use self::constants::DEFAULT_FILE_TYPE;
 
 pub mod constants;
 pub mod display;
+pub mod extract;
 pub mod logger;
+pub mod scripting;
 pub mod structs;
 pub mod table;
 pub mod tree;

src/runner/scripting.rs → src/utils/scripting.rs

@@ -1,9 +1,9 @@
+use crate::utils::tree::UrlType;
+use crate::utils::tree::{TreeData, TreeNode};
+use rhai::plugin::*;
 use std::collections::BTreeMap;
 
-use crate::{
-    cli::opts::Opts,
-    utils::tree::{tree_data, tree_node, TreeData},
-};
+use crate::cli::opts::Opts;
 use color_eyre::eyre::{eyre, Result};
 use colored::Colorize;
 use indicatif::ProgressBar;
@@ -13,6 +13,63 @@ use rhai::TypeBuilder;
 use rhai::{exported_module, CustomType, Dynamic, Engine, Scope};
 use serde::{Deserialize, Serialize};
 
+#[export_module]
+pub mod tree_node {
+
+    #[rhai_fn(get = "children")]
+    pub fn children(data: &mut TreeNode<TreeData>) -> Dynamic {
+        let mut children = Vec::new();
+        for child in &data.children {
+            children.push(child.lock().clone());
+        }
+        children.into()
+    }
+
+    #[rhai_fn(get = "data")]
+    pub fn data(data: &mut TreeNode<TreeData>) -> TreeData {
+        data.data.clone()
+    }
+
+    #[rhai_fn(global)]
+    pub fn to_string(data: &mut TreeNode<TreeData>) -> String {
+        format!(
+            "TreeNode {{ data: {}, children: [{}] }}",
+            tree_data::to_string(&mut data.data),
+            data.children.len()
+        )
+    }
+}
+
+#[export_module]
+pub mod tree_data {
+
+    #[rhai_fn(global)]
+    pub fn to_string(data: &mut TreeData) -> String {
+        format!(
+            "TreeData {{ url: {}, depth: {}, path: {}, status_code: {}, url_type: {:?}, extra: {:?} }}",
+            data.url,
+            data.depth,
+            data.status_code,
+            data.path,
+            match &data.url_type {
+                UrlType::Directory => "dir",
+                UrlType::File(ext) => ext,
+                UrlType::Unknown => "unknown",
+                UrlType::None => "",
+            },
+            data.extra
+        )
+    }
+    #[rhai_fn(get = "response")]
+    pub fn get_response(data: &mut TreeData) -> Dynamic {
+        if let Some(response) = &data.response {
+            Dynamic::from(response.clone())
+        } else {
+            Dynamic::UNIT
+        }
+    }
+}
+
 #[derive(Clone, CustomType, Serialize, Deserialize, Debug, Default)]
 pub struct ScriptingResponse {
     pub status_code: u16,

src/utils/tree.rs

@@ -3,7 +3,6 @@ use colored::Colorize;
 use log::{info, warn};
 use parking_lot::Mutex;
 use ptree::{print_tree, TreeItem};
-use rhai::plugin::*;
 use rhai::{CustomType, TypeBuilder};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -12,13 +11,11 @@ use std::{collections::HashMap, sync::Arc};
 
 use crate::{
     cli::opts::Opts,
-    runner::{
-        scripting::ScriptingResponse,
-        wordlists::{compute_checksum, ParsedWordlist},
-    },
-    utils::get_emoji_for_status_code_colored,
+    runner::wordlists::{compute_checksum, ParsedWordlist},
+    utils::{get_emoji_for_status_code_colored, scripting::ScriptingResponse},
     Save,
 };
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct TreeNode<T> {
     pub data: T,
@@ -37,61 +34,6 @@ pub struct TreeData {
     pub response: Option<ScriptingResponse>,
 }
 
-#[export_module]
-pub mod tree_node {
-    #[rhai_fn(get = "children")]
-    pub fn children(data: &mut TreeNode<TreeData>) -> Dynamic {
-        let mut children = Vec::new();
-        for child in &data.children {
-            children.push(child.lock().clone());
-        }
-        children.into()
-    }
-
-    #[rhai_fn(get = "data")]
-    pub fn data(data: &mut TreeNode<TreeData>) -> TreeData {
-        data.data.clone()
-    }
-
-    #[rhai_fn(global)]
-    pub fn to_string(data: &mut TreeNode<TreeData>) -> String {
-        format!(
-            "TreeNode {{ data: {}, children: [{}] }}",
-            tree_data::to_string(&mut data.data),
-            data.children.len()
-        )
-    }
-}
-
-#[export_module]
-pub mod tree_data {
-    #[rhai_fn(global)]
-    pub fn to_string(data: &mut TreeData) -> String {
-        format!(
-            "TreeData {{ url: {}, depth: {}, path: {}, status_code: {}, url_type: {:?}, extra: {:?} }}",
-            data.url,
-            data.depth,
-            data.status_code,
-            data.path,
-            match &data.url_type {
-                UrlType::Directory => "dir",
-                UrlType::File(ext) => ext,
-                UrlType::Unknown => "unknown",
-                UrlType::None => "",
-            },
-            data.extra
-        )
-    }
-    #[rhai_fn(get = "response")]
-    pub fn get_response(data: &mut TreeData) -> Dynamic {
-        if let Some(response) = &data.response {
-            Dynamic::from(response.clone())
-        } else {
-            Dynamic::UNIT
-        }
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
 pub enum UrlType {
     Directory,