diff options
Diffstat (limited to 'src/listing.rs')
| -rw-r--r-- | src/listing.rs | 157 |
1 files changed, 101 insertions, 56 deletions
diff --git a/src/listing.rs b/src/listing.rs index 9af2992..e86cc04 100644 --- a/src/listing.rs +++ b/src/listing.rs @@ -1,34 +1,67 @@ -use actix_web::{fs, HttpRequest, HttpResponse, Result}; +use actix_web::{fs, FromRequest, HttpRequest, HttpResponse, Query, Result}; use bytesize::ByteSize; -use clap::{_clap_count_exprs, arg_enum}; use htmlescape::encode_minimal as escape_html_entity; use percent_encoding::{utf8_percent_encode, DEFAULT_ENCODE_SET}; -use std::cmp::Ordering; +use serde::Deserialize; use std::io; use std::path::Path; use std::time::SystemTime; use crate::renderer; -arg_enum! { - #[derive(Clone, Copy, Debug)] - /// Available sorting methods - /// - /// Natural: natural sorting method - /// 1 -> 2 -> 3 -> 11 - /// - /// Alpha: pure alphabetical sorting method - /// 1 -> 11 -> 2 -> 3 - /// - /// DirsFirst: directories are listed first, alphabetical sorting is also applied - /// 1/ -> 2/ -> 3/ -> 11 -> 12 - /// - /// Date: sort by last modification date (most recent first) - pub enum SortingMethods { - Natural, - Alpha, - DirsFirst, - Date +/// Query parameters +#[derive(Debug, Deserialize)] +struct QueryParameters { + sort: Option<SortingMethod>, + order: Option<SortingOrder>, +} + +/// Available sorting methods +#[derive(Debug, Deserialize, Clone)] +pub enum SortingMethod { + /// Sort by name + #[serde(alias = "name")] + Name, + + /// Sort by size + #[serde(alias = "size")] + Size, + + /// Sort by last modification date (natural sort: follows alphanumerical order) + #[serde(alias = "date")] + Date, +} + +impl SortingMethod { + pub fn to_string(&self) -> String { + match &self { + SortingMethod::Name => "name", + SortingMethod::Size => "size", + SortingMethod::Date => "date", + } + .to_string() + } +} + +/// Available sorting orders +#[derive(Debug, Deserialize, Clone)] +pub enum SortingOrder { + /// Ascending order + #[serde(alias = "asc")] + Ascending, + + /// Descending order + #[serde(alias = "desc")] + Descending, +} + +impl SortingOrder { + pub fn to_string(&self) -> String { + match &self { + SortingOrder::Ascending => "asc", + SortingOrder::Descending => "desc", + } + .to_string() } } @@ -42,16 +75,6 @@ pub enum EntryType { File, } -impl PartialOrd for EntryType { - fn partial_cmp(&self, other: &EntryType) -> Option<Ordering> { - match (self, other) { - (EntryType::Directory, EntryType::File) => Some(Ordering::Less), - (EntryType::File, EntryType::Directory) => Some(Ordering::Greater), - _ => Some(Ordering::Equal), - } - } -} - /// Entry pub struct Entry { /// Name of the entry @@ -104,8 +127,6 @@ pub fn directory_listing<S>( req: &HttpRequest<S>, skip_symlinks: bool, random_route: Option<String>, - sort_method: SortingMethods, - reverse_sort: bool, ) -> Result<HttpResponse, io::Error> { let title = format!("Index of {}", req.path()); let base = Path::new(req.path()); @@ -113,6 +134,14 @@ pub fn directory_listing<S>( let is_root = base.parent().is_none() || req.path() == random_route; let page_parent = base.parent().map(|p| p.display().to_string()); + let mut sort_method: Option<SortingMethod> = None; + let mut sort_order: Option<SortingOrder> = None; + + if let Ok(query) = Query::<QueryParameters>::extract(req) { + sort_method = query.sort.clone(); + sort_order = query.order.clone(); + } + let mut entries: Vec<Entry> = Vec::new(); for entry in dir.path.read_dir()? { @@ -161,31 +190,47 @@ pub fn directory_listing<S>( } } - match sort_method { - SortingMethods::Natural => entries - .sort_by(|e1, e2| alphanumeric_sort::compare_str(e1.name.clone(), e2.name.clone())), - SortingMethods::Alpha => { - entries.sort_by(|e1, e2| e1.entry_type.partial_cmp(&e2.entry_type).unwrap()); - entries.sort_by_key(|e| e.name.clone()) - } - SortingMethods::DirsFirst => { - entries.sort_by_key(|e| e.name.clone()); - entries.sort_by(|e1, e2| e1.entry_type.partial_cmp(&e2.entry_type).unwrap()); + if let Some(sorting_method) = &sort_method { + match sorting_method { + SortingMethod::Name => entries + .sort_by(|e1, e2| alphanumeric_sort::compare_str(e1.name.clone(), e2.name.clone())), + SortingMethod::Size => entries.sort_by(|e1, e2| { + // If we can't get the size of the entry (directory for instance) + // let's consider it's 0b + e2.size + .unwrap_or_else(|| ByteSize::b(0)) + .cmp(&e1.size.unwrap_or_else(|| ByteSize::b(0))) + }), + SortingMethod::Date => entries.sort_by(|e1, e2| { + // If, for some reason, we can't get the last modification date of an entry + // let's consider it was modified on UNIX_EPOCH (01/01/19270 00:00:00) + e2.last_modification_date + .unwrap_or(SystemTime::UNIX_EPOCH) + .cmp(&e1.last_modification_date.unwrap_or(SystemTime::UNIX_EPOCH)) + }), + }; + } else { + // Sort in alphanumeric order by default + entries.sort_by(|e1, e2| alphanumeric_sort::compare_str(e1.name.clone(), e2.name.clone())) + } + + if let Some(sorting_order) = &sort_order { + if let SortingOrder::Descending = sorting_order { + entries.reverse() } - SortingMethods::Date => entries.sort_by(|e1, e2| { - // If, for some reason, we can't get the last modification date of an entry - // let's consider it was modified on UNIX_EPOCH (01/01/19270 00:00:00) - e2.last_modification_date - .unwrap_or(SystemTime::UNIX_EPOCH) - .cmp(&e1.last_modification_date.unwrap_or(SystemTime::UNIX_EPOCH)) - }), - }; - - if reverse_sort { - entries.reverse(); } Ok(HttpResponse::Ok() .content_type("text/html; charset=utf-8") - .body(renderer::page(&title, entries, is_root, page_parent).into_string())) + .body( + renderer::page( + &title, + entries, + is_root, + page_parent, + sort_method, + sort_order, + ) + .into_string(), + )) } |