icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-04-12 12:07:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: try adding _SimplSharp suffix to assembly if GetType fails

Browse source
This commit is contained in:
Jeffery Thompson 2018-07-18 13:38:36 -04:00
parent c03833bf9d
commit 560d3c861d
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ICD.Common.Utils/Json/JsonItemWrapper.cs
View file

@ -1,4 +1,5 @@
using System; using System;
using System.Text.RegularExpressions;
using ICD.Common.Utils.Extensions; using ICD.Common.Utils.Extensions;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@ -70,8 +71,17 @@ namespace ICD.Common.Utils.Json
string itemString = (string)token.SelectToken(ITEM_TOKEN); string itemString = (string)token.SelectToken(ITEM_TOKEN);
Type type = Type.GetType(typeString); Type type = Type.GetType(typeString);
if (type == null)
typeString = AddSimplSharpSuffix(typeString);
return JsonConvert.DeserializeObject(itemString, type); return JsonConvert.DeserializeObject(itemString, type);
} }
private static string AddSimplSharpSuffix(string typeString)
{
return Regex.Replace(typeString,
"(?'prefix'[^,]+, )(?'assembly'[^,]*)(?'suffix', .*)",
"${prefix}${assembly}_SimplSharp${suffix}");
}
} }
} }