Pushing missing changes

3 files changed, 483 insertions, 54 deletions

diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index 41eb1da2c..61b177df9 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -1,24 +1,80 @@
-using ProtoBuf;

-

-namespace MediaBrowser.Model.Configuration

-{

-    /// <summary>

-    /// Serves as a common base class for the Server and UI application Configurations

-    /// ProtoInclude tells Protobuf about subclasses,

-    /// The number 50 can be any number, so long as it doesn't clash with any of the ProtoMember numbers either here or in subclasses.

-    /// </summary>

-    [ProtoContract, ProtoInclude(50, typeof(ServerConfiguration))]

-    public class BaseApplicationConfiguration

-    {

-        [ProtoMember(1)]

-        public bool EnableDebugLevelLogging { get; set; }

-

-        [ProtoMember(2)]

-        public int HttpServerPortNumber { get; set; }

-

-        public BaseApplicationConfiguration()

-        {

-            HttpServerPortNumber = 8096;

-        }

-    }

-}

+using ProtoBuf;
+
+namespace MediaBrowser.Model.Configuration
+{
+    /// <summary>
+    /// Serves as a common base class for the Server and UI application Configurations
+    /// ProtoInclude tells Protobuf about subclasses,
+    /// The number 50 can be any number, so long as it doesn't clash with any of the ProtoMember numbers either here or in subclasses.
+    /// </summary>
+    [ProtoContract, ProtoInclude(965, typeof(ServerConfiguration))]
+    public class BaseApplicationConfiguration
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable debug level logging].
+        /// </summary>
+        /// <value><c>true</c> if [enable debug level logging]; otherwise, <c>false</c>.</value>
+        [ProtoMember(1)]
+        public bool EnableDebugLevelLogging { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable HTTP level logging].
+        /// </summary>
+        /// <value><c>true</c> if [enable HTTP level logging]; otherwise, <c>false</c>.</value>
+        [ProtoMember(56)]
+        public bool EnableHttpLevelLogging { get; set; }
+
+        /// <summary>
+        /// Gets or sets the HTTP server port number.
+        /// </summary>
+        /// <value>The HTTP server port number.</value>
+        [ProtoMember(2)]
+        public int HttpServerPortNumber { get; set; }
+
+        /// <summary>
+        /// Enable automatically and silently updating of the application
+        /// </summary>
+        /// <value><c>true</c> if [enable auto update]; otherwise, <c>false</c>.</value>
+        [ProtoMember(3)]
+        public bool EnableAutoUpdate { get; set; }
+
+        /// <summary>
+        /// The number of days we should retain log files
+        /// </summary>
+        /// <value>The log file retention days.</value>
+        [ProtoMember(5)]
+        public int LogFileRetentionDays { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [run at startup].
+        /// </summary>
+        /// <value><c>true</c> if [run at startup]; otherwise, <c>false</c>.</value>
+        [ProtoMember(58)]
+        public bool RunAtStartup { get; set; }
+
+        /// <summary>
+        /// Gets or sets the legacy web socket port number.
+        /// </summary>
+        /// <value>The legacy web socket port number.</value>
+        [ProtoMember(59)]
+        public int LegacyWebSocketPortNumber { get; set; }
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.
+        /// </summary>
+        public BaseApplicationConfiguration()
+        {
+            HttpServerPortNumber = 8096;
+            LegacyWebSocketPortNumber = 8945;
+
+            EnableAutoUpdate = true;
+            LogFileRetentionDays = 14;
+
+            EnableHttpLevelLogging = true;
+
+#if (DEBUG)
+            EnableDebugLevelLogging = true;
+#endif
+        }
+    }
+}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 5bcd09ef0..56bc43425 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,30 +1,342 @@
-using MediaBrowser.Model.Weather;

-using ProtoBuf;

-

-namespace MediaBrowser.Model.Configuration

-{

-    /// <summary>

-    /// Represents the server configuration.

-    /// </summary>

-    [ProtoContract]

-    public class ServerConfiguration : BaseApplicationConfiguration

-    {

-        [ProtoMember(3)]

-        public bool EnableInternetProviders { get; set; }

-

-        [ProtoMember(4)]

-        public bool EnableUserProfiles { get; set; }

-

-        [ProtoMember(5)]

-        public string WeatherZipCode { get; set; }

-

-        [ProtoMember(6)]

-        public WeatherUnits WeatherUnit { get; set; }

-

-        public ServerConfiguration()

-            : base()

-        {

-            EnableUserProfiles = true;

-        }

-    }

-}

