ouczbs/FastGithub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

关闭读取的文件

Browse Source
This commit is contained in:
陈国伟 2021-12-21 09:24:10 +08:00
parent 6ec0677555
commit 5daa5b987a
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
FastGithub.PacketIntercept/Dns/HostsConflictSolver.cs
View File

@ -44,23 +44,26 @@ namespace FastGithub.PacketIntercept.Dns
return;
}
Encoding hostsEncoding;
var hasConflicting = false;
var hostsBuilder = new StringBuilder();
using var fileStream = new FileStream(hostsPath, FileMode.Open, FileAccess.Read);
using var streamReader = new StreamReader(fileStream);
while (streamReader.EndOfStream == false)
using (var fileStream = new FileStream(hostsPath, FileMode.Open, FileAccess.Read))
{
var line = await streamReader.ReadLineAsync();
if (this.IsConflictingLine(line))
using var streamReader = new StreamReader(fileStream);
while (streamReader.EndOfStream == false)
{
hasConflicting = true;
hostsBuilder.AppendLine($"# {line}");
}
else
{
hostsBuilder.AppendLine(line);
var line = await streamReader.ReadLineAsync();
if (this.IsConflictingLine(line))
{
hasConflicting = true;
hostsBuilder.AppendLine($"# {line}");
}
else
{
hostsBuilder.AppendLine(line);
}
}
hostsEncoding = streamReader.CurrentEncoding;
}
@ -68,8 +71,7 @@ namespace FastGithub.PacketIntercept.Dns
{
try
{
File.Move(hostsPath, Path.ChangeExtension(hostsPath, ".bak"), overwrite: true);
await File.WriteAllTextAsync(hostsPath, hostsBuilder.ToString(), streamReader.CurrentEncoding, cancellationToken);
await File.WriteAllTextAsync(hostsPath, hostsBuilder.ToString(), hostsEncoding, cancellationToken);
}
catch (Exception ex)
{