fix theme videos
This commit is contained in:
parent
1b0b7ac6a5
commit
7760f022af
|
@ -709,7 +709,10 @@ namespace MediaBrowser.Api
|
|||
|
||||
public void StartKillTimer(TimerCallback callback, int intervalMs)
|
||||
{
|
||||
CheckHasExited();
|
||||
if (HasExited)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
lock (_timerLock)
|
||||
{
|
||||
|
@ -728,7 +731,10 @@ namespace MediaBrowser.Api
|
|||
|
||||
public void ChangeKillTimerIfStarted()
|
||||
{
|
||||
CheckHasExited();
|
||||
if (HasExited)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
lock (_timerLock)
|
||||
{
|
||||
|
@ -741,14 +747,6 @@ namespace MediaBrowser.Api
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void CheckHasExited()
|
||||
{
|
||||
if (HasExited)
|
||||
{
|
||||
throw new ObjectDisposedException("Job");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Entities
|
|||
public Guid DisplayParentId { get; set; }
|
||||
|
||||
public Guid? UserId { get; set; }
|
||||
|
||||
|
||||
public static ITVSeriesManager TVSeriesManager;
|
||||
public static IPlaylistManager PlaylistManager;
|
||||
|
||||
|
@ -40,7 +40,7 @@ namespace MediaBrowser.Controller.Entities
|
|||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
public override Task<QueryResult<BaseItem>> GetItems(InternalItemsQuery query)
|
||||
{
|
||||
var parent = this as Folder;
|
||||
|
@ -146,6 +146,11 @@ namespace MediaBrowser.Controller.Entities
|
|||
return types.Contains(viewType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
|
||||
}
|
||||
|
||||
protected override Task ValidateChildrenInternal(IProgress<double> progress, System.Threading.CancellationToken cancellationToken, bool recursive, bool refreshChildMetadata, Providers.MetadataRefreshOptions refreshOptions, Providers.IDirectoryService directoryService)
|
||||
{
|
||||
return Task.FromResult(true);
|
||||
}
|
||||
|
||||
[IgnoreDataMember]
|
||||
public override bool SupportsPeople
|
||||
{
|
||||
|
|
|
@ -13,11 +13,10 @@
|
|||
public string[] DisabledFetchers { get; set; }
|
||||
|
||||
public bool ExtractDuringLibraryScan { get; set; }
|
||||
|
||||
|
||||
public ChapterOptions()
|
||||
{
|
||||
DownloadMovieChapters = true;
|
||||
ExtractDuringLibraryScan = true;
|
||||
|
||||
DisabledFetchers = new string[] { };
|
||||
FetcherOrder = new string[] { };
|
||||
|
|
|
@ -235,6 +235,7 @@ namespace MediaBrowser.Model.Configuration
|
|||
public string[] Migrations { get; set; }
|
||||
|
||||
public int MigrationVersion { get; set; }
|
||||
public bool EnableImagePreDownloading { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
|
||||
|
|
|
@ -17,6 +17,7 @@ using System.Net;
|
|||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using CommonIO;
|
||||
using MediaBrowser.Controller.Entities.Audio;
|
||||
using MediaBrowser.Model.MediaInfo;
|
||||
|
||||
namespace MediaBrowser.Providers.Manager
|
||||
|
@ -510,6 +511,15 @@ namespace MediaBrowser.Providers.Manager
|
|||
return true;
|
||||
}
|
||||
|
||||
if (item is IItemByName && !(item is MusicArtist))
|
||||
{
|
||||
var hasDualAccess = item as IHasDualAccess;
|
||||
if (hasDualAccess == null || hasDualAccess.IsAccessedByName)
|
||||
{
|
||||
return !_config.Configuration.EnableImagePreDownloading;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -66,7 +66,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||
// Ignore hidden files and folders
|
||||
if (isHidden)
|
||||
{
|
||||
if (parent != null)
|
||||
if (parent == null)
|
||||
{
|
||||
var parentFolderName = Path.GetFileName(Path.GetDirectoryName(path));
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user