Bump to v1.5

This commit is contained in:
Dr.Caduceus
2023-11-13 11:55:37 +05:30
committed by GitHub
parent b5de3e28f2
commit a199af295b

View File

@@ -1,9 +1,9 @@
from quart import Blueprint, Response, request, render_template, redirect
from math import ceil, floor
from .error import abort
from bot import TelegramBot
from bot.config import Telegram, Server
from math import ceil, floor
from bot.modules.telegram import get_message, get_file_properties
from .error import abort
bp = Blueprint('main', __name__)
@@ -13,22 +13,22 @@ async def home():
@bp.route('/dl/<int:file_id>')
async def transmit_file(file_id):
file = await get_message(int(file_id)) or abort(404)
file = await get_message(message_id=int(file_id)) or abort(404)
code = request.args.get('code') or abort(401)
range_header = request.headers.get('Range', 0)
if code != file.caption:
if code != file.raw_text:
abort(403)
file_name, file_size, mime_type = await get_file_properties(file)
file_name, file_size, mime_type = get_file_properties(file)
if range_header:
from_bytes, until_bytes = range_header.replace("bytes=", "").split("-")
from_bytes = int(from_bytes)
until_bytes = int(until_bytes) if until_bytes else file_size - 1
else:
from_bytes = 0
until_bytes = file_size -1
from_bytes = 0
until_bytes = file_size - 1
if (until_bytes > file_size) or (from_bytes < 0) or (until_bytes < from_bytes):
abort(416, 'Invalid range.')
@@ -36,26 +36,24 @@ async def transmit_file(file_id):
chunk_size = 1024 * 1024
until_bytes = min(until_bytes, file_size - 1)
offset = from_bytes // chunk_size
first_part_cut = from_bytes - (from_bytes - (from_bytes % chunk_size))
offset = from_bytes - (from_bytes % chunk_size)
first_part_cut = from_bytes - offset
last_part_cut = until_bytes % chunk_size + 1
req_length = until_bytes - from_bytes + 1
part_count = ceil(until_bytes / chunk_size) - floor((from_bytes - (from_bytes % chunk_size)) / chunk_size)
part_count = ceil(until_bytes / chunk_size) - floor(offset / chunk_size)
headers = {
"Content-Type": f"{mime_type}",
"Content-Range": f"bytes {from_bytes}-{until_bytes}/{file_size}",
"Content-Length": str(req_length),
"Content-Disposition": f'attachment; filename="{file_name}"',
"Accept-Ranges": "bytes",
}
disposition = 'inline' if 'video' in mime_type or 'audio' in mime_type or 'html' in mime_type else 'attachment'
headers={
'Content-Type': f'{mime_type}',
'Content-Range': f'bytes {from_bytes}-{until_bytes}/{file_size}',
'Content-Length': str(req_length),
'Content-Disposition': f'{disposition}; filename="{file_name}"',
'Accept-Ranges': 'bytes',
}
async def file_streamer():
async def file_generator():
current_part = 1
async for chunk in TelegramBot.stream_media(file, offset = offset):
async for chunk in TelegramBot.iter_download(file, offset=offset, chunk_size=chunk_size, stride=chunk_size, file_size=file_size):
if not chunk:
break
elif part_count == 1:
@@ -66,12 +64,13 @@ async def transmit_file(file_id):
yield chunk[:last_part_cut]
else:
yield chunk
current_part += 1
if current_part > part_count:
break
return Response(file_streamer(), headers=headers, status=206 if range_header else 200)
return Response(file_generator(), headers=headers, status=206 if range_header else 200)
@bp.route('/stream/<int:file_id>')
async def stream_file(file_id):