File-scoped namespaces and other improvements

CloudConvert.API/CloudConvert.API.csproj

@@ -18,6 +18,8 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.4" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 

CloudConvert.API/DefaultJsonSerializerOptions.cs

@@ -1,14 +1,13 @@
-using System.Text.Json.Serialization;
 using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace CloudConvert.API;
 
-namespace CloudConvert.API
+public class DefaultJsonSerializerOptions
 {
-  public class DefaultJsonSerializerOptions
+  public static readonly JsonSerializerOptions SerializerOptions = new()
   {
-    public static readonly JsonSerializerOptions SerializerOptions = new()
-    {
-      Converters = { new JsonStringEnumConverter() },
-      DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-    };
-  }
+    Converters = { new JsonStringEnumConverter() },
+    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+  };
 }

CloudConvert.API/Extensions/CloudConvertOptions.cs

@@ -0,0 +1,19 @@
+namespace CloudConvert.API.Extensions;
+
+/// <summary>
+/// Configuration options for the CloudConvert API client.
+/// </summary>
+public class CloudConvertOptions
+{
+  /// <summary>
+  /// The CloudConvert API key used to authenticate requests.
+  /// </summary>
+  public string ApiKey { get; set; }
+
+  /// <summary>
+  /// Whether to use the CloudConvert sandbox environment.
+  /// Use <c>true</c> during development and testing to avoid consuming real credits.
+  /// Defaults to <c>false</c>.
+  /// </summary>
+  public bool IsSandbox { get; set; } = false;
+}

CloudConvert.API/Extensions/ServiceCollectionExtensions.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CloudConvert.API.Extensions;
+
+/// <summary>
+/// Extension methods for registering CloudConvert API services with the dependency injection container.
+/// </summary>
+public static class ServiceCollectionExtensions
+{
+  /// <summary>
+  /// Registers the CloudConvert API client and its dependencies with the dependency injection container.
+  /// </summary>
+  /// <param name="services">The <see cref="IServiceCollection"/> to add the services to.</param>
+  /// <param name="configure">A delegate to configure the <see cref="CloudConvertOptions"/>.</param>
+  /// <returns>The <see cref="IServiceCollection"/> so that calls can be chained.</returns>
+  /// <exception cref="ArgumentException">Thrown when <see cref="CloudConvertOptions.ApiKey"/> is not provided.</exception>
+  /// <remarks>
+  /// Register the CloudConvert API client in your DI container:
+  /// <code>
+  /// services.AddCloudConvertAPI(options =>
+  /// {
+  ///     options.ApiKey = "your_api_key";
+  ///     options.IsSandbox = false;
+  /// });
+  /// </code>
+  /// </remarks>
+  public static IServiceCollection AddCloudConvertAPI(
+    this IServiceCollection services,
+    Action<CloudConvertOptions> configure)
+  {
+    var options = new CloudConvertOptions();
+    configure(options);
+
+    if (string.IsNullOrWhiteSpace(options.ApiKey))
+    {
+      throw new ArgumentException("ApiKey is required", nameof(configure));
+    }
+
+    services.AddHttpClient<ICloudConvertAPI, CloudConvertAPI>(client =>
+    {
+      client.Timeout = Timeout.InfiniteTimeSpan;
+    })
+    .ConfigurePrimaryHttpMessageHandler(() => new WebApiHandler(false));
+
+    services.AddSingleton<ICloudConvertAPI>(sp =>
+    {
+      var httpClient = sp.GetRequiredService<IHttpClientFactory>()
+          .CreateClient(nameof(CloudConvertAPI));
+
+      return new CloudConvertAPI(new RestHelper(httpClient), options.ApiKey, options.IsSandbox);
+    });
+
+    return services;
+  }
+}

CloudConvert.API/Extensions/StringExtensions.cs

@@ -15,7 +15,7 @@ public static string TrimLengthWithEllipsis([NotNull] this string str, int maxLe
         return str;
       }
 
