From 22fd211c7c7593a7b6144ba6dc0ff6e7beb1e162 Mon Sep 17 00:00:00 2001 From: Untone Date: Mon, 23 Sep 2024 14:01:20 +0300 Subject: [PATCH] ci-fix --- .gitea/workflows/main.yml | 7 +++++++ src/handlers.rs | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 687046a..c1018cd 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -23,4 +23,11 @@ jobs: with: branch: 'main' git_remote_url: 'ssh://dokku@v2.discours.io:22/quoter' + ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} + + - name: Push to dokku + uses: dokku/github-action@master + with: + branch: 'dev' + git_remote_url: 'ssh://dokku@staging.discours.io:22/quoter' ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} \ No newline at end of file diff --git a/src/handlers.rs b/src/handlers.rs index 140f993..cb9f541 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -5,7 +5,9 @@ use crate::auth::{get_id_by_token, user_added_file}; use crate::s3_utils::{ check_file_exists, generate_key_with_extension, load_file_from_s3, upload_to_s3, }; -use crate::thumbnail::{find_closest_width, generate_thumbnails, parse_thumbnail_request, ALLOWED_THUMBNAIL_WIDTHS}; +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}; @@ -158,6 +160,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,