Do not parse remote dependencies file twice - references #1101

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+#### 2.5.6 - 01.10.2015
+* PERFORMANCE: Do not parse remote dependencies file twice - https://github.com/fsprojects/Paket/issues/1101
+
 #### 2.5.5 - 01.10.2015
 * PERFORMANCE: Check if we already downloaded paket.dependencies file for remote files in order to reduce stress on API limit - https://github.com/fsprojects/Paket/issues/1101
 

src/Paket.Core/DependenciesFile.fs

@@ -406,7 +406,7 @@ type DependenciesFile(fileName,groups:Map<GroupName,DependenciesGroup>, textRepr
     member __.FileName = fileName
     member __.Lines = textRepresentation
 
-    member __.Resolve(getSha1,getVersionF, getPackageDetailsF,groupsToResolve:Map<GroupName,RequirementsGroup>) =
+    member __.Resolve(force, getSha1, getVersionF, getPackageDetailsF, groupsToResolve:Map<GroupName,RequirementsGroup>) =
         groupsToResolve
         |> Map.map (fun k group ->  
             let rootDependencies =
@@ -415,16 +415,8 @@ type DependenciesFile(fileName,groups:Map<GroupName,DependenciesGroup>, textRepr
                 | Some d -> d
 
             let resolveSourceFile (file:ResolvedSourceFile) : PackageRequirement list =
-                let parserF text =
-                    try
-                        DependenciesFile.FromCode(text) |> ignore
-                        true
-                    with 
-                    | _ -> false
-
-                RemoteDownload.downloadDependenciesFile(Path.GetDirectoryName fileName, group.Name, parserF, file)
+                RemoteDownload.downloadDependenciesFile(force,Path.GetDirectoryName fileName, group.Name, DependenciesFile.FromCode, file)
                 |> Async.RunSynchronously
-                |> DependenciesFile.FromCode
                 |> fun df -> df.Groups.[Constants.MainDependencyGroup].Packages  // We do not support groups in reference files yet
 
             let remoteFiles = ModuleResolver.Resolve(resolveSourceFile,getSha1,group.RemoteFiles)

src/Paket.Core/FindOutdated.fs

@@ -47,7 +47,7 @@ let FindOutdated strict includingPrereleases environment = trial {
               FrameworkRestrictions = group.Options.Settings.FrameworkRestrictions
               PackageRequirements = [] })
 
-    let newResolution = dependenciesFile.Resolve(getSha1,(fun (x,y,_) -> NuGetV2.GetVersions root (x,y)),NuGetV2.GetPackageDetails root true,groups)
+    let newResolution = dependenciesFile.Resolve(true,getSha1,(fun (x,y,_) -> NuGetV2.GetVersions root (x,y)),NuGetV2.GetPackageDetails root true,groups)
 
     let changed = 
         [for kv in lockFile.Groups do

src/Paket.Core/RemoteDownload.fs

@@ -56,7 +56,7 @@ let private rawGistFileUrl owner project fileName =
     sprintf "https://gist.githubusercontent.com/%s/%s/raw/%s" owner project fileName
 
 /// Gets a dependencies file from the remote source and tries to parse it.
-let downloadDependenciesFile(rootPath,groupName,parserF,remoteFile:ModuleResolver.ResolvedSourceFile) = async {
+let downloadDependenciesFile(force,rootPath,groupName,parserF,remoteFile:ModuleResolver.ResolvedSourceFile) = async {
     let fi = FileInfo(remoteFile.Name)
 
     let dependenciesFileName = remoteFile.Name.Replace(fi.Name,Constants.DependenciesFileName)
@@ -78,26 +78,31 @@ let downloadDependenciesFile(rootPath,groupName,parserF,remoteFile:ModuleResolve
     let exists =
         let di = destination.Directory
         let versionFile = FileInfo(Path.Combine(di.FullName, Constants.PaketVersionFileName))
-        not (String.IsNullOrWhiteSpace remoteFile.Commit) && 
+        not force &&
+          not (String.IsNullOrWhiteSpace remoteFile.Commit) && 
           destination.Exists &&
           versionFile.Exists && 
           File.ReadAllText(versionFile.FullName).Contains(remoteFile.Commit)
 
 
     if exists then
-        return File.ReadAllText(destination.FullName)
+        return parserF (File.ReadAllText(destination.FullName))
     else
         let! result = lookupDocument(auth,url)
 
-        let text =
+        let text,depsFile =
             match result with
-            | Some text when parserF text -> text
-            | _ -> ""
+            | Some text -> 
+                    try
+                        text,parserF text
+                    with 
+                    | _ -> "",parserF ""
+            | _ -> "",parserF ""
 
         Directory.CreateDirectory(destination.FullName |> Path.GetDirectoryName) |> ignore
         File.WriteAllText(destination.FullName, text)
 
-        return text }
+        return depsFile }
 
 
 let ExtractZip(fileName : string, targetFolder) = 

src/Paket.Core/UpdateProcess.fs

@@ -154,7 +154,7 @@ let SelectiveUpdate(dependenciesFile : DependenciesFile, updateAll, exclude, for
     let getSha1 origin owner repo branch = RemoteDownload.getSHA1OfBranch origin owner repo branch |> Async.RunSynchronously
     let root = Path.GetDirectoryName dependenciesFile.FileName
 
-    let lockFile = selectiveUpdate (fun d g -> d.Resolve(getSha1,(fun (x,y,_) -> NuGetV2.GetVersions root (x,y)) |> getVersion,NuGetV2.GetPackageDetails root force,g)) oldLockFile dependenciesFile updateAll exclude
+    let lockFile = selectiveUpdate (fun d g -> d.Resolve(force, getSha1,(fun (x,y,_) -> NuGetV2.GetVersions root (x,y)) |> getVersion,NuGetV2.GetPackageDetails root force,g)) oldLockFile dependenciesFile updateAll exclude
     lockFile.Save()
     lockFile
 

src/Paket/Paket.fsproj

@@ -38,7 +38,7 @@
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>c:\code\Paketkopie</StartWorkingDirectory>
-    <StartWorkingDirectory>d:\code\PaketRepro</StartWorkingDirectory>
+    <StartWorkingDirectory>d:\code\PaketKopie</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

tests/Paket.Tests/TestHelpers.fs

@@ -52,7 +52,7 @@ let ResolveWithGraph(dependenciesFile:DependenciesFile,getSha1,getVersionF, getP
 
     let groups = [Constants.MainDependencyGroup, mainGroup ] |> Map.ofSeq
 
-    dependenciesFile.Resolve(getSha1,getVersionF,getPackageDetailsF,groups)
+    dependenciesFile.Resolve(true,getSha1,getVersionF,getPackageDetailsF,groups)
 
 let getVersion (resolved:ResolvedPackage) = resolved.Version.ToString()
 

tests/Paket.Tests/UpdateProcessSpecs.fs

@@ -43,7 +43,7 @@ let graph =
 let getLockFile lockFileData = LockFile.Parse("",toLines lockFileData)
 let lockFile = lockFileData |> getLockFile
 let resolve' graph (dependenciesFile : DependenciesFile) groups = 
-    dependenciesFile.Resolve(noSha1, VersionsFromGraph graph, PackageDetailsFromGraph graph, groups)
+    dependenciesFile.Resolve(true,noSha1, VersionsFromGraph graph, PackageDetailsFromGraph graph, groups)
 
 let resolve = resolve' graph