From 479c4e012e24417bb70264ac5ee6427ec93ed0f0 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Sun, 13 Sep 2020 08:15:44 +0100 Subject: [PATCH] updates --- komrade/api/api.py | 16 ++++++++-------- komrade/api/persona.py | 4 ++-- komrade/api/persona0.py | 10 +++++----- komrade/backend/__init__.py | 2 +- komrade/backend/{people.py => komrades.py} | 12 ++++++------ komrade/cli/cli.py | 2 +- komrade/cli/cli0.py | 2 +- komrade/cli/cli_curses.py | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) rename komrade/backend/{people.py => komrades.py} (96%) diff --git a/komrade/api/api.py b/komrade/api/api.py index 435aaf0..6923413 100644 --- a/komrade/api/api.py +++ b/komrade/api/api.py @@ -19,7 +19,7 @@ from threading import Thread from pathlib import Path # local imports -from persona import * +from komrade import * CACHE_DIR = os.path.join(os.path.expanduser('~'),'.komrade','.cache') if not os.path.exists(CACHE_DIR): os.makedirs(CACHE_DIR) MEMCACHE_FNFN=os.path.join(CACHE_DIR,'.memory') @@ -223,7 +223,7 @@ class Api(object): self._keys = {} for key_name in key_names: self.log('key_name =',key_name) - self._keys[key_name] = Persona(key_name,api=self,create_if_missing=False) + self._keys[key_name] = Komrade(key_name,api=self,create_if_missing=False) # break into types self.accounts = [self._keys[name] for name in priv_key_names] @@ -240,13 +240,13 @@ class Api(object): #async def personate(self,persona_name,create_if_missing=True): - persona = Persona(persona_name,api=self,create_if_missing=create_if_missing) + komrade = Komrade(persona_name,api=self,create_if_missing=create_if_missing) res = persona.boot() self.log('personate() res =',res) return persona - # persona = self.keys[persona_name] if persona_name in self.keys else None - # if persona is None and create_if_missing: - # self.keys[persona_name] = persona = Persona(persona_name, api=self, create_if_missing=create_if_missing) + # komrade = self.keys[persona_name] if persona_name in self.keys else None + # if komrade is None and create_if_missing: + # self.keys[persona_name] = komrade = Komrade(persona_name, api=self, create_if_missing=create_if_missing) # res = await persona.boot() # self.log('BOOT RESULT:',res) # return persona @@ -372,7 +372,7 @@ class Api(object): from_name = b64decode(name_b64).decode() self.log('from_name =',from_name) timestamp = b64decode(time_b64).decode() - tmpP = Persona(from_name) + tmpP = Komrade(from_name) await tmpP.boot() from_pubkey_b64_accto_name = tmpP.pubkey_b64 assert from_pubkey_b64==from_pubkey_b64_accto_name @@ -394,7 +394,7 @@ class Api(object): async def refresh_inboxes(self): uris_to_get=[] - for persona in self.accounts: + for komrade in self.accounts: inbox = await persona.load_inbox(decrypt_msg_uri=True, last=LAST_N_IN_INBOX) for decr_msg_uri in inbox: uris_to_get.append(self.get_msg(decr_msg_uri)) diff --git a/komrade/api/persona.py b/komrade/api/persona.py index 0eef112..4c0fea1 100644 --- a/komrade/api/persona.py +++ b/komrade/api/persona.py @@ -17,7 +17,7 @@ class Model(Logger): pass class UserAlreadyExists(KomradeException): pass -class Persona(Model): +class Komrade(Model): def __init__(self, name, is_group=False): self.name = name self.is_group=is_group @@ -72,7 +72,7 @@ class Persona(Model): if __name__ == '__main__': import random idnum = random.choice(list(range(1000))) - persona = Persona('Op'+str(idnum)) + komrade = Komrade('Op'+str(idnum)) print('\n\n\nREGISTERING\n\n\n') persona.register(passphrase='bb') diff --git a/komrade/api/persona0.py b/komrade/api/persona0.py index e8a6b70..c427537 100644 --- a/komrade/api/persona0.py +++ b/komrade/api/persona0.py @@ -118,7 +118,7 @@ class NetworkStillConnectingError(OSError): pass -class Persona(object): +class Komrade(object): def __init__(self,name,api=None,node=None,create_if_missing=True): self.name=name @@ -657,7 +657,7 @@ class Persona(object): from_name = b64decode(name_b64).decode() self.log('from_name =',from_name) timestamp = b64decode(time_b64).decode() - tmpP = Persona(from_name) + tmpP = Komrade(from_name) await tmpP.boot() from_pubkey_b64_accto_name = tmpP.pubkey_b64 assert from_pubkey_b64==from_pubkey_b64_accto_name @@ -698,9 +698,9 @@ async def main(): await node.listen(PORT_LISTEN) await node.bootstrap(NODES_PRIME) - marx = Persona('marx',node=node) - elon = Persona('elon2',node=node) - world = Persona('world',node=node) + marx = Komrade('marx',node=node) + elon = Komrade('elon2',node=node) + world = Komrade('world',node=node) await world.boot() diff --git a/komrade/backend/__init__.py b/komrade/backend/__init__.py index b89e5e9..320b2be 100644 --- a/komrade/backend/__init__.py +++ b/komrade/backend/__init__.py @@ -15,7 +15,7 @@ from .callers import * from .phonelines import * from .messages import * -from .people import * +from .komrades import * ## define default entities OPERATOR = None diff --git a/komrade/backend/people.py b/komrade/backend/komrades.py similarity index 96% rename from komrade/backend/people.py rename to komrade/backend/komrades.py index a06f07c..4994ebb 100644 --- a/komrade/backend/people.py +++ b/komrade/backend/komrades.py @@ -3,7 +3,7 @@ from komrade import * from komrade.backend import * from komrade.backend.keymaker import * -class Persona(Caller): +class Komrade(Caller): def __init__(self, name=None, passphrase=DEBUG_DEFAULT_PASSPHRASE): super().__init__(name=name,passphrase=passphrase) @@ -30,7 +30,7 @@ class Persona(Caller): def exists_locally_as_contact(self): return self.pubkey and not self.privkey - def exists_locally_as_persona(self): + def exists_locally_as_Komrade(self): return self.pubkey and self.privkey def exists_on_server(self): @@ -139,14 +139,14 @@ def test_register(): import random num = random.choice(list(range(0,1000))) botname=f'marx{str(num).zfill(3)}' - marxbot = Persona(botname) - # marxbot=Persona() + marxbot = Komrade(botname) + # marxbot=Komrade() marxbot.register(passphrase='spectre') if __name__=='__main__': test_register() - # marx = Persona('marx') - # elon = Persona('elon') + # marx = Komrade('marx') + # elon = Komrade('elon') # marx.register() # # elon.register() diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py index 3e2da42..e977f2d 100644 --- a/komrade/cli/cli.py +++ b/komrade/cli/cli.py @@ -61,7 +61,7 @@ class CLI(Logger): self.status(None,) def register(self,dat): - self.persona = Persona(self.name) + self.komrade = Komrade(self.name) self.persona.register() diff --git a/komrade/cli/cli0.py b/komrade/cli/cli0.py index 1148ee1..e181aba 100644 --- a/komrade/cli/cli0.py +++ b/komrade/cli/cli0.py @@ -61,7 +61,7 @@ class CLI(Logger): self.status(None,) def register(self,dat): - self.persona = Persona(self.name) + self.komrade = Komrade(self.name) self.persona.register() diff --git a/komrade/cli/cli_curses.py b/komrade/cli/cli_curses.py index 08f0c54..3500782 100644 --- a/komrade/cli/cli_curses.py +++ b/komrade/cli/cli_curses.py @@ -124,7 +124,7 @@ class CLI(Logger): self.status(None,) def register(self,dat): - self.persona = Persona(self.name) + self.komrade = Komrade(self.name) self.persona.register()