1.0.0-preview2

Author: ThatRendle

.gitignore

@@ -28,8 +28,10 @@ build/
 # Visual Studio 2015 cache/options directory
 .vs/
 .vscode/
+.idea/
 # Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
+wwwroot/
+unpkg.json
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

Add.cs

@@ -4,16 +4,10 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
 
 namespace dotnet_unpkg
 {
-    static class UnpkgJson
-    {
-        
-    }
-
-    static class Add
+    public static class Add
     {
         private static readonly HttpClient Client = new HttpClient
         {
@@ -22,15 +16,22 @@ static class Add
 
         private static readonly string BaseDirectory = Path.Combine("wwwroot", "lib");
 
-        public static async Task<List<UnpkgJsonEntry>> Run(IEnumerable<string> args)
+        public static async Task Run(IEnumerable<string> args)
         {
+            var argList = args.ToList();
+            if (argList[0] == "--help" || argList[0] == "-h")
+            {
+                Help.Add();
+                return;
+            }
+            
             if (!Directory.Exists(BaseDirectory))
             {
                 Directory.CreateDirectory(BaseDirectory);
             }
 
-            var results = await Task.WhenAll(args.Select(AddPackage));
-            return results.ToList();
+            var results = await Task.WhenAll(argList.Select(AddPackage));
+            await UnpkgJson.Save(results);
         }
 
         private static async Task<UnpkgJsonEntry> AddPackage(string package)
@@ -41,56 +42,26 @@ private static async Task<UnpkgJsonEntry> AddPackage(string package)
                 return null;
             }
 
-            await Download(package, distFile.BaseUrl, distFile.Files);
+            await DownloadPackage(package, distFile.BaseUrl, distFile.Files);
             return UnpkgJsonEntry.Create(package, distFile);
         }
 
-        private static Task Download(string package, string basePath, IEnumerable<DistFile> files)
+        private static Task DownloadPackage(string package, string basePath, IEnumerable<DistFile> files)
         {
             var tasks = new List<Task>();
             foreach (var file in files)
             {
                 if (file.Type == "file")
                 {
-                    tasks.Add(Download(package, basePath, file.Path));
+                    tasks.Add(Download.DistFile(package, $"{basePath}{file.Path}"));
                 }
                 else if (file.Files?.Count > 0)
                 {
-                    tasks.Add(Download(package, basePath, file.Files));
+                    tasks.Add(DownloadPackage(package, basePath, file.Files));
                 }
             }
 
             return Task.WhenAll(tasks);
         }
-
-        private static async Task Download(string package, string basePath, string path)
-        {
-            using (var response = await Client.GetAsync($"{basePath}{path}"))
-            {
-                if (response.IsSuccessStatusCode)
-                {
-                    // Remove /dist/ from start of path
-                    path = path.Substring(6);
-                    
-                    if (Path.DirectorySeparatorChar != '/')
-                    {
-                        path = path.Replace('/', Path.DirectorySeparatorChar);
-                    }
-                
-                    var file = Path.GetFileName(path);
-                    var directory = Path.Combine(BaseDirectory, package, Path.GetDirectoryName(path));
-
-                    if (!Directory.Exists(directory))
-                    {
-                        Directory.CreateDirectory(directory);
-                    }
-
-                    using (var fileStream = File.Create(Path.Combine(directory, file)))
-                    {
-                        await response.Content.CopyToAsync(fileStream);
-                    }
-                }
-            }
-        }
     }
 }

