diff options
Diffstat (limited to 'MediaBrowser.Controller')
7 files changed, 63 insertions, 22 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index be64d20c3..80fa3b869 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -236,6 +236,10 @@ namespace MediaBrowser.Controller.Entities { return DontFetchMeta; } + set + { + DontFetchMeta = value; + } } public bool IsUnidentified { get; set; } diff --git a/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs b/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs index 8387881cf..7482607ff 100644 --- a/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs +++ b/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs @@ -16,6 +16,9 @@ namespace MediaBrowser.Controller.Library public BaseItemInfo MediaInfo { get; set; } public string MediaSourceId { get; set; } + public string DeviceName { get; set; } + public string ClientName { get; set; } + public PlaybackProgressEventArgs() { Users = new List<User>(); diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 417c03f27..b54ad2272 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -168,7 +168,9 @@ <Compile Include="Net\IRestfulService.cs" /> <Compile Include="News\INewsService.cs" /> <Compile Include="Notifications\INotificationManager.cs" /> + <Compile Include="Notifications\INotificationService.cs" /> <Compile Include="Notifications\INotificationsRepository.cs" /> + <Compile Include="Notifications\INotificationTypeFactory.cs" /> <Compile Include="Notifications\NotificationUpdateEventArgs.cs" /> <Compile Include="Notifications\UserNotification.cs" /> <Compile Include="Persistence\IFileOrganizationRepository.cs" /> diff --git a/MediaBrowser.Controller/Notifications/INotificationManager.cs b/MediaBrowser.Controller/Notifications/INotificationManager.cs index 8ed62f59f..cb1e3da90 100644 --- a/MediaBrowser.Controller/Notifications/INotificationManager.cs +++ b/MediaBrowser.Controller/Notifications/INotificationManager.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Controller.Entities; -using MediaBrowser.Model.Notifications; +using MediaBrowser.Model.Notifications; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -20,30 +19,19 @@ namespace MediaBrowser.Controller.Notifications /// Adds the parts. /// </summary> /// <param name="services">The services.</param> - void AddParts(IEnumerable<INotificationService> services); - } + /// <param name="notificationTypeFactories">The notification type factories.</param> + void AddParts(IEnumerable<INotificationService> services, IEnumerable<INotificationTypeFactory> notificationTypeFactories); - public interface INotificationService - { /// <summary> - /// Gets the name. + /// Gets the notification types. /// </summary> - /// <value>The name.</value> - string Name { get; } - - /// <summary> - /// Sends the notification. - /// </summary> - /// <param name="request">The request.</param> - /// <param name="cancellationToken">The cancellation token.</param> - /// <returns>Task.</returns> - Task SendNotification(UserNotification request, CancellationToken cancellationToken); + /// <returns>IEnumerable{NotificationTypeInfo}.</returns> + IEnumerable<NotificationTypeInfo> GetNotificationTypes(); /// <summary> - /// Determines whether [is enabled for user] [the specified user identifier]. + /// Gets the notification services. /// </summary> - /// <param name="user">The user.</param> - /// <returns><c>true</c> if [is enabled for user] [the specified user identifier]; otherwise, <c>false</c>.</returns> - bool IsEnabledForUser(User user); + /// <returns>IEnumerable{NotificationServiceInfo}.</returns> + IEnumerable<NotificationServiceInfo> GetNotificationServices(); } } diff --git a/MediaBrowser.Controller/Notifications/INotificationService.cs b/MediaBrowser.Controller/Notifications/INotificationService.cs new file mode 100644 index 000000000..b1e313b87 --- /dev/null +++ b/MediaBrowser.Controller/Notifications/INotificationService.cs @@ -0,0 +1,30 @@ +using MediaBrowser.Controller.Entities; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Controller.Notifications +{ + public interface INotificationService + { + /// <summary> + /// Gets the name. + /// </summary> + /// <value>The name.</value> + string Name { get; } + + /// <summary> + /// Sends the notification. + /// </summary> + /// <param name="request">The request.</param> + /// <param name="cancellationToken">The cancellation token.</param> + /// <returns>Task.</returns> + Task SendNotification(UserNotification request, CancellationToken cancellationToken); + + /// <summary> + /// Determines whether [is enabled for user] [the specified user identifier]. + /// </summary> + /// <param name="user">The user.</param> + /// <returns><c>true</c> if [is enabled for user] [the specified user identifier]; otherwise, <c>false</c>.</returns> + bool IsEnabledForUser(User user); + } +} diff --git a/MediaBrowser.Controller/Notifications/INotificationTypeFactory.cs b/MediaBrowser.Controller/Notifications/INotificationTypeFactory.cs new file mode 100644 index 000000000..bf92aae2d --- /dev/null +++ b/MediaBrowser.Controller/Notifications/INotificationTypeFactory.cs @@ -0,0 +1,14 @@ +using MediaBrowser.Model.Notifications; +using System.Collections.Generic; + +namespace MediaBrowser.Controller.Notifications +{ + public interface INotificationTypeFactory + { + /// <summary> + /// Gets the notification types. + /// </summary> + /// <returns>IEnumerable{NotificationTypeInfo}.</returns> + IEnumerable<NotificationTypeInfo> GetNotificationTypes(); + } +} diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs index 70b49efec..e24daf853 100644 --- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs @@ -429,7 +429,7 @@ namespace MediaBrowser.Controller.Providers if (!string.IsNullOrWhiteSpace(val)) { - item.DontFetchMeta = string.Equals("true", val, StringComparison.OrdinalIgnoreCase); + item.IsLocked = string.Equals("true", val, StringComparison.OrdinalIgnoreCase); } break; } |