diff --git a/Api/CdnBrowserController.cs b/Api/CdnBrowserController.cs new file mode 100644 index 0000000..2a2a1d6 --- /dev/null +++ b/Api/CdnBrowserController.cs @@ -0,0 +1,75 @@ +using Microsoft.AspNetCore.Mvc; +using Server.Services; + +namespace Server.Api; + +[ApiController] +[Route("api/admin/cdn")] +public class CdnBrowserController : ControllerBase +{ + private readonly ICdnBrowserService _cdnService; + + public CdnBrowserController(ICdnBrowserService cdnService) + { + _cdnService = cdnService; + } + + /// + /// Check if CDN browsing is configured + /// + [HttpGet("status")] + public IActionResult GetStatus() + { + return Ok(new { + configured = _cdnService.IsConfigured, + message = _cdnService.IsConfigured + ? "MinIO configured and ready" + : "MinIO not configured - set AccessKey and SecretKey in appsettings" + }); + } + + /// + /// List files in a CDN prefix/folder + /// + [HttpGet("list")] + public async Task ListFiles( + [FromQuery] string prefix = "textures/items", + [FromQuery] int maxKeys = 100) + { + if (!_cdnService.IsConfigured) + { + return Ok(new { + files = new List(), + error = "MinIO not configured" + }); + } + + var files = await _cdnService.ListFilesAsync(prefix, maxKeys); + return Ok(new { + prefix, + files, + count = files.Count + }); + } + + /// + /// List subfolders in a prefix + /// + [HttpGet("folders")] + public async Task ListFolders([FromQuery] string prefix = "textures") + { + if (!_cdnService.IsConfigured) + { + return Ok(new { + folders = new List(), + error = "MinIO not configured" + }); + } + + var folders = await _cdnService.ListPrefixesAsync(prefix); + return Ok(new { + prefix, + folders + }); + } +} diff --git a/Program.cs b/Program.cs index 0381b92..41156f1 100644 --- a/Program.cs +++ b/Program.cs @@ -83,7 +83,7 @@ builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); - +builder.Services.AddSingleton(); // Health checks builder.Services.AddHealthChecks() diff --git a/Services/Admin/Pages/Assets/Index.cshtml b/Services/Admin/Pages/Assets/Index.cshtml index d2e7179..af63302 100644 --- a/Services/Admin/Pages/Assets/Index.cshtml +++ b/Services/Admin/Pages/Assets/Index.cshtml @@ -10,7 +10,7 @@

CDN Assets

-

Browse CDN and manage tracked assets

+

Browse MinIO bucket and manage tracked assets

@@ -26,126 +26,165 @@ @if (Model.Tab == "browse") { - -
-
- - -
- -

- CDN Path: @Model.CdnBaseUrl/downloads/@Model.Folder/ -

-
- - -
-
- @Html.AntiForgeryToken() -
- - -
-
- - -
- -
-
- - - @if (Model.Folder?.StartsWith("textures/") == true) + @if (!Model.CdnConfigured) { -
-
-

Preview - @Model.Folder

-

Click an image to copy its path, or use the register button to track it.

-
-
-
- @foreach (var file in Model.PreviewFiles) +
+ + + +

MinIO Not Configured

+

To browse CDN files, configure MinIO credentials in appsettings.json:

+
"MinIO": {
+    "Endpoint": "assets.aeternalisgames.com",
+    "AccessKey": "your-access-key",
+    "SecretKey": "your-secret-key",
+    "BucketName": "downloads",
+    "UseSSL": true
+}
+
+ } + else + { + +
+
+ +
+ @foreach (var folder in Model.AvailableFolders) { - var isTracked = Model.TrackedPaths.Contains(file); -
-
- @System.IO.Path.GetFileName(file) -
-

@System.IO.Path.GetFileName(file)

- - -
- - @if (!isTracked) - { -
- @Html.AntiForgeryToken() - - - -
- } - else - { - - - - - - } -
-
+ + @folder.TrimEnd('/').Split('/').Last() + }
- - @if (!Model.PreviewFiles.Any()) +
+ + +
+ root + @{ + var parts = Model.Prefix?.Split('/', StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty(); + var currentPath = ""; + } + @foreach (var part in parts) { -

- Enter file names manually or check that assets exist at this CDN path. -

+ currentPath += part + "/"; + / + @part }
+ + + @if (Model.Subfolders.Any()) + { +
+

Subfolders

+
+ @foreach (var subfolder in Model.Subfolders) + { + + + + + @subfolder.TrimEnd('/').Split('/').Last() + + } +
+
+ } + + + @if (Model.Files.Any()) + { +
+
+
+

Files in @(string.IsNullOrEmpty(Model.Prefix) ? "root" : Model.Prefix)

+

@Model.Files.Count files. Click to copy path, + to register.

+
+
+
+
+ @foreach (var file in Model.Files.Where(f => !f.IsDirectory)) + { + var isTracked = Model.TrackedPaths.Contains(file.Key); + var isImage = file.Name.EndsWith(".png") || file.Name.EndsWith(".jpg") || file.Name.EndsWith(".webp"); +
+
+ @if (isImage) + { + @file.Name + } + else + { +
+ + + +

@System.IO.Path.GetExtension(file.Name)

+
+ } +
+

@file.Name

+ @if (isTracked) + { +
+ + + +
+ } + + +
+ + @if (!isTracked) + { +
+ @Html.AntiForgeryToken() + + + + + +
+ } +
+
+ } +
+
+
+ } + else if (!Model.Subfolders.Any()) + { +
+ + + +

This folder is empty.

+
+ } } - - -
-

Quick Test - Enter filenames (comma separated)

-
- - - - -
-
} else { - +
@@ -159,7 +198,7 @@ @foreach (var t in Enum.GetValues()) { - + }
@@ -189,65 +228,44 @@
-
+
@foreach (var asset in Model.Assets) { -
-
+
+
@if (asset.AssetType == ClientAssetType.Texture) { @asset.FilePath + loading="lazy" /> } else {
- @switch (asset.AssetType) - { - case ClientAssetType.Scene: - - - - break; - case ClientAssetType.Script: - - - - break; - default: - - - - break; - } -

@asset.AssetType

+ + + +

@asset.AssetType

} -
- @asset.AssetType -
-
-

@System.IO.Path.GetFileName(asset.FilePath)

-

@asset.FilePath

-
- v@asset.Version - @FormatFileSize(asset.FileSize) -
+
+

@System.IO.Path.GetFileName(asset.FilePath)

-
- @Html.AntiForgeryToken() -
- @if (Model.TotalPages > 1) + @if (Model.TrackedTotalPages > 1) {

- Page @Model.CurrentPage of @Model.TotalPages + Page @Model.TrackedPage of @Model.TrackedTotalPages

- @if (Model.CurrentPage > 1) + @if (Model.TrackedPage > 1) { - ← Prev + ← Prev } - @if (Model.CurrentPage < Model.TotalPages) + @if (Model.TrackedPage < Model.TrackedTotalPages) { - Next → + Next → }
@@ -288,27 +306,17 @@ @if (!string.IsNullOrEmpty(Model.Message)) { -
+
@Model.Message
} -@functions { - string FormatFileSize(long bytes) - { - if (bytes < 1024) return $"{bytes} B"; - if (bytes < 1024 * 1024) return $"{bytes / 1024.0:F1} KB"; - return $"{bytes / (1024.0 * 1024.0):F1} MB"; - } -} - @section Scripts {