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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
LukePulverenti 2013-03-09 20:18:37 -05:00
commit 913cb3c564
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs
View File

@ -85,6 +85,11 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
/// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns> /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
public override bool Supports(BaseItem item) public override bool Supports(BaseItem item)
{ {
if (item.LocationType != LocationType.FileSystem)
{
return false;
}
var video = item as Video; var video = item as Video;
if (video != null) if (video != null)

2
MediaBrowser.Server.Implementations/Providers/ProviderManager.cs
View File

@ -368,7 +368,7 @@ namespace MediaBrowser.Server.Implementations.Providers
} }
//download and save locally //download and save locally
var localPath = ConfigurationManager.Configuration.SaveLocalMeta ? var localPath = (ConfigurationManager.Configuration.SaveLocalMeta && item.MetaLocation != null) ?
Path.Combine(item.MetaLocation, targetName) : Path.Combine(item.MetaLocation, targetName) :
_remoteImageCache.GetResourcePath(item.GetType().FullName + item.Path.ToLower(), targetName); _remoteImageCache.GetResourcePath(item.GetType().FullName + item.Path.ToLower(), targetName);