From bbb558713feaf61c6582691f90de71c9438af27c Mon Sep 17 00:00:00 2001 From: KnugiHK <24708955+KnugiHK@users.noreply.github.com> Date: Sat, 17 May 2025 18:24:30 +0800 Subject: [PATCH] Replace sanitize_filename with safe_name --- Whatsapp_Chat_Exporter/__main__.py | 8 ++++---- Whatsapp_Chat_Exporter/utility.py | 14 +------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/Whatsapp_Chat_Exporter/__main__.py b/Whatsapp_Chat_Exporter/__main__.py index 0a7aae3..ff44531 100644 --- a/Whatsapp_Chat_Exporter/__main__.py +++ b/Whatsapp_Chat_Exporter/__main__.py @@ -12,9 +12,9 @@ import importlib.metadata from Whatsapp_Chat_Exporter import android_crypt, exported_handler, android_handler from Whatsapp_Chat_Exporter import ios_handler, ios_media_handler from Whatsapp_Chat_Exporter.data_model import ChatCollection, ChatStore -from Whatsapp_Chat_Exporter.utility import APPLE_TIME, CLEAR_LINE, Crypt, check_update, DbType -from Whatsapp_Chat_Exporter.utility import readable_to_bytes, sanitize_filename -from Whatsapp_Chat_Exporter.utility import import_from_json, incremental_merge, bytes_to_readable +from Whatsapp_Chat_Exporter.utility import APPLE_TIME, CLEAR_LINE, Crypt, check_update +from Whatsapp_Chat_Exporter.utility import readable_to_bytes, safe_name, bytes_to_readable +from Whatsapp_Chat_Exporter.utility import import_from_json, incremental_merge, DbType from argparse import ArgumentParser, SUPPRESS from datetime import datetime from getpass import getpass @@ -683,7 +683,7 @@ def export_multiple_json(args, data: Dict) -> None: else: contact = jik.replace('+', '') - with open(f"{json_path}/{sanitize_filename(contact)}.json", "w") as f: + with open(f"{json_path}/{safe_name(contact)}.json", "w") as f: file_content = json.dumps( {jik: data[jik]}, ensure_ascii=not args.avoid_encoding_json, diff --git a/Whatsapp_Chat_Exporter/utility.py b/Whatsapp_Chat_Exporter/utility.py index 2053133..5d52d2d 100644 --- a/Whatsapp_Chat_Exporter/utility.py +++ b/Whatsapp_Chat_Exporter/utility.py @@ -334,18 +334,6 @@ def incremental_merge(source_dir: str, target_dir: str, media_dir: str, pretty_p shutil.copy2(source_file, target_file) -def sanitize_filename(file_name: str) -> str: - """Sanitizes a filename by removing invalid and unsafe characters. - - Args: - file_name: The filename to sanitize. - - Returns: - The sanitized filename. - """ - return "".join(x for x in file_name if x.isalnum() or x in "- ") - - def get_file_name(contact: str, chat: ChatStore) -> Tuple[str, str]: """Generates a sanitized filename and contact name for a chat. @@ -375,7 +363,7 @@ def get_file_name(contact: str, chat: ChatStore) -> Tuple[str, str]: else: name = phone_number - return sanitize_filename(file_name), name + return safe_name(file_name), name def get_cond_for_empty(enable: bool, jid_field: str, broadcast_field: str) -> str: