:sparkles:添加使用代理更新ACL功能

:art:启动后允许打开Netch设置及大部分部分工具栏
2026-03-14 17:43:18 +08:00 · 2020-04-21 16:58:06 +08:00
parent 5f3a300ccc
commit c31338ee1f
4 changed files with 116 additions and 18 deletions
--- a/Netch/Forms/MainForm.Designer.cs
+++ b/Netch/Forms/MainForm.Designer.cs
@@ -84,6 +84,7 @@ namespace Netch.Forms
            this.SettingsButton = new System.Windows.Forms.Button();
            this.ProfileGroupBox = new System.Windows.Forms.GroupBox();
            this.ProfileTable = new System.Windows.Forms.TableLayoutPanel();
+            this.updateACLWithProxyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.MenuStrip.SuspendLayout();
            this.ConfigurationGroupBox.SuspendLayout();
            this.configLayoutPanel.SuspendLayout();
@@ -221,7 +222,8 @@ namespace Netch.Forms
            this.RestartServiceToolStripMenuItem,
            this.UninstallServiceToolStripMenuItem,
            this.CleanDNSCacheToolStripMenuItem,
-            this.UpdateACLToolStripMenuItem});
+            this.UpdateACLToolStripMenuItem,
+            this.updateACLWithProxyToolStripMenuItem});
            this.OptionsToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
            this.OptionsToolStripMenuItem.Name = "OptionsToolStripMenuItem";
            this.OptionsToolStripMenuItem.Size = new System.Drawing.Size(66, 21);
@@ -230,35 +232,35 @@ namespace Netch.Forms
            // ReloadModesToolStripMenuItem
            // 
            this.ReloadModesToolStripMenuItem.Name = "ReloadModesToolStripMenuItem";
-            this.ReloadModesToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.ReloadModesToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
            this.ReloadModesToolStripMenuItem.Text = "Reload Modes";
            this.ReloadModesToolStripMenuItem.Click += new System.EventHandler(this.ReloadModesToolStripMenuItem_Click);
            // 
            // RestartServiceToolStripMenuItem
            // 
            this.RestartServiceToolStripMenuItem.Name = "RestartServiceToolStripMenuItem";
-            this.RestartServiceToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.RestartServiceToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
            this.RestartServiceToolStripMenuItem.Text = "Restart Service";
            this.RestartServiceToolStripMenuItem.Click += new System.EventHandler(this.RestartServiceToolStripMenuItem_Click);
            // 
            // UninstallServiceToolStripMenuItem
            // 
            this.UninstallServiceToolStripMenuItem.Name = "UninstallServiceToolStripMenuItem";
-            this.UninstallServiceToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.UninstallServiceToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
            this.UninstallServiceToolStripMenuItem.Text = "Uninstall Service";
            this.UninstallServiceToolStripMenuItem.Click += new System.EventHandler(this.UninstallServiceToolStripMenuItem_Click);
            // 
            // CleanDNSCacheToolStripMenuItem
            // 
            this.CleanDNSCacheToolStripMenuItem.Name = "CleanDNSCacheToolStripMenuItem";
-            this.CleanDNSCacheToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.CleanDNSCacheToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
            this.CleanDNSCacheToolStripMenuItem.Text = "Clean DNS Cache";
            this.CleanDNSCacheToolStripMenuItem.Click += new System.EventHandler(this.CleanDNSCacheToolStripMenuItem_Click);
            // 
            // UpdateACLToolStripMenuItem
            // 
            this.UpdateACLToolStripMenuItem.Name = "UpdateACLToolStripMenuItem";
-            this.UpdateACLToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.UpdateACLToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
            this.UpdateACLToolStripMenuItem.Text = "Update ACL";
            this.UpdateACLToolStripMenuItem.Click += new System.EventHandler(this.updateACLToolStripMenuItem_Click);
            // 
