From 20a285a6494594bf0c1ed6b3145935777b0886f5 Mon Sep 17 00:00:00 2001
From: ismailbennani <ismail.lahkim.bennani@gmail.com>
Date: Sat, 22 Mar 2025 11:36:13 +0100
Subject: [PATCH 1/4] try commandlineparser

---
 FacturXDotNet.CLI/Extract/ExtractCommand.cs |  11 ++
 FacturXDotNet.CLI/Extract/ExtractOption.cs  |  26 ++++
 FacturXDotNet.CLI/Program.cs                | 138 +++++++-------------
 FacturXDotNet.sln.DotSettings.user          |   1 +
 FacturXDotNet/FacturXDotNet.csproj          |   1 +
 5 files changed, 88 insertions(+), 89 deletions(-)
 create mode 100644 FacturXDotNet.CLI/Extract/ExtractCommand.cs
 create mode 100644 FacturXDotNet.CLI/Extract/ExtractOption.cs

diff --git a/FacturXDotNet.CLI/Extract/ExtractCommand.cs b/FacturXDotNet.CLI/Extract/ExtractCommand.cs
new file mode 100644
index 00000000..0de3cfde
--- /dev/null
+++ b/FacturXDotNet.CLI/Extract/ExtractCommand.cs
@@ -0,0 +1,11 @@
+namespace FacturXDotNet.CLI.Extract;
+
+static class ExtractCommand
+{
+    public static async Task RunAsync(ExtractOption options)
+    {
+        Console.WriteLine($"Extracting {options.Path}...");
+        Console.WriteLine($"CII {options.CiiPath ?? "(null)"}...");
+        Console.WriteLine($"XMP {options.XmpPath ?? "(null)"}...");
+    }
+}
diff --git a/FacturXDotNet.CLI/Extract/ExtractOption.cs b/FacturXDotNet.CLI/Extract/ExtractOption.cs
new file mode 100644
index 00000000..74f99d24
--- /dev/null
+++ b/FacturXDotNet.CLI/Extract/ExtractOption.cs
@@ -0,0 +1,26 @@
+using CommandLine;
+
+namespace FacturXDotNet.CLI.Extract;
+
+[Verb("extract", HelpText = "Extracts the content of a Factur-X PDF.")]
+class ExtractOption
+{
+    const string ExtractionTargetGroupName = "Extraction target";
+
+    [Value(0, MetaName = "PATH", Required = true, HelpText = "The path to the Factur-X PDF.")]
+    public string Path { get; set; } = string.Empty;
+
+    [Option(
+        "cii",
+        Group = ExtractionTargetGroupName,
+        HelpText = "Extracts the content of the CII XML. Optionally specify a path, otherwise the CII XML will be saved next to the PDF with the same name."
+    )]
+    public string? CiiPath { get; set; }
+
+    [Option(
+        "xmp",
+        Group = ExtractionTargetGroupName,
+        HelpText = "Extracts the content of the XMP metadata. Optionally specify a path, otherwise the XMP metadata will be saved next to the PDF with the same name."
+    )]
+    public string? XmpPath { get; set; }
+}
diff --git a/FacturXDotNet.CLI/Program.cs b/FacturXDotNet.CLI/Program.cs
index 07f2d533..d0a54ecf 100644
--- a/FacturXDotNet.CLI/Program.cs
+++ b/FacturXDotNet.CLI/Program.cs
@@ -1,14 +1,8 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using FacturXDotNet;
-using FacturXDotNet.CLI;
-using FacturXDotNet.Models;
-using FacturXDotNet.Parsing;
-using FacturXDotNet.Parsing.CII;
-using FacturXDotNet.Parsing.XMP;
-using FacturXDotNet.Validation;
-using FacturXDotNet.Validation.BusinessRules;
-using Microsoft.Extensions.Configuration;
+using System.Diagnostics;
+using System.Reflection;
+using CommandLine;
+using CommandLine.Text;
+using FacturXDotNet.CLI.Extract;
 using Microsoft.Extensions.Logging;
 using Serilog;
 using Serilog.Extensions.Logging;
