allow uploading large watermarks (#2151)

ErsatzTV/Pages/WatermarkEditor.razor

@@ -67,7 +67,9 @@
                 </div>
                 @if (!string.IsNullOrWhiteSpace(_model.Image?.Path) && _model.ImageSource == ChannelWatermarkImageSource.Custom)
                 {
-                    <MudElement HtmlTag="img" src="@($"artwork/watermarks/{_model.Image.UrlWithContentType}")" Style="max-height: 50px"/>
+                    <div class="d-flex" style="max-height: 50px">
+                        <MudElement HtmlTag="img" src="@($"artwork/watermarks/{_model.Image.UrlWithContentType}")" />
+                    </div>
                 }
             </MudStack>
             <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
@@ -250,7 +252,7 @@
         try
         {
             Either<BaseError, string> maybeCacheFileName = await Mediator.Send(
-                new SaveArtworkToDisk(e.File.OpenReadStream(10 * 1024 * 1024), ArtworkKind.Watermark, e.File.ContentType),
+                new SaveArtworkToDisk(e.File.OpenReadStream(SystemEnvironment.MaximumUploadMb * 1024 * 1024), ArtworkKind.Watermark, e.File.ContentType),
                 _cts.Token);
             maybeCacheFileName.Match(
                 relativeFileName =>
@@ -266,8 +268,8 @@
         }
         catch (IOException)
         {
-            Snackbar.Add("Watermark exceeds maximum allowed file size of 10 MB", Severity.Error);
-            Logger.LogError("Watermark exceeds maximum allowed file size of 10 MB");
+            Snackbar.Add($"Watermark exceeds maximum allowed file size of {SystemEnvironment.MaximumUploadMb} MB", Severity.Error);
+            Logger.LogError("Watermark exceeds maximum allowed file size of {MaximumUploadMb} MB", SystemEnvironment.MaximumUploadMb);
         }
         catch (Exception ex)
         {

ErsatzTV/Program.cs

@@ -134,21 +134,8 @@ public class Program
 
     private static IHostBuilder CreateHostBuilder(string[] args)
     {
-        string uiPortVariable = Environment.GetEnvironmentVariable("ETV_UI_PORT");
-        if (!int.TryParse(uiPortVariable, out int uiPort))
-        {
-            uiPort = 8409;
-        }
-
-        Settings.UiPort = uiPort;
-
-        string streamingPortVariable = Environment.GetEnvironmentVariable("ETV_STREAMING_PORT");
-        if (!int.TryParse(streamingPortVariable, out int streamingPort))
-        {
-            streamingPort = 8409;
-        }
-
-        Settings.StreamingPort = streamingPort;
+        Settings.UiPort = SystemEnvironment.UiPort;
+        Settings.StreamingPort = SystemEnvironment.StreamingPort;
 
         return Host.CreateDefaultBuilder(args)
             .ConfigureServices(services => services.AddSingleton(LoggingLevelSwitches))

ErsatzTV/Services/RunOnce/EndpointValidatorService.cs

@@ -17,12 +17,10 @@ public class EndpointValidatorService : BackgroundService
     {
         await Task.Yield();
 
-        string baseUrl = Environment.GetEnvironmentVariable("ETV_BASE_URL");
-
         _logger.LogInformation(
             "Server will listen on streaming port {StreamingPort}, UI port {UiPort} - try UI at {UI}",
             Settings.StreamingPort,
             Settings.UiPort,
-            $"http://localhost:{Settings.UiPort}{baseUrl}");
+            $"http://localhost:{Settings.UiPort}{SystemEnvironment.BaseUrl}");
     }
 }

ErsatzTV/Startup.cs

@@ -451,7 +451,7 @@ public class Startup
 
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
     {
-        string baseUrl = Environment.GetEnvironmentVariable("ETV_BASE_URL");
+        string baseUrl = SystemEnvironment.BaseUrl;
         if (!string.IsNullOrWhiteSpace(baseUrl))
         {
             try