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

Merge pull request #2206 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-10-01 16:31:15 -04:00 committed by GitHub
commit ad11413824
5 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Drawing/ImageMagick/ImageMagickEncoder.cs
View File

@ -53,7 +53,10 @@ namespace Emby.Drawing.ImageMagick
"arw", "arw",
"webp", "webp",
"gif", "gif",
"bmp" "bmp",
"erf",
"raf",
"rw2"
}; };
} }
} }

24
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -1149,29 +1149,19 @@ namespace MediaBrowser.Controller.Entities
return LinkedChildren return LinkedChildren
.Select(i => .Select(i =>
{ {
var requiresPostFilter = true; var child = GetLinkedChild(i);
if (!string.IsNullOrWhiteSpace(i.Path)) if (child != null)
{ {
requiresPostFilter = false; var childLocationType = child.LocationType;
if (childLocationType == LocationType.Remote || childLocationType == LocationType.Virtual)
if (!locations.Any(l => FileSystem.ContainsSubPath(l, i.Path))) {
if (!child.IsVisibleStandalone(user))
{ {
return null; return null;
} }
} }
else if (childLocationType == LocationType.FileSystem && !locations.Any(l => FileSystem.ContainsSubPath(l, child.Path)))
var child = GetLinkedChild(i);
if (requiresPostFilter && child != null)
{
if (string.IsNullOrWhiteSpace(child.Path))
{
Logger.Debug("Found LinkedChild with null path: {0}", child.Name);
return child;
}
if (!locations.Any(l => FileSystem.ContainsSubPath(l, child.Path)))
{ {
return null; return null;
} }

6
MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
View File

@ -126,11 +126,7 @@ namespace MediaBrowser.Providers.Movies
movie.Name = movieData.GetTitle() ?? movie.Name; movie.Name = movieData.GetTitle() ?? movie.Name;
var hasOriginalTitle = movie as IHasOriginalTitle; movie.OriginalTitle = movieData.GetOriginalTitle();
if (hasOriginalTitle != null)
{
hasOriginalTitle.OriginalTitle = movieData.GetOriginalTitle();
}
// Bug in Mono: WebUtility.HtmlDecode should return null if the string is null but in Mono it generate an System.ArgumentNullException. // Bug in Mono: WebUtility.HtmlDecode should return null if the string is null but in Mono it generate an System.ArgumentNullException.
movie.Overview = movieData.overview != null ? WebUtility.HtmlDecode(movieData.overview) : null; movie.Overview = movieData.overview != null ? WebUtility.HtmlDecode(movieData.overview) : null;

4
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -566,10 +566,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
} }
var seriesId = info.SeriesId; var seriesId = info.SeriesId;
if (string.IsNullOrWhiteSpace(seriesId) && info.IsSeries)
{
seriesId = info.Name.GetMD5().ToString("N");
}
if (!item.ParentId.Equals(channel.Id)) if (!item.ParentId.Equals(channel.Id))
{ {

3
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs
View File

@ -58,6 +58,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
OpenedMediaSource.Path = _appHost.GetLocalApiUrl("localhost") + "/LiveTv/LiveStreamFiles/" + Path.GetFileNameWithoutExtension(tempFile) + "/stream.ts"; OpenedMediaSource.Path = _appHost.GetLocalApiUrl("localhost") + "/LiveTv/LiveStreamFiles/" + Path.GetFileNameWithoutExtension(tempFile) + "/stream.ts";
OpenedMediaSource.Protocol = MediaProtocol.Http; OpenedMediaSource.Protocol = MediaProtocol.Http;
OpenedMediaSource.SupportsDirectPlay = false;
OpenedMediaSource.SupportsDirectStream = true;
OpenedMediaSource.SupportsTranscoding = true;
await taskCompletionSource.Task.ConfigureAwait(false); await taskCompletionSource.Task.ConfigureAwait(false);