From 40afd1879d914094eeb8e88f3f22b773324db2d9 Mon Sep 17 00:00:00 2001
From: Ivandro Jao <ivandrofly@gmail.com>
Date: Fri, 21 Jul 2023 17:52:25 +0100
Subject: [PATCH] Refactor SaveWithRetry to take action instead of parameters

The two existing implementations of SaveWithRetry were similar except for the action taken. This commit eliminates code redundancy by making SaveWithRetry accept a delegate for the save action and handle the retries. This approach makes the code more readable and easier to maintain in the future. It also makes the number of retries and delay between them configurable, opening possibilities for future improvements.
---
 src/UpdateLanguageFiles/Program.cs | 38 +++++++++++-------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/UpdateLanguageFiles/Program.cs b/src/UpdateLanguageFiles/Program.cs
index c3157ba85..ff005682e 100644
--- a/src/UpdateLanguageFiles/Program.cs
+++ b/src/UpdateLanguageFiles/Program.cs
@@ -52,7 +52,7 @@ namespace UpdateLanguageFiles
 
                 if (oldLanguageAsXml != languageAsXml)
                 {
-                    SaveWithRetry(args[0], language);
+                    SaveWithRetry(() => language.Save(args[0]));
                     noOfChanges++;
                     Console.Write(" {0} generated...", Path.GetFileName(args[0]));
                 }
@@ -66,7 +66,7 @@ namespace UpdateLanguageFiles
 
                 if (oldLanguageDeserializerContent != languageDeserializerContent)
                 {
-                    SaveWithRetry(args[1], languageDeserializerContent);
+                    SaveWithRetry(() => File.WriteAllText(args[1], languageDeserializerContent, Encoding.UTF8));
                     noOfChanges++;
                     Console.Write(" {0} generated...", Path.GetFileName(args[1]));
                 }
@@ -91,40 +91,29 @@ namespace UpdateLanguageFiles
             }
         }
 
-        private static void SaveWithRetry(string fileName, string content)
+        private static void SaveWithRetry(Action saveAction)
         {
-            for (var i = 0; i < 10; i++)
+            const int maxRetries = 10;
+            var delayBetweenRetries = TimeSpan.FromMilliseconds(10);
+            for (var i = 0; i <= maxRetries; i++)
             {
                 try
                 {
-                    File.WriteAllText(fileName, content, Encoding.UTF8);
+                    saveAction();
                     return;
                 }
                 catch
                 {
+                    if (i == maxRetries)
+                    {
+                        throw;
+                    }
+
                     System.Threading.Thread.Sleep(10);
                 }
             }
-            File.WriteAllText(fileName, content, Encoding.UTF8);
         }
-
-        private static void SaveWithRetry(string fileName, Nikse.SubtitleEdit.Logic.Language language)
-        {
-            for (var i = 0; i < 10; i++)
-            {
-                try
-                {
-                    language.Save(fileName);
-                    return;
-                }
-                catch
-                {
-                    System.Threading.Thread.Sleep(10);
-                }
-            }
-            language.Save(fileName);
-        }
-
+        
         private static string FindVersionNumber()
         {
             var templateFileName = Path.Combine("src", "ui", "Properties", "AssemblyInfo.cs.template");
@@ -161,6 +150,7 @@ namespace UpdateLanguageFiles
                 {
                     return versionMatch.Groups["version"].Value;
                 }
+
                 WriteWarning("No valid AssemblyVersion in template file '" + Path.GetFullPath(templateFileName) + "'.");
             }
             else