From 891647fbdb5ed1715bb3b51b97e42d30e101dd5c Mon Sep 17 00:00:00 2001 From: Azalea Gui Date: Thu, 23 Feb 2023 14:17:37 -0500 Subject: [PATCH] [-] Remove listing generation --- backend/src/generator.rs | 27 --------------------------- backend/src/main.rs | 9 ++++++--- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/backend/src/generator.rs b/backend/src/generator.rs index 495564b..4e10186 100644 --- a/backend/src/generator.rs +++ b/backend/src/generator.rs @@ -1,5 +1,3 @@ - -use crate::macros::*; use crate::utils::*; use std::fs; @@ -16,13 +14,6 @@ use crate::thumbnailer::{Thumbnailers}; const DOT_PATH: &str = ".meow_index"; -#[derive(Serialize, Deserialize)] -pub struct ReturnPath { - pub(crate) name: String, - pub(crate) file_type: String, - pub(crate) mtime: i64 -} - pub struct Generator { pub(crate) mime_db: SharedMimeInfo, pub(crate) thumbnailers: Thumbnailers, @@ -112,24 +103,6 @@ impl Generator { } }); - // Check if directory listing needs update - let d_info = self.dot_path(&dir).with_extension(".json"); - let d_mtime = d_info.metadata()?.mtime(); - if files.iter().any(|(f, m)| m.mtime() > d_mtime) { - // Update directory listing - let paths: Vec = files.iter() - .filter_map(|(f, m)| Some(ReturnPath { - name: f.file_name().to_str()?.to_string(), - file_type: f.path().file_type().to_string(), - mtime: m.mtime(), - })).collect(); - - let json = serde_json::to_string(&paths)?; - // fs::write(d_info, json)?; - } - - - Ok(()) } } diff --git a/backend/src/main.rs b/backend/src/main.rs index d1c7581..8e20f1b 100644 --- a/backend/src/main.rs +++ b/backend/src/main.rs @@ -4,16 +4,19 @@ mod generator; mod utils; mod thumbnailer; +use generator::*; +use macros::*; + use std::convert::Infallible; use std::{env, fs}; use std::net::SocketAddr; use std::os::unix::fs::MetadataExt; +use std::path::Path; use hyper::{Body, http, Request, Response, Server}; use hyper::service::{make_service_fn, service_fn}; use path_clean::{clean}; -use macros::StringExt; -use crate::macros::PathExt; -use generator::*; +use anyhow::{Result}; +use serde::{Deserialize, Serialize}; extern crate pretty_env_logger; #[macro_use] extern crate log;