GitHubMirror/sshyp
1
0
Fork 0
mirror of https://github.com/rwinkhart/sshyp.git synced 2026-09-03 07:37:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Re-separate server and client arguments

Browse Source 
Former-commit-id: 6e76d9689c18d886c502008768fa65842896e02e [formerly beab695605]
Former-commit-id: ecbe41716fe817a81883f8006c4be5071ce974e7
This commit is contained in:
RandyTheSilly
2023-02-25 03:04:37 -05:00
parent e511159a6c
commit ccee566a22
1 changed files with 44 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sshyp.py
+44 -50
View File
@@ -831,65 +831,59 @@ if __name__ == "__main__":
s_exit() s_exit()
# run function based on arguments # run function based on arguments
if arg_count < 1: if device_type == 'client':
no_arg() if arg_count < 1:
no_arg()
elif (arg_count == 2 and arg_start == 0) or (arg_count == 3 and arg_start == 1): elif (arg_count == 2 and arg_start == 0) or (arg_count == 3 and arg_start == 1):
if arguments[arg_start] == 'copy': if arguments[arg_start] == 'copy':
if arguments[arg_start_p] == 'username' or arguments[arg_start_p] == '-u' or arguments[arg_start_p] == \ if arguments[arg_start_p] in ['username', '-u', 'password', '-p', 'url', '-l', 'note', '-n']: # TODO use 'in' syntax more broadly
'password' or arguments[arg_start_p] == '-p' or arguments[arg_start_p] == 'url' or arguments[ try:
arg_start_p] == '-l' or arguments[arg_start_p] == 'note' or arguments[arg_start_p] == '-n': success_flag = 1
try: copy_data()
except IndexError:
print(f"\n\u001b[38;5;9merror: field does not exist in entry\u001b[0m\n")
s_exit(2)
elif arguments[arg_start] == 'add':
if arguments[arg_start_p] in ['note', '-n', 'password', '-p']:
success_flag, sync_flag = True, True
add_entry()
elif arguments[arg_start_p] == 'folder' or arguments[arg_start_p] == '-f':
success_flag = 1 success_flag = 1
copy_data() add_folder()
except IndexError: elif arguments[arg_start] == 'edit':
print(f"\n\u001b[38;5;9merror: field does not exist in entry\u001b[0m\n") if arguments[arg_start_p] in ['rename', 'relocate', '-r']:
s_exit(2) success_flag, sync_flag, silent_sync = True, True, True
elif arguments[arg_start] == 'add': rename()
if arguments[arg_start_p] == 'note' or arguments[arg_start_p] == '-n' or arguments[arg_start_p] == \ elif arguments[arg_start_p] in ['username', '-u', 'password', '-p', 'url', '-l', 'note', '-n']:
'password' or arguments[arg_start_p] == '-p': success_flag, sync_flag = True, True
edit()
elif arguments[arg_start] == 'gen' and arguments[arg_start_p] in ['update', '-u']:
success_flag, sync_flag = True, True success_flag, sync_flag = True, True
add_entry() gen()
elif arguments[arg_start_p] == 'folder' or arguments[arg_start_p] == '-f':
success_flag = 1 elif arg_count == 1 or (arg_count == 2 and arg_start == 1):
add_folder() if arg_count == 1 and arg_start == 1:
elif arguments[arg_start] == 'edit': success_flag = True
if arguments[arg_start_p] == 'rename' or arguments[arg_start_p] == 'relocate' or \ read_shortcut()
arguments[arg_start_p] == '-r': elif arguments[arg_start] == 'gen':
success_flag, sync_flag, silent_sync = True, True, True
rename()
elif arguments[arg_start_p] == 'username' or arguments[arg_start_p] == '-u' or arguments[arg_start_p] \
== 'password' or arguments[arg_start_p] == '-p' or arguments[arg_start_p] == 'url' or \
arguments[arg_start_p] == '-l' or arguments[arg_start_p] == 'note' or arguments[arg_start_p] ==\
'-n':
success_flag, sync_flag = True, True success_flag, sync_flag = True, True
edit() gen()
elif arguments[arg_start] == 'gen' and (arguments[arg_start_p] == 'update' or elif arguments[arg_start] == 'shear':
arguments[arg_start_p] == '-u'): success_flag, sync_flag = True, True
success_flag, sync_flag = True, True remove_data()
gen()
elif device_type == 'server' and arguments[arg_start] == 'whitelist': else: # server arguments
if arg_count == 1 and arguments[arg_start_p] == 'setup':
success_flag = True
whitelist_setup()
elif arg_count > 1 and arguments[arg_start] == 'whitelist':
if arguments[arg_start_p] == 'list' or arguments[arg_start_p] == '-l': if arguments[arg_start_p] == 'list' or arguments[arg_start_p] == '-l':
success_flag = True success_flag = True
whitelist_list() whitelist_list()
elif arguments[arg_start_p] == 'add' or arguments[arg_start_p] == 'delete' or arguments[arg_start_p] \ elif arguments[arg_start_p] in ['add', 'delete', 'del']:
== 'del':
success_flag = True success_flag = True
whitelist_manage() whitelist_manage()
elif arguments[arg_start_p] == 'setup':
success_flag = True
whitelist_setup()
elif arg_count == 1 or (arg_count == 2 and arg_start == 1):
if arg_count == 1 and arg_start == 1:
success_flag = True
read_shortcut()
elif arguments[arg_start] == 'gen':
success_flag, sync_flag = True, True
gen()
elif arguments[arg_start] == 'shear':
success_flag, sync_flag = True, True
remove_data()
if success_flag == 0 and arguments[0] != 'sync': if success_flag == 0 and arguments[0] != 'sync':
print_info() print_info()