diff --git a/VoidCat/Controllers/IndexController.cs b/VoidCat/Controllers/IndexController.cs index 022b5d2..d4990e1 100644 --- a/VoidCat/Controllers/IndexController.cs +++ b/VoidCat/Controllers/IndexController.cs @@ -24,10 +24,7 @@ public class IndexController : Controller [Route("{id}")] public async Task FilePreview(string id) { - if (!id.TryFromBase58Guid(out var gid)) return NotFound(); - - var meta = await _fileMetadata.Get(gid); - if (meta == default) return NotFound(); + id.TryFromBase58Guid(out var gid); var manifestPath = Path.Combine(_webHost.WebRootPath, "asset-manifest.json"); if (!System.IO.File.Exists(manifestPath)) return StatusCode(500); @@ -35,14 +32,14 @@ public class IndexController : Controller var jsonManifest = await System.IO.File.ReadAllTextAsync(manifestPath); return View("~/Pages/Index.cshtml", new IndexModel { - Meta = meta, + Meta = await _fileMetadata.Get(gid), Manifest = JsonConvert.DeserializeObject(jsonManifest)! }); } public class IndexModel { - public VoidFileMeta Meta { get; init; } + public VoidFileMeta? Meta { get; init; } public AssetManifest Manifest { get; init; } } diff --git a/VoidCat/Pages/Index.cshtml b/VoidCat/Pages/Index.cshtml index 8c66508..2e9e993 100644 --- a/VoidCat/Pages/Index.cshtml +++ b/VoidCat/Pages/Index.cshtml @@ -9,15 +9,43 @@ - - void.cat - @Model.Meta.Name - - - - - - - + + @if (Model.Meta != default) + { + void.cat - @Model.Meta.Name + + + + + + + var mime = Model.Meta.MimeType; + if (mime != default) + { + var link = $"https://{Context.Request.Host}/d/{Model.Meta.Id.ToBase58()}"; + if (mime.StartsWith("image/")) + { + + + } + else if (mime.StartsWith("video/")) + { + + + } + else if (mime.StartsWith("audio/")) + { + + + } + } + } + else + { + void.cat + + } + @foreach (var ep in Model.Manifest.Entrypoints) { switch (System.IO.Path.GetExtension(ep)) @@ -34,28 +62,6 @@ } } } - @{ - var mime = Model.Meta.MimeType; - } - @if (mime != default) - { - var link = $"https://{Context.Request.Host}/d/{Model.Meta.Id.ToBase58()}"; - if (mime.StartsWith("image/")) - { - - - } - else if (mime.StartsWith("video/")) - { - - - } - else if (mime.StartsWith("audio/")) - { - - - } - }