alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-19 12:44:19 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

read 3d format from xml

Browse Source
This commit is contained in:
Luke Pulverenti
2013-06-26 12:08:16 -04:00
parent 934584313e
commit 6025a89235
17 changed files with 153 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -663,7 +663,7 @@ namespace MediaBrowser.Controller.Entities
return LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
{
// Try to retrieve it from the db. If we don't find it, use the resolved version
var dbItem = LibraryManager.RetrieveItem(video.Id, typeof(Trailer)) as Trailer;
var dbItem = LibraryManager.RetrieveItem(video.Id) as Trailer;
if (dbItem != null)
{
@@ -724,7 +724,7 @@ namespace MediaBrowser.Controller.Entities
return LibraryManager.ResolvePaths<Audio.Audio>(files, null).Select(audio =>
{
// Try to retrieve it from the db. If we don't find it, use the resolved version
var dbItem = LibraryManager.RetrieveItem(audio.Id, typeof(Audio.Audio)) as Audio.Audio;
var dbItem = LibraryManager.RetrieveItem(audio.Id) as Audio.Audio;
if (dbItem != null)
{
@@ -782,7 +782,7 @@ namespace MediaBrowser.Controller.Entities
return LibraryManager.ResolvePaths<Video>(files, null).Select(item =>
{
// Try to retrieve it from the db. If we don't find it, use the resolved version
var dbItem = LibraryManager.RetrieveItem(item.Id, typeof(Video)) as Video;
var dbItem = LibraryManager.RetrieveItem(item.Id) as Video;
if (dbItem != null)
{

22
MediaBrowser.Controller/Entities/ChildDefinition.cs
View File

@@ -1,22 +0,0 @@
using System;
namespace MediaBrowser.Controller.Entities
{
/// <summary>
/// Class ChildDefinition
/// </summary>
public class ChildDefinition
{
/// <summary>
/// Gets or sets the item id.
/// </summary>
/// <value>The item id.</value>
public Guid ItemId { get; set; }
/// <summary>
/// Gets or sets the type.
/// </summary>
/// <value>The type.</value>
public string Type { get; set; }
}
}

48
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -3,7 +3,6 @@ using MediaBrowser.Common.Progress;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Localization;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Reflection;
using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Entities;
using System;
@@ -22,8 +21,6 @@ namespace MediaBrowser.Controller.Entities
/// </summary>
public class Folder : BaseItem
{
private static readonly TypeMapper TypeMapper = new TypeMapper();
/// <summary>
/// Gets a value indicating whether this instance is folder.
/// </summary>
@@ -118,12 +115,7 @@ namespace MediaBrowser.Controller.Entities
await LibraryManager.CreateItem(item, cancellationToken).ConfigureAwait(false);
await ItemRepository.SaveChildren(Id, _children.Values.ToList().Select(i => new ChildDefinition
{
ItemId = i.Id,
Type = i.GetType().FullName
}), cancellationToken).ConfigureAwait(false);
await ItemRepository.SaveChildren(Id, _children.Values.ToList().Select(i => i.Id), cancellationToken).ConfigureAwait(false);
}
/// <summary>
@@ -161,12 +153,7 @@ namespace MediaBrowser.Controller.Entities
LibraryManager.ReportItemRemoved(item);
return ItemRepository.SaveChildren(Id, _children.Values.ToList().Select(i => new ChildDefinition
{
ItemId = i.Id,
Type = i.GetType().FullName
}), cancellationToken);
return ItemRepository.SaveChildren(Id, _children.Values.ToList().Select(i => i.Id), cancellationToken);
}
#region Indexing
@@ -729,12 +716,7 @@ namespace MediaBrowser.Controller.Entities
}
}
await ItemRepository.SaveChildren(Id, _children.Values.ToList().Select(i => new ChildDefinition
{
ItemId = i.Id,
Type = i.GetType().FullName
}), cancellationToken).ConfigureAwait(false);
await ItemRepository.SaveChildren(Id, _children.Values.ToList().Select(i => i.Id), cancellationToken).ConfigureAwait(false);
//force the indexes to rebuild next time
IndexCache.Clear();
@@ -872,26 +854,20 @@ namespace MediaBrowser.Controller.Entities
/// </summary>
/// <param name="child">The child.</param>
/// <returns>BaseItem.</returns>
private BaseItem RetrieveChild(ChildDefinition child)
private BaseItem RetrieveChild(Guid child)
{
var type = child.Type;
var item = LibraryManager.RetrieveItem(child);
var itemType = TypeMapper.GetType(type);
if (itemType == null)
if (item != null)
{
Logger.Error("Cannot find type {0}. Probably belongs to plug-in that is no longer loaded.", type);
return null;
if (item is IByReferenceItem)
{
return LibraryManager.GetOrAddByReferenceItem(item);
}
item.Parent = this;
}
var item = LibraryManager.RetrieveItem(child.ItemId, itemType);
if (item is IByReferenceItem)
{
return LibraryManager.GetOrAddByReferenceItem(item);
}
item.Parent = this;
return item;
}

2
MediaBrowser.Controller/Entities/Movies/Movie.cs
View File

@@ -136,7 +136,7 @@ namespace MediaBrowser.Controller.Entities.Movies
return LibraryManager.ResolvePaths<Video>(files, null).Select(video =>
{
// Try to retrieve it from the db. If we don't find it, use the resolved version
var dbItem = LibraryManager.RetrieveItem(video.Id, typeof(Video)) as Video;
var dbItem = LibraryManager.RetrieveItem(video.Id) as Video;
if (dbItem != null)
{

2
MediaBrowser.Controller/Entities/Video.cs
View File

@@ -211,7 +211,7 @@ namespace MediaBrowser.Controller.Entities
return LibraryManager.ResolvePaths<Video>(files, null).Select(video =>
{
// Try to retrieve it from the db. If we don't find it, use the resolved version
var dbItem = LibraryManager.RetrieveItem(video.Id, typeof(Video)) as Video;
var dbItem = LibraryManager.RetrieveItem(video.Id) as Video;
if (dbItem != null)
{

3
MediaBrowser.Controller/Library/ILibraryManager.cs
View File

@@ -216,9 +216,8 @@ namespace MediaBrowser.Controller.Library
/// Retrieves the item.
/// </summary>
/// <param name="id">The id.</param>
/// <param name="type">The type.</param>
/// <returns>BaseItem.</returns>
BaseItem RetrieveItem(Guid id, Type type);
BaseItem RetrieveItem(Guid id);
/// <summary>
/// Validates the artists.

2
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View File

@@ -74,7 +74,6 @@
<Compile Include="Dto\SessionInfoDtoBuilder.cs" />
<Compile Include="Entities\Audio\MusicAlbumDisc.cs" />
<Compile Include="Entities\Audio\MusicGenre.cs" />
<Compile Include="Entities\ChildDefinition.cs" />
<Compile Include="Entities\Game.cs" />
<Compile Include="Entities\IByReferenceItem.cs" />
<Compile Include="Entities\MusicVideo.cs" />
@@ -83,7 +82,6 @@
<Compile Include="Library\IMetadataSaver.cs" />
<Compile Include="Library\ItemUpdateType.cs" />
<Compile Include="Localization\ILocalizationManager.cs" />
<Compile Include="Reflection\TypeMapper.cs" />
<Compile Include="Session\ISessionManager.cs" />
<Compile Include="Drawing\ImageExtensions.cs" />
<Compile Include="Drawing\ImageHeader.cs" />

39
MediaBrowser.Controller/Persistence/IItemRepository.cs
View File

@@ -54,9 +54,8 @@ namespace MediaBrowser.Controller.Persistence
/// Retrieves the item.
/// </summary>
/// <param name="id">The id.</param>
/// <param name="type">The type.</param>
/// <returns>BaseItem.</returns>
BaseItem RetrieveItem(Guid id, Type type);
BaseItem RetrieveItem(Guid id);
/// <summary>
/// Gets chapters for an item
@@ -87,7 +86,7 @@ namespace MediaBrowser.Controller.Persistence
/// </summary>
/// <param name="parentId">The parent id.</param>
/// <returns>IEnumerable{ChildDefinition}.</returns>
IEnumerable<ChildDefinition> GetChildren(Guid parentId);
IEnumerable<Guid> GetChildren(Guid parentId);
/// <summary>
/// Saves the children.
@@ -96,39 +95,7 @@ namespace MediaBrowser.Controller.Persistence
/// <param name="children">The children.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task SaveChildren(Guid parentId, IEnumerable<ChildDefinition> children, CancellationToken cancellationToken);
}
/// <summary>
/// Class ItemRepositoryExtensions
/// </summary>
public static class ItemRepositoryExtensions
{
/// <summary>
/// Retrieves the item.
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="repository">The repository.</param>
/// <param name="id">The id.</param>
/// <returns>``0.</returns>
public static T RetrieveItem<T>(this IItemRepository repository, Guid id)
where T : BaseItem, new()
{
return repository.RetrieveItem(id, typeof(T)) as T;
}
/// <summary>
/// Retrieves the item.
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="repository">The repository.</param>
/// <param name="idList">The id list.</param>
/// <returns>IEnumerable{``0}.</returns>
public static IEnumerable<T> RetrieveItems<T>(this IItemRepository repository, IEnumerable<Guid> idList)
where T : BaseItem, new()
{
return idList.Select(repository.RetrieveItem<T>).Where(i => i != null);
}
Task SaveChildren(Guid parentId, IEnumerable<Guid> children, CancellationToken cancellationToken);
}
}

86
MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
View File

@@ -252,7 +252,7 @@ namespace MediaBrowser.Controller.Providers
}
break;
}
case "CustomRating":
{
var val = reader.ReadElementContentAsString();
@@ -476,7 +476,7 @@ namespace MediaBrowser.Controller.Providers
item.SetProviderId(MetadataProviders.Tmdb, tmdb);
}
break;
case "CollectionNumber":
var tmdbCollection = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(tmdbCollection))
@@ -523,12 +523,94 @@ namespace MediaBrowser.Controller.Providers
FetchFromStudiosNode(reader.ReadSubtree(), item);
break;
case "MediaInfo":
FetchFromMediaInfoNode(reader.ReadSubtree(), item);
break;
default:
reader.Skip();
break;
}
}
/// <summary>
/// Fetches from media info node.
/// </summary>
/// <param name="reader">The reader.</param>
/// <param name="item">The item.</param>
private void FetchFromMediaInfoNode(XmlReader reader, T item)
{
reader.MoveToContent();
while (reader.Read())
{
if (reader.NodeType == XmlNodeType.Element)
{
switch (reader.Name)
{
case "Video":
FetchFromMediaInfoVideoNode(reader.ReadSubtree(), item);
break;
default:
reader.Skip();
break;
}
}
}
}
/// <summary>
/// Fetches from media info video node.
/// </summary>
/// <param name="reader">The reader.</param>
/// <param name="item">The item.</param>
private void FetchFromMediaInfoVideoNode(XmlReader reader, T item)
{
reader.MoveToContent();
while (reader.Read())
{
if (reader.NodeType == XmlNodeType.Element)
{
switch (reader.Name)
{
case "3DFormat":
{
var video = item as Video;
if (video != null)
{
var val = reader.ReadElementContentAsString();
if (string.Equals("HSBS", val))
{
video.Video3DFormat = Video3DFormat.HalfSideBySide;
}
else if (string.Equals("HTAB", val))
{
video.Video3DFormat = Video3DFormat.HalfTopAndBottom;
}
else if (string.Equals("FTAB", val))
{
video.Video3DFormat = Video3DFormat.FullTopAndBottom;
}
else if (string.Equals("FSBS", val))
{
video.Video3DFormat = Video3DFormat.FullSideBySide;
}
}
break;
}
default:
reader.Skip();
break;
}
}
}
}
/// <summary>
/// Fetches from taglines node.
/// </summary>

47
MediaBrowser.Controller/Reflection/TypeMapper.cs
View File

@@ -1,47 +0,0 @@
using System;
using System.Collections.Concurrent;
using System.Linq;
namespace MediaBrowser.Controller.Reflection
{
/// <summary>
/// Class TypeMapper
/// </summary>
public class TypeMapper
{
/// <summary>
/// This holds all the types in the running assemblies so that we can de-serialize properly when we don't have strong types
/// </summary>
private readonly ConcurrentDictionary<string, Type> _typeMap = new ConcurrentDictionary<string, Type>();
/// <summary>
/// Gets the type.
/// </summary>
/// <param name="typeName">Name of the type.</param>
/// <returns>Type.</returns>
/// <exception cref="System.ArgumentNullException"></exception>
public Type GetType(string typeName)
{
if (string.IsNullOrEmpty(typeName))
{
throw new ArgumentNullException();
}
return _typeMap.GetOrAdd(typeName, LookupType);
}
/// <summary>
/// Lookups the type.
/// </summary>
/// <param name="typeName">Name of the type.</param>
/// <returns>Type.</returns>
private Type LookupType(string typeName)
{
return AppDomain
.CurrentDomain
.GetAssemblies()
.Select(a => a.GetType(typeName, false))
.FirstOrDefault(t => t != null);
}
}
}