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

deploy-30 - fixes

Browse Source
This commit is contained in:
Stephan
2016-04-15 13:25:11 +02:00
parent 523283acd0
commit 378e8f5cd9
23 changed files with 161 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Media/ImageHelper.cs
View File

@@ -91,6 +91,8 @@ namespace Umbraco.Core.Media
#region Manage thumbnails
// note: this does not find 'custom' thumbnails?
// will find _thumb and _big-thumb but NOT _custom?
public static IEnumerable<string> GetThumbnails(IFileSystem fs, string path)
{
var parentDirectory = Path.GetDirectoryName(path);

13
src/Umbraco.Core/Media/MediaHelper.cs
View File

@@ -41,6 +41,7 @@ namespace Umbraco.Core.Media
/// <param name="cuid">The unique identifier of the content/media owning the file.</param>
/// <param name="puid">The unique identifier of the property type owning the file.</param>
/// <returns>The filesystem-relative path to the media file.</returns>
/// <remarks>With the old media path scheme, this CREATES a new media path each time it is invoked.</remarks>
public static string GetMediaPath(string filename, Guid cuid, Guid puid)
{
filename = Path.GetFileName(filename);
@@ -79,7 +80,7 @@ namespace Umbraco.Core.Media
/// <param name="puid">The unique identifier of the property type owning the file.</param>
/// <returns>The filesystem-relative path to the media file.</returns>
/// <remarks>In the old, legacy, number-based scheme, we try to re-use the media folder
/// specified by <paramref name="prevpath"/>. Else, we create a new one.</remarks>
/// specified by <paramref name="prevpath"/>. Else, we CREATE a new one. Each time we are invoked.</remarks>
public static string GetMediaPath(string filename, string prevpath, Guid cuid, Guid puid)
{
if (UseTheNewMediaPathScheme || string.IsNullOrWhiteSpace(prevpath))
@@ -112,14 +113,14 @@ namespace Umbraco.Core.Media
/// Gets the next media folder in the original number-based scheme.
/// </summary>
/// <returns></returns>
/// <remarks>Should be private, is internal for legacy FileHandlerData which is obsolete.</remarks>
internal static string GetNextFolder()
{
lock (FolderCounterLock)
{
if (_folderCounterInitialized == false)
{
// fixme - seed was not respected in MediaSubfolderCounter?
_folderCounter = 1000; // seed
_folderCounter = 1000; // seed - was not respected in MediaSubfolderCounter?
var fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
var directories = fs.GetDirectories("");
foreach (var directory in directories)
@@ -163,7 +164,7 @@ namespace Umbraco.Core.Media
// clear the old file, if any
var fs = FileSystem;
if (string.IsNullOrWhiteSpace(oldpath))
fs.DeleteFile(oldpath, true);
ImageHelper.DeleteFile(fs, oldpath, true);
// get the filepath, store the data
// use oldpath as "prevpath" to try and reuse the folder, in original number-based scheme
@@ -178,7 +179,7 @@ namespace Umbraco.Core.Media
/// <param name="filepath">The filesystem-relative path to the media file.</param>
public static void DeleteFile(string filepath)
{
FileSystem.DeleteFile(filepath, true);
ImageHelper.DeleteFile(FileSystem, filepath, true);
}
/// <summary>
@@ -202,7 +203,7 @@ namespace Umbraco.Core.Media
var filename = Path.GetFileName(sourcepath);
var filepath = GetMediaPath(filename, content.Key, propertyType.Key);
fs.CopyFile(sourcepath, filepath);
fs.CopyThumbnails(sourcepath, filepath);
ImageHelper.CopyThumbnails(fs, sourcepath, filepath);
return filepath;
}

2
src/Umbraco.Core/Media/UploadAutoFillProperties.cs
View File

@@ -11,7 +11,7 @@ using Umbraco.Core.Models;
namespace Umbraco.Core.Media
{
/// <summary>
/// Provides extension methods to manage auto-fill properties for upload fields.
/// Provides methods to manage auto-fill properties for upload fields.
/// </summary>
internal static class UploadAutoFillProperties
{