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

Change database and interface fields to more appropriate descriptions.

Browse Source
This commit is contained in:
Natalia Portillo
2018-03-15 15:55:59 +00:00
parent ba89c31f3c
commit 6ac57dd12b
7 changed files with 239 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
apprepodbmgr.Core/DBOps.cs
View File

@@ -41,7 +41,7 @@ namespace apprepodbmgr.Core
public string Version;
public string Languages;
public string Architecture;
public string Machine;
public string TargetOs;
public string Format;
public string Description;
public bool Oem;
@@ -49,10 +49,11 @@ namespace apprepodbmgr.Core
public bool Update;
public bool Source;
public bool Files;
public bool Netinstall;
public bool Installer;
public byte[] Xml;
public byte[] Json;
public string Mdid;
public byte[] Icon;
}
public class DbFile
@@ -109,9 +110,9 @@ namespace apprepodbmgr.Core
IDbCommand dbcmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbcmd.CommandText = SQL;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dbcmd.CommandText = SQL;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dataAdapter.Fill(dataSet);
DataTable dataTable = dataSet.Tables[0];
@@ -125,7 +126,7 @@ namespace apprepodbmgr.Core
Version = dRow["version"].ToString(),
Languages = dRow["languages"].ToString(),
Architecture = dRow["architecture"].ToString(),
Machine = dRow["machine"].ToString(),
TargetOs = dRow["targetos"].ToString(),
Format = dRow["format"].ToString(),
Description = dRow["description"].ToString(),
Oem = bool.Parse(dRow["oem"].ToString()),
@@ -133,12 +134,13 @@ namespace apprepodbmgr.Core
Update = bool.Parse(dRow["update"].ToString()),
Source = bool.Parse(dRow["source"].ToString()),
Files = bool.Parse(dRow["files"].ToString()),
Netinstall = bool.Parse(dRow["netinstall"].ToString()),
Installer = bool.Parse(dRow["installer"].ToString()),
Mdid = dRow["mdid"].ToString()
};
if(dRow["xml"] != DBNull.Value) fEntry.Xml = (byte[])dRow["xml"];
if(dRow["json"] != DBNull.Value) fEntry.Json = (byte[])dRow["json"];
if(dRow["icon"] != DBNull.Value) fEntry.Icon = (byte[])dRow["icon"];
entries.Add(fEntry);
}
@@ -166,13 +168,14 @@ namespace apprepodbmgr.Core
IDbDataParameter param15 = dbcmd.CreateParameter();
IDbDataParameter param16 = dbcmd.CreateParameter();
IDbDataParameter param17 = dbcmd.CreateParameter();
IDbDataParameter param18 = dbcmd.CreateParameter();
param1.ParameterName = "@developer";
param2.ParameterName = "@product";
param3.ParameterName = "@version";
param4.ParameterName = "@languages";
param5.ParameterName = "@architecture";
param6.ParameterName = "@machine";
param6.ParameterName = "@targetos";
param7.ParameterName = "@format";
param8.ParameterName = "@description";
param9.ParameterName = "@oem";
@@ -180,10 +183,11 @@ namespace apprepodbmgr.Core
param11.ParameterName = "@update";
param12.ParameterName = "@source";
param13.ParameterName = "@files";
param14.ParameterName = "@netinstall";
param14.ParameterName = "@installer";
param15.ParameterName = "@xml";
param16.ParameterName = "@json";
param17.ParameterName = "@mdid";
param18.ParameterName = "@icon";
param1.DbType = DbType.String;
param2.DbType = DbType.String;
@@ -201,13 +205,14 @@ namespace apprepodbmgr.Core
param15.DbType = DbType.Object;
param16.DbType = DbType.Object;
param17.DbType = DbType.String;
param18.DbType = DbType.Object;
param1.Value = entry.Developer;
param2.Value = entry.Product;
param3.Value = entry.Version;
param4.Value = entry.Languages;
param5.Value = entry.Architecture;
param6.Value = entry.Machine;
param6.Value = entry.TargetOs;
param7.Value = entry.Format;
param8.Value = entry.Description;
param9.Value = entry.Oem;
@@ -215,10 +220,11 @@ namespace apprepodbmgr.Core
param11.Value = entry.Update;
param12.Value = entry.Source;
param13.Value = entry.Files;
param14.Value = entry.Netinstall;
param14.Value = entry.Installer;
param15.Value = entry.Xml;
param16.Value = entry.Json;
param17.Value = entry.Mdid;
param18.Value = entry.Icon;
dbcmd.Parameters.Add(param1);
dbcmd.Parameters.Add(param2);
@@ -237,6 +243,7 @@ namespace apprepodbmgr.Core
dbcmd.Parameters.Add(param15);
dbcmd.Parameters.Add(param16);
dbcmd.Parameters.Add(param17);
dbcmd.Parameters.Add(param18);
return dbcmd;
}
@@ -245,11 +252,11 @@ namespace apprepodbmgr.Core
{
IDbCommand dbcmd = GetAppCommand(entry);
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
dbcmd.Transaction = trans;
const string SQL =
"INSERT INTO apps (developer, product, version, languages, architecture, machine, format, description, oem, upgrade, `update`, source, files, netinstall, xml, json, mdid)" +
" VALUES (@developer, @product, @version, @languages, @architecture, @machine, @format, @description, @oem, @upgrade, @update, @source, @files, @netinstall, @xml, @json, @mdid)";
"INSERT INTO apps (developer, product, version, languages, architecture, targetos, format, description, oem, upgrade, `update`, source, files, installer, xml, json, mdid, icon)" +
" VALUES (@developer, @product, @version, @languages, @architecture, @targetos, @format, @description, @oem, @upgrade, @update, @source, @files, @installer, @xml, @json, @mdid, @icon)";
dbcmd.CommandText = SQL;
@@ -312,7 +319,7 @@ namespace apprepodbmgr.Core
{
IDbCommand dbcmd = GetFileCommand(file);
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
dbcmd.Transaction = trans;
const string SQL =
"UPDATE files SET crack = @crack, hasvirus = @hasvirus, clamtime = @clamtime, vtotaltime = @vtotaltime, virus = @virus, length = @length " +
@@ -331,7 +338,7 @@ namespace apprepodbmgr.Core
{
IDbCommand dbcmd = GetFileCommand(file);
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
dbcmd.Transaction = trans;
const string SQL =
"INSERT INTO `files` (`sha256`, `crack`, `hasvirus`, `clamtime`, `vtotaltime`, `virus`, `length`)" +
@@ -355,10 +362,10 @@ namespace apprepodbmgr.Core
param1.DbType = DbType.String;
param1.Value = hash;
dbcmd.Parameters.Add(param1);
dbcmd.CommandText = "SELECT * FROM files WHERE sha256 = @hash";
dbcmd.CommandText = "SELECT * FROM files WHERE sha256 = @hash";
DataSet dataSet = new DataSet();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dataAdapter.SelectCommand = dbcmd;
dataAdapter.SelectCommand = dbcmd;
dataAdapter.Fill(dataSet);
DataTable dataTable = dataSet.Tables[0];
@@ -369,9 +376,9 @@ namespace apprepodbmgr.Core
public ulong GetFilesCount()
{
IDbCommand dbcmd = dbCon.CreateCommand();
IDbCommand dbcmd = dbCon.CreateCommand();
dbcmd.CommandText = "SELECT COUNT(*) FROM files";
object count = dbcmd.ExecuteScalar();
object count = dbcmd.ExecuteScalar();
dbcmd.Dispose();
try { return Convert.ToUInt64(count); }
catch { return 0; }
@@ -383,9 +390,9 @@ namespace apprepodbmgr.Core
IDbCommand dbcmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbcmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dbcmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dataAdapter.Fill(dataSet);
DataTable dataTable = dataSet.Tables[0];
@@ -403,9 +410,7 @@ namespace apprepodbmgr.Core
if(dRow["hasvirus"] == DBNull.Value) fEntry.HasVirus = null;
else fEntry.HasVirus = bool.Parse(dRow["hasvirus"].ToString());
if(dRow["clamtime"] == DBNull.Value) fEntry.ClamTime = null;
else
fEntry.ClamTime =
DateTime.Parse(dRow["clamtime"].ToString());
else fEntry.ClamTime = DateTime.Parse(dRow["clamtime"].ToString());
if(dRow["vtotaltime"] == DBNull.Value) fEntry.VirusTotalTime = null;
else
fEntry.VirusTotalTime =
@@ -425,9 +430,9 @@ namespace apprepodbmgr.Core
IDbCommand dbcmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbcmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dbcmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dataAdapter.Fill(dataSet);
DataTable dataTable = dataSet.Tables[0];
@@ -445,9 +450,7 @@ namespace apprepodbmgr.Core
if(dRow["hasvirus"] == DBNull.Value) fEntry.HasVirus = null;
else fEntry.HasVirus = bool.Parse(dRow["hasvirus"].ToString());
if(dRow["clamtime"] == DBNull.Value) fEntry.ClamTime = null;
else
fEntry.ClamTime =
DateTime.Parse(dRow["clamtime"].ToString());
else fEntry.ClamTime = DateTime.Parse(dRow["clamtime"].ToString());
if(dRow["vtotaltime"] == DBNull.Value) fEntry.VirusTotalTime = null;
else
fEntry.VirusTotalTime =
@@ -467,9 +470,9 @@ namespace apprepodbmgr.Core
IDbCommand dbcmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbcmd.CommandText = SQL;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dbcmd.CommandText = SQL;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dataAdapter.Fill(dataSet);
DataTable dataTable = dataSet.Tables[0];
@@ -487,9 +490,7 @@ namespace apprepodbmgr.Core
if(dRow["hasvirus"] == DBNull.Value) fEntry.HasVirus = null;
else fEntry.HasVirus = bool.Parse(dRow["hasvirus"].ToString());
if(dRow["clamtime"] == DBNull.Value) fEntry.ClamTime = null;
else
fEntry.ClamTime =
DateTime.Parse(dRow["clamtime"].ToString());
else fEntry.ClamTime = DateTime.Parse(dRow["clamtime"].ToString());
if(dRow["vtotaltime"] == DBNull.Value) fEntry.VirusTotalTime = null;
else
fEntry.VirusTotalTime =
@@ -552,7 +553,7 @@ namespace apprepodbmgr.Core
{
IDbCommand dbcmd = GetAppFileCommand(file);
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
dbcmd.Transaction = trans;
string sql =
$"INSERT INTO `app_{app}` (`path`, `sha256`, `length`, `creation`, `access`, `modification`, `attributes`)" +
@@ -608,7 +609,7 @@ namespace apprepodbmgr.Core
{
IDbCommand dbcmd = GetFolderCommand(folder);
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
dbcmd.Transaction = trans;
string sql =
$"INSERT INTO `app_{app}_folders` (`path`, `creation`, `access`, `modification`, `attributes`)" +
@@ -627,7 +628,7 @@ namespace apprepodbmgr.Core
{
IDbCommand dbcmd = dbCon.CreateCommand();
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
dbcmd.Transaction = trans;
string sql = $"DROP TABLE IF EXISTS `app_{id}`;";
@@ -680,7 +681,7 @@ namespace apprepodbmgr.Core
{
IDbCommand dbcmd = dbCon.CreateCommand();
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
dbcmd.Transaction = trans;
string sql = $"DROP TABLE IF EXISTS `app_{id}`;\n\n" +
$"CREATE TABLE IF NOT EXISTS `app_{id}` (\n" +
@@ -734,10 +735,10 @@ namespace apprepodbmgr.Core
param1.DbType = DbType.String;
param1.Value = hash;
dbcmd.Parameters.Add(param1);
dbcmd.CommandText = $"SELECT * FROM `app_{appId}` WHERE sha256 = @hash";
dbcmd.CommandText = $"SELECT * FROM `app_{appId}` WHERE sha256 = @hash";
DataSet dataSet = new DataSet();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dataAdapter.SelectCommand = dbcmd;
dataAdapter.SelectCommand = dbcmd;
dataAdapter.Fill(dataSet);
DataTable dataTable = dataSet.Tables[0];
@@ -755,10 +756,10 @@ namespace apprepodbmgr.Core
param1.DbType = DbType.String;
param1.Value = mdid;
dbcmd.Parameters.Add(param1);
dbcmd.CommandText = "SELECT * FROM `apps` WHERE mdid = @mdid";
dbcmd.CommandText = "SELECT * FROM `apps` WHERE mdid = @mdid";
DataSet dataSet = new DataSet();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dataAdapter.SelectCommand = dbcmd;
dataAdapter.SelectCommand = dbcmd;
dataAdapter.Fill(dataSet);
DataTable dataTable = dataSet.Tables[0];
@@ -775,9 +776,9 @@ namespace apprepodbmgr.Core
IDbCommand dbcmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbcmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dbcmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dataAdapter.Fill(dataSet);
DataTable dataTable = dataSet.Tables[0];
@@ -809,9 +810,9 @@ namespace apprepodbmgr.Core
IDbCommand dbcmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbcmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dbcmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dataAdapter.Fill(dataSet);
DataTable dataTable = dataSet.Tables[0];
@@ -873,7 +874,7 @@ namespace apprepodbmgr.Core
public bool HasSymlinks(long appId)
{
IDbCommand dbcmd = dbCon.CreateCommand();
IDbCommand dbcmd = dbCon.CreateCommand();
dbcmd.CommandText =
$"SELECT COUNT(*) FROM sqlite_master WHERE type = 'table' AND name = 'app_{appId}_symlinks'";
object count = dbcmd.ExecuteScalar();
@@ -886,7 +887,7 @@ namespace apprepodbmgr.Core
{
IDbCommand dbcmd = dbCon.CreateCommand();
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
dbcmd.Transaction = trans;
dbcmd.CommandText =
$"DROP TABLE IF EXISTS `app_{id}_symlinks`;\n\n" +
@@ -923,7 +924,7 @@ namespace apprepodbmgr.Core
dbcmd.Parameters.Add(param2);
IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans;
dbcmd.Transaction = trans;
string sql = $"INSERT INTO `app_{app}_symlinks` (`path`, `target`)" + " VALUES (@path, @target)";
@@ -944,9 +945,9 @@ namespace apprepodbmgr.Core
IDbCommand dbcmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbcmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dbcmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dataAdapter.Fill(dataSet);
DataTable dataTable = dataSet.Tables[0];

11
apprepodbmgr.Core/Schema.cs
View File

@@ -61,17 +61,18 @@ namespace apprepodbmgr.Core
" `version` VARCHAR(45) NULL,\n" +
" `languages` VARCHAR(45) NULL,\n" +
" `architecture` VARCHAR(45) NULL,\n" +
" `machine` VARCHAR(45) NULL,\n" +
" `targetos` VARCHAR(45) NULL,\n" +
" `format` VARCHAR(45) NULL,\n" +
" `description` VARCHAR(45) NULL,\n" +
" `description` TEXT NULL,\n" +
" `oem` BOOLEAN NOT NULL,\n" +
" `upgrade` BOOLEAN NOT NULL,\n" +
" `update` BOOLEAN NOT NULL,\n" +
" `source` BOOLEAN NOT NULL,\n" +
" `files` BOOLEAN NOT NULL,\n" +
" `netinstall` BOOLEAN NOT NULL,\n" +
" `installer` BOOLEAN NOT NULL,\n" +
" `xml` BLOB NULL,\n" +
" `json` BLOB NULL);\n\n" +
" `json` BLOB NULL,\n" +
" `icon` BLOB NULL);\n\n" +
"CREATE UNIQUE INDEX `apps_id_UNIQUE` ON `apps` (`id` ASC);\n\n" +
"CREATE UNIQUE INDEX `apps_mdid_UNIQUE` ON `apps` (`mdid` ASC);\n\n" +
"CREATE INDEX `apps_developer_idx` ON `apps` (`developer` ASC);\n\n" +
@@ -79,7 +80,7 @@ namespace apprepodbmgr.Core
"CREATE INDEX `apps_version_idx` ON `apps` (`version` ASC);\n\n" +
"CREATE INDEX `apps_architecture_idx` ON `apps` (`architecture` ASC);\n\n" +
"CREATE INDEX `apps_format_idx` ON `apps` (`format` ASC);\n\n" +
"CREATE INDEX `apps_machine_idx` ON `apps` (`machine` ASC);\n\n" +
"CREATE INDEX `apps_targetos_idx` ON `apps` (`targetos` ASC);\n\n" +
"CREATE INDEX `apps_description_idx` ON `apps` (`description` ASC);";
}
}

52
apprepodbmgr.Core/Workers/Compression.cs
View File

@@ -69,16 +69,16 @@ namespace apprepodbmgr.Core
}
string destinationFolder = "";
destinationFolder = Path.Combine(destinationFolder, Context.DbInfo.Developer);
destinationFolder = Path.Combine(destinationFolder, Context.DbInfo.Product);
destinationFolder = Path.Combine(destinationFolder, Context.DbInfo.Version);
destinationFolder = Path.Combine(destinationFolder, Context.DbInfo.Developer);
destinationFolder = Path.Combine(destinationFolder, Context.DbInfo.Product);
destinationFolder = Path.Combine(destinationFolder, Context.DbInfo.Version);
if(!string.IsNullOrWhiteSpace(Context.DbInfo.Languages))
destinationFolder = Path.Combine(destinationFolder, Context.DbInfo.Languages);
if(!string.IsNullOrWhiteSpace(Context.DbInfo.Architecture))
destinationFolder = Path.Combine(destinationFolder, Context.DbInfo.Architecture);
destinationFolder = Path.Combine(destinationFolder, Context.DbInfo.Architecture);
if(Context.DbInfo.Oem) destinationFolder = Path.Combine(destinationFolder, "oem");
if(!string.IsNullOrWhiteSpace(Context.DbInfo.Machine))
destinationFolder = Path.Combine(destinationFolder, "for " + Context.DbInfo.Machine);
if(!string.IsNullOrWhiteSpace(Context.DbInfo.TargetOs))
destinationFolder = Path.Combine(destinationFolder, "for " + Context.DbInfo.TargetOs);
string destinationFile = "";
if(!string.IsNullOrWhiteSpace(Context.DbInfo.Format))
@@ -86,40 +86,39 @@ namespace apprepodbmgr.Core
if(Context.DbInfo.Files)
{
if(destinationFile != "") destinationFile += "_";
destinationFile += "files";
destinationFile += "files";
}
if(Context.DbInfo.Netinstall)
if(Context.DbInfo.Installer)
{
if(destinationFile != "") destinationFile += "_";
destinationFile += "netinstall";
destinationFile += "installer";
}
if(Context.DbInfo.Source)
{
if(destinationFile != "") destinationFile += "_";
destinationFile += "source";
destinationFile += "source";
}
if(Context.DbInfo.Update)
{
if(destinationFile != "") destinationFile += "_";
destinationFile += "update";
destinationFile += "update";
}
if(Context.DbInfo.Upgrade)
{
if(destinationFile != "") destinationFile += "_";
destinationFile += "upgrade";
destinationFile += "upgrade";
}
if(!string.IsNullOrWhiteSpace(Context.DbInfo.Description))
{
if(destinationFile != "") destinationFile += "_";
destinationFile += Context.DbInfo.Description;
destinationFile += Context.DbInfo.Description;
}
else if(destinationFile == "")
destinationFile = "archive";
else if(destinationFile == "") destinationFile = "archive";
string destination = Path.Combine(destinationFolder, destinationFile) + ".zip";
@@ -356,12 +355,12 @@ namespace apprepodbmgr.Core
while(jsReader.Read())
switch(jsReader.TokenType)
{
case JsonToken.PropertyName when jsReader.Value != null &&
jsReader.Value.ToString() == "XADFileName":
case JsonToken.PropertyName
when jsReader.Value != null && jsReader.Value.ToString() == "XADFileName":
counter++;
break;
case JsonToken.PropertyName when jsReader.Value != null &&
jsReader.Value.ToString() == "lsarFormatName":
case JsonToken.PropertyName
when jsReader.Value != null && jsReader.Value.ToString() == "lsarFormatName":
jsReader.Read();
if(jsReader.TokenType == JsonToken.String && jsReader.Value != null)
format = jsReader.Value.ToString();
@@ -470,7 +469,7 @@ namespace apprepodbmgr.Core
#if DEBUG
stopwatch.Restart();
#endif
ZipFile zf = ZipFile.Read(Context.Path, new ReadOptions {Encoding = Encoding.UTF8});
ZipFile zf = ZipFile.Read(Context.Path, new ReadOptions {Encoding = Encoding.UTF8});
zf.ExtractExistingFile = ExtractExistingFileAction.OverwriteSilently;
zf.ExtractProgress += Zf_ExtractProgress;
zipCounter = 0;
@@ -506,11 +505,11 @@ namespace apprepodbmgr.Core
CreateNoWindow = true,
RedirectStandardOutput = true,
UseShellExecute = false,
Arguments =
Arguments =
$"-o \"\"\"{tmpFolder}\"\"\" -r -D -k hidden \"\"\"{Context.Path}\"\"\""
}
};
long counter = 0;
long counter = 0;
Context.UnarProcess.OutputDataReceived += (sender, e) =>
{
counter++;
@@ -629,7 +628,7 @@ namespace apprepodbmgr.Core
{
UpdateProgress2?.Invoke("", folder.Path, counter, folders.Count);
ZipEntry zd = zf.AddDirectoryByName(folder.Path);
ZipEntry zd = zf.AddDirectoryByName(folder.Path);
zd.Attributes = folder.Attributes;
zd.CreationTime = folder.CreationTimeUtc;
zd.AccessedTime = folder.LastAccessTimeUtc;
@@ -655,7 +654,7 @@ namespace apprepodbmgr.Core
Context.Hashes.Add(file.Path, file);
ZipEntry zi = zf.AddEntry(file.Path, Zf_HandleOpen, Zf_HandleClose);
ZipEntry zi = zf.AddEntry(file.Path, Zf_HandleOpen, Zf_HandleClose);
zi.Attributes = file.Attributes;
zi.CreationTime = file.CreationTimeUtc;
zi.AccessedTime = file.LastAccessTimeUtc;
@@ -689,7 +688,7 @@ namespace apprepodbmgr.Core
static Stream Zf_HandleOpen(string entryName)
{
DbAppFile file;
if(!Context.Hashes.TryGetValue(entryName, out file))
if(!Context.Hashes.TryGetValue(entryName, out file))
if(!Context.Hashes.TryGetValue(entryName.Replace('/', '\\'), out file))
throw new ArgumentException("Cannot find requested zip entry in hashes dictionary");
@@ -739,8 +738,7 @@ namespace apprepodbmgr.Core
file.Sha256[4].ToString(), file.Sha256 + ".lz");
algorithm = AlgoEnum.LZip;
}
else
throw new ArgumentException($"Cannot find file with hash {file.Sha256} in the repository");
else throw new ArgumentException($"Cannot find file with hash {file.Sha256} in the repository");
FileStream inFs = new FileStream(repoPath, FileMode.Open, FileAccess.Read);

8
apprepodbmgr.Eto/WrappersForEto.cs
View File

@@ -70,9 +70,9 @@ namespace apprepodbmgr.Eto
get { return _item.Architecture; }
set { }
}
public string machine
public string targetos
{
get { return _item.Machine; }
get { return _item.TargetOs; }
set { }
}
public string format
@@ -110,9 +110,9 @@ namespace apprepodbmgr.Eto
get { return _item.Files; }
set { }
}
public bool netinstall
public bool Installer
{
get { return _item.Netinstall; }
get { return _item.Installer; }
set { }
}
public byte[] xml

6
apprepodbmgr.Eto/dlgAdd.xeto
View File

@@ -43,9 +43,9 @@
</StackLayoutItem>
<StackLayoutItem HorizontalAlignment="Stretch">
<StackLayout Orientation="Horizontal">
<Label>Machine</Label>
<Label>Target OS</Label>
<StackLayoutItem Expand="True">
<TextBox ID="txtMachine" />
<TextBox ID="txtTargetOs" />
</StackLayoutItem>
</StackLayout>
</StackLayoutItem>
@@ -91,7 +91,7 @@
<CheckBox ID="chkSource">source</CheckBox>
</StackLayoutItem>
<StackLayoutItem Expand="True" HorizontalAlignment="Right">
<CheckBox ID="chkNetinstall">netinstall</CheckBox>
<CheckBox ID="chkInstaller">installer</CheckBox>
</StackLayoutItem>
</StackLayout>
</StackLayoutItem>

101
apprepodbmgr.Eto/dlgAdd.xeto.cs
View File

@@ -31,6 +31,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Threading;
using System.Xml.Serialization;
using apprepodbmgr.Core;
@@ -130,8 +131,8 @@ namespace apprepodbmgr.Eto
});
treeApps.Columns.Add(new GridColumn
{
DataCell = new TextBoxCell {Binding = Binding.Property<DBEntryForEto, string>(r => r.machine)},
HeaderText = "Machine"
DataCell = new TextBoxCell {Binding = Binding.Property<DBEntryForEto, string>(r => r.targetos)},
HeaderText = "Target OS"
});
treeApps.Columns.Add(new GridColumn
{
@@ -170,8 +171,8 @@ namespace apprepodbmgr.Eto
});
treeApps.Columns.Add(new GridColumn
{
DataCell = new CheckBoxCell {Binding = Binding.Property<DBEntryForEto, bool?>(r => r.netinstall)},
HeaderText = "NetInstall?"
DataCell = new CheckBoxCell {Binding = Binding.Property<DBEntryForEto, bool?>(r => r.Installer)},
HeaderText = "Installer?"
});
treeApps.AllowMultipleSelection = false;
@@ -352,7 +353,7 @@ namespace apprepodbmgr.Eto
btnToggleCrack.Enabled = true;
txtFormat.ReadOnly = false;
txtMachine.ReadOnly = false;
txtTargetOs.ReadOnly = false;
txtProduct.ReadOnly = false;
txtVersion.ReadOnly = false;
txtLanguages.ReadOnly = false;
@@ -363,7 +364,7 @@ namespace apprepodbmgr.Eto
chkFiles.Enabled = true;
chkUpdate.Enabled = true;
chkUpgrade.Enabled = true;
chkNetinstall.Enabled = true;
chkInstaller.Enabled = true;
chkSource.Enabled = true;
btnMetadata.Visible = true;
@@ -373,7 +374,7 @@ namespace apprepodbmgr.Eto
foreach(string developer in Context.Metadata.Developer)
{
if(!string.IsNullOrWhiteSpace(txtDeveloper.Text)) txtDeveloper.Text += ",";
txtDeveloper.Text += developer;
txtDeveloper.Text += developer;
}
if(!string.IsNullOrWhiteSpace(Context.Metadata.Name)) txtProduct.Text = Context.Metadata.Name;
@@ -383,21 +384,22 @@ namespace apprepodbmgr.Eto
foreach(LanguagesTypeLanguage language in Context.Metadata.Languages)
{
if(!string.IsNullOrWhiteSpace(txtLanguages.Text)) txtLanguages.Text += ",";
txtLanguages.Text += language;
txtLanguages.Text += language;
}
if(Context.Metadata.Architectures != null)
foreach(ArchitecturesTypeArchitecture architecture in Context.Metadata.Architectures)
{
if(!string.IsNullOrWhiteSpace(txtArchitecture.Text)) txtArchitecture.Text += ",";
txtArchitecture.Text += architecture;
txtArchitecture.Text += architecture;
}
if(Context.Metadata.Systems != null)
foreach(string machine in Context.Metadata.Systems)
if(Context.Metadata.RequiredOperatingSystems != null)
foreach(string targetos in Context
.Metadata.RequiredOperatingSystems.Select(os => os.Name).Distinct())
{
if(!string.IsNullOrWhiteSpace(txtMachine.Text)) txtMachine.Text += ",";
txtMachine.Text += machine;
if(!string.IsNullOrWhiteSpace(txtTargetOs.Text)) txtTargetOs.Text += ",";
txtTargetOs.Text += targetos;
}
btnMetadata.BackgroundColor = Colors.Green;
@@ -414,7 +416,7 @@ namespace apprepodbmgr.Eto
Application.Instance.Invoke(delegate
{
fileView.Add(new FileEntry {Path = filename, Hash = hash, Known = known, IsCrack = isCrack});
btnPack.Enabled |= !known;
btnPack.Enabled |= !known;
if(known) knownFiles++;
});
}
@@ -455,7 +457,7 @@ namespace apprepodbmgr.Eto
}
txtFormat.ReadOnly = true;
txtMachine.ReadOnly = true;
txtTargetOs.ReadOnly = true;
txtProduct.ReadOnly = true;
txtVersion.ReadOnly = true;
txtLanguages.ReadOnly = true;
@@ -466,10 +468,10 @@ namespace apprepodbmgr.Eto
chkFiles.Enabled = false;
chkUpdate.Enabled = false;
chkUpgrade.Enabled = false;
chkNetinstall.Enabled = false;
chkInstaller.Enabled = false;
chkSource.Enabled = false;
txtFormat.Text = "";
txtMachine.Text = "";
txtTargetOs.Text = "";
txtProduct.Text = "";
txtVersion.Text = "";
txtLanguages.Text = "";
@@ -480,7 +482,7 @@ namespace apprepodbmgr.Eto
chkFiles.Checked = false;
chkUpdate.Checked = false;
chkUpgrade.Checked = false;
chkNetinstall.Checked = false;
chkInstaller.Checked = false;
chkSource.Checked = false;
if(Context.TmpFolder != null)
@@ -506,11 +508,9 @@ namespace apprepodbmgr.Eto
Application.Instance.Invoke(delegate
{
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgress.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner))
lblProgress.Text = inner;
else
lblProgress.Text = text;
lblProgress.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) lblProgress.Text = inner;
else lblProgress.Text = text;
if(maximum > 0)
{
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
@@ -534,11 +534,9 @@ namespace apprepodbmgr.Eto
Application.Instance.Invoke(delegate
{
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgress2.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner))
lblProgress2.Text = inner;
else
lblProgress2.Text = text;
lblProgress2.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) lblProgress2.Text = inner;
else lblProgress2.Text = text;
if(maximum > 0)
{
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
@@ -710,7 +708,7 @@ namespace apprepodbmgr.Eto
btnClose.Enabled = false;
prgProgress.Visible = true;
txtFormat.ReadOnly = true;
txtMachine.ReadOnly = true;
txtTargetOs.ReadOnly = true;
txtProduct.ReadOnly = true;
txtVersion.ReadOnly = true;
txtLanguages.ReadOnly = true;
@@ -721,7 +719,7 @@ namespace apprepodbmgr.Eto
chkFiles.Enabled = false;
chkUpdate.Enabled = false;
chkUpgrade.Enabled = false;
chkNetinstall.Enabled = false;
chkInstaller.Enabled = false;
chkSource.Enabled = false;
Workers.UpdateProgress += UpdateProgress;
@@ -733,11 +731,11 @@ namespace apprepodbmgr.Eto
Context.DbInfo.Developer = txtDeveloper.Text;
Context.DbInfo.Format = txtFormat.Text;
Context.DbInfo.Languages = txtLanguages.Text;
Context.DbInfo.Machine = txtMachine.Text;
Context.DbInfo.TargetOs = txtTargetOs.Text;
Context.DbInfo.Product = txtProduct.Text;
Context.DbInfo.Version = txtVersion.Text;
Context.DbInfo.Files = chkFiles.Checked.Value;
Context.DbInfo.Netinstall = chkNetinstall.Checked.Value;
Context.DbInfo.Installer = chkInstaller.Checked.Value;
Context.DbInfo.Oem = chkOem.Checked.Value;
Context.DbInfo.Source = chkSource.Checked.Value;
Context.DbInfo.Update = chkUpdate.Checked.Value;
@@ -749,9 +747,9 @@ namespace apprepodbmgr.Eto
XmlSerializer xs = new XmlSerializer(typeof(CICMMetadataType));
xs.Serialize(ms, Context.Metadata);
Context.DbInfo.Xml = ms.ToArray();
JsonSerializer js = new JsonSerializer();
ms = new MemoryStream();
StreamWriter sw = new StreamWriter(ms);
JsonSerializer js = new JsonSerializer();
ms = new MemoryStream();
StreamWriter sw = new StreamWriter(ms);
js.Serialize(sw, Context.Metadata, typeof(CICMMetadataType));
Context.DbInfo.Json = ms.ToArray();
}
@@ -821,7 +819,7 @@ namespace apprepodbmgr.Eto
lblProgress.Visible = true;
lblProgress2.Visible = true;
txtFormat.ReadOnly = true;
txtMachine.ReadOnly = true;
txtTargetOs.ReadOnly = true;
txtProduct.ReadOnly = true;
txtVersion.ReadOnly = true;
txtLanguages.ReadOnly = true;
@@ -832,7 +830,7 @@ namespace apprepodbmgr.Eto
chkFiles.Enabled = false;
chkUpdate.Enabled = false;
chkUpgrade.Enabled = false;
chkNetinstall.Enabled = false;
chkInstaller.Enabled = false;
chkSource.Enabled = false;
Workers.UpdateProgress += UpdateProgress;
@@ -845,11 +843,11 @@ namespace apprepodbmgr.Eto
Context.DbInfo.Developer = txtDeveloper.Text;
Context.DbInfo.Format = txtFormat.Text;
Context.DbInfo.Languages = txtLanguages.Text;
Context.DbInfo.Machine = txtMachine.Text;
Context.DbInfo.TargetOs = txtTargetOs.Text;
Context.DbInfo.Product = txtProduct.Text;
Context.DbInfo.Version = txtVersion.Text;
Context.DbInfo.Files = chkFiles.Checked.Value;
Context.DbInfo.Netinstall = chkNetinstall.Checked.Value;
Context.DbInfo.Installer = chkInstaller.Checked.Value;
Context.DbInfo.Oem = chkOem.Checked.Value;
Context.DbInfo.Source = chkSource.Checked.Value;
Context.DbInfo.Update = chkUpdate.Checked.Value;
@@ -900,7 +898,7 @@ namespace apprepodbmgr.Eto
lblProgress.Visible = false;
lblProgress2.Visible = false;
txtFormat.ReadOnly = false;
txtMachine.ReadOnly = false;
txtTargetOs.ReadOnly = false;
txtProduct.ReadOnly = false;
txtVersion.ReadOnly = false;
txtLanguages.ReadOnly = false;
@@ -911,7 +909,7 @@ namespace apprepodbmgr.Eto
chkFiles.Enabled = true;
chkUpdate.Enabled = true;
chkUpgrade.Enabled = true;
chkNetinstall.Enabled = true;
chkInstaller.Enabled = true;
chkSource.Enabled = true;
});
}
@@ -1058,7 +1056,7 @@ namespace apprepodbmgr.Eto
foreach(string developer in Context.Metadata.Developer)
{
if(!string.IsNullOrWhiteSpace(txtDeveloper.Text)) txtDeveloper.Text += ",";
txtDeveloper.Text += developer;
txtDeveloper.Text += developer;
}
if(string.IsNullOrWhiteSpace(txtProduct.Text))
@@ -1074,7 +1072,7 @@ namespace apprepodbmgr.Eto
foreach(LanguagesTypeLanguage language in Context.Metadata.Languages)
{
if(!string.IsNullOrWhiteSpace(txtLanguages.Text)) txtLanguages.Text += ",";
txtLanguages.Text += language;
txtLanguages.Text += language;
}
if(string.IsNullOrWhiteSpace(txtArchitecture.Text))
@@ -1082,15 +1080,16 @@ namespace apprepodbmgr.Eto
foreach(ArchitecturesTypeArchitecture architecture in Context.Metadata.Architectures)
{
if(!string.IsNullOrWhiteSpace(txtArchitecture.Text)) txtArchitecture.Text += ",";
txtArchitecture.Text += architecture;
txtArchitecture.Text += architecture;
}
if(string.IsNullOrWhiteSpace(txtMachine.Text))
if(Context.Metadata.Systems != null)
foreach(string machine in Context.Metadata.Systems)
if(string.IsNullOrWhiteSpace(txtTargetOs.Text))
if(Context.Metadata.RequiredOperatingSystems != null)
foreach(string targetos in Context.Metadata.RequiredOperatingSystems.Select(os => os.Name)
.Distinct())
{
if(!string.IsNullOrWhiteSpace(txtMachine.Text)) txtMachine.Text += ",";
txtMachine.Text += machine;
if(!string.IsNullOrWhiteSpace(txtTargetOs.Text)) txtTargetOs.Text += ",";
txtTargetOs.Text += targetos;
}
btnMetadata.BackgroundColor = Colors.Green;
@@ -1151,7 +1150,7 @@ namespace apprepodbmgr.Eto
TextBox txtVersion;
TextBox txtLanguages;
TextBox txtArchitecture;
TextBox txtMachine;
TextBox txtTargetOs;
TextBox txtFormat;
TextBox txtDescription;
CheckBox chkOem;
@@ -1159,7 +1158,7 @@ namespace apprepodbmgr.Eto
CheckBox chkUpgrade;
CheckBox chkFiles;
CheckBox chkSource;
CheckBox chkNetinstall;
CheckBox chkInstaller;
GridView treeFiles;
TabPage tabApps;
GridView treeApps;

