aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-18 23:13:54 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-18 23:13:54 -0500
commitd8f48e8cdfbee12507f3b1e1235309ef2507416c (patch)
tree099de4f91dac686ee19b3213267a0d76b2003f8b
parent0ee1a0d7bd827e53351ee5e4ad21c4dda258362d (diff)
update components
-rw-r--r--Emby.Server.Implementations/Dto/DtoService.cs44
-rw-r--r--MediaBrowser.Api/ItemUpdateService.cs7
-rw-r--r--MediaBrowser.Controller/Entities/UserView.cs5
-rw-r--r--MediaBrowser.Model/Dto/BaseItemDto.cs46
4 files changed, 1 insertions, 101 deletions
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 824812494..696be80ed 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -360,7 +360,6 @@ namespace Emby.Server.Implementations.Dto
var collectionFolder = item as ICollectionFolder;
if (collectionFolder != null)
{
- dto.OriginalCollectionType = collectionFolder.CollectionType;
dto.CollectionType = collectionFolder.CollectionType;
}
@@ -492,7 +491,7 @@ namespace Emby.Server.Implementations.Dto
}
}
- if (!(item is LiveTvProgram))
+ //if (!(item is LiveTvProgram))
{
dto.PlayAccess = item.GetPlayAccess(user);
}
@@ -505,33 +504,6 @@ namespace Emby.Server.Implementations.Dto
dto.SupportsSync = true;
}
}
-
- if (fields.Contains(ItemFields.SeasonUserData))
- {
- var episode = item as Episode;
-
- if (episode != null)
- {
- var season = episode.Season;
-
- if (season != null)
- {
- dto.SeasonUserData = await _userDataRepository.GetUserDataDto(season, user).ConfigureAwait(false);
- }
- }
- }
-
- var userView = item as UserView;
- if (userView != null)
- {
- dto.HasDynamicCategories = userView.ContainsDynamicCategories(user);
- }
-
- var collectionFolder = item as ICollectionFolder;
- if (collectionFolder != null)
- {
- dto.HasDynamicCategories = false;
- }
}
private int GetChildCount(Folder folder, User user)
@@ -882,20 +854,6 @@ namespace Emby.Server.Implementations.Dto
}
dto.Container = item.Container;
- var hasBudget = item as IHasBudget;
- if (hasBudget != null)
- {
- if (fields.Contains(ItemFields.Budget))
- {
- dto.Budget = hasBudget.Budget;
- }
-
- if (fields.Contains(ItemFields.Revenue))
- {
- dto.Revenue = hasBudget.Revenue;
- }
- }
-
dto.EndDate = item.EndDate;
if (fields.Contains(ItemFields.HomePageUrl))
diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs
index dcaf7c676..cadf52be1 100644
--- a/MediaBrowser.Api/ItemUpdateService.cs
+++ b/MediaBrowser.Api/ItemUpdateService.cs
@@ -237,13 +237,6 @@ namespace MediaBrowser.Api
item.Name = request.Name;
item.ForcedSortName = request.ForcedSortName;
- var hasBudget = item as IHasBudget;
- if (hasBudget != null)
- {
- hasBudget.Budget = request.Budget;
- hasBudget.Revenue = request.Revenue;
- }
-
item.OriginalTitle = string.IsNullOrWhiteSpace(request.OriginalTitle) ? null : request.OriginalTitle;
item.CriticRating = request.CriticRating;
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index 5ac5843d7..fb00937fb 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -20,11 +20,6 @@ namespace MediaBrowser.Controller.Entities
public static ITVSeriesManager TVSeriesManager;
public static IPlaylistManager PlaylistManager;
- public bool ContainsDynamicCategories(User user)
- {
- return true;
- }
-
public override IEnumerable<Guid> GetIdsForAncestorQuery()
{
var list = new List<Guid>();
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index f8e1ca1b4..c78c92967 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -80,10 +80,8 @@ namespace MediaBrowser.Model.Dto
public string PreferredMetadataCountryCode { get; set; }
public string AwardSummary { get; set; }
- public string ShareUrl { get; set; }
public float? Metascore { get; set; }
- public bool? HasDynamicCategories { get; set; }
/// <summary>
/// Gets or sets a value indicating whether [supports synchronize].
@@ -319,12 +317,6 @@ namespace MediaBrowser.Model.Dto
public List<MediaUrl> RemoteTrailers { get; set; }
/// <summary>
- /// Gets or sets the soundtrack ids.
- /// </summary>
- /// <value>The soundtrack ids.</value>
- public string[] SoundtrackIds { get; set; }
-
- /// <summary>
/// Gets or sets the provider ids.
/// </summary>
/// <value>The provider ids.</value>
@@ -395,11 +387,6 @@ namespace MediaBrowser.Model.Dto
/// </summary>
/// <value>The user data.</value>
public UserItemDataDto UserData { get; set; }
- /// <summary>
- /// Gets or sets the season user data.
- /// </summary>
- /// <value>The season user data.</value>
- public UserItemDataDto SeasonUserData { get; set; }
/// <summary>
/// Gets or sets the recursive item count.
@@ -462,12 +449,6 @@ namespace MediaBrowser.Model.Dto
public List<DayOfWeek> AirDays { get; set; }
/// <summary>
- /// Gets or sets the index options.
- /// </summary>
- /// <value>The index options.</value>
- public string[] IndexOptions { get; set; }
-
- /// <summary>
/// Gets or sets the tags.
/// </summary>
/// <value>The tags.</value>
@@ -510,12 +491,6 @@ namespace MediaBrowser.Model.Dto
public string CollectionType { get; set; }
/// <summary>
- /// Gets or sets the type of the original collection.
- /// </summary>
- /// <value>The type of the original collection.</value>
- public string OriginalCollectionType { get; set; }
-
- /// <summary>
/// Gets or sets the display order.
/// </summary>
/// <value>The display order.</value>
@@ -712,18 +687,6 @@ namespace MediaBrowser.Model.Dto
public string HomePageUrl { get; set; }
/// <summary>
- /// Gets or sets the budget.
- /// </summary>
- /// <value>The budget.</value>
- public double? Budget { get; set; }
-
- /// <summary>
- /// Gets or sets the revenue.
- /// </summary>
- /// <value>The revenue.</value>
- public double? Revenue { get; set; }
-
- /// <summary>
/// Gets or sets the locked fields.
/// </summary>
/// <value>The locked fields.</value>
@@ -930,15 +893,6 @@ namespace MediaBrowser.Model.Dto
get { return StringHelper.EqualsIgnoreCase(Type, "Studio"); }
}
- [IgnoreDataMember]
- public bool SupportsSimilarItems
- {
- get
- {
- return IsType("Movie") || IsType("Series") || IsType("MusicAlbum") || IsType("MusicArtist") || IsType("Program") || IsType("Recording") || IsType("ChannelVideoItem") || IsType("Game");
- }
- }
-
/// <summary>
/// Gets or sets the program identifier.
/// </summary>