Fixed #320 by adding an extension method to BaseItem to make a deep copy of an object.
This commit is contained in:
parent
1f0b83c66a
commit
de7fcaadb3
|
@ -730,7 +730,9 @@ namespace Emby.Server.Implementations.Library
|
|||
|
||||
_fileSystem.CreateDirectory(rootFolderPath);
|
||||
|
||||
var rootFolder = GetItemById(GetNewItemId(rootFolderPath, typeof(AggregateFolder))) as AggregateFolder ?? (AggregateFolder)ResolvePath(_fileSystem.GetDirectoryInfo(rootFolderPath));
|
||||
var tmpAFolder = new AggregateFolder();
|
||||
((Folder)ResolvePath(_fileSystem.GetDirectoryInfo(rootFolderPath))).DeepCopy<Folder,AggregateFolder>(tmpAFolder);
|
||||
var rootFolder = GetItemById(GetNewItemId(rootFolderPath, typeof(AggregateFolder))) as AggregateFolder ?? tmpAFolder;
|
||||
|
||||
// In case program data folder was moved
|
||||
if (!string.Equals(rootFolder.Path, rootFolderPath, StringComparison.Ordinal))
|
||||
|
@ -799,7 +801,8 @@ namespace Emby.Server.Implementations.Library
|
|||
|
||||
if (tmpItem == null)
|
||||
{
|
||||
tmpItem = (UserRootFolder)ResolvePath(_fileSystem.GetDirectoryInfo(userRootPath));
|
||||
tmpItem = new UserRootFolder();
|
||||
((Folder)ResolvePath(_fileSystem.GetDirectoryInfo(userRootPath))).DeepCopy<Folder,UserRootFolder>(tmpItem);
|
||||
}
|
||||
|
||||
// In case program data folder was moved
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
@ -61,5 +62,31 @@ namespace MediaBrowser.Controller.Entities
|
|||
item.SetImagePath(imageType, BaseItem.FileSystem.GetFileInfo(file));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Copies all properties on object. Skips properties that do not exist.
|
||||
/// </summary>
|
||||
/// <param name="source">The source object.</param>
|
||||
/// <param name="dest">The destination object.</param>
|
||||
public static void DeepCopy<T, TU>(this T source, TU dest)
|
||||
{
|
||||
var sourceProps = typeof (T).GetProperties().Where(x => x.CanRead).ToList();
|
||||
var destProps = typeof(TU).GetProperties()
|
||||
.Where(x => x.CanWrite)
|
||||
.ToList();
|
||||
|
||||
foreach (var sourceProp in sourceProps)
|
||||
{
|
||||
if (destProps.Any(x => x.Name == sourceProp.Name))
|
||||
{
|
||||
var p = destProps.First(x => x.Name == sourceProp.Name);
|
||||
p.SetValue(dest, sourceProp.GetValue(source, null), null);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user