michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added extra extension method that create a new instance of the destination object.

Browse Source
This commit is contained in:
Erwin de Haan 2018-12-30 01:24:30 +01:00
parent de7fcaadb3
commit 9c1c29325d
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -730,10 +730,8 @@ namespace Emby.Server.Implementations.Library
_fileSystem.CreateDirectory(rootFolderPath); _fileSystem.CreateDirectory(rootFolderPath);
var tmpAFolder = new AggregateFolder(); var rootFolder = GetItemById(GetNewItemId(rootFolderPath, typeof(AggregateFolder))) as AggregateFolder ?? ((Folder)ResolvePath(_fileSystem.GetDirectoryInfo(rootFolderPath))).DeepCopy<Folder,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 // In case program data folder was moved
if (!string.Equals(rootFolder.Path, rootFolderPath, StringComparison.Ordinal)) if (!string.Equals(rootFolder.Path, rootFolderPath, StringComparison.Ordinal))
{ {
@ -801,8 +799,7 @@ namespace Emby.Server.Implementations.Library
if (tmpItem == null) if (tmpItem == null)
{ {
tmpItem = new UserRootFolder(); tmpItem = ((Folder)ResolvePath(_fileSystem.GetDirectoryInfo(userRootPath))).DeepCopy<Folder,UserRootFolder>();
((Folder)ResolvePath(_fileSystem.GetDirectoryInfo(userRootPath))).DeepCopy<Folder,UserRootFolder>(tmpItem);
} }
// In case program data folder was moved // In case program data folder was moved

17
MediaBrowser.Controller/Entities/BaseItemExtensions.cs
View File

@ -68,7 +68,9 @@ namespace MediaBrowser.Controller.Entities
/// </summary> /// </summary>
/// <param name="source">The source object.</param> /// <param name="source">The source object.</param>
/// <param name="dest">The destination object.</param> /// <param name="dest">The destination object.</param>
public static void DeepCopy<T, TU>(this T source, TU dest) public static void DeepCopy<T, TU>(this T source, TU dest)
where T : BaseItem
where TU : BaseItem
{ {
var sourceProps = typeof (T).GetProperties().Where(x => x.CanRead).ToList(); var sourceProps = typeof (T).GetProperties().Where(x => x.CanRead).ToList();
var destProps = typeof(TU).GetProperties() var destProps = typeof(TU).GetProperties()
@ -87,6 +89,19 @@ namespace MediaBrowser.Controller.Entities
} }
/// <summary>
/// Copies all properties on newly created object. Skips properties that do not exist.
/// </summary>
/// <param name="source">The source object.</param>
public static TU DeepCopy<T, TU>(this T source)
where T : BaseItem
where TU : BaseItem, new()
{
var dest = new TU();
source.DeepCopy(dest);
return dest;
}
} }
} }