Merge pull request #94 from InfinityGhost/release-controller

Move release download logic to separate controller
OpenTabletDriver · Jun 8, 2022 · c28beea · c28beea
2 parents ba92645 + 4ca8db6
commit c28beea
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 26 deletions.
diff --git a/OpenTabletDriver.Web/Controllers/ReleaseController.cs b/OpenTabletDriver.Web/Controllers/ReleaseController.cs
@@ -0,0 +1,28 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using OpenTabletDriver.Web.Core.Services;
+
+#nullable enable
+
+namespace OpenTabletDriver.Web.Controllers
+{
+    public class ReleaseController : Controller
+    {
+        private readonly IReleaseService _releaseService;
+
+        public ReleaseController(IReleaseService releaseService)
+        {
+            _releaseService = releaseService;
+        }
+
+        [Route("{Release}/{Download}/{file}")]
+        public async Task<IActionResult> Download(string file)
+        {
+            var release = await _releaseService.GetLatestRelease();
+            var assets = await release.GetReleaseAssets();
+            var asset = assets.First(a => a.FileName == file);
+            return Redirect(asset.Url);
+        }
+    }
+}
diff --git a/OpenTabletDriver.Web/Views/Wiki/Install/Linux.cshtml b/OpenTabletDriver.Web/Views/Wiki/Install/Linux.cshtml
@@ -1,20 +1,14 @@
-@using OpenTabletDriver.Web.Core.Services
-
-@inject IReleaseService releaseService
-
 @{
     ViewBag.Title = "Linux Installation Guide";
-    var release = await releaseService.GetLatestRelease();
-    var assets = await release.GetReleaseAssets();
-    var deb = assets.FirstOrDefault(a => a.FileName == "OpenTabletDriver.deb")!;
 }
 
 <h3 class="wiki-nav-item" id="debian">
     Ubuntu / Debian
 </h3>
 <ol>
     <li>
-        Download the <a href="@deb.Url">latest release</a>
+        Download the
+        <a href="/Release/Download/OpenTabletDriver.deb">latest release</a>
         <small class="text-muted">(OpenTabletDriver.deb)</small>
     </li>
     <li>
@@ -73,7 +67,7 @@
     <p>
         Alternatively, you can install <code>opentabletdriver</code> without an AUR helper.
     </p>
-        <li>
+    <li>
         Run the following commands in a terminal to install and enable the OpenTabletDriver service.
         <codeblock class="mt-2" language="bash">
             # Downloads the pkgbuild from the AUR.

diff --git a/OpenTabletDriver.Web/Views/Wiki/Install/MacOS.cshtml b/OpenTabletDriver.Web/Views/Wiki/Install/MacOS.cshtml
@@ -1,19 +1,14 @@
-@using OpenTabletDriver.Web.Core.Services
-@inject IReleaseService releaseService
-
 @{
     ViewBag.Title = "macOS Installation Guide";
-    var release = await releaseService.GetLatestRelease();
-    var assets = await release.GetReleaseAssets();
-    var asset = assets.First(a => a.FileName.Contains("osx-x64"));
 }
 
 <h3 class="wiki-nav-item" id="app">
     App
 </h3>
 <ol>
     <li>
-        Download the <a href="@asset.Url">latest release</a>
+        Download the
+        <a href="/Release/Download/OpenTabletDriver.osx-x64.tar.gz">latest release</a>
         <small class="text-muted">(OpenTabletDriver-osx-x64.tar.gz)</small>
     </li>
     <li>
@@ -22,4 +17,4 @@
     <li>
         Run the OpenTabletDriver app.
     </li>
-</ol>
+</ol>
diff --git a/OpenTabletDriver.Web/Views/Wiki/Install/Windows.cshtml b/OpenTabletDriver.Web/Views/Wiki/Install/Windows.cshtml
@@ -1,12 +1,5 @@
-@using OpenTabletDriver.Web.Core.Services
-
-@inject IReleaseService releaseService
-
 @{
     ViewBag.Title = "Windows Installation Guide";
-    var release = await releaseService.GetLatestRelease();
-    var assets = await release.GetReleaseAssets();
-    var winzip = assets.FirstOrDefault(a => a.FileName == "OpenTabletDriver.win-x64.zip")!;
 }
 
 <h3 class="wiki-nav-item" id="dependencies">
@@ -39,7 +32,7 @@
     <ol>
         <li>
             Download the
-            <a href="@(winzip.Url)">latest release</a>
+            <a href="/Release/Download/OpenTabletDriver.win-x64.zip">latest release</a>
             <small class="text-muted">(OpenTabletDriver-win-x64.zip)</small>
         </li>
         <li>
@@ -72,7 +65,10 @@
         requires WinUSB, and if it does, what interface. Check the <a href="/Tablets">supported list of tablets here</a>.
     </p>
     <ol>
-        <li>If your tablet <b>does</b> require WinUSB download it from <a href="https://github.com/pbatard/libwdi/releases/download/b755/zadig-2.6.exe">here</a>.</li>
+        <li>
+            If your tablet <b>does</b> require WinUSB download it from
+            <a href="https://github.com/pbatard/libwdi/releases/download/b755/zadig-2.6.exe">here</a>.
+        </li>
         <li>Start Zadig.</li>
         <li>Go to <code>Options > show all devices</code></li>
         <li>Find your tablet on the device list and the interface.</li>