yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MediaFileSystem now purely injected.

Browse Source 
A bit messy, and probably leaves quite a bit of dead / useless code around that should be deleted.
Needs some manual testing.
This commit is contained in:
Lars-Erik Aabech
2018-06-26 00:26:57 +02:00
parent 34390dec12
commit 3a7d7e370e
9 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Core/IO/MediaFileSystem.cs
View File

@@ -6,10 +6,8 @@ using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using LightInject;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.UmbracoSettings;
using Umbraco.Core.Composing;
using Umbraco.Core.Exceptions;
using Umbraco.Core.Logging;
using Umbraco.Core.Media;
@@ -35,21 +33,23 @@ namespace Umbraco.Core.IO
// { 500, "big-thumb" }
//};
public MediaFileSystem(IFileSystem wrapped)
public MediaFileSystem(IFileSystem wrapped, IContentSection contentConfig, ILogger logger)
: base(wrapped)
{
ContentConfig = contentConfig;
Logger = logger;
// fixme - remove obsolete comments
// due to how FileSystems is written at the moment, the ctor cannot be used to inject
// dependencies, so we have to rely on property injection for anything we might need
((IServiceContainer)Current.Container.ConcreteContainer).InjectProperties(this);
//((IServiceContainer)Current.Container.ConcreteContainer).InjectProperties(this);
UploadAutoFillProperties = new UploadAutoFillProperties(this, Logger, ContentConfig);
}
[Inject]
internal IContentSection ContentConfig { get; set; }
internal IContentSection ContentConfig { get; }
[Inject]
internal ILogger Logger { get; set; }
internal ILogger Logger { get; }
internal UploadAutoFillProperties UploadAutoFillProperties { get; }