zishuo/Archive
1
0
Fork 0
mirror of https://github.com/bolucat/Archive.git synced 2026-04-23 00:17:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update On Thu Mar 6 19:36:08 CET 2025

Browse Source
This commit is contained in:
github-action[bot]
2025-03-06 19:36:08 +01:00
parent f19cde2a35
commit 2b9b4eca4f
133 changed files with 3064 additions and 1421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayn/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+42 -42
View File
@@ -22,7 +22,7 @@ namespace ServiceLib.Handler
{
Config? config = null;
var result = EmbedUtils.LoadResource(Utils.GetConfigPath(_configRes));
if (Utils.IsNotEmpty(result))
if (result.IsNotEmpty())
{
config = JsonUtils.Deserialize<Config>(result);
}
@@ -67,7 +67,7 @@ namespace ServiceLib.Handler
}
config.RoutingBasicItem ??= new();
if (Utils.IsNullOrEmpty(config.RoutingBasicItem.DomainStrategy))
if (config.RoutingBasicItem.DomainStrategy.IsNullOrEmpty())
{
config.RoutingBasicItem.DomainStrategy = Global.DomainStrategies.First();
}
@@ -103,7 +103,7 @@ namespace ServiceLib.Handler
};
config.UiItem.MainColumnItem ??= new();
if (Utils.IsNullOrEmpty(config.UiItem.CurrentLanguage))
if (config.UiItem.CurrentLanguage.IsNullOrEmpty())
{
config.UiItem.CurrentLanguage = Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName.Equals("zh", StringComparison.CurrentCultureIgnoreCase)
? Global.Languages.First()
@@ -117,11 +117,11 @@ namespace ServiceLib.Handler
{
config.SpeedTestItem.SpeedTestTimeout = 10;
}
if (Utils.IsNullOrEmpty(config.SpeedTestItem.SpeedTestUrl))
if (config.SpeedTestItem.SpeedTestUrl.IsNullOrEmpty())
{
config.SpeedTestItem.SpeedTestUrl = Global.SpeedTestUrls.First();
}
if (Utils.IsNullOrEmpty(config.SpeedTestItem.SpeedPingTestUrl))
if (config.SpeedTestItem.SpeedPingTestUrl.IsNullOrEmpty())
{
config.SpeedTestItem.SpeedPingTestUrl = Global.SpeedPingTestUrl;
}
@@ -354,7 +354,7 @@ namespace ServiceLib.Handler
/// <returns></returns>
public static async Task<int> SetDefaultServerIndex(Config config, string? indexId)
{
if (Utils.IsNullOrEmpty(indexId))
if (indexId.IsNullOrEmpty())
{
return -1;
}
@@ -506,7 +506,7 @@ namespace ServiceLib.Handler
profileItem.Address = newFileName;
profileItem.ConfigType = EConfigType.Custom;
if (Utils.IsNullOrEmpty(profileItem.Remarks))
if (profileItem.Remarks.IsNullOrEmpty())
{
profileItem.Remarks = $"import custom@{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")}";
}
@@ -624,7 +624,7 @@ namespace ServiceLib.Handler
profileItem.Address = profileItem.Address.TrimEx();
profileItem.Id = profileItem.Id.TrimEx();
if (Utils.IsNullOrEmpty(profileItem.StreamSecurity))
if (profileItem.StreamSecurity.IsNullOrEmpty())
{
profileItem.StreamSecurity = Global.StreamSecurity;
}
@@ -654,7 +654,7 @@ namespace ServiceLib.Handler
profileItem.Path = profileItem.Path.TrimEx();
profileItem.Network = string.Empty;
if (Utils.IsNullOrEmpty(profileItem.StreamSecurity))
if (profileItem.StreamSecurity.IsNullOrEmpty())
{
profileItem.StreamSecurity = Global.StreamSecurity;
}
@@ -689,11 +689,11 @@ namespace ServiceLib.Handler
profileItem.HeaderType = Global.TuicCongestionControls.FirstOrDefault()!;
}
if (Utils.IsNullOrEmpty(profileItem.StreamSecurity))
if (profileItem.StreamSecurity.IsNullOrEmpty())
{
profileItem.StreamSecurity = Global.StreamSecurity;
}
if (Utils.IsNullOrEmpty(profileItem.Alpn))
if (profileItem.Alpn.IsNullOrEmpty())
{
profileItem.Alpn = "h3";
}
@@ -858,7 +858,7 @@ namespace ServiceLib.Handler
{
return -1;
}
if (Utils.IsNotEmpty(profileItem.Security) && profileItem.Security != Global.None)
if (profileItem.Security.IsNotEmpty() && profileItem.Security != Global.None)
{
profileItem.Security = Global.None;
}
@@ -897,7 +897,7 @@ namespace ServiceLib.Handler
{
profileItem.ConfigVersion = 2;
if (Utils.IsNotEmpty(profileItem.StreamSecurity))
if (profileItem.StreamSecurity.IsNotEmpty())
{
if (profileItem.StreamSecurity != Global.StreamSecurity
&& profileItem.StreamSecurity != Global.StreamSecurityReality)
@@ -906,24 +906,24 @@ namespace ServiceLib.Handler
}
else
{
if (Utils.IsNullOrEmpty(profileItem.AllowInsecure))
if (profileItem.AllowInsecure.IsNullOrEmpty())
{
profileItem.AllowInsecure = config.CoreBasicItem.DefAllowInsecure.ToString().ToLower();
}
if (Utils.IsNullOrEmpty(profileItem.Fingerprint) && profileItem.StreamSecurity == Global.StreamSecurityReality)
if (profileItem.Fingerprint.IsNullOrEmpty() && profileItem.StreamSecurity == Global.StreamSecurityReality)
{
profileItem.Fingerprint = config.CoreBasicItem.DefFingerprint;
}
}
}
if (Utils.IsNotEmpty(profileItem.Network) && !Global.Networks.Contains(profileItem.Network))
if (profileItem.Network.IsNotEmpty() && !Global.Networks.Contains(profileItem.Network))
{
profileItem.Network = Global.DefaultNetwork;
}
var maxSort = -1;
if (Utils.IsNullOrEmpty(profileItem.IndexId))
if (profileItem.IndexId.IsNullOrEmpty())
{
profileItem.IndexId = Utils.GetGuid(false);
maxSort = ProfileExHandler.Instance.GetMaxSort();
@@ -1084,14 +1084,14 @@ namespace ServiceLib.Handler
/// <returns>成功导入的数量</returns>
private static async Task<int> AddBatchServersCommon(Config config, string strData, string subid, bool isSub)
{
if (Utils.IsNullOrEmpty(strData))
if (strData.IsNullOrEmpty())
{
return -1;
}
var subFilter = string.Empty;
//remove sub items
if (isSub && Utils.IsNotEmpty(subid))
if (isSub && subid.IsNotEmpty())
{
await RemoveServersViaSubid(config, subid, isSub);
subFilter = (await AppHandler.Instance.GetSubItem(subid))?.Filter ?? "";
@@ -1122,7 +1122,7 @@ namespace ServiceLib.Handler
}
//exist sub items //filter
if (isSub && Utils.IsNotEmpty(subid) && Utils.IsNotEmpty(subFilter))
if (isSub && subid.IsNotEmpty() && subFilter.IsNotEmpty())
{
if (!Regex.IsMatch(profileItem.Remarks, subFilter))
{
@@ -1163,7 +1163,7 @@ namespace ServiceLib.Handler
private static async Task<int> AddBatchServers4Custom(Config config, string strData, string subid, bool isSub)
{
if (Utils.IsNullOrEmpty(strData))
if (strData.IsNullOrEmpty())
{
return -1;
}
@@ -1185,7 +1185,7 @@ namespace ServiceLib.Handler
}
if (lstProfiles != null && lstProfiles.Count > 0)
{
if (isSub && Utils.IsNotEmpty(subid))
if (isSub && subid.IsNotEmpty())
{
await RemoveServersViaSubid(config, subid, isSub);
}
@@ -1236,12 +1236,12 @@ namespace ServiceLib.Handler
{
profileItem = NaiveproxyFmt.ResolveFull(strData, subRemarks);
}
if (profileItem is null || Utils.IsNullOrEmpty(profileItem.Address))
if (profileItem is null || profileItem.Address.IsNullOrEmpty())
{
return -1;
}
if (isSub && Utils.IsNotEmpty(subid))
if (isSub && subid.IsNotEmpty())
{
await RemoveServersViaSubid(config, subid, isSub);
}
@@ -1261,12 +1261,12 @@ namespace ServiceLib.Handler
private static async Task<int> AddBatchServers4SsSIP008(Config config, string strData, string subid, bool isSub)
{
if (Utils.IsNullOrEmpty(strData))
if (strData.IsNullOrEmpty())
{
return -1;
}
if (isSub && Utils.IsNotEmpty(subid))
if (isSub && subid.IsNotEmpty())
{
await RemoveServersViaSubid(config, subid, isSub);
}
@@ -1293,13 +1293,13 @@ namespace ServiceLib.Handler
public static async Task<int> AddBatchServers(Config config, string strData, string subid, bool isSub)
{
if (Utils.IsNullOrEmpty(strData))
if (strData.IsNullOrEmpty())
{
return -1;
}
List<ProfileItem>? lstOriSub = null;
ProfileItem? activeProfile = null;
if (isSub && Utils.IsNotEmpty(subid))
if (isSub && subid.IsNotEmpty())
{
lstOriSub = await AppHandler.Instance.ProfileItems(subid);
activeProfile = lstOriSub?.FirstOrDefault(t => t.IndexId == config.IndexId);
@@ -1424,7 +1424,7 @@ namespace ServiceLib.Handler
item.Memo = subItem.Memo;
}
if (Utils.IsNullOrEmpty(item.Id))
if (item.Id.IsNullOrEmpty())
{
item.Id = Utils.GetGuid(false);
@@ -1457,7 +1457,7 @@ namespace ServiceLib.Handler
/// <returns></returns>
public static async Task<int> RemoveServersViaSubid(Config config, string subid, bool isSub)
{
if (Utils.IsNullOrEmpty(subid))
if (subid.IsNullOrEmpty())
{
return -1;
}
@@ -1508,7 +1508,7 @@ namespace ServiceLib.Handler
public static async Task<int> SaveRoutingItem(Config config, RoutingItem item)
{
if (Utils.IsNullOrEmpty(item.Id))
if (item.Id.IsNullOrEmpty())
{
item.Id = Utils.GetGuid(false);
}
@@ -1531,7 +1531,7 @@ namespace ServiceLib.Handler
/// <returns></returns>
public static async Task<int> AddBatchRoutingRules(RoutingItem routingItem, string strData)
{
if (Utils.IsNullOrEmpty(strData))
if (strData.IsNullOrEmpty())
{
return -1;
}
@@ -1549,7 +1549,7 @@ namespace ServiceLib.Handler
routingItem.RuleNum = lstRules.Count;
routingItem.RuleSet = JsonUtils.Serialize(lstRules, false);
if (Utils.IsNullOrEmpty(routingItem.Id))
if (routingItem.Id.IsNullOrEmpty())
{
routingItem.Id = Utils.GetGuid(false);
}
@@ -1668,7 +1668,7 @@ namespace ServiceLib.Handler
public static async Task<int> InitRouting(Config config, bool blImportAdvancedRules = false)
{
if (string.IsNullOrEmpty(config.ConstItem.RouteRulesTemplateSourceUrl))
if (config.ConstItem.RouteRulesTemplateSourceUrl.IsNullOrEmpty())
{
await InitBuiltinRouting(config, blImportAdvancedRules);
}
@@ -1684,7 +1684,7 @@ namespace ServiceLib.Handler
{
var downloadHandle = new DownloadService();
var templateContent = await downloadHandle.TryDownloadString(config.ConstItem.RouteRulesTemplateSourceUrl, true, "");
if (string.IsNullOrEmpty(templateContent))
if (templateContent.IsNullOrEmpty())
return await InitBuiltinRouting(config, blImportAdvancedRules); // fallback
var template = JsonUtils.Deserialize<RoutingTemplate>(templateContent);
@@ -1701,14 +1701,14 @@ namespace ServiceLib.Handler
{
var item = template.RoutingItems[i];
if (string.IsNullOrEmpty(item.Url) && string.IsNullOrEmpty(item.RuleSet))
if (item.Url.IsNullOrEmpty() && item.RuleSet.IsNullOrEmpty())
continue;
var ruleSetsString = !string.IsNullOrEmpty(item.RuleSet)
var ruleSetsString = !item.RuleSet.IsNullOrEmpty()
? item.RuleSet
: await downloadHandle.TryDownloadString(item.Url, true, "");
if (string.IsNullOrEmpty(ruleSetsString))
if (ruleSetsString.IsNullOrEmpty())
continue;
item.Remarks = $"{template.Version}-{item.Remarks}";
@@ -1820,7 +1820,7 @@ namespace ServiceLib.Handler
return -1;
}
if (Utils.IsNullOrEmpty(item.Id))
if (item.Id.IsNullOrEmpty())
{
item.Id = Utils.GetGuid(false);
}
@@ -1841,17 +1841,17 @@ namespace ServiceLib.Handler
var downloadHandle = new DownloadService();
var templateContent = await downloadHandle.TryDownloadString(url, true, "");
if (string.IsNullOrEmpty(templateContent))
if (templateContent.IsNullOrEmpty())
return currentItem;
var template = JsonUtils.Deserialize<DNSItem>(templateContent);
if (template == null)
return currentItem;
if (!string.IsNullOrEmpty(template.NormalDNS))
if (!template.NormalDNS.IsNullOrEmpty())
template.NormalDNS = await downloadHandle.TryDownloadString(template.NormalDNS, true, "");
if (!string.IsNullOrEmpty(template.TunDNS))
if (!template.TunDNS.IsNullOrEmpty())
template.TunDNS = await downloadHandle.TryDownloadString(template.TunDNS, true, "");
template.Id = currentItem.Id;