diff options
Diffstat (limited to 'MediaBrowser.Model/Configuration')
3 files changed, 2 insertions, 68 deletions
diff --git a/MediaBrowser.Model/Configuration/LiveTvOptions.cs b/MediaBrowser.Model/Configuration/LiveTvOptions.cs deleted file mode 100644 index 575f0b863..000000000 --- a/MediaBrowser.Model/Configuration/LiveTvOptions.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MediaBrowser.Model.Configuration -{ - public class LiveTvOptions - { - public int? GuideDays { get; set; } - public string ActiveService { get; set; } - } -}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 00f7add14..4734e2af7 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -1,7 +1,7 @@ using MediaBrowser.Model.Entities; +using MediaBrowser.Model.FileOrganization; +using MediaBrowser.Model.LiveTv; using MediaBrowser.Model.Notifications; -using MediaBrowser.Model.Weather; -using System; namespace MediaBrowser.Model.Configuration { @@ -11,18 +11,6 @@ namespace MediaBrowser.Model.Configuration public class ServerConfiguration : BaseApplicationConfiguration { /// <summary> - /// Gets or sets the zip code to use when displaying weather - /// </summary> - /// <value>The weather location.</value> - public string WeatherLocation { get; set; } - - /// <summary> - /// Gets or sets the weather unit to use when displaying weather - /// </summary> - /// <value>The weather unit.</value> - public WeatherUnits WeatherUnit { get; set; } - - /// <summary> /// Gets or sets a value indicating whether [enable u pn p]. /// </summary> /// <value><c>true</c> if [enable u pn p]; otherwise, <c>false</c>.</value> @@ -191,9 +179,6 @@ namespace MediaBrowser.Model.Configuration public SubtitleOptions SubtitleOptions { get; set; } - [Obsolete] - public string[] ManualLoginClients { get; set; } - public ChannelOptions ChannelOptions { get; set; } public ChapterOptions ChapterOptions { get; set; } @@ -237,8 +222,6 @@ namespace MediaBrowser.Model.Configuration SortRemoveCharacters = new[] { ",", "&", "-", "{", "}", "'" }; SortRemoveWords = new[] { "the", "a", "an" }; - ManualLoginClients = new string[] { }; - SeasonZeroDisplayName = "Specials"; EnableRealtimeMonitor = true; @@ -304,7 +287,6 @@ namespace MediaBrowser.Model.Configuration }; SubtitleOptions = new SubtitleOptions(); - TvFileOrganizationOptions = new TvFileOrganizationOptions(); } } } diff --git a/MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs b/MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs deleted file mode 100644 index fe32d4a80..000000000 --- a/MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs +++ /dev/null @@ -1,40 +0,0 @@ - -namespace MediaBrowser.Model.Configuration -{ - public class TvFileOrganizationOptions - { - public bool IsEnabled { get; set; } - public int MinFileSizeMb { get; set; } - public string[] LeftOverFileExtensionsToDelete { get; set; } - public string[] WatchLocations { get; set; } - - public string SeasonFolderPattern { get; set; } - - public string SeasonZeroFolderName { get; set; } - - public string EpisodeNamePattern { get; set; } - public string MultiEpisodeNamePattern { get; set; } - - public bool OverwriteExistingEpisodes { get; set; } - - public bool DeleteEmptyFolders { get; set; } - - public bool CopyOriginalFile { get; set; } - - public TvFileOrganizationOptions() - { - MinFileSizeMb = 50; - - LeftOverFileExtensionsToDelete = new string[] { }; - - WatchLocations = new string[] { }; - - EpisodeNamePattern = "%sn - %sx%0e - %en.%ext"; - MultiEpisodeNamePattern = "%sn - %sx%0e-x%0ed - %en.%ext"; - SeasonFolderPattern = "Season %s"; - SeasonZeroFolderName = "Season 0"; - - CopyOriginalFile = false; - } - } -} |