From 200dea218fe1898394bc0388f149af527bcbf92f Mon Sep 17 00:00:00 2001 From: KnugiHK <24708955+KnugiHK@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:01:10 +0800 Subject: [PATCH] Update help message --- README.md | 17 +++++++++++------ Whatsapp_Chat_Exporter/__main__.py | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 7d6bae3..45b6740 100644 --- a/README.md +++ b/README.md @@ -106,12 +106,15 @@ After extracting, you will get these: Invoke the wtsexporter with --help option will show you all options available. ```sh > wtsexporter --help -usage: wtsexporter [options] +usage: wtsexporter [-h] [-a] [-i] [-e EXPORTED] [-w WA] [-m MEDIA] [-b BACKUP] [-o OUTPUT] [-j [JSON]] [-d DB] [-k KEY] [-t TEMPLATE] [-s] [-c] [--offline OFFLINE] [--size [SIZE]] + [--no-html] [--check-update] [--assume-first-as-me] options: -h, --help show this help message and exit -a, --android Define the target as Android - -i, --iphone, --ios Define the target as iPhone + -i, --iphone, --ios Define the target as iPhone/iPad + -e EXPORTED, --exported EXPORTED + Define the target as exported chat file and specify the path to the file -w WA, --wa WA Path to contact database (default: wa.db/ContactsV2.sqlite) -m MEDIA, --media MEDIA Path to WhatsApp media folder (default: WhatsApp) @@ -125,14 +128,16 @@ options: -k KEY, --key KEY Path to key file -t TEMPLATE, --template TEMPLATE Path to custom HTML template - -e, --embedded Embed media into HTML file (not yet implemented) -s, --showkey Show the HEX key used to decrypt the database -c, --move-media Move the media directory to output directory if the flag is set, otherwise copy it --offline OFFLINE Relative path to offline static files - --size SIZE, --output-size SIZE - Maximum size of a single output file in bytes, 0 for auto (not yet implemented) + --size [SIZE], --output-size [SIZE], --split [SIZE] + Maximum (rough) size of a single output file in bytes, 0 for auto --no-html Do not output html files - --check-update Check for updates + --check-update Check for updates (require Internet access) + --assume-first-as-me Assume the first message in a chat as sent by me (must be used together with -e) + +WhatsApp Chat Exporter: 0.9.1 Licensed with MIT ``` # To do diff --git a/Whatsapp_Chat_Exporter/__main__.py b/Whatsapp_Chat_Exporter/__main__.py index e30b556..6afe2e8 100644 --- a/Whatsapp_Chat_Exporter/__main__.py +++ b/Whatsapp_Chat_Exporter/__main__.py @@ -7,7 +7,7 @@ from Whatsapp_Chat_Exporter import extract, extract_exported, extract_iphone from Whatsapp_Chat_Exporter import extract_iphone_media from Whatsapp_Chat_Exporter.data_model import ChatStore from Whatsapp_Chat_Exporter.utility import Crypt, check_update -from argparse import ArgumentParser +from argparse import ArgumentParser, SUPPRESS import os import sqlite3 import shutil @@ -38,6 +38,13 @@ def main(): default=False, action='store_true', help="Define the target as iPhone/iPad") + parser.add_argument( + "-e", + "--exported", + dest="exported", + default=None, + help="Define the target as exported chat file and specify the path to the file" + ) parser.add_argument( "-w", "--wa", @@ -98,7 +105,7 @@ def main(): dest="embedded", default=False, action='store_true', - help="Embed media into HTML file (not yet implemented)" + help=SUPPRESS or "Embed media into HTML file (not yet implemented)" ) parser.add_argument( "-s", @@ -131,7 +138,7 @@ def main(): type=int, const=0, default=None, - help="Maximum (Rough) size of a single output file in bytes, 0 for auto" + help="Maximum (rough) size of a single output file in bytes, 0 for auto" ) parser.add_argument( "--no-html", @@ -147,13 +154,6 @@ def main(): action='store_true', help="Check for updates (require Internet access)" ) - parser.add_argument( - "-e", - "--exported", - dest="exported", - default=None, - help="Path to exported chat file" - ) parser.add_argument( "--assume-first-as-me", dest="assume_first_as_me",