Added: 2nd download button popup for files that take too long to prep…

…air.
DCS-BR-Tools · Jan 8, 2025 · 1263852 · 1263852
1 parent 507175d
commit 1263852
Show file tree

Hide file tree

Showing 14 changed files with 180 additions and 4 deletions.
diff --git a/Database/Language/de.ini b/Database/Language/de.ini
@@ -126,6 +126,8 @@ Shootdown2=Eins bespritzt!
 TargetShootdown1=Ziel bespritzt.
 TargetShootdown2=Ziel abgeschossen!
 Teamkill="Waffenstillstand! Waffenstillstand! Sie schießen auf Freunde!"
+Download="Herunterladen"
+DownloadTookTooLong="Es tut uns leid, dass die Vorbereitung Ihrer Dateien eine Weile gedauert hat. Aus Sicherheitsgründen müssen Sie auf „Herunterladen“ klicken."
 
 [TransportManager]
 TotalTroops=Gesamtzahl der Truppen

diff --git a/Database/Language/en.ini b/Database/Language/en.ini
@@ -126,6 +126,8 @@ Shootdown2=Splashed one!
 TargetShootdown1=Target splashed.
 TargetShootdown2=Target shot down!
 Teamkill="Ceasefire! Ceasefire! You're firing on friendlies!"
+Download="Download"
+DownloadTookTooLong="Sorry it took a while to prepare your files. Security protocols require you to click download."
 
 [TransportManager]
 TotalTroops=Total troops

diff --git a/Database/Language/es.ini b/Database/Language/es.ini
@@ -126,6 +126,8 @@ Shootdown2=¡Uno salpicado!
 TargetShootdown1=Objetivo salpicado.
 TargetShootdown2=¡Objetivo derribado!
 Teamkill="¡Alto el fuego! ¡Alto el fuego! ¡Están disparando a los aliados!"
+Download="Descargar"
+DownloadTookTooLong="Lamentamos que haya tardado un poco en preparar los archivos. Los protocolos de seguridad requieren que haga clic en descargar."
 
 [TransportManager]
 TotalTroops=Tropas totales

diff --git a/Database/Language/fr.ini b/Database/Language/fr.ini
@@ -126,6 +126,8 @@ Shootdown2=Éclaboussé !
 TargetShootdown1=Cible éclaboussée.
 TargetShootdown2=Cible abattue !
 Teamkill="Cessez le feu ! Cessez le feu ! Vous tirez sur des ennemis !"
+Download="Télécharger"
+DownloadTookTooLong="Désolé, il a fallu un certain temps pour préparer vos fichiers. Les protocoles de sécurité vous obligent à cliquer sur télécharger."
 
 [TransportManager]
 TotalTroops=Total des troupes

diff --git a/Database/Language/it.ini b/Database/Language/it.ini
@@ -126,6 +126,8 @@ Shootdown2=Ne ho schiacciato uno!
 TargetShootdown1=Bersaglio schizzato.
 TargetShootdown2=Bersaglio abbattuto!
 Teamkill="Cessate il fuoco! Cessate il fuoco! State sparando agli alleati!"
+Download="Scaricamento"
+DownloadTookTooLong="Mi dispiace che ci sia voluto un po' per preparare i tuoi file. I protocolli di sicurezza richiedono di cliccare su Scarica."
 
 [TransportManager]
 TotalTroops=Truppe totali

diff --git a/Database/Language/pt.ini b/Database/Language/pt.ini
@@ -126,6 +126,8 @@ Shootdown2=Atingido um!
 TargetShootdown1=Alvo atingido.
 TargetShootdown2=Alvo abatido!
 Teamkill="Cessar-fogo! Cessar-fogo! Você está atirando em amigos!"
+Download="Download"
+DownloadTookTooLong="Desculpe pela demora para preparar seus arquivos. Os protocolos de segurança exigem que você clique em download."
 
 [TransportManager]
 TotalTroops=Tropas totais

diff --git a/Database/Language/ru.ini b/Database/Language/ru.ini
@@ -126,6 +126,8 @@ Shootdown2=Один разбрызган!
 TargetShootdown1=Цель разлетелась.
 TargetShootdown2=Цель сбита!
 Teamkill="Прекратить огонь! Прекратить огонь! Вы стреляете по своим!"
