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

Makes some massive headway with the real config section, have got all code re-delegated to using it and have migrated the baserest config to the core project, all configs will be shared out of the UmbracoConfiguration singleton, now to get the unit tests all wired up and using mocks for the most part.

Browse Source
This commit is contained in:
Shannon
2013-09-13 18:11:20 +10:00
parent 36d82dc43b
commit f38a6e1561
84 changed files with 841 additions and 2099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,9 @@
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.UmbracoSettings;
namespace Umbraco.Core.IO
{
@@ -11,23 +13,30 @@ namespace Umbraco.Core.IO
[FileSystemProvider("media")]
public class MediaFileSystem : FileSystemWrapper
{
public MediaFileSystem(IFileSystem wrapped)
: base(wrapped)
private readonly IContent _contentConfig;
public MediaFileSystem(IFileSystem wrapped)
: this(wrapped, UmbracoConfiguration.Current.UmbracoSettings.Content)
{
}
public string GetRelativePath(int propertyId, string fileName)
public MediaFileSystem(IFileSystem wrapped, IContent contentConfig) : base(wrapped)
{
_contentConfig = contentConfig;
}
public string GetRelativePath(int propertyId, string fileName)
{
var seperator = LegacyUmbracoSettings.UploadAllowDirectories
var seperator = _contentConfig.UploadAllowDirectories
? Path.DirectorySeparatorChar
: '-';
return propertyId.ToString() + seperator + fileName;
return propertyId.ToString(CultureInfo.InvariantCulture) + seperator + fileName;
}
public string GetRelativePath(string subfolder, string fileName)
{
var seperator = LegacyUmbracoSettings.UploadAllowDirectories
var seperator = _contentConfig.UploadAllowDirectories
? Path.DirectorySeparatorChar
: '-';