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

Improve subscription info

Browse Source
This commit is contained in:
Bruce Wayne
2020-01-23 20:36:53 +08:00
parent c857c2a72c
commit c5e46844da
3 changed files with 65 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
Netch/Forms/MainForm.cs
View File

@@ -397,6 +397,10 @@ namespace Netch.Forms
{
Global.Settings.Server.AddRange(result);
}
else
{
MessageBox.Show(Utils.i18N.Translate("Import servers error!"), Utils.i18N.Translate("Error"), MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
}
InitServer();
Utils.Configuration.Save();
@@ -457,6 +461,7 @@ namespace Netch.Forms
{
DeletePictureBox.Enabled = false;
UpdateServersFromSubscribeLinksToolStripMenuItem.Enabled = false;
Task.Run(() =>
{
if (Global.Settings.UseProxyToUpdateSubscription)
@@ -471,51 +476,60 @@ namespace Netch.Forms
}
foreach (var item in Global.Settings.SubscribeLink)
{
using (var client = new Override.WebClient())
using var client = new Override.WebClient();
try
{
if (!String.IsNullOrEmpty(item.UserAgent))
{
client.Headers.Add("User-Agent", item.UserAgent);
}
else
{
client.Headers.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36");
}
if (Global.Settings.UseProxyToUpdateSubscription)
{
client.Proxy = new System.Net.WebProxy($"http://127.0.0.1:{Global.Settings.HTTPLocalPort}");
}
var response = client.DownloadString(item.Link);
try
{
if (!String.IsNullOrEmpty(item.UserAgent))
{
client.Headers.Add("User-Agent", item.UserAgent);
}
else
{
client.Headers.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36");
}
if (Global.Settings.UseProxyToUpdateSubscription)
{
client.Proxy = new System.Net.WebProxy($"http://127.0.0.1:{Global.Settings.HTTPLocalPort}");
}
var response = client.DownloadString(item.Link);
try
{
response = Utils.ShareLink.URLSafeBase64Decode(response);
}
catch (Exception)
{
// 跳过
}
Global.Settings.Server = Global.Settings.Server.Where(server => server.Group != item.Remark).ToList();
var result = Utils.ShareLink.Parse(response);
if (result != null)
{
foreach (var x in result)
{
x.Group = item.Remark;
}
Global.Settings.Server.AddRange(result);
}
response = Utils.ShareLink.URLSafeBase64Decode(response);
}
catch (Exception)
{
continue;
// 跳过
}
Global.Settings.Server = Global.Settings.Server.Where(server => server.Group != item.Remark).ToList();
var result = Utils.ShareLink.Parse(response);
if (result != null)
{
foreach (var x in result)
{
x.Group = item.Remark;
}
Global.Settings.Server.AddRange(result);
NotifyIcon.ShowBalloonTip(5,
UpdateChecker.Name,
string.Format(Utils.i18N.Translate("Update {1} server(s) from {0}"), item.Remark, result.Count),
ToolTipIcon.Info);
}
else
{
NotifyIcon.ShowBalloonTip(5,
UpdateChecker.Name,
string.Format(Utils.i18N.Translate("Update servers error from {0}"), item.Remark),
ToolTipIcon.Error);
}
}
catch (Exception)
{
continue;
}
}
@@ -527,11 +541,19 @@ namespace Netch.Forms
ControlButton.Text = Utils.i18N.Translate("Start");
MainController.Stop();
}
MessageBox.Show(this, Utils.i18N.Translate("Update completed"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
Utils.Configuration.Save();
}).ContinueWith(task =>
{
BeginInvoke(new Action(() =>
{
UpdateServersFromSubscribeLinksToolStripMenuItem.Enabled = true;
}));
});
MessageBox.Show(Utils.i18N.Translate("Updating in the background"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
NotifyIcon.ShowBalloonTip(5,
UpdateChecker.Name,
Utils.i18N.Translate("Updating in the background"),
ToolTipIcon.Info);
}
else
{

4
Netch/Resources/zh-CN
View File

@@ -19,6 +19,7 @@
"Server": "服务器",
"Import Servers From Clipboard": "从剪贴板导入服务器",
"Import servers error!": "未找到可导入的链接！",
"Add [Socks5] Server": "添加 [Socks5] 服务器",
"Add [Shadowsocks] Server": "添加 [Shadowsocks] 服务器",
"Add [ShadowsocksR] Server": "添加 [ShadowsocksR] 服务器",
@@ -56,7 +57,8 @@
"Update Servers From Subscribe Links": "从订阅链接更新服务器",
"No subscription link": "没有任何一条订阅链接",
"Updating in the background": "正在后台更新中",
"Update completed": "更新完成",
"Update {1} server(s) from {0}": "从 {0} 更新 {1} 个服务器",
"Update servers error from {0}": "从 {0} 更新服务器失败",
"Options": "选项",
"Restart Service": "重启服务",

1
Netch/Utils/ShareLink.cs
View File

@@ -57,7 +57,6 @@ namespace Netch.Utils
if (list.Count == 0)
{
System.Windows.Forms.MessageBox.Show(@"未找到可导入的链接！", @"错误", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Exclamation);
return null;
}
}