Add FilePath and FilePathMarshaler

libgit2 · dahlbyk · Oct 2, 2011 · Oct 8, 2011 · Oct 8, 2011 · Mar 6, 2012
commit c1a8e5f423783e866a01ef1facaa32da70daec1b
diff --git a/LibGit2Sharp/Core/FilePath.cs b/LibGit2Sharp/Core/FilePath.cs
@@ -0,0 +1,34 @@
+namespace LibGit2Sharp.Core
+{
+    internal class FilePath
+    {
+        private readonly string native;
+        private readonly string posix;
+
+        private FilePath(string path)
+        {
+            native = PosixPathHelper.ToNative(path);
+            posix = PosixPathHelper.ToPosix(path);
+        }
+
+        public string Native
+        {
+            get { return native; }
+        }
+
+        public string Posix
+        {
+            get { return posix; }
+        }
+
+        public override string ToString()
+        {
+            return Native;
+        }
+
+        public static implicit operator FilePath(string path)
+        {
+            return path == null ? null : new FilePath(path);
+        }
+    }
+}
diff --git a/LibGit2Sharp/Core/FilePathMarshaler.cs b/LibGit2Sharp/Core/FilePathMarshaler.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace LibGit2Sharp.Core
+{
+    internal class FilePathMarshaler : Utf8Marshaler
+    {
+        private static FilePathMarshaler staticInstance;
+
+        public override IntPtr MarshalManagedToNative(object managedObj)
+        {
+            if (managedObj == null)
+            {
+                return IntPtr.Zero;
+            }
+
+            if (!(managedObj is FilePath))
+            {
+                throw new MarshalDirectiveException("FilePathMarshaler must be used on a FilePath.");
+            }
+
+            return StringToNative(((FilePath)managedObj).Posix);
+        }
+
+        public override object MarshalNativeToManaged(IntPtr pNativeData)
+        {
+            return (FilePath)NativeToString(pNativeData);
+        }
+
+        public static new ICustomMarshaler GetInstance(string cookie)
+        {
+            if (staticInstance == null)
+            {
+                return staticInstance = new FilePathMarshaler();
+            }
+
+            return staticInstance;
+        }
+    }
+}
diff --git a/LibGit2Sharp/Core/Utf8Marshaler.cs b/LibGit2Sharp/Core/Utf8Marshaler.cs
@@ -8,7 +8,7 @@ internal class Utf8Marshaler : ICustomMarshaler
     {
         private static Utf8Marshaler staticInstance;
 
-        public unsafe IntPtr MarshalManagedToNative(object managedObj)
+        public virtual IntPtr MarshalManagedToNative(object managedObj)
         {
             if (managedObj == null)
             {
@@ -20,8 +20,13 @@ public unsafe IntPtr MarshalManagedToNative(object managedObj)
                 throw new MarshalDirectiveException("UTF8Marshaler must be used on a string.");
             }
 
+            return StringToNative((string)managedObj);
+        }
+
+        protected unsafe IntPtr StringToNative(string value)
+        {
             // not null terminated
-            byte[] strbuf = Encoding.UTF8.GetBytes((string)managedObj);
+            byte[] strbuf = Encoding.UTF8.GetBytes(value);
             IntPtr buffer = Marshal.AllocHGlobal(strbuf.Length + 1);
             Marshal.Copy(strbuf, 0, buffer, strbuf.Length);
 
@@ -32,7 +37,12 @@ public unsafe IntPtr MarshalManagedToNative(object managedObj)
             return buffer;
         }
 
-        public unsafe object MarshalNativeToManaged(IntPtr pNativeData)
+        public virtual object MarshalNativeToManaged(IntPtr pNativeData)
+        {
+            return NativeToString(pNativeData);
+        }
+
+        protected unsafe string NativeToString(IntPtr pNativeData)
         {
             var walk = (byte*)pNativeData;
 

diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -51,6 +51,8 @@
     <Compile Include="Commit.cs" />
     <Compile Include="CommitCollection.cs" />
     <Compile Include="Configuration.cs" />
+    <Compile Include="Core\FilePath.cs" />
+    <Compile Include="Core\FilePathMarshaler.cs" />
     <Compile Include="ConfigurationLevel.cs" />
     <Compile Include="Core\Compat\Tuple.cs" />
     <Compile Include="Core\DisposableEnumerable.cs" />