mirror of
https://github.com/rwinkhart/sshyp.git
synced 2026-09-02 23:27:17 -04:00
Optimized usage of str.split(), use str.splitlines() where applicable
Former-commit-id: ef4dbc238eb361170b5e9ec06fd337a34082b53e [formerly 2f738a4e89]
Former-commit-id: 439398077bf543f0fc37f5ea01340a224761d9eb
This commit is contained in:
+3
-3
@@ -69,9 +69,9 @@ def remote_list_fetch(_user_data): # captures and returns all necessary data fr
|
|||||||
print('\n\u001b[38;5;9merror: failed to connect to the remote server\u001b[0m\n')
|
print('\n\u001b[38;5;9merror: failed to connect to the remote server\u001b[0m\n')
|
||||||
_remote_data = ''
|
_remote_data = ''
|
||||||
s_exit(6)
|
s_exit(6)
|
||||||
_deletion_database = _remote_data[0].strip().split('\n')
|
_deletion_database = _remote_data[0].strip().splitlines()
|
||||||
_folder_database = _remote_data[1].strip().split('\n')
|
_folder_database = _remote_data[1].strip().splitlines()
|
||||||
_titles_mods = _remote_data[2].strip().split('\n')
|
_titles_mods = _remote_data[2].strip().splitlines()
|
||||||
return _deletion_database, _folder_database, _titles_mods[:len(_titles_mods)//2], \
|
return _deletion_database, _folder_database, _titles_mods[:len(_titles_mods)//2], \
|
||||||
_titles_mods[len(_titles_mods)//2:]
|
_titles_mods[len(_titles_mods)//2:]
|
||||||
|
|
||||||
|
|||||||
+6
-6
@@ -87,7 +87,7 @@ def entry_name_fetch(_entry_name_location): # fetches and returns entry name fr
|
|||||||
entry_list_gen()
|
entry_list_gen()
|
||||||
_entry_name = str(input(_entry_name_location))
|
_entry_name = str(input(_entry_name_location))
|
||||||
else:
|
else:
|
||||||
_entry_name_split = argument.split(' ')
|
_entry_name_split = argument.split()
|
||||||
del _entry_name_split[:_entry_name_location]
|
del _entry_name_split[:_entry_name_location]
|
||||||
_entry_name = ' '.join(_entry_name_split)
|
_entry_name = ' '.join(_entry_name_split)
|
||||||
if _entry_name.startswith('/'):
|
if _entry_name.startswith('/'):
|
||||||
@@ -270,7 +270,7 @@ def tweak(): # runs configuration wizard
|
|||||||
'Name-Comment: gpg-sshyp\n', 'Name-Email: https://github.com/rwinkhart/sshyp\n', 'Expire-Date: 0'])
|
'Name-Comment: gpg-sshyp\n', 'Name-Email: https://github.com/rwinkhart/sshyp\n', 'Expire-Date: 0'])
|
||||||
run(['gpg', '--batch', '--generate-key', expanduser('~/.config/sshyp/gpg-gen')])
|
run(['gpg', '--batch', '--generate-key', expanduser('~/.config/sshyp/gpg-gen')])
|
||||||
remove(expanduser('~/.config/sshyp/gpg-gen'))
|
remove(expanduser('~/.config/sshyp/gpg-gen'))
|
||||||
_sshyp_data.append(run(['gpg', '-k'], stdout=PIPE, text=True).stdout.split('\n')[-4].strip())
|
_sshyp_data.append(run(['gpg', '-k'], stdout=PIPE, text=True).stdout.splitlines()[-3].strip())
|
||||||
|
|
||||||
# text editor configuration
|
# text editor configuration
|
||||||
_sshyp_data.append(input(f"{_divider}example input: vim\n\npreferred text editor: "))
|
_sshyp_data.append(input(f"{_divider}example input: vim\n\npreferred text editor: "))
|
||||||
@@ -489,7 +489,7 @@ def sync(): # calls sshync to sync changes to the user's server
|
|||||||
print('\nsyncing entries with the server device...\n')
|
print('\nsyncing entries with the server device...\n')
|
||||||
# set permissions before uploading
|
# set permissions before uploading
|
||||||
for _root, _dirs, _files in walk(expanduser('~/.local/share/sshyp')):
|
for _root, _dirs, _files in walk(expanduser('~/.local/share/sshyp')):
|
||||||
for _path in _root.split('\n'):
|
for _path in _root.splitlines():
|
||||||
chmod(_path, 0o700)
|
chmod(_path, 0o700)
|
||||||
for _file in _files:
|
for _file in _files:
|
||||||
chmod(_root + '/' + _file, 0o600)
|
chmod(_root + '/' + _file, 0o600)
|
||||||
@@ -521,7 +521,7 @@ def whitelist_setup(): # takes input from the user to set up quick-unlock passw
|
|||||||
run(['gpg', '-q', '--pinentry-mode', 'loopback', '--batch', '--generate-key', '--passphrase',
|
run(['gpg', '-q', '--pinentry-mode', 'loopback', '--batch', '--generate-key', '--passphrase',
|
||||||
_quick_unlock_password, expanduser('~/.config/sshyp/gpg-gen')])
|
_quick_unlock_password, expanduser('~/.config/sshyp/gpg-gen')])
|
||||||
remove(expanduser('~/.config/sshyp/gpg-gen'))
|
remove(expanduser('~/.config/sshyp/gpg-gen'))
|
||||||
_gpg_id = run(['gpg', '-k'], stdout=PIPE, text=True).stdout.split('\n')[-4].strip()
|
_gpg_id = run(['gpg', '-k'], stdout=PIPE, text=True).stdout.splitlines()[-3].strip()
|
||||||
|
|
||||||
# encrypt excluded with the assembly key
|
# encrypt excluded with the assembly key
|
||||||
_shm_folder, _shm_entry = shm_gen()
|
_shm_folder, _shm_entry = shm_gen()
|
||||||
@@ -540,7 +540,7 @@ def whitelist_verify(_port, _username_ssh, _ip, _client_device_id):
|
|||||||
_i, _full_password = 0, ''
|
_i, _full_password = 0, ''
|
||||||
_server_whitelist = run(['ssh', '-i', expanduser('~/.ssh/sshyp'), '-p', _port, f"{_username_ssh}@{_ip}",
|
_server_whitelist = run(['ssh', '-i', expanduser('~/.ssh/sshyp'), '-p', _port, f"{_username_ssh}@{_ip}",
|
||||||
f'python3 -c \'from os import listdir; print(*listdir("/home/{_username_ssh}'
|
f'python3 -c \'from os import listdir; print(*listdir("/home/{_username_ssh}'
|
||||||
f'/.config/sshyp/whitelist"))\''], stdout=PIPE, text=True).stdout.rstrip().split(' ')
|
f'/.config/sshyp/whitelist"))\''], stdout=PIPE, text=True).stdout.rstrip().split()
|
||||||
for _device_id in _server_whitelist:
|
for _device_id in _server_whitelist:
|
||||||
if _device_id == _client_device_id:
|
if _device_id == _client_device_id:
|
||||||
from getpass import getpass
|
from getpass import getpass
|
||||||
@@ -581,7 +581,7 @@ def whitelist_manage(): # adds or removes quick-unlock whitelisted device ids
|
|||||||
whitelist_list()
|
whitelist_list()
|
||||||
_device_id = input('device id: ')
|
_device_id = input('device id: ')
|
||||||
else:
|
else:
|
||||||
_argument_split = argument.split(' ')
|
_argument_split = argument.split()
|
||||||
del _argument_split[:2]
|
del _argument_split[:2]
|
||||||
_device_id = ' '.join(_argument_split)
|
_device_id = ' '.join(_argument_split)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user