kev/Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

handle keyboardinterrupt, eof and blank file path in interactive ui

Browse Source
This commit is contained in:
Kevin Froman 2019-06-16 01:30:17 -05:00
parent 8bbf9b10ab
commit 934602ee09
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
onionr/static-data/default-plugins/cliui/main.py
View File

@ -39,8 +39,6 @@ class OnionrCLIUI:
def subCommand(self, command, args=None): def subCommand(self, command, args=None):
try: try:
#subprocess.run(["./onionr.py", command])
#subprocess.Popen(['./onionr.py', command], stdin=subprocess.STD, stdout=subprocess.STDOUT, stderr=subprocess.STDOUT)
if args != None: if args != None:
subprocess.call(['./onionr.py', command, args]) subprocess.call(['./onionr.py', command, args])
else: else:
@ -89,8 +87,13 @@ class OnionrCLIUI:
else: else:
print('Plugin not enabled') print('Plugin not enabled')
elif choice in ("3", "file sharing", "file"): elif choice in ("3", "file sharing", "file"):
filename = input("Enter full path to file: ").strip() try:
self.subCommand("addfile", filename) filename = input("Enter full path to file: ").strip()
except (EOFError, KeyboardInterrupt) as e:
pass
else:
if len(filename.strip()) > 0:
self.subCommand("addfile", filename)
elif choice in ("4", "quit"): elif choice in ("4", "quit"):
showMenu = False showMenu = False
self.shutdown = True self.shutdown = True