develop #1

Open

maddo wants to merge 126 commits from develop into master

pull from: develop

merge into: maddo:master

maddo:master

Conversation 0 Commits 126 Files changed 345 +16644 -99279

maddo commented 2026-05-26 20:01:42 +00:00

Owner

Copy link

No description provided.

maddo added 122 commits 2026-05-26 20:01:45 +00:00

Added gitversion 058b573d48

Added gitversion msbuild task 388b9acf32

Reupdated projects 328d7da303

Updated project versions 2293c4f9e1

Added dependency injection 39a9baf5c6

Updated version a1c950734a

Added viewmodel efbc9f91db

Initialized ViewModel d3327089ff

Binding Commands 22f7143d6e

Bound UI Enabled 4e4a59b0b2

Upgraded to .NET 9 8048c41cd0

Errors fix, removed old library, Added logging d8d8b152bd

Added configuration file 1b78b245d1

optimizations b98623f092

Dispose images 55713c340b

Version number 22cf884d4d

Preload logo ce347a7095

Removed visual basic from main form 33d397d67a

Removed old code af987f840d

Updated libraries and made horizontal text property 65aeabdfee

Removed visual basic lib dependency ab33d4558f

Removed visual basic lib from project 4ceb46d65c

modernized picsettings 63aac7f911

Cleaned up old code a21522a916

Deleted projects 1b1ca37310

Removed outdated module 2fde30572b

Refactored image creator code fa889a5cd3

Race time fix abdd2a313a

Override mode fix 12d1bd57dc

Version Bump 5d21d3f8ef

Clean up 1cd71c54fc

Async stop 80fcaa6fd0

Formatting a466efbb27

Chunks and threads in model 764a439645

Fixed threads and chunk loading error 2b195946e3

Modernized xml reading and saving c722d39eb1

Removed comment a076f6b8fb

Refactoring, upgrades and improvements to memory usage cfbc6334b6

Added unit tests 0c1bb50dce

Migration to MVVM 1db874ce77

Update library and fixes d73389d791

Fixes to settings fc7175c2f7

Fixes and mapping ba965e8266

Enhance image processing performance and flexibility by introducing atomic counters, improving file pattern matching, and refining logo positioning logic. 68c1106f65

Update test project SDK, add assessment, bump submodule ... 39b0904a72

- Switched MaddoShared.Tests.csproj to Microsoft.NET.Sdk, added explicit MSTest and test SDK package references, and upgraded Microsoft.Extensions.Logging.Abstractions to 10.0.2.
- Added assessment.csv, assessment.json, and assessment.md with detailed .NET 10.0 compatibility analysis.
- Updated MaddoLibrary submodule reference (now marked as dirty).

Add image processing benchmarks and UI folder open buttons ... c2fd4bf780

- Added MaddoShared.Benchmarks project with BenchmarkDotNet for comprehensive image processing performance tests (parallel, chunk, size, stress).
- Included helper for generating test images and custom configs to ensure InProcess toolchain for .NET Windows compatibility.
- Added cross-platform scripts to run benchmarks easily.
- Updated .gitignore for benchmark artifacts and temp files.
- Exposed GetFilesToProcessPublic in ImageCreationStuff for testability.
- Added file name sanitization in ImageCreatorSharp to prevent IO errors.
- Enhanced WinForms UI: added "Open" buttons for source/destination folders, handled folder opening in Explorer, and improved user messaging and layout.
- Updated solution file to include new benchmark project.

Improve speed stats, UI usability, and settings persistence ... 6ccbec890a

Enhanced speed counter with smoothing and elapsed time display.
Added folder open buttons to UI and repositioned speed label.
Added UpdateSubdirectories to settings for persistence.

Persist last-used dialog folders in user preferences ... 5cb491f1b5

Dialogs now remember last-used folders for source, destination, logo, and settings files by storing these paths in a user preferences file under LocalApplicationData. Preferences are saved on form close, reducing unnecessary writes. SettingsService now uses a temporary ParametriSetup for settings files to avoid polluting user preferences. Error handling ensures preference save failures do not disrupt the user. This separation improves user experience and keeps user preferences distinct from project settings.

Integrate GitVersion and add version provider abstraction ... 509d5357a8

- Added GitVersion for semantic versioning and build metadata
- Introduced IVersionProvider and VersionProvider for UI-friendly version display
- MainForm now uses IVersionProvider for version label
- Registered VersionProvider in DI container
- Improved logging: filtered out AutoMapper license logs
- General code cleanup in Program.cs

