aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs12
-rw-r--r--MediaBrowser.Model/Configuration/UserConfiguration.cs4
-rw-r--r--MediaBrowser.Model/Dto/BaseItemDto.cs4
-rw-r--r--MediaBrowser.Model/Dto/BaseItemPerson.cs2
-rw-r--r--MediaBrowser.Model/Dto/ChapterInfoDto.cs2
-rw-r--r--MediaBrowser.Model/Dto/StudioDto.cs2
-rw-r--r--MediaBrowser.Model/Dto/UserDto.cs2
-rw-r--r--MediaBrowser.Model/Entities/BaseItemInfo.cs2
-rw-r--r--MediaBrowser.Model/Entities/MediaStream.cs25
-rw-r--r--MediaBrowser.Model/LiveTv/ProgramQuery.cs27
-rw-r--r--MediaBrowser.Model/LiveTv/RecordingInfoDto.cs6
-rw-r--r--MediaBrowser.Model/Session/SessionInfoDto.cs4
12 files changed, 88 insertions, 4 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index bdf072b50..f7b4cf373 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -223,7 +223,10 @@ namespace MediaBrowser.Model.Configuration
public string TranscodingTempPath { get; set; }
public bool EnableAutomaticRestart { get; set; }
-
+
+
+ public LiveTvOptions LiveTvOptions { get; set; }
+
/// <summary>
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
/// </summary>
@@ -287,6 +290,8 @@ namespace MediaBrowser.Model.Configuration
{
MaxBackdrops = 1
};
+
+ LiveTvOptions = new LiveTvOptions();
}
}
@@ -303,4 +308,9 @@ namespace MediaBrowser.Model.Configuration
HighQuality,
MaxQuality
}
+
+ public class LiveTvOptions
+ {
+ public int? GuideDays { get; set; }
+ }
}
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 90accff94..7cc61e7fd 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -67,6 +67,8 @@ namespace MediaBrowser.Model.Configuration
public bool BlockUnratedGames { get; set; }
public bool BlockUnratedBooks { get; set; }
+ public bool EnableLiveTvManagement { get; set; }
+
/// <summary>
/// Initializes a new instance of the <see cref="UserConfiguration" /> class.
/// </summary>
@@ -75,6 +77,8 @@ namespace MediaBrowser.Model.Configuration
IsAdministrator = true;
EnableRemoteControlOfOtherUsers = true;
BlockNotRated = false;
+
+ EnableLiveTvManagement = true;
}
}
}
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 665e36b88..af43ef200 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.Entities;
+using System.Diagnostics;
+using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -10,6 +11,7 @@ namespace MediaBrowser.Model.Dto
/// This is strictly used as a data transfer object from the api layer.
/// This holds information about a BaseItem in a format that is convenient for the client.
/// </summary>
+ [DebuggerDisplay("Name = {Name}, ID = {Id}, Type = {Type}")]
public class BaseItemDto : IHasProviderIds, INotifyPropertyChanged, IItemDto
{
/// <summary>
diff --git a/MediaBrowser.Model/Dto/BaseItemPerson.cs b/MediaBrowser.Model/Dto/BaseItemPerson.cs
index 9fd5e1a8a..1cc3f722d 100644
--- a/MediaBrowser.Model/Dto/BaseItemPerson.cs
+++ b/MediaBrowser.Model/Dto/BaseItemPerson.cs
@@ -1,5 +1,6 @@
using System;
using System.ComponentModel;
+using System.Diagnostics;
using System.Runtime.Serialization;
namespace MediaBrowser.Model.Dto
@@ -7,6 +8,7 @@ namespace MediaBrowser.Model.Dto
/// <summary>
/// This is used by the api to get information about a Person within a BaseItem
/// </summary>
+ [DebuggerDisplay("Name = {Name}, Role = {Role}, Type = {Type}")]
public class BaseItemPerson : INotifyPropertyChanged
{
/// <summary>
diff --git a/MediaBrowser.Model/Dto/ChapterInfoDto.cs b/MediaBrowser.Model/Dto/ChapterInfoDto.cs
index caa609a76..5a72110ce 100644
--- a/MediaBrowser.Model/Dto/ChapterInfoDto.cs
+++ b/MediaBrowser.Model/Dto/ChapterInfoDto.cs
@@ -1,5 +1,6 @@
using System;
using System.ComponentModel;
+using System.Diagnostics;
using System.Runtime.Serialization;
namespace MediaBrowser.Model.Dto
@@ -7,6 +8,7 @@ namespace MediaBrowser.Model.Dto
/// <summary>
/// Class ChapterInfo
/// </summary>
+ [DebuggerDisplay("Name = {Name}")]
public class ChapterInfoDto : INotifyPropertyChanged
{
/// <summary>
diff --git a/MediaBrowser.Model/Dto/StudioDto.cs b/MediaBrowser.Model/Dto/StudioDto.cs
index 9e2dea85d..696213a40 100644
--- a/MediaBrowser.Model/Dto/StudioDto.cs
+++ b/MediaBrowser.Model/Dto/StudioDto.cs
@@ -1,5 +1,6 @@
using System;
using System.ComponentModel;
+using System.Diagnostics;
using System.Runtime.Serialization;
namespace MediaBrowser.Model.Dto
@@ -7,6 +8,7 @@ namespace MediaBrowser.Model.Dto
/// <summary>
/// Class StudioDto
/// </summary>
+ [DebuggerDisplay("Name = {Name}")]
public class StudioDto
{
/// <summary>
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index a79ffc08c..dcf0843fe 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -1,4 +1,5 @@
using System.ComponentModel;
+using System.Diagnostics;
using MediaBrowser.Model.Configuration;
using System;
using System.Runtime.Serialization;
@@ -8,6 +9,7 @@ namespace MediaBrowser.Model.Dto
/// <summary>
/// Class UserDto
/// </summary>
+ [DebuggerDisplay("Name = {Name}, ID = {Id}, HasPassword = {HasPassword}")]
public class UserDto : INotifyPropertyChanged, IItemDto
{
/// <summary>
diff --git a/MediaBrowser.Model/Entities/BaseItemInfo.cs b/MediaBrowser.Model/Entities/BaseItemInfo.cs
index faf6fd47a..49f3e2d8f 100644
--- a/MediaBrowser.Model/Entities/BaseItemInfo.cs
+++ b/MediaBrowser.Model/Entities/BaseItemInfo.cs
@@ -1,4 +1,5 @@
using System;
+using System.Diagnostics;
using System.Runtime.Serialization;
namespace MediaBrowser.Model.Entities
@@ -6,6 +7,7 @@ namespace MediaBrowser.Model.Entities
/// <summary>
/// This is a stub class containing only basic information about an item
/// </summary>
+ [DebuggerDisplay("Name = {Name}, ID = {Id}, Type = {Type}")]
public class BaseItemInfo
{
/// <summary>
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 133631649..a8f751c10 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -1,9 +1,12 @@
-
+using System.Collections.Generic;
+using System.Diagnostics;
+
namespace MediaBrowser.Model.Entities
{
/// <summary>
/// Class MediaStream
/// </summary>
+ [DebuggerDisplay("StreamType = {Type}")]
public class MediaStream
{
/// <summary>
@@ -145,4 +148,24 @@ namespace MediaBrowser.Model.Entities
/// </summary>
Subtitle
}
+
+ public class MediaInfo
+ {
+ /// <summary>
+ /// Gets or sets the media streams.
+ /// </summary>
+ /// <value>The media streams.</value>
+ public List<MediaStream> MediaStreams { get; set; }
+
+ /// <summary>
+ /// Gets or sets the format.
+ /// </summary>
+ /// <value>The format.</value>
+ public string Format { get; set; }
+
+ public MediaInfo()
+ {
+ MediaStreams = new List<MediaStream>();
+ }
+ }
}
diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
index 36c06d4c0..a2a824994 100644
--- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
@@ -32,4 +32,31 @@ namespace MediaBrowser.Model.LiveTv
ChannelIdList = new string[] { };
}
}
+
+ public class RecommendedProgramQuery
+ {
+ /// <summary>
+ /// Gets or sets the user identifier.
+ /// </summary>
+ /// <value>The user identifier.</value>
+ public string UserId { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is airing.
+ /// </summary>
+ /// <value><c>true</c> if this instance is airing; otherwise, <c>false</c>.</value>
+ public bool? IsAiring { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance has aired.
+ /// </summary>
+ /// <value><c>null</c> if [has aired] contains no value, <c>true</c> if [has aired]; otherwise, <c>false</c>.</value>
+ public bool? HasAired { get; set; }
+
+ /// <summary>
+ /// The maximum number of items to return
+ /// </summary>
+ /// <value>The limit.</value>
+ public int? Limit { get; set; }
+ }
}
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index 0ef5c9dc0..389df2248 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -91,6 +91,12 @@ namespace MediaBrowser.Model.LiveTv
public DateTime EndDate { get; set; }
/// <summary>
+ /// Gets or sets the original air date.
+ /// </summary>
+ /// <value>The original air date.</value>
+ public DateTime? OriginalAirDate { get; set; }
+
+ /// <summary>
/// Gets or sets the status.
/// </summary>
/// <value>The status.</value>
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index 50dd4da67..083d1ef79 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -1,10 +1,12 @@
-using MediaBrowser.Model.Entities;
+using System.Diagnostics;
+using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using System.ComponentModel;
namespace MediaBrowser.Model.Session
{
+ [DebuggerDisplay("Client = {Client}, Username = {UserName}")]
public class SessionInfoDto : INotifyPropertyChanged
{
/// <summary>
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-28 05:38:02 +0000