Clash.Meta-windows-amd64-compatible

This commit is contained in:
2dust
2022-06-12 19:26:56 +08:00
parent bd6ddc3cc9
commit 57357ee1b3
5 changed files with 30 additions and 9 deletions

View File

@@ -1041,14 +1041,20 @@ namespace clashN.Forms
CloseCore(); CloseCore();
string fileName = Utils.GetPath(Utils.GetDownloadFileName(msg)); string fileName = Utils.GetPath(Utils.GetDownloadFileName(msg));
FileManager.ZipExtractToFile(fileName, config.ignoreGeoUpdateCore ? "geo" : ""); if (FileManager.ZipExtractToFile(fileName, config.ignoreGeoUpdateCore ? "geo" : "") == false)
{
Global.reloadCore = true;
_ = LoadCore();
AppendText(false, ResUI.MsgUpdateCoreCoreFailed);
}
else
{
AppendText(false, ResUI.MsgUpdateCoreCoreSuccessfullyMore);
AppendText(false, ResUI.MsgUpdateCoreCoreSuccessfullyMore); Global.reloadCore = true;
_ = LoadCore();
Global.reloadCore = true; AppendText(false, ResUI.MsgUpdateCoreCoreSuccessfully);
_ = LoadCore(); }
AppendText(false, ResUI.MsgUpdateCoreCoreSuccessfully);
} }
}; };
(new UpdateHandle()).CheckUpdateCore(type, config, _updateUI); (new UpdateHandle()).CheckUpdateCore(type, config, _updateUI);

View File

@@ -82,12 +82,12 @@ namespace clashN.Handler
coreInfos.Add(new CoreInfo coreInfos.Add(new CoreInfo
{ {
coreType = ECoreType.clash_meta, coreType = ECoreType.clash_meta,
coreExes = new List<string> { "Clash.Meta-windows-amd64v1", "Clash.Meta-windows-amd64", "Clash.Meta-windows-386", "Clash.Meta", "clash" }, coreExes = new List<string> { "Clash.Meta-windows-amd64-compatible", "Clash.Meta-windows-amd64", "Clash.Meta-windows-386", "Clash.Meta", "clash" },
arguments = "-f config.yaml", arguments = "-f config.yaml",
coreUrl = Global.clashMetaCoreUrl, coreUrl = Global.clashMetaCoreUrl,
coreLatestUrl = Global.clashMetaCoreUrl + "/latest", coreLatestUrl = Global.clashMetaCoreUrl + "/latest",
coreDownloadUrl32 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-386-{0}.zip", coreDownloadUrl32 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-386-{0}.zip",
coreDownloadUrl64 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-amd64V1-{0}.zip", coreDownloadUrl64 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-amd64-compatible-{0}.zip",
match = "Clash Meta" match = "Clash Meta"
}); });

View File

@@ -600,6 +600,15 @@ namespace clashN.Resx {
} }
} }
/// <summary>
/// 查找类似 Update Core failed, see the log for details 的本地化字符串。
/// </summary>
internal static string MsgUpdateCoreCoreFailed {
get {
return ResourceManager.GetString("MsgUpdateCoreCoreFailed", resourceCulture);
}
}
/// <summary> /// <summary>
/// 查找类似 Update Core successfully 的本地化字符串。 /// 查找类似 Update Core successfully 的本地化字符串。
/// </summary> /// </summary>

View File

@@ -376,4 +376,7 @@
<data name="MsgSkipSubscriptionUpdate" xml:space="preserve"> <data name="MsgSkipSubscriptionUpdate" xml:space="preserve">
<value>Skip this subscription update</value> <value>Skip this subscription update</value>
</data> </data>
<data name="MsgUpdateCoreCoreFailed" xml:space="preserve">
<value>Update Core failed, see the log for details</value>
</data>
</root> </root>

View File

@@ -376,4 +376,7 @@
<data name="MsgSkipSubscriptionUpdate" xml:space="preserve"> <data name="MsgSkipSubscriptionUpdate" xml:space="preserve">
<value>跳过此订阅更新</value> <value>跳过此订阅更新</value>
</data> </data>
<data name="MsgUpdateCoreCoreFailed" xml:space="preserve">
<value>更新Core失败详情见日志</value>
</data>
</root> </root>