Merge pull request #34018 from dsge/show-template-directory-path-in-error-message

Make sure to include the path in the "Data template directory not found" error message
This commit is contained in:
Ignacio Roldán Etcheverry 2019-12-05 14:17:23 +01:00 committed by GitHub
commit 6544a0e908
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -209,23 +209,25 @@ namespace GodotTools.Export
string TemplateDirName() => $"data.mono.{platform}.{bits}.{target}";
string templateDirPath = Path.Combine(Internal.FullTemplatesDir, TemplateDirName());
bool validTemplatePathFound = true;
if (!Directory.Exists(templateDirPath))
{
templateDirPath = null;
validTemplatePathFound = false;
if (isDebug)
{
target = "debug"; // Support both 'release_debug' and 'debug' for the template data directory name
templateDirPath = Path.Combine(Internal.FullTemplatesDir, TemplateDirName());
validTemplatePathFound = true;
if (!Directory.Exists(templateDirPath))
templateDirPath = null;
validTemplatePathFound = false;
}
}
if (templateDirPath == null)
throw new FileNotFoundException("Data template directory not found");
if (!validTemplatePathFound)
throw new FileNotFoundException("Data template directory not found", templateDirPath);
string outputDataDir = Path.Combine(outputDir, DataDirName);