lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2730 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-06-27 16:57:21 -04:00 committed by GitHub
commit f0aa3d2d60
7 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

@ -293,8 +293,8 @@
<Project>{1d74413b-e7cf-455b-b021-f52bdf881542}</Project> <Project>{1d74413b-e7cf-455b-b021-f52bdf881542}</Project>
<Name>SocketHttpListener</Name> <Name>SocketHttpListener</Name>
</ProjectReference> </ProjectReference>
<Reference Include="Emby.XmlTv, Version=1.0.6299.28292, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Emby.XmlTv, Version=1.0.6387.29335, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Emby.XmlTv.1.0.8\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath> <HintPath>..\packages\Emby.XmlTv.1.0.9\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="MediaBrowser.Naming, Version=1.0.6279.25941, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MediaBrowser.Naming, Version=1.0.6279.25941, Culture=neutral, processorArchitecture=MSIL">

8
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -2365,7 +2365,7 @@ namespace Emby.Server.Implementations.Library
public bool IsVideoFile(string path, LibraryOptions libraryOptions) 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); return resolver.IsVideoFile(path);
} }
@ -2376,7 +2376,7 @@ namespace Emby.Server.Implementations.Library
public bool IsAudioFile(string path, LibraryOptions libraryOptions) public bool IsAudioFile(string path, LibraryOptions libraryOptions)
{ {
var parser = new AudioFileParser(GetNamingOptions(libraryOptions)); var parser = new AudioFileParser(GetNamingOptions());
return parser.IsAudioFile(path); return parser.IsAudioFile(path);
} }
@ -2533,13 +2533,13 @@ namespace Emby.Server.Implementations.Library
return _namingOptionsWithoutOptimisticEpisodeDetection; return _namingOptionsWithoutOptimisticEpisodeDetection;
} }
return GetNamingOptions(new LibraryOptions()); return GetNamingOptionsInternal();
} }
private NamingOptions _namingOptionsWithoutOptimisticEpisodeDetection; private NamingOptions _namingOptionsWithoutOptimisticEpisodeDetection;
private NamingOptions _namingOptions; private NamingOptions _namingOptions;
private string[] _videoFileExtensions; private string[] _videoFileExtensions;
public NamingOptions GetNamingOptions(LibraryOptions libraryOptions) private NamingOptions GetNamingOptionsInternal()
{ {
if (_namingOptions == null) if (_namingOptions == null)
{ {

2
Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
View File

@ -163,7 +163,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
private bool IsMultiDiscFolder(string path, LibraryOptions libraryOptions) 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 parser = new AlbumParser(namingOptions, new NullLogger());
var result = parser.ParseMultiPart(path); var result = parser.ParseMultiPart(path);

2
Emby.Server.Implementations/packages.config
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Emby.XmlTv" version="1.0.8" targetFramework="portable45-net45+win8" /> <package id="Emby.XmlTv" version="1.0.9" targetFramework="net46" />
<package id="MediaBrowser.Naming" version="1.0.5" targetFramework="portable45-net45+win8" /> <package id="MediaBrowser.Naming" version="1.0.5" targetFramework="portable45-net45+win8" />
<package id="SQLitePCL.pretty" version="1.1.0" targetFramework="portable45-net45+win8" /> <package id="SQLitePCL.pretty" version="1.1.0" targetFramework="portable45-net45+win8" />
<package id="SQLitePCLRaw.core" version="1.1.6" targetFramework="net46" /> <package id="SQLitePCLRaw.core" version="1.1.6" targetFramework="net46" />

4
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -201,6 +201,10 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
return null; 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 // Seeing reported failures here, not sure yet if this is related to specfying input format
if (string.Equals(container, "m4v", StringComparison.OrdinalIgnoreCase)) if (string.Equals(container, "m4v", StringComparison.OrdinalIgnoreCase))

2
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -58,7 +58,7 @@
<TlsProvider>Default</TlsProvider> <TlsProvider>Default</TlsProvider>
<LinkMode>None</LinkMode> <LinkMode>None</LinkMode>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<I18n>west</I18n> <I18n>cjk,mideast,other,rare,west</I18n>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|AnyCPU' ">
<DebugType>full</DebugType> <DebugType>full</DebugType>

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.20.14")] [assembly: AssemblyVersion("3.2.20.15")]