+Download="Скачать"
+DownloadTookTooLong="Извините, подготовка файлов заняла некоторое время. Протоколы безопасности требуют, чтобы вы нажали «загрузить»."
 
 [TransportManager]
 TotalTroops=Всего войск

diff --git a/Database/Language/tk.ini b/Database/Language/tk.ini
@@ -126,6 +126,8 @@ Shootdown2=Sıçrayan bir tane!
 TargetShootdown1=Hedef sıçradı.
 TargetShootdown2=Hedef düşürüldü!
 Teamkill="Ateşkes! Ateşkes! Dostlara ateş ediyorsunuz!"
+Download="İndirmek"
+DownloadTookTooLong="Dosyalarınızı hazırlamamız biraz zaman aldı, özür dileriz. Güvenlik protokolleri indirmeyi tıklamanızı gerektirir."
 
 [TransportManager]
 TotalTroops=Toplam birlikler

diff --git a/Database/Language/uk.ini b/Database/Language/uk.ini
@@ -126,6 +126,8 @@ Shootdown2=Один забризканий!
 TargetShootdown1=Ціль забризкана.
 TargetShootdown2=Ціль збита!
 Teamkill="Припинення вогню! Припинення вогню! Ти стріляєш по товариським!"
+Download="Завантажити"
+DownloadTookTooLong="Вибачте, підготовка ваших файлів зайняла деякий час. Протоколи безпеки вимагають натиснути «Завантажити»."
 
 [TransportManager]
 TotalTroops=Загальна кількість військ

diff --git a/src/CommonGUI/Pages/CampaignBuilder.razor b/src/CommonGUI/Pages/CampaignBuilder.razor
@@ -15,7 +15,9 @@
 @using System.IO
 @using Polly
 @using System.IO.Compression
+@using System.Diagnostics
 <LoadingSpinner ON="spinner"/>
+<LateDownloadButton Download="LateDownload" ON="showLateDownloadButton" />  
 <div class="title-bar">
     <h1>@briefingRoom.Translate("CampaignGenerator")</h1>
     <TemplateButtons LoadTemplate="LoadTemplate" SaveTemplate="SaveTemplate" ClearTemplate="ClearTemplate" AcceptString=".cbrt,.zip" />
@@ -119,6 +121,7 @@
                         <div class="generator-group flex-justify-spaced flex-margin-fix">
                             <div class="form-group flex-block">
                                 <label>@briefingRoom.Translate("MissionCount")</label>
+    using IronSoftware.DOM;
                                 <InputNumber class="form-control" @bind-Value="Template.MissionsCount"></InputNumber>
                             </div>
                             <InputEnum ClassString="flex-block" Label=@briefingRoom.Translate("MissionDifficultyVariation") @bind-Value="Template.MissionsDifficultyVariation" EnumType="CampaignDifficultyVariation"/>