-      return str.Substring(0, maxLength) + "...";
+      return string.Concat(str.AsSpan(0, maxLength), "...");
     }
 
     public static string GetEnumDescription<TEnum>(this TEnum source) where TEnum : struct, Enum

CloudConvert.API/Models/Enums/CaptureWebsiteWaitUntil.cs

@@ -1,10 +1,9 @@
-namespace CloudConvert.API.Models.Enums
-{
-  public enum CaptureWebsiteWaitUntil 
-  { 
-    domcontentloaded, 
-    load, 
-    networkidle0, 
-    networkidle2 
-  };
-}
+namespace CloudConvert.API.Models.Enums;
+
+public enum CaptureWebsiteWaitUntil 
+{ 
+  domcontentloaded, 
+  load, 
+  networkidle0, 
+  networkidle2 
+};

CloudConvert.API/Models/Enums/ExportS3Acl.cs

@@ -1,26 +1,24 @@
 using System.ComponentModel;
 
-namespace CloudConvert.API.Models.Enums
-{
-  public enum ExportS3Acl
-  {
-    [Description("private")]
-    Private,
+namespace CloudConvert.API.Models.Enums;
 
-    [Description("public-read")]
-    PublicRead,
+public enum ExportS3Acl
+{
+  [Description("private")]
+  Private,
 
-    [Description("public-read-write")]
-    PublicReadWrite,
+  [Description("public-read")]
+  PublicRead,
 
-    [Description("authenticated-read")]
-    AuthenticatedRead,
+  [Description("public-read-write")]
+  PublicReadWrite,
 
-    [Description("bucket-owner-read")]
-    BucketOwnerRead,
+  [Description("authenticated-read")]
+  AuthenticatedRead,
 
-    [Description("bucket-owner-full-control")]
-    BucketOwnerFullControl    
-  };
+  [Description("bucket-owner-read")]
+  BucketOwnerRead,
 
-}
+  [Description("bucket-owner-full-control")]
+  BucketOwnerFullControl
+};

CloudConvert.API/Models/Enums/JobStatus.cs

@@ -1,9 +1,8 @@
-namespace CloudConvert.API.Models.Enums
+namespace CloudConvert.API.Models.Enums;
+
+public enum JobStatus
 {
-  public enum JobStatus
-  {
-    processing,
-    finished,
-    error
-  }
+  processing,
+  finished,
+  error
 }

CloudConvert.API/Models/Enums/MergeOutputFormat.cs

@@ -1,7 +1,6 @@
-namespace CloudConvert.API.Models.Enums
-{
-  public enum MergeOutputFormat
-  { 
-    pdf
-  };
-}
+namespace CloudConvert.API.Models.Enums;
+
+public enum MergeOutputFormat
+{ 
+  pdf
+};

CloudConvert.API/Models/Enums/OptimizeInputFormat.cs

@@ -1,9 +1,8 @@
-namespace CloudConvert.API.Models.Enums
+namespace CloudConvert.API.Models.Enums;
+
+public enum OptimizeInputFormat
 {
-  public enum OptimizeInputFormat
-  {
-    jpg,
-    pdf,
-    png
-  };
-}
+  jpg,
+  pdf,
+  png
+};

CloudConvert.API/Models/Enums/OptimizeProfile.cs

@@ -1,11 +1,10 @@
-namespace CloudConvert.API.Models.Enums
+namespace CloudConvert.API.Models.Enums;
+
+public enum OptimizeProfile
 {
-  public enum OptimizeProfile
-  {
-    archive, 
-    max, 
-    mrc, 
-    print, 
-    web
-  };
-}
+  archive, 
+  max, 
+  mrc, 
+  print, 
+  web
+};

CloudConvert.API/Models/Enums/TaskStatus.cs

