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

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

@ -44,11 +44,12 @@ namespace FastGithub.PacketIntercept.Dns
return; return;
} }
Encoding hostsEncoding;
var hasConflicting = false; var hasConflicting = false;
var hostsBuilder = new StringBuilder(); var hostsBuilder = new StringBuilder();
using var fileStream = new FileStream(hostsPath, FileMode.Open, FileAccess.Read); using (var fileStream = new FileStream(hostsPath, FileMode.Open, FileAccess.Read))
{
using var streamReader = new StreamReader(fileStream); using var streamReader = new StreamReader(fileStream);
while (streamReader.EndOfStream == false) while (streamReader.EndOfStream == false)
{ {
var line = await streamReader.ReadLineAsync(); var line = await streamReader.ReadLineAsync();
@ -62,14 +63,15 @@ namespace FastGithub.PacketIntercept.Dns
hostsBuilder.AppendLine(line); hostsBuilder.AppendLine(line);
} }
} }
hostsEncoding = streamReader.CurrentEncoding;
}
if (hasConflicting == true) if (hasConflicting == true)
{ {
try try
{ {
File.Move(hostsPath, Path.ChangeExtension(hostsPath, ".bak"), overwrite: true); await File.WriteAllTextAsync(hostsPath, hostsBuilder.ToString(), hostsEncoding, cancellationToken);
await File.WriteAllTextAsync(hostsPath, hostsBuilder.ToString(), streamReader.CurrentEncoding, cancellationToken);
} }
catch (Exception ex) catch (Exception ex)
{ {