1
- using System ;
2
1
using Microsoft . Extensions . DependencyInjection ;
3
2
using Microsoft . Extensions . Options ;
4
- using SixLabors . ImageSharp . Web . Caching ;
5
3
using Umbraco . Cms . Core . Configuration . Models ;
6
4
using Umbraco . Cms . Infrastructure . DependencyInjection ;
7
- using Umbraco . Extensions ;
8
- using Umbraco . StorageProviders . AzureBlob . Imaging ;
9
5
using Umbraco . StorageProviders . AzureBlob . IO ;
10
6
11
7
namespace Umbraco . Cms . Core . DependencyInjection
@@ -19,66 +15,49 @@ public static class AzureBlobMediaFileSystemExtensions
19
15
/// Registers an <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
20
16
/// </summary>
21
17
/// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
22
- /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
23
18
/// <returns>
24
19
/// The <see cref="IUmbracoBuilder" />.
25
20
/// </returns>
26
21
/// <exception cref="System.ArgumentNullException"><paramref name="builder" /> is <c>null</c>.</exception>
27
- public static IUmbracoBuilder AddAzureBlobMediaFileSystem ( this IUmbracoBuilder builder , bool useAzureBlobImageCache = true )
28
- => builder . AddInternal ( useAzureBlobImageCache ) ;
22
+ public static IUmbracoBuilder AddAzureBlobMediaFileSystem ( this IUmbracoBuilder builder )
23
+ => builder . AddInternal ( ) ;
29
24
30
25
/// <summary>
31
26
/// Registers a <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
32
27
/// </summary>
33
28
/// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
34
29
/// <param name="configure">An action used to configure the <see cref="AzureBlobFileSystemOptions" />.</param>
35
- /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
36
30
/// <returns>
37
31
/// The <see cref="IUmbracoBuilder" />.
38
32
/// </returns>
39
33
/// <exception cref="System.ArgumentNullException"><paramref name="builder" /> is <c>null</c>.</exception>
40
- public static IUmbracoBuilder AddAzureBlobMediaFileSystem ( this IUmbracoBuilder builder , Action < AzureBlobFileSystemOptions > configure , bool useAzureBlobImageCache = true )
41
- => builder . AddInternal ( useAzureBlobImageCache , x => x . Configure ( configure ) ) ;
42
-
43
- /// <summary>
44
- /// Registers a <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
45
- /// </summary>
46
- /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
47
- /// <param name="configure">An action used to configure the <see cref="AzureBlobFileSystemOptions" />.</param>
48
- /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
49
- /// <returns>
50
- /// The <see cref="IUmbracoBuilder" />.
51
- /// </returns>
52
- /// <exception cref="System.ArgumentNullException"><paramref name="builder" /> is <c>null</c>.</exception>
53
- public static IUmbracoBuilder AddAzureBlobFileSystem ( this IUmbracoBuilder builder , Action < AzureBlobFileSystemOptions , IServiceProvider > configure , bool useAzureBlobImageCache = true )
54
- => builder . AddInternal ( useAzureBlobImageCache , x => x . Configure ( configure ) ) ;
34
+ public static IUmbracoBuilder AddAzureBlobMediaFileSystem ( this IUmbracoBuilder builder , Action < AzureBlobFileSystemOptions > configure )
35
+ => builder . AddInternal ( x => x . Configure ( configure ) ) ;
55
36
56
37
/// <summary>
57
38
/// Registers a <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
58
39
/// </summary>
59
40
/// <typeparam name="TDep">A dependency used by the configure action.</typeparam>
60
41
/// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
61
42
/// <param name="configure">An action used to configure the <see cref="AzureBlobFileSystemOptions" />.</param>
62
- /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
63
43
/// <returns>
64
44
/// The <see cref="IUmbracoBuilder" />.
65
45
/// </returns>
66
46
/// <exception cref="System.ArgumentNullException"><paramref name="builder" /> is <c>null</c>.</exception>
67
- public static IUmbracoBuilder AddAzureBlobFileSystem < TDep > ( this IUmbracoBuilder builder , Action < AzureBlobFileSystemOptions , TDep > configure , bool useAzureBlobImageCache = true )
47
+ public static IUmbracoBuilder AddAzureBlobFileSystem < TDep > ( this IUmbracoBuilder builder , Action < AzureBlobFileSystemOptions , TDep > configure )
68
48
where TDep : class
69
- => builder . AddInternal ( useAzureBlobImageCache , x => x . Configure ( configure ) ) ;
49
+ => builder . AddInternal ( x => x . Configure ( configure ) ) ;
70
50
71
51
/// <summary>
72
52
/// Registers a <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
73
53
/// </summary>
74
54
/// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
75
- /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
76
55
/// <param name="configure">An action used to configure the <see cref="AzureBlobFileSystemOptions" />.</param>
77
56
/// <returns>
78
57
/// The <see cref="IUmbracoBuilder" />.
79
58
/// </returns>
80
59
/// <exception cref="System.ArgumentNullException"><paramref name="builder" /> is <c>null</c>.</exception>
81
- internal static IUmbracoBuilder AddInternal ( this IUmbracoBuilder builder , bool useAzureBlobImageCache , Action < OptionsBuilder < AzureBlobFileSystemOptions > > ? configure = null )
60
+ internal static IUmbracoBuilder AddInternal ( this IUmbracoBuilder builder , Action < OptionsBuilder < AzureBlobFileSystemOptions > > ? configure = null )
82
61
{
83
62
ArgumentNullException . ThrowIfNull ( builder ) ;
84
63
@@ -88,12 +67,6 @@ internal static IUmbracoBuilder AddInternal(this IUmbracoBuilder builder, bool u
88
67
configure ? . Invoke ( optionsBuilder ) ;
89
68
} ) ;
90
69
91
- // ImageSharp image cache
92
- if ( useAzureBlobImageCache )
93
- {
94
- builder . Services . AddUnique < IImageCache , AzureBlobFileSystemImageCache > ( ) ;
95
- }
96
-
97
70
builder . SetMediaFileSystem ( provider => provider . GetRequiredService < IAzureBlobFileSystemProvider > ( ) . GetFileSystem ( AzureBlobFileSystemOptions . MediaFileSystemName ) ) ;
98
71
99
72
return builder ;
0 commit comments