@@ -21,99 +15,65 @@
 
 try
 {
-    SourceGenerationContext sourceGenerationContext =
-        new(new JsonSerializerOptions(JsonSerializerDefaults.Web) { WriteIndented = true, Converters = { new JsonStringEnumConverter() } });
-
-    IConfigurationRoot configuration = new ConfigurationBuilder().AddEnvironmentVariables().Build();
-    Options options = configuration.Get<Options>() ?? new Options();
-    string environment = options.Environment ?? string.Empty;
-
-    await using FileStream example = File.OpenRead(@"D:\source\repos\FacturXDotNet\FacturXDotNet.CLI\Examples\Facture_F20220023-LE_FOURNISSEUR-POUR-LE_CLIENT_MINIMUM.pdf");
-
-    FacturXParser parser = new(
-        new FacturXParserOptions
+    Parser parser = new(
+        settings =>
         {
-            Xmp =
-            {
-                Logger = environment.Equals("development", StringComparison.InvariantCultureIgnoreCase) ? loggerFactory.CreateLogger<XmpMetadataParser>() : null
-            },
-            Cii =
-            {
-                Logger = environment.Equals("development", StringComparison.InvariantCultureIgnoreCase) ? loggerFactory.CreateLogger<CrossIndustryInvoiceParser>() : null
-            }
+            settings.AutoVersion = true;
+            settings.AutoHelp = true;
+            settings.CaseSensitive = false;
+            settings.CaseInsensitiveEnumValues = true;
+            settings.HelpWriter = null;
         }
     );
 
-    FacturX facturX = await parser.ParseFacturXPdfAsync(example);
-    logger.LogInformation("-------------");
-    logger.LogInformation("     XMP");
-    logger.LogInformation("-------------");
-    logger.LogInformation("{XMP}", JsonSerializer.Serialize(facturX.XmpMetadata, sourceGenerationContext.XmpMetadata));
-
-    logger.LogInformation("-------------");
-    logger.LogInformation("     CII");
-    logger.LogInformation("-------------");
-    logger.LogInformation("{CII}", JsonSerializer.Serialize(facturX.CrossIndustryInvoice, sourceGenerationContext.CrossIndustryInvoice));
-
-    FacturXValidator validator = new();
-    FacturXValidationResult validationResult = validator.GetValidationResult(facturX);
-
-    logger.LogInformation("-------------");
-    logger.LogInformation(" VALIDATION");
-    logger.LogInformation("-------------");
-
-    logger.LogInformation("Success: {Success}", validationResult.Success);
-    logger.LogInformation("Actual profile: {Profile}", validationResult.ValidProfiles.GetMaxProfile());
-
-    logger.LogInformation("Details:");
-
-    if (validationResult.Fatal.Count > 0)
-    {
-        logger.LogError("- Failed: ({FailedCount})", validationResult.Fatal.Count);
-    }
-    else
-    {
-        logger.LogInformation("- Failed: ({FailedCount})", validationResult.Fatal.Count);
-    }
-    foreach (FacturXBusinessRule rule in validationResult.Fatal)
-    {
-        logger.LogError("  - KO {Rule}", rule.Format());
-    }
+    ParserResult<ExtractOption>? parsed = parser.ParseArguments<ExtractOption>(args);
+    await parsed.WithParsedAsync(ExtractCommand.RunAsync);
+    await parsed.WithNotParsedAsync(errs => NotParsedAsync(parsed, errs));
+}
+catch (Exception exn)
+{
+    logger.LogCritical(exn, "Unhandled exception.");
+}
+return;
 
-    logger.LogInformation("- Passed: ({PassedCount})", validationResult.Passed.Count);
-    foreach (FacturXBusinessRule? rule in validationResult.Passed)
+async Task NotParsedAsync(ParserResult<ExtractOption> parsed1, IEnumerable<Error> errs)
+{
+    IEnumerable<Error> enumerable = errs as Error[] ?? errs.ToArray();
+    if (enumerable.IsVersion())
     {
-        logger.LogInformation("  - OK {Rule}", rule.Format());
+        await Console.Out.WriteLineAsync(GetVersion());
     }
-
-    logger.LogInformation("- Expected to fail: ({ExpectedToFailCount})", validationResult.ExpectedToFail.Count);
-    foreach (FacturXBusinessRule? rule in validationResult.ExpectedToFail)
+    else if (enumerable.IsHelp())
     {
-        logger.LogInformation("  - KO {Rule}", rule.Format());
+        await Console.Out.WriteLineAsync(GetHelp(parsed1));
     }
-
-    logger.LogInformation("- Skipped: ({SkippedCount})", validationResult.Skipped.Count);
-    foreach (FacturXBusinessRule? rule in validationResult.Skipped)
+    else
     {
-        logger.LogInformation("  - ?? {Rule}", rule.Format());
+        await Console.Error.WriteLineAsync(GetHelp(parsed1));
     }
 }
-catch (Exception exn)
+
+string GetVersion()
 {
-    logger.LogCritical(exn, "Unhandled exception.");
+    Assembly assembly = Assembly.GetExecutingAssembly();
+    FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(assembly.Location);
+    return fileVersionInfo.ProductVersion ?? "~dev";
 }
 
-namespace FacturXDotNet.CLI
+HelpText GetHelp(ParserResult<ExtractOption> parserResult)
 {
-    class Options
-    {
-        public string? Environment { get; set; }
-    }
+    HelpText? helpText = HelpText.AutoBuild(
+        parserResult,
+        h =>
+        {
+            h.AdditionalNewLineAfterOption = false;
+            h.AddEnumValuesToHelpText = true;
+            h.Heading = $"FacturX.NET {GetVersion()}";
+            h.Copyright = "Copyright (C) 2025 Ismail Bennani";
+            return HelpText.DefaultParsingErrorsHandler(parserResult, h);
+        },
+        e => e
+    );
 
-    [JsonSourceGenerationOptions(WriteIndented = true)]
-    [JsonSerializable(typeof(CrossIndustryInvoice))]
-    [JsonSerializable(typeof(XmpMetadata))]
-    partial class SourceGenerationContext : JsonSerializerContext
-    {
-    }
+    return helpText;
 }
diff --git a/FacturXDotNet.sln.DotSettings.user b/FacturXDotNet.sln.DotSettings.user
index 20a78179..15302b90 100644
--- a/FacturXDotNet.sln.DotSettings.user
+++ b/FacturXDotNet.sln.DotSettings.user
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHelpTextExtensions_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5b72d77125f16db194673a1a66f3e03cc8cb4f1fb49ced35d4c9aa5561174_003FHelpTextExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIFormatProvider_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2832e8c2b81f4641b3863f406ce3a519c90938_003F05_003Fc3b3999c_003FIFormatProvider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIXmlReadHandler_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fab8e4913ed951e8a94f7ab594f7a5464d20ca7e2b2461f7836792c0e33d0cd_003FIXmlReadHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APdfNameTree_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fcbf868f2490746fbab2087b4b2ac8198ff600_003F6f_003F97381f3b_003FPdfNameTree_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
diff --git a/FacturXDotNet/FacturXDotNet.csproj b/FacturXDotNet/FacturXDotNet.csproj
index 8c70bd54..ef912604 100644
--- a/FacturXDotNet/FacturXDotNet.csproj
+++ b/FacturXDotNet/FacturXDotNet.csproj
@@ -19,6 +19,7 @@
     <None Include="..\Assets\Logo\logo_icon_128.png" Pack="True" PackagePath="" Link="..\Assets\Logo\logo_icon_128.png" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="PDFsharp" Version="6.1.1" />
     <PackageReference Include="TurboXml" Version="2.0.2" />
   </ItemGroup>

From 321638d44b900d95280fa9ae6bf2a34ce1d42edd Mon Sep 17 00:00:00 2001
From: ismailbennani <ismail.lahkim.bennani@gmail.com>
Date: Sat, 22 Mar 2025 15:53:52 +0100
Subject: [PATCH 2/4] use System.CommandLine instead of CommandLineArgs

---
 Benchmark/Benchmark.csproj                    |  1 -
 Directory.Build.props                         |  1 -
 FacturXDotNet.CLI/Extract/CommandBase.cs      | 41 +++++++++
 FacturXDotNet.CLI/Extract/ExtractCommand.cs   | 63 ++++++++++++--
 FacturXDotNet.CLI/Extract/ExtractOption.cs    | 26 ------
 FacturXDotNet.CLI/FacturXDotNet.CLI.csproj    | 10 +--
 FacturXDotNet.CLI/Program.cs                  | 84 ++++---------------
 FacturXDotNet.sln.DotSettings.user            |  5 ++
 FacturXDotNet/FacturXDotNet.csproj            |  2 +-
 .../Tests.FacturXDotNet.csproj                |  7 +-
 10 files changed, 129 insertions(+), 111 deletions(-)
 create mode 100644 FacturXDotNet.CLI/Extract/CommandBase.cs
 delete mode 100644 FacturXDotNet.CLI/Extract/ExtractOption.cs

diff --git a/Benchmark/Benchmark.csproj b/Benchmark/Benchmark.csproj
index 20d2b953..aff03dbc 100644
--- a/Benchmark/Benchmark.csproj
+++ b/Benchmark/Benchmark.csproj
@@ -10,7 +10,6 @@
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <GenerateDocumentationFile>false</GenerateDocumentationFile>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Directory.Build.props b/Directory.Build.props
index c47a908c..56501af9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,6 +3,5 @@
         <LangVersion>latest</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 </Project>
diff --git a/FacturXDotNet.CLI/Extract/CommandBase.cs b/FacturXDotNet.CLI/Extract/CommandBase.cs
new file mode 100644
index 00000000..eeae1f46
--- /dev/null
+++ b/FacturXDotNet.CLI/Extract/CommandBase.cs
@@ -0,0 +1,41 @@
+using System.CommandLine;
+using System.CommandLine.NamingConventionBinder;
+using System.CommandLine.Parsing;
+
+namespace FacturXDotNet.CLI.Extract;
+
+abstract class CommandBase<TOption>(string name, string description, IReadOnlyList<Argument>? arguments = null, IReadOnlyList<Option>? options = null)
+{
+    public string Name { get; } = name;
+    public string Description { get; } = description;
+    public IReadOnlyList<Argument> Arguments => arguments ?? [];
+    public IReadOnlyList<Option> Options => options ?? [];
+
+    public Command GetCommand()
+    {
+        Command command = new(Name, Description);
+
+        foreach (Argument argument in Arguments)
+        {
+            command.Add(argument);
+        }
+
+        foreach (Option option in Options)
+        {
+            command.Add(option);
+        }
+
+        command.Action = CommandHandler.Create<TOption, CancellationToken>(RunAsync);
+        command.Validators.Add(Validate);
+
+        return command;
+    }
+
+    public abstract Task RunAsync(TOption opt, CancellationToken cancellationToken = default);
+    protected virtual void Validate(CommandResult option) { }
+}
+
+static class CommandBaseExtensions
+{
+    public static void AddCommand<T>(this RootCommand rootCommand, CommandBase<T> command) => rootCommand.Subcommands.Add(command.GetCommand());
+}
diff --git a/FacturXDotNet.CLI/Extract/ExtractCommand.cs b/FacturXDotNet.CLI/Extract/ExtractCommand.cs
index 0de3cfde..584b21bc 100644
--- a/FacturXDotNet.CLI/Extract/ExtractCommand.cs
+++ b/FacturXDotNet.CLI/Extract/ExtractCommand.cs
@@ -1,11 +1,62 @@
-namespace FacturXDotNet.CLI.Extract;
+using System.CommandLine;
+using System.CommandLine.Parsing;
+using System.Text.Json;
 
-static class ExtractCommand
+namespace FacturXDotNet.CLI.Extract;
+
+class ExtractCommand() : CommandBase<ExtractCommandOption>("extract", "Extracts the content of a Factur-X PDF.", [PathArgument], [CiiOption, XmpOption])
 {
-    public static async Task RunAsync(ExtractOption options)
+    static readonly Argument<FileInfo> PathArgument;
+    static readonly Option<string> CiiOption;
+    static readonly Option<string> XmpOption;
+
+    static ExtractCommand()
+    {
+        PathArgument = new Argument<FileInfo>("path") { Description = "The path to the Factur-X PDF." };
+        CiiOption = new Option<string>("--cii")
+        {
+            Description = "Extracts the content of the CII XML. Optionally specify a path, otherwise the CII XML will be saved next to the PDF with the same name.",
+            Arity = ArgumentArity.ZeroOrOne
+        };
+        XmpOption = new Option<string>("--xmp")
+        {
+            Description = "Extracts the content of the XMP metadata. Optionally specify a path, otherwise the XMP metadata will be saved next to the PDF with the same name.",
+            Arity = ArgumentArity.ZeroOrOne
+        };
+    }
+
+    public override async Task RunAsync(ExtractCommandOption opt, CancellationToken cancellationToken = default) =>
+        Console.Write(
+            JsonSerializer.Serialize(
+                new
+                {
+                    Path = opt.Path.FullName,
+                    opt.ExportCii,
+                    opt.CiiPath,
+                    opt.ExportXmp,
+                    opt.XmpPath
+                },
+                new JsonSerializerOptions(JsonSerializerOptions.Web) { WriteIndented = true }
+            )
+        );
+
+    protected override void Validate(CommandResult option)
     {
-        Console.WriteLine($"Extracting {options.Path}...");
-        Console.WriteLine($"CII {options.CiiPath ?? "(null)"}...");
-        Console.WriteLine($"XMP {options.XmpPath ?? "(null)"}...");
+        bool exportCii = option.GetResult(CiiOption) is not null;
+        bool exportXmp = option.GetResult(XmpOption) is not null;
+
+        if (!exportCii && !exportXmp)
+        {
+            option.AddError("At least one of --cii or --xmp must be specified.");
+        }
     }
 }
+
+public class ExtractCommandOption
+{
+    public FileInfo Path { get; set; } = null!;
+    public bool ExportCii { get; set; }
+    public string? CiiPath { get; set; }
+    public bool ExportXmp { get; set; }
+    public string? XmpPath { get; set; }
+}
diff --git a/FacturXDotNet.CLI/Extract/ExtractOption.cs b/FacturXDotNet.CLI/Extract/ExtractOption.cs
deleted file mode 100644
index 74f99d24..00000000
--- a/FacturXDotNet.CLI/Extract/ExtractOption.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using CommandLine;
-
-namespace FacturXDotNet.CLI.Extract;
-
-[Verb("extract", HelpText = "Extracts the content of a Factur-X PDF.")]
-class ExtractOption
-{
-    const string ExtractionTargetGroupName = "Extraction target";
-
-    [Value(0, MetaName = "PATH", Required = true, HelpText = "The path to the Factur-X PDF.")]
-    public string Path { get; set; } = string.Empty;
-
-    [Option(
-        "cii",
-        Group = ExtractionTargetGroupName,
-        HelpText = "Extracts the content of the CII XML. Optionally specify a path, otherwise the CII XML will be saved next to the PDF with the same name."
-    )]
-    public string? CiiPath { get; set; }
-
-    [Option(
-        "xmp",
-        Group = ExtractionTargetGroupName,
-        HelpText = "Extracts the content of the XMP metadata. Optionally specify a path, otherwise the XMP metadata will be saved next to the PDF with the same name."
-    )]
-    public string? XmpPath { get; set; }
-}
diff --git a/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj b/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj
index 92cc1a2b..1c6f0ba0 100644
--- a/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj
+++ b/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj
@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.3" />
-      <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
-      <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
-      <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
-      <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.2.25163.2" />
+      <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.2.25163.2" />
+      <PackageReference Include="System.CommandLine" Version="2.0.0-beta5.25170.1" />
+      <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta5.25170.1" />
+      <PackageReference Include="System.CommandLine.Rendering" Version="0.4.0-alpha.22272.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/FacturXDotNet.CLI/Program.cs b/FacturXDotNet.CLI/Program.cs
index d0a54ecf..3bca66b7 100644
--- a/FacturXDotNet.CLI/Program.cs
+++ b/FacturXDotNet.CLI/Program.cs
@@ -1,79 +1,29 @@
-using System.Diagnostics;
-using System.Reflection;
-using CommandLine;
-using CommandLine.Text;
+using System.CommandLine;
+using System.Globalization;
 using FacturXDotNet.CLI.Extract;
-using Microsoft.Extensions.Logging;
-using Serilog;
-using Serilog.Extensions.Logging;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-Log.Logger = new LoggerConfiguration().WriteTo.Console().CreateLogger();
-SerilogLoggerFactory loggerFactory = new(Log.Logger);
-
-ILogger logger = loggerFactory.CreateLogger("Program");
 
 try
 {
-    Parser parser = new(
-        settings =>
-        {
-            settings.AutoVersion = true;
-            settings.AutoHelp = true;
-            settings.CaseSensitive = false;
-            settings.CaseInsensitiveEnumValues = true;
-            settings.HelpWriter = null;
-        }
-    );
+    // force error messages to be in English
+    Thread.CurrentThread.CurrentUICulture = new CultureInfo("en-US");
 
-    ParserResult<ExtractOption>? parsed = parser.ParseArguments<ExtractOption>(args);
-    await parsed.WithParsedAsync(ExtractCommand.RunAsync);
-    await parsed.WithNotParsedAsync(errs => NotParsedAsync(parsed, errs));
-}
-catch (Exception exn)
-{
-    logger.LogCritical(exn, "Unhandled exception.");
-}
-return;
+    RootCommand rootCommand = new("facturx extract facture.pdf --cii --xmp");
+    rootCommand.AddCommand(new ExtractCommand());
 
-async Task NotParsedAsync(ParserResult<ExtractOption> parsed1, IEnumerable<Error> errs)
-{
-    IEnumerable<Error> enumerable = errs as Error[] ?? errs.ToArray();
-    if (enumerable.IsVersion())
+    await new CommandLineConfiguration(rootCommand)
     {
-        await Console.Out.WriteLineAsync(GetVersion());
-    }
-    else if (enumerable.IsHelp())
-    {
-        await Console.Out.WriteLineAsync(GetHelp(parsed1));
-    }
-    else
-    {
-        await Console.Error.WriteLineAsync(GetHelp(parsed1));
-    }
-}
+        EnablePosixBundling = true
+    }.InvokeAsync(args);
 
