Browse Source

support custom abp file

tags/3.0
Gang Zhuo 9 years ago
parent
commit
c539e027d7
2 changed files with 13 additions and 1 deletions
  1. +11
    -1
      shadowsocks-csharp/Controller/Service/GfwListUpdater.cs
  2. +2
    -0
      shadowsocks-csharp/Controller/Service/PACServer.cs

+ 11
- 1
shadowsocks-csharp/Controller/Service/GfwListUpdater.cs View File

@@ -18,6 +18,8 @@ namespace Shadowsocks.Controller
private static string USER_RULE_FILE = PACServer.USER_RULE_FILE; private static string USER_RULE_FILE = PACServer.USER_RULE_FILE;
private static string USER_ABP_FILE = PACServer.USER_ABP_FILE;
public event EventHandler<ResultEventArgs> UpdateCompleted; public event EventHandler<ResultEventArgs> UpdateCompleted;
public event ErrorEventHandler Error; public event ErrorEventHandler Error;
@@ -48,7 +50,15 @@ namespace Shadowsocks.Controller
lines.Add(rule); lines.Add(rule);
} }
} }
string abpContent = Utils.UnGzip(Resources.abp_js);
string abpContent;
if (File.Exists(USER_ABP_FILE))
{
abpContent = File.ReadAllText(USER_ABP_FILE, Encoding.UTF8);
}
else
{
abpContent = Utils.UnGzip(Resources.abp_js);
}
abpContent = abpContent.Replace("__RULES__", SimpleJson.SimpleJson.SerializeObject(lines)); abpContent = abpContent.Replace("__RULES__", SimpleJson.SimpleJson.SerializeObject(lines));
if (File.Exists(PAC_FILE)) if (File.Exists(PAC_FILE))
{ {


+ 2
- 0
shadowsocks-csharp/Controller/Service/PACServer.cs View File

@@ -18,6 +18,8 @@ namespace Shadowsocks.Controller
public static string USER_RULE_FILE = "user-rule.txt"; public static string USER_RULE_FILE = "user-rule.txt";
public static string USER_ABP_FILE = "abp.txt";
FileSystemWatcher watcher; FileSystemWatcher watcher;
private Configuration _config; private Configuration _config;


Loading…
Cancel
Save