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

使用toml库

Browse Source
This commit is contained in:
老九 2021-08-25 22:53:00 +08:00
parent 81f6afdf8b
commit bae6368087
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
@libs/dnscrypt-proxy.toml
View File

@ -36,8 +36,6 @@
## Example with both IPv4 and IPv6: ## Example with both IPv4 and IPv6:
## listen_addresses = ['127.0.0.1:53', '[::1]:53'] ## listen_addresses = ['127.0.0.1:53', '[::1]:53']
listen_addresses = ['127.0.0.1:5533']
## Maximum number of simultaneous client connections to accept ## Maximum number of simultaneous client connections to accept

7
FastGithub.DomainResolve/FastGithub.DomainResolve.csproj
View File

@ -4,6 +4,7 @@
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
<PackageReference Include="DNS" Version="6.1.0" /> <PackageReference Include="DNS" Version="6.1.0" />
<PackageReference Include="Tommy" Version="3.0.1" />
<ProjectReference Include="..\FastGithub.Configuration\FastGithub.Configuration.csproj" /> <ProjectReference Include="..\FastGithub.Configuration\FastGithub.Configuration.csproj" />
</ItemGroup> </ItemGroup>
@ -11,9 +12,9 @@
<None Include="../@libs/dnscrypt-proxy.toml" Link="dnscryptproxy/dnscrypt-proxy.toml"> <None Include="../@libs/dnscrypt-proxy.toml" Link="dnscryptproxy/dnscrypt-proxy.toml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="../@libs/LICENSE" Link="dnscryptproxy/LICENSE"> <None Include="../@libs/LICENSE" Link="dnscryptproxy/LICENSE">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(RuntimeIdentifier)' == 'win-x64'"> <ItemGroup Condition="'$(RuntimeIdentifier)' == 'win-x64'">

43
FastGithub.DomainResolve/TomlUtil.cs
View File

@ -7,6 +7,7 @@ using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Tommy;
namespace FastGithub.DomainResolve namespace FastGithub.DomainResolve
{ {
@ -21,9 +22,13 @@ namespace FastGithub.DomainResolve
/// <param name="tomlPath"></param> /// <param name="tomlPath"></param>
/// <param name="endpoint"></param> /// <param name="endpoint"></param>
/// <returns></returns> /// <returns></returns>
public static Task<bool> SetListensAsync(string tomlPath, IPEndPoint endpoint, CancellationToken cancellationToken = default) public static Task SetListensAsync(string tomlPath, IPEndPoint endpoint, CancellationToken cancellationToken = default)
{ {
return SetAsync(tomlPath, "listen_addresses", $"['{endpoint}']", cancellationToken); var value = new TomlArray
{
endpoint.ToString()
};
return SetAsync(tomlPath, "listen_addresses", value, cancellationToken);
} }
/// <summary> /// <summary>
@ -37,7 +42,12 @@ namespace FastGithub.DomainResolve
try try
{ {
var address = await GetPublicIPAddressAsync(cancellationToken); var address = await GetPublicIPAddressAsync(cancellationToken);
return await SetAsync(tomlPath, "edns_client_subnet", @$"[""{address}/32""]", cancellationToken); var value = new TomlArray
{
$"{address}/32"
};
await SetAsync(tomlPath, "edns_client_subnet", value, cancellationToken);
return true;
} }
catch (Exception) catch (Exception)
{ {
@ -66,28 +76,19 @@ namespace FastGithub.DomainResolve
/// <param name="tomlPath"></param> /// <param name="tomlPath"></param>
/// <param name="key"></param> /// <param name="key"></param>
/// <param name="value"></param> /// <param name="value"></param>
public static async Task<bool> SetAsync(string tomlPath, string key, object? value, CancellationToken cancellationToken = default) public static async Task SetAsync(string tomlPath, string key, TomlNode value, CancellationToken cancellationToken = default)
{ {
var setted = false; var toml = await File.ReadAllTextAsync(tomlPath, cancellationToken);
var reader = new StringReader(toml);
var tomlTable = TOML.Parse(reader);
tomlTable[key] = value;
var builder = new StringBuilder(); var builder = new StringBuilder();
var lines = await File.ReadAllLinesAsync(tomlPath, cancellationToken); var writer = new StringWriter(builder);
tomlTable.WriteTo(writer);
toml = builder.ToString();
foreach (var line in lines)
{
if (Regex.IsMatch(line, @$"(?<=#*\s*){key}(?=\s*=)") == false)
{
builder.AppendLine(line);
}
else if (setted == false)
{
setted = true;
builder.Append(key).Append(" = ").AppendLine(value?.ToString());
}
}
var toml = builder.ToString();
await File.WriteAllTextAsync(tomlPath, toml, cancellationToken); await File.WriteAllTextAsync(tomlPath, toml, cancellationToken);
return setted;
} }
} }
} }