From eb4982f94a881db60402681ee1a6be708f27988c Mon Sep 17 00:00:00 2001 From: poka Date: Tue, 24 Nov 2020 07:42:47 +0100 Subject: [PATCH] rearranging files --- dialog.py | 2 +- lib/cesiumMessaging.py | 5 +++-- natools.py => lib/natools.py | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename natools.py => lib/natools.py (100%) diff --git a/dialog.py b/dialog.py index d7c8434..a4c97d5 100755 --- a/dialog.py +++ b/dialog.py @@ -6,7 +6,7 @@ from shutil import copyfile from dotenv import load_dotenv from lib.cesiumMessaging import ReadFromCesium, SendToCesium, DeleteFromCesium, VERSION -# Get varriables environment +# Get variables environment if not os.path.isfile('.env'): copyfile(".env.template", ".env") dotenv_path = join(dirname(__file__), '.env') diff --git a/lib/cesiumMessaging.py b/lib/cesiumMessaging.py index 5ce1403..0c66a83 100755 --- a/lib/cesiumMessaging.py +++ b/lib/cesiumMessaging.py @@ -1,15 +1,16 @@ #!/usr/bin/env python3 import os, sys, ast, requests, json, base58, base64, time, string, random, re -from natools import fmt, sign, get_privkey, box_decrypt, box_encrypt +from lib.natools import fmt, sign, get_privkey, box_decrypt, box_encrypt from hashlib import sha256 from datetime import datetime from termcolor import colored -VERSION = "0.1" +VERSION = "0.1.1" PUBKEY_REGEX = "(?![OIl])[1-9A-Za-z]{42,45}" def pp_json(json_thing, sort=True, indents=4): + # Print beautifull JSON if type(json_thing) is str: print(json.dumps(json.loads(json_thing), sort_keys=sort, indent=indents)) else: diff --git a/natools.py b/lib/natools.py similarity index 100% rename from natools.py rename to lib/natools.py