Modernize versioning and display in app and build output ... 69fdf01de3

- Switch to explicit "3.2.0" next-version in GitVersion.yml
- Update NuGet packages and set assembly name to "ImageCatalog"
- Add MSBuild target to rename published exe with year and version
- Add AppVersion property to DataModel, set via IVersionProvider
- Replace static version label with data-bound versionLabel in UI
- Remove manual version label logic from MainForm
- Update DI to inject IVersionProvider into DataModel
- Ensures UI always shows correct version and builds are versioned

Prefer GitVersion values for assembly and publish versioning ... a00ab074c4

Enhance versioning by prioritizing GitVersion output for assembly, file, and informational versions. Add fallback MSBuild target to run GitVersion CLI in Visual Studio builds. Update publish rename logic to use FullSemVer and improve version normalization for artifact naming.

Add IImageCreator abstraction and runtime provider selection ... e48c0d266b

Introduce IImageCreator interface for image creation, and update ImageCreatorSharp to implement it. Add ImageCreatorAlternate (adapter) and ImageCreatorMapper (runtime selector) classes. Extend PicSettings with ImageCreatorProvider to control backend selection. Update DI registrations and refactor ImageCreationStuff to depend on IImageCreator, enabling backend switching via configuration.

Add selectable image library option and refactor processing ... 63751af18d

Introduce UI option to choose between System.Graphics and ImageSharp for image processing. Update DataModel and MainForm for robust binding and synchronization. Rewrite ImageCreatorAlternate to use ImageSharp for core operations and GDI+ for overlays. Remove test buttons, add radio group for library selection. Update project dependencies to support new features and modernize image handling.

Add color-key transparency support for logo overlays ... 8872080741

- Allow users to select a transparent color for logo images (watermarks) via UI (checkbox, color picker, preview).
- Apply color-key transparency in both System.Drawing and ImageSharp backends: specified color in logo is made fully transparent.
- Persist transparency settings in PicSettings and SettingsDto; bind to DataModel and UI controls.
- Update logo preview to reflect transparency in real time.
- Add option to select image processing library (System.Drawing or ImageSharp) in UI and settings.
- Fix bug in SettingsService parameter loading for int/double/DateTime.
- Fully integrate color-key transparency into image processing and settings serialization.

Add WPF UI alongside WinForms; improve cancellation logic ... 10cc574acb

Introduced MainWindow.xaml and code-behind for a modern WPF interface with tabbed settings. Enabled WPF in project file. Refactored startup to launch WPF or WinForms UI based on availability. Registered WPF MainWindow in DI. Improved DataModel cancellation to be synchronous and log exceptions. Minor logging and comment updates. App now supports both WPF and WinForms frontends.

Add AI/OCR extraction feature with UI and CSV export ... 6a5173a20d

Integrates optional AI/OCR (AIFotoONLUS.Core) support to extract numbers from images after processing. Adds new "AI" tab in the UI for enabling extraction, selecting models folder, specifying CSV output, and previewing results. Results can be exported to CSV. Uses reflection for AI library invocation, with fallback simulation if unavailable. Persists new AI settings. Updates related NuGet packages and adds theme resources.

Mutually exclusive thumbnail mode selection in UI ... 214e540170

Implement mutually exclusive logic for thumbnail display modes in DataModel and MainForm. Add ThumbnailMode property for authoritative state. Replace radio button bindings with event handlers. Synchronize UI with model changes. Explicitly map thumbnail flags to PicSettings. Force WinForms startup, disabling WPF branch.

Refactor thumbnail options to enum and ComboBox UI ... d13ec8abdf

Replaced multiple mutually-exclusive boolean properties for thumbnail text options with a single enum (`ThumbnailOption`) in the data model. Updated WinForms UI to use a ComboBox instead of radio buttons for selecting thumbnail mode. Adjusted designer, mapping profile, settings DTO, and settings service for enum support and backward compatibility. Simplified thumbnail generation logic and improved maintainability by ensuring only one mode can be selected at a time.

Switch to MinVer, add CI/CD, unify thumbnail options ... da9d9875b0

- Add .gitlab-ci.yml for Windows CI/CD: build, publish, and GitLab Release with artifact upload
- Replace GitVersion.MsBuild with MinVer for versioning; update all versioning logic in .csproj
- Remove GitVersion CLI fallback for Visual Studio builds
- Update post-publish renaming to use MinVer's Version property
- Replace multiple thumbnail text checkboxes with a single ComboBox selector in MainWindow.xaml
- Change default UI startup: prefer WPF MainWindow, fallback to WinForms MainForm