-string GetVersion()
+    return 0;
+}
+catch (Exception exn)
 {
-    Assembly assembly = Assembly.GetExecutingAssembly();
-    FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(assembly.Location);
-    return fileVersionInfo.ProductVersion ?? "~dev";
+    await Console.Error.WriteLineAsync(exn.ToString());
+    return 1;
 }
-
-HelpText GetHelp(ParserResult<ExtractOption> parserResult)
+finally
 {
-    HelpText? helpText = HelpText.AutoBuild(
-        parserResult,
-        h =>
-        {
-            h.AdditionalNewLineAfterOption = false;
-            h.AddEnumValuesToHelpText = true;
-            h.Heading = $"FacturX.NET {GetVersion()}";
-            h.Copyright = "Copyright (C) 2025 Ismail Bennani";
-            return HelpText.DefaultParsingErrorsHandler(parserResult, h);
-        },
-        e => e
-    );
-
-    return helpText;
+    await Console.Out.FlushAsync();
+    await Console.Error.FlushAsync();
 }
diff --git a/FacturXDotNet.sln.DotSettings.user b/FacturXDotNet.sln.DotSettings.user
index 15302b90..e3a1c7c5 100644
--- a/FacturXDotNet.sln.DotSettings.user
+++ b/FacturXDotNet.sln.DotSettings.user
@@ -1,10 +1,15 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsynchronousCommandLineAction_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F798992a7436b2fd173e1a755bf1b96e06b2069384a7e7a13f7f22b846127_003FAsynchronousCommandLineAction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABindingContext_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F21e8987e9f587b3e492198843676e83c9c82e0d5b456b27c887c79a77baf9419_003FBindingContext_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACommandResult_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fed14cae62ccd399ef87fa2f6e0ac1ebf030433dc9525dd89cd97a47e85363_003FCommandResult_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHandlerDescriptor_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fdb9918dfba1bfa7abf458ada35bfe6fd45b0fbbd8a8d6440f0885a3daab359d7_003FHandlerDescriptor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHelpTextExtensions_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5b72d77125f16db194673a1a66f3e03cc8cb4f1fb49ced35d4c9aa5561174_003FHelpTextExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIFormatProvider_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2832e8c2b81f4641b3863f406ce3a519c90938_003F05_003Fc3b3999c_003FIFormatProvider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIXmlReadHandler_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fab8e4913ed951e8a94f7ab594f7a5464d20ca7e2b2461f7836792c0e33d0cd_003FIXmlReadHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APdfNameTree_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fcbf868f2490746fbab2087b4b2ac8198ff600_003F6f_003F97381f3b_003FPdfNameTree_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APdfString_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fcbf868f2490746fbab2087b4b2ac8198ff600_003F7e_003Fddd2c685_003FPdfString_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AReaderProperties_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fcbf868f2490746fbab2087b4b2ac8198ff600_003F0c_003F131a4d44_003FReaderProperties_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASymbolResult_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F21317424d3675027d3784fccc07d603d802830f9542ce12a7ec94118e59e0_003FSymbolResult_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AXmlParserInternal_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5f4ff1c965e4fd98c6a1aa6bff382abeb088d69c43a28a12a45e54db9cf13a_003FXmlParserInternal_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AXmlParser_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F1a2a86e0dbbd14ad398b73854bfa97b6cc97507fc3d2a3b7a7e0d73c90f08acb_003FXmlParser_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/SweaWarningsMode/@EntryValue">ShowAndRun</s:String>
diff --git a/FacturXDotNet/FacturXDotNet.csproj b/FacturXDotNet/FacturXDotNet.csproj
index ef912604..6cec3ead 100644
--- a/FacturXDotNet/FacturXDotNet.csproj
+++ b/FacturXDotNet/FacturXDotNet.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -19,7 +20,6 @@
     <None Include="..\Assets\Logo\logo_icon_128.png" Pack="True" PackagePath="" Link="..\Assets\Logo\logo_icon_128.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="PDFsharp" Version="6.1.1" />
     <PackageReference Include="TurboXml" Version="2.0.2" />
   </ItemGroup>
