Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 15:02:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7137 from ivandrofly/feature/patch-5

Browse Source 
Refactor SaveWithRetry to take action instead of parameters
This commit is contained in:
Nikolaj Olsson 2023-07-21 12:54:18 -04:00 committed by GitHub
commit a9cf7df0de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/UpdateLanguageFiles/Program.cs
View File

@ -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");
@ -147,6 +136,7 @@ namespace UpdateLanguageFiles
{
return versionMatch.Groups["version"].Value;
}
WriteWarning("No valid AssemblyVersion in template file '" + Path.GetFullPath(templateFileName) + "'.");
}
else