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

Merge pull request #1711 from MediaBrowser/dev

Browse Source 
fix dashboard page
This commit is contained in:
Luke 2016-05-06 02:03:17 -04:00
commit 31763e06d5
6 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Providers/TV/SeriesPostScanTask.cs
View File

@ -53,7 +53,8 @@ namespace MediaBrowser.Providers.TV
var seriesList = _libraryManager.GetItemList(new InternalItemsQuery() var seriesList = _libraryManager.GetItemList(new InternalItemsQuery()
{ {
IncludeItemTypes = new[] { typeof(Series).Name }, IncludeItemTypes = new[] { typeof(Series).Name },
Recursive = true Recursive = true,
GroupByPresentationUniqueKey = false
}).Cast<Series>().ToList(); }).Cast<Series>().ToList();
@ -207,7 +208,8 @@ namespace MediaBrowser.Providers.TV
var seriesList = _libraryManager.GetItemList(new InternalItemsQuery() var seriesList = _libraryManager.GetItemList(new InternalItemsQuery()
{ {
IncludeItemTypes = new[] { typeof(Series).Name }, IncludeItemTypes = new[] { typeof(Series).Name },
Recursive = true Recursive = true,
GroupByPresentationUniqueKey = false
}).Cast<Series>().ToList(); }).Cast<Series>().ToList();

13
MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeImageProvider.cs
View File

