gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2025-06-07 13:49:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix performance issue when initial start

Browse Source
This commit is contained in:
Namhyeon Go 2025-05-17 03:29:36 +09:00
parent e454c22053
commit 753ef4c6e5
1 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
WelsonJS.Toolkit/WelsonJS.Launcher/ZipExtractor.cs
View File

@ -4,6 +4,7 @@ using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading.Tasks;
namespace WelsonJS.Launcher namespace WelsonJS.Launcher
{ {
@ -11,9 +12,10 @@ namespace WelsonJS.Launcher
{ {
class Extractor class Extractor
{ {
public string Name; public string Name { get; set; }
public string Path; public string FileName { get; set; }
public Func<string, string, string> ExtractCommand; public string Path { get; set; }
public Func<string, string, string> ExtractCommand { get; set; }
} }
private readonly List<Extractor> AvailableExtractors; private readonly List<Extractor> AvailableExtractors;
@ -24,46 +26,48 @@ namespace WelsonJS.Launcher
new Extractor new Extractor
{ {
Name = "7z", Name = "7z",
Path = FindExecutable("7z.exe"), FileName = "7z.exe",
ExtractCommand = (src, dest) => $"x \"{src}\" -o\"{dest}\" -y" ExtractCommand = (src, dest) => $"x \"{src}\" -o\"{dest}\" -y"
}, },
new Extractor new Extractor
{ {
Name = "WinRAR", Name = "WinRAR",
Path = FindExecutable("rar.exe"), FileName = "rar.exe",
ExtractCommand = (src, dest) => $"x -o+ \"{src}\" \"{dest}\\\"" ExtractCommand = (src, dest) => $"x -o+ \"{src}\" \"{dest}\\\""
}, },
new Extractor new Extractor
{ {
Name = "PeaZip", Name = "PeaZip",
Path = FindExecutable("peazip.exe"), FileName = "peazip.exe",
ExtractCommand = (src, dest) => $"-ext2simple \"{src}\" \"{dest}\"" ExtractCommand = (src, dest) => $"-ext2simple \"{src}\" \"{dest}\""
}, },
new Extractor new Extractor
{ {
Name = "tar (Windows)", Name = "tar (Windows)",
Path = FindExecutable("tar.exe"), FileName = "tar.exe",
ExtractCommand = (src, dest) => $"-xf \"{src}\" -C \"{dest}\"" ExtractCommand = (src, dest) => $"-xf \"{src}\" -C \"{dest}\""
}, },
new Extractor new Extractor
{ {
Name = "WinZip", Name = "WinZip",
Path = FindExecutable("wzunzip.exe"), FileName = "wzunzip.exe",
ExtractCommand = (src, dest) => $"-d \"{dest}\" \"{src}\"" ExtractCommand = (src, dest) => $"-d \"{dest}\" \"{src}\""
}, },
new Extractor new Extractor
{ {
Name = "ALZip", Name = "ALZip",
Path = FindExecutable("ALZipcon.exe"), FileName = "ALZipcon.exe",
ExtractCommand = (src, dest) => $"-x \"{src}\" \"{dest}\"" ExtractCommand = (src, dest) => $"-x \"{src}\" \"{dest}\""
}, },
new Extractor new Extractor
{ {
Name = "Bandizip", Name = "Bandizip",
Path = FindExecutable("Bandizip.exe"), FileName = "Bandizip.exe",
ExtractCommand = (src, dest) => $"x -o:\"{dest}\" \"{src}\" -y" ExtractCommand = (src, dest) => $"x -o:\"{dest}\" \"{src}\" -y"
} }
}; };
Task.Run(() => CheckAvailableExtractors());
} }
public bool Extract(string filePath, string workingDirectory) public bool Extract(string filePath, string workingDirectory)
@ -107,36 +111,54 @@ namespace WelsonJS.Launcher
return signature.SequenceEqual(new byte[] { 0x50, 0x4B, 0x03, 0x04 }); return signature.SequenceEqual(new byte[] { 0x50, 0x4B, 0x03, 0x04 });
} }
private string FindExecutable(string executableFileName) private void CheckAvailableExtractors()
{ {
var fileNames = AvailableExtractors.Select(e => e.FileName).ToList();
// Check PATH environment variable
var paths = (Environment.GetEnvironmentVariable("PATH") ?? "").Split(Path.PathSeparator); var paths = (Environment.GetEnvironmentVariable("PATH") ?? "").Split(Path.PathSeparator);
foreach (var dir in paths) foreach (var dir in paths)
{ {
var fullpath = Path.Combine(dir.Trim(), executableFileName); foreach (var fileName in fileNames)
if (File.Exists(fullpath)) {
return fullpath; var path = Path.Combine(dir.Trim(), fileName);
if (File.Exists(path))
{
var index = fileNames.IndexOf(fileName);
var extractor = AvailableExtractors[index];
extractor.Path = path;
}
}
} }
// Check common install locations // Check common install locations
var programDirs = new[] var programDirs = new[]
{ {
Path.Combine(Program.GetAppDataPath(), "bin"), // find an extractor from APPDATA directory
Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles),
Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)
Path.Combine(Program.GetAppDataPath(), "bin") // find an extractor from APPDATA directory
}; };
foreach (var dir in programDirs) foreach (var rootDir in programDirs)
{ {
if (!Directory.Exists(rootDir))
continue;
try try
{ {
var found = Directory.EnumerateFiles(dir, executableFileName, SearchOption.AllDirectories).FirstOrDefault(); foreach (var file in Directory.EnumerateFiles(rootDir, "*", SearchOption.AllDirectories))
if (found != null) {
return found; var fileName = Path.GetFileName(file);
if (fileNames.Contains(fileName))
{
var index = fileNames.IndexOf(fileName);
var extractor = AvailableExtractors[index];
extractor.Path = file;
}
}
} }
catch { } catch { }
} }
return null;
} }
private bool RunProcess(string executableFilePath, string arguments) private bool RunProcess(string executableFilePath, string arguments)