added retries to linux screenshots

Author: rthomasv3

Services/ScreenshotService.cs

@@ -326,50 +326,77 @@ private void TakeLinuxScreenshot(string saveDirectory)
                 ? $"{_flameshotArgs} screen -r -p \"{savePath}\""
                 : $"screen -r -p \"{savePath}\"";
 
-            ProcessStartInfo flameshotStartInfo = new()
+            for (int attempt = 1; attempt <= 3; attempt++)
             {
-                FileName = _flameshotCommand,
-                Arguments = arguments,
-                UseShellExecute = false,
-                CreateNoWindow = true,
-            };
+                ProcessStartInfo flameshotStartInfo = new()
+                {
+                    FileName = _flameshotCommand,
+                    Arguments = arguments,
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
+                };
 
-            flameshotStartInfo.EnvironmentVariables["DISPLAY"] = Environment.GetEnvironmentVariable("DISPLAY") ?? ":0";
+                flameshotStartInfo.EnvironmentVariables["DISPLAY"] = Environment.GetEnvironmentVariable("DISPLAY") ?? ":0";
 
-            if (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("XAUTHORITY")))
-            {
-                flameshotStartInfo.EnvironmentVariables["XAUTHORITY"] = Environment.GetEnvironmentVariable("XAUTHORITY");
-            }
-
-            if (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("WAYLAND_DISPLAY")))
-            {
-                flameshotStartInfo.EnvironmentVariables["WAYLAND_DISPLAY"] = Environment.GetEnvironmentVariable("WAYLAND_DISPLAY");
-            }
+                if (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("XAUTHORITY")))
+                {
+                    flameshotStartInfo.EnvironmentVariables["XAUTHORITY"] = Environment.GetEnvironmentVariable("XAUTHORITY");
+                }
 
-            Process process = Process.Start(flameshotStartInfo);
+                if (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("WAYLAND_DISPLAY")))
+                {
+                    flameshotStartInfo.EnvironmentVariables["WAYLAND_DISPLAY"] = Environment.GetEnvironmentVariable("WAYLAND_DISPLAY");
+                }
 
-            if (process.WaitForExit(3000))
-            {
-                process.Close();
+                if (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("XDG_RUNTIME_DIR")))
+                {
+                    flameshotStartInfo.EnvironmentVariables["XDG_RUNTIME_DIR"] = Environment.GetEnvironmentVariable("XDG_RUNTIME_DIR");
+                }
 
-                Thread.Sleep(100);
+                int? exitCode = null;
+                Process process = Process.Start(flameshotStartInfo);
 
-                if (!File.Exists(savePath))
+                try
                 {
-                    _loggingService.LogInfo($"{nameof(ScreenshotService)}>{nameof(TakeLinuxScreenshot)} - Screenshot may have failed");
-                    _loggingService.LogInfo($"{nameof(ScreenshotService)}>{nameof(TakeLinuxScreenshot)} - {_flameshotCommand} {arguments}");
-                }
-            }
-            else
-            {
-                process.Kill();
-                process.Close();
+                    if (process.WaitForExit(3000))
+                    {
+                        exitCode = process.ExitCode;
+                    }
+                    else
+                    {
+                        process.Kill();
+                    }
 
-                Thread.Sleep(100);
+                    Thread.Sleep(100);
 
-                if (!File.Exists(savePath))
+                    if (!File.Exists(savePath))
+                    {
+                        if (attempt == 3)
+                        {
+                            _loggingService.LogInfo($"{nameof(ScreenshotService)}>{nameof(TakeLinuxScreenshot)} - {_flameshotCommand} {arguments}");
+
+                            if (exitCode != null)
+                            {
+                                _loggingService.LogInfo($"{nameof(ScreenshotService)}>{nameof(TakeLinuxScreenshot)} - Screenshot may have failed ({exitCode})");
+                            }
+                            else
+                            {
+                                _loggingService.LogInfo($"{nameof(ScreenshotService)}>{nameof(TakeLinuxScreenshot)} - Flameshot process timed out: killed and screenshot not found");
+                            }
+                        }
+                        else
+                        {
+                            Thread.Sleep(250);
+                        }
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+                finally
                 {
-                    _loggingService.LogInfo($"{nameof(ScreenshotService)}>{nameof(TakeLinuxScreenshot)} - Flameshot process timed out, killed and screenshot not found.");
+                    process.Close();
                 }
             }
         }