discours.io/quoter
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

warndebug
All checks were successful
deploy / deploy (push) Successful in 1m2s
Details

Browse Source
This commit is contained in:
Untone 2024-10-22 20:42:45 +03:00
parent f5ee1c75ee
commit e9e0815af8
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/handlers/proxy.rs
View File

@ -1,4 +1,5 @@
use actix_web::{error::ErrorInternalServerError, web, HttpRequest, HttpResponse, Result}; use actix_web::{error::ErrorInternalServerError, web, HttpRequest, HttpResponse, Result};
use log::warn;
use crate::app_state::AppState; use crate::app_state::AppState;
use crate::handlers::serve_file::serve_file; use crate::handlers::serve_file::serve_file;
@ -16,6 +17,8 @@ pub async fn proxy_handler(
false => requested_res.to_string(), false => requested_res.to_string(),
}; };
warn!("normalized_path: {}", normalized_path);
// парсим GET запрос // парсим GET запрос
if let Some((base_filename, requested_width, extension)) = parse_image_request(&normalized_path) if let Some((base_filename, requested_width, extension)) = parse_image_request(&normalized_path)
{ {
@ -34,8 +37,11 @@ pub async fn proxy_handler(
_ => return Err(ErrorInternalServerError("unsupported file format")), _ => return Err(ErrorInternalServerError("unsupported file format")),
}; };
warn!("content_type: {}", content_type);
return match state.get_path(&filekey).await { return match state.get_path(&filekey).await {
Ok(Some(stored_path)) => { Ok(Some(stored_path)) => {
warn!("stored_path: {}", stored_path);
// we have stored file path in storj // we have stored file path in storj
if check_file_exists(&state.storj_client, &state.bucket, &stored_path).await? { if check_file_exists(&state.storj_client, &state.bucket, &stored_path).await? {
if content_type.starts_with("image") { if content_type.starts_with("image") {
@ -91,6 +97,7 @@ pub async fn proxy_handler(
return match load_file_from_s3(&state.aws_client, &state.bucket, &stored_path).await return match load_file_from_s3(&state.aws_client, &state.bucket, &stored_path).await
{ {
Ok(filedata) => { Ok(filedata) => {
warn!("download stored_path from aws: {:?}", stored_path);
let _ = upload_to_s3( let _ = upload_to_s3(
&state.storj_client, &state.storj_client,
&state.bucket, &state.bucket,