diff --git a/Tests.FacturXDotNet/Tests.FacturXDotNet.csproj b/Tests.FacturXDotNet/Tests.FacturXDotNet.csproj
index 1359af6a..deea2f7b 100644
--- a/Tests.FacturXDotNet/Tests.FacturXDotNet.csproj
+++ b/Tests.FacturXDotNet/Tests.FacturXDotNet.csproj
@@ -4,13 +4,12 @@
         <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
-      <GenerateDocumentationFile>false</GenerateDocumentationFile>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-        <PackageReference Include="MSTest.TestAdapter" Version="3.1.1"/>
-        <PackageReference Include="MSTest.TestFramework" Version="3.1.1"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.8.3" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.8.3" />
         <PackageReference Include="Shouldly" Version="4.3.0" />
     </ItemGroup>
 

From ed95f3e04fd9a25eafc663928938f54b07da3c8d Mon Sep 17 00:00:00 2001
From: ismailbennani <ismail.lahkim.bennani@gmail.com>
Date: Sat, 22 Mar 2025 17:36:18 +0100
Subject: [PATCH 3/4] implement extraction

---
 FacturXDotNet.CLI/Extract/CommandBase.cs      |  32 ++++-
 FacturXDotNet.CLI/Extract/ExtractCommand.cs   | 135 ++++++++++++++----
 FacturXDotNet.CLI/FacturXDotNet.CLI.csproj    |   6 +
 FacturXDotNet.CLI/Program.cs                  |  51 ++++++-
 FacturXDotNet.sln.DotSettings.user            |   8 ++
 .../Parsing/ExtractCiiFromFacturX.cs          |  17 ++-
 .../FacturXCrossIndustryInvoiceExtractor.cs   |  63 ++++++++
 FacturXDotNet/Parsing/FacturXParser.cs        |  27 ++++
 FacturXDotNet/Parsing/FacturXParserOptions.cs |  30 ----
 FacturXDotNet/Parsing/FacturXXmpExtractor.cs  |  49 +++++++
 10 files changed, 348 insertions(+), 70 deletions(-)
 create mode 100644 FacturXDotNet/Parsing/FacturXCrossIndustryInvoiceExtractor.cs
 delete mode 100644 FacturXDotNet/Parsing/FacturXParserOptions.cs
 create mode 100644 FacturXDotNet/Parsing/FacturXXmpExtractor.cs

diff --git a/FacturXDotNet.CLI/Extract/CommandBase.cs b/FacturXDotNet.CLI/Extract/CommandBase.cs
index eeae1f46..830a8bb1 100644
--- a/FacturXDotNet.CLI/Extract/CommandBase.cs
+++ b/FacturXDotNet.CLI/Extract/CommandBase.cs
@@ -4,7 +4,7 @@
 
 namespace FacturXDotNet.CLI.Extract;
 
-abstract class CommandBase<TOption>(string name, string description, IReadOnlyList<Argument>? arguments = null, IReadOnlyList<Option>? options = null)
+abstract class CommandBase<TOptions>(string name, string description, IReadOnlyList<Argument>? arguments = null, IReadOnlyList<Option>? options = null)
 {
     public string Name { get; } = name;
     public string Description { get; } = description;
@@ -25,14 +25,36 @@ public Command GetCommand()
             command.Add(option);
         }
 
-        command.Action = CommandHandler.Create<TOption, CancellationToken>(RunAsync);
-        command.Validators.Add(Validate);
+        command.Action = CommandHandler.Create(
+            async (ParseResult result, CancellationToken cancellationToken) =>
+            {
+                try
+                {
+                    TOptions opt = ParseOptions(result.CommandResult);
+                    return await RunImplAsync(opt, cancellationToken);
+                }
+                catch (Exception exception)
+                {
+                    await Console.Error.WriteLineAsync(exception.ToString());
+                    return 1;
+                }
+            }
+        );
+
+        command.Validators.Add(
+            result =>
+            {
+                TOptions opt = ParseOptions(result);
+                ValidateOptions(result, opt);
+            }
+        );
 
         return command;
     }
 
-    public abstract Task RunAsync(TOption opt, CancellationToken cancellationToken = default);
-    protected virtual void Validate(CommandResult option) { }
+    protected abstract Task<int> RunImplAsync(TOptions options, CancellationToken cancellationToken = default);
+    protected abstract TOptions ParseOptions(CommandResult result);
+    protected virtual void ValidateOptions(CommandResult result, TOptions opt) { }
 }
 
 static class CommandBaseExtensions
diff --git a/FacturXDotNet.CLI/Extract/ExtractCommand.cs b/FacturXDotNet.CLI/Extract/ExtractCommand.cs
index 584b21bc..f71a20f8 100644
--- a/FacturXDotNet.CLI/Extract/ExtractCommand.cs
+++ b/FacturXDotNet.CLI/Extract/ExtractCommand.cs
@@ -1,62 +1,141 @@
 using System.CommandLine;
 using System.CommandLine.Parsing;
-using System.Text.Json;
+using FacturXDotNet.Parsing;
 
 namespace FacturXDotNet.CLI.Extract;
 
