Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-22 16:26:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

slight reorg for creating accounts from liveconfig

Browse Source
This commit is contained in:
holger krekel
2022-05-01 18:55:27 +02:00
parent f11c3dd3e3
commit a947980eb6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
python/src/deltachat/testplugin.py
View File

@@ -209,6 +209,7 @@ class ACFactory:
self.tmpdir = tmpdir self.tmpdir = tmpdir
self._liveconfig_producer = testprocess.get_liveconfig_producer() self._liveconfig_producer = testprocess.get_liveconfig_producer()
self.data = data self.data = data
self.testprocess = testprocess
self._finalizers = [] self._finalizers = []
self._accounts = [] self._accounts = []
@@ -290,30 +291,30 @@ class ACFactory:
return ac return ac
def get_online_configuring_account(self, **kwargs): def get_online_configuring_account(self, **kwargs):
ac = self.get_unconfigured_account()
configdict = self.get_next_liveconfig() configdict = self.get_next_liveconfig()
configdict.update(kwargs) configdict.update(kwargs)
self.prepare_account_with_liveconfig(ac, configdict) ac = self.prepare_account_from_liveconfig(configdict)
ac._configtracker = ac.configure() ac._configtracker = ac.configure()
return ac return ac
def prepare_account_with_liveconfig(self, ac, configdict): def prepare_account_from_liveconfig(self, configdict):
ac = self.get_unconfigured_account()
assert "addr" in configdict and "mail_pw" in configdict, configdict assert "addr" in configdict and "mail_pw" in configdict, configdict
configdict.setdefault("bcc_self", False) configdict.setdefault("bcc_self", False)
configdict.setdefault("mvbox_move", False) configdict.setdefault("mvbox_move", False)
configdict.setdefault("sentbox_watch", False) configdict.setdefault("sentbox_watch", False)
configdict.setdefault("displayname", os.path.basename(ac.db_path)) configdict.setdefault("displayname", os.path.basename(ac.db_path))
self._preconfigure_key(ac, configdict["addr"])
ac.update_config(configdict) ac.update_config(configdict)
self._preconfigure_key(ac, configdict["addr"])
return ac
def get_cloned_configuring_account(self, account): def get_cloned_configuring_account(self, account):
""" Clones addr, mail_pw, mvbox_move, sentbox_watch and the """ Clones addr, mail_pw, mvbox_move, sentbox_watch and the
direct_imap object of an online account. This simulates the user setting direct_imap object of an online account. This simulates the user setting
up a new device without importing a backup. up a new device without importing a backup.
""" """
ac = self.get_unconfigured_account()
# XXX we might want to transfer the key to the new account # XXX we might want to transfer the key to the new account
self.prepare_account_with_liveconfig(ac, dict( ac = self.prepare_account_from_liveconfig(dict(
addr=account.get_config("addr"), addr=account.get_config("addr"),
mail_pw=account.get_config("mail_pw"), mail_pw=account.get_config("mail_pw"),
)) ))
@@ -358,8 +359,7 @@ class ACFactory:
fn = module.__file__ fn = module.__file__
bot_cfg = self.get_next_liveconfig() bot_cfg = self.get_next_liveconfig()
bot_ac = self.get_unconfigured_account() bot_ac = self.prepare_account_from_liveconfig(bot_cfg)
self.prepare_account_with_liveconfig(bot_ac, bot_cfg)
# Avoid starting ac so we don't interfere with the bot operating on # Avoid starting ac so we don't interfere with the bot operating on
# the same database. # the same database.