gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2025-03-12 17:05:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

allow search an instances in the temporary folder
Some checks are pending
CodeQL / Analyze (csharp) (push) Waiting to run
Details
CodeQL / Analyze (javascript) (push) Waiting to run
Details
CodeQL / Analyze (python) (push) Waiting to run
Details

Browse Source
This commit is contained in:
Namhyeon Go 2025-02-23 03:29:51 +09:00
parent 7d2f76e2dd
commit 51110e54b7
3 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
WelsonJS.Toolkit/WelsonJS.Launcher/InstancesForm.cs
View File

@ -7,43 +7,55 @@ namespace WelsonJS.Launcher
{
public partial class InstancesForm : Form
{
private string instancesRoot;
private string entryFileName;
private string scriptName;
private const string timestampFormat = "yyyy-MM-dd HH:mm:ss";
public InstancesForm()
{
InitializeComponent();
instancesRoot = Program.GetAppDataPath();
entryFileName = "bootstrap.bat";
}
private void InstancesForm_Load(object sender, EventArgs e)
{
LoadInstances();
listView1.Items.Clear();
LoadInstances(Program.GetAppDataPath());
LoadInstances(Path.GetTempPath());
}
private void LoadInstances()
private void LoadInstances(string instancesRoot)
{
listView1.Items.Clear();
if (!Directory.Exists(instancesRoot))
return;
foreach (string dir in Directory.GetDirectories(instancesRoot))
{
string timestampFile = Path.Combine(dir, ".welsonjs_first_deploy_time");
string entryScriptFile = Path.Combine(dir, "app.js");
string firstDeployTime = null;
if (File.Exists(timestampFile))
if (File.Exists(timestampFile)
&& DateTime.TryParse(File.ReadAllText(timestampFile).Trim(), out DateTime parsedTimestamp))
{
string firstDeployTime = File.ReadAllText(timestampFile).Trim();
ListViewItem item = new ListViewItem(new[] {
firstDeployTime = parsedTimestamp.ToString(timestampFormat);
}
else if (File.Exists(entryScriptFile))
{
firstDeployTime = File.GetCreationTime(entryScriptFile).ToString(timestampFormat);
}
if (firstDeployTime != null)
{
listView1.Items.Add(new ListViewItem(new[]
{
Path.GetFileName(dir),
firstDeployTime
})
{
Tag = dir
});
item.Tag = dir;
listView1.Items.Add(item);
}
}
}
@ -54,11 +66,8 @@ namespace WelsonJS.Launcher
{
scriptName = textBox1.Text;
string selectedInstance = listView1.SelectedItems[0].Text;
string workingDirectory = Path.Combine(instancesRoot, selectedInstance);
// If it is created the sub-directory
workingDirectory = Program.GetFinalDirectory(workingDirectory);
string instanceId = listView1.SelectedItems[0].Text;
string workingDirectory = Program.GetWorkingDirectory(instanceId, true);
Task.Run(() =>
{
@ -83,13 +92,21 @@ namespace WelsonJS.Launcher
{
if (listView1.SelectedItems.Count > 0)
{
string selectedInstance = listView1.SelectedItems[0].Text;
string workingDirectory = Path.Combine(instancesRoot, selectedInstance);
string instanceId = listView1.SelectedItems[0].Text;
string workingDirectory = Program.GetWorkingDirectory(instanceId, false);
if (!Directory.Exists(workingDirectory))
{
workingDirectory = Path.Combine(Path.GetTempPath(), instanceId);
}
if (Directory.Exists(workingDirectory))
{
Directory.Delete(workingDirectory, true);
LoadInstances();
listView1.Items.Clear();
LoadInstances(Program.GetAppDataPath());
LoadInstances(Path.GetTempPath());
}
}
else
@ -102,8 +119,8 @@ namespace WelsonJS.Launcher
{
if (listView1.SelectedItems.Count > 0)
{
string selectedInstance = listView1.SelectedItems[0].Text;
string workingDirectory = Path.Combine(instancesRoot, selectedInstance);
string instanceId = listView1.SelectedItems[0].Text;
string workingDirectory = Program.GetWorkingDirectory(instanceId, true);
if (Directory.Exists(workingDirectory))
{

6
WelsonJS.Toolkit/WelsonJS.Launcher/MainForm.cs
View File

@ -69,7 +69,7 @@ namespace WelsonJS.Launcher
private void ExtractAndRun(string filePath)
{
instanceId = Guid.NewGuid().ToString();
workingDirectory = Path.Combine(Program.GetAppDataPath(), instanceId);
workingDirectory = Program.GetWorkingDirectory(instanceId);
scriptName = textBox1.Text;
Task.Run(() =>
@ -88,8 +88,8 @@ namespace WelsonJS.Launcher
// record the first deploy time
RecordFirstDeployTime(workingDirectory);
// If it is created the sub-directory
workingDirectory = Program.GetFinalDirectory(workingDirectory);
// follow the sub-directory
workingDirectory = Program.GetWorkingDirectory(instanceId, true);
// Run the appliction
Program.RunCommandPrompt(workingDirectory, entryFileName, scriptName, checkBox1.Checked, checkBox2.Checked);

17
WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs
View File

@ -105,5 +105,22 @@ namespace WelsonJS.Launcher
return path;
}
public static string GetWorkingDirectory(string instanceId, bool followSubDirectory = false)
{
string workingDirectory = Path.Combine(GetAppDataPath(), instanceId);
if (followSubDirectory)
{
if (!Directory.Exists(workingDirectory))
{
workingDirectory = Path.Combine(Path.GetTempPath(), instanceId);
}
workingDirectory = GetFinalDirectory(workingDirectory);
}
return workingDirectory;
}
}
}