From a466efbb27dcb5556ad952846f9d7cde255d2d20 Mon Sep 17 00:00:00 2001 From: Marco Date: Tue, 29 Jul 2025 11:10:54 +0200 Subject: [PATCH] Formatting --- MaddoShared/ImageCreationStuff.cs | 20 +++++++++++--------- imagecatalog/DataModel.cs | 18 +++++++++--------- imagecatalog/MainForm.cs | 5 ++--- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/MaddoShared/ImageCreationStuff.cs b/MaddoShared/ImageCreationStuff.cs index a6e08c4..e437d23 100644 --- a/MaddoShared/ImageCreationStuff.cs +++ b/MaddoShared/ImageCreationStuff.cs @@ -15,7 +15,10 @@ using Microsoft.Extensions.Logging; namespace MaddoShared { [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility")] - public class ImageCreationStuff(ILogger logger, PicSettings picSettings, ImageCreatorSharp imageCreatorService) + public class ImageCreationStuff( + ILogger logger, + PicSettings picSettings, + ImageCreatorSharp imageCreatorService) { public class Options { @@ -59,19 +62,19 @@ namespace MaddoShared // int threads = options.MaxThreads == 0 ? Environment.ProcessorCount * 2 : options.MaxThreads; int threads = options.MaxThreads; - + Bitmap logoBmp = null; // Load Logo if (picSettings.LogoAggiungi & File.Exists(picSettings.LogoNomeFile)) { logoBmp = new Bitmap(picSettings.LogoNomeFile); } - + Func processFile = async fileData => { using var logoCopy = logoBmp.Clone(new Rectangle(0, 0, logoBmp.Width, logoBmp.Height), logoBmp.PixelFormat); - + var imgState = new ImageState { WorkFile = fileData.File, @@ -79,10 +82,10 @@ namespace MaddoShared }; await imageCreatorService.CreaImmagineThread(imgState, logoCopy); - + // using var imgCreator = new ImageCreatorSharp(fileData.File, fileData.Directory, picSettings); // await imgCreator.CreaImmagineThread(fileData.File.Name, logoCopy); - + results.Add(fileData.File.Name); try @@ -118,7 +121,7 @@ namespace MaddoShared maxDegreeOfParallelism: threads, false, cancellationToken); - + chunk.Clear(); GC.Collect(GC.MaxGeneration, GCCollectionMode.Forced, blocking: false, compacting: false); } @@ -132,7 +135,6 @@ namespace MaddoShared { logger.LogError(e, "Error in disposing the logo"); } - } private List GetFilesToProcess(Options options) @@ -171,7 +173,7 @@ namespace MaddoShared destFolderInfo.EnsureDirectoryExists(); return new FileData(fInfo, new DirectoryInfo(new FileInfo(newFilePath).DirectoryName)); - + // var destDir = new FileInfo(newFilePath).Directory!; // destDir.Create(); // Ensure exists // diff --git a/imagecatalog/DataModel.cs b/imagecatalog/DataModel.cs index 97e405e..ad06cd2 100644 --- a/imagecatalog/DataModel.cs +++ b/imagecatalog/DataModel.cs @@ -14,16 +14,16 @@ namespace ImageCatalog_2 { public class DataModel : ViewModelBase { - public ICommand TestCommand { get; } public ICommand AsyncTestCommand { get; } public ICommand AsyncCancelOperationCommand { get; } - + public ICommand ProcessImagesCommand { get; } private readonly ITestService _service; - private readonly ILogger _logger; + private readonly ILogger _logger; + public DataModel(ITestService testService, ILogger logger) { _service = testService; @@ -32,7 +32,7 @@ namespace ImageCatalog_2 TestCommand = new RelayCommand(Test); AsyncTestCommand = new AsyncCommand(TestAsync); AsyncCancelOperationCommand = new AsyncCommand(CancelOperation); - + ProcessImagesCommand = new AsyncCommand(ProcessImages); } @@ -61,6 +61,7 @@ namespace ImageCatalog_2 } private string _destinationPath; + public string DestinationPath { get => _destinationPath; @@ -82,8 +83,9 @@ namespace ImageCatalog_2 NotifyPropertyChanged(); } } - + private string _verticalText; + public string VerticalText { get => _verticalText; @@ -117,7 +119,7 @@ namespace ImageCatalog_2 NotifyPropertyChanged(); } } - + public bool UiDisabled => !_uiEnabled; private string _speedCounter = "-"; @@ -145,7 +147,6 @@ namespace ImageCatalog_2 private async Task ProcessImages() { - } private async Task CancelOperation() @@ -162,6 +163,5 @@ namespace ImageCatalog_2 _logger.LogInformation("Ignora questo errore"); } } - } -} +} \ No newline at end of file diff --git a/imagecatalog/MainForm.cs b/imagecatalog/MainForm.cs index b51b05b..8b6afbd 100644 --- a/imagecatalog/MainForm.cs +++ b/imagecatalog/MainForm.cs @@ -113,7 +113,7 @@ public partial class MainForm SetText(Label10, args.Item1); SetText(lblFotoTotaliNum, args.Item2.ToString()); } - + private bool WaterSelectColor = false; // Private ContaFotoCuori As Integer @@ -896,8 +896,7 @@ public partial class MainForm { _logger.LogInformation("Avvio elaborazione..."); lockUI(); - // Dim timeStart As Date - // Dim timeStop As Date + Model.MainToken?.Dispose(); Model.MainToken = new CancellationTokenSource(); var token = Model.MainToken.Token;