From 4a45d60c40b6ea59e13630993c47c55575d59032 Mon Sep 17 00:00:00 2001
From: Licshee <licshee@yen.ai>
Date: Sat, 6 Feb 2016 12:56:25 +0800
Subject: [PATCH] more reliable & maintainable extension methods

---
 shadowsocks-csharp/Controller/I18N.cs                   | 2 +-
 shadowsocks-csharp/Controller/Service/GfwListUpdater.cs | 5 +++--
 shadowsocks-csharp/Controller/ShadowsocksController.cs  | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/shadowsocks-csharp/Controller/I18N.cs b/shadowsocks-csharp/Controller/I18N.cs
index b298ae0c..fcae64da 100755
--- a/shadowsocks-csharp/Controller/I18N.cs
+++ b/shadowsocks-csharp/Controller/I18N.cs
@@ -21,7 +21,7 @@ namespace Shadowsocks.Controller
                     string line;
                     while ((line = sr.ReadLine()) != null)
                     {
-                        if (line == "" || line[0] == '#')
+                        if (line.BeginWith('#'))
                             continue;
 
                         var pos = line.IndexOf('=');
diff --git a/shadowsocks-csharp/Controller/Service/GfwListUpdater.cs b/shadowsocks-csharp/Controller/Service/GfwListUpdater.cs
index e89935b2..8098897c 100644
--- a/shadowsocks-csharp/Controller/Service/GfwListUpdater.cs
+++ b/shadowsocks-csharp/Controller/Service/GfwListUpdater.cs
@@ -30,6 +30,7 @@ namespace Shadowsocks.Controller
             }
         }
 
+        private static readonly IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' };
         private void http_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e)
         {
             try
@@ -44,7 +45,7 @@ namespace Shadowsocks.Controller
                         string rule;
                         while ((rule = sr.ReadLine()) != null)
                         {
-                            if (rule == "" || rule[0] == '!' || rule[0] == '[')
+                            if (rule.BeginWithAny(IgnoredLineBegins))
                                 continue;
                             lines.Add(rule);
                         }
@@ -102,7 +103,7 @@ namespace Shadowsocks.Controller
                 string line;
                 while ((line = sr.ReadLine()) != null)
                 {
-                    if (line == "" || line[0] == '!' || line[0] == '[')
+                    if (line.BeginWithAny(IgnoredLineBegins))
                         continue;
                     valid_lines.Add(line);
                 }
diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs
index 960b8f97..d8a76ced 100755
--- a/shadowsocks-csharp/Controller/ShadowsocksController.cs
+++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs
@@ -442,6 +442,7 @@ namespace Shadowsocks.Controller
                 UpdatePACFromGFWListError(this, e);
         }
 
+        private static readonly IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' };
         private void pacServer_UserRuleFileChanged(object sender, EventArgs e)
         {
             // TODO: this is a dirty hack. (from code GListUpdater.http_DownloadStringCompleted())
@@ -459,7 +460,7 @@ namespace Shadowsocks.Controller
                     string rule;
                     while ((rule = sr.ReadLine()) != null)
                     {
-                        if (rule == "" || rule[0] == '!' || rule[0] == '[')
+                        if (rule.BeginWithAny(IgnoredLineBegins))
                             continue;
                         lines.Add(rule);
                     }