Skip to content

addition of multi-render app support and log output adjustments #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
av-romann wants to merge 1 commit into
base: master
Choose a base branch
from
Open

addition of multi-render app support and log output adjustments #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Automation/BackupManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public class BackupManager : Manager
public RunConfiguration RunConfig;
///<summary>Time in milliseconds to wait until sending next <code>save query</code> command to <code>ProcessManager</code>'s process</summary>
public int QueryTimeout { get; set; } = 500;
private string _tag = "[ VELLUM:BACKUP ] ";


#region PLUGIN
public Version Version { get; }
Expand Down Expand Up @@ -48,7 +50,7 @@ public BackupManager(ProcessManager p, RunConfiguration runConfig)
public void CreateWorldBackup(string worldPath, string destinationPath, bool fullCopy, bool archive)
{
Processing = true;

Log(String.Format("{0}Creating initial temporary copy of world directory...", _tag));
CallHook((byte)Hook.BEGIN);

#region PRE EXEC
Expand Down
272 changes: 144 additions & 128 deletions src/Automation/RenderManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,129 +1,145 @@
using System;
using System.IO;
using System.Diagnostics;
using System.Collections.Generic;
using Vellum.Extension;

namespace Vellum.Automation
{
public class RenderManager : Manager
{
private ProcessManager _bds;
private Process _renderer;
public RunConfiguration RunConfig;

#region PLUGIN
public Version Version { get; }
public enum Hook
{
BEGIN,
ABORT,
NEXT,
END
}
#endregion

public RenderManager(ProcessManager p, RunConfiguration runConfig)
{
_bds = p;
RunConfig = runConfig;
}

public void Start(string worldPath)
{
Processing = true;

// Send tellraw message 1/2
_bds.SendTellraw("Rendering map...");

Log(String.Format("{0}Initializing map rendering...", _tag));

CallHook((byte)Hook.BEGIN);

// Create temporary copy of latest backup to initiate render on
string prfx = "_";
string tempPathCopy = worldPath.Replace(Path.GetFileName(worldPath), prfx + Path.GetFileName(worldPath));
BackupManager.CopyDirectory(worldPath, tempPathCopy);

// Prepare map render output directory
if (!Directory.Exists(RunConfig.Renders.PapyrusOutputPath))
{
Directory.CreateDirectory(RunConfig.Renders.PapyrusOutputPath);
}

for (int i = 0; i < RunConfig.Renders.PapyrusTasks.Length; i++)
{
Dictionary<string, string> placeholderReplacements = new Dictionary<string, string>()
{
{ "$WORLD_PATH", String.Format("\"{0}\"", tempPathCopy) },
{ "$OUTPUT_PATH", String.Format("\"{0}\"", RunConfig.Renders.PapyrusOutputPath) },
{ "${WORLD_PATH}", String.Format("\"{0}\"", tempPathCopy) },
{ "${OUTPUT_PATH}", String.Format("\"{0}\"", RunConfig.Renders.PapyrusOutputPath) }
};

string args = RunConfig.Renders.PapyrusGlobalArgs;

foreach (KeyValuePair<string, string> kv in placeholderReplacements)
args = args.Replace(kv.Key, kv.Value);

_renderer = new Process();
_renderer.StartInfo.FileName = RunConfig.Renders.PapyrusBinPath;
_renderer.StartInfo.WorkingDirectory = Path.GetDirectoryName(RunConfig.Renders.PapyrusBinPath);
_renderer.StartInfo.Arguments = $"{args} {RunConfig.Renders.PapyrusTasks[i]}";
_renderer.StartInfo.RedirectStandardOutput = RunConfig.HideStdout;
_renderer.StartInfo.RedirectStandardInput = true;

Log(String.Format("{0}{1}Rendering map {2}/{3}...", _tag, _indent, i + 1, RunConfig.Renders.PapyrusTasks.Length));

// To pre-emptively start a process with defined priority you need to set calling process to said priority.
Process parentProcess = Process.GetCurrentProcess();
ProcessPriorityClass parentPriority = parentProcess.PriorityClass;
if(RunConfig.Renders.LowPriority)
{
parentProcess.PriorityClass = ProcessPriorityClass.Idle;
}

_renderer.Start();

CallHook((byte)Hook.NEXT, new HookEventArgs() { Attachment = i });

if(RunConfig.Renders.LowPriority)
{
// Set back parent process to original priority
parentProcess.PriorityClass = parentPriority;
}

_renderer.WaitForExit();
}

Log(String.Format("{0}{1}Cleaning up...", _tag, _indent));

Directory.Delete(tempPathCopy, true);

Log(String.Format("{0}Rendering done!", _tag, _indent));

// Send tellraw message 2/2
_bds.SendTellraw("Done rendering!");

CallHook((byte)Hook.END);

Processing = false;
}

public bool Abort()
{
bool result = false;
if (_renderer != null)
{
_renderer.Kill();
result = true;
} else {
result = false;
}

CallHook((byte)Hook.ABORT, new HookEventArgs() { Attachment = result });

return result;
}
}
using System;
using System.IO;
using System.Diagnostics;
using System.Collections.Generic;
using Vellum.Extension;

namespace Vellum.Automation
{
public class RenderManager : Manager
{
private ProcessManager _bds;
private Process _renderer;
public RunConfiguration RunConfig;
private string _tag = "[ VELLUM:RENDER ] ";

#region PLUGIN
public Version Version { get; }
public enum Hook
{
BEGIN,
ABORT,
NEXT,
END
}
#endregion

public RenderManager(ProcessManager p, RunConfiguration runConfig)
{
_bds = p;
RunConfig = runConfig;
}


public void Start(string worldPath, string keyFilter = "(.)")
{
Processing = true;

// Send tellraw message 1/2
_bds.SendTellraw("Rendering map...");

Log(String.Format("{0}Initializing map rendering...", _tag));

CallHook((byte)Hook.BEGIN);

// Create temporary copy of latest backup to initiate render on
string prfx = "_";
string tempPathCopy = worldPath.Replace(Path.GetFileName(worldPath), prfx + Path.GetFileName(worldPath));
BackupManager.CopyDirectory(worldPath, tempPathCopy);


// Allow multiple external applications that use the same temporary copy in sequence and iterate through them, skipping over disabled engines.
RenderConfig RenderApp;
foreach(KeyValuePair<string, RenderConfig> renderEntry in RunConfig.Renders)
{
RenderApp = renderEntry.Value;

// Global render settings won't be executed, non-existing apps and disabled items will be skipped, and optionally only filtered and active items will run.
if (renderEntry.Key != "Global" && System.Text.RegularExpressions.Regex.IsMatch(renderEntry.Key,keyFilter) && File.Exists(RenderApp.RenderAppBinPath) && RenderApp.EnableRenders )
{

// Prepare map render output directory
if (!Directory.Exists(RenderApp.RenderAppOutputPath))
{
Directory.CreateDirectory(RenderApp.RenderAppOutputPath);
}

// Go through this renders task list
for (int i = 0; i < RenderApp.RenderAppTasks.Length; i++)
{
Dictionary<string, string> placeholderReplacements = new Dictionary<string, string>()
{
{ "$WORLD_PATH", String.Format("\"{0}\"", tempPathCopy) },
{ "$OUTPUT_PATH", String.Format("\"{0}\"", RenderApp.RenderAppOutputPath) },
{ "${WORLD_PATH}", String.Format("\"{0}\"", tempPathCopy) },
{ "${OUTPUT_PATH}", String.Format("\"{0}\"", RenderApp.RenderAppOutputPath) }
};

string args = RenderApp.RenderAppGlobalArgs;

foreach (KeyValuePair<string, string> kv in placeholderReplacements)
args = args.Replace(kv.Key, kv.Value);

_renderer = new Process();
_renderer.StartInfo.FileName = RenderApp.RenderAppBinPath;
_renderer.StartInfo.WorkingDirectory = Path.GetDirectoryName(RenderApp.RenderAppBinPath);
_renderer.StartInfo.Arguments = $"{args} {RenderApp.RenderAppTasks[i]}";
_renderer.StartInfo.RedirectStandardOutput = RunConfig.HideStdout;
_renderer.StartInfo.RedirectStandardInput = true;

Log(String.Format("{0}{1}Rendering map {2}/{3}...", _tag, _indent, i + 1, RenderApp.RenderAppTasks.Length));

// To pre-emptively start a process with defined priority you need to set calling process to said priority.
Process parentProcess = Process.GetCurrentProcess();
ProcessPriorityClass parentPriority = parentProcess.PriorityClass;
if(RenderApp.LowPriority)
{
parentProcess.PriorityClass = ProcessPriorityClass.Idle;
}

_renderer.Start();
// TODO: needs a try /catch block to handle sub-process failure events (e.g. cleanup/recover) without killing the BDS server, since they don't interact
CallHook((byte)Hook.NEXT, new HookEventArgs() { Attachment = i });

if(RenderApp.LowPriority)
{
// Set back parent process to original priority
parentProcess.PriorityClass = parentPriority;
}

_renderer.WaitForExit();
}
}
}

Log(String.Format("{0}{1}Cleaning up...", _tag, _indent));

Directory.Delete(tempPathCopy, true);

Log(String.Format("{0}Rendering done!", _tag, _indent));

// Send tellraw message 2/2
_bds.SendTellraw("Done rendering!");

CallHook((byte)Hook.END);

Processing = false;
}

public bool Abort()
{
bool result = false;
if (_renderer != null)
{
_renderer.Kill();
result = true;
} else {
result = false;
}

CallHook((byte)Hook.ABORT, new HookEventArgs() { Attachment = result });

return result;
}
}
}
Loading