Refactor

apprepodbmgr.Core/Properties/AssemblyInfo.cs

@@ -25,8 +25,8 @@
 //  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 //  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
+
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.

apprepodbmgr.Core/Workers/Database.cs

@@ -246,7 +246,8 @@ namespace apprepodbmgr.Core
                 counter = 0;
                 foreach(KeyValuePair<string, DbAppFile> kvp in Context.Hashes)
                 {
-                    UpdateProgress?.Invoke(null, "Adding files to application in database", counter, Context.Hashes.Count);
+                    UpdateProgress?.Invoke(null, "Adding files to application in database", counter,
+                                           Context.Hashes.Count);
 
                     dbCore.DbOps.AddFileToApp(kvp.Value, Context.DbInfo.Id);
 

apprepodbmgr.Core/Workers/Delegates.cs

@@ -32,14 +32,14 @@ namespace apprepodbmgr.Core
 {
     public static partial class Workers
     {
+        public delegate void AddAppDelegate(DbEntry os);
+
         public delegate void AddFileDelegate(DbFile file);
 
         public delegate void AddFileForAppDelegate(string filename, string hash, bool known, bool isCrack);
 
         public delegate void AddFilesDelegate(List<DbFile> file);
 
-        public delegate void AddAppDelegate(DbEntry os);
-
         public delegate void FailedDelegate(string text);
 
         public delegate void FinishedWithoutErrorDelegate();

apprepodbmgr.Eto.Desktop/Program.cs

@@ -25,6 +25,7 @@
 //  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 //  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
+
 using System;
 using apprepodbmgr.Core;
 using Eto;
@@ -41,11 +42,11 @@ namespace apprepodbmgr.Eto.Desktop
             Context.CheckUnar();
             if(Settings.Current.UseAntivirus)
             {
-                if(Settings.Current.UseClamd)
+                if(Settings.Current.UseClamd) Workers.InitClamd();
-                    Workers.InitClamd();
                 if(Settings.Current.UseVirusTotal)
                     Context.VirusTotalEnabled = Workers.InitVirusTotal(Settings.Current.VirusTotalKey);
             }
+
             Context.UsableDotNetZip = !Platform.Detect.IsMac && !Platform.Detect.IsIos;
 
             new Application(Platform.Detect).Run(new frmMain());

apprepodbmgr.Eto.Desktop/Properties/AssemblyInfo.cs

@@ -25,8 +25,8 @@
 //  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 //  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
+
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.

apprepodbmgr.Eto/Properties/AssemblyInfo.cs

@@ -25,8 +25,8 @@
 //  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 //  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
+
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.

apprepodbmgr.Eto/dlgAdd.xeto.cs

@@ -46,9 +46,10 @@ namespace apprepodbmgr.Eto
     {
         public delegate void OnAddedAppDelegate(DbEntry app);
 
+        ObservableCollection<DBEntryForEto> appView;
+
         ObservableCollection<FileEntry> fileView;
         int                             knownFiles;
-        ObservableCollection<DBEntryForEto> appView;
         bool                            stopped;
         Thread                          thdAddFiles;
         Thread                          thdCheckFiles;

apprepodbmgr.Eto/frmMain.xeto.cs

@@ -40,16 +40,16 @@ namespace apprepodbmgr.Eto
     public class frmMain : Form
     {
         int infectedFiles;
-        ObservableCollection<DbFile> lstFiles;
 
         ObservableCollection<DBEntryForEto> lstApps;
+        ObservableCollection<DbFile>        lstFiles;
         DbFile                              outIter;
         bool                                populatingFiles;
         bool                                scanningFiles;
         Thread                              thdCleanFiles;
         Thread                              thdCompressTo;
-        Thread                              thdPopulateFiles;
         Thread                              thdPopulateApps;
+        Thread                              thdPopulateFiles;
         Thread                              thdSaveAs;
         Thread                              thdScanFile;