alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-03 06:18:28 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update people saving

Browse Source
This commit is contained in:
Luke Pulverenti
2015-06-28 21:10:45 -04:00
parent b3dd4beb8a
commit b1be09242c
90 changed files with 800 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
View File

@@ -216,5 +216,14 @@ namespace MediaBrowser.Controller.Entities.Audio
return hasArtist != null && hasArtist.HasAnyArtist(Name);
};
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
}

9
MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
View File

@@ -71,5 +71,14 @@ namespace MediaBrowser.Controller.Entities.Audio
{
return i => (i is IHasMusicGenres) && i.Genres.Contains(Name, StringComparer.OrdinalIgnoreCase);
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
}

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

@@ -35,7 +35,6 @@ namespace MediaBrowser.Controller.Entities
{
Genres = new List<string>();
Studios = new List<string>();
People = new List<PersonInfo>();
ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
LockedFields = new List<MetadataFields>();
ImageInfos = new List<ItemImageInfo>();
@@ -776,6 +775,12 @@ namespace MediaBrowser.Controller.Entities
get { return IsFolder || Parent != null; }
}
[IgnoreDataMember]
public virtual bool SupportsPeople
{
get { return true; }
}
/// <summary>
/// Refreshes owned items such as trailers, theme videos, special features, etc.
/// Returns true or false indicating if changes were found.
@@ -1239,7 +1244,6 @@ namespace MediaBrowser.Controller.Entities
/// <exception cref="System.ArgumentNullException"></exception>
public void AddPerson(PersonInfo person)
{
PeopleHelper.AddPerson(People, person);
}
/// <summary>

11
MediaBrowser.Controller/Entities/BasePluginFolder.cs
View File

@@ -1,4 +1,6 @@

using System.Runtime.Serialization;
namespace MediaBrowser.Controller.Entities
{
/// <summary>
@@ -21,5 +23,14 @@ namespace MediaBrowser.Controller.Entities
{
return true;
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
}

9
MediaBrowser.Controller/Entities/CollectionFolder.cs
View File

@@ -194,5 +194,14 @@ namespace MediaBrowser.Controller.Entities
.Where(i => i.Path != null && PhysicalLocations.Contains(i.Path, StringComparer.OrdinalIgnoreCase))
.SelectMany(c => c.Children);
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
}

9
MediaBrowser.Controller/Entities/GameGenre.cs
View File

@@ -62,5 +62,14 @@ namespace MediaBrowser.Controller.Entities
{
return i => (i is Game) && i.Genres.Contains(Name, StringComparer.OrdinalIgnoreCase);
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
}

9
MediaBrowser.Controller/Entities/GameSystem.cs
View File

@@ -58,5 +58,14 @@ namespace MediaBrowser.Controller.Entities
return id;
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
}

9
MediaBrowser.Controller/Entities/Genre.cs
View File

@@ -66,5 +66,14 @@ namespace MediaBrowser.Controller.Entities
{
return i => !(i is Game) && !(i is IHasMusicGenres) && i.Genres.Contains(Name, StringComparer.OrdinalIgnoreCase);
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
}

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

@@ -59,5 +59,11 @@ namespace MediaBrowser.Controller.Entities
/// Afters the metadata refresh.
/// </summary>
void AfterMetadataRefresh();
/// <summary>
/// Gets a value indicating whether [supports people].
/// </summary>
/// <value><c>true</c> if [supports people]; otherwise, <c>false</c>.</value>
bool SupportsPeople { get; }
}
}

9
MediaBrowser.Controller/Entities/Person.cs
View File

@@ -78,6 +78,15 @@ namespace MediaBrowser.Controller.Entities
{
return i => LibraryManager.GetPeople(i).Any(p => string.Equals(p.Name, Name, StringComparison.OrdinalIgnoreCase));
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
/// <summary>

9
MediaBrowser.Controller/Entities/Studio.cs
View File

@@ -72,5 +72,14 @@ namespace MediaBrowser.Controller.Entities
{
return i => i.Studios.Contains(Name, StringComparer.OrdinalIgnoreCase);
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
}

9
MediaBrowser.Controller/Entities/User.cs
View File

@@ -295,5 +295,14 @@ namespace MediaBrowser.Controller.Entities
return config.GroupedFolders.Select(i => new Guid(i)).Contains(id);
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
}

12
MediaBrowser.Controller/Entities/UserView.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Playlists;
using System.Runtime.Serialization;
using MediaBrowser.Controller.Playlists;
using MediaBrowser.Controller.TV;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Querying;
@@ -93,5 +94,14 @@ namespace MediaBrowser.Controller.Entities
return standaloneTypes.Contains(collectionFolder.CollectionType ?? string.Empty);
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
}

9
MediaBrowser.Controller/Entities/Year.cs
View File

@@ -88,5 +88,14 @@ namespace MediaBrowser.Controller.Entities
var val = GetYearValue();
return i => i.ProductionYear.HasValue && val.HasValue && i.ProductionYear.Value == val.Value;
}
[IgnoreDataMember]
public override bool SupportsPeople
{
get
{
return false;
}
}
}
}

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

