fix #52

Author: jackbrookes

Assets/UXF/Scripts/DataHandling/FileSaver.cs

@@ -143,10 +143,10 @@ public override string HandleDataTable(UXFDataTable table, string experiment, st
             Directory.CreateDirectory(directory);
             string savePath = Path.Combine(directory, string.Format("{0}.csv", dataName));
 
-             if (verboseDebug) Debug.LogFormat("Queuing save of file: {0}", savePath);
+            if (verboseDebug) Debug.LogFormat("Queuing save of file: {0}", savePath);
 
             ManageInWorker(() => { File.WriteAllLines(savePath, lines); });
-            return savePath;
+            return GetRelativePath(storagePath, savePath);;
         }
 
         public override string HandleJSONSerializableObject(List<object> serializableObject, string experiment, string ppid, int sessionNum, string dataName, UXFDataType dataType, int optionalTrialNum = 0)
@@ -163,7 +163,7 @@ public override string HandleJSONSerializableObject(List<object> serializableObj
             if (verboseDebug) Debug.LogFormat("Queuing save of file: {0}", savePath);
 
             ManageInWorker(() => { File.WriteAllText(savePath, text); });
-            return savePath;
+            return GetRelativePath(storagePath, savePath);;
         }
 
         public override string HandleJSONSerializableObject(Dictionary<string, object> serializableObject, string experiment, string ppid, int sessionNum, string dataName, UXFDataType dataType, int optionalTrialNum = 0)
@@ -177,10 +177,10 @@ public override string HandleJSONSerializableObject(Dictionary<string, object> s
             Directory.CreateDirectory(directory);
             string savePath = Path.Combine(directory, string.Format("{0}.json", dataName));
 
-             if (verboseDebug) Debug.LogFormat("Queuing save of file: {0}", savePath);
+            if (verboseDebug) Debug.LogFormat("Queuing save of file: {0}", savePath);
 
             ManageInWorker(() => { File.WriteAllText(savePath, text); });
-            return savePath;
+            return GetRelativePath(storagePath, savePath);;
         }
 
         public override string HandleText(string text, string experiment, string ppid, int sessionNum, string dataName, UXFDataType dataType, int optionalTrialNum = 0)
@@ -192,10 +192,10 @@ public override string HandleText(string text, string experiment, string ppid, i
             Directory.CreateDirectory(directory);
             string savePath = Path.Combine(directory, string.Format("{0}.txt", dataName));
 
-             if (verboseDebug) Debug.LogFormat("Queuing save of file: {0}", savePath);
+            if (verboseDebug) Debug.LogFormat("Queuing save of file: {0}", savePath);
 
             ManageInWorker(() => { File.WriteAllText(savePath, text); });
-            return savePath;
+            return GetRelativePath(storagePath, savePath);;
         }
 
         public override string HandleBytes(byte[] bytes, string experiment, string ppid, int sessionNum, string dataName, UXFDataType dataType, int optionalTrialNum = 0)
@@ -207,10 +207,10 @@ public override string HandleBytes(byte[] bytes, string experiment, string ppid,
             Directory.CreateDirectory(directory);
             string savePath = Path.Combine(directory, string.Format("{0}.txt", dataName));  
 
-             if (verboseDebug) Debug.LogFormat("Queuing save of file: {0}", savePath);
+            if (verboseDebug) Debug.LogFormat("Queuing save of file: {0}", savePath);
 
             ManageInWorker(() => { File.WriteAllBytes(savePath, bytes); });
-            return savePath;
+            return GetRelativePath(storagePath, savePath);
         }
 
 
@@ -243,6 +243,20 @@ public override void CleanUp()
             bq.Enqueue(doNothing); // ensures bq breaks from foreach loop
             parallelThread.Join();
         }
+
+        public static string GetRelativePath(string relativeToDirectory, string path)
+        {
+            relativeToDirectory = Path.GetFullPath(relativeToDirectory);
+            if (!relativeToDirectory.EndsWith("\\")) relativeToDirectory += "\\";
+
+            path = Path.GetFullPath(path);
+
+            Uri path1 = new Uri(relativeToDirectory);
+            Uri path2 = new Uri(path);
+
+            Uri diff = path1.MakeRelativeUri(path2);
+            return diff.OriginalString;
+        }
     }
 
 

Assets/UXF/Tests/Editor/TestFileIOManager.cs

@@ -23,7 +23,6 @@ public void SetUp()
         {
 			var gameObject = new GameObject();
 			fileSaver = gameObject.AddComponent<FileSaver>();
-            fileSaver.storagePath = "example_output";
 			fileSaver.verboseDebug = true;
         }
 
@@ -38,6 +37,7 @@ public void TearDown()
         [Test]
         public void WriteManyFiles()
         {
+            fileSaver.storagePath = "example_output";
             fileSaver.SetUp();
 
             // generate a large dictionary
@@ -69,14 +69,15 @@ public void WriteManyFiles()
 			// cleanup files
             foreach (var fpath in fpaths)
             {
-                System.IO.File.Delete(fpath);
+                System.IO.File.Delete(Path.Combine(fileSaver.storagePath, fpath));
             }
         }
 
 
         [Test]
         public void EarlyExit()
         {
+            fileSaver.storagePath = "example_output";
             fileSaver.SetUp();
             fileSaver.CleanUp();
 
@@ -89,7 +90,44 @@ public void EarlyExit()
             fileSaver.SetUp();
             fileSaver.ManageInWorker(() => Debug.Log("Code enqueued after FileSaver re-opened"));
             fileSaver.CleanUp();
+        }
+
+        [Test]
+        public void AbsolutePath()
+        {
+            fileSaver.storagePath = "C:/example_output";
+            fileSaver.SetUp();
+            
+            string outString = fileSaver.HandleText("abc", experiment, ppid, sessionNum, "test", UXFDataType.OtherSessionData);
+
+            Assert.AreEqual(outString, @"fileSaver_test/test_ppid/S001/othersessiondata/test.txt");
+
+            fileSaver.CleanUp();
+        }
+
+        [Test]
+        public void FileSaverRelPath()
+        {
 
+            Assert.AreEqual(
+                FileSaver.GetRelativePath("C:\\base", "C:\\base\\123"),
+                "123"
+            );
+
+            Assert.AreEqual(
+                FileSaver.GetRelativePath("base", "base\\123"),
+                "123"
+            );
+
+            Assert.AreEqual(
+                FileSaver.GetRelativePath("base/", "base\\123"),
+                "123"
+            );
+
+            Assert.AreEqual(
+                FileSaver.GetRelativePath("C:/base/", "C:/base\\123"),
+                "123"
+            );
         }
 
     }