From 9e136bb7c35e7f825e6e62fd8cdd978b86c1b70d Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 19 May 2017 01:27:05 +0100 Subject: [PATCH] Added progress messages to clamd core. --- osrepodbmgr.Core/ChangeLog | 5 +++++ osrepodbmgr.Core/Workers/Clamd.cs | 14 ++++++++++++++ osrepodbmgr.Eto/ChangeLog | 5 +++++ osrepodbmgr.Eto/frmMain.xeto.cs | 6 +++--- osrepodbmgr/ChangeLog | 5 +++++ osrepodbmgr/frmMain.cs | 3 +++ 6 files changed, 35 insertions(+), 3 deletions(-) diff --git a/osrepodbmgr.Core/ChangeLog b/osrepodbmgr.Core/ChangeLog index cc1b1de..750a2ce 100644 --- a/osrepodbmgr.Core/ChangeLog +++ b/osrepodbmgr.Core/ChangeLog @@ -1,3 +1,8 @@ +2017-05-19 Natalia Portillo + + * Workers/Clamd.cs: + Added progress messages to clamd core. + 2017-05-19 Natalia Portillo * Context.cs: diff --git a/osrepodbmgr.Core/Workers/Clamd.cs b/osrepodbmgr.Core/Workers/Clamd.cs index 458f740..31e069f 100644 --- a/osrepodbmgr.Core/Workers/Clamd.cs +++ b/osrepodbmgr.Core/Workers/Clamd.cs @@ -144,10 +144,16 @@ namespace osrepodbmgr.Core inFs.Seek(8, SeekOrigin.Current); zStream = new LzmaStream(properties, inFs); + if(UpdateProgress != null) + UpdateProgress("Uncompressing file...", null, 0, 0); + zStream.CopyTo(outFs); zStream.Close(); outFs.Close(); + if(UpdateProgress != null) + UpdateProgress("Requesting local scan to clamd server...", null, 0, 0); + Task.Run(async () => { result = await clam.ScanFileOnServerMultithreadedAsync(tmpFile); @@ -156,10 +162,15 @@ namespace osrepodbmgr.Core File.Delete(tmpFile); } else + { + if(UpdateProgress != null) + UpdateProgress("Requesting local scan to clamd server...", null, 0, 0); + Task.Run(async () => { result = await clam.ScanFileOnServerMultithreadedAsync(repoPath); }).Wait(); + } } else { @@ -181,6 +192,9 @@ namespace osrepodbmgr.Core break; } + if(UpdateProgress != null) + UpdateProgress("Uploading file to clamd server...", null, 0, 0); + Task.Run(async () => { result = await clam.SendAndScanFileAsync(zStream); diff --git a/osrepodbmgr.Eto/ChangeLog b/osrepodbmgr.Eto/ChangeLog index 42a4345..dfc9f09 100644 --- a/osrepodbmgr.Eto/ChangeLog +++ b/osrepodbmgr.Eto/ChangeLog @@ -1,3 +1,8 @@ +2017-05-19 Natalia Portillo + + * frmMain.xeto.cs: + Added progress messages to clamd core. + 2017-05-19 Natalia Portillo * frmMain.xeto.cs: diff --git a/osrepodbmgr.Eto/frmMain.xeto.cs b/osrepodbmgr.Eto/frmMain.xeto.cs index 1e54c0e..422c1f6 100644 --- a/osrepodbmgr.Eto/frmMain.xeto.cs +++ b/osrepodbmgr.Eto/frmMain.xeto.cs @@ -658,6 +658,7 @@ namespace osrepodbmgr.Eto lblProgressFiles1.Visible = true; Workers.Failed += ClamdFailed; Workers.ScanFinished += ClamdFinished; + Workers.UpdateProgress += UpdateVirusProgress; lblProgressFiles1.Text = "Scanning file with clamd."; prgProgressFiles1.Indeterminate = true; @@ -679,6 +680,7 @@ namespace osrepodbmgr.Eto lblProgressFiles1.Visible = false; Workers.Failed -= ClamdFailed; Workers.ScanFinished -= ClamdFinished; + Workers.UpdateProgress -= UpdateVirusProgress; lblProgressFiles1.Text = ""; if(thdScanFile != null) { @@ -698,6 +700,7 @@ namespace osrepodbmgr.Eto btnCheckInVirusTotal.Enabled = true; Workers.Failed -= ClamdFailed; Workers.ScanFinished -= ClamdFinished; + Workers.UpdateProgress -= UpdateVirusProgress; lblProgressFiles1.Text = ""; prgProgressFiles1.Visible = false; lblProgressFiles1.Visible = false; @@ -755,10 +758,7 @@ namespace osrepodbmgr.Eto Workers.UpdateProgress -= UpdateVirusProgress; lblProgressFiles1.Text = ""; if(thdScanFile != null) - { - thdScanFile.Abort(); thdScanFile = null; - } }); } diff --git a/osrepodbmgr/ChangeLog b/osrepodbmgr/ChangeLog index 765407b..40bd5f8 100644 --- a/osrepodbmgr/ChangeLog +++ b/osrepodbmgr/ChangeLog @@ -1,3 +1,8 @@ +2017-05-19 Natalia Portillo + + * frmMain.cs: + Added progress messages to clamd core. + 2017-05-19 Natalia Portillo * Program.cs: diff --git a/osrepodbmgr/frmMain.cs b/osrepodbmgr/frmMain.cs index ead5585..27f88f3 100644 --- a/osrepodbmgr/frmMain.cs +++ b/osrepodbmgr/frmMain.cs @@ -674,6 +674,7 @@ namespace osrepodbmgr prgProgressFiles1.Visible = true; Workers.Failed += ClamdFailed; Workers.ScanFinished += ClamdFinished; + Workers.UpdateProgress += UpdateVirusProgress; prgProgressFiles1.Text = "Scanning file with clamd."; thdPulseProgress = new Thread(() => @@ -704,6 +705,7 @@ namespace osrepodbmgr prgProgressFiles1.Visible = false; Workers.Failed -= ClamdFailed; Workers.ScanFinished -= ClamdFinished; + Workers.UpdateProgress -= UpdateVirusProgress; prgProgressFiles1.Text = ""; if(thdPulseProgress != null) { @@ -728,6 +730,7 @@ namespace osrepodbmgr btnCheckInVirusTotal.Sensitive = true; Workers.Failed -= ClamdFailed; Workers.ScanFinished -= ClamdFinished; + Workers.UpdateProgress -= UpdateVirusProgress; prgProgressFiles1.Text = ""; prgProgressFiles1.Visible = false; if(thdPulseProgress != null)