deltabot-cli 6.1.0__tar.gz → 6.2.0__tar.gz

{deltabot_cli-6.1.0/deltabot_cli.egg-info → deltabot_cli-6.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deltabot-cli
-Version: 6.1.0
+Version: 6.2.0
 Summary: Library to speedup Delta Chat bot development
 Author-email: adbenitez <adb@merlinux.eu>
 Project-URL: Homepage, https://github.com/deltachat-bot/deltabot-cli-py

{deltabot_cli-6.1.0 → deltabot_cli-6.2.0}/deltabot_cli/cli.py

@@ -6,12 +6,13 @@ import subprocess
 import sys
 import time
 from argparse import ArgumentParser, Namespace
+from pathlib import Path
 from threading import Thread
 from typing import Callable, Set, Union
 
 import qrcode
 from appdirs import user_config_dir
-from deltachat2 import Bot, Event, EventType, IOTransport, JsonRpcError, Rpc
+from deltachat2 import Bot, CoreEvent, Event, EventType, IOTransport, JsonRpcError, Rpc
 from deltachat2.events import EventFilter, HookCollection, HookDecorator, RawEvent
 from rich.logging import RichHandler
 
@@ -131,6 +132,9 @@ class BotCli:
         config_parser.add_argument("option", help="option name", nargs="?")
         config_parser.add_argument("value", help="option value to set", nargs="?")
 
+        import_parser = self.add_subcommand(_import_cmd, name="import")
+        import_parser.add_argument("path", help="path to the account backup", type=Path)
+
         self.add_subcommand(_serve_cmd, name="serve")
         self.add_subcommand(_qr_cmd, name="qr")
         self.add_subcommand(_list_cmd, name="list")
@@ -215,7 +219,7 @@ def _init_cmd(cli: BotCli, bot: Bot, args: Namespace) -> None:  # noqa: C901
     while True:
         raw_event = bot.rpc.get_next_event()
         accid = raw_event.context_id
-        event = raw_event.event
+        event = CoreEvent(raw_event.event)
         if event.kind == EventType.CONFIGURE_PROGRESS:
             if event.comment:
                 bot.logger.info(event.comment)
@@ -340,7 +344,7 @@ def _list_cmd(cli: BotCli, bot: Bot, _args: Namespace) -> None:
     for accid in accounts:
         addr = cli.get_address(rpc, accid)
         if not rpc.is_configured(accid):
-            addr = addr + " (not configured)"
+            addr = f"{addr or ''} (not configured)"
         print(f"#{accid} - {addr}")
 
 
@@ -365,3 +369,20 @@ def _remove_cmd(cli: BotCli, bot: Bot, args: Namespace) -> None:
     addr = cli.get_address(bot.rpc, accid)
     bot.rpc.remove_account(accid)
     print(f"Account #{accid} ({addr}) removed successfully.")
+
+
+def _import_cmd(_cli: BotCli, bot: Bot, args: Namespace) -> None:
+    """import account backup"""
+    if not args.path.exists():
+        bot.logger.error(f"path doesn't exist: {str(args.path)!r}")
+        sys.exit(1)
+    accid = bot.rpc.add_account()
+    try:
+        bot.rpc.import_backup(accid, str(args.path), None)
+    except JsonRpcError as ex:
+        bot.rpc.remove_account(accid)
+        bot.logger.exception(ex)
+        sys.exit(1)
+    else:
+        addr = bot.rpc.get_config(accid, "configured_addr")
+        print(f"Account #{accid} ({addr}) imported successfully.")

{deltabot_cli-6.1.0 → deltabot_cli-6.2.0/deltabot_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deltabot-cli
-Version: 6.1.0
+Version: 6.2.0
 Summary: Library to speedup Delta Chat bot development
 Author-email: adbenitez <adb@merlinux.eu>
 Project-URL: Homepage, https://github.com/deltachat-bot/deltabot-cli-py

{deltabot_cli-6.1.0 → deltabot_cli-6.2.0}/pyproject.toml

@@ -41,6 +41,9 @@ dev = [
 [tool.setuptools_scm]
 # can be empty if no extra settings are needed, presence enables setuptools_scm
 
+[tool.setuptools]
+packages = ["deltabot_cli"]
+
 [tool.black]
 line-length = 100