mirror of
https://github.com/Jackzmc/storage.git
synced 2025-05-06 03:23:22 +00:00
Move options up
This commit is contained in:
parent
c56d51707a
commit
6eb900b814
1 changed files with 8 additions and 7 deletions
|
@ -46,6 +46,13 @@ pub async fn list_library_files(
|
||||||
sort_dir: Option<String>,
|
sort_dir: Option<String>,
|
||||||
display: Option<String>,
|
display: Option<String>,
|
||||||
) -> Result<Template, ResponseError> {
|
) -> Result<Template, ResponseError> {
|
||||||
|
let options = FileDisplayOptions {
|
||||||
|
// TODO: prevent bad values
|
||||||
|
// TODO: fix login errror msg -------_____------
|
||||||
|
sort_key: validate_option(sort_key, FILE_CONSTANTS.sort_keys, "name"),
|
||||||
|
sort_dir: validate_option(sort_dir, &["asc", "desc"], "asc"),
|
||||||
|
display: validate_option(display, FILE_CONSTANTS.display_options, "list"),
|
||||||
|
};
|
||||||
let libs = libraries.lock().await;
|
let libs = libraries.lock().await;
|
||||||
let library = libs.get(library_id).await?;
|
let library = libs.get(library_id).await?;
|
||||||
let files = library.list_files(&PathBuf::from(&path)).await
|
let files = library.list_files(&PathBuf::from(&path)).await
|
||||||
|
@ -82,13 +89,7 @@ pub async fn list_library_files(
|
||||||
parent,
|
parent,
|
||||||
path_segments: segments,
|
path_segments: segments,
|
||||||
// TODO: have struct?
|
// TODO: have struct?
|
||||||
options: FileDisplayOptions {
|
options,
|
||||||
// TODO: prevent bad values
|
|
||||||
// TODO: fix login errror msg -------_____------
|
|
||||||
sort_key: validate_option(sort_key, FILE_CONSTANTS.sort_keys, "name"),
|
|
||||||
sort_dir: validate_option(sort_dir, &["asc", "desc"], "asc"),
|
|
||||||
display: validate_option(display, FILE_CONSTANTS.display_options, "list"),
|
|
||||||
},
|
|
||||||
DATA: FILE_CONSTANTS
|
DATA: FILE_CONSTANTS
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue