aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-10-17 16:59:46 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-10-17 16:59:46 -0400
commit0eec819ca70ac0fab7e37cee09c58fab336bf9f0 (patch)
tree4e9da82e719c592ac6bfea6323e9abf88ba3a2cf
parent005b6c92aac4ee618fc1efa86ec5f1d9687b531e (diff)
added detail page indicator for missing
-rw-r--r--MediaBrowser.Server.Implementations/Dto/DtoService.cs2
-rw-r--r--MediaBrowser.Server.Implementations/Providers/ImageSaver.cs11
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj3
3 files changed, 6 insertions, 10 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 153639a00..fea49880e 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1075,7 +1075,7 @@ namespace MediaBrowser.Server.Implementations.Dto
double totalPercentPlayed = 0;
// Loop through each recursive child
- foreach (var child in folder.GetRecursiveChildren(user, i => !i.IsFolder))
+ foreach (var child in folder.GetRecursiveChildren(user, i => !i.IsFolder && i.LocationType != LocationType.Virtual))
{
var userdata = _userDataRepository.GetUserData(user.Id, child.GetUserDataKey());
diff --git a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs
index 5827b211c..331dea402 100644
--- a/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs
+++ b/MediaBrowser.Server.Implementations/Providers/ImageSaver.cs
@@ -408,7 +408,7 @@ namespace MediaBrowser.Server.Implementations.Providers
return new[] { Path.Combine(seriesFolder, imageFilename) };
}
-
+
return new[]
{
Path.Combine(item.MetaLocation, "fanart" + extension)
@@ -426,13 +426,6 @@ namespace MediaBrowser.Server.Implementations.Providers
if (type == ImageType.Primary)
{
- if (item is Series)
- {
- var imageFilename = "poster" + extension;
-
- return new[] { Path.Combine(item.Path, imageFilename) };
- }
-
if (item is Season && item.IndexNumber.HasValue)
{
var seriesFolder = Path.GetDirectoryName(item.Path);
@@ -460,7 +453,7 @@ namespace MediaBrowser.Server.Implementations.Providers
return new[] { GetSavePathForItemInMixedFolder(item, type, string.Empty, extension) };
}
- var filename = Path.GetFileNameWithoutExtension(item.Path) + "-poster" + extension;
+ var filename = "poster" + extension;
return new[] { Path.Combine(item.MetaLocation, filename) };
}
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 741627d28..5ed3544c6 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -92,6 +92,9 @@
<Content Include="dashboard-ui\css\images\editor\lock.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\css\images\editor\missing.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\css\images\editor\missingbackdrop.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>