@@ -212,13 +212,21 @@ def process_collection_descendants(collection, headers_v1,headers_v2, v2_parent_
212212 process_collection_descendants (child , headers_v1 , headers_v2 , new_folder ['id' ], 'folder' , v2_dataset_id )
213213
214214 for dataset in dataset_json :
215+ # TODO TODO DATASET PROCESSING
215216 if v2_parent_type == "dataset" :
216217 print (f"Parent is a dataset" )
217218 new_folder = create_folder_if_not_exists_or_get (dataset ["name" ], v2_parent_id , v2_dataset_id , headers_v2 )
218219 print (f"Now we need to add the sub folders of this dataset" )
220+ # TODO get DATASET FOLDERS HERE FROM v1
221+ process_dataset_folders (dataset , headers_v1 , headers_v2 , new_folder ['id' ], v2_dataset_id )
222+ process_dataset_files (dataset , headers_v1 , headers_v2 , new_folder ['id' ], v2_dataset_id )
219223 else :
220224 print (f"Parent is a folder" )
221225 new_folder = create_folder_if_not_exists_or_get (dataset ["name" ], v2_parent_id , v2_dataset_id , headers_v2 )
226+ # TODO GET DATASET FOLDERS HERE FROM v1
227+ process_dataset_folders (dataset , headers_v1 , headers_v2 , new_folder ['id' ], v2_dataset_id )
228+ process_dataset_files (dataset , headers_v1 , headers_v2 , new_folder ['id' ], v2_dataset_id )
229+
222230
223231
224232def process_dataset_folders (dataset , headers_v1 , headers_v2 , parent_type , parent_id ):
@@ -227,6 +235,12 @@ def process_dataset_folders(dataset, headers_v1, headers_v2, parent_type, parent
227235 folder_json = folder_response .json ()
228236 print (f"Got dataset folders" )
229237
238+ def process_dataset_files (dataset , headers_v1 , headers_v2 , parent_type , parent_id ):
239+ files_endpoint = f"{ CLOWDER_V1 } /api/datasets/{ dataset ['id' ]} /files"
240+ files_response = requests .get (files_endpoint , headers = headers_v1 )
241+ files_json = files_response .json ()
242+ print (f"Got dataset files" )
243+
230244
231245
232246def create_v2_dataset_from_collection (collection , user_v1 , headers_v1 , headers_v2 ):
@@ -518,6 +532,8 @@ def add_folder_hierarchy(folder_hierarchy, dataset_v2, headers):
518532
519533def create_folder_if_not_exists_or_get (folder , parent , dataset_v2 , headers ):
520534 """Create a folder if it does not exist or return the existing folder."""
535+ # TODO if this is a dataset, we should create the subfolders
536+ # TODO or write another method for processing datasets
521537 current_folders = get_folder_and_subfolders (dataset_v2 , headers )
522538 folder_data = (
523539 {"name" : folder , "parent_folder" : parent } if parent else {"name" : folder }
0 commit comments