gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2025-10-27 02:51:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

One more fix #254

Browse Source
This commit is contained in:
Namhyeon Go 2025-05-17 11:26:46 +09:00
parent 1c678ba7ae
commit 32a261963a
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
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.Security.Cryptography;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace WelsonJS.Launcher namespace WelsonJS.Launcher
@ -16,6 +17,7 @@ namespace WelsonJS.Launcher
public string FileName { get; set; } public string FileName { get; set; }
public string Path { get; set; } public string Path { get; set; }
public Func<string, string, string> ExtractCommand { get; set; } public Func<string, string, string> ExtractCommand { get; set; }
public bool UseCmd { get; set; } = false;
} }
private readonly List<Extractor> AvailableExtractors; private readonly List<Extractor> AvailableExtractors;
@ -60,6 +62,13 @@ namespace WelsonJS.Launcher
ExtractCommand = (src, dest) => $"x -o:\"{dest}\" \"{src}\" -y" ExtractCommand = (src, dest) => $"x -o:\"{dest}\" \"{src}\" -y"
}, },
new Extractor new Extractor
{
Name = "jar (Java SDK)",
FileName = "jar.exe",
ExtractCommand = (src, dest) => $"jar xf \"{src}\"",
UseCmd = true
},
new Extractor
{ {
Name = "tar (Windows)", // Windows 10 build 17063 or later Name = "tar (Windows)", // Windows 10 build 17063 or later
FileName = "tar.exe", FileName = "tar.exe",
@ -91,7 +100,7 @@ namespace WelsonJS.Launcher
foreach (var extractor in AvailableExtractors.Where(e => e.Path != null)) foreach (var extractor in AvailableExtractors.Where(e => e.Path != null))
{ {
if (RunProcess(extractor.Path, extractor.ExtractCommand(filePath, workingDirectory))) if (RunProcess(extractor.Path, extractor, workingDirectory))
return true; return true;
} }
@ -167,18 +176,28 @@ namespace WelsonJS.Launcher
} }
} }
} }
catch { catch (Exception ex)
// ignore an exception {
Trace.TraceInformation($"Ignored file or directory: {ex.Message}");
} }
} }
} }
private bool RunProcess(string executableFilePath, string arguments) private bool RunProcess(string executableFilePath, string arguments, string workingDirectory, bool useCmd = false)
{ {
var fileName = executableFilePath;
var adjustedArguments = arguments;
if (useCmd && !String.IsNullOrEmpty(workingDirectory))
{
fileName = "cmd.exe";
adjustedArguments = $"/c cd /d \"{workingDirectory}\" && {arguments}";
}
var psi = new ProcessStartInfo var psi = new ProcessStartInfo
{ {
FileName = executableFilePath, FileName = fileName,
Arguments = arguments, Arguments = adjustedArguments,
RedirectStandardOutput = true, RedirectStandardOutput = true,
RedirectStandardError = true, RedirectStandardError = true,
UseShellExecute = false, UseShellExecute = false,
@ -193,13 +212,22 @@ namespace WelsonJS.Launcher
} }
} }
private bool RunProcess(string executableFilePath, Extractor extractor, string workingDirectory)
{
return RunProcess(executableFilePath,
extractor.ExtractCommand(extractor.FileName, workingDirectory),
workingDirectory,
extractor.UseCmd
);
}
private bool ExtractUsingPowerShell(string filePath, string workingDirectory) private bool ExtractUsingPowerShell(string filePath, string workingDirectory)
{ {
var escapedSrc = filePath.Replace("'", "''"); var escapedSrc = filePath.Replace("'", "''");
var escapedDest = workingDirectory.Replace("'", "''"); var escapedDest = workingDirectory.Replace("'", "''");
var script = $"Expand-Archive -LiteralPath '{escapedSrc}' -DestinationPath '{escapedDest}' -Force"; var script = $"Expand-Archive -LiteralPath '{escapedSrc}' -DestinationPath '{escapedDest}' -Force";
return RunProcess("powershell.exe", $"-NoProfile -Command \"{script}\""); return RunProcess("powershell.exe", $"-NoProfile -Command \"{script}\"", workingDirectory);
} }
private bool ExtractUsingShell(string filePath, string workingDirectory) private bool ExtractUsingShell(string filePath, string workingDirectory)