@@ -1,10 +1,9 @@
-namespace CloudConvert.API.Models.Enums
-{
-  public enum TaskStatus
-   {
-    waiting,
-    processing,
-    finished,
-    error
-  }
+namespace CloudConvert.API.Models.Enums;
+
+public enum TaskStatus
+ {
+  waiting,
+  processing,
+  finished,
+  error
 }

CloudConvert.API/Models/Enums/ThumbnailFit.cs

@@ -1,9 +1,8 @@
-namespace CloudConvert.API.Models.Enums
-{
-  public enum ThumbnailFit 
-  { 
-    max, 
-    crop,
-    scale 
-  };
-}
+namespace CloudConvert.API.Models.Enums;
+
+public enum ThumbnailFit 
+{ 
+  max, 
+  crop,
+  scale 
+};

CloudConvert.API/Models/Enums/ThumbnailOutputFormat.cs

@@ -1,8 +1,7 @@
-namespace CloudConvert.API.Models.Enums
-{
-  public enum ThumbnailOutputFormat 
-  { 
-    jpg, 
-    png 
-  };
-}
+namespace CloudConvert.API.Models.Enums;
+
+public enum ThumbnailOutputFormat 
+{ 
+  jpg, 
+  png 
+};

CloudConvert.API/Models/ErrorResponse.cs

@@ -1,16 +1,15 @@
 using System.Text.Json.Serialization;
 
-namespace CloudConvert.API.Models
+namespace CloudConvert.API.Models;
+
+public partial class ErrorResponse
 {
-  public partial class ErrorResponse
-  {
-    [JsonPropertyName("message")]
-    public string Message { get; set; }
+  [JsonPropertyName("message")]
+  public string Message { get; set; }
 
-    [JsonPropertyName("code")]
-    public string Code { get; set; }
+  [JsonPropertyName("code")]
+  public string Code { get; set; }
 
-    [JsonPropertyName("errors")]
-    public object Errors { get; set; }
-  }
+  [JsonPropertyName("errors")]
+  public object Errors { get; set; }
 }

CloudConvert.API/Models/ExportOperations/ExportAzureBlobCreateRequest.cs

@@ -1,35 +1,34 @@
 using System.Text.Json.Serialization;
 
-namespace CloudConvert.API.Models.ExportOperations
+namespace CloudConvert.API.Models.ExportOperations;
+
+public class ExportAzureBlobCreateRequest
 {
-  public class ExportAzureBlobCreateRequest
-  {
-    [JsonPropertyName("operation")]
-    public string Operation { get; } = "export/azure/blob";
+  [JsonPropertyName("operation")]
+  public string Operation { get; } = "export/azure/blob";
 
-    /// <summary>
-    /// The input task name(s) for this task.
-    /// input: string | string[];
-    /// </summary>
-    [JsonPropertyName("input")]
-    public object Input { get; set; }
+  /// <summary>
+  /// The input task name(s) for this task.
+  /// input: string | string[];
+  /// </summary>
+  [JsonPropertyName("input")]
+  public object Input { get; set; }
 
-    [JsonPropertyName("storage_account")]
-    public string Storage_Account { get; set; }
+  [JsonPropertyName("storage_account")]
+  public string Storage_Account { get; set; }
 
-    [JsonPropertyName("storage_access_key")]
-    public string Storage_Access_Key { get; set; }
+  [JsonPropertyName("storage_access_key")]
+  public string Storage_Access_Key { get; set; }
 
-    [JsonPropertyName("sas_token")]
-    public string Sas_Token { get; set; }
+  [JsonPropertyName("sas_token")]
+  public string Sas_Token { get; set; }
 
-    [JsonPropertyName("container")]
-    public string Container { get; set; }
+  [JsonPropertyName("container")]
+  public string Container { get; set; }
 
-    [JsonPropertyName("blob")]
-    public string Blob { get; set; }
+  [JsonPropertyName("blob")]
+  public string Blob { get; set; }
 
-    [JsonPropertyName("blob_prefix")]
-    public string Blob_Prefix { get; set; }
-  }
+  [JsonPropertyName("blob_prefix")]
+  public string Blob_Prefix { get; set; }
 }