Force relative paths in settings

Author: Sahasrara

Assets/GameScriptSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   MaxFlags: 0
   InitialConversationPool: 1
   PreventSingleNodeChoices: 1
-  DatabasePath: D:/Work/GameScriptUnity/Database/TestDB
-  DatabaseVersion: 
-  GeneratedPath: 
-  GameDataPath: /Users/eric/Work/GameScriptUnity/Assets/StreamingAssets/GameScript
+  DatabasePath: Database/TestDB
+  DatabaseVersion:
+  GeneratedPath:
+  GameDataPath: GameScript

Packages/studio.shortsleeve.gamescriptunity/Editor/Menu/SettingsEditor.cs

@@ -141,8 +141,7 @@ public override VisualElement CreateInspectorGUI()
                     return;
 
                 // Convert to relative and save
-                string projectRoot = Path.GetFullPath(Path.Combine(Application.dataPath, ".."));
-                string relativeDbPath = GetRelativePath(projectRoot, absoluteDbPath);
+                string relativeDbPath = GetRelativePathFromProjectRoot(absoluteDbPath);
                 serializedObject.FindProperty("DatabasePath").stringValue = relativeDbPath;
                 serializedObject.ApplyModifiedProperties();
 
@@ -201,6 +200,15 @@ public override VisualElement CreateInspectorGUI()
                 {
                     // Convert to relative and save
                     string relativePath = GetRelativePathFromStreamingAssets(absolutePath);
+                    if (relativePath == null)
+                    {
+                        EditorUtility.DisplayDialog(
+                            "Invalid Path",
+                            "The selected folder must be within the StreamingAssets folder.",
+                            "OK"
+                        );
+                        return;
+                    }
                     serializedObject.FindProperty("GameDataPath").stringValue = relativePath;
                     serializedObject.ApplyModifiedProperties();
                     // Update display with absolute path
@@ -220,13 +228,22 @@ public override VisualElement CreateInspectorGUI()
             {
                 string absolutePath = EditorUtility.OpenFolderPanel(
                     $"Select {RuntimeConstants.k_AppName} Folder",
-                    "",
+                    Application.dataPath,
                     ""
                 );
                 if (!string.IsNullOrEmpty(absolutePath))
                 {
                     // Convert to relative and save
                     string relativePath = GetRelativePathFromAssets(absolutePath);
+                    if (relativePath == null)
+                    {
+                        EditorUtility.DisplayDialog(
+                            "Invalid Path",
+                            "The selected folder must be within the Assets folder.",
+                            "OK"
+                        );
+                        return;
+                    }
                     serializedObject.FindProperty("GeneratedPath").stringValue = relativePath;
                     serializedObject.ApplyModifiedProperties();
                     // Update display with absolute path
@@ -528,36 +545,38 @@ private bool IsValidSubFolder(string path, string parent)
             return false;
         }
 
-        private string GetRelativePath(string fromPath, string toPath)
+        /// <summary>
+        /// Gets a relative path that must be within the specified parent folder.
+        /// Returns null if the path is outside the parent folder.
+        /// </summary>
+        private string GetRelativeSubPath(string parentPath, string absolutePath)
         {
-            if (string.IsNullOrEmpty(fromPath) || string.IsNullOrEmpty(toPath))
-                return toPath;
+            if (string.IsNullOrEmpty(parentPath) || string.IsNullOrEmpty(absolutePath))
+                return null;
 
-            fromPath = Path.GetFullPath(fromPath).Replace('\\', '/');
-            toPath = Path.GetFullPath(toPath).Replace('\\', '/');
+            string relativePath = Path.GetRelativePath(parentPath, absolutePath).Replace('\\', '/');
 
-            // Ensure paths have trailing separators for directory comparison
-            if (!fromPath.EndsWith("/"))
-                fromPath += "/";
-
-            // Check if toPath starts with fromPath
-            if (toPath.StartsWith(fromPath, StringComparison.OrdinalIgnoreCase))
-            {
-                return toPath.Substring(fromPath.Length);
-            }
+            // If the relative path starts with "..", it's outside the parent folder
+            if (relativePath.StartsWith(".."))
+                return null;
 
-            // If not a subpath, return the absolute path
-            return toPath;
+            return relativePath;
         }
 
         private string GetRelativePathFromStreamingAssets(string absolutePath)
         {
-            return GetRelativePath(Application.streamingAssetsPath, absolutePath);
+            return GetRelativeSubPath(Application.streamingAssetsPath, absolutePath);
         }
 
         private string GetRelativePathFromAssets(string absolutePath)
         {
-            return GetRelativePath(Application.dataPath, absolutePath);
+            return GetRelativeSubPath(Application.dataPath, absolutePath);
+        }
+
+        private string GetRelativePathFromProjectRoot(string absolutePath)
+        {
+            string projectRoot = Path.GetFullPath(Path.Combine(Application.dataPath, ".."));
+            return Path.GetRelativePath(projectRoot, absolutePath).Replace('\\', '/');
         }
         #endregion
     }

Packages/studio.shortsleeve.gamescriptunity/package.json

@@ -1,7 +1,7 @@
 {
   "name": "studio.shortsleeve.gamescriptunity",
   "displayName": "GameScriptUnity",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "unity": "2023.2",
   "description": "Cross-platform dialogue middleware",
   "keywords": [