"kpm restore" ignores nonexistent local package feeds and gives warnings

Author: ChengTian

src/Microsoft.Framework.PackageManager/Commands/InstallCommand.cs

@@ -55,15 +55,14 @@ public async Task<bool> ExecuteCommand()
             var packageFeeds = new List<IPackageFeed>();
             foreach (var source in effectiveSources)
             {
-                if (new Uri(source.Source).IsFile)
+                var feed = PackageSourceUtils.CreatePackageFeed(
+                    source,
+                    _restoreCommand.NoCache,
+                    _restoreCommand.IgnoreFailedSources,
+                    Reports);
+                if (feed != null)
                 {
-                    packageFeeds.Add(PackageFolderFactory.CreatePackageFolderFromPath(source.Source, Reports.Quiet));
-                }
-                else
-                {
-                    packageFeeds.Add(new NuGetv2Feed(
-                        source.Source, source.UserName, source.Password, _restoreCommand.NoCache, Reports,
-                        _restoreCommand.IgnoreFailedSources));
+                    packageFeeds.Add(feed);
                 }
             }
 

src/Microsoft.Framework.PackageManager/Restore/NuGet/IPackageFeed.cs

@@ -10,6 +10,7 @@ namespace Microsoft.Framework.PackageManager.Restore.NuGet
 {
     public interface IPackageFeed
     {
+        string Source { get; }
         Task<IEnumerable<PackageInfo>> FindPackagesByIdAsync(string id);
         Task<Stream> OpenNupkgStreamAsync(PackageInfo package);
         Task<Stream> OpenNuspecStreamAsync(PackageInfo package);

src/Microsoft.Framework.PackageManager/Restore/NuGet/KpmPackageFolder.cs

@@ -17,6 +17,8 @@ public class KpmPackageFolder : IPackageFeed
         private readonly IFileSystem _fileSystem;
         private readonly IPackagePathResolver _pathResolver;
 
+        public string Source { get; }
+
         public KpmPackageFolder(
             string physicalPath,
             IReport report)
@@ -27,6 +29,7 @@ public KpmPackageFolder(
             _fileSystem = new PhysicalFileSystem(physicalPath);
             _pathResolver = new DefaultPackagePathResolver(_fileSystem);
             _report = report;
+            Source = physicalPath;
         }
 
         public Task<IEnumerable<PackageInfo>> FindPackagesByIdAsync(string id)

src/Microsoft.Framework.PackageManager/Restore/NuGet/NuGetPackageFolder.cs

@@ -14,12 +14,15 @@ public class NuGetPackageFolder : IPackageFeed
         private readonly IReport _report;
         private readonly LocalPackageRepository _repository;
 
+        public string Source { get; }
+
         public NuGetPackageFolder(
             string physicalPath,
             IReport report)
         {
             _repository = new LocalPackageRepository(physicalPath, report);
             _report = report;
+            Source = physicalPath;
         }
 
         public Task<IEnumerable<PackageInfo>> FindPackagesByIdAsync(string id)

src/Microsoft.Framework.PackageManager/Restore/NuGet/NuGetv2Feed.cs

@@ -33,6 +33,8 @@ public class NuGetv2Feed : IPackageFeed
         private readonly Dictionary<string, Task<IEnumerable<PackageInfo>>> _packageVersionsCache = new Dictionary<string, Task<IEnumerable<PackageInfo>>>();
         private readonly Dictionary<string, Task<NupkgEntry>> _nupkgCache = new Dictionary<string, Task<NupkgEntry>>();
 
+        public string Source { get; }
+
         public NuGetv2Feed(
             string baseUri,
             string userName,
@@ -55,6 +57,7 @@ public NuGetv2Feed(
                 _cacheAgeLimitList = TimeSpan.FromMinutes(30);
                 _cacheAgeLimitNupkg = TimeSpan.FromHours(24);
             }
+            Source = baseUri;
         }
 
         public Task<IEnumerable<PackageInfo>> FindPackagesByIdAsync(string id)

src/Microsoft.Framework.PackageManager/Restore/RemoteWalkProvider.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -16,10 +17,10 @@ public class RemoteWalkProvider : IWalkProvider
     {
         private readonly IPackageFeed _source;
 
-        public RemoteWalkProvider(IPackageFeed source, bool isHttp)
+        public RemoteWalkProvider(IPackageFeed source)
         {
             _source = source;
-            IsHttp = isHttp;
+            IsHttp = IsHttpSource(source);
         }
 
         public bool IsHttp { get; private set; }
@@ -87,6 +88,12 @@ public async Task CopyToAsync(WalkProviderMatch match, Stream stream)
                 await nupkgStream.CopyToAsync(stream);
             }
         }
+
+        private static bool IsHttpSource(IPackageFeed source)
+        {
+            return source.Source.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+                source.Source.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
+        }
     }
 }
 

src/Microsoft.Framework.PackageManager/Restore/RestoreCommand.cs

@@ -460,27 +460,10 @@ private void AddRemoteProvidersFromSources(List<IWalkProvider> remoteProviders,
         {
             foreach (var source in effectiveSources)
             {
-                if (new Uri(source.Source).IsFile)
+                var feed = PackageSourceUtils.CreatePackageFeed(source, NoCache, IgnoreFailedSources, Reports);
+                if (feed != null)
                 {
-                    remoteProviders.Add(
-                        new RemoteWalkProvider(
-                            PackageFolderFactory.CreatePackageFolderFromPath(
-                                source.Source,
-                                Reports.Quiet),
-                            isHttp: false));
-                }
-                else
-                {
-                    remoteProviders.Add(
-                        new RemoteWalkProvider(
-                            new NuGetv2Feed(
-                                source.Source,
-                                source.UserName,
-                                source.Password,
-                                NoCache,
-                                Reports,
-                                ignoreFailure: IgnoreFailedSources),
-                            isHttp: true));
+                    remoteProviders.Add(new RemoteWalkProvider(feed));
                 }
             }
         }

src/Microsoft.Framework.PackageManager/Utils/PackageSourceUtils.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using NuGet;
+using Microsoft.Framework.PackageManager.Restore.NuGet;
 
 namespace Microsoft.Framework.PackageManager
 {
@@ -25,6 +26,31 @@ public static List<PackageSource> GetEffectivePackageSources(IPackageSourceProvi
             return enabledSources.Concat(addedSources).Distinct().ToList();
         }
 
+        public static IPackageFeed CreatePackageFeed(PackageSource source, bool noCache, bool ignoreFailedSources,
+            Reports reports)
+        {
+            if (new Uri(source.Source).IsFile)
+            {
+                if (!Directory.Exists(source.Source))
+                {
+                    reports.Information.WriteLine("Package source {0} doesn't exist",
+                        source.Source.Yellow().Bold());
+                    return null;
+                }
+                return PackageFolderFactory.CreatePackageFolderFromPath(source.Source, reports.Quiet);
+            }
+            else
+            {
+                return new NuGetv2Feed(
+                    source.Source,
+                    source.UserName,
+                    source.Password,
+                    noCache,
+                    reports,
+                    ignoreFailedSources);
+            }
+        }
+
         private static bool CorrectName(string value, PackageSource source)
         {
             return source.Name.Equals(value, StringComparison.CurrentCultureIgnoreCase) ||