From a275daa499eebda4863cba6abbb4d4e8c0183a20 Mon Sep 17 00:00:00 2001 From: shana-git Date: Sat, 21 Sep 2024 20:55:37 +0300 Subject: [PATCH 1/3] added correct path --- DB/NEW_KT_DB/DataAccess/ObjectManager.py | 4 +++ .../Controller/MultipartUploadController.py | 28 +++++++++++++++++++ .../DataAccess/ObjectManager.py | 4 +++ 3 files changed, 36 insertions(+) diff --git a/DB/NEW_KT_DB/DataAccess/ObjectManager.py b/DB/NEW_KT_DB/DataAccess/ObjectManager.py index 58dcc4cb..de09bea9 100644 --- a/DB/NEW_KT_DB/DataAccess/ObjectManager.py +++ b/DB/NEW_KT_DB/DataAccess/ObjectManager.py @@ -1,6 +1,10 @@ from typing import Dict, Any, Optional import json import sqlite3 +import os +import sys +sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..','..','..'))) + from DB.NEW_KT_DB.DataAccess.DBManager import DBManager diff --git a/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py b/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py index 14aaed49..6bbbe95b 100644 --- a/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py +++ b/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py @@ -31,4 +31,32 @@ def complete_upload(self, upload_id: str, bucket_name: str = None, object_key: s """ return self.service.complete_upload(upload_id, bucket_name, object_key) +if __name__ == "__main__": + db_file = "my_db.db" + storage_path = "C:/Users/shana/Desktop/a" + + controller = MultipartUploadController(db_file, storage_path) + + # Initiates the upload + bucket_name = "my_bucket" + object_key = "my_file_shana-6.txt" + upload_id = controller.initiate_upload(bucket_name, object_key) + print(f"Upload ID: {upload_id}") + + # # Uploads the file parts + # controller.service.upload_part(upload_id, 1, "aaaa") + # controller.service.upload_part(upload_id, 2, "bbbb") + file_path = "C:/Users/shana/Desktop/a/my_file.txt" + controller.upload_file_parts(upload_id, file_path) + # print("File parts uploaded.") + + list_parts = controller.list_parts(upload_id) + print(list_parts, "list_parts") + + # # Completes the upload + complete_file_path = controller.complete_upload(upload_id, bucket_name, object_key) + print(f"Upload complete! File saved at: {complete_file_path}") + # Displays all existing multipart uploads + all_uploads = controller.service.select_all_from_table(db_file, "mng_MultipartUploads") + print("All multipart uploads:", all_uploads) diff --git a/Storage/NEW_KT_Storage/DataAccess/ObjectManager.py b/Storage/NEW_KT_Storage/DataAccess/ObjectManager.py index 3cd1150d..03e3b72b 100644 --- a/Storage/NEW_KT_Storage/DataAccess/ObjectManager.py +++ b/Storage/NEW_KT_Storage/DataAccess/ObjectManager.py @@ -1,3 +1,7 @@ +import os +import sys +sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..','..','..'))) + from DB.NEW_KT_DB.DataAccess.ObjectManager import ObjectManager as ObjectManagerDB from Storage.NEW_KT_Storage.DataAccess.StorageManager import StorageManager From 6a41d13116d14e284ca499cec35b8cfb95577dc3 Mon Sep 17 00:00:00 2001 From: shana-git Date: Sat, 21 Sep 2024 20:56:48 +0300 Subject: [PATCH 2/3] removed main --- .../Controller/MultipartUploadController.py | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py b/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py index 6bbbe95b..348728d0 100644 --- a/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py +++ b/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py @@ -31,32 +31,3 @@ def complete_upload(self, upload_id: str, bucket_name: str = None, object_key: s """ return self.service.complete_upload(upload_id, bucket_name, object_key) -if __name__ == "__main__": - db_file = "my_db.db" - storage_path = "C:/Users/shana/Desktop/a" - - controller = MultipartUploadController(db_file, storage_path) - - # Initiates the upload - bucket_name = "my_bucket" - object_key = "my_file_shana-6.txt" - upload_id = controller.initiate_upload(bucket_name, object_key) - print(f"Upload ID: {upload_id}") - - # # Uploads the file parts - # controller.service.upload_part(upload_id, 1, "aaaa") - # controller.service.upload_part(upload_id, 2, "bbbb") - file_path = "C:/Users/shana/Desktop/a/my_file.txt" - controller.upload_file_parts(upload_id, file_path) - # print("File parts uploaded.") - - list_parts = controller.list_parts(upload_id) - print(list_parts, "list_parts") - - # # Completes the upload - complete_file_path = controller.complete_upload(upload_id, bucket_name, object_key) - print(f"Upload complete! File saved at: {complete_file_path}") - - # Displays all existing multipart uploads - all_uploads = controller.service.select_all_from_table(db_file, "mng_MultipartUploads") - print("All multipart uploads:", all_uploads) From ca8d32edfcd5f33a1b867db82770b0fb32772418 Mon Sep 17 00:00:00 2001 From: shana-git Date: Sat, 21 Sep 2024 20:57:39 +0300 Subject: [PATCH 3/3] small change --- Storage/NEW_KT_Storage/Controller/MultipartUploadController.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py b/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py index 348728d0..1011e611 100644 --- a/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py +++ b/Storage/NEW_KT_Storage/Controller/MultipartUploadController.py @@ -31,3 +31,4 @@ def complete_upload(self, upload_id: str, bucket_name: str = None, object_key: s """ return self.service.complete_upload(upload_id, bucket_name, object_key) +