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

Merge pull request #4 from quamotion/fixes/dotnetcore

Browse Source 
.NET Core Compatibility
This commit is contained in:
Natalia Portillo
2016-05-23 00:35:49 +01:00
parent accdc880ae a58ff42cef
commit 6571783fab
14 changed files with 158 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -5,6 +5,8 @@ mono:
- alpha
- beta
- weekly
- 4.2.3
- 4.0.5
- 3.10.0
- 3.8.0
- 3.2.8

2
README.md
View File

@@ -18,7 +18,7 @@ The provided API mimics the Cocoa/NeXTSTEP API, and where applicable, the .NET A
| GNUstep ASCII | yes | yes |
###Requirements
.NET Framework 4.0 or Mono.
.NET Framework 4.0, Mono or .NET Core.
###Download

9
plist-cil.test/ParseTest.cs
View File

@@ -112,7 +112,11 @@ namespace plistcil.test
Assert.True(d.Count == 5);
Assert.True(((NSString)d.ObjectForKey("keyA")).ToString().Equals("valueA"));
Assert.True(((NSString)d.ObjectForKey("key&B")).ToString().Equals("value&B"));
Assert.True(((NSDate)d.ObjectForKey("date")).Date.Equals(new DateTime(2011, 11, 28, 9, 21, 30, DateTimeKind.Utc)));
var actualDate = (NSDate)d.ObjectForKey("date");
var expectedDate = new DateTime(2011, 11, 28, 9, 21, 30, DateTimeKind.Utc).ToLocalTime();
Assert.AreEqual(actualDate.Date, expectedDate);
Assert.True(ArrayEquals(((NSData)d.ObjectForKey("data")).Bytes,
new byte[]{ 0x00, 0x00, 0x00, 0x04, 0x10, 0x41, 0x08, 0x20, (byte)0x82 }));
NSArray a = (NSArray)d.ObjectForKey("array");
@@ -182,7 +186,6 @@ namespace plistcil.test
DateTime date = new DateTime();
string strg = "Hello World";
byte[] bytes = new byte[] { (byte)0x00, (byte)0xAF, (byte)0xAF };
DirectoryInfo netObject = new DirectoryInfo(Environment.CurrentDirectory);
Object[] array = new Object[] { bl, byt, shrt, i, lng, flt, dbl, date, strg, bytes };
int[] array2 = new int[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 3000 };
List<Object> list = new List<Object>(array);
@@ -249,8 +252,6 @@ namespace plistcil.test
objArray = (Object[])WrappedO.ToObject();
Assert.True(objArray.Length == array.Length);
Assert.True(NSObject.Wrap((Object)netObject).GetType().Equals(typeof(NSData)));
WrappedO = NSObject.Wrap((Object)map);
Assert.True(WrappedO.GetType().Equals(typeof(NSDictionary)));
NSDictionary dict = (NSDictionary)WrappedO;

10
plist-cil/ASCIIPropertyListParser.cs
View File

