mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 05:47:14 -04:00
Merge branch 'master' into userdb-efcore
This commit is contained in:
commit
bb23ce3466
@ -1,3 +1,5 @@
|
|||||||
|
#pragma warning disable CS1591
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@ -18,8 +20,14 @@ using MediaBrowser.Model.Querying;
|
|||||||
|
|
||||||
namespace Emby.Server.Implementations.Images
|
namespace Emby.Server.Implementations.Images
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Class ArtistImageProvider.
|
||||||
|
/// </summary>
|
||||||
public class ArtistImageProvider : BaseDynamicImageProvider<MusicArtist>
|
public class ArtistImageProvider : BaseDynamicImageProvider<MusicArtist>
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The library manager.
|
||||||
|
/// </summary>
|
||||||
private readonly ILibraryManager _libraryManager;
|
private readonly ILibraryManager _libraryManager;
|
||||||
|
|
||||||
public ArtistImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IImageProcessor imageProcessor, ILibraryManager libraryManager) : base(fileSystem, providerManager, applicationPaths, imageProcessor)
|
public ArtistImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IImageProcessor imageProcessor, ILibraryManager libraryManager) : base(fileSystem, providerManager, applicationPaths, imageProcessor)
|
||||||
@ -27,6 +35,11 @@ namespace Emby.Server.Implementations.Images
|
|||||||
_libraryManager = libraryManager;
|
_libraryManager = libraryManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get children objects used to create an artist image.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="item">The artist used to create the image.</param>
|
||||||
|
/// <returns>Any relevant children objects.</returns>
|
||||||
protected override IReadOnlyList<BaseItem> GetItemsWithImages(BaseItem item)
|
protected override IReadOnlyList<BaseItem> GetItemsWithImages(BaseItem item)
|
||||||
{
|
{
|
||||||
return Array.Empty<BaseItem>();
|
return Array.Empty<BaseItem>();
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
using System;
|
#pragma warning disable CS1591
|
||||||
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
|
||||||
using Emby.Server.Implementations.Images;
|
|
||||||
using MediaBrowser.Common.Configuration;
|
using MediaBrowser.Common.Configuration;
|
||||||
using MediaBrowser.Controller.Drawing;
|
using MediaBrowser.Controller.Drawing;
|
||||||
using MediaBrowser.Controller.Dto;
|
using MediaBrowser.Controller.Dto;
|
||||||
@ -10,7 +9,6 @@ using MediaBrowser.Controller.Entities.Audio;
|
|||||||
using MediaBrowser.Controller.Entities.Movies;
|
using MediaBrowser.Controller.Entities.Movies;
|
||||||
using MediaBrowser.Controller.Entities.TV;
|
using MediaBrowser.Controller.Entities.TV;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Controller.Playlists;
|
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.IO;
|
using MediaBrowser.Model.IO;
|
||||||
@ -18,8 +16,14 @@ using MediaBrowser.Model.Querying;
|
|||||||
|
|
||||||
namespace Emby.Server.Implementations.Images
|
namespace Emby.Server.Implementations.Images
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Class MusicGenreImageProvider.
|
||||||
|
/// </summary>
|
||||||
public class MusicGenreImageProvider : BaseDynamicImageProvider<MusicGenre>
|
public class MusicGenreImageProvider : BaseDynamicImageProvider<MusicGenre>
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The library manager.
|
||||||
|
/// </summary>
|
||||||
private readonly ILibraryManager _libraryManager;
|
private readonly ILibraryManager _libraryManager;
|
||||||
|
|
||||||
public MusicGenreImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IImageProcessor imageProcessor, ILibraryManager libraryManager) : base(fileSystem, providerManager, applicationPaths, imageProcessor)
|
public MusicGenreImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IImageProcessor imageProcessor, ILibraryManager libraryManager) : base(fileSystem, providerManager, applicationPaths, imageProcessor)
|
||||||
@ -27,6 +31,11 @@ namespace Emby.Server.Implementations.Images
|
|||||||
_libraryManager = libraryManager;
|
_libraryManager = libraryManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get children objects used to create an music genre image.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="item">The music genre used to create the image.</param>
|
||||||
|
/// <returns>Any relevant children objects.</returns>
|
||||||
protected override IReadOnlyList<BaseItem> GetItemsWithImages(BaseItem item)
|
protected override IReadOnlyList<BaseItem> GetItemsWithImages(BaseItem item)
|
||||||
{
|
{
|
||||||
return _libraryManager.GetItemList(new InternalItemsQuery
|
return _libraryManager.GetItemList(new InternalItemsQuery
|
||||||
@ -42,8 +51,14 @@ namespace Emby.Server.Implementations.Images
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Class GenreImageProvider.
|
||||||
|
/// </summary>
|
||||||
public class GenreImageProvider : BaseDynamicImageProvider<Genre>
|
public class GenreImageProvider : BaseDynamicImageProvider<Genre>
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The library manager.
|
||||||
|
/// </summary>
|
||||||
private readonly ILibraryManager _libraryManager;
|
private readonly ILibraryManager _libraryManager;
|
||||||
|
|
||||||
public GenreImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IImageProcessor imageProcessor, ILibraryManager libraryManager) : base(fileSystem, providerManager, applicationPaths, imageProcessor)
|
public GenreImageProvider(IFileSystem fileSystem, IProviderManager providerManager, IApplicationPaths applicationPaths, IImageProcessor imageProcessor, ILibraryManager libraryManager) : base(fileSystem, providerManager, applicationPaths, imageProcessor)
|
||||||
@ -51,6 +66,11 @@ namespace Emby.Server.Implementations.Images
|
|||||||
_libraryManager = libraryManager;
|
_libraryManager = libraryManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get children objects used to create an genre image.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="item">The genre used to create the image.</param>
|
||||||
|
/// <returns>Any relevant children objects.</returns>
|
||||||
protected override IReadOnlyList<BaseItem> GetItemsWithImages(BaseItem item)
|
protected override IReadOnlyList<BaseItem> GetItemsWithImages(BaseItem item)
|
||||||
{
|
{
|
||||||
return _libraryManager.GetItemList(new InternalItemsQuery
|
return _libraryManager.GetItemList(new InternalItemsQuery
|
||||||
|
@ -101,5 +101,18 @@
|
|||||||
"TaskRefreshLibrary": "Skann mediebibliotek",
|
"TaskRefreshLibrary": "Skann mediebibliotek",
|
||||||
"TaskRefreshChapterImagesDescription": "Lager forhåndsvisningsbilder for videoer som har kapitler.",
|
"TaskRefreshChapterImagesDescription": "Lager forhåndsvisningsbilder for videoer som har kapitler.",
|
||||||
"TaskRefreshChapterImages": "Trekk ut Kapittelbilder",
|
"TaskRefreshChapterImages": "Trekk ut Kapittelbilder",
|
||||||
"TaskCleanCacheDescription": "Sletter mellomlagrede filer som ikke lengre trengs av systemet."
|
"TaskCleanCacheDescription": "Sletter mellomlagrede filer som ikke lengre trengs av systemet.",
|
||||||
|
"TaskDownloadMissingSubtitlesDescription": "Søker etter manglende underteksting på nett basert på metadatakonfigurasjon.",
|
||||||
|
"TaskDownloadMissingSubtitles": "Last ned manglende underteksting",
|
||||||
|
"TaskRefreshChannelsDescription": "Frisker opp internettkanalinformasjon.",
|
||||||
|
"TaskRefreshChannels": "Oppfrisk kanaler",
|
||||||
|
"TaskCleanTranscodeDescription": "Sletter omkodede filer som er mer enn én dag gamle.",
|
||||||
|
"TaskCleanTranscode": "Tøm transkodingmappe",
|
||||||
|
"TaskUpdatePluginsDescription": "Laster ned og installerer oppdateringer for utvidelser som er stilt inn til å oppdatere automatisk.",
|
||||||
|
"TaskUpdatePlugins": "Oppdater utvidelser",
|
||||||
|
"TaskRefreshPeopleDescription": "Oppdaterer metadata for skuespillere og regissører i mediebiblioteket ditt.",
|
||||||
|
"TaskRefreshPeople": "Oppfrisk personer",
|
||||||
|
"TaskCleanLogsDescription": "Sletter loggfiler som er eldre enn {0} dager gamle.",
|
||||||
|
"TaskCleanLogs": "Tøm loggmappe",
|
||||||
|
"TaskRefreshLibraryDescription": "Skanner mediebibliotekene dine for nye filer og oppdaterer metadata."
|
||||||
}
|
}
|
||||||
|
@ -113,5 +113,6 @@
|
|||||||
"TasksChannelsCategory": "Spletni kanali",
|
"TasksChannelsCategory": "Spletni kanali",
|
||||||
"TasksApplicationCategory": "Aplikacija",
|
"TasksApplicationCategory": "Aplikacija",
|
||||||
"TasksLibraryCategory": "Knjižnica",
|
"TasksLibraryCategory": "Knjižnica",
|
||||||
"TasksMaintenanceCategory": "Vzdrževanje"
|
"TasksMaintenanceCategory": "Vzdrževanje",
|
||||||
|
"TaskDownloadMissingSubtitlesDescription": "Na podlagi nastavitev metapodatkov poišče manjkajoče podnapise na internetu."
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
|
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
|
||||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||||
<TreatWarningsAsErrors Condition=" '$(Configuration)' == 'Release' ">true</TreatWarningsAsErrors>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||||
|
@ -872,9 +872,8 @@ namespace MediaBrowser.Api.Playback.Hls
|
|||||||
|
|
||||||
if (framerate.HasValue)
|
if (framerate.HasValue)
|
||||||
{
|
{
|
||||||
builder.Append(",FRAME-RATE=\"")
|
builder.Append(",FRAME-RATE=")
|
||||||
.Append(framerate.Value)
|
.Append(framerate.Value);
|
||||||
.Append('"');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -888,11 +887,10 @@ namespace MediaBrowser.Api.Playback.Hls
|
|||||||
{
|
{
|
||||||
if (state.OutputWidth.HasValue && state.OutputHeight.HasValue)
|
if (state.OutputWidth.HasValue && state.OutputHeight.HasValue)
|
||||||
{
|
{
|
||||||
builder.Append(",RESOLUTION=\"")
|
builder.Append(",RESOLUTION=")
|
||||||
.Append(state.OutputWidth.GetValueOrDefault())
|
.Append(state.OutputWidth.GetValueOrDefault())
|
||||||
.Append('x')
|
.Append('x')
|
||||||
.Append(state.OutputHeight.GetValueOrDefault())
|
.Append(state.OutputHeight.GetValueOrDefault());
|
||||||
.Append('"');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user