claunia/plist-cil
1
0
Fork 0
mirror of https://github.com/claunia/plist-cil.git synced 2025-12-16 11:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66 from quamotion/fixes/xml-uid-deserialize

Browse Source 
XmlPropertyListParser: Support deserializing UID values
This commit is contained in:
Natalia Portillo
2020-08-24 23:11:14 +01:00
committed by GitHub
parent 7f98f27448 ffe39d9143
commit 03462a8b74
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@@ -1,3 +1,5 @@
image: Visual Studio 2019
build_script:
- cmd: dotnet build -c Release --version-suffix r%APPVEYOR_BUILD_NUMBER%
- cmd: dotnet test plist-cil.test\plist-cil.test.csproj

5
plist-cil.test/UIDTests.cs
View File

@@ -88,9 +88,8 @@ namespace plistcil.test
// UIDs don't exist in XML property lists, but they are represented as dictionaries
// for compability purposes
var roundtrip = XmlPropertyListParser.ParseString(plist) as NSDictionary;
Assert.Single(roundtrip.Keys, "CF$UID");
Assert.Single(roundtrip.Values, new NSNumber(0xabcd));
var roundtrip = XmlPropertyListParser.ParseString(plist) as UID;
Assert.Equal(0xabcdUL, roundtrip.ToUInt64());
}
}
}

32
plist-cil/XmlPropertyListParser.cs
View File

@@ -147,19 +147,31 @@ namespace Claunia.PropertyList
{
if(n.Name.Equals("dict"))
{
NSDictionary dict = new NSDictionary();
List<XmlNode> children = FilterElementNodes(n.ChildNodes);
for(int i = 0; i < children.Count; i += 2)
// Special case for UID values
if(n.ChildNodes.Count == 2
&& n.ChildNodes[0].Name == "key"
&& n.ChildNodes[0].InnerText == "CF$UID"
&& n.ChildNodes[1].Name == "integer"
&& uint.TryParse(n.ChildNodes[1].InnerText, out uint uidValue))
{
XmlNode key = children[i];
XmlNode val = children[i + 1];
string keyString = GetNodeTextContents(key);
dict.Add(keyString, ParseObject(val));
return new UID(uidValue);
}
else
{
NSDictionary dict = new NSDictionary();
List<XmlNode> children = FilterElementNodes(n.ChildNodes);
for(int i = 0; i < children.Count; i += 2)
{
XmlNode key = children[i];
XmlNode val = children[i + 1];
return dict;
string keyString = GetNodeTextContents(key);
dict.Add(keyString, ParseObject(val));
}
return dict;
}
}
if(n.Name.Equals("array"))