Fix errors that collections has been changed while foreach collections

This commit is contained in:
qianlifeng 2014-11-04 18:21:07 +08:00
parent 3c4a9a05a0
commit 5855ff0d27

View File

@ -7,6 +7,7 @@ namespace Wox.Plugin.FindFile.MFTSearch
internal class MFTSearcherCache internal class MFTSearcherCache
{ {
public Dictionary<string, Dictionary<ulong, USNRecord>> VolumeRecords = new Dictionary<string, Dictionary<ulong, USNRecord>>(); public Dictionary<string, Dictionary<ulong, USNRecord>> VolumeRecords = new Dictionary<string, Dictionary<ulong, USNRecord>>();
public static object locker = new object();
public MFTSearcherCache() { } public MFTSearcherCache() { }
@ -26,7 +27,10 @@ namespace Wox.Plugin.FindFile.MFTSearch
EnsureVolumeExistInHashTable(volume); EnsureVolumeExistInHashTable(volume);
if (!VolumeRecords[volume].ContainsKey(record.FRN)) if (!VolumeRecords[volume].ContainsKey(record.FRN))
{ {
VolumeRecords[volume].Add(record.FRN, record); lock (locker)
{
VolumeRecords[volume].Add(record.FRN, record);
}
} }
} }
@ -47,7 +51,10 @@ namespace Wox.Plugin.FindFile.MFTSearch
{ {
if (hashtable.ContainsKey(volume) && hashtable[volume].ContainsKey(frn)) if (hashtable.ContainsKey(volume) && hashtable[volume].ContainsKey(frn))
{ {
hashtable[volume].Remove(frn); lock (locker)
{
hashtable[volume].Remove(frn);
}
return true; return true;
} }
else else
@ -65,7 +72,10 @@ namespace Wox.Plugin.FindFile.MFTSearch
{ {
if (source.ContainsKey(volume) && source[volume].ContainsKey(record.FRN)) if (source.ContainsKey(volume) && source[volume].ContainsKey(record.FRN))
{ {
source[volume][record.FRN] = record; lock (locker)
{
source[volume][record.FRN] = record;
}
return true; return true;
} }
else else
@ -77,20 +87,21 @@ namespace Wox.Plugin.FindFile.MFTSearch
public List<USNRecord> FindByName(string filename, long maxResult = -1) public List<USNRecord> FindByName(string filename, long maxResult = -1)
{ {
List<USNRecord> result = new List<USNRecord>(); List<USNRecord> result = new List<USNRecord>();
lock (locker)
foreach (Dictionary<ulong, USNRecord> dictionary in VolumeRecords.Values)
{ {
foreach (var usnRecord in dictionary) foreach (Dictionary<ulong, USNRecord> dictionary in VolumeRecords.Values)
{ {
if (usnRecord.Value.Name.IndexOf(filename, StringComparison.OrdinalIgnoreCase) >= 0) foreach (var usnRecord in dictionary)
{ {
result.Add(usnRecord.Value); if (usnRecord.Value.Name.IndexOf(filename, StringComparison.OrdinalIgnoreCase) >= 0)
{
result.Add(usnRecord.Value);
if (maxResult > 0 && result.Count() >= maxResult) break;
}
if (maxResult > 0 && result.Count() >= maxResult) break; if (maxResult > 0 && result.Count() >= maxResult) break;
} }
if (maxResult > 0 && result.Count() >= maxResult) break;
} }
} }
return result; return result;
} }