-class ExtractCommand() : CommandBase<ExtractCommandOption>("extract", "Extracts the content of a Factur-X PDF.", [PathArgument], [CiiOption, XmpOption])
+class ExtractCommand() : CommandBase<ExtractCommandOptions>("extract", "Extracts the content of a Factur-X PDF.", [PathArgument], [CiiOption, CiiAttachmentOption, XmpOption])
 {
     static readonly Argument<FileInfo> PathArgument;
     static readonly Option<string> CiiOption;
+    static readonly Option<string> CiiAttachmentOption;
     static readonly Option<string> XmpOption;
 
     static ExtractCommand()
     {
-        PathArgument = new Argument<FileInfo>("path") { Description = "The path to the Factur-X PDF." };
+        PathArgument = new Argument<FileInfo>("path")
+        {
+            Description = "The path to the Factur-X PDF.",
+            Validators =
+            {
+                result =>
+                {
+                    FileInfo path = result.GetValueOrDefault<FileInfo>();
+                    if (!path.Exists)
+                    {
+                        result.AddError($"Could not find file '{path.FullName}'.");
+                    }
+                }
+            }
+        };
         CiiOption = new Option<string>("--cii")
         {
             Description = "Extracts the content of the CII XML. Optionally specify a path, otherwise the CII XML will be saved next to the PDF with the same name.",
+            HelpName = "path",
             Arity = ArgumentArity.ZeroOrOne
         };
+        CiiAttachmentOption = new Option<string>("--cii-attachment")
+        {
+            Description = "The name of the CII attachment.",
+            HelpName = "name",
+            DefaultValueFactory = _ => "factur-x.xml"
+        };
         XmpOption = new Option<string>("--xmp")
         {
             Description = "Extracts the content of the XMP metadata. Optionally specify a path, otherwise the XMP metadata will be saved next to the PDF with the same name.",
+            HelpName = "path",
             Arity = ArgumentArity.ZeroOrOne
         };
     }
 
-    public override async Task RunAsync(ExtractCommandOption opt, CancellationToken cancellationToken = default) =>
-        Console.Write(
-            JsonSerializer.Serialize(
-                new
-                {
-                    Path = opt.Path.FullName,
-                    opt.ExportCii,
-                    opt.CiiPath,
-                    opt.ExportXmp,
-                    opt.XmpPath
-                },
-                new JsonSerializerOptions(JsonSerializerOptions.Web) { WriteIndented = true }
-            )
-        );
-
-    protected override void Validate(CommandResult option)
+    protected override ExtractCommandOptions ParseOptions(CommandResult result) =>
+        new()
+        {
+            Path = result.GetValue(PathArgument)!,
+            Cii = result.GetResult(CiiOption) is not null ? result.GetValue(CiiOption) ?? "" : null,
+            CiiAttachment = result.GetValue(CiiAttachmentOption),
+            Xmp = result.GetResult(XmpOption) is not null ? result.GetValue(XmpOption) ?? "" : null
+        };
+
+    protected override void ValidateOptions(CommandResult result, ExtractCommandOptions options)
+    {
+        if (options is { ExportCii: false, ExportXmp: false })
+        {
+            result.AddError("At least one of --cii or --xmp must be specified.");
+        }
+    }
+
+    protected override async Task<int> RunImplAsync(ExtractCommandOptions options, CancellationToken cancellationToken = default)
     {
-        bool exportCii = option.GetResult(CiiOption) is not null;
-        bool exportXmp = option.GetResult(XmpOption) is not null;
+        if (options.ExportCii)
+        {
+            string outputPath = string.IsNullOrWhiteSpace(options.Cii) ? Path.ChangeExtension(options.Path.FullName, ".xml") : options.Cii;
+            await ExtractCii(options.Path, options.CiiAttachment, outputPath, cancellationToken);
+            Console.WriteLine("Extracted CII XML to '{0}'.", outputPath);
+        }
 
-        if (!exportCii && !exportXmp)
+        if (options.ExportXmp)
         {
-            option.AddError("At least one of --cii or --xmp must be specified.");
+            string outputPath = string.IsNullOrWhiteSpace(options.Xmp) ? Path.ChangeExtension(options.Path.FullName, ".xmp") : options.Xmp;
+            await ExtractXmp(options.Path, outputPath, cancellationToken);
+            Console.WriteLine("Extracted XMP metadata to '{0}'.", outputPath);
         }
+
+        return 0;
+    }
+
+    static async Task ExtractCii(FileInfo pdfPath, string? ciiAttachment, string outputPath, CancellationToken cancellationToken)
+    {
+        await using FileStream stream = pdfPath.OpenRead();
+
+        FacturXCrossIndustryInvoiceExtractor extractor = new(new FacturXCrossIndustryInvoiceExtractorOptions { CiiXmlAttachmentName = ciiAttachment });
+        await using Stream xmpStream = extractor.ExtractCiiAsync(stream);
+
+        await using FileStream xmpFile = File.Open(outputPath, FileMode.Create);
+        await xmpStream.CopyToAsync(xmpFile, cancellationToken);
+    }
+
+    static async Task ExtractXmp(FileInfo pdfPath, string outputPath, CancellationToken cancellationToken)
+    {
+        await using FileStream stream = pdfPath.OpenRead();
+
+        FacturXXmpExtractor extractor = new();
+        await using Stream xmpStream = extractor.ExtractXmpAsync(stream);
+
+        await using FileStream xmpFile = File.Open(outputPath, FileMode.Create);
+        await xmpStream.CopyToAsync(xmpFile, cancellationToken);
     }
 }
 
-public class ExtractCommandOption
+public class ExtractCommandOptions
 {
+    /// <summary>
+    ///     The path to the Factur-X PDF.
+    /// </summary>
     public FileInfo Path { get; set; } = null!;
-    public bool ExportCii { get; set; }
-    public string? CiiPath { get; set; }
-    public bool ExportXmp { get; set; }
-    public string? XmpPath { get; set; }
+
+    /// <summary>
+    ///     True if the CII XML should be extracted.
+    /// </summary>
+    public bool ExportCii => Cii is not null;
+
+    /// <summary>
+    ///     The path to extract the CII XML to. If empty, the CII XML will be saved next to the PDF with the same name. If null, the CII XML will not be extracted.
+    /// </summary>
+    public string? Cii { get; set; }
+
+    /// <summary>
+    ///     The name of the CII attachment.
+    /// </summary>
+    public string? CiiAttachment { get; set; }
+
+    /// <summary>
+    ///     True if the XMP metadata should be extracted.
+    /// </summary>
+    public bool ExportXmp => Xmp is not null;
+
+    /// <summary>
+    ///     The path to extract the XMP metadata to. If empty, the XMP metadata will be saved next to the PDF with the same name. If null, the XMP metadata will not be extracted.
+    /// </summary>
+    public string? Xmp { get; set; }
 }
diff --git a/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj b/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj
index 1c6f0ba0..fd139b53 100644
--- a/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj
+++ b/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj
@@ -5,6 +5,12 @@
         <OutputType>exe</OutputType>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <Product>FacturX.NET CLI</Product>
+        <Company>Ismail Bennani</Company>
+        <Copyright>Copyright © $([System.DateTime]::Now.Year) $(Company)</Copyright>
+    </PropertyGroup>
+    
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.2.25163.2" />
       <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.2.25163.2" />
diff --git a/FacturXDotNet.CLI/Program.cs b/FacturXDotNet.CLI/Program.cs
index 3bca66b7..8455e45c 100644
--- a/FacturXDotNet.CLI/Program.cs
+++ b/FacturXDotNet.CLI/Program.cs
@@ -1,5 +1,7 @@
 using System.CommandLine;
+using System.CommandLine.Help;
 using System.Globalization;
+using System.Reflection;
 using FacturXDotNet.CLI.Extract;
 
 try
@@ -8,14 +10,55 @@
     Thread.CurrentThread.CurrentUICulture = new CultureInfo("en-US");
 
     RootCommand rootCommand = new("facturx extract facture.pdf --cii --xmp");
-    rootCommand.AddCommand(new ExtractCommand());
 
