calvin.erfmann/WhatsApp-Chat-Exporter
1
0
Fork 0
mirror of https://github.com/KnugiHK/WhatsApp-Chat-Exporter.git synced 2026-05-22 08:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Normalize media path handling in handlers

Browse Source
This commit is contained in:
KnugiHK
2026-03-21 17:22:47 +08:00
parent 8dfced9d94
commit a161993ab9
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Whatsapp_Chat_Exporter/android_handler.py
View File

@@ -806,10 +806,9 @@ def _process_single_media(data, content, media_folder, mime, separate_media, fix
file_path, new_path, message.timestamp, file_path, new_path, message.timestamp,
timezone_offset, embed_exif, rename_media timezone_offset, embed_exif, rename_media
) )
message.data = final_path
else: else:
shutil.copy2(file_path, new_path) final_path = new_path
message.data = new_path shutil.copy2(file_path, final_path)
elif embed_exif or rename_media: elif embed_exif or rename_media:
# Handle in-place processing when not separating # Handle in-place processing when not separating
# Create a copy with timestamp processing in the same folder # Create a copy with timestamp processing in the same folder
@@ -817,9 +816,9 @@ def _process_single_media(data, content, media_folder, mime, separate_media, fix
file_path, file_path, message.timestamp, file_path, file_path, message.timestamp,
timezone_offset, embed_exif, rename_media timezone_offset, embed_exif, rename_media
) )
message.data = final_path
else: else:
message.data = file_path final_path = file_path
message.data = final_path
else: else:
message.data = "The media is missing" message.data = "The media is missing"
message.mime = "media" message.mime = "media"

10
Whatsapp_Chat_Exporter/ios_handler.py
View File

@@ -495,20 +495,18 @@ def process_media_item(content, data, media_folder, mime, separate_media, fix_do
file_path, new_path, message.timestamp, file_path, new_path, message.timestamp,
timezone_offset, embed_exif, rename_media timezone_offset, embed_exif, rename_media
) )
message.data = '/'.join(final_path.split("\\")[1:])
else: else:
shutil.copy2(file_path, new_path) final_path = new_path
message.data = '/'.join(new_path.split("\\")[1:]) shutil.copy2(file_path, final_path)
elif embed_exif or rename_media: elif embed_exif or rename_media:
# Handle in-place processing when not separating # Handle in-place processing when not separating
final_path = process_media_with_timestamp( final_path = process_media_with_timestamp(
file_path, file_path, message.timestamp, file_path, file_path, message.timestamp,
timezone_offset, embed_exif, rename_media timezone_offset, embed_exif, rename_media
) )
message.data = '/'.join(final_path.split("/")[1:])
else: else:
message.data = '/'.join(file_path.split("/")[1:]) final_path = file_path
message.data = os.path.join(*final_path.split(os.sep)[1:])
else: else:
# Handle missing media # Handle missing media
message.data = "The media is missing" message.data = "The media is missing"