alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 01:54:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

add tvdb and games db to xml savers

Browse Source
This commit is contained in:
Luke Pulverenti
2013-07-16 13:18:32 -04:00
parent c1ad234b79
commit 44493dca1d
7 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MediaBrowser.Controller/Dto/DtoBuilder.cs
View File

@@ -275,11 +275,9 @@ namespace MediaBrowser.Controller.Dto
dto.DisplayPreferencesId = ((Folder)item).GetDisplayPreferencesId(user.Id).ToString();
}
var addUserData = fields.Contains(ItemFields.UserData);
if (item.IsFolder)
{
if (fields.Contains(ItemFields.ItemCounts) || addUserData)
if (fields.Contains(ItemFields.ItemCounts))
{
var folder = (Folder)item;
@@ -290,16 +288,13 @@ namespace MediaBrowser.Controller.Dto
}
}
if (addUserData)
var userData = _userDataRepository.GetUserData(user.Id, item.GetUserDataKey());
dto.UserData = GetUserItemDataDto(userData);
if (item.IsFolder)
{
var userData = _userDataRepository.GetUserData(user.Id, item.GetUserDataKey());
dto.UserData = GetUserItemDataDto(userData);
if (item.IsFolder)
{
dto.UserData.Played = dto.PlayedPercentage.HasValue && dto.PlayedPercentage.Value >= 100;
}
dto.UserData.Played = dto.PlayedPercentage.HasValue && dto.PlayedPercentage.Value >= 100;
}
}

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

@@ -992,8 +992,13 @@ namespace MediaBrowser.Controller.Entities
return true;
}
var rating = CustomRating ?? OfficialRating;
var rating = CustomRating;
if (string.IsNullOrEmpty(rating))
{
rating = OfficialRating;
}
if (string.IsNullOrEmpty(rating))
{
return !user.Configuration.BlockNotRated;

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

@@ -1,5 +1,6 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Progress;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Localization;
@@ -139,6 +140,11 @@ namespace MediaBrowser.Controller.Entities
{
get
{
if (this is Series)
{
return base.OfficialRating;
}
return !string.IsNullOrEmpty(base.OfficialRating) ? base.OfficialRating : "None";
}
set

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

@@ -464,6 +464,22 @@ namespace MediaBrowser.Controller.Providers
break;
}
case "TvDbId":
var tvdbId = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(tvdbId))
{
item.SetProviderId(MetadataProviders.Tvdb, tvdbId);
}
break;
case "GamesDbId":
var gamesdbId = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(gamesdbId))
{
item.SetProviderId(MetadataProviders.Gamesdb, gamesdbId);
}
break;
case "MusicbrainzId":
var mbz = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(mbz))