Merge pull request #2939 from MediaBrowser/dev

Dev

Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs

@@ -49,18 +49,20 @@ namespace Emby.Server.Implementations.FFMpeg
 
             var downloadInfo = _ffmpegInstallInfo;
 
-            var version = downloadInfo.Version;
-
-            if (string.Equals(version, "path", StringComparison.OrdinalIgnoreCase))
+            var prebuiltffmpeg = Path.Combine(_appPaths.ProgramSystemPath, downloadInfo.FFMpegFilename);
+            var prebuiltffprobe = Path.Combine(_appPaths.ProgramSystemPath, downloadInfo.FFProbeFilename);
+            if (_fileSystem.FileExists(prebuiltffmpeg) && _fileSystem.FileExists(prebuiltffprobe))
             {
                 return new FFMpegInfo
                 {
-                    ProbePath = downloadInfo.FFProbeFilename,
-                    EncoderPath = downloadInfo.FFMpegFilename,
-                    Version = version
+                    ProbePath = prebuiltffprobe,
+                    EncoderPath = prebuiltffmpeg,
+                    Version = "external"
                 };
             }
 
+            var version = downloadInfo.Version;
+
             if (string.Equals(version, "0", StringComparison.OrdinalIgnoreCase))
             {
                 return new FFMpegInfo();

Emby.Server.Implementations/TV/TVSeriesManager.cs

@@ -36,8 +36,6 @@ namespace Emby.Server.Implementations.TV
                 throw new ArgumentException("User not found");
             }
 
-            var parentIdGuid = string.IsNullOrWhiteSpace(request.ParentId) ? (Guid?)null : new Guid(request.ParentId);
-
             string presentationUniqueKey = null;
             int? limit = null;
             if (!string.IsNullOrWhiteSpace(request.SeriesId))
@@ -56,10 +54,26 @@ namespace Emby.Server.Implementations.TV
                 return GetResult(GetNextUpEpisodes(request, user, new[] { presentationUniqueKey }, dtoOptions), request);
             }
 
-            var parents = user.RootFolder.GetChildren(user, true)
-                .Where(i => i is Folder)
-                .Where(i => !user.Configuration.LatestItemsExcludes.Contains(i.Id.ToString("N")))
-                .ToList();
+            var parentIdGuid = string.IsNullOrWhiteSpace(request.ParentId) ? (Guid?)null : new Guid(request.ParentId);
+
+            List<BaseItem> parents;
+
+            if (parentIdGuid.HasValue)
+            {
+                var parent = _libraryManager.GetItemById(parentIdGuid.Value);
+                parents = new List<BaseItem>();
+                if (parent != null)
+                {
+                    parents.Add(parent);
+                }
+            }
+            else
+            {
+                parents = user.RootFolder.GetChildren(user, true)
+                   .Where(i => i is Folder)
+                   .Where(i => !user.Configuration.LatestItemsExcludes.Contains(i.Id.ToString("N")))
+                   .ToList();
+            }
 
             return GetNextUp(request, parents, dtoOptions);
         }
@@ -88,7 +102,7 @@ namespace Emby.Server.Implementations.TV
 
             if (!string.IsNullOrWhiteSpace(presentationUniqueKey))
             {
-                return GetResult(GetNextUpEpisodes(request, user, new [] { presentationUniqueKey }, dtoOptions), request);
+                return GetResult(GetNextUpEpisodes(request, user, new[] { presentationUniqueKey }, dtoOptions), request);
             }
 
             if (limit.HasValue)

SharedVersion.cs

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