diff options
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/IO/IZipClient.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/ProgramQuery.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/QueryFilters.cs | 18 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/SystemInfo.cs | 2 |
5 files changed, 22 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index f2c3b7cc8a..41ed0648a6 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -61,6 +61,8 @@ namespace MediaBrowser.Model.Configuration /// <value><c>true</c> if this instance is port authorized; otherwise, <c>false</c>.</value> public bool IsPortAuthorized { get; set; } + public bool AutoRunWebApp { get; set; } + /// <summary> /// Gets or sets a value indicating whether [enable case sensitive item ids]. /// </summary> diff --git a/MediaBrowser.Model/IO/IZipClient.cs b/MediaBrowser.Model/IO/IZipClient.cs index 2dc4880c2f..4ebcba9d89 100644 --- a/MediaBrowser.Model/IO/IZipClient.cs +++ b/MediaBrowser.Model/IO/IZipClient.cs @@ -24,6 +24,7 @@ namespace MediaBrowser.Model.IO void ExtractAll(Stream source, string targetPath, bool overwriteExistingFiles); void ExtractAllFromGz(Stream source, string targetPath, bool overwriteExistingFiles); + void ExtractFirstFileFromGz(Stream source, string targetPath, string defaultFileName); /// <summary> /// Extracts all from zip. diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs index c0959635f3..ec3f8ad672 100644 --- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs +++ b/MediaBrowser.Model/LiveTv/ProgramQuery.cs @@ -14,6 +14,7 @@ namespace MediaBrowser.Model.LiveTv ChannelIds = new string[] { }; OrderBy = new Tuple<string, SortOrder>[] { }; Genres = new string[] { }; + GenreIds = new string[] { }; EnableTotalRecordCount = true; EnableUserData = true; } @@ -110,6 +111,7 @@ namespace MediaBrowser.Model.LiveTv /// Limit results to items containing specific genres /// </summary> /// <value>The genres.</value> + public string[] GenreIds { get; set; } public string[] Genres { get; set; } } }
\ No newline at end of file diff --git a/MediaBrowser.Model/Querying/QueryFilters.cs b/MediaBrowser.Model/Querying/QueryFilters.cs index dd575c2a88..3a261857bd 100644 --- a/MediaBrowser.Model/Querying/QueryFilters.cs +++ b/MediaBrowser.Model/Querying/QueryFilters.cs @@ -1,14 +1,15 @@ - +using MediaBrowser.Model.Dto; + namespace MediaBrowser.Model.Querying { - public class QueryFilters + public class QueryFiltersLegacy { public string[] Genres { get; set; } public string[] Tags { get; set; } public string[] OfficialRatings { get; set; } public int[] Years { get; set; } - public QueryFilters() + public QueryFiltersLegacy() { Genres = new string[] { }; Tags = new string[] { }; @@ -16,4 +17,15 @@ namespace MediaBrowser.Model.Querying Years = new int[] { }; } } + public class QueryFilters + { + public NameIdPair[] Genres { get; set; } + public string[] Tags { get; set; } + + public QueryFilters() + { + Tags = new string[] { }; + Genres = new NameIdPair[] { }; + } + } } diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index b61d637293..9ed0f904f0 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -68,6 +68,8 @@ namespace MediaBrowser.Model.System /// <value><c>true</c> if this instance can self update; otherwise, <c>false</c>.</value> public bool CanSelfUpdate { get; set; } + public bool CanLaunchWebBrowser { get; set; } + /// <summary> /// Gets or sets plugin assemblies that failed to load. /// </summary> |