alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 00:55:13 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fixes #697 - Support xbmc offline discs

Browse Source
This commit is contained in:
Luke Pulverenti
2014-03-03 00:11:03 -05:00
parent 2db452f68f
commit 6efb78b8b2
27 changed files with 154 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@@ -970,6 +970,12 @@ namespace MediaBrowser.Server.Implementations.Dto
}
}
var supportsPlaceHolders = item as ISupportsPlaceHolders;
if (supportsPlaceHolders != null)
{
dto.IsPlaceHolder = supportsPlaceHolders.IsPlaceHolder;
}
// Add audio info
var audio = item as Audio;
if (audio != null)

2
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@@ -451,7 +451,7 @@ namespace MediaBrowser.Server.Implementations.Library
}
}
if (options.DeleteFileLocation && (locationType == LocationType.FileSystem || locationType == LocationType.Offline))
if (options.DeleteFileLocation && locationType != LocationType.Remote && locationType != LocationType.Virtual)
{
foreach (var path in item.GetDeletePaths().ToList())
{

1
MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
View File

@@ -132,6 +132,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
return true;
}
if (EntityResolutionHelper.IsVideoFile(fullName)) return false;
if (EntityResolutionHelper.IsVideoPlaceHolder(fullName)) return false;
}
// or a single audio file and no video files

5
MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
View File

@@ -84,6 +84,11 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
/// <returns><c>true</c> if [is eligible for chapter image extraction] [the specified video]; otherwise, <c>false</c>.</returns>
private bool IsEligibleForChapterImageExtraction(Video video)
{
if (video.IsPlaceHolder)
{
return false;
}
if (video is Movie)
{
if (!_config.Configuration.EnableMovieChapterImageExtraction)