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

39
apprepodbmgr.Core/DBOps.cs
View File

@@ -41,7 +41,7 @@ namespace apprepodbmgr.Core
public string Version; public string Version;
public string Languages; public string Languages;
public string Architecture; public string Architecture;
public string Machine; public string TargetOs;
public string Format; public string Format;
public string Description; public string Description;
public bool Oem; public bool Oem;
@@ -49,10 +49,11 @@ namespace apprepodbmgr.Core
public bool Update; public bool Update;
public bool Source; public bool Source;
public bool Files; public bool Files;
public bool Netinstall; public bool Installer;
public byte[] Xml; public byte[] Xml;
public byte[] Json; public byte[] Json;
public string Mdid; public string Mdid;
public byte[] Icon;
} }
public class DbFile public class DbFile
@@ -125,7 +126,7 @@ namespace apprepodbmgr.Core
Version = dRow["version"].ToString(), Version = dRow["version"].ToString(),
Languages = dRow["languages"].ToString(), Languages = dRow["languages"].ToString(),
Architecture = dRow["architecture"].ToString(), Architecture = dRow["architecture"].ToString(),
Machine = dRow["machine"].ToString(), TargetOs = dRow["targetos"].ToString(),
Format = dRow["format"].ToString(), Format = dRow["format"].ToString(),
Description = dRow["description"].ToString(), Description = dRow["description"].ToString(),
Oem = bool.Parse(dRow["oem"].ToString()), Oem = bool.Parse(dRow["oem"].ToString()),
@@ -133,12 +134,13 @@ namespace apprepodbmgr.Core
Update = bool.Parse(dRow["update"].ToString()), Update = bool.Parse(dRow["update"].ToString()),
Source = bool.Parse(dRow["source"].ToString()), Source = bool.Parse(dRow["source"].ToString()),
Files = bool.Parse(dRow["files"].ToString()), Files = bool.Parse(dRow["files"].ToString()),
Netinstall = bool.Parse(dRow["netinstall"].ToString()), Installer = bool.Parse(dRow["installer"].ToString()),
Mdid = dRow["mdid"].ToString() Mdid = dRow["mdid"].ToString()
}; };
if(dRow["xml"] != DBNull.Value) fEntry.Xml = (byte[])dRow["xml"]; if(dRow["xml"] != DBNull.Value) fEntry.Xml = (byte[])dRow["xml"];
if(dRow["json"] != DBNull.Value) fEntry.Json = (byte[])dRow["json"]; if(dRow["json"] != DBNull.Value) fEntry.Json = (byte[])dRow["json"];
if(dRow["icon"] != DBNull.Value) fEntry.Icon = (byte[])dRow["icon"];
entries.Add(fEntry); entries.Add(fEntry);
} }
@@ -166,13 +168,14 @@ namespace apprepodbmgr.Core
IDbDataParameter param15 = dbcmd.CreateParameter(); IDbDataParameter param15 = dbcmd.CreateParameter();
IDbDataParameter param16 = dbcmd.CreateParameter(); IDbDataParameter param16 = dbcmd.CreateParameter();
IDbDataParameter param17 = dbcmd.CreateParameter(); IDbDataParameter param17 = dbcmd.CreateParameter();
IDbDataParameter param18 = dbcmd.CreateParameter();
param1.ParameterName = "@developer"; param1.ParameterName = "@developer";
param2.ParameterName = "@product"; param2.ParameterName = "@product";
param3.ParameterName = "@version"; param3.ParameterName = "@version";
param4.ParameterName = "@languages"; param4.ParameterName = "@languages";
param5.ParameterName = "@architecture"; param5.ParameterName = "@architecture";
param6.ParameterName = "@machine"; param6.ParameterName = "@targetos";
param7.ParameterName = "@format"; param7.ParameterName = "@format";
param8.ParameterName = "@description"; param8.ParameterName = "@description";
param9.ParameterName = "@oem"; param9.ParameterName = "@oem";
@@ -180,10 +183,11 @@ namespace apprepodbmgr.Core
param11.ParameterName = "@update"; param11.ParameterName = "@update";
param12.ParameterName = "@source"; param12.ParameterName = "@source";
param13.ParameterName = "@files"; param13.ParameterName = "@files";
param14.ParameterName = "@netinstall"; param14.ParameterName = "@installer";
param15.ParameterName = "@xml"; param15.ParameterName = "@xml";
param16.ParameterName = "@json"; param16.ParameterName = "@json";
param17.ParameterName = "@mdid"; param17.ParameterName = "@mdid";
param18.ParameterName = "@icon";
param1.DbType = DbType.String; param1.DbType = DbType.String;
param2.DbType = DbType.String; param2.DbType = DbType.String;
@@ -201,13 +205,14 @@ namespace apprepodbmgr.Core
param15.DbType = DbType.Object; param15.DbType = DbType.Object;
param16.DbType = DbType.Object; param16.DbType = DbType.Object;
param17.DbType = DbType.String; param17.DbType = DbType.String;
param18.DbType = DbType.Object;
param1.Value = entry.Developer; param1.Value = entry.Developer;
param2.Value = entry.Product; param2.Value = entry.Product;
param3.Value = entry.Version; param3.Value = entry.Version;
param4.Value = entry.Languages; param4.Value = entry.Languages;
param5.Value = entry.Architecture; param5.Value = entry.Architecture;
param6.Value = entry.Machine; param6.Value = entry.TargetOs;
param7.Value = entry.Format; param7.Value = entry.Format;
param8.Value = entry.Description; param8.Value = entry.Description;
param9.Value = entry.Oem; param9.Value = entry.Oem;
@@ -215,10 +220,11 @@ namespace apprepodbmgr.Core
param11.Value = entry.Update; param11.Value = entry.Update;
param12.Value = entry.Source; param12.Value = entry.Source;
param13.Value = entry.Files; param13.Value = entry.Files;
param14.Value = entry.Netinstall; param14.Value = entry.Installer;
param15.Value = entry.Xml; param15.Value = entry.Xml;
param16.Value = entry.Json; param16.Value = entry.Json;
param17.Value = entry.Mdid; param17.Value = entry.Mdid;
param18.Value = entry.Icon;
dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param1);
dbcmd.Parameters.Add(param2); dbcmd.Parameters.Add(param2);
@@ -237,6 +243,7 @@ namespace apprepodbmgr.Core
dbcmd.Parameters.Add(param15); dbcmd.Parameters.Add(param15);
dbcmd.Parameters.Add(param16); dbcmd.Parameters.Add(param16);
dbcmd.Parameters.Add(param17); dbcmd.Parameters.Add(param17);
dbcmd.Parameters.Add(param18);
return dbcmd; return dbcmd;
} }
@@ -248,8 +255,8 @@ namespace apprepodbmgr.Core
dbcmd.Transaction = trans; dbcmd.Transaction = trans;
const string SQL = const string SQL =
"INSERT INTO apps (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, @machine, @format, @description, @oem, @upgrade, @update, @source, @files, @netinstall, @xml, @json, @mdid)"; " VALUES (@developer, @product, @version, @languages, @architecture, @targetos, @format, @description, @oem, @upgrade, @update, @source, @files, @installer, @xml, @json, @mdid, @icon)";
dbcmd.CommandText = SQL; dbcmd.CommandText = SQL;
@@ -403,9 +410,7 @@ namespace apprepodbmgr.Core
if(dRow["hasvirus"] == DBNull.Value) fEntry.HasVirus = null; if(dRow["hasvirus"] == DBNull.Value) fEntry.HasVirus = null;
else fEntry.HasVirus = bool.Parse(dRow["hasvirus"].ToString()); else fEntry.HasVirus = bool.Parse(dRow["hasvirus"].ToString());
if(dRow["clamtime"] == DBNull.Value) fEntry.ClamTime = null; if(dRow["clamtime"] == DBNull.Value) fEntry.ClamTime = null;
else else fEntry.ClamTime = DateTime.Parse(dRow["clamtime"].ToString());
fEntry.ClamTime =
DateTime.Parse(dRow["clamtime"].ToString());
if(dRow["vtotaltime"] == DBNull.Value) fEntry.VirusTotalTime = null; if(dRow["vtotaltime"] == DBNull.Value) fEntry.VirusTotalTime = null;
else else
fEntry.VirusTotalTime = fEntry.VirusTotalTime =
@@ -445,9 +450,7 @@ namespace apprepodbmgr.Core
if(dRow["hasvirus"] == DBNull.Value) fEntry.HasVirus = null; if(dRow["hasvirus"] == DBNull.Value) fEntry.HasVirus = null;
else fEntry.HasVirus = bool.Parse(dRow["hasvirus"].ToString()); else fEntry.HasVirus = bool.Parse(dRow["hasvirus"].ToString());
if(dRow["clamtime"] == DBNull.Value) fEntry.ClamTime = null; if(dRow["clamtime"] == DBNull.Value) fEntry.ClamTime = null;
else else fEntry.ClamTime = DateTime.Parse(dRow["clamtime"].ToString());
fEntry.ClamTime =
DateTime.Parse(dRow["clamtime"].ToString());
if(dRow["vtotaltime"] == DBNull.Value) fEntry.VirusTotalTime = null; if(dRow["vtotaltime"] == DBNull.Value) fEntry.VirusTotalTime = null;
else else
fEntry.VirusTotalTime = fEntry.VirusTotalTime =
@@ -487,9 +490,7 @@ namespace apprepodbmgr.Core
if(dRow["hasvirus"] == DBNull.Value) fEntry.HasVirus = null; if(dRow["hasvirus"] == DBNull.Value) fEntry.HasVirus = null;
else fEntry.HasVirus = bool.Parse(dRow["hasvirus"].ToString()); else fEntry.HasVirus = bool.Parse(dRow["hasvirus"].ToString());
if(dRow["clamtime"] == DBNull.Value) fEntry.ClamTime = null; if(dRow["clamtime"] == DBNull.Value) fEntry.ClamTime = null;
else else fEntry.ClamTime = DateTime.Parse(dRow["clamtime"].ToString());
fEntry.ClamTime =
DateTime.Parse(dRow["clamtime"].ToString());
if(dRow["vtotaltime"] == DBNull.Value) fEntry.VirusTotalTime = null; if(dRow["vtotaltime"] == DBNull.Value) fEntry.VirusTotalTime = null;
else else
fEntry.VirusTotalTime = fEntry.VirusTotalTime =

