diff --git a/osrepodbmgr.Core/ChangeLog b/osrepodbmgr.Core/ChangeLog index 5d267e5..91c49cf 100644 --- a/osrepodbmgr.Core/ChangeLog +++ b/osrepodbmgr.Core/ChangeLog @@ -1,3 +1,11 @@ +2017-05-10 Natalia Portillo + + * Context.cs: + * Workers.cs: + * DicWorkers.cs: + * osrepodbmgr.Core.csproj: + Refactor: Rename Core.Core to Core.Workers + 2017-05-10 Natalia Portillo * Core.cs: diff --git a/osrepodbmgr.Core/Context.cs b/osrepodbmgr.Core/Context.cs index 6926bef..6251473 100644 --- a/osrepodbmgr.Core/Context.cs +++ b/osrepodbmgr.Core/Context.cs @@ -55,10 +55,10 @@ namespace osrepodbmgr.Core public static void CheckUnar() { - Core.Finished += CheckUnarFinished; - Core.Failed += CheckUnarFailed; + Workers.Finished += CheckUnarFinished; + Workers.Failed += CheckUnarFailed; - Thread thdCheckUnar = new Thread(Core.CheckUnar); + Thread thdCheckUnar = new Thread(Workers.CheckUnar); thdCheckUnar.Start(); } @@ -67,8 +67,8 @@ namespace osrepodbmgr.Core unarUsable = true; if(UnarChangeStatus != null) UnarChangeStatus(); - Core.Finished -= CheckUnarFinished; - Core.Failed -= CheckUnarFailed; + Workers.Finished -= CheckUnarFinished; + Workers.Failed -= CheckUnarFailed; } static void CheckUnarFailed(string text) @@ -76,8 +76,8 @@ namespace osrepodbmgr.Core unarUsable = false; if(UnarChangeStatus != null) UnarChangeStatus(); - Core.Finished -= CheckUnarFinished; - Core.Failed -= CheckUnarFailed; + Workers.Finished -= CheckUnarFinished; + Workers.Failed -= CheckUnarFailed; } } } diff --git a/osrepodbmgr.Core/DicCore.cs b/osrepodbmgr.Core/DicWorkers.cs similarity index 99% rename from osrepodbmgr.Core/DicCore.cs rename to osrepodbmgr.Core/DicWorkers.cs index 7884931..0534c1b 100644 --- a/osrepodbmgr.Core/DicCore.cs +++ b/osrepodbmgr.Core/DicWorkers.cs @@ -38,7 +38,7 @@ using Schemas; namespace osrepodbmgr.Core { - public static partial class Core + public static partial class Workers { public static void AddMedia() { diff --git a/osrepodbmgr.Core/Core.cs b/osrepodbmgr.Core/Workers.cs similarity index 99% rename from osrepodbmgr.Core/Core.cs rename to osrepodbmgr.Core/Workers.cs index 92a255e..14b72e0 100644 --- a/osrepodbmgr.Core/Core.cs +++ b/osrepodbmgr.Core/Workers.cs @@ -40,7 +40,7 @@ using Schemas; namespace osrepodbmgr.Core { - public static partial class Core + public static partial class Workers { // Sets a 128Kbyte buffer const long bufferSize = 131072; diff --git a/osrepodbmgr.Core/osrepodbmgr.Core.csproj b/osrepodbmgr.Core/osrepodbmgr.Core.csproj index 4a2d612..bfbbfe7 100644 --- a/osrepodbmgr.Core/osrepodbmgr.Core.csproj +++ b/osrepodbmgr.Core/osrepodbmgr.Core.csproj @@ -46,12 +46,12 @@ - + - + diff --git a/osrepodbmgr/ChangeLog b/osrepodbmgr/ChangeLog index 494d2fc..70220ff 100644 --- a/osrepodbmgr/ChangeLog +++ b/osrepodbmgr/ChangeLog @@ -1,3 +1,10 @@ +2017-05-10 Natalia Portillo + + * frmAdd.cs: + * dlgMetadata.cs: + * frmSettings.cs: + Refactor: Rename Core.Core to Core.Workers + 2017-05-10 Natalia Portillo * frmAdd.cs: diff --git a/osrepodbmgr/dlgMetadata.cs b/osrepodbmgr/dlgMetadata.cs index 4880755..4cc448f 100644 --- a/osrepodbmgr/dlgMetadata.cs +++ b/osrepodbmgr/dlgMetadata.cs @@ -720,15 +720,15 @@ namespace osrepodbmgr buttonOk.Visible = false; btnEditDisc.Visible = false; btnClearDiscs.Visible = false; - Core.Core.Failed += OnDiscAddFailed; - Core.Core.Finished += OnDiscAddFinished; - Core.Core.UpdateProgress += UpdateDiscProgress1; - Core.Core.UpdateProgress2 += UpdateDiscProgress2; + Core.Workers.Failed += OnDiscAddFailed; + Core.Workers.Finished += OnDiscAddFinished; + Core.Workers.UpdateProgress += UpdateDiscProgress1; + Core.Workers.UpdateProgress2 += UpdateDiscProgress2; Context.workingDisc = null; btnStopAddDisc.Visible = true; btnAddDisc.Visible = false; btnRemoveDiscs.Visible = false; - thdDisc = new Thread(Core.Core.AddMedia); + thdDisc = new Thread(Core.Workers.AddMedia); thdDisc.Start(); } @@ -789,10 +789,10 @@ namespace osrepodbmgr buttonOk.Visible = true; btnEditDisc.Visible = true; btnClearDiscs.Visible = true; - Core.Core.Failed -= OnDiscAddFailed; - Core.Core.Finished -= OnDiscAddFinished; - Core.Core.UpdateProgress -= UpdateDiscProgress1; - Core.Core.UpdateProgress2 -= UpdateDiscProgress2; + Core.Workers.Failed -= OnDiscAddFailed; + Core.Workers.Finished -= OnDiscAddFinished; + Core.Workers.UpdateProgress -= UpdateDiscProgress1; + Core.Workers.UpdateProgress2 -= UpdateDiscProgress2; Context.workingDisc = null; btnStopAddDisc.Visible = false; btnAddDisc.Visible = true; @@ -906,10 +906,10 @@ namespace osrepodbmgr buttonOk.Visible = true; btnEditDisc.Visible = true; btnClearDiscs.Visible = true; - Core.Core.Failed -= OnDiscAddFailed; - Core.Core.Finished -= OnDiscAddFinished; - Core.Core.UpdateProgress -= UpdateDiscProgress1; - Core.Core.UpdateProgress2 -= UpdateDiscProgress2; + Core.Workers.Failed -= OnDiscAddFailed; + Core.Workers.Finished -= OnDiscAddFinished; + Core.Workers.UpdateProgress -= UpdateDiscProgress1; + Core.Workers.UpdateProgress2 -= UpdateDiscProgress2; Context.workingDisc = null; btnStopAddDisc.Visible = false; btnAddDisc.Visible = true; @@ -952,15 +952,15 @@ namespace osrepodbmgr buttonOk.Visible = false; btnEditDisk.Visible = false; btnClearDisks.Visible = false; - Core.Core.Failed += OnDiskAddFailed; - Core.Core.Finished += OnDiskAddFinished; - Core.Core.UpdateProgress += UpdateDiskProgress1; - Core.Core.UpdateProgress2 += UpdateDiskProgress2; + Core.Workers.Failed += OnDiskAddFailed; + Core.Workers.Finished += OnDiskAddFinished; + Core.Workers.UpdateProgress += UpdateDiskProgress1; + Core.Workers.UpdateProgress2 += UpdateDiskProgress2; Context.workingDisk = null; btnStopAddDisk.Visible = true; btnAddDisk.Visible = false; btnRemoveDisk.Visible = false; - thdDisk = new Thread(Core.Core.AddMedia); + thdDisk = new Thread(Core.Workers.AddMedia); thdDisk.Start(); } @@ -1021,10 +1021,10 @@ namespace osrepodbmgr buttonOk.Visible = true; btnEditDisk.Visible = true; btnClearDisks.Visible = true; - Core.Core.Failed -= OnDiskAddFailed; - Core.Core.Finished -= OnDiskAddFinished; - Core.Core.UpdateProgress -= UpdateDiskProgress1; - Core.Core.UpdateProgress2 -= UpdateDiskProgress2; + Core.Workers.Failed -= OnDiskAddFailed; + Core.Workers.Finished -= OnDiskAddFinished; + Core.Workers.UpdateProgress -= UpdateDiskProgress1; + Core.Workers.UpdateProgress2 -= UpdateDiskProgress2; Context.workingDisk = null; btnStopAddDisk.Visible = false; btnAddDisk.Visible = true; @@ -1134,10 +1134,10 @@ namespace osrepodbmgr buttonOk.Visible = true; btnEditDisk.Visible = true; btnClearDisks.Visible = true; - Core.Core.Failed -= OnDiskAddFailed; - Core.Core.Finished -= OnDiskAddFinished; - Core.Core.UpdateProgress -= UpdateDiskProgress1; - Core.Core.UpdateProgress2 -= UpdateDiskProgress2; + Core.Workers.Failed -= OnDiskAddFailed; + Core.Workers.Finished -= OnDiskAddFinished; + Core.Workers.UpdateProgress -= UpdateDiskProgress1; + Core.Workers.UpdateProgress2 -= UpdateDiskProgress2; Context.workingDisk = null; btnStopAddDisk.Visible = false; btnAddDisk.Visible = true; diff --git a/osrepodbmgr/frmAdd.cs b/osrepodbmgr/frmAdd.cs index 4b59a6b..882d50d 100644 --- a/osrepodbmgr/frmAdd.cs +++ b/osrepodbmgr/frmAdd.cs @@ -55,7 +55,7 @@ public partial class frmAdd : Window { Build(); - Core.InitDB(); + Workers.InitDB(); Context.UnarChangeStatus += UnarChangeStatus; Context.CheckUnar(); @@ -183,10 +183,10 @@ public partial class frmAdd : Window } }); - thdFindFiles = new Thread(Core.FindFiles); + thdFindFiles = new Thread(Workers.FindFiles); Context.path = dlgFolder.Filename; - Core.Failed += FindFilesFailed; - Core.Finished += FindFilesFinished; + Workers.Failed += FindFilesFailed; + Workers.Finished += FindFilesFinished; btnStop.Visible = true; thdPulseProgress.Start(); thdFindFiles.Start(); @@ -213,8 +213,8 @@ public partial class frmAdd : Window btnFolder.Visible = true; btnArchive.Visible = true; btnSettings.Sensitive = true; - Core.Failed -= FindFilesFailed; - Core.Finished -= FindFilesFinished; + Workers.Failed -= FindFilesFailed; + Workers.Finished -= FindFilesFinished; thdFindFiles = null; }); } @@ -226,8 +226,8 @@ public partial class frmAdd : Window if(thdPulseProgress != null) thdPulseProgress.Abort(); - Core.Failed -= FindFilesFailed; - Core.Finished -= FindFilesFinished; + Workers.Failed -= FindFilesFailed; + Workers.Finished -= FindFilesFinished; lblProgress.Visible = true; prgProgress.Visible = true; @@ -235,11 +235,11 @@ public partial class frmAdd : Window prgProgress2.Visible = true; thdFindFiles = null; - thdHashFiles = new Thread(Core.HashFiles); - Core.Failed += HashFilesFailed; - Core.Finished += HashFilesFinished; - Core.UpdateProgress += UpdateProgress; - Core.UpdateProgress2 += UpdateProgress2; + thdHashFiles = new Thread(Workers.HashFiles); + Workers.Failed += HashFilesFailed; + Workers.Finished += HashFilesFinished; + Workers.UpdateProgress += UpdateProgress; + Workers.UpdateProgress2 += UpdateProgress2; thdHashFiles.Start(); }); } @@ -260,10 +260,10 @@ public partial class frmAdd : Window prgProgress.Visible = false; lblProgress2.Visible = false; prgProgress2.Visible = false; - Core.Failed -= HashFilesFailed; - Core.Finished -= HashFilesFinished; - Core.UpdateProgress -= UpdateProgress; - Core.UpdateProgress2 -= UpdateProgress2; + Workers.Failed -= HashFilesFailed; + Workers.Finished -= HashFilesFinished; + Workers.UpdateProgress -= UpdateProgress; + Workers.UpdateProgress2 -= UpdateProgress2; btnExit.Sensitive = true; btnFolder.Visible = true; btnArchive.Visible = true; @@ -284,21 +284,21 @@ public partial class frmAdd : Window prgProgress.Visible = false; lblProgress2.Visible = false; prgProgress2.Visible = false; - Core.Failed -= HashFilesFailed; - Core.Finished -= HashFilesFinished; - Core.UpdateProgress -= UpdateProgress; - Core.UpdateProgress2 -= UpdateProgress2; + Workers.Failed -= HashFilesFailed; + Workers.Finished -= HashFilesFinished; + Workers.UpdateProgress -= UpdateProgress; + Workers.UpdateProgress2 -= UpdateProgress2; thdHashFiles = null; prgProgress.Visible = true; - thdCheckFiles = new Thread(Core.CheckDbForFiles); - Core.Failed += ChkFilesFailed; - Core.Finished += ChkFilesFinished; - Core.UpdateProgress += UpdateProgress; - Core.UpdateProgress2 += UpdateProgress2; - Core.AddFile += AddFile; - Core.AddOS += AddOS; + thdCheckFiles = new Thread(Workers.CheckDbForFiles); + Workers.Failed += ChkFilesFailed; + Workers.Finished += ChkFilesFinished; + Workers.UpdateProgress += UpdateProgress; + Workers.UpdateProgress2 += UpdateProgress2; + Workers.AddFile += AddFile; + Workers.AddOS += AddOS; btnAdd.Sensitive = false; thdCheckFiles.Start(); }); @@ -322,12 +322,12 @@ public partial class frmAdd : Window btnStop.Visible = false; btnClose.Visible = false; btnExit.Sensitive = true; - Core.Failed -= ChkFilesFailed; - Core.Finished -= ChkFilesFinished; - Core.UpdateProgress -= UpdateProgress; - Core.UpdateProgress2 -= UpdateProgress2; - Core.AddFile -= AddFile; - Core.AddOS -= AddOS; + Workers.Failed -= ChkFilesFailed; + Workers.Finished -= ChkFilesFinished; + Workers.UpdateProgress -= UpdateProgress; + Workers.UpdateProgress2 -= UpdateProgress2; + Workers.AddFile -= AddFile; + Workers.AddOS -= AddOS; thdHashFiles = null; if(fileView != null) fileView.Clear(); @@ -346,12 +346,12 @@ public partial class frmAdd : Window if(thdCheckFiles != null) thdCheckFiles.Abort(); - Core.Failed -= ChkFilesFailed; - Core.Finished -= ChkFilesFinished; - Core.UpdateProgress -= UpdateProgress; - Core.UpdateProgress2 -= UpdateProgress2; - Core.AddFile -= AddFile; - Core.AddOS -= AddOS; + Workers.Failed -= ChkFilesFailed; + Workers.Finished -= ChkFilesFinished; + Workers.UpdateProgress -= UpdateProgress; + Workers.UpdateProgress2 -= UpdateProgress2; + Workers.AddFile -= AddFile; + Workers.AddOS -= AddOS; if(thdPulseProgress != null) thdPulseProgress.Abort(); @@ -530,9 +530,9 @@ public partial class frmAdd : Window Thread.Sleep(66); } }); - Core.Failed += RemoveTempFilesFailed; - Core.Finished += RemoveTempFilesFinished; - thdRemoveTemp = new Thread(Core.RemoveTempFolder); + Workers.Failed += RemoveTempFilesFailed; + Workers.Finished += RemoveTempFilesFinished; + thdRemoveTemp = new Thread(Workers.RemoveTempFolder); thdRemoveTemp.Start(); } @@ -633,9 +633,9 @@ public partial class frmAdd : Window Thread.Sleep(66); } }); - Core.Failed += RemoveTempFilesFailed; - Core.Finished += RemoveTempFilesFinished; - thdRemoveTemp = new Thread(Core.RemoveTempFolder); + Workers.Failed += RemoveTempFilesFailed; + Workers.Finished += RemoveTempFilesFinished; + thdRemoveTemp = new Thread(Workers.RemoveTempFolder); thdRemoveTemp.Start(); } else @@ -658,24 +658,24 @@ public partial class frmAdd : Window btnFolder.Visible = true; btnArchive.Visible = true; btnSettings.Sensitive = true; - Core.Failed -= FindFilesFailed; - Core.Failed -= HashFilesFailed; - Core.Failed -= ChkFilesFailed; - Core.Failed -= OpenArchiveFailed; - Core.Failed -= AddFilesToDbFailed; - Core.Failed -= PackFilesFailed; - Core.Failed -= ExtractArchiveFailed; - Core.Failed -= RemoveTempFilesFailed; - Core.Finished -= FindFilesFinished; - Core.Finished -= HashFilesFinished; - Core.Finished -= ChkFilesFinished; - Core.Finished -= OpenArchiveFinished; - Core.Finished -= AddFilesToDbFinished; - Core.Finished -= ExtractArchiveFinished; - Core.Finished -= RemoveTempFilesFinished; - Core.FinishedWithText -= PackFilesFinished; - Core.UpdateProgress -= UpdateProgress; - Core.UpdateProgress2 -= UpdateProgress2; + Workers.Failed -= FindFilesFailed; + Workers.Failed -= HashFilesFailed; + Workers.Failed -= ChkFilesFailed; + Workers.Failed -= OpenArchiveFailed; + Workers.Failed -= AddFilesToDbFailed; + Workers.Failed -= PackFilesFailed; + Workers.Failed -= ExtractArchiveFailed; + Workers.Failed -= RemoveTempFilesFailed; + Workers.Finished -= FindFilesFinished; + Workers.Finished -= HashFilesFinished; + Workers.Finished -= ChkFilesFinished; + Workers.Finished -= OpenArchiveFinished; + Workers.Finished -= AddFilesToDbFinished; + Workers.Finished -= ExtractArchiveFinished; + Workers.Finished -= RemoveTempFilesFinished; + Workers.FinishedWithText -= PackFilesFinished; + Workers.UpdateProgress -= UpdateProgress; + Workers.UpdateProgress2 -= UpdateProgress2; btnStop.Visible = false; if(fileView != null) fileView.Clear(); @@ -698,8 +698,8 @@ public partial class frmAdd : Window thdPulseProgress.Abort(); thdPulseProgress = null; } - Core.Failed -= RemoveTempFilesFailed; - Core.Finished -= RemoveTempFilesFinished; + Workers.Failed -= RemoveTempFilesFailed; + Workers.Finished -= RemoveTempFilesFinished; Context.path = null; Context.tmpFolder = null; RestoreUI(); @@ -715,8 +715,8 @@ public partial class frmAdd : Window thdPulseProgress.Abort(); thdPulseProgress = null; } - Core.Failed -= RemoveTempFilesFailed; - Core.Finished -= RemoveTempFilesFinished; + Workers.Failed -= RemoveTempFilesFailed; + Workers.Finished -= RemoveTempFilesFinished; Context.path = null; Context.tmpFolder = null; RestoreUI(); @@ -744,9 +744,9 @@ public partial class frmAdd : Window chkNetinstall.Sensitive = false; chkSource.Sensitive = false; - Core.UpdateProgress += UpdateProgress; - Core.Finished += AddFilesToDbFinished; - Core.Failed += AddFilesToDbFailed; + Workers.UpdateProgress += UpdateProgress; + Workers.Finished += AddFilesToDbFinished; + Workers.Failed += AddFilesToDbFailed; Context.dbInfo.architecture = txtArchitecture.Text; Context.dbInfo.description = txtDescription.Text; @@ -781,7 +781,7 @@ public partial class frmAdd : Window Context.dbInfo.json = null; } - thdAddFiles = new Thread(Core.AddFilesToDb); + thdAddFiles = new Thread(Workers.AddFilesToDb); thdAddFiles.Start(); } @@ -794,9 +794,9 @@ public partial class frmAdd : Window if(thdPulseProgress != null) thdPulseProgress.Abort(); - Core.UpdateProgress -= UpdateProgress; - Core.Finished -= AddFilesToDbFinished; - Core.Failed -= AddFilesToDbFailed; + Workers.UpdateProgress -= UpdateProgress; + Workers.Finished -= AddFilesToDbFinished; + Workers.Failed -= AddFilesToDbFailed; long counter = 0; fileView.Clear(); @@ -831,9 +831,9 @@ public partial class frmAdd : Window if(thdPulseProgress != null) thdPulseProgress.Abort(); - Core.UpdateProgress -= UpdateProgress; - Core.Finished -= AddFilesToDbFinished; - Core.Failed -= AddFilesToDbFailed; + Workers.UpdateProgress -= UpdateProgress; + Workers.Finished -= AddFilesToDbFinished; + Workers.Failed -= AddFilesToDbFailed; ChkFilesFinished(); }); @@ -869,10 +869,10 @@ public partial class frmAdd : Window chkNetinstall.Sensitive = false; chkSource.Sensitive = false; - Core.UpdateProgress += UpdateProgress; - Core.UpdateProgress2 += UpdateProgress2; - Core.FinishedWithText += PackFilesFinished; - Core.Failed += PackFilesFailed; + Workers.UpdateProgress += UpdateProgress; + Workers.UpdateProgress2 += UpdateProgress2; + Workers.FinishedWithText += PackFilesFinished; + Workers.Failed += PackFilesFailed; Context.dbInfo.architecture = txtArchitecture.Text; Context.dbInfo.description = txtDescription.Text; @@ -902,17 +902,17 @@ public partial class frmAdd : Window Thread.Sleep(66); } }); - Core.UpdateProgress -= UpdateProgress; - Core.UpdateProgress2 -= UpdateProgress2; + Workers.UpdateProgress -= UpdateProgress; + Workers.UpdateProgress2 -= UpdateProgress2; prgProgress.Text = "Copying archive as is."; prgProgress2.Visible = false; lblProgress2.Visible = false; - thdPackFiles = new Thread(Core.CopyArchive); + thdPackFiles = new Thread(Workers.CopyArchive); thdPackFiles.Start(); } else { - thdPackFiles = new Thread(Core.CompressFiles); + thdPackFiles = new Thread(Workers.CompressFiles); thdPackFiles.Start(); } } @@ -926,10 +926,10 @@ public partial class frmAdd : Window if(thdPulseProgress != null) thdPulseProgress.Abort(); - Core.UpdateProgress -= UpdateProgress; - Core.UpdateProgress2 -= UpdateProgress2; - Core.FinishedWithText -= PackFilesFinished; - Core.Failed -= PackFilesFailed; + Workers.UpdateProgress -= UpdateProgress; + Workers.UpdateProgress2 -= UpdateProgress2; + Workers.FinishedWithText -= PackFilesFinished; + Workers.Failed -= PackFilesFailed; btnAdd.Click(); @@ -955,10 +955,10 @@ public partial class frmAdd : Window if(thdPulseProgress != null) thdPulseProgress.Abort(); - Core.UpdateProgress -= UpdateProgress; - Core.UpdateProgress2 -= UpdateProgress2; - Core.FinishedWithText -= PackFilesFinished; - Core.Failed -= PackFilesFailed; + Workers.UpdateProgress -= UpdateProgress; + Workers.UpdateProgress2 -= UpdateProgress2; + Workers.FinishedWithText -= PackFilesFinished; + Workers.Failed -= PackFilesFailed; btnAdd.Sensitive = true; btnPack.Sensitive = true; @@ -1020,10 +1020,10 @@ public partial class frmAdd : Window } }); - thdOpenArchive = new Thread(Core.OpenArchive); + thdOpenArchive = new Thread(Workers.OpenArchive); Context.path = dlgFolder.Filename; - Core.Failed += OpenArchiveFailed; - Core.Finished += OpenArchiveFinished; + Workers.Failed += OpenArchiveFailed; + Workers.Finished += OpenArchiveFinished; btnStop.Visible = true; thdPulseProgress.Start(); thdOpenArchive.Start(); @@ -1050,8 +1050,8 @@ public partial class frmAdd : Window btnFolder.Visible = true; btnArchive.Visible = true; btnSettings.Sensitive = true; - Core.Failed -= OpenArchiveFailed; - Core.Finished -= OpenArchiveFinished; + Workers.Failed -= OpenArchiveFailed; + Workers.Finished -= OpenArchiveFinished; thdOpenArchive = null; }); } @@ -1082,13 +1082,13 @@ public partial class frmAdd : Window Thread.Sleep(66); } }); - Core.Failed -= OpenArchiveFailed; - Core.Finished -= OpenArchiveFinished; + Workers.Failed -= OpenArchiveFailed; + Workers.Finished -= OpenArchiveFinished; thdOpenArchive = null; - Core.Failed += ExtractArchiveFailed; - Core.Finished += ExtractArchiveFinished; - Core.UpdateProgress2 += UpdateProgress2; - thdExtractArchive = new Thread(Core.ExtractArchive); + Workers.Failed += ExtractArchiveFailed; + Workers.Finished += ExtractArchiveFinished; + Workers.UpdateProgress2 += UpdateProgress2; + thdExtractArchive = new Thread(Workers.ExtractArchive); thdExtractArchive.Start(); }); } @@ -1111,9 +1111,9 @@ public partial class frmAdd : Window btnFolder.Visible = true; btnArchive.Visible = true; btnSettings.Sensitive = true; - Core.Failed -= ExtractArchiveFailed; - Core.Finished -= ExtractArchiveFinished; - Core.UpdateProgress2 -= UpdateProgress2; + Workers.Failed -= ExtractArchiveFailed; + Workers.Finished -= ExtractArchiveFinished; + Workers.UpdateProgress2 -= UpdateProgress2; thdExtractArchive = null; if(Context.tmpFolder != null) { @@ -1130,9 +1130,9 @@ public partial class frmAdd : Window Thread.Sleep(66); } }); - Core.Failed += RemoveTempFilesFailed; - Core.Finished += RemoveTempFilesFinished; - thdRemoveTemp = new Thread(Core.RemoveTempFolder); + Workers.Failed += RemoveTempFilesFailed; + Workers.Finished += RemoveTempFilesFinished; + thdRemoveTemp = new Thread(Workers.RemoveTempFolder); thdRemoveTemp.Start(); } }); @@ -1154,9 +1154,9 @@ public partial class frmAdd : Window btnFolder.Visible = false; btnArchive.Visible = false; btnSettings.Sensitive = false; - Core.Failed -= ExtractArchiveFailed; - Core.Finished -= ExtractArchiveFinished; - Core.UpdateProgress2 -= UpdateProgress2; + Workers.Failed -= ExtractArchiveFailed; + Workers.Finished -= ExtractArchiveFinished; + Workers.UpdateProgress2 -= UpdateProgress2; thdPulseProgress = new Thread(() => { while(true) @@ -1169,9 +1169,9 @@ public partial class frmAdd : Window } }); - thdFindFiles = new Thread(Core.FindFiles); - Core.Failed += FindFilesFailed; - Core.Finished += FindFilesFinished; + thdFindFiles = new Thread(Workers.FindFiles); + Workers.Failed += FindFilesFailed; + Workers.Finished += FindFilesFinished; btnStop.Visible = true; thdPulseProgress.Start(); thdFindFiles.Start(); diff --git a/osrepodbmgr/frmSettings.cs b/osrepodbmgr/frmSettings.cs index 3db8ac3..d0dec83 100644 --- a/osrepodbmgr/frmSettings.cs +++ b/osrepodbmgr/frmSettings.cs @@ -63,8 +63,8 @@ namespace osrepodbmgr Core.Settings.Current.DatabasePath = txtDatabase.Text; Core.Settings.Current.RepositoryPath = txtRepository.Text; Core.Settings.SaveSettings(); - Core.Core.CloseDB(); - Core.Core.InitDB(); + Core.Workers.CloseDB(); + Core.Workers.InitDB(); Context.CheckUnar(); Destroy(); } @@ -182,12 +182,12 @@ namespace osrepodbmgr void CheckUnar() { - Core.Core.FinishedWithText += CheckUnarFinished; - Core.Core.Failed += CheckUnarFailed; + Core.Workers.FinishedWithText += CheckUnarFinished; + Core.Workers.Failed += CheckUnarFailed; oldUnarPath = Core.Settings.Current.UnArchiverPath; Core.Settings.Current.UnArchiverPath = txtUnar.Text; - Thread thdCheckUnar = new Thread(Core.Core.CheckUnar); + Thread thdCheckUnar = new Thread(Core.Workers.CheckUnar); thdCheckUnar.Start(); } @@ -195,8 +195,8 @@ namespace osrepodbmgr { Application.Invoke(delegate { - Core.Core.FinishedWithText -= CheckUnarFinished; - Core.Core.Failed -= CheckUnarFailed; + Core.Workers.FinishedWithText -= CheckUnarFinished; + Core.Workers.Failed -= CheckUnarFailed; lblUnarVersion.Text = text; lblUnarVersion.Visible = true; @@ -208,8 +208,8 @@ namespace osrepodbmgr { Application.Invoke(delegate { - Core.Core.FinishedWithText -= CheckUnarFinished; - Core.Core.Failed -= CheckUnarFailed; + Core.Workers.FinishedWithText -= CheckUnarFinished; + Core.Workers.Failed -= CheckUnarFailed; if(string.IsNullOrWhiteSpace(oldUnarPath)) txtUnar.Text = "";