github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Add check update for sing-box

pull/5853/head
2dust 1 month ago
parent
fc3ba6c030
commit
d004c6860e
3 changed files with 42 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      v2rayN/ServiceLib/Common/FileManager.cs
  2. 2
      v2rayN/ServiceLib/Services/UpdateService.cs
  3. 48
      v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

25
v2rayN/ServiceLib/Common/FileManager.cs
Unescape View File

@ -1,4 +1,5 @@
using System.IO.Compression; using System.Formats.Tar;
using System.IO.Compression;
using System.Text; using System.Text;
namespace ServiceLib.Common namespace ServiceLib.Common
@ -19,7 +20,7 @@ namespace ServiceLib.Common
return false; return false;
} }
public static void UncompressedFile(string fileName, byte[] content) public static void DecompressFile(string fileName, byte[] content)
{ {
try try
{ {
@ -33,7 +34,7 @@ namespace ServiceLib.Common
} }
} }
public static void UncompressedFile(string fileName, string toPath, string? toName) public static void DecompressFile(string fileName, string toPath, string? toName)
{ {
try try
{ {
@ -49,6 +50,20 @@ namespace ServiceLib.Common
} }
} }
public static void DecompressTarFile(string fileName, string toPath)
{
try
{
using var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
using var gz = new GZipStream(fs, CompressionMode.Decompress, leaveOpen: true);
TarFile.ExtractToDirectory(gz, toPath, overwriteFiles: true);
}
catch (Exception ex)
{
Logging.SaveLog(ex.Message, ex);
}
}
public static string NonExclusiveReadAllText(string path) public static string NonExclusiveReadAllText(string path)
{ {
return NonExclusiveReadAllText(path, Encoding.Default); return NonExclusiveReadAllText(path, Encoding.Default);
@ -139,7 +154,7 @@ namespace ServiceLib.Common
return true; return true;
} }
public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive, string ignoredName) public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive, string? ignoredName)
{ {
// Get information about the source directory // Get information about the source directory
var dir = new DirectoryInfo(sourceDir); var dir = new DirectoryInfo(sourceDir);
@ -166,7 +181,7 @@ namespace ServiceLib.Common
continue; continue;
} }
var targetFilePath = Path.Combine(destinationDir, file.Name); var targetFilePath = Path.Combine(destinationDir, file.Name);
file.CopyTo(targetFilePath); file.CopyTo(targetFilePath, true);
} }
// If recursive and copying subdirectories, recursively call this method // If recursive and copying subdirectories, recursively call this method

2
v2rayN/ServiceLib/Services/UpdateService.cs
Unescape View File

@ -107,7 +107,7 @@ namespace ServiceLib.Services
_updateFunc?.Invoke(false, args.Msg); _updateFunc?.Invoke(false, args.Msg);
url = args.Url; url = args.Url;
var ext = Path.GetExtension(url); var ext = url.Contains(".tar.gz") ? ".tar.gz" : Path.GetExtension(url);
fileName = Utils.GetTempPath(Utils.GetGuid() + ext); fileName = Utils.GetTempPath(Utils.GetGuid() + ext);
await downloadHandle.DownloadFileAsync(url, fileName, true, _timeout); await downloadHandle.DownloadFileAsync(url, fileName, true, _timeout);
} }

48
v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
Unescape View File

@ -66,15 +66,12 @@ namespace ServiceLib.ViewModels
CoreType = ECoreType.mihomo.ToString(), CoreType = ECoreType.mihomo.ToString(),
Remarks = ResUI.menuCheckUpdate, Remarks = ResUI.menuCheckUpdate,
}); });
if (Utils.IsWindows()) _checkUpdateItem.Add(new CheckUpdateItem()
{ {
_checkUpdateItem.Add(new CheckUpdateItem() IsSelected = true,
{ CoreType = ECoreType.sing_box.ToString(),
IsSelected = true, Remarks = ResUI.menuCheckUpdate,
CoreType = ECoreType.sing_box.ToString(), });
Remarks = ResUI.menuCheckUpdate,
});
}
_checkUpdateItem.Add(new CheckUpdateItem() _checkUpdateItem.Add(new CheckUpdateItem()
{ {
IsSelected = true, IsSelected = true,
@ -149,16 +146,6 @@ namespace ServiceLib.ViewModels
private async Task CheckUpdateN(bool preRelease) private async Task CheckUpdateN(bool preRelease)
{ {
////Check for standalone windows .Net version
//if (Utils.IsWindows()
// && File.Exists(Path.Combine(Utils.StartupPath(), "wpfgfx_cor3.dll"))
// && File.Exists(Path.Combine(Utils.StartupPath(), "D3DCompiler_47_cor3.dll"))
// )
//{
// UpdateView(_v2rayN, ResUI.UpdateStandalonePackageTip);
// return;
//}
void _updateUI(bool success, string msg) void _updateUI(bool success, string msg)
{ {
UpdateView(_v2rayN, msg); UpdateView(_v2rayN, msg);
@ -262,15 +249,24 @@ namespace ServiceLib.ViewModels
{ {
continue; continue;
} }
string toPath = Utils.GetBinPath("", item.CoreType); var toPath = Utils.GetBinPath("", item.CoreType);
if (fileName.Contains(".tar.gz")) if (fileName.Contains(".tar.gz"))
{ {
//It's too complicated to unzip. TODO FileManager.DecompressTarFile(fileName, toPath);
var dir = new DirectoryInfo(toPath);
if (dir.Exists)
{
foreach (var subDir in dir.GetDirectories())
{
FileManager.CopyDirectory(subDir.FullName, toPath, false, null);
subDir.Delete(true);
}
}
} }
else if (fileName.Contains(".gz")) else if (fileName.Contains(".gz"))
{ {
FileManager.UncompressedFile(fileName, toPath, item.CoreType); FileManager.DecompressFile(fileName, toPath, item.CoreType);
} }
else else
{ {
@ -299,12 +295,10 @@ namespace ServiceLib.ViewModels
public void UpdateViewResult(CheckUpdateItem item) public void UpdateViewResult(CheckUpdateItem item)
{ {
var found = _checkUpdateItem.FirstOrDefault(t => t.CoreType == item.CoreType); var found = _checkUpdateItem.FirstOrDefault(t => t.CoreType == item.CoreType);
if (found != null) if (found == null) return;
{ var itemCopy = JsonUtils.DeepCopy(found);
var itemCopy = JsonUtils.DeepCopy(found); itemCopy.Remarks = item.Remarks;
itemCopy.Remarks = item.Remarks; _checkUpdateItem.Replace(found, itemCopy);
_checkUpdateItem.Replace(found, itemCopy);
}
} }
} }
} }
Write Preview
Loading…
Cancel
Save