11
apprepodbmgr.Core/Schema.cs
View File

@@ -61,17 +61,18 @@ namespace apprepodbmgr.Core
" `version` VARCHAR(45) NULL,\n" + " `version` VARCHAR(45) NULL,\n" +
" `languages` VARCHAR(45) NULL,\n" + " `languages` VARCHAR(45) NULL,\n" +
" `architecture` VARCHAR(45) NULL,\n" + " `architecture` VARCHAR(45) NULL,\n" +
" `machine` VARCHAR(45) NULL,\n" + " `targetos` VARCHAR(45) NULL,\n" +
" `format` VARCHAR(45) NULL,\n" + " `format` VARCHAR(45) NULL,\n" +
" `description` VARCHAR(45) NULL,\n" + " `description` TEXT NULL,\n" +
" `oem` BOOLEAN NOT NULL,\n" + " `oem` BOOLEAN NOT NULL,\n" +
" `upgrade` BOOLEAN NOT NULL,\n" + " `upgrade` BOOLEAN NOT NULL,\n" +
" `update` BOOLEAN NOT NULL,\n" + " `update` BOOLEAN NOT NULL,\n" +
" `source` BOOLEAN NOT NULL,\n" + " `source` BOOLEAN NOT NULL,\n" +
" `files` BOOLEAN NOT NULL,\n" + " `files` BOOLEAN NOT NULL,\n" +
" `netinstall` BOOLEAN NOT NULL,\n" + " `installer` BOOLEAN NOT NULL,\n" +
" `xml` BLOB 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_id_UNIQUE` ON `apps` (`id` ASC);\n\n" +
"CREATE UNIQUE INDEX `apps_mdid_UNIQUE` ON `apps` (`mdid` 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" + "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_version_idx` ON `apps` (`version` ASC);\n\n" +
"CREATE INDEX `apps_architecture_idx` ON `apps` (`architecture` 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_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);"; "CREATE INDEX `apps_description_idx` ON `apps` (`description` ASC);";
} }
} }

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

