DM: Moved killing of trash data folder to own data management function

New function: KillTrashFolders No functional changes
AllenInstitute · Aug 15, 2024 · ce02f8f · ce02f8f
1 parent d8f6166
commit ce02f8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/Packages/MIES/MIES_IgorHooks.ipf b/Packages/MIES/MIES_IgorHooks.ipf
@@ -28,13 +28,7 @@ static Function IH_KillTemporaries()
 	KillStrings/Z dfrHW:ITCDeviceList
 
 	// try to delete all trash folders
-	trashFolders = GetListOfObjects(dfr, TRASH_FOLDER_PREFIX + ".*", typeFlag = COUNTOBJECTS_DATAFOLDER, fullPath = 1)
-
-	numFolders = ItemsInList(trashFolders)
-	for(i = 0; i < numFolders; i += 1)
-		path = StringFromList(i, trashFolders)
-		KillDataFolder/Z $path
-	endfor
+	KillTrashFolders()
 
 	RemoveEmptyDataFolder(dfr)
 

diff --git a/Packages/MIES/MIES_MiesUtilities_DataManagement.ipf b/Packages/MIES/MIES_MiesUtilities_DataManagement.ipf
@@ -90,3 +90,15 @@ threadsafe Function MoveToTrash([wv, dfr])
 		endif
 	endif
 End
+
+threadsafe Function KillTrashFolders()
+
+	string dfPath
+
+	DFREF  dfr          = GetMiesPath()
+	WAVE/T trashFolders = ListToTextWave(GetListOfObjects(dfr, TRASH_FOLDER_PREFIX + ".*", typeFlag = COUNTOBJECTS_DATAFOLDER, fullPath = 1), ";")
+
+	for(dfPath : trashFolders)
+		KillDataFolder/Z $dfPath
+	endfor
+End