@@ -79,7 +79,8 @@ namespace Claunia.PropertyList
public static NSObject Parse(Stream fs)
{
byte[] buf = PropertyListParser.ReadAll(fs);
fs.Close();
// Don't close the stream - that would be the responisibility of code that class
// Parse
return Parse(buf);
}
@@ -718,11 +719,12 @@ namespace Claunia.PropertyList
/// <param name="s">The escaped string according to the ASCII property list format, without leading and trailing quotation marks.</param>
/// <exception cref="ArgumentException">If the en-/decoder for the UTF-8 or ASCII encoding could not be loaded</exception>
/// <exception cref="EncoderFallbackException">If the string is encoded neither in ASCII nor in UTF-8</exception>
[MethodImpl(MethodImplOptions.Synchronized)]
public static string ParseQuotedString(string s)
{
List<byte> strBytes = new List<byte>();
CharEnumerator c = s.GetEnumerator();
var characters = (IEnumerable<char>)s.ToCharArray();
var c = characters.GetEnumerator();
while (c.MoveNext())
{
@@ -768,7 +770,7 @@ namespace Claunia.PropertyList
/// <returns>The unescaped character as a string.</returns>
/// <param name="iterator">The string character iterator pointing to the first character after the backslash</param>
/// <exception cref="EncoderFallbackException">If an invalid Unicode or ASCII escape sequence is found.</exception>
private static string ParseEscapedSequence(CharEnumerator iterator)
private static string ParseEscapedSequence(IEnumerator<char> iterator)
{
iterator.MoveNext();
char c = iterator.Current;

3
plist-cil/BinaryPropertyListParser.cs
View File

@@ -154,7 +154,8 @@ namespace Claunia.PropertyList
{
//Read all bytes into a list
byte[] buf = PropertyListParser.ReadAll(fs);
fs.Close();
// Don't close the stream - that would be the responisibility of code that class
// Parse
return Parse(buf);
}

7
plist-cil/BinaryPropertyListWriter.cs
View File

@@ -117,9 +117,10 @@ namespace Claunia.PropertyList
/// <exception cref="IOException"></exception>
public static void Write(FileInfo file, NSObject root)
{
FileStream fous = file.OpenWrite();
Write(fous, root);
fous.Close();
using (FileStream fous = file.OpenWrite())
{
Write(fous, root);
}
}
/// <summary>

9
plist-cil/NSData.cs
View File

@@ -65,9 +65,10 @@ namespace Claunia.PropertyList
public NSData(FileInfo file)
{
bytes = new byte[(int)file.Length];
FileStream raf = file.OpenRead();
raf.Read(bytes, 0, (int)file.Length);
raf.Close();
using (FileStream raf = file.OpenRead())
{
raf.Read(bytes, 0, (int)file.Length);
}
}
/// <summary>
@@ -121,7 +122,7 @@ namespace Claunia.PropertyList
/// <returns>The Base64 encoded data as a <c>string</c>.</returns>
public string GetBase64EncodedData()
{
return Convert.ToBase64String(bytes, Base64FormattingOptions.InsertLineBreaks);
return Convert.ToBase64String(bytes);
}
/// <summary>

27
plist-cil/NSObject.cs
View File

@@ -25,8 +25,8 @@
using System;
using System.Text;
using System.Collections.Generic;
using System.Runtime.Serialization.Formatters.Binary;
using System.IO;
using System.Reflection;
namespace Claunia.PropertyList
{
@@ -350,31 +350,8 @@ namespace Claunia.PropertyList
}
if (typeof(List<Object>).IsAssignableFrom(c))
return Wrap(((List<Object>)o).ToArray());
return WrapSerialized(o);
}
/// <summary>
/// Serializes the given object using Java's default object serialization
/// and wraps the serialized object in a NSData object.
/// </summary>
/// <param name="o">The object to serialize and wrap.</param>
/// <returns>A NSData object</returns>
/// <exception cref="SystemException">When the object could not be serialized.</exception>
public static NSData WrapSerialized(Object o)
{
try
{
BinaryFormatter bf = new BinaryFormatter();
using (MemoryStream ms = new MemoryStream())
{
bf.Serialize(ms, o);
return new NSData(ms.ToArray());
}
}
catch (IOException)
{
throw new SystemException("The given object of class " + o.GetType() + " could not be serialized and stored in a NSData object.");
}
throw new PropertyListException(string.Format("Cannot wrap an object of type {0}.", o.GetType().Name));
}
/// <summary>

2
plist-cil/NSString.cs
View File

@@ -163,7 +163,7 @@ namespace Claunia.PropertyList
}
catch (Exception ex)
{
throw new SystemException("Could not encode the NSString into UTF-8: " + ex.Message);
throw new PropertyListException("Could not encode the NSString into UTF-8: " + ex.Message);
}
}

77
plist-cil/PropertyListException.cs Normal file
View File

@@ -0,0 +1,77 @@
// plist-cil - An open source library to parse and generate property lists for .NET
// Copyright (C) 2015 Natalia Portillo
// Copyright (C) 2016 Quamotion
//
// This code is based on:
// plist - An open source library to parse and generate property lists
// Copyright (C) 2014 Daniel Dreibrodt
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
using System;
using System.Runtime.Serialization;
namespace Claunia.PropertyList
{
/// <summary>
/// The exception that is thrown when an property list file could not be processed correctly.
/// </summary>
[Serializable]
public class PropertyListException : Exception
{
/// <summary>
/// Initializes a new instance of the <see cref="PropertyListException"/> class.
/// </summary>
public PropertyListException()
{
}
/// <summary>
/// Initializes a new instance of the <see cref="PropertyListException"/> class.
/// </summary>
/// <param name="message">
/// The error message that explains the reason for the exception.
/// </param>
public PropertyListException(string message)
: base(message)
{
}
/// <summary>
/// Initializes a new instance of the <see cref="PropertyListException"/> class.
/// </summary>
/// <param name="message">
/// The error message that explains the reason for the exception.
/// </param>
/// <param name="inner">
/// The exception that is the cause of the current exception, or <see langword="null"/>
/// if no inner exception is specified.
/// </param>
public PropertyListException(string message, Exception inner)
: base(message, inner)
{
}
#if !NETCORE
protected PropertyListException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
}
#endif
}
}

2
plist-cil/PropertyListFormatException.cs
View File

