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

update media source methods

Browse Source
This commit is contained in:
Luke Pulverenti
2017-08-05 15:02:33 -04:00
parent 3fe1c25c3e
commit db315c4e32
31 changed files with 240 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@@ -113,7 +113,7 @@ namespace Emby.Server.Implementations.Data
{
get
{
return true;
return false;
}
}
@@ -1972,20 +1972,7 @@ namespace Emby.Server.Implementations.Data
/// <returns>Task{IEnumerable{ItemReview}}.</returns>
public IEnumerable<ItemReview> GetCriticReviews(Guid itemId)
{
try
{
var path = Path.Combine(_criticReviewsPath, itemId + ".json");
return _jsonSerializer.DeserializeFromFile<List<ItemReview>>(path);
}
catch (FileNotFoundException)
{
return new List<ItemReview>();
}
catch (IOException)
{
return new List<ItemReview>();
}
return new List<ItemReview>();
}
private readonly Task _cachedTask = Task.FromResult(true);
@@ -1997,12 +1984,6 @@ namespace Emby.Server.Implementations.Data
/// <returns>Task.</returns>
public Task SaveCriticReviews(Guid itemId, IEnumerable<ItemReview> criticReviews)
{
_fileSystem.CreateDirectory(_criticReviewsPath);
var path = Path.Combine(_criticReviewsPath, itemId + ".json");
_jsonSerializer.SerializeToFile(criticReviews.ToList(), path);
return _cachedTask;
}
@@ -5610,7 +5591,7 @@ namespace Emby.Server.Implementations.Data
return item;
}
public IEnumerable<MediaStream> GetMediaStreams(MediaStreamQuery query)
public List<MediaStream> GetMediaStreams(MediaStreamQuery query)
{
CheckDisposed();

2
Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
View File

@@ -95,7 +95,7 @@ namespace Emby.Server.Implementations.Data
{
get
{
return true;
return false;
}
}

4
Emby.Server.Implementations/Dto/DtoService.cs
View File

@@ -359,11 +359,11 @@ namespace Emby.Server.Implementations.Dto
{
if (user == null)
{
dto.MediaSources = _mediaSourceManager().GetStaticMediaSources(hasMediaSources, true).ToList();
dto.MediaSources = _mediaSourceManager().GetStaticMediaSources(hasMediaSources, true);
}
else
{
dto.MediaSources = _mediaSourceManager().GetStaticMediaSources(hasMediaSources, true, user).ToList();
dto.MediaSources = _mediaSourceManager().GetStaticMediaSources(hasMediaSources, true, user);
}
}
}

3
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

@@ -413,6 +413,9 @@
<ItemGroup>
<EmbeddedResource Include="Localization\Ratings\es.txt" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Localization\Ratings\ro.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

15
Emby.Server.Implementations/Library/MediaSourceManager.cs
View File

