Minor refactoring

nulltoken · nulltoken · commit 41a1bae8287d · 2015-02-12T20:55:28.000+01:00
diff --git a/LibGit2Sharp/BlobExtensions.cs b/LibGit2Sharp/BlobExtensions.cs
@@ -22,10 +22,7 @@ public static string GetContentText(this Blob blob, Encoding encoding = null)
         {
             Ensure.ArgumentNotNull(blob, "blob");
 
-            using (var reader = new StreamReader(blob.GetContentStream(), encoding ?? Encoding.UTF8, encoding == null))
-            {
-                return reader.ReadToEnd();
-            }
+            return ReadToEnd(blob.GetContentStream, encoding);
         }
 
         /// <summary>
@@ -43,7 +40,12 @@ public static string GetContentText(this Blob blob, FilteringOptions filteringOp
             Ensure.ArgumentNotNull(blob, "blob");
             Ensure.ArgumentNotNull(filteringOptions, "filteringOptions");
 
-            using (var reader = new StreamReader(blob.GetContentStream(filteringOptions), encoding ?? Encoding.UTF8, encoding == null))
+            return ReadToEnd(() => blob.GetContentStream(filteringOptions), encoding);
+        }
+
+        private static string ReadToEnd(Func<Stream> streamProvider, Encoding encoding)
+        {
+            using (var reader = new StreamReader(streamProvider(), encoding ?? Encoding.UTF8, encoding == null))
             {
                 return reader.ReadToEnd();
             }

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,7 @@ public static string GetContentText(this Blob blob, Encoding encoding = null)`
`22`	`22`	`{`
`23`	`23`	`Ensure.ArgumentNotNull(blob, "blob");`
`24`	`24`
`25`		`- using (var reader = new StreamReader(blob.GetContentStream(), encoding ?? Encoding.UTF8, encoding == null))`
`26`		`- {`
`27`		`- return reader.ReadToEnd();`
`28`		`- }`
	`25`	`+ return ReadToEnd(blob.GetContentStream, encoding);`
`29`	`26`	`}`
`30`	`27`
`31`	`28`	`/// <summary>`
`@@ -43,7 +40,12 @@ public static string GetContentText(this Blob blob, FilteringOptions filteringOp`
`43`	`40`	`Ensure.ArgumentNotNull(blob, "blob");`
`44`	`41`	`Ensure.ArgumentNotNull(filteringOptions, "filteringOptions");`
`45`	`42`
`46`		`- using (var reader = new StreamReader(blob.GetContentStream(filteringOptions), encoding ?? Encoding.UTF8, encoding == null))`
	`43`	`+ return ReadToEnd(() => blob.GetContentStream(filteringOptions), encoding);`
	`44`	`+ }`
	`45`	`+`
	`46`	`+ private static string ReadToEnd(Func<Stream> streamProvider, Encoding encoding)`
	`47`	`+ {`
	`48`	`+ using (var reader = new StreamReader(streamProvider(), encoding ?? Encoding.UTF8, encoding == null))`
`47`	`49`	`{`
`48`	`50`	`return reader.ReadToEnd();`
`49`	`51`	`}`