Put feed url into cache filename - references #487

fsprojects · Jan 1, 2015 · a1509e1 · a1509e1
1 parent 8edfd31
commit a1509e1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 0.20.9 - 01.01.2015
+* PERFORMANCE: Put feed url into cache filename - https://github.com/fsprojects/Paket/issues/487
+
 #### 0.20.8 - 01.01.2015
 * Disable NuGet v3 for now - seems to be unreliable.
 

diff --git a/src/Paket.Core/NuGetV2.fs b/src/Paket.Core/NuGetV2.fs
@@ -241,17 +241,16 @@ let private loadFromCacheOrOData force fileName auth nugetURL package version =
 let getDetailsFromNuget force auth nugetURL package (version:SemVerInfo) = 
     async {
         try            
-            let fi = 
-                let packageUrl = sprintf "%s.%s.json" package (version.Normalize())
+            let cacheFile = 
+                let h = nugetURL |> normalizeUrl |> hash |> abs
+                let packageUrl = sprintf "%s.%s.s%d.json" package (version.Normalize()) h
                 FileInfo(Path.Combine(CacheFolder,packageUrl))
 
-            let! (invalidCache,details) = loadFromCacheOrOData force fi.FullName auth nugetURL package version
-            if normalizeUrl details.SourceUrl <> normalizeUrl nugetURL then
-                return! getDetailsFromNuGetViaOData auth nugetURL package version 
-            else
-                if invalidCache then
-                    File.WriteAllText(fi.FullName,JsonConvert.SerializeObject(details))
-                return details
+            let! (invalidCache,details) = loadFromCacheOrOData force cacheFile.FullName auth nugetURL package version
+
+            if invalidCache then
+                File.WriteAllText(cacheFile.FullName,JsonConvert.SerializeObject(details))
+            return details
         with
         | _ -> return! getDetailsFromNuGetViaOData auth nugetURL package version 
     }    

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -28,12 +28,12 @@
     <DocumentationFile>
     </DocumentationFile>
     <StartArguments>update -f</StartArguments>
-    <StartArguments>update</StartArguments>
+    <StartArguments>install</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>
     </StartWorkingDirectory>
-    <StartWorkingDirectory>c:\code\suave</StartWorkingDirectory>
+    <StartWorkingDirectory>c:\code\PaketKopie</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>