+using MediaBrowser.Model.Weather;
+using ProtoBuf;
+using System;
+
+namespace MediaBrowser.Model.Configuration
+{
+    /// <summary>
+    /// Represents the server configuration.
+    /// </summary>
+    [ProtoContract]
+    public class ServerConfiguration : BaseApplicationConfiguration
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable internet providers].
+        /// </summary>
+        /// <value><c>true</c> if [enable internet providers]; otherwise, <c>false</c>.</value>
+        [ProtoMember(6)]
+        public bool EnableInternetProviders { get; set; }
+
+        /// <summary>
+        /// Gets or sets the zip code to use when displaying weather
+        /// </summary>
+        /// <value>The weather location.</value>
+        [ProtoMember(7)]
+        public string WeatherLocation { get; set; }
+
+        /// <summary>
+        /// Gets or sets the weather unit to use when displaying weather
+        /// </summary>
+        /// <value>The weather unit.</value>
+        [ProtoMember(8)]
+        public WeatherUnits WeatherUnit { get; set; }
+
+        /// <summary>
+        /// Gets or sets the metadata refresh days.
+        /// </summary>
+        /// <value>The metadata refresh days.</value>
+        [ProtoMember(9)]
+        public int MetadataRefreshDays { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [save local meta].
+        /// </summary>
+        /// <value><c>true</c> if [save local meta]; otherwise, <c>false</c>.</value>
+        [ProtoMember(10)]
+        public bool SaveLocalMeta { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [refresh item images].
+        /// </summary>
+        /// <value><c>true</c> if [refresh item images]; otherwise, <c>false</c>.</value>
+        [ProtoMember(11)]
+        public bool RefreshItemImages { get; set; }
+
+        /// <summary>
+        /// Gets or sets the preferred metadata language.
+        /// </summary>
+        /// <value>The preferred metadata language.</value>
+        [ProtoMember(12)]
+        public string PreferredMetadataLanguage { get; set; }
+
+        /// <summary>
+        /// Gets or sets the metadata country code.
+        /// </summary>
+        /// <value>The metadata country code.</value>
+        [ProtoMember(13)]
+        public string MetadataCountryCode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the size of the TMDB fetched poster.
+        /// </summary>
+        /// <value>The size of the TMDB fetched poster.</value>
+        [ProtoMember(14)]
+        public string TmdbFetchedPosterSize { get; set; }
+
+        /// <summary>
+        /// Gets or sets the size of the TMDB fetched profile.
+        /// </summary>
+        /// <value>The size of the TMDB fetched profile.</value>
+        [ProtoMember(15)]
+        public string TmdbFetchedProfileSize { get; set; }
+
+        /// <summary>
+        /// Gets or sets the size of the TMDB fetched backdrop.
+        /// </summary>
+        /// <value>The size of the TMDB fetched backdrop.</value>
+        [ProtoMember(16)]
+        public string TmdbFetchedBackdropSize { get; set; }
+
+        /// <summary>
+        /// Gets or sets the max backdrops.
+        /// </summary>
+        /// <value>The max backdrops.</value>
+        [ProtoMember(17)]
+        public int MaxBackdrops { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download movie art].
+        /// </summary>
+        /// <value><c>true</c> if [download movie art]; otherwise, <c>false</c>.</value>
+        [ProtoMember(40)]
+        public bool DownloadMovieArt { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download movie logo].
+        /// </summary>
+        /// <value><c>true</c> if [download movie logo]; otherwise, <c>false</c>.</value>
+        [ProtoMember(41)]
+        public bool DownloadMovieLogo { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download movie disc].
+        /// </summary>
+        /// <value><c>true</c> if [download movie disc]; otherwise, <c>false</c>.</value>
+        [ProtoMember(42)]
+        public bool DownloadMovieDisc { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download TV art].
+        /// </summary>
+        /// <value><c>true</c> if [download TV art]; otherwise, <c>false</c>.</value>
+        [ProtoMember(43)]
+        public bool DownloadTVArt { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download TV logo].
+        /// </summary>
+        /// <value><c>true</c> if [download TV logo]; otherwise, <c>false</c>.</value>
+        [ProtoMember(44)]
+        public bool DownloadTVLogo { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download TV thumb].
+        /// </summary>
+        /// <value><c>true</c> if [download TV thumb]; otherwise, <c>false</c>.</value>
+        [ProtoMember(45)]
+        public bool DownloadTVThumb { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download movie banner].
+        /// </summary>
+        /// <value><c>true</c> if [download movie banner]; otherwise, <c>false</c>.</value>
+        [ProtoMember(46)]
+        public bool DownloadMovieBanner { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download movie thumb].
+        /// </summary>
+        /// <value><c>true</c> if [download movie thumb]; otherwise, <c>false</c>.</value>
+        [ProtoMember(47)]
+        public bool DownloadMovieThumb { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download TV banner].
+        /// </summary>
+        /// <value><c>true</c> if [download TV banner]; otherwise, <c>false</c>.</value>
+        [ProtoMember(48)]
+        public bool DownloadTVBanner { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download TV season banner].
+        /// </summary>
+        /// <value><c>true</c> if [download TV season banner]; otherwise, <c>false</c>.</value>
+        [ProtoMember(49)]
+        public bool DownloadTVSeasonBanner { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download TV season thumb].
+        /// </summary>
+        /// <value><c>true</c> if [download TV season thumb]; otherwise, <c>false</c>.</value>
+        [ProtoMember(50)]
+        public bool DownloadTVSeasonThumb { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download TV season backdrops].
+        /// </summary>
+        /// <value><c>true</c> if [download TV season banner]; otherwise, <c>false</c>.</value>
+        [ProtoMember(51)]
+        public bool DownloadTVSeasonBackdrops { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [download TV season backdrops].
+        /// </summary>
+        /// <value><c>true</c> if [download TV season banner]; otherwise, <c>false</c>.</value>
+        [ProtoMember(52)]
+        public bool DownloadHDFanArt { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the item repository that should be used
+        /// </summary>
+        /// <value>The item repository.</value>
+        [ProtoMember(24)]
+        public string ItemRepository { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the user repository that should be used
+        /// </summary>
+        /// <value>The user repository.</value>
+        [ProtoMember(25)]
+        public string UserRepository { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the user data repository that should be used
+        /// </summary>
+        /// <value>The user data repository.</value>
+        [ProtoMember(26)]
+        public string UserDataRepository { get; set; }
+
+        /// <summary>
+        /// Characters to be replaced with a ' ' in strings to create a sort name
+        /// </summary>
+        /// <value>The sort replace characters.</value>
+        [ProtoMember(27)]
+        public string[] SortReplaceCharacters { get; set; }
+
+        /// <summary>
+        /// Characters to be removed from strings to create a sort name
+        /// </summary>
+        /// <value>The sort remove characters.</value>
+        [ProtoMember(28)]
+        public string[] SortRemoveCharacters { get; set; }
+
+        /// <summary>
+        /// Words to be removed from strings to create a sort name
+        /// </summary>
+        /// <value>The sort remove words.</value>
+        [ProtoMember(29)]
+        public string[] SortRemoveWords { get; set; }
+
+        /// <summary>
+        /// Show an output log window for debugging
+        /// </summary>
+        /// <value><c>true</c> if [show log window]; otherwise, <c>false</c>.</value>
+        [ProtoMember(30)]
+        public bool ShowLogWindow { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the user data repository that should be used
+        /// </summary>
+        /// <value>The display preferences repository.</value>
+        [ProtoMember(31)]
+        public string DisplayPreferencesRepository { get; set; }
+
+        /// <summary>
+        /// The list of types that will NOT be allowed to have internet providers run against them even if they are turned on.
+        /// </summary>
+        /// <value>The internet provider exclude types.</value>
+        [ProtoMember(32)]
+        public string[] InternetProviderExcludeTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the recent item days.
+        /// </summary>
+        /// <value>The recent item days.</value>
+        [ProtoMember(34)]
+        public int RecentItemDays { get; set; }
+
+        /// <summary>
+        /// Gets or sets the recently played days.
+        /// </summary>
+        /// <value>The recently played days.</value>
+        [ProtoMember(35)]
+        public int RecentlyPlayedDays { get; set; }
+
+        /// <summary>
+        /// Gets or sets the minimum percentage of an item that must be played in order for playstate to be updated.
+        /// </summary>
+        /// <value>The min resume PCT.</value>
+        [ProtoMember(36)]
+        public int MinResumePct { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum percentage of an item that can be played while still saving playstate. If this percentage is crossed playstate will be reset to the beginning and the item will be marked watched.
+        /// </summary>
+        /// <value>The max resume PCT.</value>
+        [ProtoMember(37)]
+        public int MaxResumePct { get; set; }
+
+        /// <summary>
+        /// Gets or sets the minimum duration that an item must have in order to be eligible for playstate updates..
+        /// </summary>
+        /// <value>The min resume duration seconds.</value>
+        [ProtoMember(38)]
+        public int MinResumeDurationSeconds { get; set; }
+
+        /// <summary>
+        /// The delay in seconds that we will wait after a file system change to try and discover what has been added/removed
+        /// Some delay is necessary with some items because their creation is not atomic.  It involves the creation of several
+        /// different directories and files.
+        /// </summary>
+        /// <value>The file watcher delay.</value>
+        [ProtoMember(55)]
+        public int FileWatcherDelay { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable developer tools].
+        /// </summary>
+        /// <value><c>true</c> if [enable developer tools]; otherwise, <c>false</c>.</value>
+        [ProtoMember(57)]
+        public bool EnableDeveloperTools { get; set; }
+        
+        // Next Proto number ====> 59
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
+        /// </summary>
+        public ServerConfiguration()
+            : base()
+        {
+#if (DEBUG)
+            EnableDeveloperTools = true;
+#endif
+
+            MinResumePct = 5;
+            MaxResumePct = 90;
+            MinResumeDurationSeconds = Convert.ToInt32(TimeSpan.FromMinutes(5).TotalSeconds);
+
+            FileWatcherDelay = 8;
+
+            RecentItemDays = 14;
+            RecentlyPlayedDays = 14;
+
+            EnableInternetProviders = true; //initial installs will need these
+            InternetProviderExcludeTypes = new string[] { };
+
+            MetadataRefreshDays = 30;
+            PreferredMetadataLanguage = "en";
+            MetadataCountryCode = "US";
+            TmdbFetchedProfileSize = "w185"; //w185 w45 h632 or original
+            TmdbFetchedPosterSize = "w500"; //w500, w342, w185 or original
+            TmdbFetchedBackdropSize = "w1280"; //w1280, w780 or original
+            DownloadTVSeasonBanner = true;
+            DownloadTVBanner = true;
+            DownloadHDFanArt = true;
+            MaxBackdrops = 4;
+
+            SortReplaceCharacters = new [] { ".", "+", "%" };
+            SortRemoveCharacters = new [] { ",", "&", "-", "{", "}", "'" };
+            SortRemoveWords = new [] { "the", "a", "an" };
+        }
+    }
+}
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
new file mode 100644
index 000000000..d8db52977
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -0,0 +1,61 @@
+using ProtoBuf;
+
+namespace MediaBrowser.Model.Configuration
+{
+    /// <summary>
+    /// Class UserConfiguration
+    /// </summary>
+    [ProtoContract]
+    public class UserConfiguration
+    {
+        /// <summary>
+        /// Gets or sets the max parental rating.
+        /// </summary>
+        /// <value>The max parental rating.</value>
+        [ProtoMember(1)]
+        public int? MaxParentalRating { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [use custom library].
+        /// </summary>
+        /// <value><c>true</c> if [use custom library]; otherwise, <c>false</c>.</value>
+        [ProtoMember(2)]
+        public bool UseCustomLibrary { 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>
+        [ProtoMember(3)]
+        public bool IsAdministrator { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio language preference.
+        /// </summary>
+        /// <value>The audio language preference.</value>
+        [ProtoMember(4)]
+        public string AudioLanguagePreference { get; set; }
+
+        /// <summary>
+        /// Gets or sets the subtitle language preference.
+        /// </summary>
+        /// <value>The subtitle language preference.</value>
+        [ProtoMember(5)]
+        public string SubtitleLanguagePreference { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [use forced subtitles only].
+        /// </summary>
+        /// <value><c>true</c> if [use forced subtitles only]; otherwise, <c>false</c>.</value>
+        [ProtoMember(6)]
+        public bool UseForcedSubtitlesOnly { get; set; }
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
+        /// </summary>
+        public UserConfiguration()
+        {
+            IsAdministrator = true;
+        }
+    }
+}