From 3241a11e9902f4d42b0668c04e6eb8bebf7d54e5 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 28 May 2015 01:51:48 -0400 Subject: bump dev version --- SharedVersion.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 6fbe36048..c576e56f1 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5621.4")] +[assembly: AssemblyVersion("3.0.*")] +//[assembly: AssemblyVersion("3.0.5621.4")] -- cgit v1.2.3 From 67c4c9381f3c56f44d7ecadb3b95f72929b8af6e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 11 Jun 2015 17:22:44 -0400 Subject: 3.0.5641.0 --- .../Subtitles/ISubtitleProvider.cs | 8 +++++ .../Subtitles/OpenSubtitleDownloader.cs | 36 ++++++++++++++++++---- MediaBrowser.Providers/TV/TvdbSeriesProvider.cs | 24 +++++++-------- .../Connect/ConnectEntryPoint.cs | 9 ++++-- SharedVersion.cs | 4 +-- 5 files changed, 58 insertions(+), 23 deletions(-) (limited to 'SharedVersion.cs') diff --git a/MediaBrowser.Controller/Subtitles/ISubtitleProvider.cs b/MediaBrowser.Controller/Subtitles/ISubtitleProvider.cs index dceea0cc6..5cb106fec 100644 --- a/MediaBrowser.Controller/Subtitles/ISubtitleProvider.cs +++ b/MediaBrowser.Controller/Subtitles/ISubtitleProvider.cs @@ -1,4 +1,5 @@ using MediaBrowser.Controller.Providers; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Providers; using System.Collections.Generic; using System.Threading; @@ -35,5 +36,12 @@ namespace MediaBrowser.Controller.Subtitles /// The cancellation token. /// Task{SubtitleResponse}. Task GetSubtitles(string id, CancellationToken cancellationToken); + + /// + /// Gets the supported languages. + /// + /// The cancellation token. + /// Task<IEnumerable<NameIdPair>>. + Task> GetSupportedLanguages(CancellationToken cancellationToken); } } diff --git a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs index 289c5661f..54db0d5fa 100644 --- a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs +++ b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs @@ -5,10 +5,11 @@ using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Security; using MediaBrowser.Controller.Subtitles; -using MediaBrowser.Model.Configuration; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Providers; +using MediaBrowser.Model.Serialization; using OpenSubtitlesHandler; using System; using System.Collections.Generic; @@ -38,17 +39,23 @@ namespace MediaBrowser.Providers.Subtitles // And the user may restart the server private const int MaxDownloadsPerDay = 150; - public OpenSubtitleDownloader(ILogManager logManager, IHttpClient httpClient, IServerConfigurationManager config, IEncryptionManager encryption) + private readonly IJsonSerializer _json; + + public OpenSubtitleDownloader(ILogManager logManager, IHttpClient httpClient, IServerConfigurationManager config, IEncryptionManager encryption, IJsonSerializer json) { _logger = logManager.GetLogger(GetType().Name); _httpClient = httpClient; _config = config; _encryption = encryption; + _json = json; _config.NamedConfigurationUpdating += _config_NamedConfigurationUpdating; // Reset the count every 24 hours _dailyTimer = new Timer(state => _dailyDownloadCount = 0, null, TimeSpan.FromHours(24), TimeSpan.FromHours(24)); + + Utilities.HttpClient = httpClient; + OpenSubtitles.SetUserAgent("mediabrowser.tv"); } private const string PasswordHashPrefix = "h:"; @@ -195,6 +202,26 @@ namespace MediaBrowser.Providers.Subtitles _lastLogin = DateTime.UtcNow; } + public async Task> GetSupportedLanguages(CancellationToken cancellationToken) + { + await Login(cancellationToken).ConfigureAwait(false); + + var result = OpenSubtitles.GetSubLanguages("en"); + if (!(result is MethodResponseGetSubLanguages)) + { + _logger.Error("Invalid response type"); + return new List(); + } + + var results = ((MethodResponseGetSubLanguages)result).Languages; + + return results.Select(i => new NameIdPair + { + Name = i.LanguageName, + Id = i.SubLanguageID + }); + } + public async Task> Search(SubtitleSearchRequest request, CancellationToken cancellationToken) { var imdbIdText = request.GetProviderId(MetadataProviders.Imdb); @@ -229,9 +256,6 @@ namespace MediaBrowser.Providers.Subtitles return new List(); } - Utilities.HttpClient = _httpClient; - OpenSubtitles.SetUserAgent("mediabrowser.tv"); - await Login(cancellationToken).ConfigureAwait(false); var subLanguageId = request.Language; @@ -260,7 +284,7 @@ namespace MediaBrowser.Providers.Subtitles var result = await OpenSubtitles.SearchSubtitlesAsync(parms.ToArray(), cancellationToken).ConfigureAwait(false); if (!(result is MethodResponseSubtitleSearch)) { - _logger.Debug("Invalid response type"); + _logger.Error("Invalid response type"); return new List(); } diff --git a/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs b/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs index 60e484a36..8bdd914df 100644 --- a/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs +++ b/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs @@ -398,21 +398,21 @@ namespace MediaBrowser.Providers.TV } } - if (titles.Any(t => string.Equals(t, comparableName, StringComparison.OrdinalIgnoreCase))) + foreach (var title in titles) { - var id = node.SelectSingleNode("./seriesid") ?? - node.SelectSingleNode("./id"); - - if (id != null) + if (string.Equals(title, comparableName, StringComparison.OrdinalIgnoreCase)) { - searchResult.Name = titles.FirstOrDefault(); - searchResult.SetProviderId(MetadataProviders.Tvdb, id.InnerText); - searchResults.Add(searchResult); - } - } + var id = node.SelectSingleNode("./seriesid") ?? + node.SelectSingleNode("./id"); - foreach (var title in titles) - { + if (id != null) + { + searchResult.Name = title; + searchResult.SetProviderId(MetadataProviders.Tvdb, id.InnerText); + searchResults.Add(searchResult); + } + break; + } _logger.Info("TVDb Provider - " + title + " did not match " + comparableName); } } diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs b/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs index 770eaa41f..973519a77 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs @@ -1,4 +1,4 @@ -using System.Linq; +using MediaBrowser.Common; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Net; using MediaBrowser.Controller.Connect; @@ -22,14 +22,16 @@ namespace MediaBrowser.Server.Implementations.Connect private readonly IConnectManager _connectManager; private readonly INetworkManager _networkManager; + private readonly IApplicationHost _appHost; - public ConnectEntryPoint(IHttpClient httpClient, IApplicationPaths appPaths, ILogger logger, INetworkManager networkManager, IConnectManager connectManager) + public ConnectEntryPoint(IHttpClient httpClient, IApplicationPaths appPaths, ILogger logger, INetworkManager networkManager, IConnectManager connectManager, IApplicationHost appHost) { _httpClient = httpClient; _appPaths = appPaths; _logger = logger; _networkManager = networkManager; _connectManager = connectManager; + _appHost = appHost; } public void Run() @@ -49,7 +51,8 @@ namespace MediaBrowser.Server.Implementations.Connect { using (var stream = await _httpClient.Get(new HttpRequestOptions { - Url = ipLookupUrl + Url = ipLookupUrl, + UserAgent = "Emby Server/" + _appHost.ApplicationVersion }).ConfigureAwait(false)) { diff --git a/SharedVersion.cs b/SharedVersion.cs index c576e56f1..c81991d9a 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5621.4")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5641.0")] -- cgit v1.2.3 From 97d6ab1dd03899a3daff41cc82d6fa31443a8775 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 12 Jun 2015 06:55:47 -0400 Subject: 3.0.5641.1 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index c81991d9a..fafd33ea0 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5641.0")] +[assembly: AssemblyVersion("3.0.5641.1")] -- cgit v1.2.3 From 7905080e3eff2eb7f506899ea765126c82a0b400 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 13 Jun 2015 10:46:59 -0400 Subject: 3.0.5641.2 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index fafd33ea0..d1f70ad19 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5641.1")] +[assembly: AssemblyVersion("3.0.5641.2")] -- cgit v1.2.3 From 4cf456925f489c435704950d619ac206443e8698 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 14 Jun 2015 13:55:42 -0400 Subject: adjust default setting for library monitor --- .../MediaBrowser.Model.Portable.csproj | 3 +++ .../MediaBrowser.Model.net35.csproj | 3 +++ MediaBrowser.Model/Configuration/AutoOnOff.cs | 10 ++++++++++ .../Configuration/ServerConfiguration.cs | 6 +++--- MediaBrowser.Model/MediaBrowser.Model.csproj | 1 + .../IO/LibraryMonitor.cs | 19 ++++++++++++++++++- SharedVersion.cs | 2 +- 7 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 MediaBrowser.Model/Configuration/AutoOnOff.cs (limited to 'SharedVersion.cs') diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index a2fb14517..3238e79b7 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -182,6 +182,9 @@ Configuration\AccessSchedule.cs + + Configuration\AutoOnOff.cs + Configuration\BaseApplicationConfiguration.cs diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj index 0cb8e5ca2..be7277607 100644 --- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -147,6 +147,9 @@ Configuration\AccessSchedule.cs + + Configuration\AutoOnOff.cs + Configuration\BaseApplicationConfiguration.cs diff --git a/MediaBrowser.Model/Configuration/AutoOnOff.cs b/MediaBrowser.Model/Configuration/AutoOnOff.cs new file mode 100644 index 000000000..e911a0ff1 --- /dev/null +++ b/MediaBrowser.Model/Configuration/AutoOnOff.cs @@ -0,0 +1,10 @@ + +namespace MediaBrowser.Model.Configuration +{ + public enum AutoOnOff + { + Auto, + Enabled, + Disabled + } +} diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index ec9e6e10f..f1d6bbcae 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -187,7 +187,6 @@ namespace MediaBrowser.Model.Configuration public bool EnableAutomaticRestart { get; set; } - public bool EnableRealtimeMonitor { get; set; } public PathSubstitution[] PathSubstitutions { get; set; } public string ServerName { get; set; } @@ -210,6 +209,8 @@ namespace MediaBrowser.Model.Configuration public bool DenyIFrameEmbedding { get; set; } + public AutoOnOff EnableLibraryMonitor { get; set; } + /// /// Initializes a new instance of the class. /// @@ -236,6 +237,7 @@ namespace MediaBrowser.Model.Configuration // 5 minutes MinResumeDurationSeconds = 300; + EnableLibraryMonitor = AutoOnOff.Auto; RealtimeLibraryMonitorDelay = 40; EnableInternetProviders = true; @@ -253,8 +255,6 @@ namespace MediaBrowser.Model.Configuration SeasonZeroDisplayName = "Specials"; - EnableRealtimeMonitor = true; - UICulture = "en-us"; PeopleMetadataOptions = new PeopleMetadataOptions(); diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index df3cd15f6..3daacdd73 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -96,6 +96,7 @@ + diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs index ba5d10eef..d6a1be962 100644 --- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs +++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs @@ -3,6 +3,7 @@ using MediaBrowser.Common.ScheduledTasks; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; +using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Logging; using MediaBrowser.Server.Implementations.ScheduledTasks; using Microsoft.Win32; @@ -147,9 +148,25 @@ namespace MediaBrowser.Server.Implementations.IO Start(); } + private bool EnableLibraryMonitor + { + get + { + switch (ConfigurationManager.Configuration.EnableLibraryMonitor) + { + case AutoOnOff.Auto: + return Environment.OSVersion.Platform == PlatformID.Win32NT; + case AutoOnOff.Enabled: + return true; + default: + return false; + } + } + } + public void Start() { - if (ConfigurationManager.Configuration.EnableRealtimeMonitor) + if (EnableLibraryMonitor) { StartInternal(); } diff --git a/SharedVersion.cs b/SharedVersion.cs index d1f70ad19..0478d2aae 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5641.2")] +[assembly: AssemblyVersion("3.0.5641.3")] -- cgit v1.2.3 From cd759e215e2654194de1195c3a7327672a79653e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 15 Jun 2015 00:17:12 -0400 Subject: 3.0.5641.4 --- MediaBrowser.Api/Playback/BaseStreamingService.cs | 5 ++ .../MediaBrowser.LocalMetadata.csproj | 1 - .../Savers/SeasonXmlSaver.cs | 95 ---------------------- .../Configuration/ServerConfiguration.cs | 5 +- .../MediaBrowser.WebDashboard.csproj | 3 - SharedVersion.cs | 2 +- 6 files changed, 10 insertions(+), 101 deletions(-) delete mode 100644 MediaBrowser.LocalMetadata/Savers/SeasonXmlSaver.cs (limited to 'SharedVersion.cs') diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 71ef689a7..41d785a34 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -772,6 +772,11 @@ namespace MediaBrowser.Api.Playback ? null : audioStream.Channels; + if (inputChannels <= 0) + { + inputChannels = null; + } + var codec = outputAudioCodec ?? string.Empty; if (codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1) diff --git a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj index 57174d63a..14cec3627 100644 --- a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj +++ b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj @@ -78,7 +78,6 @@ - diff --git a/MediaBrowser.LocalMetadata/Savers/SeasonXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/SeasonXmlSaver.cs deleted file mode 100644 index 30f3e0ca1..000000000 --- a/MediaBrowser.LocalMetadata/Savers/SeasonXmlSaver.cs +++ /dev/null @@ -1,95 +0,0 @@ -using MediaBrowser.Controller.Configuration; -using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Entities.TV; -using MediaBrowser.Controller.Library; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Security; -using System.Text; -using System.Threading; - -namespace MediaBrowser.LocalMetadata.Savers -{ - public class SeasonXmlSaver - { - public string Name - { - get - { - return XmlProviderUtils.Name; - } - } - - private readonly IServerConfigurationManager _config; - - public SeasonXmlSaver(IServerConfigurationManager config) - { - _config = config; - } - - /// - /// Determines whether [is enabled for] [the specified item]. - /// - /// The item. - /// Type of the update. - /// true if [is enabled for] [the specified item]; otherwise, false. - public bool IsEnabledFor(IHasMetadata item, ItemUpdateType updateType) - { - if (!item.SupportsLocalMetadata) - { - return false; - } - - if (!(item is Season)) - { - return false; - } - - return updateType >= ItemUpdateType.MetadataDownload || (updateType >= ItemUpdateType.MetadataImport && File.Exists(GetSavePath(item))); - } - - private readonly CultureInfo _usCulture = new CultureInfo("en-US"); - - /// - /// Saves the specified item. - /// - /// The item. - /// The cancellation token. - /// Task. - public void Save(IHasMetadata item, CancellationToken cancellationToken) - { - var builder = new StringBuilder(); - - builder.Append(""); - - var season = (Season)item; - - if (season.IndexNumber.HasValue) - { - builder.Append("" + SecurityElement.Escape(season.IndexNumber.Value.ToString(_usCulture)) + ""); - } - - XmlSaverHelpers.AddCommonNodes((Season)item, builder); - - builder.Append(""); - - var xmlFilePath = GetSavePath(item); - - XmlSaverHelpers.Save(builder, xmlFilePath, new List - { - "SeasonNumber" - }, _config); - } - - /// - /// Gets the save path. - /// - /// The item. - /// System.String. - public string GetSavePath(IHasMetadata item) - { - return Path.Combine(item.Path, "season.xml"); - } - } -} diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index f1d6bbcae..e7490b3fa 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -429,7 +429,10 @@ namespace MediaBrowser.Model.Configuration } }, - new MetadataOptions(0, 1280) {ItemType = "Season"} + new MetadataOptions(0, 1280) + { + ItemType = "Season" + } }; } } diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 73d957145..b987f2069 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -318,9 +318,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest diff --git a/SharedVersion.cs b/SharedVersion.cs index 0478d2aae..a8ebfc1ea 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5641.3")] +[assembly: AssemblyVersion("3.0.5641.4")] -- cgit v1.2.3