develop #1

Open
maddo wants to merge 126 commits from develop into master
3 changed files with 22 additions and 21 deletions
Showing only changes of commit a466efbb27 - Show all commits

Formatting

Marco 2025-07-29 11:10:54 +02:00

View file

@ -15,7 +15,10 @@ using Microsoft.Extensions.Logging;
namespace MaddoShared
{
[SuppressMessage("Interoperability", "CA1416:Validate platform compatibility")]
public class ImageCreationStuff(ILogger<ImageCreationStuff> logger, PicSettings picSettings, ImageCreatorSharp imageCreatorService)
public class ImageCreationStuff(
ILogger<ImageCreationStuff> 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<FileData, Task> 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<FileData> 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
//

View file

@ -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<DataModel> _logger;
private readonly ILogger<DataModel> _logger;
public DataModel(ITestService testService, ILogger<DataModel> 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");
}
}
}
}
}

View file

@ -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;