-    await new CommandLineConfiguration(rootCommand)
+    CommandLineConfiguration configuration = new(rootCommand)
     {
+        EnableDefaultExceptionHandler = true,
         EnablePosixBundling = true
-    }.InvokeAsync(args);
+    };
+
+    #region Help customization
+
+    Assembly assembly = typeof(Program).Assembly;
+    AssemblyName assemblyName = assembly.GetName();
+    string title = assembly.GetCustomAttribute<AssemblyProductAttribute>()?.Product ?? "FacturX.NET";
+    string? copyright = assembly.GetCustomAttribute<AssemblyCopyrightAttribute>()?.Copyright;
+    string version = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? assemblyName.Version?.ToString() ?? "~dev";
+
+    HelpBuilder helpBuilder = new();
+    helpBuilder.CustomizeLayout(
+        _ => HelpBuilder.Default.GetLayout()
+            .Skip(1)
+            .Prepend(
+                context =>
+                {
+                    context.Output.WriteLine($"{title} v{version}");
+                    if (copyright != null)
+                    {
+                        context.Output.WriteLine(copyright);
+                    }
+                    return true;
+                }
+            )
+    );
+
+    Option helpOption = rootCommand.Options.Single(opt => opt is HelpOption);
+    rootCommand.Options.Remove(helpOption);
+    rootCommand.Add(new HelpOption { Action = new HelpAction { Builder = helpBuilder } });
+
+    #endregion
+
+    #region Register commands
+
+    rootCommand.AddCommand(new ExtractCommand());
+
+    #endregion
+
+#if DEBUG
+    configuration.ThrowIfInvalid();
+#endif
 
-    return 0;
+    return await configuration.InvokeAsync(args);
 }
 catch (Exception exn)
 {
diff --git a/FacturXDotNet.sln.DotSettings.user b/FacturXDotNet.sln.DotSettings.user
index e3a1c7c5..65a07bcf 100644
--- a/FacturXDotNet.sln.DotSettings.user
+++ b/FacturXDotNet.sln.DotSettings.user
@@ -1,14 +1,22 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsynchronousCommandLineAction_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F798992a7436b2fd173e1a755bf1b96e06b2069384a7e7a13f7f22b846127_003FAsynchronousCommandLineAction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABindingContextExtensions_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F8ce53f8dddcd3ed9e2457f6843eeb01df587b09d6cc3201155d3ddc491db28_003FBindingContextExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABindingContext_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F21e8987e9f587b3e492198843676e83c9c82e0d5b456b27c887c79a77baf9419_003FBindingContext_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABindingHandler_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fdce759866342fc3fc45fd9745a176762d8597aaa1fc1996052f4a520361ddf_003FBindingHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACommandLineConfiguration_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F578d7da311e83846854dd1ae30a8cdc48dd9b3e78a75f417d1a931d5b9f2f7_003FCommandLineConfiguration_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACommandResult_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fed14cae62ccd399ef87fa2f6e0ac1ebf030433dc9525dd89cd97a47e85363_003FCommandResult_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHandlerDescriptor_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fdb9918dfba1bfa7abf458ada35bfe6fd45b0fbbd8a8d6440f0885a3daab359d7_003FHandlerDescriptor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHelpTextExtensions_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5b72d77125f16db194673a1a66f3e03cc8cb4f1fb49ced35d4c9aa5561174_003FHelpTextExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIFormatProvider_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2832e8c2b81f4641b3863f406ce3a519c90938_003F05_003Fc3b3999c_003FIFormatProvider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIXmlReadHandler_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fab8e4913ed951e8a94f7ab594f7a5464d20ca7e2b2461f7836792c0e33d0cd_003FIXmlReadHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AModelBinderCollection_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F7db231249ee17e65399f466789eb90e7a55fde25b118f5d5f82dc43fc956297_003FModelBinderCollection_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AModelBinder_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fb6b865e1c41583721e274a498cea962bbdda4da558a1554307ba34e5fbccb_003FModelBinder_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AModelBindingCommandHandler_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fbbd6d672c41da862a92f75d956b73a4dd2215bb2345d6dcd83be686d7b93321_003FModelBindingCommandHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AParseErrorAction_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fe2eb457a782535ed6b517d82e377c3a8d53e8a4971d44a27cdc938d6e05cb73_003FParseErrorAction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APdfNameTree_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fcbf868f2490746fbab2087b4b2ac8198ff600_003F6f_003F97381f3b_003FPdfNameTree_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APdfString_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fcbf868f2490746fbab2087b4b2ac8198ff600_003F7e_003Fddd2c685_003FPdfString_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AReaderProperties_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fcbf868f2490746fbab2087b4b2ac8198ff600_003F0c_003F131a4d44_003FReaderProperties_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARootCommand_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Ffc4ac513e724771c6a8c5af24a64c6f0818fe32965f637b47eb49bb25f569f_003FRootCommand_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASymbolResult_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F21317424d3675027d3784fccc07d603d802830f9542ce12a7ec94118e59e0_003FSymbolResult_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AXmlParserInternal_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5f4ff1c965e4fd98c6a1aa6bff382abeb088d69c43a28a12a45e54db9cf13a_003FXmlParserInternal_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AXmlParser_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F1a2a86e0dbbd14ad398b73854bfa97b6cc97507fc3d2a3b7a7e0d73c90f08acb_003FXmlParser_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
diff --git a/FacturXDotNet/Parsing/ExtractCiiFromFacturX.cs b/FacturXDotNet/Parsing/ExtractCiiFromFacturX.cs
index 5e00215d..720b9731 100644
--- a/FacturXDotNet/Parsing/ExtractCiiFromFacturX.cs
+++ b/FacturXDotNet/Parsing/ExtractCiiFromFacturX.cs
@@ -8,8 +8,19 @@ namespace FacturXDotNet.Parsing;
 /// <summary>
 ///     Extract the Cross-Industry Invoice XML attachment from a Factur-X PDF document.
 /// </summary>
-class ExtractCiiFromFacturX(string ciiAttachmentName)
+class ExtractCiiFromFacturX
 {
+    readonly string? _ciiAttachmentName;
+
+    /// <summary>
+    ///     Extract the Cross-Industry Invoice XML attachment from a Factur-X PDF document.
+    /// </summary>
+    /// <param name="ciiAttachmentName">The name of the attachment containing the Cross-Industry Invoice XML file. If not specified, the default name 'factur-x.xml' will be used.</param>
+    public ExtractCiiFromFacturX(string? ciiAttachmentName = null)
+    {
+        _ciiAttachmentName = ciiAttachmentName ?? "factur-x.xml";
+    }
+
     /// <summary>
     ///     Extract the Cross-Industry Invoice XML attachment from a Factur-X PDF document.
     /// </summary>
@@ -20,7 +31,7 @@ public Stream ExtractFacturXAttachment(PdfDocument document, out string attachme
             attachmentFileName = attachmentFileNameOrNull;
             return result;
         }
-        throw new InvalidOperationException($"The Cross-Industry Invoice XML attachment with name '{ciiAttachmentName}' could not be found.");
+        throw new InvalidOperationException($"The Cross-Industry Invoice XML attachment with name '{_ciiAttachmentName}' could not be found.");
     }
 
     /// <summary>
@@ -49,7 +60,7 @@ public bool TryExtractFacturXAttachment(PdfDocument document, [NotNullWhen(true)
             }
 
             string attachedFileName = fileSpec.Elements.GetString("/F");
-            if (attachedFileName != ciiAttachmentName)
+            if (attachedFileName != _ciiAttachmentName)
             {
                 continue;
             }
diff --git a/FacturXDotNet/Parsing/FacturXCrossIndustryInvoiceExtractor.cs b/FacturXDotNet/Parsing/FacturXCrossIndustryInvoiceExtractor.cs
new file mode 100644
index 00000000..4fbafc31
--- /dev/null
+++ b/FacturXDotNet/Parsing/FacturXCrossIndustryInvoiceExtractor.cs
@@ -0,0 +1,63 @@
+using PdfSharp.Pdf;
+using PdfSharp.Pdf.IO;
+
+namespace FacturXDotNet.Parsing;
+
+/// <summary>
+///     Extracts XMP metadata from a Factur-X PDF file.
+/// </summary>
+public class FacturXCrossIndustryInvoiceExtractor
+{
+    readonly FacturXCrossIndustryInvoiceExtractorOptions _options;
+    readonly ExtractCiiFromFacturX _extractor;
+
+    /// <summary>
+    ///     Extracts XMP metadata from a Factur-X PDF file.
+    /// </summary>
+    public FacturXCrossIndustryInvoiceExtractor(FacturXCrossIndustryInvoiceExtractorOptions? options = null)
+    {
+        _options = options ?? new FacturXCrossIndustryInvoiceExtractorOptions();
+        _extractor = new ExtractCiiFromFacturX(_options.CiiXmlAttachmentName);
+    }
+
+    /// <summary>
+    ///     Extracts the XMP metadata from a Factur-X PDF file.
+    /// </summary>
+    public Stream ExtractCiiAsync(Stream facturXStream)
+    {
+        using PdfDocument document = OpenPdfDocument(facturXStream);
+        return _extractor.ExtractFacturXAttachment(document, out _);
+    }
+
+    PdfDocument OpenPdfDocument(Stream stream)
+    {
+        PdfDocument document;
+
+        if (_options.Password != null)
+        {
+            document = PdfReader.Open(stream, PdfDocumentOpenMode.Import, args => args.Password = _options.Password);
+        }
+        else
+        {
+            document = PdfReader.Open(stream, PdfDocumentOpenMode.Import);
+        }
+
+        return document;
+    }
+}
+
+/// <summary>
+///     Options for the <see cref="FacturXCrossIndustryInvoiceExtractor" />.
+/// </summary>
+public class FacturXCrossIndustryInvoiceExtractorOptions
+{
+    /// <summary>
+    ///     The password to open the PDF file.
+    /// </summary>
+    public string? Password { get; set; }
+
+    /// <summary>
+    ///     The name of the attachment containing the Cross-Industry Invoice XML file.
+    /// </summary>
+    public string? CiiXmlAttachmentName { get; set; } = "factur-x.xml";
+}
diff --git a/FacturXDotNet/Parsing/FacturXParser.cs b/FacturXDotNet/Parsing/FacturXParser.cs
index 7ec80c3b..8a961c42 100644
--- a/FacturXDotNet/Parsing/FacturXParser.cs
+++ b/FacturXDotNet/Parsing/FacturXParser.cs
@@ -81,9 +81,36 @@ PdfDocument OpenPdfDocument(Stream stream)
         {
             document = PdfReader.Open(stream, PdfDocumentOpenMode.Import);
         }
+
         return document;
     }
 
     [GeneratedRegex("<\\?xpacket.*?\\?>")]
     private static partial Regex PacketInstructions();
 }
