mirror of
				https://github.com/jellyfin/jellyfin.git
				synced 2025-11-04 02:01:28 +01:00 
			
		
		
		
	update components
This commit is contained in:
		
							parent
							
								
									0ee1a0d7bd
								
							
						
					
					
						commit
						d8f48e8cdf
					
				@ -360,7 +360,6 @@ namespace Emby.Server.Implementations.Dto
 | 
				
			|||||||
            var collectionFolder = item as ICollectionFolder;
 | 
					            var collectionFolder = item as ICollectionFolder;
 | 
				
			||||||
            if (collectionFolder != null)
 | 
					            if (collectionFolder != null)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                dto.OriginalCollectionType = collectionFolder.CollectionType;
 | 
					 | 
				
			||||||
                dto.CollectionType = 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);
 | 
					                dto.PlayAccess = item.GetPlayAccess(user);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
@ -505,33 +504,6 @@ namespace Emby.Server.Implementations.Dto
 | 
				
			|||||||
                    dto.SupportsSync = true;
 | 
					                    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)
 | 
					        private int GetChildCount(Folder folder, User user)
 | 
				
			||||||
@ -882,20 +854,6 @@ namespace Emby.Server.Implementations.Dto
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
            dto.Container = item.Container;
 | 
					            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;
 | 
					            dto.EndDate = item.EndDate;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (fields.Contains(ItemFields.HomePageUrl))
 | 
					            if (fields.Contains(ItemFields.HomePageUrl))
 | 
				
			||||||
 | 
				
			|||||||
@ -237,13 +237,6 @@ namespace MediaBrowser.Api
 | 
				
			|||||||
            item.Name = request.Name;
 | 
					            item.Name = request.Name;
 | 
				
			||||||
            item.ForcedSortName = request.ForcedSortName;
 | 
					            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.OriginalTitle = string.IsNullOrWhiteSpace(request.OriginalTitle) ? null : request.OriginalTitle;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            item.CriticRating = request.CriticRating;
 | 
					            item.CriticRating = request.CriticRating;
 | 
				
			||||||
 | 
				
			|||||||
@ -20,11 +20,6 @@ namespace MediaBrowser.Controller.Entities
 | 
				
			|||||||
        public static ITVSeriesManager TVSeriesManager;
 | 
					        public static ITVSeriesManager TVSeriesManager;
 | 
				
			||||||
        public static IPlaylistManager PlaylistManager;
 | 
					        public static IPlaylistManager PlaylistManager;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public bool ContainsDynamicCategories(User user)
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
            return true;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        public override IEnumerable<Guid> GetIdsForAncestorQuery()
 | 
					        public override IEnumerable<Guid> GetIdsForAncestorQuery()
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            var list = new List<Guid>();
 | 
					            var list = new List<Guid>();
 | 
				
			||||||
 | 
				
			|||||||
@ -80,10 +80,8 @@ namespace MediaBrowser.Model.Dto
 | 
				
			|||||||
        public string PreferredMetadataCountryCode { get; set; }
 | 
					        public string PreferredMetadataCountryCode { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public string AwardSummary { get; set; }
 | 
					        public string AwardSummary { get; set; }
 | 
				
			||||||
        public string ShareUrl { get; set; }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public float? Metascore { get; set; }
 | 
					        public float? Metascore { get; set; }
 | 
				
			||||||
        public bool? HasDynamicCategories { get; set; }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// Gets or sets a value indicating whether [supports synchronize].
 | 
					        /// Gets or sets a value indicating whether [supports synchronize].
 | 
				
			||||||
@ -318,12 +316,6 @@ namespace MediaBrowser.Model.Dto
 | 
				
			|||||||
        /// <value>The trailer urls.</value>
 | 
					        /// <value>The trailer urls.</value>
 | 
				
			||||||
        public List<MediaUrl> RemoteTrailers { get; set; }
 | 
					        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>
 | 
					        /// <summary>
 | 
				
			||||||
        /// Gets or sets the provider ids.
 | 
					        /// Gets or sets the provider ids.
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
@ -395,11 +387,6 @@ namespace MediaBrowser.Model.Dto
 | 
				
			|||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
        /// <value>The user data.</value>
 | 
					        /// <value>The user data.</value>
 | 
				
			||||||
        public UserItemDataDto UserData { get; set; }
 | 
					        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>
 | 
					        /// <summary>
 | 
				
			||||||
        /// Gets or sets the recursive item count.
 | 
					        /// Gets or sets the recursive item count.
 | 
				
			||||||
@ -461,12 +448,6 @@ namespace MediaBrowser.Model.Dto
 | 
				
			|||||||
        /// <value>The air days.</value>
 | 
					        /// <value>The air days.</value>
 | 
				
			||||||
        public List<DayOfWeek> AirDays { get; set; }
 | 
					        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>
 | 
					        /// <summary>
 | 
				
			||||||
        /// Gets or sets the tags.
 | 
					        /// Gets or sets the tags.
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
@ -509,12 +490,6 @@ namespace MediaBrowser.Model.Dto
 | 
				
			|||||||
        /// <value>The type of the collection.</value>
 | 
					        /// <value>The type of the collection.</value>
 | 
				
			||||||
        public string CollectionType { get; set; }
 | 
					        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>
 | 
					        /// <summary>
 | 
				
			||||||
        /// Gets or sets the display order.
 | 
					        /// Gets or sets the display order.
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
@ -711,18 +686,6 @@ namespace MediaBrowser.Model.Dto
 | 
				
			|||||||
        /// <value>The home page URL.</value>
 | 
					        /// <value>The home page URL.</value>
 | 
				
			||||||
        public string HomePageUrl { get; set; }
 | 
					        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>
 | 
					        /// <summary>
 | 
				
			||||||
        /// Gets or sets the locked fields.
 | 
					        /// Gets or sets the locked fields.
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
@ -930,15 +893,6 @@ namespace MediaBrowser.Model.Dto
 | 
				
			|||||||
            get { return StringHelper.EqualsIgnoreCase(Type, "Studio"); }
 | 
					            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>
 | 
					        /// <summary>
 | 
				
			||||||
        /// Gets or sets the program identifier.
 | 
					        /// Gets or sets the program identifier.
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user