@ -176,19 +176,16 @@ namespace MediaBrowser.Providers.TV
public bool HasChanged(IHasMetadata item, IDirectoryService directoryService) public bool HasChanged(IHasMetadata item, IDirectoryService directoryService)
{ {
var episode = (Episode)item; // For non-unaired items, only enable if configured
if (!TvdbSeriesProvider.Current.GetTvDbOptions().EnableAutomaticUpdates)
if (!episode.IsVirtualUnaired)
{ {
// For non-unaired items, only enable if configured return false;
if (!TvdbSeriesProvider.Current.GetTvDbOptions().EnableAutomaticUpdates)
{
return false;
}
} }
if (!item.HasImage(ImageType.Primary)) if (!item.HasImage(ImageType.Primary))
{ {
var episode = (Episode)item;
var series = episode.Series; var series = episode.Series;
if (series != null && TvdbSeriesProvider.IsValidSeries(series.ProviderIds)) if (series != null && TvdbSeriesProvider.IsValidSeries(series.ProviderIds))

3
MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
View File

@ -146,8 +146,7 @@ namespace MediaBrowser.Providers.TV
public bool HasChanged(IHasMetadata item, IDirectoryService directoryService) public bool HasChanged(IHasMetadata item, IDirectoryService directoryService)
{ {
// Only enable for virtual items if (!TvdbSeriesProvider.Current.GetTvDbOptions().EnableAutomaticUpdates)
if (item.LocationType != LocationType.Virtual)
{ {
return false; return false;
} }

34
MediaBrowser.Providers/TV/TheTVDB/TvdbPrescanTask.cs
View File

@ -15,6 +15,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml; using System.Xml;
using CommonIO; using CommonIO;
using MediaBrowser.Controller.Entities;
namespace MediaBrowser.Providers.TV namespace MediaBrowser.Providers.TV
{ {
@ -89,7 +90,7 @@ namespace MediaBrowser.Providers.TV
var path = TvdbSeriesProvider.GetSeriesDataPath(_config.CommonApplicationPaths); var path = TvdbSeriesProvider.GetSeriesDataPath(_config.CommonApplicationPaths);
_fileSystem.CreateDirectory(path); _fileSystem.CreateDirectory(path);
var timestampFile = Path.Combine(path, "time.txt"); var timestampFile = Path.Combine(path, "time.txt");
@ -102,7 +103,7 @@ namespace MediaBrowser.Providers.TV
} }
// Find out the last time we queried tvdb for updates // Find out the last time we queried tvdb for updates
var lastUpdateTime = timestampFileInfo.Exists ? _fileSystem.ReadAllText(timestampFile, Encoding.UTF8) : string.Empty; var lastUpdateTime = timestampFileInfo.Exists ? _fileSystem.ReadAllText(timestampFile, Encoding.UTF8) : string.Empty;
string newUpdateTime; string newUpdateTime;
@ -110,9 +111,15 @@ namespace MediaBrowser.Providers.TV
.Select(Path.GetFileName) .Select(Path.GetFileName)
.ToList(); .ToList();
var seriesIdsInLibrary = _libraryManager.RootFolder var seriesList = _libraryManager.GetItemList(new InternalItemsQuery()
.GetRecursiveChildren(i => i is Series && !string.IsNullOrEmpty(i.GetProviderId(MetadataProviders.Tvdb))) {
.Cast<Series>() IncludeItemTypes = new[] { typeof(Series).Name },
Recursive = true,
GroupByPresentationUniqueKey = false
}).Cast<Series>();
var seriesIdsInLibrary = seriesList
.Where(i => !string.IsNullOrEmpty(i.GetProviderId(MetadataProviders.Tvdb)))
.Select(i => i.GetProviderId(MetadataProviders.Tvdb)) .Select(i => i.GetProviderId(MetadataProviders.Tvdb))
.ToList(); .ToList();
@ -157,7 +164,7 @@ namespace MediaBrowser.Providers.TV
await UpdateSeries(listToUpdate, path, nullableUpdateValue, progress, cancellationToken).ConfigureAwait(false); await UpdateSeries(listToUpdate, path, nullableUpdateValue, progress, cancellationToken).ConfigureAwait(false);
} }
_fileSystem.WriteAllText(timestampFile, newUpdateTime, Encoding.UTF8); _fileSystem.WriteAllText(timestampFile, newUpdateTime, Encoding.UTF8);
progress.Report(100); progress.Report(100);
} }
@ -300,10 +307,17 @@ namespace MediaBrowser.Providers.TV
var list = seriesIds.ToList(); var list = seriesIds.ToList();
var numComplete = 0; var numComplete = 0;
var seriesList = _libraryManager.GetItemList(new InternalItemsQuery()
{
IncludeItemTypes = new[] { typeof(Series).Name },
Recursive = true,
GroupByPresentationUniqueKey = false
}).Cast<Series>();
// Gather all series into a lookup by tvdb id // Gather all series into a lookup by tvdb id
var allSeries = _libraryManager.RootFolder var allSeries = seriesList
.GetRecursiveChildren(i => i is Series && !string.IsNullOrEmpty(i.GetProviderId(MetadataProviders.Tvdb))) .Where(i => !string.IsNullOrEmpty(i.GetProviderId(MetadataProviders.Tvdb)))
.Cast<Series>()
.ToLookup(i => i.GetProviderId(MetadataProviders.Tvdb)); .ToLookup(i => i.GetProviderId(MetadataProviders.Tvdb));
foreach (var seriesId in list) foreach (var seriesId in list)
@ -357,7 +371,7 @@ namespace MediaBrowser.Providers.TV
seriesDataPath = Path.Combine(seriesDataPath, id); seriesDataPath = Path.Combine(seriesDataPath, id);
_fileSystem.CreateDirectory(seriesDataPath); _fileSystem.CreateDirectory(seriesDataPath);
return TvdbSeriesProvider.Current.DownloadSeriesZip(id, MetadataProviders.Tvdb.ToString(), seriesDataPath, lastTvDbUpdateTime, preferredMetadataLanguage, cancellationToken); return TvdbSeriesProvider.Current.DownloadSeriesZip(id, MetadataProviders.Tvdb.ToString(), seriesDataPath, lastTvDbUpdateTime, preferredMetadataLanguage, cancellationToken);
} }

8
MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
View File

@ -365,13 +365,9 @@ namespace MediaBrowser.Providers.TV
public bool HasChanged(IHasMetadata item, IDirectoryService directoryService) public bool HasChanged(IHasMetadata item, IDirectoryService directoryService)
{ {
if (item.LocationType != LocationType.Virtual) if (!TvdbSeriesProvider.Current.GetTvDbOptions().EnableAutomaticUpdates)
{ {
// For non-virtual items, only enable if configured return false;
if (!TvdbSeriesProvider.Current.GetTvDbOptions().EnableAutomaticUpdates)
{
return false;
}
} }
var season = (Season)item; var season = (Season)item;

5
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@ -2398,6 +2398,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
return false; return false;
} }
if (query.User == null)
{
return false;
}
if (query.IncludeItemTypes.Length == 0) if (query.IncludeItemTypes.Length == 0)
{ {
return true; return true;