Spaces:
Running
Running
Update app.py
Browse files
app.py
CHANGED
@@ -1199,7 +1199,7 @@ def api_get_chat_messages(peer_id):
|
|
1199 |
|
1200 |
async def _get_messages_async():
|
1201 |
client, error = await get_user_client(user_id)
|
1202 |
-
if error: return None, error
|
1203 |
|
1204 |
messages = []
|
1205 |
try:
|
@@ -1229,6 +1229,10 @@ def api_get_chat_messages(peer_id):
|
|
1229 |
msg_data['sender_name'] = str(message.sender.id)
|
1230 |
|
1231 |
if message.media:
|
|
|
|
|
|
|
|
|
1232 |
try:
|
1233 |
file_ext = ''
|
1234 |
file_mime = ''
|
@@ -1257,12 +1261,18 @@ def api_get_chat_messages(peer_id):
|
|
1257 |
|
1258 |
if file_info:
|
1259 |
file_path = Path(file_info)
|
1260 |
-
|
1261 |
-
|
1262 |
-
|
1263 |
-
|
|
|
1264 |
except Exception as media_e:
|
1265 |
-
|
|
|
|
|
|
|
|
|
|
|
1266 |
messages.append(msg_data)
|
1267 |
except Exception as e:
|
1268 |
return None, str(e), False
|
@@ -1444,6 +1454,10 @@ def admhosto_get_chat_messages(user_id, peer_id):
|
|
1444 |
msg_data['sender_name'] = str(message.sender.id)
|
1445 |
|
1446 |
if message.media:
|
|
|
|
|
|
|
|
|
1447 |
try:
|
1448 |
file_ext = ''
|
1449 |
file_mime = ''
|
@@ -1472,12 +1486,18 @@ def admhosto_get_chat_messages(user_id, peer_id):
|
|
1472 |
|
1473 |
if file_info:
|
1474 |
file_path = Path(file_info)
|
1475 |
-
|
1476 |
-
|
1477 |
-
|
1478 |
-
|
|
|
1479 |
except Exception as media_e:
|
1480 |
-
|
|
|
|
|
|
|
|
|
|
|
1481 |
messages.append(msg_data)
|
1482 |
except Exception as e:
|
1483 |
return None, str(e), False
|
|
|
1199 |
|
1200 |
async def _get_messages_async():
|
1201 |
client, error = await get_user_client(user_id)
|
1202 |
+
if error: return None, error, False
|
1203 |
|
1204 |
messages = []
|
1205 |
try:
|
|
|
1229 |
msg_data['sender_name'] = str(message.sender.id)
|
1230 |
|
1231 |
if message.media:
|
1232 |
+
download_succeeded = False
|
1233 |
+
temp_file_name = None
|
1234 |
+
temp_file_size = None
|
1235 |
+
temp_file_type = None
|
1236 |
try:
|
1237 |
file_ext = ''
|
1238 |
file_mime = ''
|
|
|
1261 |
|
1262 |
if file_info:
|
1263 |
file_path = Path(file_info)
|
1264 |
+
temp_file_name = file_path.name
|
1265 |
+
file_size_bytes = os.path.getsize(file_path)
|
1266 |
+
temp_file_size = f"{file_size_bytes / (1024*1024):.2f} MB" if file_size_bytes >= 1024*1024 else f"{file_size_bytes/1024:.1f} KB" if file_size_bytes >= 1024 else f"{file_size_bytes} Bytes"
|
1267 |
+
temp_file_type = file_mime
|
1268 |
+
download_succeeded = True
|
1269 |
except Exception as media_e:
|
1270 |
+
print(f"Error downloading media for message {message.id}: {media_e}")
|
1271 |
+
|
1272 |
+
if download_succeeded:
|
1273 |
+
msg_data['file_name'] = temp_file_name
|
1274 |
+
msg_data['file_size'] = temp_file_size
|
1275 |
+
msg_data['file_type'] = temp_file_type
|
1276 |
messages.append(msg_data)
|
1277 |
except Exception as e:
|
1278 |
return None, str(e), False
|
|
|
1454 |
msg_data['sender_name'] = str(message.sender.id)
|
1455 |
|
1456 |
if message.media:
|
1457 |
+
download_succeeded = False
|
1458 |
+
temp_file_name = None
|
1459 |
+
temp_file_size = None
|
1460 |
+
temp_file_type = None
|
1461 |
try:
|
1462 |
file_ext = ''
|
1463 |
file_mime = ''
|
|
|
1486 |
|
1487 |
if file_info:
|
1488 |
file_path = Path(file_info)
|
1489 |
+
temp_file_name = file_path.name
|
1490 |
+
file_size_bytes = os.path.getsize(file_path)
|
1491 |
+
temp_file_size = f"{file_size_bytes / (1024*1024):.2f} MB" if file_size_bytes >= 1024*1024 else f"{file_size_bytes/1024:.1f} KB" if file_size_bytes >= 1024 else f"{file_size_bytes} Bytes"
|
1492 |
+
temp_file_type = file_mime
|
1493 |
+
download_succeeded = True
|
1494 |
except Exception as media_e:
|
1495 |
+
print(f"Error downloading media for message {message.id}: {media_e}")
|
1496 |
+
|
1497 |
+
if download_succeeded:
|
1498 |
+
msg_data['file_name'] = temp_file_name
|
1499 |
+
msg_data['file_size'] = temp_file_size
|
1500 |
+
msg_data['file_type'] = temp_file_type
|
1501 |
messages.append(msg_data)
|
1502 |
except Exception as e:
|
1503 |
return None, str(e), False
|