diff options
Diffstat (limited to 'MediaBrowser.Model/Configuration')
5 files changed, 74 insertions, 45 deletions
diff --git a/MediaBrowser.Model/Configuration/FanartOptions.cs b/MediaBrowser.Model/Configuration/FanartOptions.cs new file mode 100644 index 000000000..e992abe5d --- /dev/null +++ b/MediaBrowser.Model/Configuration/FanartOptions.cs @@ -0,0 +1,17 @@ + +namespace MediaBrowser.Model.Configuration +{ + public class FanartOptions + { + /// <summary> + /// Gets or sets a value indicating whether [enable automatic updates]. + /// </summary> + /// <value><c>true</c> if [enable automatic updates]; otherwise, <c>false</c>.</value> + public bool EnableAutomaticUpdates { get; set; } + /// <summary> + /// Gets or sets the user API key. + /// </summary> + /// <value>The user API key.</value> + public string UserApiKey { get; set; } + } +} diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index f9c5c6567..c15c76004 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -21,6 +21,12 @@ namespace MediaBrowser.Model.Configuration public int PublicPort { get; set; } /// <summary> + /// Gets or sets the public HTTPS port. + /// </summary> + /// <value>The public HTTPS port.</value> + public int PublicHttpsPort { get; set; } + + /// <summary> /// Gets or sets the HTTP server port number. /// </summary> /// <value>The HTTP server port number.</value> @@ -31,7 +37,19 @@ namespace MediaBrowser.Model.Configuration /// </summary> /// <value>The HTTPS server port number.</value> public int HttpsPortNumber { get; set; } - + + /// <summary> + /// Gets or sets a value indicating whether [use HTTPS]. + /// </summary> + /// <value><c>true</c> if [use HTTPS]; otherwise, <c>false</c>.</value> + public bool EnableHttps { get; set; } + + /// <summary> + /// Gets or sets the value pointing to the file system where the ssl certiifcate is located.. + /// </summary> + /// <value>The value pointing to the file system where the ssl certiifcate is located..</value> + public string CertificatePath { get; set; } + /// <summary> /// Gets or sets a value indicating whether [enable internet providers]. /// </summary> @@ -73,6 +91,12 @@ namespace MediaBrowser.Model.Configuration /// </summary> /// <value><c>true</c> if [enable localized guids]; otherwise, <c>false</c>.</value> public bool EnableLocalizedGuids { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether [enable library metadata sub folder]. + /// </summary> + /// <value><c>true</c> if [enable library metadata sub folder]; otherwise, <c>false</c>.</value> + public bool EnableLibraryMetadataSubFolder { get; set; } /// <summary> /// Gets or sets the preferred metadata language. @@ -136,6 +160,7 @@ namespace MediaBrowser.Model.Configuration /// </summary> /// <value><c>true</c> if [enable dashboard response caching]; otherwise, <c>false</c>.</value> public bool EnableDashboardResponseCaching { get; set; } + public bool EnableDashboardResourceMinification { get; set; } /// <summary> /// Allows the dashboard to be served from a custom path. @@ -143,13 +168,8 @@ namespace MediaBrowser.Model.Configuration /// <value>The dashboard source path.</value> public string DashboardSourcePath { get; set; } - /// <summary> - /// Gets or sets a value indicating whether [enable tv db updates]. - /// </summary> - /// <value><c>true</c> if [enable tv db updates]; otherwise, <c>false</c>.</value> - public bool EnableTvDbUpdates { get; set; } - public bool EnableTmdbUpdates { get; set; } - public bool EnableFanArtUpdates { get; set; } + public bool MergeMetadataAndImagesByName { get; set; } + public bool EnableStandaloneMetadata { get; set; } /// <summary> /// Gets or sets the image saving convention. @@ -177,13 +197,14 @@ namespace MediaBrowser.Model.Configuration public string[] InsecureApps8 { get; set; } public bool SaveMetadataHidden { get; set; } - public bool EnableWin8HttpListener { get; set; } public NameValuePair[] ContentTypes { get; set; } public bool EnableAudioArchiveFiles { get; set; } public bool EnableVideoArchiveFiles { get; set; } + public bool EnableLegacyCollections { get; set; } + /// <summary> /// Initializes a new instance of the <see cref="ServerConfiguration" /> class. /// </summary> @@ -192,12 +213,14 @@ namespace MediaBrowser.Model.Configuration { ImageSavingConvention = ImageSavingConvention.Compatible; PublicPort = 8096; + PublicHttpsPort = 8920; HttpServerPortNumber = 8096; HttpsPortNumber = 8920; + EnableHttps = false; EnableDashboardResponseCaching = true; + EnableDashboardResourceMinification = true; EnableAutomaticRestart = true; - EnableWin8HttpListener = true; EnableUPnP = true; diff --git a/MediaBrowser.Model/Configuration/TheMovieDbOptions.cs b/MediaBrowser.Model/Configuration/TheMovieDbOptions.cs new file mode 100644 index 000000000..9a73e3476 --- /dev/null +++ b/MediaBrowser.Model/Configuration/TheMovieDbOptions.cs @@ -0,0 +1,12 @@ + +namespace MediaBrowser.Model.Configuration +{ + public class TheMovieDbOptions + { + /// <summary> + /// Gets or sets a value indicating whether [enable automatic updates]. + /// </summary> + /// <value><c>true</c> if [enable automatic updates]; otherwise, <c>false</c>.</value> + public bool EnableAutomaticUpdates { get; set; } + } +} diff --git a/MediaBrowser.Model/Configuration/TvdbOptions.cs b/MediaBrowser.Model/Configuration/TvdbOptions.cs new file mode 100644 index 000000000..034af609c --- /dev/null +++ b/MediaBrowser.Model/Configuration/TvdbOptions.cs @@ -0,0 +1,12 @@ + +namespace MediaBrowser.Model.Configuration +{ + public class TvdbOptions + { + /// <summary> + /// Gets or sets a value indicating whether [enable automatic updates]. + /// </summary> + /// <value><c>true</c> if [enable automatic updates]; otherwise, <c>false</c>.</value> + public bool EnableAutomaticUpdates { get; set; } + } +} diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs index 9e33c1c36..aa49ee50d 100644 --- a/MediaBrowser.Model/Configuration/UserConfiguration.cs +++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs @@ -7,12 +7,6 @@ namespace MediaBrowser.Model.Configuration public class UserConfiguration { /// <summary> - /// Gets or sets the max parental rating. - /// </summary> - /// <value>The max parental rating.</value> - public int? MaxParentalRating { get; set; } - - /// <summary> /// Gets or sets a value indicating whether this instance is administrator. /// </summary> /// <value><c>true</c> if this instance is administrator; otherwise, <c>false</c>.</value> @@ -36,22 +30,8 @@ namespace MediaBrowser.Model.Configuration /// <value>The subtitle language preference.</value> public string SubtitleLanguagePreference { get; set; } - /// <summary> - /// Gets or sets a value indicating whether this instance is hidden. - /// </summary> - /// <value><c>true</c> if this instance is hidden; otherwise, <c>false</c>.</value> - public bool IsHidden { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance is disabled. - /// </summary> - /// <value><c>true</c> if this instance is disabled; otherwise, <c>false</c>.</value> - public bool IsDisabled { get; set; } - public bool DisplayMissingEpisodes { get; set; } public bool DisplayUnairedEpisodes { get; set; } - public bool EnableRemoteControlOfOtherUsers { get; set; } - public bool EnableSharedDeviceControl { get; set; } public bool EnableLiveTvManagement { get; set; } public bool EnableLiveTvAccess { get; set; } @@ -61,9 +41,6 @@ namespace MediaBrowser.Model.Configuration public bool GroupMoviesIntoBoxSets { get; set; } - public string[] BlockedMediaFolders { get; set; } - public string[] BlockedChannels { get; set; } - public string[] DisplayChannelsWithinViews { get; set; } public string[] ExcludeFoldersFromGrouping { get; set; } @@ -82,12 +59,7 @@ namespace MediaBrowser.Model.Configuration public bool EnableCinemaMode { get; set; } - public AccessSchedule[] AccessSchedules { get; set; } - - public bool EnableUserPreferenceAccess { get; set; } - public string[] LatestItemsExcludes { get; set; } - public string[] BlockedTags { get; set; } public bool HasMigratedToPolicy { get; set; } @@ -100,14 +72,10 @@ namespace MediaBrowser.Model.Configuration EnableLiveTvManagement = true; EnableMediaPlayback = true; EnableLiveTvAccess = true; - EnableSharedDeviceControl = true; LatestItemsExcludes = new string[] { }; OrderedViews = new string[] { }; - BlockedMediaFolders = new string[] { }; DisplayChannelsWithinViews = new string[] { }; - BlockedTags = new string[] { }; - BlockedChannels = new string[] { }; BlockUnratedItems = new UnratedItem[] { }; ExcludeFoldersFromGrouping = new string[] { }; @@ -115,9 +83,6 @@ namespace MediaBrowser.Model.Configuration IncludeTrailersInSuggestions = true; EnableCinemaMode = true; - EnableUserPreferenceAccess = true; - - AccessSchedules = new AccessSchedule[] { }; } } } |