calvin.erfmann/WhatsApp-Chat-Exporter
1
0
Fork 0
mirror of https://github.com/KnugiHK/WhatsApp-Chat-Exporter.git synced 2026-04-27 16:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix and improve the logging facility for incremental merge

Browse Source
This commit is contained in:
KnugiHK
2026-01-24 16:24:10 +08:00
parent 1694ae7dd9
commit 746e4e1ac5
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Whatsapp_Chat_Exporter/utility.py
View File

@@ -287,7 +287,7 @@ class IncrementalMerger:
logger.error("No JSON files found in the source directory.") logger.error("No JSON files found in the source directory.")
raise SystemExit(1) raise SystemExit(1)
logger.info("JSON files found:", json_files) logger.debug("JSON files found:", json_files)
return json_files return json_files
def _copy_new_file(self, source_path: str, target_path: str, target_dir: str, json_file: str) -> None: def _copy_new_file(self, source_path: str, target_path: str, target_dir: str, json_file: str) -> None:
@@ -389,7 +389,7 @@ class IncrementalMerger:
target_path: Path to target file. target_path: Path to target file.
json_file: Name of the JSON file. json_file: Name of the JSON file.
""" """
logger.info(f"Merging '{json_file}' with existing file in target directory...") logger.info(f"Merging '{json_file}' with existing file in target directory...\r")
source_data = self._load_chat_data(source_path) source_data = self._load_chat_data(source_path)
target_data = self._load_chat_data(target_path) target_data = self._load_chat_data(target_path)
@@ -401,10 +401,10 @@ class IncrementalMerger:
merged_data = self._serialize_chats(merged_chats) merged_data = self._serialize_chats(merged_chats)
if self._has_changes(merged_data, target_data): if self._has_changes(merged_data, target_data):
logger.info(f"Changes detected in '{json_file}', updating target file...") logger.info(f"Changes detected in '{json_file}', updating target file...{CLEAR_LINE}")
self._save_merged_data(target_path, merged_data) self._save_merged_data(target_path, merged_data)
else: else:
logger.info(f"No changes detected in '{json_file}', skipping update.") logger.info(f"No changes detected in '{json_file}', skipping update.{CLEAR_LINE}")
def _should_copy_media_file(self, source_file: str, target_file: str) -> bool: def _should_copy_media_file(self, source_file: str, target_file: str) -> bool:
"""Check if media file should be copied. """Check if media file should be copied.
@@ -429,7 +429,7 @@ class IncrementalMerger:
source_media_path = os.path.join(source_dir, media_dir) source_media_path = os.path.join(source_dir, media_dir)
target_media_path = os.path.join(target_dir, media_dir) target_media_path = os.path.join(target_dir, media_dir)
logger.info(f"Merging media directories. Source: {source_media_path}, target: {target_media_path}") logger.info(f"Merging media directories. Source: {source_media_path}, target: {target_media_path}{CLEAR_LINE}")
if not os.path.exists(source_media_path): if not os.path.exists(source_media_path):
return return
@@ -444,7 +444,7 @@ class IncrementalMerger:
target_file = os.path.join(target_root, file) target_file = os.path.join(target_root, file)
if self._should_copy_media_file(source_file, target_file): if self._should_copy_media_file(source_file, target_file):
logger.info(f"Copying '{source_file}' to '{target_file}'...") logger.debug(f"Copying '{source_file}' to '{target_file}'...")
shutil.copy2(source_file, target_file) shutil.copy2(source_file, target_file)
def merge(self, source_dir: str, target_dir: str, media_dir: str) -> None: def merge(self, source_dir: str, target_dir: str, media_dir: str) -> None:
@@ -457,6 +457,7 @@ class IncrementalMerger:
""" """
json_files = self._get_json_files(source_dir) json_files = self._get_json_files(source_dir)
logger.info("Starting incremental merge process...{CLEAR_LINE}")
for json_file in json_files: for json_file in json_files:
source_path = os.path.join(source_dir, json_file) source_path = os.path.join(source_dir, json_file)
target_path = os.path.join(target_dir, json_file) target_path = os.path.join(target_dir, json_file)