From 79a2f1d7e7922de531b7f0d898bc2ada49ae1e83 Mon Sep 17 00:00:00 2001 From: zeroGRMh Date: Mon, 28 Jul 2025 15:25:42 +0300 Subject: [PATCH] deleted dependency on '.jpeg' extension --- src/Backend/ISwork.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/Backend/ISwork.py b/src/Backend/ISwork.py index d05dbd4..18f1452 100644 --- a/src/Backend/ISwork.py +++ b/src/Backend/ISwork.py @@ -13,19 +13,28 @@ def _setClient(): ) return minio_client -def getNumberofObjects(client, currentDay, bucket_name): - objects = client.list_objects(bucket_name, prefix=currentDay+'/') +def getNumberofObjects(client, currentDay): + objects = client.list_objects(config.bucket_name, prefix=currentDay+'/') return sum(1 for _ in objects) -def getImageName(currentDay, client): - maxFiles = getNumberofObjects(client, currentDay, config.bucket_name) +def getObjectExtension(client, currentDay, fileNumber): + objects = client.list_objects(config.bucket_name, prefix=currentDay+'/') + for counter, obj in enumerate(objects, start=1): + if counter == fileNumber: + return obj.object_name.split('.')[-1] + +def getFileNames(currentDay, client, username): + maxFiles = getNumberofObjects(client, currentDay) fileNumber = randint(1, maxFiles) - desiredFile = currentDay + '/' + str(fileNumber) + '.jpeg' - return desiredFile + fileExtension = getObjectExtension(client, currentDay, fileNumber) + desiredFile = currentDay + '/' + str(fileNumber) + '.' + fileExtension + downloadName = username + '.' + fileExtension + return desiredFile, downloadName def downloadImage(currentDay, username): client = _setClient() - client.fget_object(config.bucket_name, getImageName(currentDay, client), username + '.jpeg') + object_name, file_name = getFileNames(currentDay, client, username) + client.fget_object(config.bucket_name, object_name, file_name) def downloadForAll(currentDay): cur, conn = DBwork.set_connection()