@@ -620,6 +622,13 @@ namespace Netch.Forms
            this.ProfileTable.Size = new System.Drawing.Size(599, 43);
            this.ProfileTable.TabIndex = 0;
            // 
+            // updateACLWithProxyToolStripMenuItem
+            // 
+            this.updateACLWithProxyToolStripMenuItem.Name = "updateACLWithProxyToolStripMenuItem";
+            this.updateACLWithProxyToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
+            this.updateACLWithProxyToolStripMenuItem.Text = "Update ACL with proxy";
+            this.updateACLWithProxyToolStripMenuItem.Click += new System.EventHandler(this.updateACLWithProxyToolStripMenuItem_Click);
+            // 
            // MainForm
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -718,5 +727,6 @@ namespace Netch.Forms
        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
        private System.Windows.Forms.ToolStripMenuItem UpdateACLToolStripMenuItem;
        private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem updateACLWithProxyToolStripMenuItem;
    }
 }
--- a/Netch/Forms/MainForm.cs
+++ b/Netch/Forms/MainForm.cs
@@ -794,7 +794,14 @@ namespace Netch.Forms
                    return;
                }

-                MenuStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = false;
+                //MenuStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = false;
+
+                //关闭启动按钮
+                ControlButton.Enabled = false;
+                //关闭使用代理更新ACL
+                updateACLWithProxyToolStripMenuItem.Enabled = false;
+                UpdateServersFromSubscribeLinksToolStripMenuItem.Enabled = false;
+
                ControlButton.Text = "...";
                StatusLabel.Text = $"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting")}";
                State = Models.State.Starting;
@@ -1295,14 +1302,29 @@ namespace Netch.Forms
            client.DownloadFileTaskAsync(Global.Settings.ACL, "bin\\default.acl");
            client.DownloadFileCompleted += ((sender, args) =>
            {
-                if (args.Error == null)
+                try
                {
-                    MessageBox.Show(Utils.i18N.Translate("ACL updated successfully"));
+
+                    if (args.Error == null)
+                    {
+                        NotifyIcon.ShowBalloonTip(5,
+                                UpdateChecker.Name, Utils.i18N.Translate("ACL updated successfully"),
+                                ToolTipIcon.Info);
+                        //MessageBox.Show(Utils.i18N.Translate("ACL updated successfully"));
+                    }
+                    else
+                    {
+                        Utils.Logging.Info("ACL更新失败！" + args.Error);
+                        NotifyIcon.ShowBalloonTip(5,
+                                UpdateChecker.Name,
+                                Utils.i18N.Translate("ACL update failed"),
+                                ToolTipIcon.Error);
+                        //MessageBox.Show(Utils.i18N.Translate("ACL update failed"));
+                    }
                }
-                else
+                finally
                {
-                    Utils.Logging.Info("ACL更新失败！" + args.Error);
-                    MessageBox.Show(Utils.i18N.Translate("ACL update failed"));
+                    StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Waiting for command")}");
                }
            });
        }
@@ -1337,5 +1359,61 @@ namespace Netch.Forms
            Dispose();
            Environment.Exit(Environment.ExitCode);
        }
