Skip to content
This repository has been archived by the owner on Jan 18, 2022. It is now read-only.

No more schema copying #953

Merged
merged 16 commits into from
May 29, 2019
Merged

No more schema copying #953

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bb75ebe
no longer copy schema, multiple schema path support
zeroZshadow Apr 1, 2019
c961641
Update GdkToolsConfiguration.json
May 20, 2019
bc787be
remove excess mobile assets
May 21, 2019
6fd4417
revert projectsettings changes
May 21, 2019
72d5e80
post-command pwd check
May 21, 2019
e620399
use a pinned commit from shared-ci
May 21, 2019
8a074aa
update shared-ci pinned
May 21, 2019
3848ea7
Update bootstrap.sh
May 22, 2019
4e0f526
Update CHANGELOG.md
May 22, 2019
ddd07c6
PR feedback
May 22, 2019
ba31e87
tidy up package.jsons + PR feedback
May 23, 2019
92329db
Update .gitignore
May 22, 2019
d127c21
migration guide for schema + add cd back to make clearer where script…
May 23, 2019
7fea68c
update changelolg
May 23, 2019
d919638
check for invalid chars in schema path
May 24, 2019
b79bfaa
cheeky refactor
May 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion workers/unity/Assets/Plugins.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 18 additions & 13 deletions workers/unity/Packages/com.improbable.gdk.tools/GdkToolsConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using UnityEngine;

Expand Down Expand Up @@ -55,26 +54,32 @@ internal List<string> Validate()
errors.Add($"{GdkToolsConfigurationWindow.DescriptorOutputDirLabel} cannot be empty.");
}

var emptySchemaSourceDir = false;
foreach (var schemaSourceDir in SchemaSourceDirs)
for (var i = 0; i < SchemaSourceDirs.Count; i++)
{
var schemaSourceDir = SchemaSourceDirs[i];

if (!string.IsNullOrEmpty(schemaSourceDir))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Invert the if condition and continue if its null or empty:

if (string.IsNullOrEmpty(schemaSourceDir))
{
	errors.Add(...);
	continue;
}

try 
{
	...
}

...

{
var fullSchemaSourceDirPath = Path.Combine(UnityProjectRoot, schemaSourceDir);
string fullSchemaSourceDirPath;
try
{
fullSchemaSourceDirPath = Path.Combine(UnityProjectRoot, schemaSourceDir);
}
catch (ArgumentException)
{
errors.Add($"Schema path [{i}] contains one or more invalid characters.");
continue;
}

if (!Directory.Exists(fullSchemaSourceDirPath))
paulbalaji marked this conversation as resolved.
Show resolved Hide resolved
{
errors.Add($"{fullSchemaSourceDirPath} cannot be found.");
}

continue;
}

emptySchemaSourceDir = true;
}

if (emptySchemaSourceDir)
{
errors.Add($"Cannot have any empty entry in {GdkToolsConfigurationWindow.SchemaSourceDirsLabel}.");
else
{
errors.Add($"Schema path [{i}] is empty. You must provide a valid path.");
}
}

if (!string.IsNullOrEmpty(RuntimeIp) && !IPAddress.TryParse(RuntimeIp, out _))
Expand Down