mirrors/py-kms
1
0
Fork 0
mirror of https://github.com/Py-KMS-Organization/py-kms.git synced 2025-05-17 08:35:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Pretty-print added strings get and put

Browse source
This commit is contained in:
Matteo ℱan 2019-10-07 23:30:23 +02:00
parent 328dcedea2
commit bc9365f791
2 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
py-kms/pykms_Format.py
View file

@ -120,7 +120,7 @@ MsgMap = {0 : {'text' : "{yellow}\n\t\t\tClient generating RPC Bind Request...{
-2 : {'text' : "{white}\n\n\t\t\t\t\t\t\t\tClient sending{end}", 'where' : "srv"}, -2 : {'text' : "{white}\n\n\t\t\t\t\t\t\t\tClient sending{end}", 'where' : "srv"},
-3 : {'text' : "{white}\t\t\t\t\t\t\t\tClient receiving{end}", 'where' : "srv"}, -3 : {'text' : "{white}\t\t\t\t\t\t\t\tClient receiving{end}", 'where' : "srv"},
-4 : {'text' : "{white}\n\nServer sending{end}", 'where' : "clt"}, -4 : {'text' : "{white}\n\nServer sending{end}", 'where' : "clt"},
30 : {'text' : "{red}{bold}\nServer connection timed out. Exiting...{end}", 'where' : "srv"} 30 : {'text' : "{red}{bold}Server connection timed out. Exiting...{end}", 'where' : "srv"}
} }
@ -171,9 +171,12 @@ class ShellMessage(object):
StringIO.write(self, s) StringIO.write(self, s)
class Process(object): class Process(object):
def __init__(self, nshell): def __init__(self, nshell, get_text = False, put_text = None):
self.nshell = nshell self.nshell = nshell
self.print_queue = Queue.Queue() self.print_queue = Queue.Queue()
self.get_text = get_text
self.plaintext = []
self.put_text = put_text
def run(self): def run(self):
if not ShellMessage.view: if not ShellMessage.view:
@ -193,6 +196,9 @@ class ShellMessage(object):
gui_redirect(toprint) gui_redirect(toprint)
except: except:
print(toprint) print(toprint)
# Get string/s printed.
if self.get_text:
return self.plaintext
def spawn(self): def spawn(self):
# Save everything that would otherwise go to stdout. # Save everything that would otherwise go to stdout.
@ -201,11 +207,16 @@ class ShellMessage(object):
try: try:
# Print something. # Print something.
if isinstance(self.nshell, list): if not isinstance(self.nshell, list):
for n in self.nshell: self.nshell = [self.nshell]
print(MsgMap[n]['text'].format(**ColorExtraMap), flush = True) for n in self.nshell:
else: if self.put_text is None:
print(MsgMap[self.nshell]['text'].format(**ColorExtraMap), flush = True) msg = MsgMap[n]['text'].format(**ColorExtraMap)
else:
msg = MsgMap[n]['text'].format(*self.put_text, **ColorExtraMap)
print(msg, flush = True)
if self.get_text:
self.plaintext.append(unshell_message(msg, m = 0)[0]["tag00"]['text'])
finally: finally:
# Restore stdout and send content. # Restore stdout and send content.
sys.stdout = sys.__stdout__ sys.stdout = sys.__stdout__

4
py-kms/pykms_Server.py
View file

@ -36,8 +36,8 @@ class KeyServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
allow_reuse_address = True allow_reuse_address = True
def handle_timeout(self): def handle_timeout(self):
ShellMessage.Process([30]).run() errmsg = ShellMessage.Process(30, get_text = True).run()
loggersrv.error("Server connection timed out. Exiting...") loggersrv.error(errmsg[0])
sys.exit(1) sys.exit(1)
class server_thread(threading.Thread): class server_thread(threading.Thread):