change folder output

Author: jackbrookes

Assets/UXF/Scripts/DataHandling/FileSaver.cs

@@ -142,7 +142,7 @@ public override string HandleDataTable(UXFDataTable table, string experiment, st
             string[] lines = table.GetCSVLines();
 
             string directory = GetSessionPath(experiment, ppid, sessionNum);
-            if (sortDataIntoFolders && dataType != UXFDataType.TrialResults) directory = Path.Combine(directory, dataType.ToLower());
+            if (sortDataIntoFolders && dataType != UXFDataType.TrialResults) directory = Path.Combine(directory, dataType.GetFolderName());
             Directory.CreateDirectory(directory);
             string name = string.IsNullOrEmpty(ext) ? string.Format("{0}.csv", dataName) : string.Format("{0}{1}", dataName, ext);
             string savePath = Path.Combine(directory, name);
@@ -163,7 +163,7 @@ public override string HandleJSONSerializableObject(List<object> serializableObj
             string text = MiniJSON.Json.Serialize(serializableObject);
 
             string directory = GetSessionPath(experiment, ppid, sessionNum);
-            if (sortDataIntoFolders && dataType != UXFDataType.TrialResults) directory = Path.Combine(directory, dataType.ToLower());
+            if (sortDataIntoFolders && dataType != UXFDataType.TrialResults) directory = Path.Combine(directory, dataType.GetFolderName());
             Directory.CreateDirectory(directory);
             string name = string.IsNullOrEmpty(ext) ? string.Format("{0}.json", dataName) : string.Format("{0}{1}", dataName, ext);
             string savePath = Path.Combine(directory, name);
@@ -184,7 +184,7 @@ public override string HandleJSONSerializableObject(Dictionary<string, object> s
             string text = MiniJSON.Json.Serialize(serializableObject);
 
             string directory = GetSessionPath(experiment, ppid, sessionNum);
-            if (sortDataIntoFolders && dataType != UXFDataType.TrialResults) directory = Path.Combine(directory, dataType.ToLower());
+            if (sortDataIntoFolders && dataType != UXFDataType.TrialResults) directory = Path.Combine(directory, dataType.GetFolderName());
             Directory.CreateDirectory(directory);
             string name = string.IsNullOrEmpty(ext) ? string.Format("{0}.json", dataName) : string.Format("{0}{1}", dataName, ext);
             string savePath = Path.Combine(directory, name);
@@ -203,7 +203,7 @@ public override string HandleText(string text, string experiment, string ppid, i
             if (dataType.GetDataLevel() == UXFDataLevel.PerTrial) dataName = string.Format("{0}_T{1:000}", dataName, optionalTrialNum);
 
             string directory = GetSessionPath(experiment, ppid, sessionNum);
-            if (sortDataIntoFolders && dataType != UXFDataType.TrialResults) directory = Path.Combine(directory, dataType.ToLower());
+            if (sortDataIntoFolders && dataType != UXFDataType.TrialResults) directory = Path.Combine(directory, dataType.GetFolderName());
             Directory.CreateDirectory(directory);
 
             string name = string.IsNullOrEmpty(ext) ? string.Format("{0}.txt", dataName) : string.Format("{0}{1}", dataName, ext);
@@ -223,7 +223,7 @@ public override string HandleBytes(byte[] bytes, string experiment, string ppid,
             if (dataType.GetDataLevel() == UXFDataLevel.PerTrial) dataName = string.Format("{0}_T{1:000}", dataName, optionalTrialNum);
 
             string directory = GetSessionPath(experiment, ppid, sessionNum);
-            if (sortDataIntoFolders && dataType != UXFDataType.TrialResults) directory = Path.Combine(directory, dataType.ToLower());
+            if (sortDataIntoFolders && dataType != UXFDataType.TrialResults) directory = Path.Combine(directory, dataType.GetFolderName());
             Directory.CreateDirectory(directory);
 
             string name = string.IsNullOrEmpty(ext) ? string.Format("{0}.txt", dataName) : string.Format("{0}{1}", dataName, ext);

Assets/UXF/Tests/Editor/TestFileIOManager.cs

@@ -100,7 +100,7 @@ public void AbsolutePath()
 
             string outString = fileSaver.HandleText("abc", experiment, ppid, sessionNum, "test", UXFDataType.OtherSessionData);
 
-            Assert.AreEqual(outString, @"fileSaver_test/test_ppid/S001/othersessiondata/test.txt");
+            Assert.AreEqual(outString, @"fileSaver_test/test_ppid/S001/other/test.txt");
 
             fileSaver.CleanUp();
         }