alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-19 12:44:19 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update themes

Browse Source
This commit is contained in:
Luke Pulverenti
2017-07-31 01:16:22 -04:00
parent 4ea1216af6
commit 2ed625d27e
14 changed files with 22 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -128,12 +128,6 @@ namespace MediaBrowser.Controller.Entities
[IgnoreDataMember]
public bool IsInMixedFolder { get; set; }
[IgnoreDataMember]
protected virtual bool SupportsIsInMixedFolderDetection
{
get { return false; }
}
[IgnoreDataMember]
public virtual bool SupportsPlayedStatus
{
@@ -152,16 +146,6 @@ namespace MediaBrowser.Controller.Entities
}
}
public bool DetectIsInMixedFolder()
{
if (SupportsIsInMixedFolderDetection)
{
}
return IsInMixedFolder;
}
[IgnoreDataMember]
public virtual bool SupportsRemoteImageDownloading
{
@@ -1156,7 +1140,7 @@ namespace MediaBrowser.Controller.Entities
{
if (SupportsThemeMedia)
{
if (!DetectIsInMixedFolder())
if (!IsInMixedFolder)
{
themeSongsChanged = await RefreshThemeSongs(this, options, fileSystemChildren, cancellationToken).ConfigureAwait(false);
@@ -1311,12 +1295,9 @@ namespace MediaBrowser.Controller.Entities
{
var current = this;
if (!SupportsIsInMixedFolderDetection)
if (current.IsInMixedFolder != newItem.IsInMixedFolder)
{
if (current.IsInMixedFolder != newItem.IsInMixedFolder)
{
return false;
}
return false;
}
return true;

2
MediaBrowser.Controller/Entities/Game.cs
View File

@@ -100,7 +100,7 @@ namespace MediaBrowser.Controller.Entities
public override IEnumerable<FileSystemMetadata> GetDeletePaths()
{
if (!DetectIsInMixedFolder())
if (!IsInMixedFolder)
{
return new[] {
new FileSystemMetadata

2
MediaBrowser.Controller/Entities/IHasImages.cs
View File

@@ -152,7 +152,7 @@ namespace MediaBrowser.Controller.Entities
/// <value><c>true</c> if [supports local metadata]; otherwise, <c>false</c>.</value>
bool SupportsLocalMetadata { get; }
bool DetectIsInMixedFolder();
bool IsInMixedFolder { get; }
/// <summary>
/// Gets a value indicating whether this instance is locked.

15
MediaBrowser.Controller/Entities/Movies/Movie.cs
View File

@@ -55,22 +55,13 @@ namespace MediaBrowser.Controller.Entities.Movies
return value;
}
[IgnoreDataMember]
protected override bool SupportsIsInMixedFolderDetection
{
get
{
return false;
}
}
protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, List<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
{
var hasChanges = await base.RefreshedOwnedItems(options, fileSystemChildren, cancellationToken).ConfigureAwait(false);
// Must have a parent to have special features
// In other words, it must be part of the Parent/Child tree
if (LocationType == LocationType.FileSystem && GetParent() != null && !DetectIsInMixedFolder())
if (LocationType == LocationType.FileSystem && GetParent() != null && !IsInMixedFolder)
{
var specialFeaturesChanged = await RefreshSpecialFeatures(options, fileSystemChildren, cancellationToken).ConfigureAwait(false);
@@ -108,7 +99,7 @@ namespace MediaBrowser.Controller.Entities.Movies
{
var info = GetItemLookupInfo<MovieInfo>();
if (!DetectIsInMixedFolder())
if (!IsInMixedFolder)
{
var name = System.IO.Path.GetFileName(ContainingFolderPath);
@@ -145,7 +136,7 @@ namespace MediaBrowser.Controller.Entities.Movies
else
{
// Try to get the year from the folder name
if (!DetectIsInMixedFolder())
if (!IsInMixedFolder)
{
info = LibraryManager.ParseName(System.IO.Path.GetFileName(ContainingFolderPath));

11
MediaBrowser.Controller/Entities/MusicVideo.cs
View File

@@ -24,15 +24,6 @@ namespace MediaBrowser.Controller.Entities
}
}
[IgnoreDataMember]
protected override bool SupportsIsInMixedFolderDetection
{
get
{
return false;
}
}
public override UnratedItem GetBlockUnratedType()
{
return UnratedItem.Music;
@@ -61,7 +52,7 @@ namespace MediaBrowser.Controller.Entities
else
{
// Try to get the year from the folder name
if (!DetectIsInMixedFolder())
if (!IsInMixedFolder)
{
info = LibraryManager.ParseName(System.IO.Path.GetFileName(ContainingFolderPath));

4
MediaBrowser.Controller/Entities/Trailer.cs
View File

@@ -47,7 +47,7 @@ namespace MediaBrowser.Controller.Entities
info.IsLocalTrailer = TrailerTypes.Contains(TrailerType.LocalTrailer);
if (!DetectIsInMixedFolder() && LocationType == LocationType.FileSystem)
if (!IsInMixedFolder && LocationType == LocationType.FileSystem)
{
info.Name = System.IO.Path.GetFileName(ContainingFolderPath);
}
@@ -73,7 +73,7 @@ namespace MediaBrowser.Controller.Entities
else
{
// Try to get the year from the folder name
if (!DetectIsInMixedFolder())
if (!IsInMixedFolder)
{
info = LibraryManager.ParseName(System.IO.Path.GetFileName(ContainingFolderPath));

11
MediaBrowser.Controller/Entities/Video.cs
View File

@@ -77,15 +77,6 @@ namespace MediaBrowser.Controller.Entities
}
}
[IgnoreDataMember]
protected override bool SupportsIsInMixedFolderDetection
{
get
{
return true;
}
}
public override string CreatePresentationUniqueKey()
{
if (!string.IsNullOrWhiteSpace(PrimaryVersionId))
@@ -500,7 +491,7 @@ namespace MediaBrowser.Controller.Entities
public override IEnumerable<FileSystemMetadata> GetDeletePaths()
{
if (!DetectIsInMixedFolder())
if (!IsInMixedFolder)
{
return new[] {
new FileSystemMetadata