fmt
Some checks failed
deploy / deploy (push) Failing after 3s

This commit is contained in:
Untone 2024-09-23 18:16:47 +03:00
parent a85a5c5dd5
commit ef78bc078b
6 changed files with 10 additions and 18 deletions

View File

@ -1,5 +1,3 @@
// app_state.rs
use actix_web::error::ErrorInternalServerError;
use aws_config::BehaviorVersion;
use aws_sdk_s3::{config::Credentials, Client as S3Client};

View File

@ -1,5 +1,3 @@
// auth.rs
use actix_web::error::ErrorInternalServerError;
use redis::{aio::MultiplexedConnection, AsyncCommands};
use reqwest::header::{HeaderMap, HeaderValue, CONTENT_TYPE};

View File

@ -1,4 +1,7 @@
// handlers.rs
use actix_multipart::Multipart;
use actix_web::{error::ErrorInternalServerError, web, HttpRequest, HttpResponse, Result};
use futures::StreamExt;
use mime_guess::MimeGuess;
use crate::app_state::AppState;
use crate::auth::{get_id_by_token, user_added_file};
@ -8,13 +11,9 @@ use crate::s3_utils::{
use crate::thumbnail::{
find_closest_width, generate_thumbnails, parse_thumbnail_request, ALLOWED_THUMBNAIL_WIDTHS,
};
use actix_multipart::Multipart;
use actix_web::error::ErrorInternalServerError;
use actix_web::{web, HttpRequest, HttpResponse, Result};
use futures::StreamExt;
use mime_guess::MimeGuess;
pub const MAX_WEEK_BYTES: u64 = 2 * 1024 * 1024 * 1024; // Лимит квоты на пользователя: 2 ГБ в неделю
// Лимит квоты на пользователя: 2 ГБ в неделю
pub const MAX_WEEK_BYTES: u64 = 2 * 1024 * 1024 * 1024;
/// Функция для обслуживания файла по заданному пути.
async fn serve_file(file_key: &str, state: &AppState) -> Result<HttpResponse, actix_web::Error> {
@ -160,7 +159,7 @@ pub async fn proxy_handler(
let thumbnails_bytes =
generate_thumbnails(&image, &ALLOWED_THUMBNAIL_WIDTHS).await?;
let thumbnail_bytes = thumbnails_bytes[&closest_width].clone();
// Загружаем миниатюру в S3
upload_to_s3(
&state.s3_client,

View File

@ -14,7 +14,7 @@ async fn main() -> std::io::Result<()> {
let app_state = AppState::new().await;
let app_state_clone = app_state.clone();
// Используем spawn_blocking для работы, которая не совместима с Send
spawn_blocking(move || {
let rt = tokio::runtime::Handle::current();
@ -34,4 +34,4 @@ async fn main() -> std::io::Result<()> {
.bind("127.0.0.1:8080")?
.run()
.await
}
}

View File

@ -1,8 +1,7 @@
use std::str::FromStr;
use actix_web::error::ErrorInternalServerError;
use aws_sdk_s3::{error::SdkError, primitives::ByteStream, Client as S3Client};
use mime_guess::mime;
use std::str::FromStr;
/// Загружает файл в S3 хранилище.
pub async fn upload_to_s3(

View File

@ -1,5 +1,3 @@
// thumbnail.rs
use actix_web::error::ErrorInternalServerError;
use image::{imageops::FilterType, DynamicImage};
use std::{collections::HashMap, io::Cursor};