(GH-5) Interface for PackageDownloader

Also allow overriding PackageDownloader
chocolatey · Dec 18, 2016 · 19986e7 · 19986e7
1 parent a48c742
commit 19986e7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
@@ -209,6 +209,7 @@
     <Compile Include="FileModifiers\XmlTransfomer.cs" />
     <Compile Include="Http\IHttpClient.cs" />
     <Compile Include="Utility\FrameworkNameEqualityComparer.cs" />
+    <Compile Include="Utility\IPackageDownloader.cs" />
     <Compile Include="Utility\IProgressProvider.cs" />
     <Compile Include="Utility\IVersionSpec.cs" />
     <Compile Include="Utility\MemoryCache.cs" />

diff --git a/src/Core/Utility/IPackageDownloader.cs b/src/Core/Utility/IPackageDownloader.cs
@@ -0,0 +1,11 @@
+namespace NuGet
+{
+    using System;
+    using System.IO;
+
+    public interface IPackageDownloader : IHttpClientEvents
+    {
+        void DownloadPackage(Uri uri, IPackageMetadata package, Stream targetStream);
+        void DownloadPackage(IHttpClient downloadClient, IPackageName package, Stream targetStream);
+    }
+}
diff --git a/src/Core/Utility/PackageDownloader.cs b/src/Core/Utility/PackageDownloader.cs
@@ -5,7 +5,7 @@
 
 namespace NuGet
 {
-    public class PackageDownloader : IHttpClientEvents
+    public class PackageDownloader : IPackageDownloader 
     {
         private const string DefaultUserAgentClient = "NuGet Core";
 
@@ -15,7 +15,7 @@ public class PackageDownloader : IHttpClientEvents
         public string CurrentDownloadPackageId
         {
             get;
-            private set;
+            protected set;
         }
 
         public virtual void DownloadPackage(Uri uri, IPackageMetadata package, Stream targetStream)
@@ -32,7 +32,7 @@ public virtual void DownloadPackage(Uri uri, IPackageMetadata package, Stream ta
             DownloadPackage(downloadClient, package, targetStream);
         }
 
-        public void DownloadPackage(IHttpClient downloadClient, IPackageName package, Stream targetStream)
+        public virtual void DownloadPackage(IHttpClient downloadClient, IPackageName package, Stream targetStream)
         {
             if (downloadClient == null)
             {
@@ -68,12 +68,12 @@ public void DownloadPackage(IHttpClient downloadClient, IPackageName package, St
             }
         }
 
-        private void OnPackageDownloadProgress(ProgressEventArgs e)
+        protected virtual void OnPackageDownloadProgress(ProgressEventArgs e)
         {
             ProgressAvailable(this, e);
         }
 
-        private void OnSendingRequest(object sender, WebRequestEventArgs webRequestArgs)
+        protected virtual void OnSendingRequest(object sender, WebRequestEventArgs webRequestArgs)
         {
             SendingRequest(this, webRequestArgs);
         }