Use git_blob_fromstream instead of fromchunks

Make GitWriteStream a struct instead of a class so that we can accept a native `git_writestream`. Use `git_blob_fromstream` to stream data into a blob instead of the now-removed `git_blob_fromchunks`.

Author: Edward Thomson

LibGit2Sharp/Core/GitWriteStream.cs

@@ -4,7 +4,7 @@
 namespaceLibGit2Sharp.Core
 {
 [StructLayout(LayoutKind.Sequential)]
-internalclassGitWriteStream
+internalstructGitWriteStream
 {
 [MarshalAs(UnmanagedType.FunctionPtr)]
 publicwrite_fnwrite;

LibGit2Sharp/Core/NativeMethods.cs

@@ -126,6 +126,17 @@ internal delegate int source_callback(
 intmax_length,
 IntPtrdata);
 
+[DllImport(libgit2)]
+internalstaticexternunsafeintgit_blob_create_fromstream(
+outIntPtrstream,
+git_repository*repositoryPtr,
+[MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictFilePathMarshaler))]FilePathhintpath);
+
+[DllImport(libgit2)]
+internalstaticexternunsafeintgit_blob_create_fromstream_commit(
+refGitOidoid,
+IntPtrstream);
+
 [DllImport(libgit2)]
 internalstaticexternunsafeintgit_blob_create_fromchunks(
 refGitOidoid,

LibGit2Sharp/Core/Proxy.cs

@@ -115,18 +115,18 @@ public static unsafe BlameHandle git_blame_file(
 
  #region git_blob_
 
-publicstaticunsafeObjectIdgit_blob_create_fromchunks(RepositoryHandlerepo,FilePathhintpath,NativeMethods.source_callbackfileCallback)
+publicstaticunsafeIntPtrgit_blob_create_fromstream(RepositoryHandlerepo,FilePathhintpath)
 {
-varoid=newGitOid();
-intres=NativeMethods.git_blob_create_fromchunks(refoid,repo,hintpath,fileCallback,IntPtr.Zero);
-
-if(res==(int)GitErrorCode.User)
-{
-thrownewEndOfStreamException("The stream ended unexpectedly");
-}
+IntPtrwritestream_ptr;
 
-Ensure.ZeroResult(res);
+Ensure.ZeroResult(NativeMethods.git_blob_create_fromstream(outwritestream_ptr,repo,hintpath));
+returnwritestream_ptr;
+}
 
+publicstaticunsafeObjectIdgit_blob_create_fromstream_commit(IntPtrwritestream_ptr)
+{
+varoid=newGitOid();
+Ensure.ZeroResult(NativeMethods.git_blob_create_fromstream_commit(refoid,writestream_ptr));
 returnoid;
 }
 

LibGit2Sharp/Filter.cs

@@ -261,8 +261,7 @@ int StreamCreateCallback(out IntPtr git_writestream_out, GitFilter self, IntPtr
 Marshal.StructureToPtr(state.thisStream,state.thisPtr,false);
 
 state.nextPtr=git_writestream_next;
-state.nextStream=newGitWriteStream();
-Marshal.PtrToStructure(state.nextPtr,state.nextStream);
+state.nextStream=(GitWriteStream)Marshal.PtrToStructure(state.nextPtr,typeof(GitWriteStream));
 
 state.filterSource=FilterSource.FromNativePtr(filterSourcePtr);
 state.output=newWriteStream(state.nextStream,state.nextPtr);

LibGit2Sharp/ObjectDatabase.cs

@@ -213,7 +213,7 @@ public virtual Blob CreateBlob(Stream stream, string hintpath, long numberOfByte
 returnCreateBlob(stream,hintpath,(long?)numberOfBytesToConsume);
 }
 
-privateBlobCreateBlob(Streamstream,stringhintpath,long?numberOfBytesToConsume)
+privateunsafeBlobCreateBlob(Streamstream,stringhintpath,long?numberOfBytesToConsume)
 {
 Ensure.ArgumentNotNull(stream,"stream");
 
@@ -228,9 +228,51 @@ private Blob CreateBlob(Stream stream, string hintpath, long? numberOfBytesToCon
 thrownewArgumentException("The stream cannot be read from.","stream");
 }
 
-varproc=newProcessor(stream,numberOfBytesToConsume);
-ObjectIdid=Proxy.git_blob_create_fromchunks(repo.Handle,hintpath,proc.Provider);
+IntPtrwritestream_ptr=Proxy.git_blob_create_fromstream(repo.Handle,hintpath);
+GitWriteStreamwritestream=(GitWriteStream)Marshal.PtrToStructure(writestream_ptr,typeof(GitWriteStream));
 
+try
+{
+varbuffer=newbyte[4*1024];
+longtotalRead=0;
+intread=0;
+
+while(true)
+{
+inttoRead=numberOfBytesToConsume.HasValue?
+(int)Math.Min(numberOfBytesToConsume.Value-totalRead,(long)buffer.Length):
+buffer.Length;
+
+if(toRead>0)
+{
+read=(toRead>0)?stream.Read(buffer,0,toRead):0;
+}
+
+if(read==0)
+{
+break;
+}
+
+ fixed (byte*buffer_ptr=buffer)
+{
+writestream.write(writestream_ptr,(IntPtr)buffer_ptr,(UIntPtr)read);
+}
+
+totalRead+=read;
+}
+
+if(numberOfBytesToConsume.HasValue&&totalRead<numberOfBytesToConsume.Value)
+{
+thrownewEndOfStreamException("The stream ended unexpectedly");
+}
+}
+catch(Exceptione)
+{
+writestream.free(writestream_ptr);
+throwe;
+}
+
+ObjectIdid=Proxy.git_blob_create_fromstream_commit(writestream_ptr);
 returnrepo.Lookup<Blob>(id);
 }