zenon/federated-storage
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug where old image was not saved on AWS

Browse Source
This commit is contained in:
Tobias Eidelpes 2021-01-18 17:26:24 +01:00
parent 6f7936cc4b
commit d500518d8f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
middleware/app_be/services/dropboxservice.py
View File

@ -70,7 +70,7 @@ class DropboxService(StorageServiceInterface):
return file_bytes return file_bytes
@staticmethod @staticmethod
def move_file(identifier_from: str, identifier_to: str, file: bytes = None) -> bool: def move_file(identifier_from: str, identifier_to: str) -> bool:
"""Move/Rename a file on the dropbox storage. """Move/Rename a file on the dropbox storage.
:param identifier_from: Location of the file to be moved :param identifier_from: Location of the file to be moved

4
middleware/app_be/services/minioservice.py
View File

@ -66,7 +66,7 @@ class MinioService(StorageServiceInterface):
return True return True
@staticmethod @staticmethod
def move_file(identifier_from: str, identifier_to: str, file: bytes) -> bool: def move_file(identifier_from: str, identifier_to: str) -> bool:
"""Move/Rename a file on the S3 storage. """Move/Rename a file on the S3 storage.
Consists of a PUT method (copying the object) and a delete method. Consists of a PUT method (copying the object) and a delete method.
@ -79,6 +79,8 @@ class MinioService(StorageServiceInterface):
filename_from = identifier_from + '.jpg' filename_from = identifier_from + '.jpg'
filename_to = identifier_to filename_to = identifier_to
file = MinioService.read_file(filename_from)
if not MinioService.delete_file(filename_from): if not MinioService.delete_file(filename_from):
print("MinioService: Updating (delete) file {} failed".format(filename_from)) print("MinioService: Updating (delete) file {} failed".format(filename_from))
return False return False

5
middleware/app_be/views/rest_api.py
View File

@ -238,12 +238,9 @@ class ImageEndpoint:
MongoDBService.updateSingle(identifier, decoded_image, metadata) MongoDBService.updateSingle(identifier, decoded_image, metadata)
# TODO TOBIAS get old image for MinIO
old_bytes = None
for service in ImageEndpoint.storageServiceList: for service in ImageEndpoint.storageServiceList:
orig_new_name = identifier + '_' + str(metadata['version']) + '.jpg' orig_new_name = identifier + '_' + str(metadata['version']) + '.jpg'
if not service.move_file(identifier, orig_new_name, old_bytes): if not service.move_file(identifier, orig_new_name):
print("Could not move file from {} to {}".format(identifier, orig_new_name)) print("Could not move file from {} to {}".format(identifier, orig_new_name))
if not service.create_file(filename, decoded_image): if not service.create_file(filename, decoded_image):
print("Could not save updated image to " + service.name) print("Could not save updated image to " + service.name)