Updated runner 16aff04ccd

Added windows runner b6455a4bcb

Fixed shared runner tag 3898c002f2

Install .net sdk 10 on runner 90c50358d1

Added variables for nuget 38cf61ab33

Update NuGet source config and add packageSourceMapping ... e556d74fd1

Renamed the private NuGet source from 'GitLab' to 'Nuget-GitLab-AIFotoONLUS' in CI scripts for clarity and consistency. Added a repository-level NuGet.Config with packageSourceMapping to ensure only specific private packages are restored from the GitLab feed, preventing 401 errors when restoring public packages from nuget.org.

Changed nuget credentials to the CI token c8d6258556

Update NuGet auth to use CI_JOB_TOKEN in CI scripts ... 4569e001c8

Switched private NuGet source authentication in build_windows and publish_release jobs to use CI_JOB_TOKEN instead of NUGET_USERNAME/NUGET_PASSWORD. Updated related log messages and ensured PowerShell variable usage is correct for environment variables. This improves compatibility with GitLab CI best practices.

Support NuGet auth fallback and add feed diagnostics ... 8db7ee8075

Enhance private NuGet source setup in build_windows and publish_release jobs to support fallback authentication using NUGET_USERNAME/NUGET_PASSWORD when CI_JOB_TOKEN is unavailable. Update log messages for clarity. Add diagnostic steps in build_windows to verify NuGet feed and package visibility using configured credentials. No changes to core build or publish logic.

Improve multi-line text, logo, and version display ... f4893a39e9

- Enhance ImageCreatorAlternate to support multi-line text rendering with correct sizing, spacing, and shadow for each line.
- Only draw logos on non-thumbnail images to match GDI behavior.
- Add a status bar to MainWindow showing the app version at runtime.
- Upgrade MinVer to 7.0.0 and adjust versioning to avoid WPF/XAML assembly identity issues.
- Refactor XAML layout to accommodate the new status bar.

Remove EXIF orientation tag after image processing ... bbda970d57

Ensures EXIF orientation is cleared when cloning and after rotation,
preventing incorrect display in EXIF-aware viewers. Failures are
logged as debug messages without interrupting processing.

Improve text overlay for rotated and multi-line images ... 7e1ca95a25

- Use vertical text variant (TestoFirmaV) for rotated images to ensure correct orientation of overlays.
- Adjust font sizing logic for multi-line text to better fit within image bounds, accounting for line count and spacing.
- Set rotation flags (FotoRuotaADestra, FotoRuotaASinistra) before drawing text, enabling correct text variant selection.
- Ensure vertical text field is initialized from settings for consistent behavior.

Center each text line individually when drawing on image ... 4091fb78c5

Updated text rendering logic to center each line horizontally
based on its estimated width, ensuring multi-line text is
visually centered. Previously, all lines were drawn at a fixed
horizontal position. Both shadow and main text now use the
calculated centered position.

Renamed image creators c70ab9e5de

Add Material icons to UI and refactor theme resources ... ec4635a37f

Integrated MahApps.Metro.IconPacks for Material icons in tab headers and buttons, enhancing visual clarity and user experience. Refactored resource dictionary to define theme brushes at the top level for easier theme switching. All button content now combines icons and text for a more modern interface. No functional changes; UI/UX improvements only.

Upgrade UI to MahApps.Metro with runtime theming ... 9007a27fb2

Modernize WPF UI using MahApps.Metro: switch MainWindow to MetroWindow, add MetroTabControl/MetroTabItem, custom tab styles, and icon-based theme toggle. Move version display to window commands. Integrate MahApps resource dictionaries and ThemeManager for runtime theme switching. Update startup logic for proper theming. WinForms fallback retained.

Refactor UI: reorganize options and improve color picker ... 67f207c05b

- Moved "Create Thumbnails" checkbox to the Thumbnails section.
- Relocated "Add Time" and "Add Race Time" controls to a new "Tempo Gara" section in the text options area.
- Enabled multiline input and wrapping for the Vertical Text box.
- Replaced text color selection with MahApps ColorPicker for better UX.
- Moved "Select Transparent Color" button to the logo options section.
- Made minor UI layout improvements for clarity.

Support UI selection via --wpf command-line argument ... d068b4b3e1

Refactored Program.cs to accept command-line arguments and select between WinForms (default) and WPF UI based on the presence of --wpf. Removed old commented-out UI selection code. Updated launchSettings.json to provide separate profiles for WinForms and WPF launches. If WPF is requested but unavailable, the app falls back to WinForms.

