drop host/hits totals feature

Author: yggverse

README.md

@@ -85,8 +85,6 @@ nexy -p /path/to/public_dir
 
           **Patterns**
           * `{list}` - entries list for the `public` directory
-          * `{hosts}` - unique visitors count
-          * `{hits}` - requests count
 
       --template-index <TEMPLATE_INDEX>
           Absolute path to the `Index` template file for each directory
@@ -95,8 +93,6 @@ nexy -p /path/to/public_dir
 
           **Patterns**
           * `{list}` - entries list for the current directory
-          * `{hosts}` - unique visitors count
-          * `{hits}` - requests count
 
       --list-dir-show-count
           Show files count in dir (as the alternative text for navigation links)

src/config.rs

@@ -59,8 +59,6 @@ pub struct Config {
     ///
     /// **Patterns**
     /// * `{list}` - entries list for the `public` directory
-    /// * `{hosts}` - unique visitors count
-    /// * `{hits}` - requests count
     #[arg(long)]
     pub template_welcome: Option<String>,
 
@@ -70,8 +68,6 @@ pub struct Config {
     ///
     /// **Patterns**
     /// * `{list}` - entries list for the current directory
-    /// * `{hosts}` - unique visitors count
-    /// * `{hits}` - requests count
     #[arg(long)]
     pub template_index: Option<String>,
 

src/response.rs

@@ -21,6 +21,5 @@ pub enum Response<'a> {
     Directory {
         data: String,
         is_root: bool,
-        query: &'a str,
     },
 }

src/server/connection.rs

@@ -41,9 +41,6 @@ impl Connection {
                         self.address.server, self.address.client
                     )
                 }
-                if let Some(ref request) = self.session.request {
-                    request.add(&self.address.client, &q)
-                }
                 if self.session.clone().public.request(&q, |response| {
                     self.response(response).is_ok_and(|sent| {
                         t += sent;
@@ -117,22 +114,13 @@ impl Connection {
         let data = match response {
             Response::File(b) => b,
             Response::Directory {
-                query: q,
                 data: ref s,
                 is_root,
             } => {
                 &if is_root {
-                    self.session.template.welcome(
-                        Some(s),
-                        self.session.request.as_ref().map(|i| i.count()),
-                        self.session.request.as_ref().map(|i| i.total(None)),
-                    )
+                    self.session.template.welcome(Some(s))
                 } else {
-                    self.session.template.index(
-                        Some(s),
-                        self.session.request.as_ref().map(|i| i.count()),
-                        self.session.request.as_ref().map(|i| i.total(Some(q))),
-                    )
+                    self.session.template.index(Some(s))
                 }
             }
             Response::InternalServerError {

src/session.rs

@@ -1,15 +1,13 @@
 mod access_log;
 mod public;
-mod request;
 mod template;
 
-use {access_log::AccessLog, public::Public, request::Request, template::Template};
+use {access_log::AccessLog, public::Public, template::Template};
 
 /// Shared, multi-thread features for the current server session
 pub struct Session {
     pub access_log: Option<AccessLog>,
     pub public: Public,
-    pub request: Option<Request>,
     pub template: Template,
     pub is_debug: bool,
 }
@@ -20,15 +18,6 @@ impl Session {
         Ok(Self {
             access_log: AccessLog::init(config)?,
             public: Public::init(config)?,
-            request: if template.welcome.contains("{hosts}")
-                || template.welcome.contains("{hits}")
-                || template.index.contains("{hosts}")
-                || template.index.contains("{hits}")
-            {
-                Some(Request::new())
-            } else {
-                None // do not int request collector if its features not in use
-            },
             template,
             is_debug: config.debug,
         })

src/session/public.rs

@@ -71,7 +71,6 @@ impl Public {
             Ok(t) => match (t.is_dir(), t.is_file()) {
                 (true, _) => callback(match self.list(&path) {
                     Ok(data) => Response::Directory {
-                        query,
                         data,
                         is_root: path == self.public_dir,
                     },

src/session/request.rs

@@ -16,7 +16,7 @@ impl Template {
             },
             index: match config.template_index {
                 Some(ref p) => read_to_string(p)?,
-                None => "{list}\n\n👁 {hosts} / {hits}".into(),
+                None => "{list}".into(),
             },
             internal_server_error: match config.template_internal_server_error {
                 Some(ref p) => read(p)?,
@@ -28,7 +28,7 @@ impl Template {
             },
             welcome: match config.template_welcome {
                 Some(ref p) => read_to_string(p)?,
-                None => "Welcome to Nexy!\n\n{list}\n\n👁 {hosts} / {hits}".into(),
+                None => "Welcome to Nexy!\n\n{list}".into(),
             },
         })
     }
@@ -37,11 +37,9 @@ impl Template {
         &self.access_denied
     }
 
-    pub fn index(&self, list: Option<&str>, hosts: Option<usize>, hits: Option<usize>) -> Vec<u8> {
+    pub fn index(&self, list: Option<&str>) -> Vec<u8> {
         self.index
             .replace("{list}", list.unwrap_or_default())
-            .replace("{hosts}", &format_count(hosts))
-            .replace("{hits}", &format_count(hits))
             .into()
     }
 
@@ -53,20 +51,9 @@ impl Template {
         &self.not_found
     }
 
-    pub fn welcome(
-        &self,
-        list: Option<&str>,
-        hosts: Option<usize>,
-        hits: Option<usize>,
-    ) -> Vec<u8> {
+    pub fn welcome(&self, list: Option<&str>) -> Vec<u8> {
         self.welcome
             .replace("{list}", list.unwrap_or_default())
-            .replace("{hosts}", &format_count(hosts))
-            .replace("{hits}", &format_count(hits))
             .into()
     }
 }
-
-fn format_count(v: Option<usize>) -> String {
-    v.map_or(String::new(), |c| c.to_string())
-}