From ffc9c42370b46629c2df42f09e06c271cbdea893 Mon Sep 17 00:00:00 2001 From: bakatrouble Date: Wed, 17 Mar 2021 13:05:54 +0300 Subject: [PATCH] add content type for s3 --- Pipfile | 1 + Pipfile.lock | 24 ++++++++++++++++-------- bots/modules/robot.py | 4 +++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Pipfile b/Pipfile index 9e49fa0..73d186f 100644 --- a/Pipfile +++ b/Pipfile @@ -38,6 +38,7 @@ twisted = {extras = ["http2", "tls"], version = "*"} whitenoise = "*" django-picklefield = "*" boto3 = "*" +filetype = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index ed8ced7..f86f286 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "edd3a9ebec36929c8ff036bf21938fb3ac5d955cc5cbed716f1fa9c34eca854e" + "sha256": "b349892ba15b7d9c0f4923076c76c40bb526ceadfd2a1a7073bcb945f75786c9" }, "pipfile-spec": 6, "requires": { @@ -85,19 +85,19 @@ }, "boto3": { "hashes": [ - "sha256:6758751f1181b9363e4e7559dcbd5ac0fc7147b73f429c976ec5ecd1688c9ec7", - "sha256:fa41987f9f71368013767306d9522b627946a01b4843938a26fb19cc8adb06c0" + "sha256:31396fcaffdfc0f465b4de76e1ecae53894eb869b000ffa54aa1693a98db3a3c", + "sha256:bf8ced7760f9ef36964ccdba719f334a2ae6ec8a7719c259b198fec56fabad87" ], "index": "pypi", - "version": "==1.17.27" + "version": "==1.17.29" }, "botocore": { "hashes": [ - "sha256:4477803f07649f4d80b17d054820e7a09bb2cb0792d0decc2812108bc3759c4a", - "sha256:57e45c9d443163da7312cae61bcc60382e6d0b3aecda68e850d6438162fe7b5b" + "sha256:184b7d26b0669fd65ac8193662376d1267d800e005b69412b57cc82c5ffbe935", + "sha256:5a26ad20662f8e15685889a17c62a2f8804bf02fcdea59f45ad993b261f9caa2" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==1.20.27" + "version": "==1.20.29" }, "celery": { "hashes": [ @@ -333,6 +333,14 @@ "index": "pypi", "version": "==6.0.2" }, + "filetype": { + "hashes": [ + "sha256:353369948bb1c09b8b3ea3d78390b5586e9399bff9aab894a1dff954e31a66f6", + "sha256:da393ece8d98b47edf2dd5a85a2c8733e44b769e32c71af4cd96ed8d38d96aa7" + ], + "index": "pypi", + "version": "==1.0.7" + }, "future": { "hashes": [ "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d" @@ -956,7 +964,7 @@ "sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df", "sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "version": "==1.26.4" }, "vine": { diff --git a/bots/modules/robot.py b/bots/modules/robot.py index 22385b9..7e06ba6 100644 --- a/bots/modules/robot.py +++ b/bots/modules/robot.py @@ -4,6 +4,7 @@ import time from tempfile import TemporaryDirectory import boto3 +import filetype from django.db import models from telegram import Update, InlineKeyboardMarkup, InlineKeyboardButton from telegram.ext import CallbackContext, Dispatcher, MessageHandler, Filters @@ -47,8 +48,9 @@ class RobotBotModuleConfig(TelegramBotModuleConfig): with TemporaryDirectory() as d: file_path = os.path.join(d, filename) file.download(file_path) + tp = filetype.guess(file_path) s3 = boto3.client('s3', aws_access_key_id=config.aws_access_key_id, aws_secret_access_key=config.aws_secret_access_key) - s3.upload_file(file_path, config.s3_bucket, filename, ExtraArgs={'ACL': 'public-read'}) + s3.upload_file(file_path, config.s3_bucket, filename, ExtraArgs={'ACL': 'public-read', 'ContentType': tp.mime}) file_url = f'https://{config.s3_bucket}.s3.amazonaws.com/{filename}' if update.message.photo: markup.inline_keyboard = [[