mirror of
https://github.com/KnugiHK/WhatsApp-Chat-Exporter.git
synced 2026-04-21 13:34:41 +00:00
Refactor a bit and use chat jid as the final fallback
This commit is contained in:
@@ -571,16 +571,13 @@ def media(db, data, media_folder, filter_date, filter_chat, separate_media=True)
|
|||||||
else:
|
else:
|
||||||
message.mime = content["mime_type"]
|
message.mime = content["mime_type"]
|
||||||
if separate_media:
|
if separate_media:
|
||||||
chat_display_name = data[content["key_remote_jid"]].name or slugify(message.sender) or "Unknown"
|
chat_display_name = slugify(data[content["key_remote_jid"]].name or message.sender \
|
||||||
separated_media_folder = f"{media_folder}/separated/"
|
or content["key_remote_jid"].split('@')[0], True)
|
||||||
|
|
||||||
current_filename = file_path.split("/")[-1]
|
current_filename = file_path.split("/")[-1]
|
||||||
new_folder = f"{separated_media_folder}/{chat_display_name}"
|
new_folder = os.path.join(media_folder, "separated", chat_display_name)
|
||||||
Path(new_folder).mkdir(parents=True, exist_ok=True)
|
Path(new_folder).mkdir(parents=True, exist_ok=True)
|
||||||
new_path = f"{new_folder}/{current_filename}"
|
new_path = os.path.join(new_folder, current_filename)
|
||||||
|
|
||||||
shutil.copy2(file_path, new_path)
|
shutil.copy2(file_path, new_path)
|
||||||
|
|
||||||
message.data = new_path
|
message.data = new_path
|
||||||
else:
|
else:
|
||||||
if False: # Block execution
|
if False: # Block execution
|
||||||
|
|||||||
Reference in New Issue
Block a user