mirror of
https://github.com/rwinkhart/sshyp.git
synced 2026-09-05 16:47:14 -04:00
Old files are now deleted from the server when renaming
This commit is contained in:
@@ -286,15 +286,19 @@ def sync(): # calls sshync to sync changes to the user's server
|
|||||||
for _file in _deletion_database:
|
for _file in _deletion_database:
|
||||||
if _file[:-1].endswith('/'):
|
if _file[:-1].endswith('/'):
|
||||||
try:
|
try:
|
||||||
|
if silent_sync != 1:
|
||||||
print(f"\u001b[38;5;208m{_file[:-1]}\u001b[0m has been sheared, removing...")
|
print(f"\u001b[38;5;208m{_file[:-1]}\u001b[0m has been sheared, removing...")
|
||||||
rmtree(f"{path.expanduser('~/.password-pasture/')}{_file[:-1]}")
|
rmtree(f"{path.expanduser('~/.password-pasture/')}{_file[:-1]}")
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
|
if silent_sync != 1:
|
||||||
print('Folder does not exist locally.')
|
print('Folder does not exist locally.')
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
|
if silent_sync != 1:
|
||||||
print(f"\u001b[38;5;208m{_file[:-1]}\u001b[0m has been sheared, removing...")
|
print(f"\u001b[38;5;208m{_file[:-1]}\u001b[0m has been sheared, removing...")
|
||||||
remove(f"{path.expanduser('~/.password-pasture/')}{_file[:-1]}.gpg")
|
remove(f"{path.expanduser('~/.password-pasture/')}{_file[:-1]}.gpg")
|
||||||
except (FileNotFoundError, IsADirectoryError):
|
except (FileNotFoundError, IsADirectoryError):
|
||||||
|
if silent_sync != 1:
|
||||||
print('File does not exist locally.')
|
print('File does not exist locally.')
|
||||||
# check for new folders
|
# check for new folders
|
||||||
system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"python -c 'import sshypRemote"
|
system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"python -c 'import sshypRemote"
|
||||||
@@ -366,7 +370,7 @@ def add_folder(): # creates a new folder
|
|||||||
f"{_folder_name}'\"")
|
f"{_folder_name}'\"")
|
||||||
|
|
||||||
|
|
||||||
def rename(): # renames an entry or folder TODO delete original from server to prevent re-downloading
|
def rename(): # renames an entry or folder
|
||||||
if argument == 'edit rename' or argument == 'edit relocate' or argument == 'edit -r':
|
if argument == 'edit rename' or argument == 'edit relocate' or argument == 'edit -r':
|
||||||
entry_list_gen()
|
entry_list_gen()
|
||||||
_entry_name = str(input('What would you like to rename/relocate? '))
|
_entry_name = str(input('What would you like to rename/relocate? '))
|
||||||
@@ -383,6 +387,8 @@ def rename(): # renames an entry or folder TODO delete original from server to
|
|||||||
f"{_new_name}'\"")
|
f"{_new_name}'\"")
|
||||||
else:
|
else:
|
||||||
move(f"{directory}{_entry_name}.gpg", f"{directory}{_new_name}.gpg")
|
move(f"{directory}{_entry_name}.gpg", f"{directory}{_new_name}.gpg")
|
||||||
|
system(f"ssh -i '{path.expanduser('~/.ssh/sshyp')}' -p {port} {username_ssh}@{ip} \"python -c 'import sshypRemote; "
|
||||||
|
f"sshypRemote.delete(\"'\"{_entry_name}\"'\")'\"")
|
||||||
|
|
||||||
|
|
||||||
def edit(): # edits the contents of an entry
|
def edit(): # edits the contents of an entry
|
||||||
@@ -538,6 +544,7 @@ def remove_data(): # deletes an entry from the server and flags it for local de
|
|||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
silent_sync = 0
|
||||||
# retrieve typed argument
|
# retrieve typed argument
|
||||||
argument_list, argument = argv, ''
|
argument_list, argument = argv, ''
|
||||||
del argument_list[0]
|
del argument_list[0]
|
||||||
@@ -601,6 +608,7 @@ if __name__ == "__main__":
|
|||||||
print('\n')
|
print('\n')
|
||||||
s_exit()
|
s_exit()
|
||||||
elif argument.startswith('edit rename') or argument.startswith('edit relocate') or argument.startswith('edit -r'):
|
elif argument.startswith('edit rename') or argument.startswith('edit relocate') or argument.startswith('edit -r'):
|
||||||
|
silent_sync = 1
|
||||||
try:
|
try:
|
||||||
rename()
|
rename()
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
|
|||||||
Reference in New Issue
Block a user