diff --git a/filed/src/files/lookup.rs b/filed/src/files/lookup.rs index c5270b7..1300e7d 100644 --- a/filed/src/files/lookup.rs +++ b/filed/src/files/lookup.rs @@ -33,6 +33,7 @@ impl FileManager { Ok(Some(serde_json::from_str(data.as_str())?)) } pub fn find_by_name(self: &Self, name: String) -> Result, Box> { + println!("{}-name-{}", self.env.redis.prefix, name); Ok(self.find(format!("{}-name-{}", self.env.redis.prefix, name))?) } pub fn find_by_hash(self: &Self, hash: String) -> Result, Box> { diff --git a/filed/src/files/mod.rs b/filed/src/files/mod.rs index cb89bde..c150f80 100644 --- a/filed/src/files/mod.rs +++ b/filed/src/files/mod.rs @@ -29,6 +29,13 @@ impl File { pub fn hash(self: &Self) -> String { self.sha512.clone() } + pub fn leftmost_link(self: &Self) -> String { + if self.name.is_none() { + self.hash() + } else { + self.name.clone().unwrap() + } + } pub async fn read(self: &Self) -> Result, Box> { let data = self.read_unchecked().await?; diff --git a/filed/src/web/forms.rs b/filed/src/web/forms.rs index d6eddd2..df1cac3 100644 --- a/filed/src/web/forms.rs +++ b/filed/src/web/forms.rs @@ -101,7 +101,7 @@ pub async fn upload(form: FormData, state: SharedState) -> Result let uploaded = UploadSuccessPage { env: state.env.clone(), - link: "uwu".into() + link: file.leftmost_link() }; Ok(Box::new(warp::reply::html(uploaded.render().unwrap()))) diff --git a/filed/src/web/uploaded.rs b/filed/src/web/uploaded.rs index 094b8a4..20e5c93 100644 --- a/filed/src/web/uploaded.rs +++ b/filed/src/web/uploaded.rs @@ -9,7 +9,7 @@ pub async fn uploaded((file, _state): (String, SharedState)) -> Result