@@ -77,8 +77,8 @@ namespace apprepodbmgr.Core
if(!string.IsNullOrWhiteSpace(Context.DbInfo.Architecture)) 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(Context.DbInfo.Oem) destinationFolder = Path.Combine(destinationFolder, "oem");
if(!string.IsNullOrWhiteSpace(Context.DbInfo.Machine)) if(!string.IsNullOrWhiteSpace(Context.DbInfo.TargetOs))
destinationFolder = Path.Combine(destinationFolder, "for " + Context.DbInfo.Machine); destinationFolder = Path.Combine(destinationFolder, "for " + Context.DbInfo.TargetOs);
string destinationFile = ""; string destinationFile = "";
if(!string.IsNullOrWhiteSpace(Context.DbInfo.Format)) if(!string.IsNullOrWhiteSpace(Context.DbInfo.Format))
@@ -89,10 +89,10 @@ namespace apprepodbmgr.Core
destinationFile += "files"; destinationFile += "files";
} }
if(Context.DbInfo.Netinstall) if(Context.DbInfo.Installer)
{ {
if(destinationFile != "") destinationFile += "_"; if(destinationFile != "") destinationFile += "_";
destinationFile += "netinstall"; destinationFile += "installer";
} }
if(Context.DbInfo.Source) if(Context.DbInfo.Source)
@@ -118,8 +118,7 @@ namespace apprepodbmgr.Core
if(destinationFile != "") destinationFile += "_"; if(destinationFile != "") destinationFile += "_";
destinationFile += Context.DbInfo.Description; destinationFile += Context.DbInfo.Description;
} }
else if(destinationFile == "") else if(destinationFile == "") destinationFile = "archive";
destinationFile = "archive";
string destination = Path.Combine(destinationFolder, destinationFile) + ".zip"; string destination = Path.Combine(destinationFolder, destinationFile) + ".zip";
@@ -356,12 +355,12 @@ namespace apprepodbmgr.Core
while(jsReader.Read()) while(jsReader.Read())
switch(jsReader.TokenType) switch(jsReader.TokenType)
{ {
case JsonToken.PropertyName when jsReader.Value != null && case JsonToken.PropertyName
jsReader.Value.ToString() == "XADFileName": when jsReader.Value != null && jsReader.Value.ToString() == "XADFileName":
counter++; counter++;
break; break;
case JsonToken.PropertyName when jsReader.Value != null && case JsonToken.PropertyName
jsReader.Value.ToString() == "lsarFormatName": when jsReader.Value != null && jsReader.Value.ToString() == "lsarFormatName":
jsReader.Read(); jsReader.Read();
if(jsReader.TokenType == JsonToken.String && jsReader.Value != null) if(jsReader.TokenType == JsonToken.String && jsReader.Value != null)
format = jsReader.Value.ToString(); format = jsReader.Value.ToString();
@@ -739,8 +738,7 @@ namespace apprepodbmgr.Core
file.Sha256[4].ToString(), file.Sha256 + ".lz"); file.Sha256[4].ToString(), file.Sha256 + ".lz");
algorithm = AlgoEnum.LZip; algorithm = AlgoEnum.LZip;
} }
else else throw new ArgumentException($"Cannot find file with hash {file.Sha256} in the repository");
throw new ArgumentException($"Cannot find file with hash {file.Sha256} in the repository");
FileStream inFs = new FileStream(repoPath, FileMode.Open, FileAccess.Read); 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; } get { return _item.Architecture; }
set { } set { }
} }
public string machine public string targetos
{ {
get { return _item.Machine; } get { return _item.TargetOs; }
set { } set { }
} }
public string format public string format
@@ -110,9 +110,9 @@ namespace apprepodbmgr.Eto
get { return _item.Files; } get { return _item.Files; }
set { } set { }
} }
public bool netinstall public bool Installer
{ {
get { return _item.Netinstall; } get { return _item.Installer; }
set { } set { }
} }
public byte[] xml public byte[] xml

