ObjectDatabase: Add Write(Stream, ...)

ethomson · ethomson · commit 2eeb068f18a1 · 2017-11-29T17:50:11.000Z
Provide a mechanism to write a stream directly to an object database.
diff --git a/LibGit2Sharp.Tests/ObjectDatabaseFixture.cs b/LibGit2Sharp.Tests/ObjectDatabaseFixture.cs
@@ -133,6 +133,19 @@ public void CanWriteABlobFromAByteArray()
             }
         }
 
+        [Fact]
+        public void CanWriteABlobFromAStream()
+        {
+            var ba = Encoding.ASCII.GetBytes("libgit2\r\n");
+
+            using (var stream = new MemoryStream(ba))
+            using (var repo = new Repository(InitNewRepository()))
+            {
+                var id = repo.ObjectDatabase.Write<Blob>(stream, stream.Length);
+                Assert.Equal(new ObjectId("99115ea359379a218c47cffc83cd0af8c91c4061"), id);
+            }
+        }
+
         Stream PrepareMemoryStream(int contentSize)
         {
             var sb = new StringBuilder();
diff --git a/LibGit2Sharp/ObjectDatabase.cs b/LibGit2Sharp/ObjectDatabase.cs
@@ -187,6 +187,45 @@ public virtual ObjectId Write<T>(byte[] data) where T : GitObject
             return Proxy.git_odb_write(handle, data, GitObject.TypeToKindMap[typeof(T)]);
         }
 
+        /// <summary>
+        /// Writes an object to the object database.
+        /// </summary>
+        /// <param name="stream">The contents of the object</param>
+        /// <param name="numberOfBytesToConsume">The number of bytes to consume from the stream</param>
+        /// <typeparam name="T">The type of object to write</typeparam>
+        public virtual ObjectId Write<T>(Stream stream, long numberOfBytesToConsume) where T : GitObject
+        {
+            Ensure.ArgumentNotNull(stream, "stream");
+
+            if (!stream.CanRead)
+            {
+                throw new ArgumentException("The stream cannot be read from.", "stream");
+            }
+
+            using (var odbStream = Proxy.git_odb_open_wstream(handle, numberOfBytesToConsume, GitObjectType.Blob))
+            {
+                var buffer = new byte[4 * 1024];
+                long totalRead = 0;
+
+                while (totalRead < numberOfBytesToConsume)
+                {
+                    long left = numberOfBytesToConsume - totalRead;
+                    int toRead = left < buffer.Length ? (int)left : buffer.Length;
+                    var read = stream.Read(buffer, 0, toRead);
+
+                    if (read == 0)
+                    {
+                        throw new EndOfStreamException("The stream ended unexpectedly");
+                    }
+
+                    Proxy.git_odb_stream_write(odbStream, buffer, read);
+                    totalRead += read;
+                }
+
+                return Proxy.git_odb_stream_finalize_write(odbStream);
+            }
+        }
+
         /// <summary>
         /// Inserts a <see cref="Blob"/> into the object database, created from the content of a stream.
         /// <para>Optionally, git filters will be applied to the content before storing it.</para>
@@ -294,37 +333,8 @@ private unsafe Blob CreateBlob(Stream stream, string hintpath, long? numberOfByt
         /// <returns>The created <see cref="Blob"/>.</returns>
         public virtual Blob CreateBlob(Stream stream, long numberOfBytesToConsume)
         {
-            Ensure.ArgumentNotNull(stream, "stream");
-
-            if (!stream.CanRead)
-            {
-                throw new ArgumentException("The stream cannot be read from.", "stream");
-            }
-
-            using (var odbStream = Proxy.git_odb_open_wstream(handle, numberOfBytesToConsume, GitObjectType.Blob))
-            {
-                var buffer = new byte[4 * 1024];
-                long totalRead = 0;
-
-                while (totalRead < numberOfBytesToConsume)
-                {
-                    long left = numberOfBytesToConsume - totalRead;
-                    int toRead = left < buffer.Length ? (int)left : buffer.Length;
-                    var read = stream.Read(buffer, 0, toRead);
-
-                    if (read == 0)
-                    {
-                        throw new EndOfStreamException("The stream ended unexpectedly");
-                    }
-
-                    Proxy.git_odb_stream_write(odbStream, buffer, read);
-                    totalRead += read;
-                }
-
-                var id = Proxy.git_odb_stream_finalize_write(odbStream);
-
-                return repo.Lookup<Blob>(id);
-            }
+            var id = Write<Blob>(stream, numberOfBytesToConsume);
+            return repo.Lookup<Blob>(id);
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,19 @@ public void CanWriteABlobFromAByteArray()`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
	`136`	`+ [Fact]`
	`137`	`+ public void CanWriteABlobFromAStream()`
	`138`	`+ {`
	`139`	`+ var ba = Encoding.ASCII.GetBytes("libgit2\r\n");`
	`140`	`+`
	`141`	`+ using (var stream = new MemoryStream(ba))`
	`142`	`+ using (var repo = new Repository(InitNewRepository()))`
	`143`	`+ {`
	`144`	`+ var id = repo.ObjectDatabase.Write<Blob>(stream, stream.Length);`
	`145`	`+ Assert.Equal(new ObjectId("99115ea359379a218c47cffc83cd0af8c91c4061"), id);`
	`146`	`+ }`
	`147`	`+ }`
	`148`	`+`
`136`	`149`	`Stream PrepareMemoryStream(int contentSize)`
`137`	`150`	`{`
`138`	`151`	`var sb = new StringBuilder();`