Update CI configuration and assembly information; remove log file and add logo image 900e8b6bf8

Refactor CI pipeline for GitLab: streamline publish_release job and improve artifact handling f8d4687a97

Removed tags only from publish job 1bb0176c92

Add minversion file generation to build output for downstream jobs 335da52abf

Refactor CI pipeline: replace minversion file generation with single-file publish for downstream jobs 3a964bbbcf

Made trimmed false 93413b0fe9

Enhance publish_release job: export version and add release metadata for automated releases 3ae4da3e49

Add Avalonia UI frontend alongside WinForms and WPF ... 311b3e76f0

Introduce Avalonia as a new cross-platform UI option, including new XAML and code-behind files for the application and main window. Update Program.cs to support a --avalonia launch argument and add corresponding launch profile. Integrate Avalonia NuGet packages and ensure DataModel supports UI-thread invocation for all frontends. All business logic and state are shared via DI, enabling consistent behavior across WinForms, WPF, and Avalonia.

Cross-platform: remove System.Drawing deps, add #if WINDOWS ... 73597689ed

Refactored image creation APIs to use byte[] for logo data instead of System.Drawing.Image, enabling cross-platform support. Wrapped all GDI+/Windows-specific code in #if WINDOWS and updated project files to conditionally include Windows-only dependencies. Defaulted to ImageSharp on non-Windows, and updated UI and settings to reflect platform capabilities. Application now builds and runs on Linux/macOS with Avalonia and ImageSharp, while retaining full Windows functionality.

Removed old projects 775080a178

Added avalonia integration and remote proof of concept 4a0973b681

feat: Add race upload functionality and file transfer endpoints ... 15b1da4371

- Implemented IRaceUploadCommunicationClient with methods for saving races, creating race points, indexing race points, retrieving race details, and uploading files to the receiver.
- Added ReceiveFilePath option to CatalogCommunicationOptions for file transfer configuration.
- Enhanced CatalogCommunicationServiceCollectionExtensions to validate ReceiveFilePath.
- Developed RaceUploadCommunicationClient to handle race-related API interactions, including saving race data and uploading processed images.
- Updated API documentation to reflect new race upload and file transfer endpoints.
- Modified Avalonia UI to support race creation and processed image uploads, including new input fields and buttons.
- Introduced RaceSaveRequest and ReceiveFileUploadRequest models for structured data handling.

feat: Implement Face AI functionality and race upload settings in Avalonia UI 6cf0c029fc

Add new tab views for image catalog functionality ... 90fb03bf0c

- Implement GeneralTabView for source and destination path settings, options, processing parameters, and image library selection.
- Create LogoTabView for logo selection, preview, and positioning options.
- Add PhotoTabView for photo dimensions and JPEG quality settings.
- Introduce RaceUploadTabView for race setup and processed photo upload functionality, including API integration.
- Develop TextTabView for horizontal and vertical text settings, font options, and race time configuration.
- Implement ThumbnailsTabView for thumbnail creation options and settings.

Implement ImageCreatorImageSharp using SixLabors.ImageSharp for image processing ... d62342aae1

- Added ImageCreatorImageSharp class for image creation, handling EXIF orientation, resizing, and saving images.
- Replaced GDI+ dependencies with ImageSharp for cross-platform compatibility.
- Introduced methods for drawing text and logos on images, including handling transparency and positioning.
- Created a test plan for validating ImageCreatorImageSharp functionality, focusing on image resizing, text positioning, logo features, and EXIF orientation.
- Added documentation for the test plan outlining goals, project structure, and implementation notes.

feat: Update Avalonia UI with new tab icons and styles; upgrade AutoMapper and Avalonia packages e80b427fcc

feat: Enhance Avalonia UI with compact styles and improved layout for various views; adjust margins and paddings for a denser interface b29cc95a1e

feat: Refactor RaceUploadCommunicationClient and RaceUploadTabView to improve HttpClient management and resource disposal bdf503c627

feat: Add AI extraction service and related view models ... 3c722a66df

- Introduced `IAiExtractionService` and its implementation `AiExtractionService` for processing images and extracting text.
- Created `AiResultItem` model to hold results from AI extraction.
- Added `ImageProcessingCoordinator` to manage image processing tasks and provide progress updates.
- Implemented view models for AI settings, path settings, processing state, race upload settings, and visual settings to support UI binding.
- Updated `Program.cs` to register new services and dependencies.
- Modified project file to skip MinVer execution during local builds.