@@ -590,12 +593,19 @@
 
     async Task DownloadCampaign()
     {
-        try { 
+        try {
+            Stopwatch stopwatch = Stopwatch.StartNew(); 
             spinner = true;
             StateHasChanged();
             byte[] zipBytes = await campaign.ExportToCompressedByteArray(Template);
             if (zipBytes == null) return; // Something went wrong during the .miz export
-
+            stopwatch.Stop();
+            Console.WriteLine($"Download Prep in {stopwatch.Elapsed.Seconds}s");
+            if(stopwatch.Elapsed.Seconds > 5)
+            {
+                ShowLateDownloadButton($"{Template.ContextTheater} - {campaign.Name}.zip", "application/octet-stream", zipBytes);
+              return;  
+            } 
             await JSRuntime.InvokeVoidAsync("BlazorDownloadFile", $"{Template.ContextTheater} - {campaign.Name}.zip", "application/octet-stream", zipBytes);
         } catch (Exception ex){
             Console.WriteLine(ex);
@@ -605,6 +615,35 @@
         }
     }
 
+     private byte[] cachedBytes;
+     private string cachedName;
+     private string cachedMimeType;
+     private Boolean showLateDownloadButton = false;
+
+    private void ShowLateDownloadButton(string fileName, string mimeType, byte[] data)
+    {
+        cachedBytes = data;
+        cachedName = fileName;
+        cachedMimeType = mimeType;
+        showLateDownloadButton = true;
+    }
+
+    private async Task LateDownload()
+    {
+        try {
+        await JSRuntime.InvokeVoidAsync("BlazorDownloadFile", cachedName, cachedMimeType, cachedBytes);
+
+        } catch (Exception ex) { 
+            Console.WriteLine(ex);
+        } finally {
+            showLateDownloadButton = false;
+            cachedBytes = null;
+            cachedName = null;
+            cachedMimeType = null;
+            StateHasChanged();
+        }
+    }
+
     async Task DownloadBriefing()
     {
             byte[] zipBytes = campaign.ExportBriefingsToCompressedByteArray();

diff --git a/src/CommonGUI/Pages/FullBuilder.razor b/src/CommonGUI/Pages/FullBuilder.razor
@@ -15,7 +15,9 @@
 @using System.IO
 @using Polly
 @using System.IO.Compression
+@using System.Diagnostics
 <LoadingSpinner ON="spinner"/>
+<LateDownloadButton Download="LateDownload" ON="showLateDownloadButton" />  
 <div class="title-bar">
     <h1>@briefingRoom.Translate("FullGenerator")</h1>
     <TemplateButtons LoadTemplate="LoadTemplate" SaveTemplate="SaveTemplate" ClearTemplate="ClearTemplate" AcceptString=".brt,.miz" />
@@ -912,11 +914,19 @@
     async Task DownloadMission()
     {
         try {
+            Stopwatch stopwatch = Stopwatch.StartNew(); 
             spinner = true;
             StateHasChanged();
             byte[] zipBytes = await mission.SaveToMizBytes();
             if (zipBytes == null) return; // Something went wrong during the .miz export
-            await JSRuntime.InvokeVoidAsync("BlazorDownloadFile", $"{(Template.OptionsMission.Contains("DSMC")? "DSMC_": "")}{Template.ContextTheater} - {mission.Briefing.Name}.miz", "application/octet-stream", zipBytes); 
+            stopwatch.Stop();
+            Console.WriteLine($"Download Prep in {stopwatch.Elapsed.Seconds}s");
+            if(stopwatch.Elapsed.Seconds > 5)
+            {
+                ShowLateDownloadButton( $"{(Template.OptionsMission.Contains("DSMC")? "DSMC_": "")}{Template.ContextTheater} - {mission.Briefing.Name}.miz", "application/octet-stream", zipBytes);
+                return;  
+            } 
+            await JSRuntime.InvokeVoidAsync("BlazorDownloadFile", $"{(Template.OptionsMission.Contains("DSMC")? "DSMC_": "")}{Template.ContextTheater} - {mission.Briefing.Name}.miz", "application/octet-stream", zipBytes);
         } catch (Exception ex){
             Console.WriteLine(ex);
         } finally {
@@ -925,6 +935,36 @@
         }
     }
 
+    private byte[] cachedBytes;
+     private string cachedName;
+     private string cachedMimeType;
+     private Boolean showLateDownloadButton = false;
+
+    private void ShowLateDownloadButton(string fileName, string mimeType, byte[] data)
+    {
+        cachedBytes = data;
+        cachedName = fileName;
+        cachedMimeType = mimeType;
+        showLateDownloadButton = true;
+    }
+
+    private async Task LateDownload()
+    {
+        try {
+        await JSRuntime.InvokeVoidAsync("BlazorDownloadFile", cachedName, cachedMimeType, cachedBytes);
+
+        } catch (Exception ex) { 
+            Console.WriteLine(ex);
+        } finally {
+            showLateDownloadButton = false;
+            cachedBytes = null;
+            cachedName = null;
+            cachedMimeType = null;
+            StateHasChanged();
+        }
+    }
+
+
     async Task DownloadBriefing()
     {
         try { 

diff --git a/src/CommonGUI/Pages/QuickBuilder.razor b/src/CommonGUI/Pages/QuickBuilder.razor
@@ -13,7 +13,9 @@
 @using System.IO
 @using Polly
 @using System.IO.Compression
+@using System.Diagnostics
 <LoadingSpinner ON="spinner"/>
+<LateDownloadButton Download="LateDownload" ON="showLateDownloadButton" />  
 <div class="title-bar">
     <h1>@briefingRoom.Translate("QuickGenerator")</h1>
     <TemplateButtons LoadTemplate="LoadTemplate" SaveTemplate="SaveTemplate" ClearTemplate="ClearTemplate" AcceptString=".brt,.miz" />
@@ -525,11 +527,18 @@
     async Task DownloadMission()
     {
         try {
+            Stopwatch stopwatch = Stopwatch.StartNew(); 
             spinner = true;
             StateHasChanged();
             byte[] zipBytes = await mission.SaveToMizBytes();
             if (zipBytes == null) return; // Something went wrong during the .miz export
-
+            stopwatch.Stop();
+            Console.WriteLine($"Download Prep in {stopwatch.Elapsed.Seconds}s");
+            if(stopwatch.Elapsed.Seconds > 5)
+            {
+                ShowLateDownloadButton( $"{(Template.OptionsMission.Contains("DSMC")? "DSMC_": "")}{Template.ContextTheater} - {mission.Briefing.Name}.miz", "application/octet-stream", zipBytes);
+              return;  
+            } 
             await JSRuntime.InvokeVoidAsync("BlazorDownloadFile", $"{(Template.OptionsMission.Contains("DSMC")? "DSMC_": "")}{Template.ContextTheater} - {mission.Briefing.Name}.miz", "application/octet-stream", zipBytes);
         } catch (Exception ex){
             Console.WriteLine(ex);
@@ -539,6 +548,36 @@
         }
     }
 
+    private byte[] cachedBytes;
+     private string cachedName;
+     private string cachedMimeType;
+     private Boolean showLateDownloadButton = false;
+
+    private void ShowLateDownloadButton(string fileName, string mimeType, byte[] data)
+    {
+        cachedBytes = data;
+        cachedName = fileName;
+        cachedMimeType = mimeType;
+        showLateDownloadButton = true;
+    }
+
+    private async Task LateDownload()
+    {
+        try {
+        await JSRuntime.InvokeVoidAsync("BlazorDownloadFile", cachedName, cachedMimeType, cachedBytes);
+
+        } catch (Exception ex) { 
+            Console.WriteLine(ex);
+        } finally {
+            showLateDownloadButton = false;
+            cachedBytes = null;
+            cachedName = null;
+            cachedMimeType = null;
+            StateHasChanged();
+        }
+    }
+
+
     async Task DownloadBriefing()
     {
         byte[] zipBytes = Encoding.ASCII.GetBytes(mission.Briefing.GetBriefingAsHTML(mission));

diff --git a/src/CommonGUI/Shared/LateDownloadButton.razor b/src/CommonGUI/Shared/LateDownloadButton.razor
@@ -0,0 +1,18 @@
+@inject BriefingRoom4DCS.BriefingRoom briefingRoom
+<div class="late_download_overlay">
+    @if (ON)
+    {  
+        <div class="late_download">
+            <button class="btn btn-warning late_download_button" @onclick="() => Download()">
+                <span class="oi oi-data-transfer-download"></span>
+                @briefingRoom.Translate("Download")
+            </button>
+            <p class="custom-warning"><span class="oi oi-info"></span>&nbsp;@briefingRoom.Translate("DownloadTookTooLong")</p>
+        </div>
+    }
+</div>
+
+@code {
+    [Parameter] public bool ON { get; set; }
+    [Parameter] public Func<Task> Download { get; set; }
+}
diff --git a/src/CommonGUI/Shared/LateDownloadButton.razor.css b/src/CommonGUI/Shared/LateDownloadButton.razor.css
@@ -0,0 +1,22 @@
+.late_download_overlay {
+  position: relative;
+}
+
+.late_download {
+  top: 200px;
+  position: absolute;
+  text-align: center;
+  margin: 0 auto;
+  left: 0;
+  right: 0;
+  z-index: 999999;
+  background-color: #020A10;
+  border: 1px solid white;
+  width: fit-content;
+}
+
+.late_download_button {
+  height: 10vh;
+  width: 20vw;
+  margin: 10vh;
+}