diff --git a/whatsapp_archiver.py b/whatsapp_archiver.py index adfc269..8b8547d 100644 --- a/whatsapp_archiver.py +++ b/whatsapp_archiver.py @@ -115,13 +115,17 @@ def generate_all_media_gallery(db_path, output_dir): end_idx = min(start_idx + items_per_page, total_media) page_media_messages = valid_media_messages[start_idx:end_idx] + # Create media-gallery subdirectory + media_gallery_dir = os.path.join(output_dir, "media-gallery") + os.makedirs(media_gallery_dir, exist_ok=True) + # Determine filename if page_num == 1: filename = "media-gallery.html" else: filename = f"media-gallery-page-{page_num}.html" - media_gallery_path = os.path.join(output_dir, filename) + media_gallery_path = os.path.join(media_gallery_dir, filename) with open(media_gallery_path, 'w', encoding='utf-8') as f: f.write(f""" @@ -288,8 +292,8 @@ def generate_all_media_gallery(db_path, output_dir):

📷 Media Gallery

- ← Back to Chats - 🏠 Home + ← Back to Chats + 🏠 Home
@@ -387,10 +391,10 @@ def generate_all_media_gallery(db_path, output_dir): • {html.escape(str(sender_name))} {convert_whatsapp_timestamp(message_date)}
- + {media_html} - 📁 Open File + 📁 Open File """) @@ -613,7 +617,7 @@ def generate_chat_media_gallery(db_path, output_dir, chat_id, chat_name, contact

📷 Media from {html.escape(str(chat_name))}

← Back to Chat - 🖼️ All Media + 🖼️ All Media 💬 All Chats
@@ -881,7 +885,7 @@ def generate_html_chat(db_path, media_path, output_dir, chat_id, chat_name, is_g {html.escape(chat_name)}
{contact_jid}
- ← Back + ← Back to Chats 📷 Media
@@ -980,73 +984,73 @@ def process_iphone_backup(backup_path, output_dir): 'Sticker.sqlite' ] - # Prepare to recreate file structure - for fileID, domain, relativePath in files: - src_file = os.path.join(backup_path, fileID[:2], fileID) - dest_file = os.path.join(output_dir, relativePath) - os.makedirs(os.path.dirname(dest_file), exist_ok=True) + # # Prepare to recreate file structure + # for fileID, domain, relativePath in files: + # src_file = os.path.join(backup_path, fileID[:2], fileID) + # dest_file = os.path.join(output_dir, relativePath) + # os.makedirs(os.path.dirname(dest_file), exist_ok=True) - if not os.path.exists(src_file): - # print(f"Source file missing: {src_file}") - skipped_files += 1 - continue + # if not os.path.exists(src_file): + # # print(f"Source file missing: {src_file}") + # skipped_files += 1 + # continue - # Handle SQLite database files specially - merge data instead of overwriting - file_basename = os.path.basename(dest_file) - if file_basename in db_files_to_merge and os.path.exists(dest_file): - special_db_files += 1 - try: - # For SQLite databases, we need to merge the data - if file_basename == 'ChatStorage.sqlite': - merge_chat_database(src_file, dest_file) - else: - # For other SQLite databases, make a backup and then replace - # Future enhancement: implement proper merging for all database types - backup_file = f"{dest_file}.backup_{datetime.now().strftime('%Y%m%d%H%M%S')}" - shutil.copy2(dest_file, backup_file) - print(f"Created backup of {file_basename} as {os.path.basename(backup_file)}") - shutil.copy2(src_file, dest_file) - except Exception as e: - print(f"Error processing database {dest_file}: {e}") - continue + # # Handle SQLite database files specially - merge data instead of overwriting + # file_basename = os.path.basename(dest_file) + # if file_basename in db_files_to_merge and os.path.exists(dest_file): + # special_db_files += 1 + # try: + # # For SQLite databases, we need to merge the data + # if file_basename == 'ChatStorage.sqlite': + # merge_chat_database(src_file, dest_file) + # else: + # # For other SQLite databases, make a backup and then replace + # # Future enhancement: implement proper merging for all database types + # backup_file = f"{dest_file}.backup_{datetime.now().strftime('%Y%m%d%H%M%S')}" + # shutil.copy2(dest_file, backup_file) + # print(f"Created backup of {file_basename} as {os.path.basename(backup_file)}") + # shutil.copy2(src_file, dest_file) + # except Exception as e: + # print(f"Error processing database {dest_file}: {e}") + # continue - # For non-database files - if os.path.exists(dest_file): - # If file exists, we want to keep the newer one - # For media files, we always keep them (accumulate data) - is_media_file = any(relativePath.startswith(prefix) for prefix in ['Media/', 'Message/', 'ProfilePictures/', 'Avatar/']) + # # For non-database files + # if os.path.exists(dest_file): + # # If file exists, we want to keep the newer one + # # For media files, we always keep them (accumulate data) + # is_media_file = any(relativePath.startswith(prefix) for prefix in ['Media/', 'Message/', 'ProfilePictures/', 'Avatar/']) - if is_media_file: - # For media files, don't overwrite but create a version with timestamp if different - if not files_are_identical(src_file, dest_file): - filename, ext = os.path.splitext(dest_file) - timestamp = datetime.now().strftime('%Y%m%d%H%M%S') - new_dest_file = f"{filename}_{timestamp}{ext}" - try: - shutil.copy2(src_file, new_dest_file) - print(f"Saved additional version of media file: {os.path.relpath(new_dest_file, output_dir)}") - new_files += 1 - except Exception as e: - print(f"Error copying alternate version {src_file}: {e}") - skipped_files += 1 - else: - skipped_files += 1 - else: - # For non-media files, we'll take the newer one - try: - shutil.copy2(src_file, dest_file) - updated_files += 1 - except Exception as e: - print(f"Error updating {dest_file}: {e}") - skipped_files += 1 - else: - # If file doesn't exist, copy it - try: - shutil.copy2(src_file, dest_file) - new_files += 1 - except Exception as e: - print(f"Error copying {src_file} to {dest_file}: {e}") - skipped_files += 1 + # if is_media_file: + # # For media files, don't overwrite but create a version with timestamp if different + # if not files_are_identical(src_file, dest_file): + # filename, ext = os.path.splitext(dest_file) + # timestamp = datetime.now().strftime('%Y%m%d%H%M%S') + # new_dest_file = f"{filename}_{timestamp}{ext}" + # try: + # shutil.copy2(src_file, new_dest_file) + # print(f"Saved additional version of media file: {os.path.relpath(new_dest_file, output_dir)}") + # new_files += 1 + # except Exception as e: + # print(f"Error copying alternate version {src_file}: {e}") + # skipped_files += 1 + # else: + # skipped_files += 1 + # else: + # # For non-media files, we'll take the newer one + # try: + # shutil.copy2(src_file, dest_file) + # updated_files += 1 + # except Exception as e: + # print(f"Error updating {dest_file}: {e}") + # skipped_files += 1 + # else: + # # If file doesn't exist, copy it + # try: + # shutil.copy2(src_file, dest_file) + # new_files += 1 + # except Exception as e: + # print(f"Error copying {src_file} to {dest_file}: {e}") + # skipped_files += 1 print(f"\nBackup import summary:") print(f"- Added {new_files} new files") @@ -1358,7 +1362,7 @@ def main():

WhatsApp Chat Export

Exported on {datetime.now().strftime('%Y-%m-%d %H:%M')}
- 📷 View All Media + 📷 View All Media
@@ -1464,7 +1468,7 @@ def main(): print(f" • {os.path.abspath(index_path)}") print(f" • {os.path.abspath(redirect_index)}") print(f"\nAdditional features:") - print(f" • Media Gallery: {os.path.abspath(os.path.join(args.output, 'media-gallery.html'))}") + print(f" • Media Gallery: {os.path.abspath(os.path.join(args.output, 'media-gallery', 'media-gallery.html'))}") print(f" • Individual chat media galleries available in the media/ folder")