properly fix startup race (again) and fix a bug in threaded hashing

CClash.Tests/HashingTest.cs

@@ -69,7 +69,10 @@ public void ThreadyHashIncludeFilesCacheTest()
                 var hashes2 = ht.DigestFiles(Directory.GetFiles(IncludeDir));
                 foreach (var h in hashes2)
                 {
-                    Assert.IsTrue(h.Value.Cached);
+                    if (hashes.ContainsKey(h.Key))
+                    {
+                        Assert.IsTrue(h.Value.Cached);
+                    }
                 }
             }
         }

CClash/CClashServerClient.cs

@@ -69,6 +69,7 @@ void Connect()
                 p.Start();
                 Logging.Error("started new cclash service process");
                 System.Threading.Thread.Sleep(1000);
+                Logging.Error("connecting to cclash service");
                 ConnectClient();
             } catch (Exception e) {
                 Logging.Emit("error starting cclash server process {0}", e.ToString());
@@ -78,8 +79,19 @@ void Connect()
 
         private void ConnectClient()
         {
-            if (!ncs.IsConnected)
-                ncs.Connect(1000);
+            for (int i = 0; i < 6; i++)
+            {
+                try
+                {
+                    if (!ncs.IsConnected)
+                        ncs.Connect(500);
+                    break;
+                }
+                catch (TimeoutException)
+                {
+                    if (i == 5) throw;
+                }
+            }
             ncs.ReadMode = PipeTransmissionMode.Message;
         }
 

CClash/HashUtil.cs

@@ -106,14 +106,15 @@ public Dictionary<string,DataHash> DigestFiles(IEnumerable<string> files)
 
             foreach (var f in files.Distinct())
             {
-                if (recentHashes.ContainsKey(f) && (recentHashes[f].Age.TotalMinutes < SavedHashMaxAgeMinutes))
+                var filepath = f.ToLower();
+                if (recentHashes.ContainsKey(filepath) && (recentHashes[filepath].Age.TotalMinutes < SavedHashMaxAgeMinutes))
                 {
-                    rv[f] = recentHashes[f];
-                    rv[f].Cached = true;
+                    rv[filepath] = recentHashes[filepath];
+                    rv[filepath].Cached = true;
                 }
                 else
                 {
-                    tohash.Add(f);
+                    tohash.Add(filepath);
                 }
             }