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

Removed redundant code from optimized_edit, renamed to line_edit

Browse Source 
Former-commit-id: 6fc1642909392c5c1f2f7e4602fd499ceff9d6a4
Former-commit-id: 9dd02b390893cb6239717ab886534a24bc3ea618
This commit is contained in:
RandyTheSilly
2023-06-20 11:12:30 -04:00
parent 7972040d5d
commit 05e9bcc478
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sshyp.py
+5 -12
View File
@@ -246,19 +246,12 @@ def target_type_check(_target_name, _expected_type=True, _error=False):
# ensures an edited entry is optimized for best compatibility # ensures an edited entry is optimized for best compatibility
def optimized_edit(_lines, _edit_data, _edit_line): def line_edit(_lines, _edit_data, _edit_line):
# ensure enough lines are present for edited field
while len(_lines) < _edit_line + 1: while len(_lines) < _edit_line + 1:
_lines.append('\n') _lines.append('\n')
if _edit_data is not None: # write the edited field
_lines[_edit_line] = _edit_data.rstrip() _lines[_edit_line] = _edit_data.rstrip()
for _num in reversed(range(len(_lines))):
if _lines[_num] == '\n':
_lines = _lines[:-1]
elif _lines[_num].endswith('\n'):
_lines[_num] = _lines[_num].rstrip()
break
else:
break
return _lines return _lines
@@ -488,7 +481,7 @@ def edit():
_old_lines = decrypt(directory + entry_name, _quick_verify=quick_unlock_enabled) _old_lines = decrypt(directory + entry_name, _quick_verify=quick_unlock_enabled)
_new_lines = _old_lines[0:3] + edit_note(_old_lines[3:], True).split('\n') _new_lines = _old_lines[0:3] + edit_note(_old_lines[3:], True).split('\n')
else: else:
_new_lines = optimized_edit(decrypt(directory + entry_name, _quick_verify=quick_unlock_enabled), _detail, _new_lines = line_edit(decrypt(directory + entry_name, _quick_verify=quick_unlock_enabled), _detail,
_edit_line) _edit_line)
print('\n\u001b[1mentry preview:\u001b[0m') print('\n\u001b[1mentry preview:\u001b[0m')
entry_reader(_new_lines) entry_reader(_new_lines)
@@ -503,7 +496,7 @@ def gen():
if arg_count == 3 and arguments[2] in ('update', '-u'): if arg_count == 3 and arguments[2] in ('update', '-u'):
# ensure the gen update target is an entry # ensure the gen update target is an entry
target_type_check(entry_name, True, True) target_type_check(entry_name, True, True)
_new_lines = optimized_edit(decrypt(directory + entry_name, _quick_verify=quick_unlock_enabled), pass_gen(), 0) _new_lines = line_edit(decrypt(directory + entry_name, _quick_verify=quick_unlock_enabled), pass_gen(), 0)
# gen # gen
else: else:
# make sure the gen target does not already exist # make sure the gen target does not already exist
lib/stweak.py
+1 -1
View File
@@ -251,7 +251,7 @@ def refresh_encryption():
from os import walk from os import walk
from os.path import isdir from os.path import isdir
from shutil import move, rmtree from shutil import move, rmtree
from sshyp import decrypt, encrypt, optimized_edit from sshyp import decrypt, encrypt
# remove existing conflicts # remove existing conflicts
for _extension in ('.new', '.old'): for _extension in ('.new', '.old'):