Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Put user rules at the begin of the PAC file.

Browse Source 
Fix: #1468
Enhance: 46d40fec67
This commit is contained in:
Liming Jin
2017-12-10 17:25:07 +08:00
parent 0c877a76c6
commit dc718a583b
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shadowsocks-csharp/Controller/Service/GfwListUpdater.cs
+4 -9
View File
@@ -36,7 +36,7 @@ namespace Shadowsocks.Controller
try
{
File.WriteAllText(Utils.GetTempPath("gfwlist.txt"), e.Result, Encoding.UTF8);
List<string> lines = ParseResult(e.Result);
List<string> lines = new List<string>();
if (File.Exists(PACServer.USER_RULE_FILE))
{
string local = FileManager.NonExclusiveReadAllText(PACServer.USER_RULE_FILE, Encoding.UTF8);
@@ -50,6 +50,7 @@ namespace Shadowsocks.Controller
}
}
}
lines.AddRange(ParseResult(e.Result));
string abpContent;
if (File.Exists(PACServer.USER_ABP_FILE))
{
@@ -70,17 +71,11 @@ namespace Shadowsocks.Controller
}
}
File.WriteAllText(PACServer.PAC_FILE, abpContent, Encoding.UTF8);
if (UpdateCompleted != null)
{
UpdateCompleted(this, new ResultEventArgs(true));
}
UpdateCompleted?.Invoke(this, new ResultEventArgs(true));
}
catch (Exception ex)
{
if (Error != null)
{
Error(this, new ErrorEventArgs(ex));
}
Error?.Invoke(this, new ErrorEventArgs(ex));
}
}