claunia/apprepodbmgr
1
0
Fork 0
mirror of https://github.com/claunia/apprepodbmgr.git synced 2025-12-16 19:24:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added progress messages to clamd core.

Browse Source
This commit is contained in:
Natalia Portillo
2017-05-19 01:27:05 +01:00
parent 6ff82e7b56
commit 9e136bb7c3
6 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osrepodbmgr.Core/ChangeLog
View File

@@ -1,3 +1,8 @@
2017-05-19 Natalia Portillo <claunia@claunia.com>
* Workers/Clamd.cs:
Added progress messages to clamd core.
2017-05-19 Natalia Portillo <claunia@claunia.com>
* Context.cs:

14
osrepodbmgr.Core/Workers/Clamd.cs
View File

@@ -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);

5
osrepodbmgr.Eto/ChangeLog
View File

@@ -1,3 +1,8 @@
2017-05-19 Natalia Portillo <claunia@claunia.com>
* frmMain.xeto.cs:
Added progress messages to clamd core.
2017-05-19 Natalia Portillo <claunia@claunia.com>
* frmMain.xeto.cs:

6
osrepodbmgr.Eto/frmMain.xeto.cs
View File

@@ -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;
}
});
}

5
osrepodbmgr/ChangeLog
View File

@@ -1,3 +1,8 @@
2017-05-19 Natalia Portillo <claunia@claunia.com>
* frmMain.cs:
Added progress messages to clamd core.
2017-05-19 Natalia Portillo <claunia@claunia.com>
* Program.cs:

3
osrepodbmgr/frmMain.cs
View File

@@ -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)