From c43cefb58959f536e12f40e7a044e5fad0fc14bd Mon Sep 17 00:00:00 2001 From: Luke Date: Tue, 27 Jun 2017 00:54:29 -0400 Subject: [PATCH 1/3] update mac project --- MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 5f13eee0e4..3555f761f8 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -58,7 +58,7 @@ Default None true - west + cjk,mideast,other,rare,west full From 9a4fe6625d88a48e3328b7a9a1374615581d588e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 27 Jun 2017 16:55:22 -0400 Subject: [PATCH 2/3] xml tv fixes --- .../Emby.Server.Implementations.csproj | 4 ++-- Emby.Server.Implementations/Library/LibraryManager.cs | 8 ++++---- .../Library/Resolvers/Audio/MusicAlbumResolver.cs | 2 +- Emby.Server.Implementations/packages.config | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index 231ffe7913..a056a57d01 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -293,8 +293,8 @@ {1d74413b-e7cf-455b-b021-f52bdf881542} SocketHttpListener - - ..\packages\Emby.XmlTv.1.0.8\lib\portable-net45+win8\Emby.XmlTv.dll + + ..\packages\Emby.XmlTv.1.0.9\lib\portable-net45+win8\Emby.XmlTv.dll True diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index 1a909549e7..4846a57682 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -2365,7 +2365,7 @@ namespace Emby.Server.Implementations.Library public bool IsVideoFile(string path, LibraryOptions libraryOptions) { - var resolver = new VideoResolver(GetNamingOptions(libraryOptions), new NullLogger()); + var resolver = new VideoResolver(GetNamingOptions(), new NullLogger()); return resolver.IsVideoFile(path); } @@ -2376,7 +2376,7 @@ namespace Emby.Server.Implementations.Library public bool IsAudioFile(string path, LibraryOptions libraryOptions) { - var parser = new AudioFileParser(GetNamingOptions(libraryOptions)); + var parser = new AudioFileParser(GetNamingOptions()); return parser.IsAudioFile(path); } @@ -2533,13 +2533,13 @@ namespace Emby.Server.Implementations.Library return _namingOptionsWithoutOptimisticEpisodeDetection; } - return GetNamingOptions(new LibraryOptions()); + return GetNamingOptionsInternal(); } private NamingOptions _namingOptionsWithoutOptimisticEpisodeDetection; private NamingOptions _namingOptions; private string[] _videoFileExtensions; - public NamingOptions GetNamingOptions(LibraryOptions libraryOptions) + private NamingOptions GetNamingOptionsInternal() { if (_namingOptions == null) { diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs index 806e20f00a..70fe8d9ef7 100644 --- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs @@ -163,7 +163,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio private bool IsMultiDiscFolder(string path, LibraryOptions libraryOptions) { - var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions(libraryOptions); + var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions(); var parser = new AlbumParser(namingOptions, new NullLogger()); var result = parser.ParseMultiPart(path); diff --git a/Emby.Server.Implementations/packages.config b/Emby.Server.Implementations/packages.config index 817e3eedb7..468bf925fd 100644 --- a/Emby.Server.Implementations/packages.config +++ b/Emby.Server.Implementations/packages.config @@ -1,6 +1,6 @@  - + From 71308b5c29da6506bc294a6b4eb1f4a5b86ce0bd Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 27 Jun 2017 16:56:47 -0400 Subject: [PATCH 3/3] fix -tp format command line --- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 4 ++++ SharedVersion.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 60583b95bf..44bdafc5b2 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -201,6 +201,10 @@ namespace MediaBrowser.Controller.MediaEncoding { return null; } + if (string.Equals(container, "tp", StringComparison.OrdinalIgnoreCase)) + { + return null; + } // Seeing reported failures here, not sure yet if this is related to specfying input format if (string.Equals(container, "m4v", StringComparison.OrdinalIgnoreCase)) diff --git a/SharedVersion.cs b/SharedVersion.cs index 54c495e321..a7aafdb10b 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.20.14")] +[assembly: AssemblyVersion("3.2.20.15")]