+
+/// <summary>
+///     The options that can be passed to the <see cref="FacturXParser" />.
+/// </summary>
+public class FacturXParserOptions
+{
+    /// <summary>
+    ///     The password to use to open the PDF document if it is encrypted with standard encryption.
+    /// </summary>
+    public string? Password { get; set; }
+
+    /// <summary>
+    ///     The name of the attachment containing the Cross-Industry Invoice XML file.
+    /// </summary>
+    public string CiiXmlAttachmentName { get; set; } = "factur-x.xml";
+
+    /// <summary>
+    ///     The options for parsing the XMP metadata.
+    /// </summary>
+    public XmpMetadataParserOptions Xmp { get; set; } = new();
+
+    /// <summary>
+    ///     The options for parsing the Cross-Industry Invoice.
+    /// </summary>
+    public CrossIndustryInvoiceParserOptions Cii { get; } = new();
+}
diff --git a/FacturXDotNet/Parsing/FacturXParserOptions.cs b/FacturXDotNet/Parsing/FacturXParserOptions.cs
deleted file mode 100644
index 5080e539..00000000
--- a/FacturXDotNet/Parsing/FacturXParserOptions.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using FacturXDotNet.Parsing.CII;
-using FacturXDotNet.Parsing.XMP;
-
-namespace FacturXDotNet.Parsing;
-
-/// <summary>
-///     The options that can be passed to the <see cref="FacturXParser" />.
-/// </summary>
-public class FacturXParserOptions
-{
-    /// <summary>
-    ///     The password to use to open the PDF document if it is encrypted with standard encryption.
-    /// </summary>
-    public string? Password { get; set; }
-
-    /// <summary>
-    ///     The name of the attachment containing the Cross-Industry Invoice XML file.
-    /// </summary>
-    public string CiiXmlAttachmentName { get; set; } = "factur-x.xml";
-
-    /// <summary>
-    ///     The options for parsing the XMP metadata.
-    /// </summary>
-    public XmpMetadataParserOptions Xmp { get; set; } = new();
-
-    /// <summary>
-    ///     The options for parsing the Cross-Industry Invoice.
-    /// </summary>
-    public CrossIndustryInvoiceParserOptions Cii { get; } = new();
-}
diff --git a/FacturXDotNet/Parsing/FacturXXmpExtractor.cs b/FacturXDotNet/Parsing/FacturXXmpExtractor.cs
new file mode 100644
index 00000000..d3d8c4d1
--- /dev/null
+++ b/FacturXDotNet/Parsing/FacturXXmpExtractor.cs
@@ -0,0 +1,49 @@
+using PdfSharp.Pdf;
+using PdfSharp.Pdf.IO;
+
+namespace FacturXDotNet.Parsing;
+
+/// <summary>
+///     Extracts XMP metadata from a Factur-X PDF file.
+/// </summary>
+public class FacturXXmpExtractor(FacturXXmpExtractorOptions? options = null)
+{
+    readonly FacturXXmpExtractorOptions _options = options ?? new FacturXXmpExtractorOptions();
+    readonly ExtractXmpFromFacturX _extractor = new();
+
+    /// <summary>
+    ///     Extracts the XMP metadata from a Factur-X PDF file.
+    /// </summary>
+    public Stream ExtractXmpAsync(Stream facturXStream)
+    {
+        using PdfDocument document = OpenPdfDocument(facturXStream);
+        return _extractor.ExtractXmpMetadata(document);
+    }
+
+    PdfDocument OpenPdfDocument(Stream stream)
+    {
+        PdfDocument document;
+
+        if (_options.Password != null)
+        {
+            document = PdfReader.Open(stream, PdfDocumentOpenMode.Import, args => args.Password = _options.Password);
+        }
+        else
+        {
+            document = PdfReader.Open(stream, PdfDocumentOpenMode.Import);
+        }
+
+        return document;
+    }
+}
+
+/// <summary>
+///     Options for the <see cref="FacturXXmpExtractor" />.
+/// </summary>
+public class FacturXXmpExtractorOptions
+{
+    /// <summary>
+    ///     The password to open the PDF file.
+    /// </summary>
+    public string? Password { get; set; }
+}

From 934aef0caf722114475b1b39fa73a0f35effffa6 Mon Sep 17 00:00:00 2001
From: ismailbennani <ismail.lahkim.bennani@gmail.com>
Date: Sat, 22 Mar 2025 18:04:53 +0100
Subject: [PATCH 4/4] use spectre's AnsiConsole instead of Console

---
 FacturXDotNet.CLI/Extract/CommandBase.cs    |  3 +-
 FacturXDotNet.CLI/Extract/ExtractCommand.cs | 31 +++++++++++++++++----
 FacturXDotNet.CLI/FacturXDotNet.CLI.csproj  |  5 ++++
 FacturXDotNet.CLI/Program.cs                |  3 +-
 FacturXDotNet.sln.DotSettings.user          |  5 ++++
 5 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/FacturXDotNet.CLI/Extract/CommandBase.cs b/FacturXDotNet.CLI/Extract/CommandBase.cs