+
+        private void updateACLWithProxyToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            updateACLWithProxyToolStripMenuItem.Enabled = false;
+            if (Global.Settings.UseProxyToUpdateSubscription)
+            {
+                // 当前 ServerComboBox 中至少有一项
+                if (ServerComboBox.SelectedIndex == -1)
+                {
+                    MessageBox.Show(Utils.i18N.Translate("Please select a server first"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    return;
+                }
+                MenuStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = false;
+                ControlButton.Text = "...";
+            }
+
+            Task.Run(() =>
+            {
+                var mode = new Models.Mode
+                {
+                    Remark = "ProxyUpdate",
+                    Type = 5
+                };
+                MainController = new MainController();
+                MainController.Start(ServerComboBox.SelectedItem as Models.Server, mode);
+
+                using var client = new Override.WebClient();
+
+                client.Proxy = new System.Net.WebProxy($"http://127.0.0.1:{Global.Settings.HTTPLocalPort}");
+
+                StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Updating in the background")}");
+                try
+                {
+                    client.DownloadFile(Global.Settings.ACL, "bin\\default.acl");
+                    NotifyIcon.ShowBalloonTip(5,
+                            UpdateChecker.Name, Utils.i18N.Translate("ACL updated successfully"),
+                            ToolTipIcon.Info);
+                }
+                catch (Exception e)
+                {
+
+                    Utils.Logging.Info("ACL更新失败！" + e.Message);
+                    NotifyIcon.ShowBalloonTip(5,
+                            UpdateChecker.Name,
+                            Utils.i18N.Translate("ACL update failed"),
+                            ToolTipIcon.Error);
+                }
+                finally
+                {
+                    updateACLWithProxyToolStripMenuItem.Enabled = true;
+
+                    StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Waiting for command")}");
+                    MainController.Stop();
+                }
+            });
+        }
    }
 }
--- a/Netch/Forms/SubscribeForm.Designer.cs
+++ b/Netch/Forms/SubscribeForm.Designer.cs
@@ -88,7 +88,7 @@
            this.UserAgentLabel.AutoSize = true;
            this.UserAgentLabel.Location = new System.Drawing.Point(11, 77);
            this.UserAgentLabel.Name = "UserAgentLabel";
-            this.UserAgentLabel.Size = new System.Drawing.Size(73, 17);
+            this.UserAgentLabel.Size = new System.Drawing.Size(74, 17);
            this.UserAgentLabel.TabIndex = 5;
            this.UserAgentLabel.Text = "User-Agent";
            // 
@@ -150,6 +150,7 @@
            this.SubscribeLinkListView.TabIndex = 0;
            this.SubscribeLinkListView.UseCompatibleStateImageBehavior = false;
            this.SubscribeLinkListView.View = System.Windows.Forms.View.Details;
+            this.SubscribeLinkListView.SelectedIndexChanged += new System.EventHandler(this.SubscribeLinkListView_SelectedIndexChanged);
            // 
            // RemarkColumnHeader
            // 
@@ -169,23 +170,22 @@
            // pContextMenuStrip
            // 
            this.pContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.DeleteToolStripMenuItem});
-            this.pContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.DeleteToolStripMenuItem,
            this.CopyLinkToolStripMenuItem});
            this.pContextMenuStrip.Name = "pContextMenuStrip";
-            this.pContextMenuStrip.Size = new System.Drawing.Size(114, 26);
+            this.pContextMenuStrip.Size = new System.Drawing.Size(130, 48);
            // 
            // DeleteToolStripMenuItem
            // 
            this.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem";
-            this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(113, 22);
+            this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
            this.DeleteToolStripMenuItem.Text = "Delete";
            this.DeleteToolStripMenuItem.Click += new System.EventHandler(this.DeleteToolStripMenuItem_Click);
            // 
            // CopyLinkToolStripMenuItem
            // 
            this.CopyLinkToolStripMenuItem.Name = "CopyLinkToolStripMenuItem";
-            this.CopyLinkToolStripMenuItem.Size = new System.Drawing.Size(113, 22);
+            this.CopyLinkToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
            this.CopyLinkToolStripMenuItem.Text = "CopyLink";
            this.CopyLinkToolStripMenuItem.Click += new System.EventHandler(this.CopyLinkToolStripMenuItem_Click);
            // 
--- a/Netch/Forms/SubscribeForm.cs
+++ b/Netch/Forms/SubscribeForm.cs
@@ -144,5 +144,15 @@ namespace Netch.Forms
            MessageBox.Show(Utils.i18N.Translate("Successfully saved"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
            Close();
        }
+        /// <summary>
+        /// 订阅列表选中节点
+        /// TODO 选中节点编辑
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SubscribeLinkListView_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            //MessageBox.Show(SubscribeLinkListView.SelectedItems + "", Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
    }
 }