diff --git a/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs b/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs
index 737cdcc7da..23f33f06cc 100644
--- a/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs
@@ -458,15 +458,22 @@ namespace Emby.Common.Implementations.HttpClientManager
!string.IsNullOrEmpty(options.RequestContent) ||
string.Equals(httpMethod, "post", StringComparison.OrdinalIgnoreCase))
{
- var bytes = options.RequestContentBytes ??
- Encoding.UTF8.GetBytes(options.RequestContent ?? string.Empty);
+ try
+ {
+ var bytes = options.RequestContentBytes ??
+ Encoding.UTF8.GetBytes(options.RequestContent ?? string.Empty);
- httpWebRequest.ContentType = options.RequestContentType ?? "application/x-www-form-urlencoded";
+ httpWebRequest.ContentType = options.RequestContentType ?? "application/x-www-form-urlencoded";
#if NET46
- httpWebRequest.ContentLength = bytes.Length;
-#endif
- (await httpWebRequest.GetRequestStreamAsync().ConfigureAwait(false)).Write(bytes, 0, bytes.Length);
+ httpWebRequest.ContentLength = bytes.Length;
+#endif
+ (await httpWebRequest.GetRequestStreamAsync().ConfigureAwait(false)).Write(bytes, 0, bytes.Length);
+ }
+ catch (Exception ex)
+ {
+ throw new HttpException(ex.Message) { IsTimedOut = true };
+ }
}
if (options.ResourcePool != null)
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 195d24b218..a1bd67f1f8 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -309,8 +309,8 @@
{4f26d5d8-a7b0-42b3-ba42-7cb7d245934e}
SocketHttpListener.Portable
-
- ..\packages\Emby.XmlTv.1.0.5\lib\portable-net45+win8\Emby.XmlTv.dll
+
+ ..\packages\Emby.XmlTv.1.0.6\lib\portable-net45+win8\Emby.XmlTv.dll
True
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
index 68126f9263..9a8282250c 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
@@ -155,6 +155,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
var durationParam = " -t " + _mediaEncoder.GetTimeParameter(duration.Ticks);
var inputModifiers = "-fflags +genpts -async 1 -vsync -1";
var mapArgs = string.Equals(OutputFormat, "mkv", StringComparison.OrdinalIgnoreCase) ? "-map 0" : "-sn";
+ mapArgs = "-sn";
var commandLineArgs = "-i \"{0}\"{4} " + mapArgs + " {2} -map_metadata -1 -threads 0 {3} -y \"{1}\"";
long startTimeTicks = 0;
diff --git a/Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs b/Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs
index 5a0389b16a..5cff88a676 100644
--- a/Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/ProgramImageProvider.cs
@@ -50,13 +50,16 @@ namespace Emby.Server.Implementations.LiveTv
{
var channel = _liveTvManager.GetInternalChannel(liveTvItem.ChannelId);
- var response = await service.GetProgramImageAsync(GetItemExternalId(liveTvItem), GetItemExternalId(channel), cancellationToken).ConfigureAwait(false);
-
- if (response != null)
+ if (channel != null)
{
- imageResponse.HasImage = true;
- imageResponse.Stream = response.Stream;
- imageResponse.Format = response.Format;
+ var response = await service.GetProgramImageAsync(GetItemExternalId(liveTvItem), GetItemExternalId(channel), cancellationToken).ConfigureAwait(false);
+
+ if (response != null)
+ {
+ imageResponse.HasImage = true;
+ imageResponse.Stream = response.Stream;
+ imageResponse.Format = response.Format;
+ }
}
}
catch (NotImplementedException)
diff --git a/Emby.Server.Implementations/packages.config b/Emby.Server.Implementations/packages.config
index 5249577e61..3c82e979b7 100644
--- a/Emby.Server.Implementations/packages.config
+++ b/Emby.Server.Implementations/packages.config
@@ -1,6 +1,6 @@
-
+
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs
index ed95529641..83057dba4e 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs
@@ -1486,33 +1486,33 @@ namespace MediaBrowser.MediaEncoding.Encoder
//inputModifier += " -noaccurate_seek";
}
- if (!string.IsNullOrWhiteSpace(state.InputContainer))
- {
- var inputFormat = GetInputFormat(state.InputContainer);
- if (!string.IsNullOrWhiteSpace(inputFormat))
- {
- inputModifier += " -f " + inputFormat;
- }
- }
+ //if (!string.IsNullOrWhiteSpace(state.InputContainer))
+ //{
+ // var inputFormat = GetInputFormat(state.InputContainer);
+ // if (!string.IsNullOrWhiteSpace(inputFormat))
+ // {
+ // inputModifier += " -f " + inputFormat;
+ // }
+ //}
- if (state.RunTimeTicks.HasValue)
- {
- foreach (var stream in state.MediaSource.MediaStreams)
- {
- if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle)
- {
- if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1)
- {
- var decoder = GetDecoderFromCodec(stream.Codec);
+ //if (state.RunTimeTicks.HasValue)
+ //{
+ // foreach (var stream in state.MediaSource.MediaStreams)
+ // {
+ // if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle)
+ // {
+ // if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1)
+ // {
+ // var decoder = GetDecoderFromCodec(stream.Codec);
- if (!string.IsNullOrWhiteSpace(decoder))
- {
- inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder;
- }
- }
- }
- }
- }
+ // if (!string.IsNullOrWhiteSpace(decoder))
+ // {
+ // inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder;
+ // }
+ // }
+ // }
+ // }
+ //}
}
return inputModifier;
diff --git a/MediaBrowser.Providers/Omdb/OmdbProvider.cs b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
index b42dd34b21..fdd334e6e7 100644
--- a/MediaBrowser.Providers/Omdb/OmdbProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
@@ -385,10 +385,11 @@ namespace MediaBrowser.Providers.Omdb
{
T item = itemResult.Item;
+ var isConfiguredForEnglish = IsConfiguredForEnglish(item);
+
// Grab series genres because imdb data is better than tvdb. Leave movies alone
// But only do it if english is the preferred language because this data will not be localized
- if (ShouldFetchGenres(item) &&
- !string.IsNullOrWhiteSpace(result.Genre))
+ if (isConfiguredForEnglish && !string.IsNullOrWhiteSpace(result.Genre))
{
item.Genres.Clear();
@@ -418,8 +419,11 @@ namespace MediaBrowser.Providers.Omdb
hasAwards.AwardSummary = WebUtility.HtmlDecode(result.Awards);
}
- // Imdb plots are usually pretty short
- item.Overview = result.Plot;
+ if (isConfiguredForEnglish)
+ {
+ // Omdb is currently english only, so for other languages skip this and let secondary providers fill it in
+ item.Overview = result.Plot;
+ }
//if (!string.IsNullOrWhiteSpace(result.Director))
//{
@@ -462,7 +466,7 @@ namespace MediaBrowser.Providers.Omdb
//}
}
- private bool ShouldFetchGenres(BaseItem item)
+ private bool IsConfiguredForEnglish(BaseItem item)
{
var lang = item.GetPreferredMetadataLanguage();