Dist.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -8,23 +9,18 @@
 
 namespace dotnet_unpkg
 {
-    public class Dist
+    public static class Dist
     {
         private static readonly Regex EndPart = new Regex(@"\/dist\/\?meta$");
         private static readonly HttpClient Client = CreateClient();
 
         public static async Task<DistFile> Get(string package)
         {
-            var url = $"https://unpkg.com/{package}/dist/?meta";
-            var response = await Client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
-            while (response.StatusCode == HttpStatusCode.Redirect)
-            {
-                Console.WriteLine(response.Headers.Location);
-                url = response.Headers.Location.ToString();
-                response = await Client.GetAsync(url);
-            }
+            var response = await Find(package);
+            var url = response.RequestMessage.RequestUri.AbsolutePath;
             if (response.IsSuccessStatusCode)
             {
+                Console.WriteLine($"Found {UnpkgJson.CleanVersion(url)}");
                 var json = await response.Content.ReadAsStringAsync();
                 var distFile = JsonConvert.DeserializeObject<DistFile>(json);
                 distFile.BaseUrl = EndPart.Replace(url, string.Empty);
@@ -35,6 +31,45 @@ public static async Task<DistFile> Get(string package)
             return null;
         }
 
+        private static async Task<HttpResponseMessage> Find(string package)
+        {
+            string url;
+            if (package.Contains("/"))
+            {
+                var parts = package.Split('/');
+                url = $"{parts[0]}/dist/{string.Join('/', parts.Skip(1))}/?meta";
+            }
+            else
+            {
+                url = $"{package}/dist/?meta";
+            }
+
+            var response = await FollowRedirects(url);
+            
+            if (response.IsSuccessStatusCode)
+            {
+                return response;
+            }
+            
+            response.Dispose();
+
+            return await FollowRedirects($"{package}/?meta");
+        }
+
+        private static async Task<HttpResponseMessage> FollowRedirects(string url)
+        {
+            var response = await Client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
+            
+            while (response.StatusCode == HttpStatusCode.Redirect)
+            {
+                url = response.Headers.Location.ToString();
+                response.Dispose();
+                response = await Client.GetAsync(url);
+            }
+
+            return response;
+        }
+
         private static HttpClient CreateClient()
         {
             var httpMessageHandler = new HttpClientHandler

Download.cs

@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace dotnet_unpkg
+{
+    public static class Download
+    {
+        private static readonly HttpClient Client = new HttpClient
+        {
+            BaseAddress = new Uri("https://unpkg.com")
+        };
+        private static readonly string BaseDirectory = Path.Combine("wwwroot", "lib");
+        
+        public static async Task DistFile(string package, string path)
+        {
+            var target = TargetFile(path);
+            using (var response = await Client.GetAsync(path))
+            {
+                if (response.IsSuccessStatusCode)
+                {
+                    var file = Path.GetFileName(target);
+                    var directory = Path.Combine(BaseDirectory, package, Path.GetDirectoryName(target));
+
+                    if (!Directory.Exists(directory))
+                    {
+                        Directory.CreateDirectory(directory);
+                    }
+
+                    using (var fileStream = File.Create(Path.Combine(directory, file)))
+                    {
+                        await response.Content.CopyToAsync(fileStream);
+                    }
+
+                    Console.WriteLine($"{Path.Combine(package, target)}... OK");
+                }
+                else
+                {
+                    Console.WriteLine($"{Path.Combine(package, target)}... failed ({(int)response.StatusCode}");
+                }
+            }
+        }
+
+        private static string TargetFile(string path) => path.Contains("/dist/")
+            ? string.Join(Path.DirectorySeparatorChar,
+                path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries)
+                    .SkipWhile(s => !s.Equals("dist", StringComparison.OrdinalIgnoreCase))
+                    .Skip(1))
+            : string.Join(Path.DirectorySeparatorChar,
+                path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries)
+                    .Skip(1));
+    }
+}

Program.cs

@@ -4,18 +4,38 @@
 
 namespace dotnet_unpkg
 {
-    class Program
+    public static class Program
     {
         static async Task Main(string[] args)
         {
             if (args.Length == 0)
             {
-                Console.Error.WriteLine("Usage: unpkg add [package]");
+                Help.Empty();
+                return;
             }
 
-            if (args[0] == "add")
+            try
             {
-                await Add.Run(args.Skip(1));
+            switch (args[0])
+            {
+                case "--help":
+                case "-h":
+                    Help.Empty();
+                    return;
+                case "add":
+                    await Add.Run(args.Skip(1));
+                    break;
+                case "restore":
+                    await Restore.Run(args.Skip(1));
+                    break;
+                default:
+                    Help.Empty();
+                    break;
+            }
+            }
+            catch (Exception exception)
+            {
+                Console.WriteLine(exception);
             }
         }
     }