fix refresh of tv recordings

This commit is contained in:
Luke Pulverenti
2014-02-10 15:11:46 -05:00
parent 326fa5a670
commit cf9ef0e43d
34 changed files with 88 additions and 187 deletions

View File

@@ -273,8 +273,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
{
if (item.LocationType == LocationType.FileSystem)
{
return collections.Where(i => i.LocationType == LocationType.FileSystem &&
i.PhysicalLocations.Contains(item.Path)).Cast<T>();
return collections.Where(i => i.PhysicalLocations.Contains(item.Path)).Cast<T>();
}
}
@@ -283,7 +282,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
{
if (item.Id == user.RootFolder.Id)
{
return new T[] { item };
return new[] { item };
}
return new T[] { };

View File

@@ -161,7 +161,6 @@ namespace MediaBrowser.Server.Implementations.IO
.RootFolder
.Children
.OfType<Folder>()
.Where(i => i.LocationType != LocationType.Remote && i.LocationType != LocationType.Virtual)
.SelectMany(f => f.PhysicalLocations)
.Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(i => i)

View File

@@ -1399,22 +1399,7 @@ namespace MediaBrowser.Server.Implementations.Library
.Distinct()
.SelectMany(i => i.Children)
.OfType<CollectionFolder>()
.Where(i =>
{
var locationType = i.LocationType;
if (locationType == LocationType.Remote || locationType == LocationType.Virtual)
{
return false;
}
if (string.Equals(i.Path, item.Path, StringComparison.OrdinalIgnoreCase))
{
return true;
}
return i.PhysicalLocations.Contains(item.Path);
})
.Where(i => string.Equals(i.Path, item.Path, StringComparison.OrdinalIgnoreCase) || i.PhysicalLocations.Contains(item.Path))
.Select(i => i.CollectionType)
.Where(i => !string.IsNullOrEmpty(i))
.Distinct()

View File

@@ -615,13 +615,9 @@ namespace MediaBrowser.Server.Implementations.Session
}
var items = command.ItemIds.Select(i => _libraryManager.GetItemById(new Guid(i)))
.Where(i => i.LocationType != LocationType.Virtual)
.ToList();
if (items.Any(i => i.LocationType == LocationType.Virtual))
{
throw new ArgumentException("Virtual items are not playable.");
}
if (command.PlayCommand != PlayCommand.PlayNow)
{
if (items.Any(i => !session.QueueableMediaTypes.Contains(i.MediaType, StringComparer.OrdinalIgnoreCase)))