From 5dd6e7716cc7c32f516f0bf10a156dd81d070b2b Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Tue, 8 Sep 2020 08:26:49 +0100 Subject: [PATCH] updates --- komrade/backend/keymaker.py | 3 ++- komrade/backend/operators.py | 4 ++++ komrade/constants.py | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index db96b92..70e5f78 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -218,7 +218,7 @@ class Keymaker(Logger): keychain_toreturn[key]=keychain[key] return keychain_toreturn - def save_uri_as_qrcode(self,name=None,uri_id=None): + def save_uri_as_qrcode(self,name=None,uri_id=None,odir=None): if not uri_id: uri_id = get_random_id() + get_random_id() uri_id = self.uri_id if not uri_id and not self.uri_id: raise KomradeException('Need URI id to save!') @@ -226,6 +226,7 @@ class Keymaker(Logger): # gen import pyqrcode qr = pyqrcode.create(uri_id) + if not odir: odir = PATH_QRCODES ofnfn = os.path.join(PATH_QRCODES,self.name+'.png') qr.png(ofnfn,scale=10) self.log('>> saved:',ofnfn) diff --git a/komrade/backend/operators.py b/komrade/backend/operators.py index 247fb25..72baca8 100644 --- a/komrade/backend/operators.py +++ b/komrade/backend/operators.py @@ -431,9 +431,13 @@ def create_phonelines(): ) # store URIs + op.save_uri_as_qrcode(odir=PATH_OPERATOR_WEB_CONTACTS_DIR) op.save_uri_as_qrcode() + + phone.save_uri_as_qrcode(odir=PATH_OPERATOR_WEB_CONTACTS_DIR) phone.save_uri_as_qrcode() + ## store remote keys THIRD_PARTY_DICT = {OPERATOR_NAME:{}, TELEPHONE_NAME:{}} for key in op_keys_to_keep_on_3rdparty: diff --git a/komrade/constants.py b/komrade/constants.py index 20efeca..23d158d 100644 --- a/komrade/constants.py +++ b/komrade/constants.py @@ -133,6 +133,7 @@ TELEPHONE = None PATH_OPERATOR_WEB_KEYS_FILE = f'/home/ryan/www/website-komrade/.builtin.keys' PATH_OPERATOR_WEB_KEYS_URL = f'http://{KOMRADE_URL}/.builtin.keys' +PATH_OPERATOR_WEB_CONTACTS_DIR = '/home/ryan/www/website-komrade/.contacts'