aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-10-09 01:24:55 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-10-09 01:24:55 -0400
commit3c7ee764eca1d5babe648a7d98a711bebaf17e3f (patch)
tree107cedd105735948abfef7a17a560b887b556504
parentbe1ed79cf633b5e9d8728ca50fe6e98d514f0ad6 (diff)
3.2.33.5
-rw-r--r--Emby.Photos/PhotoProvider.cs4
-rw-r--r--Mono.Nat/Upnp/Messages/UpnpMessage.cs1
-rw-r--r--SharedVersion.cs2
3 files changed, 4 insertions, 3 deletions
diff --git a/Emby.Photos/PhotoProvider.cs b/Emby.Photos/PhotoProvider.cs
index fe77cff69..b2d6ecdcb 100644
--- a/Emby.Photos/PhotoProvider.cs
+++ b/Emby.Photos/PhotoProvider.cs
@@ -31,14 +31,14 @@ namespace Emby.Photos
}
// These are causing taglib to hang
- private string[] _excludeExtensions = new string[] { ".dng" };
+ private string[] _includextensions = new string[] { ".jpg", ".jpeg", ".png", ".tiff" };
public Task<ItemUpdateType> FetchAsync(Photo item, MetadataRefreshOptions options, CancellationToken cancellationToken)
{
item.SetImagePath(ImageType.Primary, item.Path);
// Examples: https://github.com/mono/taglib-sharp/blob/a5f6949a53d09ce63ee7495580d6802921a21f14/tests/fixtures/TagLib.Tests.Images/NullOrientationTest.cs
- if (!_excludeExtensions.Contains(Path.GetExtension(item.Path) ?? string.Empty, StringComparer.OrdinalIgnoreCase))
+ if (_includextensions.Contains(Path.GetExtension(item.Path) ?? string.Empty, StringComparer.OrdinalIgnoreCase))
{
try
{
diff --git a/Mono.Nat/Upnp/Messages/UpnpMessage.cs b/Mono.Nat/Upnp/Messages/UpnpMessage.cs
index 54cca4494..d15e48b2f 100644
--- a/Mono.Nat/Upnp/Messages/UpnpMessage.cs
+++ b/Mono.Nat/Upnp/Messages/UpnpMessage.cs
@@ -51,6 +51,7 @@ namespace Mono.Nat.Upnp
NatUtility.Log("Initiating request to: {0}", ss);
var req = new HttpRequestOptions();
+ req.LogErrors = false;
req.Url = ss;
req.EnableKeepAlive = false;
req.RequestContentType = "text/xml; charset=\"utf-8\"";
diff --git a/SharedVersion.cs b/SharedVersion.cs
index d2ae99469..fcfa2ec5a 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.2.33.4")]
+[assembly: AssemblyVersion("3.2.33.5")]