190
apprepodbmgr.Eto/frmMain.xeto.cs
View File

@@ -89,8 +89,8 @@ namespace apprepodbmgr.Eto
});
treeApps.Columns.Add(new GridColumn
{
DataCell = new TextBoxCell {Binding = Binding.Property<DBEntryForEto, string>(r => r.machine)},
HeaderText = "Machine"
DataCell = new TextBoxCell {Binding = Binding.Property<DBEntryForEto, string>(r => r.targetos)},
HeaderText = "Target OS"
});
treeApps.Columns.Add(new GridColumn
{
@@ -129,8 +129,8 @@ namespace apprepodbmgr.Eto
});
treeApps.Columns.Add(new GridColumn
{
DataCell = new CheckBoxCell {Binding = Binding.Property<DBEntryForEto, bool?>(r => r.netinstall)},
HeaderText = "NetInstall?"
DataCell = new CheckBoxCell {Binding = Binding.Property<DBEntryForEto, bool?>(r => r.Installer)},
HeaderText = "Installer?"
});
treeApps.AllowMultipleSelection = false;
@@ -188,8 +188,8 @@ namespace apprepodbmgr.Eto
HeaderText = "Virus"
});
treeFiles.AllowMultipleSelection = false;
treeFiles.CellFormatting += (sender, e) =>
treeFiles.AllowMultipleSelection = false;
treeFiles.CellFormatting += (sender, e) =>
{
if(((DbFile)e.Item).HasVirus.HasValue)
e.BackgroundColor = ((DbFile)e.Item).HasVirus.Value ? Colors.Red : Colors.Green;
@@ -267,11 +267,9 @@ namespace apprepodbmgr.Eto
Application.Instance.Invoke(delegate
{
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgress.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner))
lblProgress.Text = inner;
else
lblProgress.Text = text;
lblProgress.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) lblProgress.Text = inner;
else lblProgress.Text = text;
if(maximum > 0)
{
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
@@ -295,11 +293,9 @@ namespace apprepodbmgr.Eto
Application.Instance.Invoke(delegate
{
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgress2.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner))
lblProgress2.Text = inner;
else
lblProgress2.Text = text;
lblProgress2.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) lblProgress2.Text = inner;
else lblProgress2.Text = text;
if(maximum > 0)
{
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
@@ -325,7 +321,7 @@ namespace apprepodbmgr.Eto
protected void OnBtnAddClicked(object sender, EventArgs e)
{
dlgAdd dlgAdd = new dlgAdd();
dlgAdd dlgAdd = new dlgAdd();
dlgAdd.OnAddedApp += app => { lstApps.Add(new DBEntryForEto(app)); };
dlgAdd.ShowModal(this);
}
@@ -502,8 +498,8 @@ namespace apprepodbmgr.Eto
btnRemove.Visible = false;
btnCompress.Visible = false;
btnSave.Visible = false;
btnSettings.Enabled = false;
btnStop.Visible = true;
btnSettings.Enabled = false;
btnStop.Visible = true;
Workers.Failed += CompressToFailed;
Workers.Finished += CompressToFinished;
@@ -628,7 +624,7 @@ namespace apprepodbmgr.Eto
if(treeFiles.SelectedItem == null) return;
DbFile file = Workers.GetDBFile(((DbFile)treeFiles.SelectedItem).Sha256);
outIter = (DbFile)treeFiles.SelectedItem;
outIter = (DbFile)treeFiles.SelectedItem;
if(file == null)
{
@@ -678,20 +674,21 @@ namespace apprepodbmgr.Eto
{
Application.Instance.Invoke(delegate
{
treeFiles.Enabled = true;
btnToggleCrack.Enabled = true;
btnScanWithClamd.Enabled = true;
btnCheckInVirusTotal.Enabled = true;
Workers.Failed -= ClamdFailed;
Workers.ScanFinished -= ClamdFinished;
Workers.UpdateProgress -= UpdateVirusProgress;
lblProgressFiles1.Text = "";
prgProgressFiles1.Visible = false;
lblProgressFiles1.Visible = false;
if(thdScanFile != null) thdScanFile = null;
treeFiles.Enabled = true;
btnToggleCrack.Enabled = true;
btnScanWithClamd.Enabled = true;
btnCheckInVirusTotal.Enabled = true;
Workers.Failed -= ClamdFailed;
Workers.ScanFinished -= ClamdFinished;
Workers.UpdateProgress -= UpdateVirusProgress;
lblProgressFiles1.Text = "";
prgProgressFiles1.Visible = false;
lblProgressFiles1.Visible = false;
if(thdScanFile != null) thdScanFile = null;
if((!outIter.HasVirus.HasValue || outIter.HasVirus.HasValue && !outIter.HasVirus.Value) &&
file.HasVirus.HasValue && file.HasVirus.Value) infectedFiles++;
file.HasVirus.HasValue &&
file.HasVirus.Value) infectedFiles++;
lstFiles.Remove(outIter);
AddFile(file);
@@ -705,7 +702,7 @@ namespace apprepodbmgr.Eto
if(treeFiles.SelectedItem == null) return;
DbFile file = Workers.GetDBFile(((DbFile)treeFiles.SelectedItem).Sha256);
outIter = (DbFile)treeFiles.SelectedItem;
outIter = (DbFile)treeFiles.SelectedItem;
if(file == null)
{
@@ -734,16 +731,16 @@ namespace apprepodbmgr.Eto
{
Application.Instance.Invoke(delegate
{
treeFiles.Enabled = true;
btnToggleCrack.Enabled = true;
btnScanWithClamd.Enabled = true;
btnCheckInVirusTotal.Enabled = true;
prgProgressFiles1.Visible = false;
Workers.Failed -= VirusTotalFailed;
Workers.ScanFinished -= VirusTotalFinished;
Workers.UpdateProgress -= UpdateVirusProgress;
lblProgressFiles1.Text = "";
if(thdScanFile != null) thdScanFile = null;
treeFiles.Enabled = true;
btnToggleCrack.Enabled = true;
btnScanWithClamd.Enabled = true;
btnCheckInVirusTotal.Enabled = true;
prgProgressFiles1.Visible = false;
Workers.Failed -= VirusTotalFailed;
Workers.ScanFinished -= VirusTotalFinished;
Workers.UpdateProgress -= UpdateVirusProgress;
lblProgressFiles1.Text = "";
if(thdScanFile != null) thdScanFile = null;
MessageBox.Show(text, MessageBoxType.Error);
});
}
@@ -752,19 +749,20 @@ namespace apprepodbmgr.Eto
{
Application.Instance.Invoke(delegate
{
treeFiles.Enabled = true;
btnToggleCrack.Enabled = true;
btnScanWithClamd.Enabled = true;
btnCheckInVirusTotal.Enabled = true;
Workers.Failed -= VirusTotalFailed;
Workers.ScanFinished -= VirusTotalFinished;
Workers.UpdateProgress -= UpdateVirusProgress;
lblProgressFiles1.Text = "";
prgProgressFiles1.Visible = false;
if(thdScanFile != null) thdScanFile = null;
treeFiles.Enabled = true;
btnToggleCrack.Enabled = true;
btnScanWithClamd.Enabled = true;
btnCheckInVirusTotal.Enabled = true;
Workers.Failed -= VirusTotalFailed;
Workers.ScanFinished -= VirusTotalFinished;
Workers.UpdateProgress -= UpdateVirusProgress;
lblProgressFiles1.Text = "";
prgProgressFiles1.Visible = false;
if(thdScanFile != null) thdScanFile = null;
if((!outIter.HasVirus.HasValue || outIter.HasVirus.HasValue && !outIter.HasVirus.Value) &&
file.HasVirus.HasValue && file.HasVirus.Value) infectedFiles++;
file.HasVirus.HasValue &&
file.HasVirus.Value) infectedFiles++;
lstFiles.Remove(outIter);
AddFile(file);
@@ -805,11 +803,9 @@ namespace apprepodbmgr.Eto
Application.Instance.Invoke(delegate
{
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgressFiles1.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner))
lblProgressFiles1.Text = inner;
else
lblProgressFiles1.Text = text;
lblProgressFiles1.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) lblProgressFiles1.Text = inner;
else lblProgressFiles1.Text = text;
if(maximum > 0)
{
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
@@ -833,11 +829,9 @@ namespace apprepodbmgr.Eto
Application.Instance.Invoke(delegate
{
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgressFiles2.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner))
lblProgressFiles2.Text = inner;
else
lblProgressFiles2.Text = text;
lblProgressFiles2.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) lblProgressFiles2.Text = inner;
else lblProgressFiles2.Text = text;
if(maximum > 0)
{
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
@@ -971,21 +965,21 @@ namespace apprepodbmgr.Eto
{
Application.Instance.Invoke(delegate
{
treeFiles.Enabled = true;
btnToggleCrack.Enabled = true;
btnScanWithClamd.Enabled = true;
btnCheckInVirusTotal.Enabled = true;
btnScanAllPending.Enabled = true;
Workers.Finished -= AllClamdFinished;
Workers.UpdateProgress -= UpdateVirusProgress2;
Workers.UpdateProgress2 -= UpdateFileProgress;
lblProgressFiles1.Text = "";
prgProgressFiles1.Visible = false;
lblProgressFiles2.Text = "";
prgProgressFiles2.Visible = false;
btnStopFiles.Visible = false;
scanningFiles = false;
if(thdScanFile != null) thdScanFile = null;
treeFiles.Enabled = true;
btnToggleCrack.Enabled = true;
btnScanWithClamd.Enabled = true;
btnCheckInVirusTotal.Enabled = true;
btnScanAllPending.Enabled = true;
Workers.Finished -= AllClamdFinished;
Workers.UpdateProgress -= UpdateVirusProgress2;
Workers.UpdateProgress2 -= UpdateFileProgress;
lblProgressFiles1.Text = "";
prgProgressFiles1.Visible = false;
lblProgressFiles2.Text = "";
prgProgressFiles2.Visible = false;
btnStopFiles.Visible = false;
scanningFiles = false;
if(thdScanFile != null) thdScanFile = null;
OnBtnPopulateFilesClicked(null, new EventArgs());
});
@@ -1033,25 +1027,25 @@ namespace apprepodbmgr.Eto
{
Application.Instance.Invoke(delegate
{
btnCleanFiles.Visible = true;
btnToggleCrack.Visible = true;
btnScanWithClamd.Visible = true;
btnScanAllPending.Visible = true;
btnCheckInVirusTotal.Visible = true;
tabApps.Enabled = true;
treeFiles.Enabled = true;
Workers.Finished -= CleanFilesFinished;
Workers.UpdateProgress -= UpdateFileProgress;
Workers.UpdateProgress2 -= UpdateFileProgress2;
lblProgressFiles1.Text = "";
prgProgressFiles1.Visible = false;
lblProgressFiles2.Text = "";
prgProgressFiles2.Visible = false;
btnSettings.Enabled = true;
mnuCompress.Enabled = true;
btnQuit.Enabled = true;
mnuFile.Enabled = true;
if(thdCleanFiles != null) thdCleanFiles = null;
btnCleanFiles.Visible = true;
btnToggleCrack.Visible = true;
btnScanWithClamd.Visible = true;
btnScanAllPending.Visible = true;
btnCheckInVirusTotal.Visible = true;
tabApps.Enabled = true;
treeFiles.Enabled = true;
Workers.Finished -= CleanFilesFinished;
Workers.UpdateProgress -= UpdateFileProgress;
Workers.UpdateProgress2 -= UpdateFileProgress2;
lblProgressFiles1.Text = "";
prgProgressFiles1.Visible = false;
lblProgressFiles2.Text = "";
prgProgressFiles2.Visible = false;
btnSettings.Enabled = true;
mnuCompress.Enabled = true;
btnQuit.Enabled = true;
mnuFile.Enabled = true;
if(thdCleanFiles != null) thdCleanFiles = null;
OnBtnPopulateFilesClicked(null, new EventArgs());
});