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

fixed bug

Browse source
This commit is contained in:
Marco Batzinger 2021-04-15 13:31:15 +02:00
parent 6b76afc663
commit 5d6249a4f6
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,10 +29,11 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
[NotNull] [NotNull]
private readonly IJobProcessor _jobProcessor; private readonly IJobProcessor _jobProcessor;
private IDirectoryHelper _directoryHelper; private IDirectoryHelper _directoryHelper;
private TcpListener _socket; private TcpListener _socket;
private FileSystemWatcher _watcher; private FileSystemWatcher _watcher;
private string _outputDir;
public AmagnoVirtualTcpInputPrinter public AmagnoVirtualTcpInputPrinter
( (
@ -118,11 +119,11 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
private void RestartFileWatcherIfNeeded(string sid) private void RestartFileWatcherIfNeeded(string sid)
{ {
var config = GetUserRegistryConfig(sid); var config = GetUserRegistryConfig(sid);
var dir = _directoryHelper.GetOutputDirectory(config); _outputDir = _directoryHelper.GetOutputDirectory(config);
if (_watcher == null || _watcher.Path != dir) if (_watcher == null || _watcher.Path != _outputDir)
{ {
StartFileWatcher(dir); StartFileWatcher(_outputDir);
} }
} }
@ -135,10 +136,8 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
} }
var rawName = $"{Path.GetFileNameWithoutExtension(ini)}.ps"; var rawName = $"{Path.GetFileNameWithoutExtension(ini)}.ps";
var sessionInfo = _jobService.GetSessionInfo(ini);
var config = GetUserRegistryConfig(sessionInfo.Sid); var rawFile = Path.Combine(_outputDir, rawName);
var dir = _directoryHelper.GetOutputDirectory(config);
var rawFile = Path.Combine(dir, rawName);
var status = _jobService.ReadStatus(ini); var status = _jobService.ReadStatus(ini);
if (status == PrintStatus.Resumed) if (status == PrintStatus.Resumed)
@ -157,14 +156,14 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
if (status == PrintStatus.Canceled) if (status == PrintStatus.Canceled)
{ {
LogDebug($"Deleting file on print status: {status}"); LogDebug($"Deleting file on print status: {status}");
DeleteFiles(ini, dir, rawFile); DeleteFiles(ini, _outputDir, rawFile);
} }
var jobStatus = _jobService.ReadJobStatus(ini); var jobStatus = _jobService.ReadJobStatus(ini);
if (jobStatus == JobStatus.Completed || jobStatus == JobStatus.Failed) if (jobStatus == JobStatus.Completed || jobStatus == JobStatus.Failed)
{ {
LogDebug($"Deleting file on job status: {jobStatus}"); LogDebug($"Deleting file on job status: {jobStatus}");
DeleteFiles(ini, dir, rawFile); DeleteFiles(ini, _outputDir, rawFile);
} }
} }