From 724e1ea97e6d971c5587af7c44af5f1f20dfc83d Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 6 Mar 2020 11:28:47 +0100
Subject: [PATCH] simplify example

---
 python/examples/echo_and_quit.py | 41 ++-----------------------------
 python/src/deltachat/__init__.py | 42 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/python/examples/echo_and_quit.py b/python/examples/echo_and_quit.py
index 73a8bc099..cf9ee8c27 100644
--- a/python/examples/echo_and_quit.py
+++ b/python/examples/echo_and_quit.py
@@ -1,11 +1,8 @@
 
 # content of echo_and_quit.py
 
-import sys
-import optparse
 import deltachat
 
-
 class SimpleEchoPlugin:
     @deltachat.hookspec.account_hookimpl
     def process_incoming_message(self, message):
@@ -23,40 +20,6 @@ class SimpleEchoPlugin:
         print("process_message_delivered", message)
 
 
-def main(argv):
-    p = optparse.OptionParser("simple-echo")
-    p.add_option("-l", action="store_true", help="show ffi")
-    p.add_option("--db", type="str", help="database file")
-    p.add_option("--email", type="str", help="email address")
-    p.add_option("--password", type="str", help="password")
+if __name__ = "__main__":
+    deltachat.run_simple_cmdline(account_plugins=[SimpleEchoPlugin()])
 
-    opts, posargs = p.parse_args(argv)
-
-    assert opts.db, "you must specify --db"
-    ac = deltachat.Account(opts.db)
-
-    if opts.l:
-        log = deltachat.eventlogger.FFIEventLogger(ac, "echo")
-        ac.add_account_plugin(log)
-
-    if not ac.is_configured():
-        assert opts.email and opts.password, (
-            "you must specify --email and --password"
-        )
-        ac.set_config("addr", opts.email)
-        ac.set_config("mail_pw", opts.password)
-        ac.set_config("mvbox_watch", "0")
-        ac.set_config("sentbox_watch", "0")
-
-    ac.add_account_plugin(SimpleEchoPlugin())
-
-    # start IO threads and configure if neccessary
-    ac.start()
-
-    print("{}: waiting for message".format(ac.get_config("addr")))
-
-    ac.wait_shutdown()
-
-
-if __name__ == "__main__":
-    main(sys.argv)
diff --git a/python/src/deltachat/__init__.py b/python/src/deltachat/__init__.py
index ac27a4209..13ac63f75 100644
--- a/python/src/deltachat/__init__.py
+++ b/python/src/deltachat/__init__.py
@@ -2,6 +2,7 @@ from . import capi, const, hookspec
 from .capi import ffi
 from .account import Account  # noqa
 from . import eventlogger
+from .util import lazydecorator
 
 from pkg_resources import get_distribution, DistributionNotFound
 try:
@@ -92,3 +93,44 @@ def unregister_global_plugin(plugin):
 
 
 register_global_plugin(eventlogger)
+
+
+def run_cmdline(argv=None, account_plugins=None):
+    """ Run a simple default command line app, registering the specified
+    account plugins. """
+    import argparse
+    if argv is None:
+        argv = sys.argv
+
+    parser = argparse.ArgumentParser(prog="simple-echo")
+    parser.add_argument("--show-ffi", action="store_true", help="show low level ffi events")
+    parser.add_argument("--db", action="store", help="database file")
+    parser.add_argument("--email", action="store", help="email address")
+    parser.add_argument("--password", action="store", help="password")
+
+    args = parser.parse_args(argv[1:])
+
+    assert args.db, "you must specify --db"
+    ac = deltachat.Account(args.db)
+
+    if args.show_ffi:
+        log = deltachat.eventlogger.FFIEventLogger(ac, "echo")
+        ac.add_account_plugin(log)
+
+    if not ac.is_configured():
+        assert args.email and args.password, (
+            "you must specify --email and --password once to configure this database/account"
+        )
+        ac.set_config("addr", args.email)
+        ac.set_config("mail_pw", args.password)
+        ac.set_config("mvbox_watch", "0")
+        ac.set_config("sentbox_watch", "0")
+
+    ac.add_account_plugin(SimpleEchoPlugin())
+
+    # start IO threads and configure if neccessary
+    ac.start()
+
+    print("{}: waiting for message".format(ac.get_config("addr")))
+
+    ac.wait_shutdown()