Fix #793 - Relative pathing for interface and fileexists check (#882)

* relative path and file exists check * Update DMCompiler/Compiler/DMPreprocessor/DMPreprocessor.cs Co-authored-by: wixoa <[email protected]> * code review * get rid of dead var * clear up whitespace * Update DMCompiler/DMCompiler.cs Co-authored-by: wixoa <[email protected]> * Tmp fix for no interface specified. See #851 Co-authored-by: wixoa <[email protected]>
OpenDreamProject · Oct 29, 2022 · baa5589 · baa5589
1 parent 00d5697
commit baa5589
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/DMCompiler/DMCompiler.cs b/DMCompiler/DMCompiler.cs
@@ -223,7 +223,7 @@ private static string SaveJson(List<DreamMapJson> maps, string interfaceFile, st
             DreamCompiledJson compiledDream = new DreamCompiledJson();
             compiledDream.Strings = DMObjectTree.StringTable;
             compiledDream.Maps = maps;
-            compiledDream.Interface = interfaceFile;
+            compiledDream.Interface = string.IsNullOrEmpty(interfaceFile) ? "" : Path.GetRelativePath(Path.GetDirectoryName(outputFile), interfaceFile);
             var jsonRep = DMObjectTree.CreateJsonRepresentation();
             compiledDream.Types = jsonRep.Item1;
             compiledDream.Procs = jsonRep.Item2;

diff --git a/OpenDreamRuntime/DreamManager.cs b/OpenDreamRuntime/DreamManager.cs
@@ -80,7 +80,9 @@ public bool LoadJson(string? jsonPath)
 
             _compiledJson = json;
             _dreamResourceManager.SetDirectory(Path.GetDirectoryName(jsonPath));
-
+            if(!string.IsNullOrEmpty(_compiledJson.Interface) && !_dreamResourceManager.DoesFileExist(_compiledJson.Interface))            
+                throw new FileNotFoundException("Interface DMF not found at "+Path.Join(Path.GetDirectoryName(jsonPath),_compiledJson.Interface));
+            //TODO: Empty or invalid _compiledJson.Interface should return default interface - see issue #851
             ObjectTree.LoadJson(json);
 
             SetMetaObjects();