feat: Replace Moq and FluentAssertions with NSubstitute and Shouldly in test projects 41d9dacfac

feat: Update FaceAiTabView to support output file selection and validation for .pkl files fa09f7c324

feat: Enhance UI with new styles, improved layout, and icon integration across various views 901dc02ca8

feat: Update Microsoft.Extensions packages to version 10.0.5 for improved functionality and stability b194a2424c

Merge branch 'avalonia' into 'develop' ... 0d6435520b

Enhance image processing performance and flexibility by introducing atomic...

See merge request MaddoScientisto/Catalog!2

feat: Add build workflow for Windows Avalonia with Docker support 3ddaf31340

feat: Enhance Windows Avalonia build workflow with NuGet source validation and configuration daf3b5ad2c

feat: Implement face encoder functionality with GPU support and recursive option 988a3d94e1

Refactor application to remove Windows Forms dependencies and transition to Avalonia UI ... d6b778a648

- Deleted MainWindow.xaml.cs, which contained the WPF implementation of the main window.
- Updated Program.cs to remove Windows Forms initialization and support only Avalonia UI.
- Removed Windows Forms specific code from ViewModelBase, including control marshalling logic.

feat: Add face encoder settings including GPU support, parallelism, and thumbnail options 25fdb82d2f

AI Pettorali cb41c42bb5

feat: Add support for thumbnail inclusion in AI processing and enhance UI bindings 7e105e3738

CUDA build 4230300518

feat: Implement AI workload settings and enhance AI processing summaries 88c193549f

feat: Update GPU worker allocation for improved performance in AI extraction 48d6af13da

feat: Enhance AI extraction summaries and worker allocation for GPU support f57dc1edba

feat: Add Face Matcher functionality and related settings ... c261557a29

- Implemented FilePathToBitmapConverter for image loading.
- Enhanced DataModel with commands and properties for Face Matcher.
- Created FaceMatcherResultItem model to store results.
- Updated SettingsDto to include Face Matcher paths and tolerance.
- Introduced PickerPreferenceService for managing folder paths.
- Expanded AiSettingsViewModel to manage Face Matcher settings and results.

feat: Update .gitignore and project file to include TestArtifacts and local CUDA libraries for publish 5511817896

Local build fix 55e8f0face

feat: Update package references and enhance AI extraction service with CSV output functionality af74c90ce7

feat: Add GPU support options and enhance UI for Face Encoder and Matcher functionalities 6e05869b04

feat: Implement AI CSV overwrite confirmation and update CSV output path based on destination f3ac1ea920

Refactor path handling in UI components ... 398cfa310e

- Removed redundant folder and file opening methods from AiTabView and FaceAiTabView.
- Introduced PathPickerField control to streamline path selection and opening functionality across multiple views.
- Updated FaceAiTabView and GeneralTabView to utilize PathPickerField for source and destination path selection.
- Created PathShellService to encapsulate logic for opening paths in the file explorer.
- Simplified XAML structure by replacing manual grid definitions with PathPickerField components.
- Removed unused namespaces and cleaned up code for better readability and maintainability.

Catalog Lite 181229aa41

fix: Add paths-ignore for CatalogLite in Windows Avalonia build workflow 50f0209eb9

feat: Update build workflows for Catalog Lite and Windows Avalonia with improved input types and release handling 3fea86fa78

maddo added 1 commit 2026-05-26 20:08:21 +00:00

fix: downgrade actions/upload-artifact and actions/download-artifact to v3 in workflows 64525f5ead

maddo added 1 commit 2026-05-26 20:33:48 +00:00

feat: Enhance Catalog Lite expiration handling and improve Italian localization 03dfe0f3a1

maddo added 2 commits 2026-05-28 18:27:11 +00:00

feat: Update build configuration and dependencies for Catalog Lite, including executable naming and validation improvements ddf47ad51b

Completely removed GDI d76e133f18

Some checks failed

Hide all checks

Build Windows Avalonia / build (push) Failing after 1m47s

Details

This pull request has changes conflicting with the target branch.

• CatalogVbLib/CatalogVbLib.vbproj
• MaddoShared/MaddoShared.csproj
• imagecatalog/Form1.cs
• imagecatalog/ImageCatalog 2.csproj

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin develop:develop

git switch develop

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff develop

git switch develop

git rebase master

git switch master

git merge --ff-only develop

git switch develop

git rebase master

git switch master

git merge --no-ff develop

git switch master

git merge --squash develop

git switch master

git merge --ff-only develop

git switch master

git merge develop

git push origin master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

maddo/Catalog!1

No description provided.