Skip to content

Commit ce25af0

Browse files
committed
Circular import fixed
Circular import fixed and improvement to get_name
1 parent bee3289 commit ce25af0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

WebStreamer/server/stream_routes.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from WebStreamer.bot import multi_clients, work_loads
1313
from WebStreamer.server.exceptions import FIleNotFound, InvalidHash
1414
from WebStreamer import Var, utils, StartTime, __version__, StreamBot
15-
from WebStreamer.utils import get_name
1615

1716
logger = logging.getLogger("routes")
1817

@@ -117,7 +116,7 @@ async def media_streamer(request: web.Request, message_id: int, secure_hash: str
117116
file_id, index, offset, first_part_cut, last_part_cut, part_count, chunk_size
118117
)
119118
mime_type = file_id.mime_type
120-
file_name = get_name(file_id)
119+
file_name = utils.get_name(file_id)
121120
disposition = "attachment"
122121

123122
if not mime_type:

WebStreamer/utils/file_properties.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ def get_name(media_msg: Message | FileId) -> str:
7070
if not file_name:
7171
if isinstance(media_msg, Message) and media_msg.media:
7272
media_type = media_msg.media.value
73+
elif media_msg.file_type:
74+
media_type = media_msg.file_type.name.lower()
7375
else:
7476
media_type = "file"
7577

0 commit comments

Comments
 (0)