@@ -49,10 +49,9 @@ namespace Emby.Server.Implementations.Library
_providers = providers.ToArray();
}
public IEnumerable<MediaStream> GetMediaStreams(MediaStreamQuery query)
public List<MediaStream> GetMediaStreams(MediaStreamQuery query)
{
var list = _itemRepo.GetMediaStreams(query)
.ToList();
var list = _itemRepo.GetMediaStreams(query);
foreach (var stream in list)
{
@@ -77,7 +76,7 @@ namespace Emby.Server.Implementations.Library
return false;
}
public IEnumerable<MediaStream> GetMediaStreams(string mediaSourceId)
public List<MediaStream> GetMediaStreams(string mediaSourceId)
{
var list = GetMediaStreams(new MediaStreamQuery
{
@@ -87,7 +86,7 @@ namespace Emby.Server.Implementations.Library
return GetMediaStreamsForItem(list);
}
public IEnumerable<MediaStream> GetMediaStreams(Guid itemId)
public List<MediaStream> GetMediaStreams(Guid itemId)
{
var list = GetMediaStreams(new MediaStreamQuery
{
@@ -97,7 +96,7 @@ namespace Emby.Server.Implementations.Library
return GetMediaStreamsForItem(list);
}
private IEnumerable<MediaStream> GetMediaStreamsForItem(IEnumerable<MediaStream> streams)
private List<MediaStream> GetMediaStreamsForItem(IEnumerable<MediaStream> streams)
{
var list = streams.ToList();
@@ -253,7 +252,7 @@ namespace Emby.Server.Implementations.Library
return sources.FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
}
public IEnumerable<MediaSourceInfo> GetStaticMediaSources(IHasMediaSources item, bool enablePathSubstitution, User user = null)
public List<MediaSourceInfo> GetStaticMediaSources(IHasMediaSources item, bool enablePathSubstitution, User user = null)
{
if (item == null)
{
@@ -265,7 +264,7 @@ namespace Emby.Server.Implementations.Library
return item.GetMediaSources(enablePathSubstitution);
}
var sources = item.GetMediaSources(enablePathSubstitution).ToList();
var sources = item.GetMediaSources(enablePathSubstitution);
if (user != null)
{

4
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@@ -1957,7 +1957,7 @@ namespace Emby.Server.Implementations.LiveTv
if (dto.MediaSources == null)
{
dto.MediaSources = recording.GetMediaSources(true).ToList();
dto.MediaSources = recording.GetMediaSources(true);
}
if (dto.MediaStreams == null)
@@ -2365,7 +2365,7 @@ namespace Emby.Server.Implementations.LiveTv
if (addMediaSources)
{
dto.MediaSources = channel.GetMediaSources(true).ToList();
dto.MediaSources = channel.GetMediaSources(true);
}
if (addCurrentProgram)

3
Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
View File

@@ -78,8 +78,7 @@ namespace Emby.Server.Implementations.LiveTv
{
var hasMediaSources = (IHasMediaSources)item;
sources = _mediaSourceManager.GetStaticMediaSources(hasMediaSources, false)
.ToList();
sources = _mediaSourceManager.GetStaticMediaSources(hasMediaSources, false);
forceRequireOpening = true;
}

1
Emby.Server.Implementations/Localization/Ratings/es.txt
View File

@@ -1,4 +1,5 @@
ES-A,1
ES-APTA,1
ES-7,3
ES-12,6
ES-16,8

1
Emby.Server.Implementations/Localization/Ratings/ro.txt Normal file
View File

@@ -0,0 +1 @@
RO-AG,1

22
Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
View File

@@ -29,9 +29,9 @@ namespace Emby.Server.Implementations.MediaEncoder
private readonly IChapterManager _chapterManager;
private readonly ILibraryManager _libraryManager;
public EncodingManager(IFileSystem fileSystem,
ILogger logger,
IMediaEncoder encoder,
public EncodingManager(IFileSystem fileSystem,
ILogger logger,
IMediaEncoder encoder,
IChapterManager chapterManager, ILibraryManager libraryManager)
{
_fileSystem = fileSystem;
@@ -121,12 +121,16 @@ namespace Emby.Server.Implementations.MediaEncoder
{
continue;
}
List<string> playableStreamFileNames = null;
if (video.VideoType == VideoType.BluRay || video.VideoType == VideoType.Dvd)
{
if (video.PlayableStreamFileNames.Count != 1)
{
continue;
}
continue;
}
if (playableStreamFileNames == null)
{
playableStreamFileNames = new List<string>();
}
try
@@ -136,7 +140,7 @@ namespace Emby.Server.Implementations.MediaEncoder
var protocol = MediaProtocol.File;
var inputPath = MediaEncoderHelpers.GetInputArgument(_fileSystem, video.Path, protocol, null, video.PlayableStreamFileNames);
var inputPath = MediaEncoderHelpers.GetInputArgument(_fileSystem, video.Path, protocol, null, playableStreamFileNames);
_fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(path));
@@ -151,7 +155,7 @@ namespace Emby.Server.Implementations.MediaEncoder
}
catch
{
}
chapter.ImagePath = path;