Browse Source

set default geosite group in Configuration

tags/4.2.0.0
Student Main 4 years ago
parent
commit
77a0cedaa7
2 changed files with 5 additions and 13 deletions
  1. +3
    -11
      shadowsocks-csharp/Controller/Service/GeositeUpdater.cs
  2. +2
    -2
      shadowsocks-csharp/Model/Configuration.cs

+ 3
- 11
shadowsocks-csharp/Controller/Service/GeositeUpdater.cs View File

@@ -6,8 +6,6 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks;
using Google.Protobuf;
using Newtonsoft.Json; using Newtonsoft.Json;
using Shadowsocks.Model; using Shadowsocks.Model;
using System.Net; using System.Net;
@@ -66,14 +64,9 @@ namespace Shadowsocks.Controller
public static void UpdatePACFromGeosite(Configuration config) public static void UpdatePACFromGeosite(Configuration config)
{ {
string geositeUrl = GEOSITE_URL; string geositeUrl = GEOSITE_URL;
string group = "geolocation-!cn";
bool blacklist = true;
if (!string.IsNullOrWhiteSpace(config.geositeGroup))
{
group = config.geositeGroup;
blacklist = config.geositeBlacklistMode;
}

string group = config.geositeGroup;
bool blacklist = config.geositeBlacklistMode;
if (!string.IsNullOrWhiteSpace(config.geositeUrl)) if (!string.IsNullOrWhiteSpace(config.geositeUrl))
{ {
logger.Info("Found custom Geosite URL in config file"); logger.Info("Found custom Geosite URL in config file");
@@ -170,7 +163,6 @@ var __RULES__ = {JsonConvert.SerializeObject(gfwLines, Formatting.Indented)};
private static List<string> GeositeToGFWList(IList<DomainObject> domains, bool blacklist) private static List<string> GeositeToGFWList(IList<DomainObject> domains, bool blacklist)
{ {
return blacklist ? GeositeToGFWListBlack(domains) : GeositeToGFWListWhite(domains); return blacklist ? GeositeToGFWListBlack(domains) : GeositeToGFWListWhite(domains);

} }


private static List<string> GeositeToGFWListBlack(IList<DomainObject> domains) private static List<string> GeositeToGFWListBlack(IList<DomainObject> domains)


+ 2
- 2
shadowsocks-csharp/Model/Configuration.cs View File

@@ -30,8 +30,8 @@ namespace Shadowsocks.Model
public bool showPluginOutput; public bool showPluginOutput;
public string pacUrl; public string pacUrl;
public string geositeUrl; public string geositeUrl;
public string geositeGroup;
public bool geositeBlacklistMode;
public string geositeGroup = "geolocation-!cn";
public bool geositeBlacklistMode = true;
public bool useOnlinePac; public bool useOnlinePac;
public bool secureLocalPac = true; public bool secureLocalPac = true;


Loading…
Cancel
Save