@@ -147,6 +147,21 @@ namespace MediaBrowser.Controller.Persistence
/// <param name="query">The query.</param>
/// <returns>List&lt;Guid&gt;.</returns>
List<Guid> GetItemIdsList(InternalItemsQuery query);
/// <summary>
/// Gets the people.
/// </summary>
/// <param name="itemId">The item identifier.</param>
/// <returns>List&lt;PersonInfo&gt;.</returns>
List<PersonInfo> GetPeople(Guid itemId);
/// <summary>
/// Updates the people.
/// </summary>
/// <param name="itemId">The item identifier.</param>
/// <param name="people">The people.</param>
/// <returns>Task.</returns>
Task UpdatePeople(Guid itemId, List<PersonInfo> people);
}
}

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

@@ -40,7 +40,7 @@ namespace MediaBrowser.Controller.Providers
/// <param name="metadataFile">The metadata file.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <exception cref="System.ArgumentNullException"></exception>
public void Fetch(T item, string metadataFile, CancellationToken cancellationToken)
public void Fetch(MetadataResult<T> item, string metadataFile, CancellationToken cancellationToken)
{
if (item == null)
{
@@ -72,7 +72,7 @@ namespace MediaBrowser.Controller.Providers
/// <param name="settings">The settings.</param>
/// <param name="encoding">The encoding.</param>
/// <param name="cancellationToken">The cancellation token.</param>
private void Fetch(T item, string metadataFile, XmlReaderSettings settings, Encoding encoding, CancellationToken cancellationToken)
private void Fetch(MetadataResult<T> item, string metadataFile, XmlReaderSettings settings, Encoding encoding, CancellationToken cancellationToken)
{
using (var streamReader = new StreamReader(metadataFile, encoding))
{
@@ -101,9 +101,11 @@ namespace MediaBrowser.Controller.Providers
/// Fetches metadata from one Xml Element
/// </summary>
/// <param name="reader">The reader.</param>
/// <param name="item">The item.</param>
protected virtual void FetchDataFromXmlNode(XmlReader reader, T item)
/// <param name="itemResult">The item result.</param>
protected virtual void FetchDataFromXmlNode(XmlReader reader, MetadataResult<T> itemResult)
{
var item = itemResult.Item;
switch (reader.Name)
{
// DateCreated
@@ -490,7 +492,7 @@ namespace MediaBrowser.Controller.Providers
{
continue;
}
PeopleHelper.AddPerson(item.People, p);
PeopleHelper.AddPerson(itemResult.People, p);
}
break;
}
@@ -502,7 +504,7 @@ namespace MediaBrowser.Controller.Providers
{
continue;
}
PeopleHelper.AddPerson(item.People, p);
PeopleHelper.AddPerson(itemResult.People, p);
}
break;
}
@@ -516,7 +518,7 @@ namespace MediaBrowser.Controller.Providers
{
// This is one of the mis-named "Actors" full nodes created by MB2
// Create a reader and pass it to the persons node processor
FetchDataFromPersonsNode(new XmlTextReader(new StringReader("<Persons>" + actors + "</Persons>")), item);
FetchDataFromPersonsNode(new XmlTextReader(new StringReader("<Persons>" + actors + "</Persons>")), itemResult);
}
else
{
@@ -527,7 +529,7 @@ namespace MediaBrowser.Controller.Providers
{
continue;
}
PeopleHelper.AddPerson(item.People, p);
PeopleHelper.AddPerson(itemResult.People, p);
}
}
break;
@@ -541,7 +543,7 @@ namespace MediaBrowser.Controller.Providers
{
continue;
}
PeopleHelper.AddPerson(item.People, p);
PeopleHelper.AddPerson(itemResult.People, p);
}
break;
}
@@ -833,7 +835,7 @@ namespace MediaBrowser.Controller.Providers
{
using (var subtree = reader.ReadSubtree())
{
FetchDataFromPersonsNode(subtree, item);
FetchDataFromPersonsNode(subtree, itemResult);
}
break;
}
@@ -1133,7 +1135,7 @@ namespace MediaBrowser.Controller.Providers
/// </summary>
/// <param name="reader">The reader.</param>
/// <param name="item">The item.</param>
private void FetchDataFromPersonsNode(XmlReader reader, T item)
private void FetchDataFromPersonsNode(XmlReader reader, MetadataResult<T> item)
{
reader.MoveToContent();

10
MediaBrowser.Controller/Providers/LocalMetadataResult.cs
View File

@@ -1,23 +1,17 @@
using System.Collections.Generic;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Entities;
using System.Collections.Generic;
namespace MediaBrowser.Controller.Providers
{
public class LocalMetadataResult<T>
public class LocalMetadataResult<T> : MetadataResult<T>
where T : IHasMetadata
{
public bool HasMetadata { get; set; }
public T Item { get; set; }
public List<LocalImageInfo> Images { get; set; }
public List<ChapterInfo> Chapters { get; set; }
public List<UserItemData> UserDataLIst { get; set; }
public LocalMetadataResult()
{
Images = new List<LocalImageInfo>();
Chapters = new List<ChapterInfo>();
UserDataLIst = new List<UserItemData>();
}
}

10
MediaBrowser.Controller/Providers/MetadataResult.cs
View File

@@ -1,8 +1,18 @@
using MediaBrowser.Controller.Entities;
using System.Collections.Generic;
namespace MediaBrowser.Controller.Providers
{
public class MetadataResult<T>
{
public List<PersonInfo> People { get; set; }
public bool HasMetadata { get; set; }
public T Item { get; set; }
public MetadataResult()
{
People = new List<PersonInfo>();
}
}
}