GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-03-20 18:19:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: builder dns string and Mode FileString

Browse Source
This commit is contained in:
ChsBuffer
2020-10-22 12:23:23 +08:00
parent 421b35a797
commit 2ad394dfde
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netch/Controllers/TUNTAPController.cs
View File

@@ -73,7 +73,7 @@ namespace Netch.Controllers
{
if (Global.Settings.TUNTAP.DNS.Any())
{
dns = Global.Settings.TUNTAP.DNS.Aggregate((current, ip) => $"{current},{ip}");
dns = string.Join(",", Global.Settings.TUNTAP.DNS);
}
else
{

4
Netch/Forms/SettingForm.cs
View File

@@ -217,7 +217,7 @@ namespace Netch.Forms
if (UseCustomDNSCheckBox.Checked)
{
TUNTAPDNSTextBox.Text = Global.Settings.TUNTAP.DNS.Any()
? Global.Settings.TUNTAP.DNS.Aggregate((current, ip) => $"{current},{ip}")
? string.Join(",", Global.Settings.TUNTAP.DNS)
: "1.1.1.1";
}
else
@@ -284,7 +284,7 @@ namespace Netch.Forms
if (UseCustomDNSCheckBox.Checked)
{
TUNTAPDNSTextBox.Text = Global.Settings.TUNTAP.DNS.Aggregate((current, ip) => $"{current},{ip}");
TUNTAPDNSTextBox.Text = string.Join(",", Global.Settings.TUNTAP.DNS);
}
return;

20
Netch/Models/Mode.cs
View File

@@ -131,30 +131,30 @@ namespace Netch.Models
/// <returns>模式文件字符串</returns>
public string ToFileString()
{
string fileString;
StringBuilder fileString = new StringBuilder();
switch (Type)
{
case 0:
// 进程模式
fileString = $"# {Remark}";
fileString.Append($"# {Remark}");
break;
case 1:
// TUN/TAP 规则内 IP CIDR，无 Bypass China 设置
fileString = $"# {Remark}, {Type}, 0";
fileString.Append($"# {Remark}, {Type}, 0");
break;
default:
fileString = $"# {Remark}, {Type}, {(BypassChina ? 1 : 0)}";
fileString.Append($"# {Remark}, {Type}, {(BypassChina ? 1 : 0)}");
break;
}
fileString += Global.EOF;
if (Rule.Any())
{
fileString.Append(Global.EOF);
fileString.Append(string.Join(Global.EOF, Rule));
}
fileString = Rule.Aggregate(fileString, (current, item) => $"{current}{item}{Global.EOF}");
// 去除最后的行尾符
fileString = fileString.Substring(0, fileString.Length - 2);
return fileString;
return fileString.ToString();
}
public string TypeToString()