6
apprepodbmgr.Eto/dlgAdd.xeto
View File

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

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

@@ -31,6 +31,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.ComponentModel; using System.ComponentModel;
using System.IO; using System.IO;
using System.Linq;
using System.Threading; using System.Threading;
using System.Xml.Serialization; using System.Xml.Serialization;
using apprepodbmgr.Core; using apprepodbmgr.Core;
@@ -130,8 +131,8 @@ namespace apprepodbmgr.Eto
}); });
treeApps.Columns.Add(new GridColumn treeApps.Columns.Add(new GridColumn
{ {
DataCell = new TextBoxCell {Binding = Binding.Property<DBEntryForEto, string>(r => r.machine)}, DataCell = new TextBoxCell {Binding = Binding.Property<DBEntryForEto, string>(r => r.targetos)},
HeaderText = "Machine" HeaderText = "Target OS"
}); });
treeApps.Columns.Add(new GridColumn treeApps.Columns.Add(new GridColumn
{ {
@@ -170,8 +171,8 @@ namespace apprepodbmgr.Eto
}); });
treeApps.Columns.Add(new GridColumn treeApps.Columns.Add(new GridColumn
{ {
DataCell = new CheckBoxCell {Binding = Binding.Property<DBEntryForEto, bool?>(r => r.netinstall)}, DataCell = new CheckBoxCell {Binding = Binding.Property<DBEntryForEto, bool?>(r => r.Installer)},
HeaderText = "NetInstall?" HeaderText = "Installer?"
}); });
treeApps.AllowMultipleSelection = false; treeApps.AllowMultipleSelection = false;
@@ -352,7 +353,7 @@ namespace apprepodbmgr.Eto
btnToggleCrack.Enabled = true; btnToggleCrack.Enabled = true;
txtFormat.ReadOnly = false; txtFormat.ReadOnly = false;
txtMachine.ReadOnly = false; txtTargetOs.ReadOnly = false;
txtProduct.ReadOnly = false; txtProduct.ReadOnly = false;
txtVersion.ReadOnly = false; txtVersion.ReadOnly = false;
txtLanguages.ReadOnly = false; txtLanguages.ReadOnly = false;
@@ -363,7 +364,7 @@ namespace apprepodbmgr.Eto
chkFiles.Enabled = true; chkFiles.Enabled = true;
chkUpdate.Enabled = true; chkUpdate.Enabled = true;
chkUpgrade.Enabled = true; chkUpgrade.Enabled = true;
chkNetinstall.Enabled = true; chkInstaller.Enabled = true;
chkSource.Enabled = true; chkSource.Enabled = true;
btnMetadata.Visible = true; btnMetadata.Visible = true;
@@ -393,11 +394,12 @@ namespace apprepodbmgr.Eto
txtArchitecture.Text += architecture; txtArchitecture.Text += architecture;
} }
if(Context.Metadata.Systems != null) if(Context.Metadata.RequiredOperatingSystems != null)
foreach(string machine in Context.Metadata.Systems) foreach(string targetos in Context
.Metadata.RequiredOperatingSystems.Select(os => os.Name).Distinct())
{ {
if(!string.IsNullOrWhiteSpace(txtMachine.Text)) txtMachine.Text += ","; if(!string.IsNullOrWhiteSpace(txtTargetOs.Text)) txtTargetOs.Text += ",";
txtMachine.Text += machine; txtTargetOs.Text += targetos;
} }
btnMetadata.BackgroundColor = Colors.Green; btnMetadata.BackgroundColor = Colors.Green;
@@ -455,7 +457,7 @@ namespace apprepodbmgr.Eto
} }
txtFormat.ReadOnly = true; txtFormat.ReadOnly = true;
txtMachine.ReadOnly = true; txtTargetOs.ReadOnly = true;
txtProduct.ReadOnly = true; txtProduct.ReadOnly = true;
txtVersion.ReadOnly = true; txtVersion.ReadOnly = true;
txtLanguages.ReadOnly = true; txtLanguages.ReadOnly = true;
@@ -466,10 +468,10 @@ namespace apprepodbmgr.Eto
chkFiles.Enabled = false; chkFiles.Enabled = false;
chkUpdate.Enabled = false; chkUpdate.Enabled = false;
chkUpgrade.Enabled = false; chkUpgrade.Enabled = false;
chkNetinstall.Enabled = false; chkInstaller.Enabled = false;
chkSource.Enabled = false; chkSource.Enabled = false;
txtFormat.Text = ""; txtFormat.Text = "";
txtMachine.Text = ""; txtTargetOs.Text = "";
txtProduct.Text = ""; txtProduct.Text = "";
txtVersion.Text = ""; txtVersion.Text = "";
txtLanguages.Text = ""; txtLanguages.Text = "";
@@ -480,7 +482,7 @@ namespace apprepodbmgr.Eto
chkFiles.Checked = false; chkFiles.Checked = false;
chkUpdate.Checked = false; chkUpdate.Checked = false;
chkUpgrade.Checked = false; chkUpgrade.Checked = false;
chkNetinstall.Checked = false; chkInstaller.Checked = false;
chkSource.Checked = false; chkSource.Checked = false;
if(Context.TmpFolder != null) if(Context.TmpFolder != null)
@@ -507,10 +509,8 @@ namespace apprepodbmgr.Eto
{ {
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner)) if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgress.Text = $"{text}: {inner}"; lblProgress.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) else if(!string.IsNullOrWhiteSpace(inner)) lblProgress.Text = inner;
lblProgress.Text = inner; else lblProgress.Text = text;
else
lblProgress.Text = text;
if(maximum > 0) if(maximum > 0)
{ {
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue || if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
@@ -535,10 +535,8 @@ namespace apprepodbmgr.Eto
{ {
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner)) if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgress2.Text = $"{text}: {inner}"; lblProgress2.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) else if(!string.IsNullOrWhiteSpace(inner)) lblProgress2.Text = inner;
lblProgress2.Text = inner; else lblProgress2.Text = text;
else
lblProgress2.Text = text;
if(maximum > 0) if(maximum > 0)
{ {
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue || if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
@@ -710,7 +708,7 @@ namespace apprepodbmgr.Eto
btnClose.Enabled = false; btnClose.Enabled = false;
prgProgress.Visible = true; prgProgress.Visible = true;
txtFormat.ReadOnly = true; txtFormat.ReadOnly = true;
txtMachine.ReadOnly = true; txtTargetOs.ReadOnly = true;
txtProduct.ReadOnly = true; txtProduct.ReadOnly = true;
txtVersion.ReadOnly = true; txtVersion.ReadOnly = true;
txtLanguages.ReadOnly = true; txtLanguages.ReadOnly = true;
@@ -721,7 +719,7 @@ namespace apprepodbmgr.Eto
chkFiles.Enabled = false; chkFiles.Enabled = false;
chkUpdate.Enabled = false; chkUpdate.Enabled = false;
chkUpgrade.Enabled = false; chkUpgrade.Enabled = false;
chkNetinstall.Enabled = false; chkInstaller.Enabled = false;
chkSource.Enabled = false; chkSource.Enabled = false;
Workers.UpdateProgress += UpdateProgress; Workers.UpdateProgress += UpdateProgress;
@@ -733,11 +731,11 @@ namespace apprepodbmgr.Eto
Context.DbInfo.Developer = txtDeveloper.Text; Context.DbInfo.Developer = txtDeveloper.Text;
Context.DbInfo.Format = txtFormat.Text; Context.DbInfo.Format = txtFormat.Text;
Context.DbInfo.Languages = txtLanguages.Text; Context.DbInfo.Languages = txtLanguages.Text;
Context.DbInfo.Machine = txtMachine.Text; Context.DbInfo.TargetOs = txtTargetOs.Text;
Context.DbInfo.Product = txtProduct.Text; Context.DbInfo.Product = txtProduct.Text;
Context.DbInfo.Version = txtVersion.Text; Context.DbInfo.Version = txtVersion.Text;
Context.DbInfo.Files = chkFiles.Checked.Value; 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.Oem = chkOem.Checked.Value;
Context.DbInfo.Source = chkSource.Checked.Value; Context.DbInfo.Source = chkSource.Checked.Value;
Context.DbInfo.Update = chkUpdate.Checked.Value; Context.DbInfo.Update = chkUpdate.Checked.Value;
@@ -821,7 +819,7 @@ namespace apprepodbmgr.Eto
lblProgress.Visible = true; lblProgress.Visible = true;
lblProgress2.Visible = true; lblProgress2.Visible = true;
txtFormat.ReadOnly = true; txtFormat.ReadOnly = true;
txtMachine.ReadOnly = true; txtTargetOs.ReadOnly = true;
txtProduct.ReadOnly = true; txtProduct.ReadOnly = true;
txtVersion.ReadOnly = true; txtVersion.ReadOnly = true;
txtLanguages.ReadOnly = true; txtLanguages.ReadOnly = true;
@@ -832,7 +830,7 @@ namespace apprepodbmgr.Eto
chkFiles.Enabled = false; chkFiles.Enabled = false;
chkUpdate.Enabled = false; chkUpdate.Enabled = false;
chkUpgrade.Enabled = false; chkUpgrade.Enabled = false;
chkNetinstall.Enabled = false; chkInstaller.Enabled = false;
chkSource.Enabled = false; chkSource.Enabled = false;
Workers.UpdateProgress += UpdateProgress; Workers.UpdateProgress += UpdateProgress;
@@ -845,11 +843,11 @@ namespace apprepodbmgr.Eto
Context.DbInfo.Developer = txtDeveloper.Text; Context.DbInfo.Developer = txtDeveloper.Text;
Context.DbInfo.Format = txtFormat.Text; Context.DbInfo.Format = txtFormat.Text;
Context.DbInfo.Languages = txtLanguages.Text; Context.DbInfo.Languages = txtLanguages.Text;
Context.DbInfo.Machine = txtMachine.Text; Context.DbInfo.TargetOs = txtTargetOs.Text;
Context.DbInfo.Product = txtProduct.Text; Context.DbInfo.Product = txtProduct.Text;
Context.DbInfo.Version = txtVersion.Text; Context.DbInfo.Version = txtVersion.Text;
Context.DbInfo.Files = chkFiles.Checked.Value; 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.Oem = chkOem.Checked.Value;
Context.DbInfo.Source = chkSource.Checked.Value; Context.DbInfo.Source = chkSource.Checked.Value;
Context.DbInfo.Update = chkUpdate.Checked.Value; Context.DbInfo.Update = chkUpdate.Checked.Value;
@@ -900,7 +898,7 @@ namespace apprepodbmgr.Eto
lblProgress.Visible = false; lblProgress.Visible = false;
lblProgress2.Visible = false; lblProgress2.Visible = false;
txtFormat.ReadOnly = false; txtFormat.ReadOnly = false;
txtMachine.ReadOnly = false; txtTargetOs.ReadOnly = false;
txtProduct.ReadOnly = false; txtProduct.ReadOnly = false;
txtVersion.ReadOnly = false; txtVersion.ReadOnly = false;
txtLanguages.ReadOnly = false; txtLanguages.ReadOnly = false;
@@ -911,7 +909,7 @@ namespace apprepodbmgr.Eto
chkFiles.Enabled = true; chkFiles.Enabled = true;
chkUpdate.Enabled = true; chkUpdate.Enabled = true;
chkUpgrade.Enabled = true; chkUpgrade.Enabled = true;
chkNetinstall.Enabled = true; chkInstaller.Enabled = true;
chkSource.Enabled = true; chkSource.Enabled = true;
}); });
} }
@@ -1085,12 +1083,13 @@ namespace apprepodbmgr.Eto
txtArchitecture.Text += architecture; txtArchitecture.Text += architecture;
} }
if(string.IsNullOrWhiteSpace(txtMachine.Text)) if(string.IsNullOrWhiteSpace(txtTargetOs.Text))
if(Context.Metadata.Systems != null) if(Context.Metadata.RequiredOperatingSystems != null)
foreach(string machine in Context.Metadata.Systems) foreach(string targetos in Context.Metadata.RequiredOperatingSystems.Select(os => os.Name)
.Distinct())
{ {
if(!string.IsNullOrWhiteSpace(txtMachine.Text)) txtMachine.Text += ","; if(!string.IsNullOrWhiteSpace(txtTargetOs.Text)) txtTargetOs.Text += ",";
txtMachine.Text += machine; txtTargetOs.Text += targetos;
} }
btnMetadata.BackgroundColor = Colors.Green; btnMetadata.BackgroundColor = Colors.Green;
@@ -1151,7 +1150,7 @@ namespace apprepodbmgr.Eto
TextBox txtVersion; TextBox txtVersion;
TextBox txtLanguages; TextBox txtLanguages;
TextBox txtArchitecture; TextBox txtArchitecture;
TextBox txtMachine; TextBox txtTargetOs;
TextBox txtFormat; TextBox txtFormat;
TextBox txtDescription; TextBox txtDescription;
CheckBox chkOem; CheckBox chkOem;
@@ -1159,7 +1158,7 @@ namespace apprepodbmgr.Eto
CheckBox chkUpgrade; CheckBox chkUpgrade;
CheckBox chkFiles; CheckBox chkFiles;
CheckBox chkSource; CheckBox chkSource;
CheckBox chkNetinstall; CheckBox chkInstaller;
GridView treeFiles; GridView treeFiles;
TabPage tabApps; TabPage tabApps;
GridView treeApps; GridView treeApps;

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

