feat(ipfsServer.ipfs): if directory contains "index.html" then show it

richardschneider · May 29, 2019 · b0e9276 · b0e9276
1 parent ecebe52
commit b0e9276
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/IpfsServer/Pages/ipfs.cshtml.cs b/IpfsServer/Pages/ipfs.cshtml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Net.Http.Headers;
 using System.Threading;
@@ -93,11 +94,30 @@ public IEnumerable<IFileSystemLink> Directories
         /// </remarks>
         public async Task<IActionResult> OnGetAsync(CancellationToken cancel)
         {
-            node = await ipfs.FileSystem.ListFileAsync(Path, cancel);
+            if (String.IsNullOrWhiteSpace(Path))
+            {
+                return NotFound();
+            }
+
+            try
+            {
+                node = await ipfs.FileSystem.ListFileAsync(Path, cancel);
+            }
+            catch (ArgumentException e)
+            {
+                return NotFound(e.Message);
+            }
 
-            // If a directory, then display a page with directory contents.
+            // If a directory, then display a page with directory contents or if
+            // the directory contain "index.html", redirect to the page.
             if (node.IsDirectory)
             {
+                if (!Path.EndsWith("/") && node.Links.Any(l => l.Name == "index.html"))
+                {
+                    return Redirect($"/ipfs/{Path}/index.html");
+                }
+
+                Path = Path.TrimEnd('/');
                 return Page();
             }
 

diff --git a/IpfsServer/WebUIController.cs b/IpfsServer/WebUIController.cs
@@ -18,7 +18,7 @@ public class WebUIController : Controller
         [HttpGet]
         public ActionResult Get()
         {
-            return Redirect("/ipfs/QmfQkD8pBSBCBxWEwFSu4XaDVSWK6bjnNuaWZjMyQbyDub/index.html");
+            return Redirect("/ipfs/QmfQkD8pBSBCBxWEwFSu4XaDVSWK6bjnNuaWZjMyQbyDub");
         }
 
     }

diff --git a/src/IpfsEngine.csproj b/src/IpfsEngine.csproj
@@ -37,7 +37,7 @@
 
   <ItemGroup>
     <PackageReference Include="Ipfs.Core" Version="0.50.1" />
-    <PackageReference Include="Makaretu.Dns.Unicast" Version="0.8.0" />
+    <PackageReference Include="Makaretu.Dns.Unicast" Version="0.9.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="Nito.AsyncEx.Coordination" Version="5.0.0" />
     <PackageReference Include="PeerTalk" Version="0.11.3" />