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

Fix log messages

Browse Source
This commit is contained in:
Tobias Eidelpes 2021-01-08 13:12:34 +01:00
parent 9a6e2d3ca8
commit 6ad99561e7
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,14 +70,14 @@ class DropboxService(StorageServiceInterface):
while True: while True:
try: try:
dbx = dropbox.Dropbox(settings.DROPBOX_OAUTH2_ACCESS_TOKEN) dbx = dropbox.Dropbox(settings.DROPBOX_OAUTH2_ACCESS_TOKEN)
print("DropboxService: Checking if version %s exists".format(identifier + '_' + str(i) + '.jpg')) print("DropboxService: Checking if version {} exists".format(identifier + '_' + str(i) + '.jpg'))
dbx.files_get_metadata(identifier + '_' + str(i) + '.jpg') dbx.files_get_metadata(identifier + '_' + str(i) + '.jpg')
i = i + 1 i = i + 1
except: except:
print("DropboxService: Version %s exists".format(identifier + '_' + str(i) + '.jpg')) print("DropboxService: Version {} exists".format(identifier + '_' + str(i) + '.jpg'))
break break
print("DropboxService: Creating new version %s".format(identifier + '_' + str(i) + '.jpg')) print("DropboxService: Creating new version {}".format(identifier + '_' + str(i) + '.jpg'))
return DropboxService.create_file(identifier + '_' + str(i) + '.jpg', file) return DropboxService.create_file(identifier + '_' + str(i) + '.jpg', file)
@staticmethod @staticmethod

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

@ -59,14 +59,14 @@ class MinioService(StorageServiceInterface):
try: try:
headers = {'Content-Type': 'binary/octet-stream'} headers = {'Content-Type': 'binary/octet-stream'}
i = 0 i = 0
while MinioService.read_file(identifier + '_' + str(i) + '.jpg') is not False: while MinioService.read_file(identifier + '_' + str(i) + '.jpg') is not None:
print("MinioService: Version %s exists".format(identifier + '_' + str(i) + '.jpg')) print("MinioService: Version {} exists".format(identifier + '_' + str(i) + '.jpg'))
i = i + 1 i = i + 1
print("MinioService: Creating new version %s".format(identifier + '_' + str(i) + '.jpg')) print("MinioService: Creating new version {}".format(identifier + '_' + str(i) + '.jpg'))
url = settings.AWS_HOST + identifier + '_' + str(i) + '.jpg' url = settings.AWS_HOST + identifier + '_' + str(i) + '.jpg'
r = requests.put(url, data=file, headers=headers) r = requests.put(url, data=file, headers=headers)
if r.status_code == 200: if r.status_code == 200:
print("Successfully uploaded a new version with filename %s!".format(identifier + '_' + str(i) + '.jpg')) print("Successfully uploaded a new version with filename {}!".format(identifier + '_' + str(i) + '.jpg'))
else: else:
print("Something went wrong while updating") print("Something went wrong while updating")
except: except:

6
middleware/app_be/services/mongodbservice.py
View File

@ -78,15 +78,15 @@ class MongoDBService:
i = 0 i = 0
while MongoDBService.getSingle(identifier + '_' + str(i)) is not None: while MongoDBService.getSingle(identifier + '_' + str(i)) is not None:
print("MongoDBService: Version %s exists".format(identifier + '_' + str(i))) print("MongoDBService: Version {} exists".format(identifier + '_' + str(i)))
i = i + 1 i = i + 1
if i == 0: if i == 0:
print("MongoDBService: Creating new version with identifier %s".format(identifier + '_' + str(i))) print("MongoDBService: Creating new version with identifier {}".format(identifier + '_' + str(i)))
MongoDBService.createSingle(resp, identifier + '_' + str(i), decoded_image) MongoDBService.createSingle(resp, identifier + '_' + str(i), decoded_image)
else: else:
resp = MongoDBService.getSingle(identifier + '_' + str(i - 1)) resp = MongoDBService.getSingle(identifier + '_' + str(i - 1))
print("MongoDBService: Creating new version with identifier %s".format(identifier + '_' + str(i - 1))) print("MongoDBService: Creating new version with identifier {}".format(identifier + '_' + str(i - 1)))
MongoDBService.createSingle(resp, identifier + '_' + str(i), decoded_image) MongoDBService.createSingle(resp, identifier + '_' + str(i), decoded_image)
return True return True