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

Added fields to DB to store virus scanning and crack status of files.

Browse Source
This commit is contained in:
Natalia Portillo
2017-05-17 05:12:57 +01:00
parent 00556953d2
commit d7ebda6eda
8 changed files with 180 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osrepodbmgr.Core/Context.cs
View File

@@ -1,4 +1,4 @@
// //
// Author: // Author:
// Natalia Portillo claunia@claunia.com // Natalia Portillo claunia@claunia.com
// //
@@ -36,7 +36,7 @@ namespace osrepodbmgr.Core
{ {
public static List<string> files; public static List<string> files;
public static List<string> folders; public static List<string> folders;
public static Dictionary<string, DBFile> hashes; public static Dictionary<string, DBOSFile> hashes;
public static Dictionary<string, DBFolder> foldersDict; public static Dictionary<string, DBFolder> foldersDict;
public static string path; public static string path;
public static DBEntry dbInfo; public static DBEntry dbInfo;

132
osrepodbmgr.Core/DBOps.cs
View File

@@ -55,6 +55,18 @@ namespace osrepodbmgr.Core
} }
public struct DBFile public struct DBFile
{
public ulong Id;
public string Sha256;
public bool Crack;
public bool? VirusScanned;
public DateTime? ClamTime;
public DateTime? VirusTotalTime;
public string Virus;
public long Length;
}
public struct DBOSFile
{ {
public ulong Id; public ulong Id;
public string Path; public string Path;
@@ -247,24 +259,67 @@ namespace osrepodbmgr.Core
return true; return true;
} }
public bool AddFile(string hash) IDbCommand GetFileCommand(DBFile entry)
{ {
//Console.WriteLine("Adding {0}", hash);
IDbCommand dbcmd = dbCon.CreateCommand(); IDbCommand dbcmd = dbCon.CreateCommand();
IDbDataParameter param1 = dbcmd.CreateParameter(); IDbDataParameter param1 = dbcmd.CreateParameter();
IDbDataParameter param2 = dbcmd.CreateParameter();
IDbDataParameter param3 = dbcmd.CreateParameter();
IDbDataParameter param4 = dbcmd.CreateParameter();
IDbDataParameter param5 = dbcmd.CreateParameter();
IDbDataParameter param6 = dbcmd.CreateParameter();
IDbDataParameter param7 = dbcmd.CreateParameter();
param1.ParameterName = "@hash"; param1.ParameterName = "@sha256";
param2.ParameterName = "@crack";
param3.ParameterName = "@virscan";
param4.ParameterName = "@clamtime";
param5.ParameterName = "@vtotaltime";
param6.ParameterName = "@virus";
param7.ParameterName = "@length";
param1.DbType = DbType.String; param1.DbType = DbType.String;
param2.DbType = DbType.Boolean;
param3.DbType = DbType.String;
param4.DbType = DbType.String;
param5.DbType = DbType.String;
param7.DbType = DbType.UInt64;
param1.Value = hash; param1.Value = entry.Sha256;
param2.Value = entry.Crack;
param3.Value = entry.VirusScanned;
if(entry.ClamTime != null)
param4.Value = entry.ClamTime.Value.ToString("yyyy-MM-dd HH:mm");
else
param4.Value = null;
if(entry.VirusTotalTime != null)
param5.Value = entry.VirusTotalTime.Value.ToString("yyyy-MM-dd HH:mm");
else
param5.Value = null;
param6.Value = entry.Virus;
param7.Value = entry.Length;
dbcmd.Parameters.Add(param1); dbcmd.Parameters.Add(param1);
dbcmd.Parameters.Add(param2);
dbcmd.Parameters.Add(param3);
dbcmd.Parameters.Add(param4);
dbcmd.Parameters.Add(param5);
dbcmd.Parameters.Add(param6);
dbcmd.Parameters.Add(param7);
return dbcmd;
}
public bool AddFile(DBFile file)
{
IDbCommand dbcmd = GetFileCommand(file);
IDbTransaction trans = dbCon.BeginTransaction(); IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans; dbcmd.Transaction = trans;
const string sql = "INSERT INTO files (sha256) VALUES (@hash)"; const string sql = "INSERT INTO `files` (`sha256`, `crack`, `virscan`, `clamtime`, `vtotaltime`, `virus`, `length`)" +
" VALUES (@sha256, @crack, @virscan, @clamtime, @vtotaltime, @virus, @length)";
dbcmd.CommandText = sql; dbcmd.CommandText = sql;
@@ -299,7 +354,62 @@ namespace osrepodbmgr.Core
return false; return false;
} }
IDbCommand GetFileCommand(DBFile person) public ulong GetFilesCount()
{
IDbCommand dbcmd = dbCon.CreateCommand();
dbcmd.CommandText = "SELECT COUNT(*) FROM files";
object count = dbcmd.ExecuteScalar();
dbcmd.Dispose();
try
{
return Convert.ToUInt64(count);
}
catch { return 0; }
}
public bool GetFiles(out List<DBFile> entries, long start, long count)
{
entries = new List<DBFile>();
string sql = string.Format("SELECT * FROM files LIMIT {0}, {1} ORDER BY id", count, start);
IDbCommand dbcmd = dbCon.CreateCommand();
IDbDataAdapter dataAdapter = dbCore.GetNewDataAdapter();
dbcmd.CommandText = sql;
DataSet dataSet = new DataSet();
dataAdapter.SelectCommand = dbcmd;
dataAdapter.Fill(dataSet);
DataTable dataTable = dataSet.Tables[0];
foreach(DataRow dRow in dataTable.Rows)
{
DBFile fEntry = new DBFile();
fEntry.Id = ulong.Parse(dRow["id"].ToString());
fEntry.Sha256 = dRow["sha256"].ToString();
fEntry.Crack = bool.Parse(dRow["crack"].ToString());
if(dRow["virscan"] == DBNull.Value)
fEntry.VirusScanned = null;
else
fEntry.VirusScanned = bool.Parse(dRow["virscan"].ToString());
if(dRow["clamtime"] == DBNull.Value)
fEntry.ClamTime = null;
else
fEntry.ClamTime = DateTime.Parse(dRow["clamtime"].ToString());
if(dRow["vtotaltime"] == DBNull.Value)
fEntry.VirusTotalTime = null;
else
fEntry.VirusTotalTime = DateTime.Parse(dRow["vtotaltime"].ToString());
fEntry.Virus = dRow["virus"].ToString();
fEntry.Length = long.Parse(dRow["length"].ToString());
entries.Add(fEntry);
}
return true;
}
IDbCommand GetOSFileCommand(DBOSFile person)
{ {
IDbCommand dbcmd = dbCon.CreateCommand(); IDbCommand dbcmd = dbCon.CreateCommand();
@@ -346,9 +456,9 @@ namespace osrepodbmgr.Core
return dbcmd; return dbcmd;
} }
public bool AddFileToOS(DBFile file, long os) public bool AddFileToOS(DBOSFile file, long os)
{ {
IDbCommand dbcmd = GetFileCommand(file); IDbCommand dbcmd = GetOSFileCommand(file);
IDbTransaction trans = dbCon.BeginTransaction(); IDbTransaction trans = dbCon.BeginTransaction();
dbcmd.Transaction = trans; dbcmd.Transaction = trans;
@@ -557,9 +667,9 @@ namespace osrepodbmgr.Core
return false; return false;
} }
public bool GetAllFiles(out List<DBFile> entries, long id) public bool GetAllFilesInOS(out List<DBOSFile> entries, long id)
{ {
entries = new List<DBFile>(); entries = new List<DBOSFile>();
string sql = string.Format("SELECT * from os_{0}", id); string sql = string.Format("SELECT * from os_{0}", id);
@@ -573,7 +683,7 @@ namespace osrepodbmgr.Core
foreach(DataRow dRow in dataTable.Rows) foreach(DataRow dRow in dataTable.Rows)
{ {
DBFile fEntry = new DBFile(); DBOSFile fEntry = new DBOSFile();
fEntry.Id = ulong.Parse(dRow["id"].ToString()); fEntry.Id = ulong.Parse(dRow["id"].ToString());
fEntry.Path = dRow["path"].ToString(); fEntry.Path = dRow["path"].ToString();
fEntry.Sha256 = dRow["sha256"].ToString(); fEntry.Sha256 = dRow["sha256"].ToString();

25
osrepodbmgr.Core/Schema.cs
View File

@@ -35,9 +35,18 @@ namespace osrepodbmgr.Core
"DROP TABLE IF EXISTS `files` ;\n\n" + "DROP TABLE IF EXISTS `files` ;\n\n" +
"CREATE TABLE IF NOT EXISTS `files` (\n" + "CREATE TABLE IF NOT EXISTS `files` (\n" +
" `id` INTEGER PRIMARY KEY AUTOINCREMENT,\n" + " `id` INTEGER PRIMARY KEY AUTOINCREMENT,\n" +
" `sha256` VARCHAR(64) NOT NULL);\n\n" + " `sha256` VARCHAR(64) NOT NULL,\n" +
" `crack` BOOLEAN NOT NULL,\n" +
" `virscan` BOOLEAN NULL,\n" +
" `clamtime` DATETIME NULL,\n" +
" `vtotaltime` DATETIME NULL,\n" +
" `virus` VARCHAR(128) NULL,\n" +
" `length` BIGINT NOT NULL);\n\n" +
"CREATE UNIQUE INDEX `files_id_UNIQUE` ON `files` (`id` ASC);\n\n" + "CREATE UNIQUE INDEX `files_id_UNIQUE` ON `files` (`id` ASC);\n\n" +
"CREATE UNIQUE INDEX `files_sha256_UNIQUE` ON `files` (`sha256` ASC);"; "CREATE UNIQUE INDEX `files_sha256_UNIQUE` ON `files` (`sha256` ASC);\n\n" +
"CREATE INDEX `files_virscan_idx` ON `files` (`virscan` ASC);\n\n" +
"CREATE INDEX `files_virus_idx` ON `files` (`virus` ASC);\n\n" +
"CREATE INDEX `files_length_idx` ON `files` (`length` ASC);";
public const string OSesTableSql = "-- -----------------------------------------------------\n" + public const string OSesTableSql = "-- -----------------------------------------------------\n" +
"-- Table `oses`\n" + "-- Table `oses`\n" +
@@ -54,12 +63,12 @@ namespace osrepodbmgr.Core
" `machine` VARCHAR(45) NULL,\n" + " `machine` VARCHAR(45) NULL,\n" +
" `format` VARCHAR(45) NULL,\n" + " `format` VARCHAR(45) NULL,\n" +
" `description` VARCHAR(45) NULL,\n" + " `description` VARCHAR(45) NULL,\n" +
" `oem` BOOLEAN NULL,\n" + " `oem` BOOLEAN NOT NULL,\n" +
" `upgrade` BOOLEAN NULL,\n" + " `upgrade` BOOLEAN NOT NULL,\n" +
" `update` BOOLEAN NULL,\n" + " `update` BOOLEAN NOT NULL,\n" +
" `source` BOOLEAN NULL,\n" + " `source` BOOLEAN NOT NULL,\n" +
" `files` BOOLEAN NULL,\n" + " `files` BOOLEAN NOT NULL,\n" +
" `netinstall` BOOLEAN NULL,\n" + " `netinstall` BOOLEAN NOT NULL,\n" +
" `xml` BLOB NULL,\n" + " `xml` BLOB NULL,\n" +
" `json` BLOB NULL);\n\n" + " `json` BLOB NULL);\n\n" +
"CREATE UNIQUE INDEX `oses_id_UNIQUE` ON `oses` (`id` ASC);\n\n" + "CREATE UNIQUE INDEX `oses_id_UNIQUE` ON `oses` (`id` ASC);\n\n" +

50
osrepodbmgr.Core/Workers.cs
View File

@@ -1,4 +1,4 @@
// //
// Author: // Author:
// Natalia Portillo claunia@claunia.com // Natalia Portillo claunia@claunia.com
// //
@@ -112,7 +112,7 @@ namespace osrepodbmgr.Core
{ {
try try
{ {
Context.hashes = new Dictionary<string, DBFile>(); Context.hashes = new Dictionary<string, DBOSFile>();
Context.foldersDict = new Dictionary<string, DBFolder>(); Context.foldersDict = new Dictionary<string, DBFolder>();
List<string> alreadyMetadata = new List<string>(); List<string> alreadyMetadata = new List<string>();
bool foundMetadata = false; bool foundMetadata = false;
@@ -375,7 +375,8 @@ namespace osrepodbmgr.Core
fileStream.Read(dataBuffer, 0, (int)remainder); fileStream.Read(dataBuffer, 0, (int)remainder);
sha256Context.Update(dataBuffer); sha256Context.Update(dataBuffer);
} }
else { else
{
if(UpdateProgress2 != null) if(UpdateProgress2 != null)
UpdateProgress2(string.Format("{0:P}", 0 / (double)fileStream.Length), relpath, 0, fileStream.Length); UpdateProgress2(string.Format("{0:P}", 0 / (double)fileStream.Length), relpath, 0, fileStream.Length);
dataBuffer = new byte[fileStream.Length]; dataBuffer = new byte[fileStream.Length];
@@ -386,7 +387,7 @@ namespace osrepodbmgr.Core
fileStream.Close(); fileStream.Close();
string hash = stringify(sha256Context.Final()); string hash = stringify(sha256Context.Final());
DBFile dbFile = new DBFile(); DBOSFile dbFile = new DBOSFile();
dbFile.Attributes = fi.Attributes; dbFile.Attributes = fi.Attributes;
dbFile.CreationTimeUtc = fi.CreationTimeUtc; dbFile.CreationTimeUtc = fi.CreationTimeUtc;
dbFile.LastAccessTimeUtc = fi.LastAccessTimeUtc; dbFile.LastAccessTimeUtc = fi.LastAccessTimeUtc;
@@ -531,7 +532,7 @@ namespace osrepodbmgr.Core
try try
{ {
long counter = 0; long counter = 0;
foreach(KeyValuePair<string, DBFile> kvp in Context.hashes) foreach(KeyValuePair<string, DBOSFile> kvp in Context.hashes)
{ {
if(UpdateProgress != null) if(UpdateProgress != null)
UpdateProgress(null, "Checking files in database", counter, Context.hashes.Count); UpdateProgress(null, "Checking files in database", counter, Context.hashes.Count);
@@ -559,7 +560,7 @@ namespace osrepodbmgr.Core
UpdateProgress(null, string.Format("Check OS id {0}", os.id), osCounter, osesArray.Length); UpdateProgress(null, string.Format("Check OS id {0}", os.id), osCounter, osesArray.Length);
counter = 0; counter = 0;
foreach(KeyValuePair<string, DBFile> kvp in Context.hashes) foreach(KeyValuePair<string, DBOSFile> kvp in Context.hashes)
{ {
if(UpdateProgress2 != null) if(UpdateProgress2 != null)
UpdateProgress2(null, string.Format("Checking for file {0}", kvp.Value.Path), counter, Context.hashes.Count); UpdateProgress2(null, string.Format("Checking for file {0}", kvp.Value.Path), counter, Context.hashes.Count);
@@ -612,13 +613,17 @@ namespace osrepodbmgr.Core
try try
{ {
long counter = 0; long counter = 0;
foreach(KeyValuePair<string, DBFile> kvp in Context.hashes) foreach(KeyValuePair<string, DBOSFile> kvp in Context.hashes)
{ {
if(UpdateProgress != null) if(UpdateProgress != null)
UpdateProgress(null, "Adding files to database", counter, Context.hashes.Count); UpdateProgress(null, "Adding files to database", counter, Context.hashes.Count);
if(!dbCore.DBOps.ExistsFile(kvp.Value.Sha256)) if(!dbCore.DBOps.ExistsFile(kvp.Value.Sha256))
dbCore.DBOps.AddFile(kvp.Value.Sha256); dbCore.DBOps.AddFile(new DBFile
{
Sha256 = kvp.Value.Sha256, ClamTime = null, Crack = false,
Length = kvp.Value.Length, Virus = null, VirusScanned = null, VirusTotalTime = null
});
counter++; counter++;
} }
@@ -631,7 +636,7 @@ namespace osrepodbmgr.Core
dbCore.DBOps.CreateTableForOS(Context.dbInfo.id); dbCore.DBOps.CreateTableForOS(Context.dbInfo.id);
counter = 0; counter = 0;
foreach(KeyValuePair<string, DBFile> kvp in Context.hashes) foreach(KeyValuePair<string, DBOSFile> kvp in Context.hashes)
{ {
if(UpdateProgress != null) if(UpdateProgress != null)
UpdateProgress(null, "Adding files to OS in database", counter, Context.hashes.Count); UpdateProgress(null, "Adding files to OS in database", counter, Context.hashes.Count);
@@ -701,7 +706,8 @@ namespace osrepodbmgr.Core
return; return;
} }
} }
else { else
{
if(!dbCore.CreateDB(Settings.Current.DatabasePath, null, null, null)) if(!dbCore.CreateDB(Settings.Current.DatabasePath, null, null, null))
{ {
if(Failed != null) if(Failed != null)
@@ -879,7 +885,7 @@ namespace osrepodbmgr.Core
break; break;
} }
foreach(KeyValuePair<string, DBFile> file in Context.hashes) foreach(KeyValuePair<string, DBOSFile> file in Context.hashes)
{ {
if(UpdateProgress != null) if(UpdateProgress != null)
UpdateProgress("Compressing...", file.Value.Path, counter, Context.hashes.Count); UpdateProgress("Compressing...", file.Value.Path, counter, Context.hashes.Count);
@@ -934,7 +940,7 @@ namespace osrepodbmgr.Core
if(UpdateProgress2 != null) if(UpdateProgress2 != null)
UpdateProgress2(string.Format("{0:P}", inFs.Length / (double)inFs.Length), UpdateProgress2(string.Format("{0:P}", inFs.Length / (double)inFs.Length),
"Finishing...",inFs.Length, inFs.Length); "Finishing...", inFs.Length, inFs.Length);
inFs.Close(); inFs.Close();
zStream.Close(); zStream.Close();
@@ -974,7 +980,7 @@ namespace osrepodbmgr.Core
jms.Position = 0; jms.Position = 0;
} }
if(FinishedWithText!= null) if(FinishedWithText != null)
FinishedWithText(string.Format("Correctly added operating system with MDID {0}", mdid)); FinishedWithText(string.Format("Correctly added operating system with MDID {0}", mdid));
} }
catch(Exception ex) catch(Exception ex)
@@ -1419,14 +1425,14 @@ namespace osrepodbmgr.Core
return; return;
} }
List<DBFile> files; List<DBOSFile> files;
List<DBFolder> folders; List<DBFolder> folders;
long counter; long counter;
if(UpdateProgress != null) if(UpdateProgress != null)
UpdateProgress("", "Asking DB for files...", 1, 100); UpdateProgress("", "Asking DB for files...", 1, 100);
dbCore.DBOps.GetAllFiles(out files, Context.dbInfo.id); dbCore.DBOps.GetAllFilesInOS(out files, Context.dbInfo.id);
if(UpdateProgress != null) if(UpdateProgress != null)
UpdateProgress("", "Asking DB for folders...", 2, 100); UpdateProgress("", "Asking DB for folders...", 2, 100);
@@ -1452,7 +1458,7 @@ namespace osrepodbmgr.Core
} }
counter = 3; counter = 3;
foreach(DBFile file in files) foreach(DBOSFile file in files)
{ {
if(UpdateProgress != null) if(UpdateProgress != null)
UpdateProgress("", string.Format("Creating {0}...", file.Path), counter, 3 + files.Count); UpdateProgress("", string.Format("Creating {0}...", file.Path), counter, 3 + files.Count);
@@ -1610,14 +1616,14 @@ namespace osrepodbmgr.Core
zf.EmitTimesInWindowsFormatWhenSaving = true; zf.EmitTimesInWindowsFormatWhenSaving = true;
zf.UseZip64WhenSaving = Zip64Option.AsNecessary; zf.UseZip64WhenSaving = Zip64Option.AsNecessary;
zf.SortEntriesBeforeSaving = true; zf.SortEntriesBeforeSaving = true;
List<DBFile> files; List<DBOSFile> files;
List<DBFolder> folders; List<DBFolder> folders;
long counter; long counter;
if(UpdateProgress != null) if(UpdateProgress != null)
UpdateProgress("", "Asking DB for files...", 1, 100); UpdateProgress("", "Asking DB for files...", 1, 100);
dbCore.DBOps.GetAllFiles(out files, Context.dbInfo.id); dbCore.DBOps.GetAllFilesInOS(out files, Context.dbInfo.id);
if(UpdateProgress != null) if(UpdateProgress != null)
UpdateProgress("", "Asking DB for folders...", 2, 100); UpdateProgress("", "Asking DB for folders...", 2, 100);
@@ -1644,8 +1650,8 @@ namespace osrepodbmgr.Core
} }
counter = 3; counter = 3;
Context.hashes = new Dictionary<string, DBFile>(); Context.hashes = new Dictionary<string, DBOSFile>();
foreach(DBFile file in files) foreach(DBOSFile file in files)
{ {
if(UpdateProgress != null) if(UpdateProgress != null)
UpdateProgress("", string.Format("Adding {0}...", file.Path), counter, 3 + files.Count); UpdateProgress("", string.Format("Adding {0}...", file.Path), counter, 3 + files.Count);
@@ -1677,10 +1683,10 @@ namespace osrepodbmgr.Core
static Stream Zf_HandleOpen(string entryName) static Stream Zf_HandleOpen(string entryName)
{ {
DBFile file; DBOSFile file;
if(!Context.hashes.TryGetValue(entryName, out file)) if(!Context.hashes.TryGetValue(entryName, out file))
{ {
if (!Context.hashes.TryGetValue(entryName.Replace('/', '\\'), out file)) if(!Context.hashes.TryGetValue(entryName.Replace('/', '\\'), out file))
throw new ArgumentException("Cannot find requested zip entry in hashes dictionary"); throw new ArgumentException("Cannot find requested zip entry in hashes dictionary");
} }

4
osrepodbmgr.Eto/dlgAdd.xeto.cs
View File

@@ -1,4 +1,4 @@
// //
// Author: // Author:
// Natalia Portillo claunia@claunia.com // Natalia Portillo claunia@claunia.com
// //
@@ -798,7 +798,7 @@ namespace osrepodbmgr.Eto
long counter = 0; long counter = 0;
fileView.Clear(); fileView.Clear();
foreach(KeyValuePair<string, DBFile> kvp in Context.hashes) foreach(KeyValuePair<string, DBOSFile> kvp in Context.hashes)
{ {
UpdateProgress(null, "Updating table", counter, Context.hashes.Count); UpdateProgress(null, "Updating table", counter, Context.hashes.Count);
fileView.Add(new FileEntry { path = kvp.Key, hash = kvp.Value.Sha256, known = true }); fileView.Add(new FileEntry { path = kvp.Key, hash = kvp.Value.Sha256, known = true });

4
osrepodbmgr.Eto/dlgMetadata.xeto.cs
View File

@@ -1,4 +1,4 @@
// //
// Author: // Author:
// Natalia Portillo claunia@claunia.com // Natalia Portillo claunia@claunia.com
// //
@@ -258,7 +258,7 @@ namespace osrepodbmgr.Eto
void FillFilesCombos() void FillFilesCombos()
{ {
foreach(KeyValuePair<string, DBFile> files in Context.hashes) foreach(KeyValuePair<string, DBOSFile> files in Context.hashes)
lstFilesForMedia.Add(files.Key); lstFilesForMedia.Add(files.Key);
} }

4
osrepodbmgr/dlgAdd.cs
View File

@@ -1,4 +1,4 @@
// //
// Author: // Author:
// Natalia Portillo claunia@claunia.com // Natalia Portillo claunia@claunia.com
// //
@@ -786,7 +786,7 @@ public partial class dlgAdd : Dialog
long counter = 0; long counter = 0;
fileView.Clear(); fileView.Clear();
foreach(KeyValuePair<string, DBFile> kvp in Context.hashes) foreach(KeyValuePair<string, DBOSFile> kvp in Context.hashes)
{ {
UpdateProgress(null, "Updating table", counter, Context.hashes.Count); UpdateProgress(null, "Updating table", counter, Context.hashes.Count);
fileView.AppendValues(kvp.Key, kvp.Value.Sha256, true, "green", "black"); fileView.AppendValues(kvp.Key, kvp.Value.Sha256, true, "green", "black");

8
osrepodbmgr/dlgMetadata.cs
View File

@@ -1,4 +1,4 @@
// //
// Author: // Author:
// Natalia Portillo claunia@claunia.com // Natalia Portillo claunia@claunia.com
// //
@@ -217,7 +217,7 @@ namespace osrepodbmgr
void FillFilesCombos() void FillFilesCombos()
{ {
foreach(KeyValuePair<string, DBFile> files in Context.hashes) foreach(KeyValuePair<string, DBOSFile> files in Context.hashes)
{ {
lstFilesForDisc.AppendValues(files.Key); lstFilesForDisc.AppendValues(files.Key);
lstFilesForDisk.AppendValues(files.Key); lstFilesForDisk.AppendValues(files.Key);
@@ -228,7 +228,7 @@ namespace osrepodbmgr
{ {
// TODO: Check that files are not already added as disks // TODO: Check that files are not already added as disks
lstFilesForDisc.Clear(); lstFilesForDisc.Clear();
foreach(KeyValuePair<string, DBFile> files in Context.hashes) foreach(KeyValuePair<string, DBOSFile> files in Context.hashes)
lstFilesForDisc.AppendValues(files.Key); lstFilesForDisc.AppendValues(files.Key);
} }
@@ -236,7 +236,7 @@ namespace osrepodbmgr
{ {
// TODO: Check that files are not already added as discs // TODO: Check that files are not already added as discs
lstFilesForDisk.Clear(); lstFilesForDisk.Clear();
foreach(KeyValuePair<string, DBFile> files in Context.hashes) foreach(KeyValuePair<string, DBOSFile> files in Context.hashes)
lstFilesForDisk.AppendValues(files.Key); lstFilesForDisk.AppendValues(files.Key);
} }