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

Removed AbstractFileSystem in favour of extension methods

Browse Source 
Updated UmbracoFile to use IFileSystem
Updated UmbracoMediaFactories to use IFileSystem
This commit is contained in:
Matt@MBP13-PC
2012-08-20 10:46:32 -01:00
parent 7afbc8e7bf
commit 2775d9bedc
11 changed files with 118 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Umbraco.Core/IO/PhysicalFileSystem.cs
View File

@@ -7,7 +7,7 @@ using System.Web;
namespace Umbraco.Core.IO
{
internal class PhysicalFileSystem : AbstractFileSystem
internal class PhysicalFileSystem : IFileSystem
{
private readonly string _rootPath;
private readonly string _rootUrl;
@@ -30,7 +30,7 @@ namespace Umbraco.Core.IO
_rootUrl = rootUrl;
}
public override IEnumerable<string> GetDirectories(string path)
public IEnumerable<string> GetDirectories(string path)
{
path = EnsureTrailingSeparator(GetFullPath(path));
@@ -47,12 +47,12 @@ namespace Umbraco.Core.IO
return Enumerable.Empty<string>();
}
public override void DeleteDirectory(string path)
public void DeleteDirectory(string path)
{
DeleteDirectory(path, false);
}
public override void DeleteDirectory(string path, bool recursive)
public void DeleteDirectory(string path, bool recursive)
{
if (!DirectoryExists(path))
return;
@@ -65,17 +65,17 @@ namespace Umbraco.Core.IO
{ }
}
public override bool DirectoryExists(string path)
public bool DirectoryExists(string path)
{
return Directory.Exists(GetFullPath(path));
}
public override void AddFile(string path, Stream stream)
public void AddFile(string path, Stream stream)
{
AddFile(path, stream, true);
}
public override void AddFile(string path, Stream stream, bool overrideIfExists)
public void AddFile(string path, Stream stream, bool overrideIfExists)
{
if (FileExists(path) && !overrideIfExists)
throw new InvalidOperationException(string.Format("A file at path '{0}' already exists",
@@ -87,12 +87,12 @@ namespace Umbraco.Core.IO
stream.CopyTo(destination);
}
public override IEnumerable<string> GetFiles(string path)
public IEnumerable<string> GetFiles(string path)
{
return GetFiles(path, "*.*");
}
public override IEnumerable<string> GetFiles(string path, string filter)
public IEnumerable<string> GetFiles(string path, string filter)
{
path = EnsureTrailingSeparator(GetFullPath(path));
@@ -109,12 +109,12 @@ namespace Umbraco.Core.IO
return Enumerable.Empty<string>();
}
public override Stream OpenFile(string path)
public Stream OpenFile(string path)
{
return File.OpenRead(GetFullPath(path));
}
public override void DeleteFile(string path)
public void DeleteFile(string path)
{
if (!FileExists(path))
return;
@@ -127,12 +127,12 @@ namespace Umbraco.Core.IO
{ }
}
public override bool FileExists(string path)
public bool FileExists(string path)
{
return File.Exists(GetFullPath(path));
}
public override string GetRelativePath(string fullPathOrUrl)
public string GetRelativePath(string fullPathOrUrl)
{
var relativePath = fullPathOrUrl
.TrimStart(_rootUrl)
@@ -143,28 +143,28 @@ namespace Umbraco.Core.IO
return relativePath;
}
public override string GetFullPath(string path)
public string GetFullPath(string path)
{
return !path.StartsWith(_rootPath)
? Path.Combine(_rootPath, path)
: path;
}
public override string GetUrl(string path)
public string GetUrl(string path)
{
return _rootUrl.TrimEnd("/") + "/" + path
.TrimStart(Path.DirectorySeparatorChar)
.Replace(Path.DirectorySeparatorChar, '/');
}
public override DateTimeOffset GetLastModified(string path)
public DateTimeOffset GetLastModified(string path)
{
return DirectoryExists(path)
? new DirectoryInfo(GetFullPath(path)).LastWriteTimeUtc
: new FileInfo(GetFullPath(path)).LastWriteTimeUtc;
}
public override DateTimeOffset GetCreated(string path)
public DateTimeOffset GetCreated(string path)
{
return DirectoryExists(path)
? Directory.GetCreationTimeUtc(GetFullPath(path))