Added timeout for rare case that exiftool becomes unresponsive for an…

…y issue.
josemoliver · Oct 12, 2018 · 5064651 · 5064651
1 parent a0698a2
commit 5064651
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/WeatherTag/Program.cs b/WeatherTag/Program.cs
@@ -58,7 +58,7 @@ static void Main(string[] args)
             }
 
 
-            Console.WriteLine("Weather file: " + WeatherHistoryFile);
+            //Console.WriteLine("Weather file: " + WeatherHistoryFile);
 
             //Load weather history file into stream
             try
@@ -278,8 +278,14 @@ public static DateTime GetFileDate(string file)
 
         public static double CheckExiftool()
         {
+
+            double exiftoolreturn = 0;
+
+            try
+            { 
+
             // Start Process
-            Process p = new Process();
+                Process p = new Process();
 
             // Redirect the output stream of the child process.
             p.StartInfo.UseShellExecute = false;
@@ -289,13 +295,12 @@ public static double CheckExiftool()
             p.StartInfo.FileName = "exiftool.exe";
             p.Start();
 
-            double exiftoolreturn = 0;
+
             // Read the output stream
-           try
-           {
+
                 string exiftooloutput = p.StandardOutput.ReadToEnd().Trim();
                 exiftoolreturn = double.Parse(exiftooloutput);
-                p.WaitForExit();
+                p.WaitForExit(8000);
            }
            catch
             {
@@ -336,7 +341,7 @@ public static string WriteFileInfo(string File, WeatherReading reading)
             p.StartInfo.FileName = "exiftool.exe";
             p.Start();
             output = File + Arguments+" --- " + p.StandardOutput.ReadToEnd();
-            p.WaitForExit();
+            p.WaitForExit(10000);
 
             return output;
         }