Fixed bug in file pointer probing and enhanced logging

Author: rajkumar-rangaraj

SymbolFetch/App.config

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-  <appSettings>
-    <add key="SymbolServer" value="http://msdl.microsoft.com/download/symbols"/>
-  </appSettings>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>

SymbolFetch/FileDownloader.cs

@@ -339,13 +339,24 @@ private long ProcessFileSize(HttpWebResponse webResp, out string filePath)
             readStream.Read(read, 0, (int)webResp.ContentLength);
 
             string file = new string(read, 0, (int)webResp.ContentLength);
-            file = file.Substring(5, file.Length - 5); //Removing PATH: from the output
 
-            System.IO.FileInfo fInfo = new System.IO.FileInfo(file);
-            if (fInfo.Exists)
+            if (file.Contains("PATH"))
             {
-                length = fInfo.Length;
-                filePath = file;
+                file = file.Substring(5, file.Length - 5); //Removing PATH: from the output
+
+                System.IO.FileInfo fInfo = new System.IO.FileInfo(file);
+                if (fInfo.Exists)
+                {
+                    length = fInfo.Length;
+                    filePath = file;
+                }
+            }
+            else
+            {
+                int position= webResp.ResponseUri.PathAndQuery.IndexOf(".pdb");
+                string fileName = webResp.ResponseUri.PathAndQuery.Substring(1, position + 3);
+                if (!FailedFiles.ContainsKey(fileName))
+                    FailedFiles.Add(fileName, " - No matching PDBs found - " + file);
             }
 
             return length;
@@ -422,7 +433,7 @@ private void downloadFile(Int32 fileNr)
 
                     if (webResp.StatusCode != HttpStatusCode.OK)
                     {
-                        FailedFiles.Add(file.Name, webResp.StatusCode + ": " + webResp.StatusDescription);
+                        FailedFiles.Add(file.Name, " - " + webResp.StatusCode + "  " + webResp.StatusDescription);
                     }
                 }
                 else if(webResp.StatusCode == HttpStatusCode.OK)
@@ -443,14 +454,16 @@ private void downloadFile(Int32 fileNr)
                     string filePath = dirPath + "\\" +
                         file.Name;
                     string srcFile = null;
-                    
+                    FileStream reader;
                     size = ProcessFileSize(webResp, out srcFile);
-                    var reader = new FileStream(srcFile, FileMode.Open,FileAccess.Read);
-                    writer = new FileStream(filePath,
-                        System.IO.FileMode.Create);
                     m_currentFileSize = size;
+
                     if (srcFile != null)
                     {
+                        reader = new FileStream(srcFile, FileMode.Open, FileAccess.Read);
+                        writer = new FileStream(filePath,
+                            System.IO.FileMode.Create);
+
                         //   DownloadFile(srcFile, filePath);
                         fireEventFromBgw(Event.FileDownloadStarted);
                         m_currentFileProgress = 0;
@@ -546,7 +559,7 @@ public static void WriteToLog(string fileName, Exception exc)
             using (FileStream fs = new FileStream("Log.txt", FileMode.Append))
             using (StreamWriter sr = new StreamWriter(fs))
             {
-                sr.WriteLine(fileName + ": " + exc.Message);
+                sr.WriteLine(DateTime.Now.ToString() + "   " + fileName + ": " + exc.Message);
             }
         }
 
@@ -555,7 +568,7 @@ public static void WriteToLog(string fileName, string text)
             using (FileStream fs = new FileStream("Log.txt", FileMode.Append))
             using (StreamWriter sr = new StreamWriter(fs))
             {
-                sr.WriteLine(fileName + ": " + text);
+                sr.WriteLine(DateTime.Now.ToString() + "   " + fileName + ": " + text);
             }
         }
 

SymbolFetch/MainWindow.xaml.cs

@@ -98,7 +98,7 @@ private void btnStart_Click(object sender, RoutedEventArgs e)
                     downloader.Files.Add(fileInfo);
                 }
                 else
-                    downloader.FailedFiles.Add(item.ToString(), ": Invalid download URL, not probing");
+                    downloader.FailedFiles.Add(item.ToString(), " - No Debug information in PE header");
             }
 
             downloader.Start();
@@ -258,11 +258,17 @@ private void downloader_Completed(object sender, EventArgs e)
                 {
                     foreach (var item in downloader.FailedFiles)
                     {
-                        sr.WriteLine(item.Key + (!string.IsNullOrEmpty(item.Value) ? item.Value : ": Failure after probing"));
+                        sr.WriteLine(DateTime.Now.ToString() + "   " +  item.Key + (!string.IsNullOrEmpty(item.Value) ? item.Value : " - Failure after probing"));
                     }
                 }
 
-                MessageBox.Show("Some symbols could not be downloaded. Please check the log file for more info.", "Error");
+                if (downloader.Files.Count > 1)
+                {
+                        MessageBox.Show("Some symbols could not be downloaded. Please check the log file for more info.", "Error");
+                }
+                else
+                    MessageBox.Show("Symbol could not be downloaded. Please check the log file for more info.", "Error");
+
                 downloader.FailedFiles = new Dictionary<string, string>();
             }
         }