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

XmlPropertyListParser: Support deserializing UID values

Browse Source
This commit is contained in:
Frederik Carlier
2020-04-27 23:02:28 +02:00
parent 7f98f27448
commit 997e9c3b4c
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 // UIDs don't exist in XML property lists, but they are represented as dictionaries
// for compability purposes // for compability purposes
var roundtrip = XmlPropertyListParser.ParseString(plist) as NSDictionary; var roundtrip = XmlPropertyListParser.ParseString(plist) as UID;
Assert.Single(roundtrip.Keys, "CF$UID"); Assert.Equal(0xabcdUL, roundtrip.ToUInt64());
Assert.Single(roundtrip.Values, new NSNumber(0xabcd));
} }
} }
} }

32
plist-cil/XmlPropertyListParser.cs
View File

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