1.2 Support sub-folders in namespaced packages

Author: ThatRendle

.gitignore

@@ -29,7 +29,8 @@ build/
 .vs/
 .vscode/
 .idea/
-# Uncomment if you have tasks that create the project's static files in wwwroot
+
+# Local test files
 wwwroot/
 unpkg.json
 

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.0
+
+- Added support for sub-directories in namespaced packages like `dotnet unpkg add @aspnet/signalr/browser`
+
 ## 1.1.0
 
 - Added support for namespaced packages like `@aspnet/signalr`

Dist.cs

@@ -34,16 +34,32 @@ public static async Task<DistFile> Get(string package)
         private static async Task<HttpResponseMessage> Find(string package)
         {
             string url;
-            if (package.Contains("/"))
+            var parts = package.Split('/');
+            string sub = null;
+
+            if (package.StartsWith('@') && parts.Length > 1)
+            {
+                package = $"{parts[0]}/{parts[1]}";
+                if (parts.Length > 2)
+                {
+                    sub = string.Join('/', parts.Skip(2));
+                }
+            }
+            else if (parts.Length > 1)
+            {
+                package = parts[0];
+                sub = string.Join('/', parts.Skip(1));
+            }
+
+            if (sub != null)
             {
-                var parts = package.Split('/');
-                url = $"{parts[0]}/dist/{string.Join('/', parts.Skip(1))}/?meta";
+                url = $"{package}/dist/{sub}/?meta";
             }
             else
             {
                 url = $"{package}/dist/?meta";
             }
-
+            
             var response = await FollowRedirects(url);
 
             if (response.IsSuccessStatusCode)

README.md

@@ -86,6 +86,16 @@ $ dotnet unpkg add bootswatch/yeti
 That just installs the **Yeti** theme within the larger Bootswatch package. If
 you just install Bootswatch by itself, you'll get all 20-odd themes.
 
+**New in 1.2**
+
+You can now specify paths with namespaced packages. This is incredibly useful if you want to install [Rx.js](http://reactivex.io/rxjs/)
+because it's *huge*, and all you want is the `global` folder:
+
+```
+$ dotnet unpkg add @reactivex/rxjs/global
+```
+And you'll just get the four `<script>`-tag-friendly files that you need, and not the hundreds of Node and Webpack and source files.
+
 ### unpkg.json
 
 The `add` command stores the details about the files it downloaded into a file in the current directory, `unpkg.json`. Once that's there, you can just run

dotnet-unpkg.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>latest</LangVersion>