Try to report better error when file is blocked by Firewall

fsprojects · Oct 20, 2015 · 73ade42 · 73ade42
1 parent 46a1631
commit 73ade42
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 2 deletions.
diff --git a/src/Paket.Core/NuGetV2.fs b/src/Paket.Core/NuGetV2.fs
@@ -393,8 +393,19 @@ let ExtractPackage(fileName:string, targetFolder, packageName:PackageName, versi
         else
             Directory.CreateDirectory(targetFolder) |> ignore
 
-            fixArchive fileName
-            ZipFile.ExtractToDirectory(fileName, targetFolder)
+            try
+                fixArchive fileName
+                ZipFile.ExtractToDirectory(fileName, targetFolder)
+            with
+            | exn ->
+                let text = ref ""
+                try
+                    text := File.ReadAllText(fileName)
+                with
+                | _ -> ()
+
+                let text = if !text = "" then "" else sprintf " Package contains text: %s%s" !text Environment.NewLine
+                failwithf "Error during extraction of %s.%s%s Message: %s" (Path.GetFullPath fileName) Environment.NewLine text exn.Message
 
             // cleanup folder structure
             let rec cleanup (dir : DirectoryInfo) = 

diff --git a/tests/Paket.Tests/ExtractPackageSpecs.fs b/tests/Paket.Tests/ExtractPackageSpecs.fs
@@ -0,0 +1,26 @@
+module Paket.ExtractPackageSpecs
+
+open System.IO
+open Paket
+open NUnit.Framework
+open FsUnit
+open System
+open System.Net
+open Domain
+
+[<Test>]
+let ``should report blocked download``() =
+    let di = Path.Combine(Path.GetTempPath(),"PaketTests/Extract")
+    if Directory.Exists di then
+        Directory.Delete(di,true)
+    Directory.CreateDirectory(di) |> ignore
+    let fileName = Path.Combine(di,"FSharp.Data.nupkg")
+    File.Copy("Nuspec/FSharp.Data.nuspec",fileName)
+
+    try
+        NuGetV2.ExtractPackage(fileName,di,PackageName "FSharp.Data",SemVer.Parse("0.1.1"))
+        |> Async.RunSynchronously
+
+    with 
+    | exn -> exn.Message
+    |> fun error -> error.Contains("Package contains text:") |> shouldEqual true
diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj
@@ -87,6 +87,7 @@
     <Compile Include="NugetVersionRangeSerializerSpecs.fs" />
     <Compile Include="DependencySetSpecs.fs" />
     <Compile Include="BindingRedirect.fs" />
+    <Compile Include="ExtractPackageSpecs.fs" />
     <Compile Include="UtilsSpecs.fs" />
     <Compile Include="TemplateFileParsing.fs" />
     <Compile Include="NuspecWriterSpecs.fs" />