diff --git a/Services/Admin/Pages/SpriteSheets/Edit.cshtml.cs b/Services/Admin/Pages/SpriteSheets/Edit.cshtml.cs index 0cb3a05..ac6d57f 100644 --- a/Services/Admin/Pages/SpriteSheets/Edit.cshtml.cs +++ b/Services/Admin/Pages/SpriteSheets/Edit.cshtml.cs @@ -28,7 +28,8 @@ public class EditModel : AdminPageModel public async Task OnGetAsync(int? id) { - CdnBaseUrl = _config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"; + //CdnBaseUrl = _config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"; + CdnBaseUrl = NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"); CdnImages = await _db.ClientAssets .Where(a => a.AssetType == ClientAssetType.Texture && a.IsEnabled) .OrderBy(a => a.FilePath) @@ -57,8 +58,9 @@ public class EditModel : AdminPageModel public async Task OnPostAsync() { - CdnBaseUrl = _config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"; - + //CdnBaseUrl = _config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"; + CdnBaseUrl = NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"); + try { if (Sheet.Id == 0) @@ -223,4 +225,18 @@ public class EditModel : AdminPageModel return RedirectToPage(new { id = copy.Id }); } + private static string NormalizeCdnBaseUrl(string? baseUrl) + { + baseUrl = string.IsNullOrWhiteSpace(baseUrl) + ? "https://assets.aeternalisgames.com" + : baseUrl; + + baseUrl = baseUrl.TrimEnd('/'); + + if (!baseUrl.EndsWith("/downloads", StringComparison.OrdinalIgnoreCase)) + baseUrl += "/downloads"; + + return baseUrl; + } + }