Add NullMediaFileStoreCache to avoid injecting IServiceProvider

src/OrchardCore.Modules/OrchardCore.Media/Controllers/MediaCacheController.cs

@@ -1,9 +1,7 @@
-using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Localization;
-using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.Admin;
 using OrchardCore.DisplayManagement.Notify;
 using OrchardCore.Media.ViewModels;
@@ -22,14 +20,12 @@ public class MediaCacheController : Controller
 
         public MediaCacheController(
             IAuthorizationService authorizationService,
-            IServiceProvider serviceProvider,
+            IMediaFileStoreCache mediaFileStoreCache,
             INotifier notifier,
-            IHtmlLocalizer<MediaCacheController> htmlLocalizer
-            )
+            IHtmlLocalizer<MediaCacheController> htmlLocalizer)
         {
             _authorizationService = authorizationService;
-            // Resolve from service provider as the service will not be registered if configuration is invalid.
-            _mediaFileStoreCache = serviceProvider.GetService<IMediaFileStoreCache>();
+            _mediaFileStoreCache = mediaFileStoreCache;
             _notifier = notifier;
             H = htmlLocalizer;
         }

src/OrchardCore.Modules/OrchardCore.Media/Services/RemoteMediaCacheBackgroundTask.cs

@@ -3,7 +3,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using OrchardCore.BackgroundTasks;
@@ -20,14 +19,14 @@ public class RemoteMediaCacheBackgroundTask : IBackgroundTask
 
     private readonly IMediaFileStore _mediaFileStore;
     private readonly ILogger _logger;
-
     private readonly string _cachePath;
     private readonly TimeSpan? _cacheMaxStale;
 
     public RemoteMediaCacheBackgroundTask(
         ShellSettings shellSettings,
         IMediaFileStore mediaFileStore,
         IWebHostEnvironment webHostEnvironment,
+        IMediaFileStoreCache mediaFileStoreCache,
         IOptions<MediaOptions> mediaOptions,
         ILogger<RemoteMediaCacheBackgroundTask> logger)
     {
@@ -50,12 +49,6 @@ public async Task DoWorkAsync(IServiceProvider serviceProvider, CancellationToke
             return;
         }
 
-        // Ensure that a remote media cache has been registered.
-        if (serviceProvider.GetService<IMediaFileStoreCache>() is null)
-        {
-            return;
-        }
-
         // The min write time for an item to be retained in the cache,
         // without having to get the item info from the remote store.
         var minWriteTimeUtc = DateTimeOffset.UtcNow - _cacheMaxStale.Value;

src/OrchardCore.Modules/OrchardCore.Media/Startup.cs

@@ -134,6 +134,8 @@ public override void ConfigureServices(IServiceCollection services)
                 return new DefaultMediaFileStore(fileStore, mediaUrlBase, mediaOptions.CdnBaseUrl, mediaEventHandlers, mediaCreatingEventHandlers, logger);
             });
 
+            services.AddSingleton<IMediaFileStoreCache, NullMediaFileStoreCache>();
+
             services.AddScoped<IPermissionProvider, Permissions>();
             services.AddScoped<IAuthorizationHandler, ManageMediaFolderAuthorizationHandler>();
             services.AddScoped<INavigationProvider, AdminMenu>();
@@ -197,13 +199,8 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
         {
             var mediaFileProvider = serviceProvider.GetRequiredService<IMediaFileProvider>();
             var mediaOptions = serviceProvider.GetRequiredService<IOptions<MediaOptions>>().Value;
-            var mediaFileStoreCache = serviceProvider.GetService<IMediaFileStoreCache>();
 
-            // FileStore middleware before ImageSharp, but only if a remote storage module has registered a cache provider.
-            if (mediaFileStoreCache != null)
-            {
-                app.UseMiddleware<MediaFileStoreResolverMiddleware>();
-            }
+            app.UseMiddleware<MediaFileStoreResolverMiddleware>();
 
             // ImageSharp before the static file provider.
             app.UseImageSharp();

src/OrchardCore/OrchardCore.Media.Core/NullMediaFileStoreCache.cs

@@ -0,0 +1,19 @@
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using OrchardCore.FileStorage;
+
+namespace OrchardCore.Media.Core;
+
+public class NullMediaFileStoreCache : IMediaFileStoreCache
+{
+    public Task<bool> IsCachedAsync(string path) => Task.FromResult(false);
+
+    public Task<bool> PurgeAsync() => Task.FromResult(false);
+
+    public Task SetCacheAsync(Stream stream, IFileStoreEntry fileStoreEntry, CancellationToken cancellationToken) => Task.CompletedTask;
+
+    public Task<bool> TryDeleteDirectoryAsync(string path) => Task.FromResult(false);
+
+    public Task<bool> TryDeleteFileAsync(string path) => Task.FromResult(false);
+}