@@ -21,7 +21,7 @@ namespace Shadowsocks.Controller | |||||
string line; | string line; | ||||
while ((line = sr.ReadLine()) != null) | while ((line = sr.ReadLine()) != null) | ||||
{ | { | ||||
if (line == "" || line[0] == '#') | |||||
if (line.BeginWith('#')) | |||||
continue; | continue; | ||||
var pos = line.IndexOf('='); | var pos = line.IndexOf('='); | ||||
@@ -30,6 +30,7 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
} | } | ||||
private static readonly IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' }; | |||||
private void http_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e) | private void http_DownloadStringCompleted(object sender, DownloadStringCompletedEventArgs e) | ||||
{ | { | ||||
try | try | ||||
@@ -44,7 +45,7 @@ namespace Shadowsocks.Controller | |||||
string rule; | string rule; | ||||
while ((rule = sr.ReadLine()) != null) | while ((rule = sr.ReadLine()) != null) | ||||
{ | { | ||||
if (rule == "" || rule[0] == '!' || rule[0] == '[') | |||||
if (rule.BeginWithAny(IgnoredLineBegins)) | |||||
continue; | continue; | ||||
lines.Add(rule); | lines.Add(rule); | ||||
} | } | ||||
@@ -102,7 +103,7 @@ namespace Shadowsocks.Controller | |||||
string line; | string line; | ||||
while ((line = sr.ReadLine()) != null) | while ((line = sr.ReadLine()) != null) | ||||
{ | { | ||||
if (line == "" || line[0] == '!' || line[0] == '[') | |||||
if (line.BeginWithAny(IgnoredLineBegins)) | |||||
continue; | continue; | ||||
valid_lines.Add(line); | valid_lines.Add(line); | ||||
} | } | ||||
@@ -442,6 +442,7 @@ namespace Shadowsocks.Controller | |||||
UpdatePACFromGFWListError(this, e); | UpdatePACFromGFWListError(this, e); | ||||
} | } | ||||
private static readonly IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' }; | |||||
private void pacServer_UserRuleFileChanged(object sender, EventArgs e) | private void pacServer_UserRuleFileChanged(object sender, EventArgs e) | ||||
{ | { | ||||
// TODO: this is a dirty hack. (from code GListUpdater.http_DownloadStringCompleted()) | // TODO: this is a dirty hack. (from code GListUpdater.http_DownloadStringCompleted()) | ||||
@@ -459,7 +460,7 @@ namespace Shadowsocks.Controller | |||||
string rule; | string rule; | ||||
while ((rule = sr.ReadLine()) != null) | while ((rule = sr.ReadLine()) != null) | ||||
{ | { | ||||
if (rule == "" || rule[0] == '!' || rule[0] == '[') | |||||
if (rule.BeginWithAny(IgnoredLineBegins)) | |||||
continue; | continue; | ||||
lines.Add(rule); | lines.Add(rule); | ||||
} | } | ||||