This commit is contained in:
@@ -20,146 +20,138 @@ pub async fn proxy_handler(
|
||||
};
|
||||
|
||||
// парсим GET запрос
|
||||
if let Some((base_filename, requested_width, extension)) = parse_image_request(&normalized_path)
|
||||
{
|
||||
warn!("base_filename: {}", base_filename);
|
||||
warn!("requested_width: {}", requested_width);
|
||||
warn!("extension: {}", extension);
|
||||
let filekey = format!("{}.{}", base_filename, extension);
|
||||
let content_type = match extension.as_str() {
|
||||
"jpg" | "jpeg" => "image/jpeg",
|
||||
"png" => "image/png",
|
||||
"webp" => "image/webp",
|
||||
"gif" => "image/gif",
|
||||
"mp3" => "audio/mpeg",
|
||||
"wav" => "audio/x-wav",
|
||||
"ogg" => "audio/ogg",
|
||||
"aac" => "audio/aac",
|
||||
"m4a" => "audio/m4a",
|
||||
"flac" => "audio/flac",
|
||||
_ => {
|
||||
error!("unsupported file format");
|
||||
return Err(ErrorInternalServerError("unsupported file format"));
|
||||
},
|
||||
};
|
||||
let (base_filename, requested_width, extension) = parse_image_request(&normalized_path);
|
||||
|
||||
warn!("content_type: {}", content_type);
|
||||
let filekey = format!("{}.{}", base_filename, extension);
|
||||
let content_type = match extension.as_str() {
|
||||
"jpg" | "jpeg" => "image/jpeg",
|
||||
"png" => "image/png",
|
||||
"webp" => "image/webp",
|
||||
"gif" => "image/gif",
|
||||
"mp3" => "audio/mpeg",
|
||||
"wav" => "audio/x-wav",
|
||||
"ogg" => "audio/ogg",
|
||||
"aac" => "audio/aac",
|
||||
"m4a" => "audio/m4a",
|
||||
"flac" => "audio/flac",
|
||||
_ => {
|
||||
error!("unsupported file format");
|
||||
return Err(ErrorInternalServerError("unsupported file format"));
|
||||
},
|
||||
};
|
||||
|
||||
return match state.get_path(&filekey).await {
|
||||
Ok(Some(stored_path)) => {
|
||||
warn!("stored_path: {}", stored_path);
|
||||
// we have stored file path in storj
|
||||
if check_file_exists(&state.storj_client, &state.bucket, &stored_path).await? {
|
||||
if content_type.starts_with("image") {
|
||||
return match requested_width == 0 {
|
||||
true => serve_file(&stored_path, &state).await,
|
||||
false => {
|
||||
// find closest thumb width
|
||||
let closest: u32 = find_closest_width(requested_width as u32);
|
||||
let thumb_filename =
|
||||
&format!("{}_{}.{}", base_filename, closest, extension);
|
||||
warn!("content_type: {}", content_type);
|
||||
|
||||
return match check_file_exists(
|
||||
&state.storj_client,
|
||||
&state.bucket,
|
||||
thumb_filename,
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(true) => {
|
||||
warn!("serve existed thumb file: {}", thumb_filename);
|
||||
serve_file(thumb_filename, &state).await
|
||||
},
|
||||
Ok(false) => {
|
||||
if let Ok(filedata) = load_file_from_s3(
|
||||
&state.storj_client,
|
||||
&state.bucket,
|
||||
&stored_path,
|
||||
return match state.get_path(&filekey).await {
|
||||
Ok(Some(stored_path)) => {
|
||||
warn!("stored_path: {}", stored_path);
|
||||
// we have stored file path in storj
|
||||
if check_file_exists(&state.storj_client, &state.bucket, &stored_path).await? {
|
||||
if content_type.starts_with("image") {
|
||||
return match requested_width == 0 {
|
||||
true => serve_file(&stored_path, &state).await,
|
||||
false => {
|
||||
// find closest thumb width
|
||||
let closest: u32 = find_closest_width(requested_width as u32);
|
||||
let thumb_filename =
|
||||
&format!("{}_{}.{}", base_filename, closest, extension);
|
||||
|
||||
return match check_file_exists(
|
||||
&state.storj_client,
|
||||
&state.bucket,
|
||||
thumb_filename,
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(true) => {
|
||||
warn!("serve existed thumb file: {}", thumb_filename);
|
||||
serve_file(thumb_filename, &state).await
|
||||
},
|
||||
Ok(false) => {
|
||||
if let Ok(filedata) = load_file_from_s3(
|
||||
&state.storj_client,
|
||||
&state.bucket,
|
||||
&stored_path,
|
||||
)
|
||||
.await
|
||||
{
|
||||
warn!("generate new thumb files: {}", stored_path);
|
||||
warn!("{} bytes", filedata.len());
|
||||
thumbdata_save(
|
||||
filedata.clone(),
|
||||
&state,
|
||||
&filekey,
|
||||
content_type.to_string(),
|
||||
)
|
||||
.await
|
||||
{
|
||||
warn!("generate new thumb files: {}", stored_path);
|
||||
warn!("{} bytes", filedata.len());
|
||||
thumbdata_save(
|
||||
filedata.clone(),
|
||||
&state,
|
||||
&filekey,
|
||||
content_type.to_string(),
|
||||
)
|
||||
.await;
|
||||
warn!("serve new thumb file: {}", thumb_filename);
|
||||
serve_file(thumb_filename, &state).await
|
||||
} else {
|
||||
Err(ErrorInternalServerError(
|
||||
"cannot generate thumbnail",
|
||||
))
|
||||
}
|
||||
.await;
|
||||
warn!("serve new thumb file: {}", thumb_filename);
|
||||
serve_file(thumb_filename, &state).await
|
||||
} else {
|
||||
Err(ErrorInternalServerError(
|
||||
"cannot generate thumbnail",
|
||||
))
|
||||
}
|
||||
Err(_) => {
|
||||
Err(ErrorInternalServerError("failed to load thumbnail"))
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
}
|
||||
// not image passing thumb generation
|
||||
}
|
||||
|
||||
// we need to download what stored_path keeping in aws
|
||||
return match load_file_from_s3(&state.aws_client, &state.bucket, &stored_path).await
|
||||
{
|
||||
Ok(filedata) => {
|
||||
warn!("download stored_path from aws: {:?}", stored_path);
|
||||
if let Err(e) = upload_to_s3(
|
||||
&state.storj_client,
|
||||
&state.bucket,
|
||||
&filekey,
|
||||
filedata.clone(),
|
||||
content_type,
|
||||
)
|
||||
.await {
|
||||
warn!("cannot upload to storj: {}", e);
|
||||
} else {
|
||||
warn!("file {} uploaded to storj", filekey);
|
||||
}
|
||||
Err(_) => {
|
||||
Err(ErrorInternalServerError("failed to load thumbnail"))
|
||||
}
|
||||
};
|
||||
}
|
||||
thumbdata_save(filedata.clone(), &state, &filekey, content_type.to_string())
|
||||
.await;
|
||||
|
||||
Ok(HttpResponse::Ok().content_type(content_type).body(filedata))
|
||||
}
|
||||
Err(err) => Err(ErrorInternalServerError(err)),
|
||||
};
|
||||
};
|
||||
}
|
||||
// not image passing thumb generation
|
||||
}
|
||||
Ok(None) => {
|
||||
// download from aws to storj
|
||||
match load_file_from_s3(&state.aws_client, &state.bucket, &requested_res).await {
|
||||
Ok(filedata) => {
|
||||
thumbdata_save(filedata.clone(), &state, &filekey, content_type.to_string())
|
||||
.await;
|
||||
if let Err(e) = upload_to_s3(
|
||||
&state.storj_client,
|
||||
&state.bucket,
|
||||
&filekey,
|
||||
filedata.clone(),
|
||||
content_type,
|
||||
)
|
||||
.await {
|
||||
warn!("cannot upload to storj: {}", e);
|
||||
} else {
|
||||
warn!("file {} uploaded to storj", filekey);
|
||||
}
|
||||
Ok(HttpResponse::Ok().content_type(content_type).body(filedata))
|
||||
},
|
||||
Err(e) => Err(ErrorInternalServerError(e)),
|
||||
}
|
||||
},
|
||||
Err(e) => Err(ErrorInternalServerError(e))
|
||||
};
|
||||
} else {
|
||||
warn!("cant parse file request");
|
||||
}
|
||||
|
||||
Err(ErrorInternalServerError("invalid file key"))
|
||||
// we need to download what stored_path keeping in aws
|
||||
return match load_file_from_s3(&state.aws_client, &state.bucket, &stored_path).await
|
||||
{
|
||||
Ok(filedata) => {
|
||||
warn!("download stored_path from aws: {:?}", stored_path);
|
||||
if let Err(e) = upload_to_s3(
|
||||
&state.storj_client,
|
||||
&state.bucket,
|
||||
&filekey,
|
||||
filedata.clone(),
|
||||
content_type,
|
||||
)
|
||||
.await {
|
||||
warn!("cannot upload to storj: {}", e);
|
||||
} else {
|
||||
warn!("file {} uploaded to storj", filekey);
|
||||
}
|
||||
thumbdata_save(filedata.clone(), &state, &filekey, content_type.to_string())
|
||||
.await;
|
||||
|
||||
Ok(HttpResponse::Ok().content_type(content_type).body(filedata))
|
||||
}
|
||||
Err(err) => Err(ErrorInternalServerError(err)),
|
||||
};
|
||||
}
|
||||
Ok(None) => {
|
||||
// download from aws to storj
|
||||
match load_file_from_s3(&state.aws_client, &state.bucket, &requested_res).await {
|
||||
Ok(filedata) => {
|
||||
thumbdata_save(filedata.clone(), &state, &filekey, content_type.to_string())
|
||||
.await;
|
||||
if let Err(e) = upload_to_s3(
|
||||
&state.storj_client,
|
||||
&state.bucket,
|
||||
&filekey,
|
||||
filedata.clone(),
|
||||
content_type,
|
||||
)
|
||||
.await {
|
||||
warn!("cannot upload to storj: {}", e);
|
||||
} else {
|
||||
warn!("file {} uploaded to storj", filekey);
|
||||
}
|
||||
Ok(HttpResponse::Ok().content_type(content_type).body(filedata))
|
||||
},
|
||||
Err(e) => Err(ErrorInternalServerError(e)),
|
||||
}
|
||||
},
|
||||
Err(e) => Err(ErrorInternalServerError(e))
|
||||
}
|
||||
}
|
||||
|
||||
async fn thumbdata_save(
|
||||
@@ -171,7 +163,7 @@ async fn thumbdata_save(
|
||||
let state = state.clone();
|
||||
if content_type.starts_with("image") {
|
||||
warn!("original file name: {}", original_filename);
|
||||
let (base_filename, _, extension) = parse_image_request(&original_filename).unwrap();
|
||||
let (base_filename, _, extension) = parse_image_request(&original_filename);
|
||||
let filename = format!("{}.{}", base_filename, extension);
|
||||
|
||||
warn!("file extension: {}", extension);
|
||||
|
||||
Reference in New Issue
Block a user