pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-11-14 16:35:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Common

Browse Source
This commit is contained in:
2dust
2024-10-14 10:57:40 +08:00
parent 6b99b7eec5
commit 019c69ecff
11 changed files with 49 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/Common/FileManager.cs
+12 -12
View File
@@ -23,7 +23,7 @@ namespace ServiceLib.Common
{
try
{
using FileStream fs = File.Create(fileName);
using var fs = File.Create(fileName);
using GZipStream input = new(new MemoryStream(content), CompressionMode.Decompress, false);
input.CopyTo(fs);
}
@@ -38,8 +38,8 @@ namespace ServiceLib.Common
try
{
FileInfo fileInfo = new(fileName);
using FileStream originalFileStream = fileInfo.OpenRead();
using FileStream decompressedFileStream = File.Create(toName != null ? Path.Combine(toPath, toName) : toPath);
using var originalFileStream = fileInfo.OpenRead();
using var decompressedFileStream = File.Create(toName != null ? Path.Combine(toPath, toName) : toPath);
using GZipStream decompressionStream = new(originalFileStream, CompressionMode.Decompress);
decompressionStream.CopyTo(decompressedFileStream);
}
@@ -54,7 +54,7 @@ namespace ServiceLib.Common
return NonExclusiveReadAllText(path, Encoding.Default);
}
public static string NonExclusiveReadAllText(string path, Encoding encoding)
private static string NonExclusiveReadAllText(string path, Encoding encoding)
{
try
{
@@ -73,8 +73,8 @@ namespace ServiceLib.Common
{
try
{
using ZipArchive archive = ZipFile.OpenRead(fileName);
foreach (ZipArchiveEntry entry in archive.Entries)
using var archive = ZipFile.OpenRead(fileName);
foreach (var entry in archive.Entries)
{
if (entry.Length == 0)
{
@@ -110,7 +110,7 @@ namespace ServiceLib.Common
}
try
{
using ZipArchive archive = ZipFile.OpenRead(fileName);
using var archive = ZipFile.OpenRead(fileName);
return archive.Entries.Select(entry => entry.FullName).ToList();
}
catch (Exception ex)
@@ -149,13 +149,13 @@ namespace ServiceLib.Common
throw new DirectoryNotFoundException($"Source directory not found: {dir.FullName}");
// Cache directories before we start copying
DirectoryInfo[] dirs = dir.GetDirectories();
var dirs = dir.GetDirectories();
// Create the destination directory
Directory.CreateDirectory(destinationDir);
// Get the files in the source directory and copy to the destination directory
foreach (FileInfo file in dir.GetFiles())
foreach (var file in dir.GetFiles())
{
if (Utils.IsNotEmpty(ignoredName) && file.Name.Contains(ignoredName))
{
@@ -165,16 +165,16 @@ namespace ServiceLib.Common
{
continue;
}
string targetFilePath = Path.Combine(destinationDir, file.Name);
var targetFilePath = Path.Combine(destinationDir, file.Name);
file.CopyTo(targetFilePath);
}
// If recursive and copying subdirectories, recursively call this method
if (recursive)
{
foreach (DirectoryInfo subDir in dirs)
foreach (var subDir in dirs)
{
string newDestinationDir = Path.Combine(destinationDir, subDir.Name);
var newDestinationDir = Path.Combine(destinationDir, subDir.Name);
CopyDirectory(subDir.FullName, newDestinationDir, true, ignoredName);
}
}