cabele/AmagnoVirtualPrinter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

using HKCU for printer output path, starting file watcher when receiving first job and restart file watcher, if output path in registry has changed

Browse source
This commit is contained in:
Marco Batzinger 2021-04-14 14:52:51 +02:00
parent 4a23f4ffb8
commit 2811a2ea29
13 changed files with 94 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Common/AmagnoVirtualPrinter.Agent.Lib/Misc/JobFactory.cs
View file

@ -66,8 +66,7 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
try
{
var now = DateTime.Now;
var config = _registryRepository.GetRegistryConfig();
var root = _directoryHelper.GetOutputDirectory(config);
var jobInfo = GetCurrentPrintJobs(printerName).FirstOrDefault();
if (jobInfo == null)
{
@ -75,6 +74,9 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
}
var session = GetCurrentSessions(jobInfo).FirstOrDefault();
var config = _registryRepository.GetRegistryConfig();
var userConfig = _registryRepository.GetUserRegistryConfig(session.Sid);
var root = _directoryHelper.GetOutputDirectory(userConfig);
var iniName = GenerateFileName(now, jobInfo.JobId, 0, config.FileNameMask, "ini");
var iniPath = Path.Combine(root, iniName);
var extension = GetRawFileExtension(config.IntermediateFormat);

2
Common/AmagnoVirtualPrinter.Agent.Lib/Misc/JobProcessor.cs
View file

@ -92,7 +92,7 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
}
var targetFile = $"{Path.GetFileNameWithoutExtension(job.RawDataPath)}";
var config = _registryRepository.GetRegistryConfig();
var config = _registryRepository.GetUserRegistryConfig(job.SessionInfo.Sid);
var dir = _directoryHelper.GetOutputDirectory(config);
targetFile = Path.Combine(dir, targetFile);

10
Common/AmagnoVirtualPrinter.Agent.Lib/Misc/JobService.cs
View file

@ -98,9 +98,11 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
public void Finish(IJob job)
{
var config = _registryRepository.GetRegistryConfig();
WriteJobFinishIni(job.IniDataPath, config);
var userConfig = _registryRepository.GetUserRegistryConfig(job.SessionInfo.Sid);
WriteJobFinishIni(job.IniDataPath, userConfig);
var iniFile = Path.GetFullPath(job.IniDataPath);
var config = _registryRepository.GetRegistryConfig();
var post = config.ResolvedPostconverter;
_shell.Execute(job.JobInfo, job.SessionInfo, post.Item1, $"{post.Item2} \"{iniFile}\"");
@ -122,7 +124,7 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
_shell.WriteIniEntry("Preconverting", "Status", status.ToIni(), job.IniDataPath);
}
private SessionInfo GetSessionInfo(string iniFile)
public SessionInfo GetSessionInfo(string iniFile)
{
var sessionInfo = new SessionInfo
{
@ -152,7 +154,7 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
return jobInfo;
}
private void WriteJobFinishIni(string iniPath, [NotNull]IExConfig config)
private void WriteJobFinishIni(string iniPath, [NotNull]IUserConfig config)
{
const PrintStatus status = PrintStatus.Complete;
const PrintJobStatus spoolerState = PrintJobStatus.Printed;

48
Common/AmagnoVirtualPrinter.Agent.Lib/Misc/VirtualTcpInputPrinter.cs
View file

@ -54,15 +54,29 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
public void Dispose()
{
_watcher.Dispose();
_watcher?.Dispose();
_socket.Stop();
}
public void Init()
{
var config = GetRegistryConfig();
try
{
var config = GetRegistryConfig();
_socket = new TcpListener(IPAddress.Loopback, config.PrinterPort);
_socket.Start();
_socket.BeginAcceptTcpClient(HandleClient, _socket);
var dir = _directoryHelper.GetOutputDirectory(config);
LogDebug($"Waiting on {_socket.LocalEndpoint}...");
}
catch (Exception e)
{
LogError(e, "Error initializing tcp input printer");
}
}
private void StartFileWatcher([NotNull] string dir)
{
_watcher = new FileSystemWatcher(dir, "*.ini")
{
IncludeSubdirectories = false,
@ -70,11 +84,7 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
EnableRaisingEvents = true
};
_watcher.Changed += IniFileChanged;
_socket = new TcpListener(IPAddress.Loopback, config.PrinterPort);
_socket.Start();
_socket.BeginAcceptTcpClient(HandleClient, _socket);
LogDebug($"Waiting on {_socket.LocalEndpoint}...");
LogDebug("Setting file watcher on folder @{dir}", dir);
}
private void HandleClient([NotNull]IAsyncResult ar)
@ -101,6 +111,19 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
socket.BeginAcceptTcpClient(HandleClient, ar.AsyncState);
_jobService.Start(job);
RestartFileWatcherIfNeeded(job.SessionInfo.Sid);
}
private void RestartFileWatcherIfNeeded(string sid)
{
var config = GetUserRegistryConfig(sid);
var dir = _directoryHelper.GetOutputDirectory(config);
if (_watcher == null || _watcher.Path != dir)
{
StartFileWatcher(dir);
}
}
private void IniFileChanged(object sender, [NotNull]FileSystemEventArgs e)
@ -112,7 +135,8 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
}
var rawName = $"{Path.GetFileNameWithoutExtension(ini)}.ps";
var config = GetRegistryConfig();
var sessionInfo = _jobService.GetSessionInfo(ini);
var config = GetUserRegistryConfig(sessionInfo.Sid);
var dir = _directoryHelper.GetOutputDirectory(config);
var rawFile = Path.Combine(dir, rawName);
var status = _jobService.ReadStatus(ini);
@ -195,6 +219,12 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
}
}
[NotNull]
private IUserConfig GetUserRegistryConfig(string sid)
{
return _registryRepository.GetUserRegistryConfig(sid);
}
[NotNull]
private IExConfig GetRegistryConfig()
{