@@ -89,8 +89,8 @@ namespace apprepodbmgr.Eto
}); });
treeApps.Columns.Add(new GridColumn treeApps.Columns.Add(new GridColumn
{ {
DataCell = new TextBoxCell {Binding = Binding.Property<DBEntryForEto, string>(r => r.machine)}, DataCell = new TextBoxCell {Binding = Binding.Property<DBEntryForEto, string>(r => r.targetos)},
HeaderText = "Machine" HeaderText = "Target OS"
}); });
treeApps.Columns.Add(new GridColumn treeApps.Columns.Add(new GridColumn
{ {
@@ -129,8 +129,8 @@ namespace apprepodbmgr.Eto
}); });
treeApps.Columns.Add(new GridColumn treeApps.Columns.Add(new GridColumn
{ {
DataCell = new CheckBoxCell {Binding = Binding.Property<DBEntryForEto, bool?>(r => r.netinstall)}, DataCell = new CheckBoxCell {Binding = Binding.Property<DBEntryForEto, bool?>(r => r.Installer)},
HeaderText = "NetInstall?" HeaderText = "Installer?"
}); });
treeApps.AllowMultipleSelection = false; treeApps.AllowMultipleSelection = false;
@@ -268,10 +268,8 @@ namespace apprepodbmgr.Eto
{ {
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner)) if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgress.Text = $"{text}: {inner}"; lblProgress.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) else if(!string.IsNullOrWhiteSpace(inner)) lblProgress.Text = inner;
lblProgress.Text = inner; else lblProgress.Text = text;
else
lblProgress.Text = text;
if(maximum > 0) if(maximum > 0)
{ {
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue || if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
@@ -296,10 +294,8 @@ namespace apprepodbmgr.Eto
{ {
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner)) if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgress2.Text = $"{text}: {inner}"; lblProgress2.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) else if(!string.IsNullOrWhiteSpace(inner)) lblProgress2.Text = inner;
lblProgress2.Text = inner; else lblProgress2.Text = text;
else
lblProgress2.Text = text;
if(maximum > 0) if(maximum > 0)
{ {
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue || if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
@@ -691,7 +687,8 @@ namespace apprepodbmgr.Eto
if(thdScanFile != null) thdScanFile = null; if(thdScanFile != null) thdScanFile = null;
if((!outIter.HasVirus.HasValue || outIter.HasVirus.HasValue && !outIter.HasVirus.Value) && 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); lstFiles.Remove(outIter);
AddFile(file); AddFile(file);
@@ -764,7 +761,8 @@ namespace apprepodbmgr.Eto
if(thdScanFile != null) thdScanFile = null; if(thdScanFile != null) thdScanFile = null;
if((!outIter.HasVirus.HasValue || outIter.HasVirus.HasValue && !outIter.HasVirus.Value) && 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); lstFiles.Remove(outIter);
AddFile(file); AddFile(file);
@@ -806,10 +804,8 @@ namespace apprepodbmgr.Eto
{ {
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner)) if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgressFiles1.Text = $"{text}: {inner}"; lblProgressFiles1.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) else if(!string.IsNullOrWhiteSpace(inner)) lblProgressFiles1.Text = inner;
lblProgressFiles1.Text = inner; else lblProgressFiles1.Text = text;
else
lblProgressFiles1.Text = text;
if(maximum > 0) if(maximum > 0)
{ {
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue || if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||
@@ -834,10 +830,8 @@ namespace apprepodbmgr.Eto
{ {
if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner)) if(!string.IsNullOrWhiteSpace(text) && !string.IsNullOrWhiteSpace(inner))
lblProgressFiles2.Text = $"{text}: {inner}"; lblProgressFiles2.Text = $"{text}: {inner}";
else if(!string.IsNullOrWhiteSpace(inner)) else if(!string.IsNullOrWhiteSpace(inner)) lblProgressFiles2.Text = inner;
lblProgressFiles2.Text = inner; else lblProgressFiles2.Text = text;
else
lblProgressFiles2.Text = text;
if(maximum > 0) if(maximum > 0)
{ {
if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue || if(current < int.MinValue || current > int.MaxValue || maximum < int.MinValue ||