From a88c9000edd626cff2ba8eb595ba2572f66d0459 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 7 Jul 2025 22:46:40 +0100 Subject: [PATCH] [Refactor] Update field names in checksum packets to use properties for consistency --- RomRepoMgr.Core/Workers/Checksum.cs | 60 +++++++++---------- .../ViewModels/ImportDatFolderViewModel.cs | 18 +++--- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/RomRepoMgr.Core/Workers/Checksum.cs b/RomRepoMgr.Core/Workers/Checksum.cs index c16f0df..4656cc5 100644 --- a/RomRepoMgr.Core/Workers/Checksum.cs +++ b/RomRepoMgr.Core/Workers/Checksum.cs @@ -90,27 +90,27 @@ internal sealed class Checksum _sha384Pkt = new Sha384Packet(); _sha512Pkt = new Sha512Packet(); - _crc32Pkt.context = _crc32Ctx; - _md5Pkt.context = _md5Ctx; - _sha1Pkt.context = _sha1Ctx; - _sha256Pkt.context = _sha256Ctx; - _sha384Pkt.context = _sha384Ctx; - _sha512Pkt.context = _sha512Ctx; + _crc32Pkt.Context = _crc32Ctx; + _md5Pkt.Context = _md5Ctx; + _sha1Pkt.Context = _sha1Ctx; + _sha256Pkt.Context = _sha256Ctx; + _sha384Pkt.Context = _sha384Ctx; + _sha512Pkt.Context = _sha512Ctx; } internal void Update(byte[] data) { - _crc32Pkt.data = data; + _crc32Pkt.Data = data; _crc32Thread.Start(_crc32Pkt); - _md5Pkt.data = data; + _md5Pkt.Data = data; _md5Thread.Start(_md5Pkt); - _sha1Pkt.data = data; + _sha1Pkt.Data = data; _sha1Thread.Start(_sha1Pkt); - _sha256Pkt.data = data; + _sha256Pkt.Data = data; _sha256Thread.Start(_sha256Pkt); - _sha384Pkt.data = data; + _sha384Pkt.Data = data; _sha384Thread.Start(_sha384Pkt); - _sha512Pkt.data = data; + _sha512Pkt.Data = data; _sha512Thread.Start(_sha512Pkt); while(_crc32Thread.IsAlive || @@ -142,51 +142,51 @@ internal sealed class Checksum struct Crc32Packet { - public Crc32Context context; - public byte[] data; + public Crc32Context Context; + public byte[] Data; } struct Md5Packet { - public Md5Context context; - public byte[] data; + public Md5Context Context; + public byte[] Data; } struct Sha1Packet { - public Sha1Context context; - public byte[] data; + public Sha1Context Context; + public byte[] Data; } struct Sha256Packet { - public Sha256Context context; - public byte[] data; + public Sha256Context Context; + public byte[] Data; } struct Sha384Packet { - public Sha384Context context; - public byte[] data; + public Sha384Context Context; + public byte[] Data; } struct Sha512Packet { - public Sha512Context context; - public byte[] data; + public Sha512Context Context; + public byte[] Data; } - static void UpdateCrc32(object packet) => ((Crc32Packet)packet).context.Update(((Crc32Packet)packet).data); + static void UpdateCrc32(object packet) => ((Crc32Packet)packet).Context.Update(((Crc32Packet)packet).Data); - static void UpdateMd5(object packet) => ((Md5Packet)packet).context.Update(((Md5Packet)packet).data); + static void UpdateMd5(object packet) => ((Md5Packet)packet).Context.Update(((Md5Packet)packet).Data); - static void UpdateSha1(object packet) => ((Sha1Packet)packet).context.Update(((Sha1Packet)packet).data); + static void UpdateSha1(object packet) => ((Sha1Packet)packet).Context.Update(((Sha1Packet)packet).Data); - static void UpdateSha256(object packet) => ((Sha256Packet)packet).context.Update(((Sha256Packet)packet).data); + static void UpdateSha256(object packet) => ((Sha256Packet)packet).Context.Update(((Sha256Packet)packet).Data); - static void UpdateSha384(object packet) => ((Sha384Packet)packet).context.Update(((Sha384Packet)packet).data); + static void UpdateSha384(object packet) => ((Sha384Packet)packet).Context.Update(((Sha384Packet)packet).Data); - static void UpdateSha512(object packet) => ((Sha512Packet)packet).context.Update(((Sha512Packet)packet).data); + static void UpdateSha512(object packet) => ((Sha512Packet)packet).Context.Update(((Sha512Packet)packet).Data); #endregion Threading helpers } \ No newline at end of file diff --git a/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs b/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs index b84f09a..4d22d2d 100644 --- a/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs +++ b/RomRepoMgr/ViewModels/ImportDatFolderViewModel.cs @@ -303,15 +303,15 @@ public sealed class ImportDatFolderViewModel : ViewModelBase StatusMessage = string.Format(Localization.ImportingItem, Path.GetFileName(_datFiles[_listPosition])); ProgressValue = _listPosition; - var _worker = new DatImporter(_datFiles[_listPosition], Category); - _worker.ErrorOccurred += OnWorkerOnErrorOccurred; - _worker.SetIndeterminateProgress += OnWorkerOnSetIndeterminateProgress; - _worker.SetMessage += OnWorkerOnSetMessage; - _worker.SetProgress += OnWorkerOnSetProgress; - _worker.SetProgressBounds += OnWorkerOnSetProgressBounds; - _worker.WorkFinished += OnWorkerOnWorkFinished; - _worker.RomSetAdded += RomSetAdded; - _ = Task.Run(_worker.Import); + var worker = new DatImporter(_datFiles[_listPosition], Category); + worker.ErrorOccurred += OnWorkerOnErrorOccurred; + worker.SetIndeterminateProgress += OnWorkerOnSetIndeterminateProgress; + worker.SetMessage += OnWorkerOnSetMessage; + worker.SetProgress += OnWorkerOnSetProgress; + worker.SetProgressBounds += OnWorkerOnSetProgressBounds; + worker.WorkFinished += OnWorkerOnWorkFinished; + worker.RomSetAdded += RomSetAdded; + _ = Task.Run(worker.Import); } void OnWorkerOnWorkFinished(object sender, MessageEventArgs args) => Dispatcher.UIThread.Post(() =>