index 830a8bb1..908d8743 100644
--- a/FacturXDotNet.CLI/Extract/CommandBase.cs
+++ b/FacturXDotNet.CLI/Extract/CommandBase.cs
@@ -1,6 +1,7 @@
 using System.CommandLine;
 using System.CommandLine.NamingConventionBinder;
 using System.CommandLine.Parsing;
+using Spectre.Console;
 
 namespace FacturXDotNet.CLI.Extract;
 
@@ -35,7 +36,7 @@ public Command GetCommand()
                 }
                 catch (Exception exception)
                 {
-                    await Console.Error.WriteLineAsync(exception.ToString());
+                    AnsiConsole.WriteException(exception, ExceptionFormats.ShortenEverything);
                     return 1;
                 }
             }
diff --git a/FacturXDotNet.CLI/Extract/ExtractCommand.cs b/FacturXDotNet.CLI/Extract/ExtractCommand.cs
index f71a20f8..c96bb4ec 100644
--- a/FacturXDotNet.CLI/Extract/ExtractCommand.cs
+++ b/FacturXDotNet.CLI/Extract/ExtractCommand.cs
@@ -1,6 +1,7 @@
 using System.CommandLine;
 using System.CommandLine.Parsing;
 using FacturXDotNet.Parsing;
+using Spectre.Console;
 
 namespace FacturXDotNet.CLI.Extract;
 
@@ -69,16 +70,34 @@ protected override async Task<int> RunImplAsync(ExtractCommandOptions options, C
     {
         if (options.ExportCii)
         {
-            string outputPath = string.IsNullOrWhiteSpace(options.Cii) ? Path.ChangeExtension(options.Path.FullName, ".xml") : options.Cii;
-            await ExtractCii(options.Path, options.CiiAttachment, outputPath, cancellationToken);
-            Console.WriteLine("Extracted CII XML to '{0}'.", outputPath);
+            await AnsiConsole.Status()
+                .Spinner(Spinner.Known.Default)
+                .StartAsync(
+                    "Exporting CII XML...",
+                    async ctx =>
+                    {
+                        string outputPath = string.IsNullOrWhiteSpace(options.Cii) ? Path.ChangeExtension(options.Path.FullName, ".xml") : options.Cii;
+                        await ExtractCii(options.Path, options.CiiAttachment, outputPath, cancellationToken);
+
+                        AnsiConsole.MarkupLine("[green]:check_mark:[/] Extracted CII XML to '[bold]{0}[/]'.", outputPath);
+                    }
+                );
         }
 
         if (options.ExportXmp)
         {
-            string outputPath = string.IsNullOrWhiteSpace(options.Xmp) ? Path.ChangeExtension(options.Path.FullName, ".xmp") : options.Xmp;
-            await ExtractXmp(options.Path, outputPath, cancellationToken);
-            Console.WriteLine("Extracted XMP metadata to '{0}'.", outputPath);
+            await AnsiConsole.Status()
+                .Spinner(Spinner.Known.Default)
+                .StartAsync(
+                    "Exporting XMP metadata...",
+                    async ctx =>
+                    {
+                        string outputPath = string.IsNullOrWhiteSpace(options.Xmp) ? Path.ChangeExtension(options.Path.FullName, ".xmp") : options.Xmp;
+                        await ExtractXmp(options.Path, outputPath, cancellationToken);
+
+                        AnsiConsole.MarkupLine("[green]:check_mark:[/] Extracted XMP metadata to '[bold]{0}[/]'.", outputPath);
+                    }
+                );
         }
 
         return 0;
diff --git a/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj b/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj
index fd139b53..4b66d2eb 100644
--- a/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj
+++ b/FacturXDotNet.CLI/FacturXDotNet.CLI.csproj
@@ -14,6 +14,11 @@
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.2.25163.2" />
       <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.2.25163.2" />
+      <PackageReference Include="Spectre.Console" Version="0.49.2-preview.0.76" />
+      <PackageReference Include="Spectre.Console.Analyzer" Version="1.0.0">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
       <PackageReference Include="System.CommandLine" Version="2.0.0-beta5.25170.1" />
       <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta5.25170.1" />
       <PackageReference Include="System.CommandLine.Rendering" Version="0.4.0-alpha.22272.1" />
diff --git a/FacturXDotNet.CLI/Program.cs b/FacturXDotNet.CLI/Program.cs
index 8455e45c..b0c89a7e 100644
--- a/FacturXDotNet.CLI/Program.cs
+++ b/FacturXDotNet.CLI/Program.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.Reflection;
 using FacturXDotNet.CLI.Extract;
+using Spectre.Console;
 
 try
 {
@@ -62,7 +63,7 @@
 }
 catch (Exception exn)
 {
-    await Console.Error.WriteLineAsync(exn.ToString());
+    AnsiConsole.WriteException(exn, ExceptionFormats.ShortenEverything);
     return 1;
 }
 finally
diff --git a/FacturXDotNet.sln.DotSettings.user b/FacturXDotNet.sln.DotSettings.user
index 65a07bcf..9ee38503 100644
--- a/FacturXDotNet.sln.DotSettings.user
+++ b/FacturXDotNet.sln.DotSettings.user
@@ -5,7 +5,11 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABindingHandler_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fdce759866342fc3fc45fd9745a176762d8597aaa1fc1996052f4a520361ddf_003FBindingHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACommandLineConfiguration_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F578d7da311e83846854dd1ae30a8cdc48dd9b3e78a75f417d1a931d5b9f2f7_003FCommandLineConfiguration_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACommandResult_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fed14cae62ccd399ef87fa2f6e0ac1ebf030433dc9525dd89cd97a47e85363_003FCommandResult_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACommand_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fcec8dad0abbf66e23474c4d12533d0e1419bbc0f87ddfcb61b37bebc28419_003FCommand_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACommandLineAction_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5575e29bd5a690ea6b9612f677da65ca68df57a8d54b66da3558f25e815a764_003FCommandLineAction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADelegateHandlerDescriptor_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F2ffce84f34e723ee835b1112ff268f41ea8506e48c57fc56c80564cba092ce_003FDelegateHandlerDescriptor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHandlerDescriptor_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fdb9918dfba1bfa7abf458ada35bfe6fd45b0fbbd8a8d6440f0885a3daab359d7_003FHandlerDescriptor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHelpBuilder_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fb1c5d451bb26b069f9d814a6c79c3d1b991141621de2d9e46bcf16af27cd3fc_003FHelpBuilder_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHelpTextExtensions_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5b72d77125f16db194673a1a66f3e03cc8cb4f1fb49ced35d4c9aa5561174_003FHelpTextExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIFormatProvider_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2832e8c2b81f4641b3863f406ce3a519c90938_003F05_003Fc3b3999c_003FIFormatProvider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIXmlReadHandler_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fab8e4913ed951e8a94f7ab594f7a5464d20ca7e2b2461f7836792c0e33d0cd_003FIXmlReadHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -17,6 +21,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APdfString_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fcbf868f2490746fbab2087b4b2ac8198ff600_003F7e_003Fddd2c685_003FPdfString_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AReaderProperties_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fcbf868f2490746fbab2087b4b2ac8198ff600_003F0c_003F131a4d44_003FReaderProperties_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARootCommand_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Ffc4ac513e724771c6a8c5af24a64c6f0818fe32965f637b47eb49bb25f569f_003FRootCommand_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASpinner_002EGenerated_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F2785637749a235e9a285d99c8285b3ce12be9e079838976c3d8b3551a6eb6_003FSpinner_002EGenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASymbolResult_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F21317424d3675027d3784fccc07d603d802830f9542ce12a7ec94118e59e0_003FSymbolResult_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AXmlParserInternal_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5f4ff1c965e4fd98c6a1aa6bff382abeb088d69c43a28a12a45e54db9cf13a_003FXmlParserInternal_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AXmlParser_002Ecs_002Fl_003AC_0021_003FUsers_003Flahki_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F1a2a86e0dbbd14ad398b73854bfa97b6cc97507fc3d2a3b7a7e0d73c90f08acb_003FXmlParser_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>