From 16600500fc430423a5ebd94287c8471d3a755728 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Fri, 23 Aug 2024 19:20:06 +0200
Subject: [PATCH] Fix backup check interval.

---
 cli/Squidex.CLI/Directory.Build.props             |  2 +-
 .../Squidex.CLI/Commands/App_Backup.cs            | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/cli/Squidex.CLI/Directory.Build.props b/cli/Squidex.CLI/Directory.Build.props
index 4a5cf15..c49e97b 100644
--- a/cli/Squidex.CLI/Directory.Build.props
+++ b/cli/Squidex.CLI/Directory.Build.props
@@ -15,6 +15,6 @@
     <PackageTags>Squidex HeadlessCMS</PackageTags>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>13.1</Version>
+    <Version>13.3</Version>
   </PropertyGroup>
 </Project>
diff --git a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Backup.cs b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Backup.cs
index 162518f..e984b46 100644
--- a/cli/Squidex.CLI/Squidex.CLI/Commands/App_Backup.cs
+++ b/cli/Squidex.CLI/Squidex.CLI/Commands/App_Backup.cs
@@ -11,6 +11,7 @@
 using Squidex.CLI.Configuration;
 using Squidex.ClientLibrary;
 
+#pragma warning disable CS0612 // Type or member is obsolete
 #pragma warning disable MA0048 // File name must match type name
 
 namespace Squidex.CLI.Commands;
@@ -26,8 +27,6 @@ public async Task Create(CreateArguments arguments)
         {
             var session = configuration.StartSession(arguments.App);
 
-            var backupStarted = DateTimeOffset.UtcNow.AddMinutes(-5);
-
             await session.Client.Backups.PostBackupAsync();
 
             log.WriteLine("Backup started, waiting for completion...");
@@ -36,6 +35,9 @@ public async Task Create(CreateArguments arguments)
 
             using (var tcs = new CancellationTokenSource(TimeSpan.FromMinutes(arguments.Timeout)))
             {
+                var backupStarted = DateTimeOffset.UtcNow.AddMinutes(-5);
+                var backupInterval = TimeSpan.FromSeconds(arguments.Interval);
+
                 while (!tcs.Token.IsCancellationRequested)
                 {
 #pragma warning disable CS0612 // Type or member is obsolete
@@ -48,9 +50,9 @@ public async Task Create(CreateArguments arguments)
                         foundBackup = backup;
                         break;
                     }
-                }
 
-                await Task.Delay(5000, tcs.Token);
+                    await Task.Delay(backupInterval, tcs.Token);
+                }
             }
 
             if (foundBackup == null)
@@ -65,7 +67,6 @@ public async Task Create(CreateArguments arguments)
 
                 await using (var fs = new FileStream(arguments.File, mode))
                 {
-#pragma warning disable CS0612 // Type or member is obsolete
                     using (var download = await session.Client.Backups.GetBackupContentAsync(foundBackup.Id))
 #pragma warning restore CS0612 // Type or member is obsolete
                     {
@@ -98,6 +99,9 @@ public sealed class CreateArguments : AppArguments
             [Option("timeout", Description = "The timeout to wait for the backup in minutes.")]
             public int Timeout { get; set; } = 30;
 
+            [Option("interval", Description = "The query interval to test if the backup is ready in seconds.")]
+            public int Interval { get; set; } = 30;
+
             [Option("deleteAfterDownload", Description = "Defines if the created backup shall be deleted from app after the backup task is completed.")]
             public bool DeleteAfterDownload { get; set; }
 
@@ -109,6 +113,7 @@ public sealed class Validator : AbstractValidator<CreateArguments>
                 public Validator()
                 {
                     RuleFor(x => x.File).NotEmpty();
+                    RuleFor(x => x.Interval).InclusiveBetween(1, 120);
                 }
             }
         }