fionera
/
datatrash
forked from neri/datatrash
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always display content as text if user uploaded it as such 

Fixes #8
This commit is contained in:
neri 2021-04-04 14:33:37 +02:00
parent 3bed4de127
commit 313da6b583
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/download.rs
View File

@ -12,8 +12,8 @@ use sqlx::{
Row, Row,
}; };
use crate::config::Config;
use crate::deleter; use crate::deleter;
use crate::{config::Config, file_kind::FileKind};
const VIEW_HTML: &str = include_str!("../template/view.html"); const VIEW_HTML: &str = include_str!("../template/view.html");
@ -23,10 +23,11 @@ pub async fn download(
config: web::Data<Config>, config: web::Data<Config>,
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
let id = req.match_info().query("id"); let id = req.match_info().query("id");
let mut rows = let mut rows = sqlx::query(
sqlx::query("SELECT file_id, file_name, delete_on_download from files WHERE file_id = $1") "SELECT file_id, file_name, kind, delete_on_download from files WHERE file_id = $1",
.bind(id) )
.fetch(db.as_ref()); .bind(id)
.fetch(db.as_ref());
let row: PgRow = rows let row: PgRow = rows
.try_next() .try_next()
.await .await
@ -35,13 +36,15 @@ pub async fn download(
let file_id: String = row.get("file_id"); let file_id: String = row.get("file_id");
let file_name: String = row.get("file_name"); let file_name: String = row.get("file_name");
let file_kind: String = row.get("kind");
let delete_on_download: bool = row.get("delete_on_download"); let delete_on_download: bool = row.get("delete_on_download");
let mut path = config.files_dir.clone(); let mut path = config.files_dir.clone();
path.push(&file_id); path.push(&file_id);
let download = req.query_string().contains("dl"); let download = req.query_string().contains("dl");
let (content_type, mut content_disposition) = get_content_types(&path, &file_name); let (content_type, mut content_disposition) = get_content_types(&path, &file_name);
let response = if content_type.type_() == mime::TEXT && !download { let is_text = file_kind == FileKind::Text.to_string() || content_type.type_() == mime::TEXT;
let response = if is_text && !download {
let content = fs::read_to_string(path).await.map_err(|_| { let content = fs::read_to_string(path).await.map_err(|_| {
error::ErrorInternalServerError("this file should be here but could not be found") error::ErrorInternalServerError("this file should be here but could not be found")
})?; })?;