@@ -32,7 +32,7 @@ namespace Claunia.PropertyList
/// </summary>
/// @author Daniel Dreibrodt
/// @author Natalia Portillo
public class PropertyListFormatException : Exception
public class PropertyListFormatException : PropertyListException
{
/// <summary>
/// Creates a new exception with the given message.

66
plist-cil/PropertyListParser.cs
View File

@@ -158,9 +158,13 @@ namespace Claunia.PropertyList
/// <returns>The root object in the property list. This is usually a NSDictionary but can also be a NSArray.</returns>
public static NSObject Parse(FileInfo f)
{
FileStream fis = f.OpenRead();
int type = DetermineType(fis);
fis.Close();
int type;
using (FileStream fis = f.OpenRead())
{
type = DetermineType(fis);
}
switch (type)
{
case TYPE_BINARY:
@@ -215,9 +219,10 @@ namespace Claunia.PropertyList
string parent = outFile.DirectoryName;
if (!Directory.Exists(parent))
Directory.CreateDirectory(parent);
Stream fous = outFile.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite);
SaveAsXml(root, fous);
fous.Close();
using (Stream fous = outFile.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite))
{
SaveAsXml(root, fous);
}
}
/// <summary>
@@ -228,9 +233,18 @@ namespace Claunia.PropertyList
/// <exception cref="IOException">When an error occurs during the writing process.</exception>
public static void SaveAsXml(NSObject root, Stream outStream)
{
#if NET40
// The StreamWriter constructor which takes a "leaveOpen" parameter is
// not available on .NET 4.0
StreamWriter w = new StreamWriter(outStream, Encoding.UTF8);
w.Write(root.ToXmlPropertyList());
w.Close();
#else
using (StreamWriter w = new StreamWriter(outStream, Encoding.UTF8, bufferSize: 1024, leaveOpen: true))
{
w.Write(root.ToXmlPropertyList());
}
#endif
}
/// <summary>
@@ -291,11 +305,11 @@ namespace Claunia.PropertyList
string parent = outFile.DirectoryName;
if (!Directory.Exists(parent))
Directory.CreateDirectory(parent);
Stream fous = outFile.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite);
StreamWriter w = new StreamWriter(fous, Encoding.ASCII);
w.Write(root.ToASCIIPropertyList());
w.Close();
fous.Close();
using (Stream fous = outFile.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite))
using (StreamWriter w = new StreamWriter(fous, Encoding.ASCII))
{
w.Write(root.ToASCIIPropertyList());
}
}
/// <summary>
@@ -309,11 +323,11 @@ namespace Claunia.PropertyList
string parent = outFile.DirectoryName;
if (!Directory.Exists(parent))
Directory.CreateDirectory(parent);
Stream fous = outFile.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite);
StreamWriter w = new StreamWriter(fous, Encoding.ASCII);
w.Write(root.ToASCIIPropertyList());
w.Close();
fous.Close();
using (Stream fous = outFile.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite))
using (StreamWriter w = new StreamWriter(fous, Encoding.ASCII))
{
w.Write(root.ToASCIIPropertyList());
}
}
/// <summary>
@@ -350,11 +364,11 @@ namespace Claunia.PropertyList
string parent = outFile.DirectoryName;
if (!Directory.Exists(parent))
Directory.CreateDirectory(parent);
Stream fous = outFile.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite);
StreamWriter w = new StreamWriter(fous, Encoding.ASCII);
w.Write(root.ToGnuStepASCIIPropertyList());
w.Close();
fous.Close();
using (Stream fous = outFile.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite))
using (StreamWriter w = new StreamWriter(fous, Encoding.ASCII))
{
w.Write(root.ToGnuStepASCIIPropertyList());
}
}
/// <summary>
@@ -368,11 +382,11 @@ namespace Claunia.PropertyList
string parent = outFile.DirectoryName;
if (!Directory.Exists(parent))
Directory.CreateDirectory(parent);
Stream fous = outFile.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite);
StreamWriter w = new StreamWriter(fous, Encoding.ASCII);
w.Write(root.ToGnuStepASCIIPropertyList());
w.Close();
fous.Close();
using (Stream fous = outFile.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite))
using (StreamWriter w = new StreamWriter(fous, Encoding.ASCII))
{
w.Write(root.ToGnuStepASCIIPropertyList());
}
}
/// <summary>

6
plist-cil/XmlPropertyListParser.cs
View File

@@ -25,6 +25,7 @@
using System.Xml;
using System.Collections.Generic;
using System.IO;
using System.Linq;
namespace Claunia.PropertyList
{
@@ -79,7 +80,10 @@ namespace Claunia.PropertyList
/// <param name="doc">The XML document.</param>
static NSObject ParseDocument(XmlDocument doc)
{
XmlDocumentType docType = doc.DocumentType;
var docType = doc.ChildNodes
.OfType<XmlNode>()
.SingleOrDefault(n => n.NodeType == XmlNodeType.DocumentType);
if (docType == null)
{
if (!doc.DocumentElement.Name.Equals("plist"))

8
plist-cil/plist-cil.csproj
View File

@@ -8,16 +8,19 @@
<RootNamespace>Claunia.PropertyList</RootNamespace>
<AssemblyName>plist-cil</AssemblyName>
<ReleaseVersion>1.14</ReleaseVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<DefineConstants>DEBUG;NET40</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
@@ -37,6 +40,8 @@
<Command type="AfterBuild" command="nuget pack plist-cil.nuspec -Verbosity Detailed" workingdir="${ProjectDir}" />
</CustomCommands>
</CustomCommands>
<Prefer32Bit>false</Prefer32Bit>
<DefineConstants>NET40</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
@@ -55,6 +60,7 @@
<Compile Include="NSNumber.cs" />
<Compile Include="NSString.cs" />
<Compile Include="NSSet.cs" />
<Compile Include="PropertyListException.cs" />
<Compile Include="UID.cs" />
<Compile Include="NSDate.cs" />
<Compile Include="NSArray.cs" />