mirror of https://github.com/jellyfin/jellyfin.git
Remove more compile time warnings
This commit is contained in:
parent
e0315b5695
commit
ded9dee22c
|
@ -502,7 +502,6 @@ namespace Emby.Server.Implementations.Activity
|
||||||
_sessionManager.PlaybackStart -= _sessionManager_PlaybackStart;
|
_sessionManager.PlaybackStart -= _sessionManager_PlaybackStart;
|
||||||
_sessionManager.PlaybackStopped -= _sessionManager_PlaybackStopped;
|
_sessionManager.PlaybackStopped -= _sessionManager_PlaybackStopped;
|
||||||
|
|
||||||
_subManager.SubtitlesDownloaded -= _subManager_SubtitlesDownloaded;
|
|
||||||
_subManager.SubtitleDownloadFailure -= _subManager_SubtitleDownloadFailure;
|
_subManager.SubtitleDownloadFailure -= _subManager_SubtitleDownloadFailure;
|
||||||
|
|
||||||
_userManager.UserCreated -= _userManager_UserCreated;
|
_userManager.UserCreated -= _userManager_UserCreated;
|
||||||
|
|
|
@ -112,7 +112,6 @@ using ServiceStack;
|
||||||
using ServiceStack.Text.Jsv;
|
using ServiceStack.Text.Jsv;
|
||||||
using StringExtensions = MediaBrowser.Controller.Extensions.StringExtensions;
|
using StringExtensions = MediaBrowser.Controller.Extensions.StringExtensions;
|
||||||
using X509Certificate = System.Security.Cryptography.X509Certificates.X509Certificate;
|
using X509Certificate = System.Security.Cryptography.X509Certificates.X509Certificate;
|
||||||
using UtfUnknown;
|
|
||||||
|
|
||||||
namespace Emby.Server.Implementations
|
namespace Emby.Server.Implementations
|
||||||
{
|
{
|
||||||
|
@ -888,7 +887,7 @@ namespace Emby.Server.Implementations
|
||||||
MediaSourceManager = new MediaSourceManager(ItemRepository, ApplicationPaths, LocalizationManager, UserManager, LibraryManager, LoggerFactory, JsonSerializer, FileSystemManager, UserDataManager, TimerFactory, () => MediaEncoder);
|
MediaSourceManager = new MediaSourceManager(ItemRepository, ApplicationPaths, LocalizationManager, UserManager, LibraryManager, LoggerFactory, JsonSerializer, FileSystemManager, UserDataManager, TimerFactory, () => MediaEncoder);
|
||||||
RegisterSingleInstance(MediaSourceManager);
|
RegisterSingleInstance(MediaSourceManager);
|
||||||
|
|
||||||
SubtitleManager = new SubtitleManager(LoggerFactory, FileSystemManager, LibraryMonitor, MediaSourceManager, ServerConfigurationManager, LocalizationManager);
|
SubtitleManager = new SubtitleManager(LoggerFactory, FileSystemManager, LibraryMonitor, MediaSourceManager, LocalizationManager);
|
||||||
RegisterSingleInstance(SubtitleManager);
|
RegisterSingleInstance(SubtitleManager);
|
||||||
|
|
||||||
ProviderManager = new ProviderManager(HttpClient, SubtitleManager, ServerConfigurationManager, LibraryMonitor, LoggerFactory, FileSystemManager, ApplicationPaths, () => LibraryManager, JsonSerializer);
|
ProviderManager = new ProviderManager(HttpClient, SubtitleManager, ServerConfigurationManager, LibraryMonitor, LoggerFactory, FileSystemManager, ApplicationPaths, () => LibraryManager, JsonSerializer);
|
||||||
|
|
|
@ -153,7 +153,11 @@ namespace MediaBrowser.Api
|
||||||
private readonly INetworkManager _network;
|
private readonly INetworkManager _network;
|
||||||
private readonly IDeviceManager _deviceManager;
|
private readonly IDeviceManager _deviceManager;
|
||||||
|
|
||||||
public PluginService(IJsonSerializer jsonSerializer, IApplicationHost appHost, IInstallationManager installationManager, INetworkManager network, IDeviceManager deviceManager)
|
public PluginService(IJsonSerializer jsonSerializer,
|
||||||
|
IApplicationHost appHost,
|
||||||
|
IInstallationManager installationManager,
|
||||||
|
INetworkManager network,
|
||||||
|
IDeviceManager deviceManager)
|
||||||
: base()
|
: base()
|
||||||
{
|
{
|
||||||
if (jsonSerializer == null)
|
if (jsonSerializer == null)
|
||||||
|
@ -173,7 +177,7 @@ namespace MediaBrowser.Api
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="request">The request.</param>
|
/// <param name="request">The request.</param>
|
||||||
/// <returns>System.Object.</returns>
|
/// <returns>System.Object.</returns>
|
||||||
public async Task<object> Get(GetRegistrationStatus request)
|
public object Get(GetRegistrationStatus request)
|
||||||
{
|
{
|
||||||
var record = new MBRegistrationRecord
|
var record = new MBRegistrationRecord
|
||||||
{
|
{
|
||||||
|
@ -187,26 +191,12 @@ namespace MediaBrowser.Api
|
||||||
return ToOptimizedResult(record);
|
return ToOptimizedResult(record);
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO this function is only kept for compatibility and should be removed once paid plugins break
|
|
||||||
public async Task<object> Get(GetRegistration request)
|
|
||||||
{
|
|
||||||
var info = new RegistrationInfo
|
|
||||||
{
|
|
||||||
ExpirationDate = DateTime.Now.AddYears(100),
|
|
||||||
IsRegistered = true,
|
|
||||||
IsTrial = false,
|
|
||||||
Name = request.Name
|
|
||||||
};
|
|
||||||
|
|
||||||
return ToOptimizedResult(info);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the specified request.
|
/// Gets the specified request.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="request">The request.</param>
|
/// <param name="request">The request.</param>
|
||||||
/// <returns>System.Object.</returns>
|
/// <returns>System.Object.</returns>
|
||||||
public async Task<object> Get(GetPlugins request)
|
public object Get(GetPlugins request)
|
||||||
{
|
{
|
||||||
var result = _appHost.Plugins.OrderBy(p => p.Name).Select(p => p.GetPluginInfo()).ToArray();
|
var result = _appHost.Plugins.OrderBy(p => p.Name).Select(p => p.GetPluginInfo()).ToArray();
|
||||||
return ToOptimizedResult(result);
|
return ToOptimizedResult(result);
|
||||||
|
@ -230,7 +220,7 @@ namespace MediaBrowser.Api
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="request">The request.</param>
|
/// <param name="request">The request.</param>
|
||||||
/// <returns>System.Object.</returns>
|
/// <returns>System.Object.</returns>
|
||||||
public async Task<object> Get(GetPluginSecurityInfo request)
|
public object Get(GetPluginSecurityInfo request)
|
||||||
{
|
{
|
||||||
var result = new PluginSecurityInfo
|
var result = new PluginSecurityInfo
|
||||||
{
|
{
|
||||||
|
|
|
@ -267,13 +267,13 @@ namespace MediaBrowser.Api.UserLibrary
|
||||||
|
|
||||||
var session = GetSession(_sessionContext);
|
var session = GetSession(_sessionContext);
|
||||||
|
|
||||||
var dto = await UpdatePlayedStatus(user, request.Id, true, datePlayed).ConfigureAwait(false);
|
var dto = UpdatePlayedStatus(user, request.Id, true, datePlayed);
|
||||||
|
|
||||||
foreach (var additionalUserInfo in session.AdditionalUsers)
|
foreach (var additionalUserInfo in session.AdditionalUsers)
|
||||||
{
|
{
|
||||||
var additionalUser = _userManager.GetUserById(additionalUserInfo.UserId);
|
var additionalUser = _userManager.GetUserById(additionalUserInfo.UserId);
|
||||||
|
|
||||||
await UpdatePlayedStatus(additionalUser, request.Id, true, datePlayed).ConfigureAwait(false);
|
UpdatePlayedStatus(additionalUser, request.Id, true, datePlayed);
|
||||||
}
|
}
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
|
@ -412,13 +412,13 @@ namespace MediaBrowser.Api.UserLibrary
|
||||||
|
|
||||||
var session = GetSession(_sessionContext);
|
var session = GetSession(_sessionContext);
|
||||||
|
|
||||||
var dto = await UpdatePlayedStatus(user, request.Id, false, null).ConfigureAwait(false);
|
var dto = UpdatePlayedStatus(user, request.Id, false, null);
|
||||||
|
|
||||||
foreach (var additionalUserInfo in session.AdditionalUsers)
|
foreach (var additionalUserInfo in session.AdditionalUsers)
|
||||||
{
|
{
|
||||||
var additionalUser = _userManager.GetUserById(additionalUserInfo.UserId);
|
var additionalUser = _userManager.GetUserById(additionalUserInfo.UserId);
|
||||||
|
|
||||||
await UpdatePlayedStatus(additionalUser, request.Id, false, null).ConfigureAwait(false);
|
UpdatePlayedStatus(additionalUser, request.Id, false, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
|
@ -432,7 +432,7 @@ namespace MediaBrowser.Api.UserLibrary
|
||||||
/// <param name="wasPlayed">if set to <c>true</c> [was played].</param>
|
/// <param name="wasPlayed">if set to <c>true</c> [was played].</param>
|
||||||
/// <param name="datePlayed">The date played.</param>
|
/// <param name="datePlayed">The date played.</param>
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
private async Task<UserItemDataDto> UpdatePlayedStatus(User user, string itemId, bool wasPlayed, DateTime? datePlayed)
|
private UserItemDataDto UpdatePlayedStatus(User user, string itemId, bool wasPlayed, DateTime? datePlayed)
|
||||||
{
|
{
|
||||||
var item = _libraryManager.GetItemById(itemId);
|
var item = _libraryManager.GetItemById(itemId);
|
||||||
|
|
||||||
|
|
|
@ -15,11 +15,6 @@ namespace MediaBrowser.Controller.Subtitles
|
||||||
/// </summary>
|
/// </summary>
|
||||||
event EventHandler<SubtitleDownloadFailureEventArgs> SubtitleDownloadFailure;
|
event EventHandler<SubtitleDownloadFailureEventArgs> SubtitleDownloadFailure;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Occurs when [subtitles downloaded].
|
|
||||||
/// </summary>
|
|
||||||
event EventHandler<SubtitleDownloadEventArgs> SubtitlesDownloaded;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Adds the parts.
|
/// Adds the parts.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -30,9 +30,7 @@ namespace MediaBrowser.Providers.Subtitles
|
||||||
private readonly IFileSystem _fileSystem;
|
private readonly IFileSystem _fileSystem;
|
||||||
private readonly ILibraryMonitor _monitor;
|
private readonly ILibraryMonitor _monitor;
|
||||||
private readonly IMediaSourceManager _mediaSourceManager;
|
private readonly IMediaSourceManager _mediaSourceManager;
|
||||||
private readonly IServerConfigurationManager _config;
|
|
||||||
|
|
||||||
public event EventHandler<SubtitleDownloadEventArgs> SubtitlesDownloaded;
|
|
||||||
public event EventHandler<SubtitleDownloadFailureEventArgs> SubtitleDownloadFailure;
|
public event EventHandler<SubtitleDownloadFailureEventArgs> SubtitleDownloadFailure;
|
||||||
|
|
||||||
private ILocalizationManager _localization;
|
private ILocalizationManager _localization;
|
||||||
|
@ -42,14 +40,12 @@ namespace MediaBrowser.Providers.Subtitles
|
||||||
IFileSystem fileSystem,
|
IFileSystem fileSystem,
|
||||||
ILibraryMonitor monitor,
|
ILibraryMonitor monitor,
|
||||||
IMediaSourceManager mediaSourceManager,
|
IMediaSourceManager mediaSourceManager,
|
||||||
IServerConfigurationManager config,
|
|
||||||
ILocalizationManager localizationManager)
|
ILocalizationManager localizationManager)
|
||||||
{
|
{
|
||||||
_logger = loggerFactory.CreateLogger(nameof(SubtitleManager));
|
_logger = loggerFactory.CreateLogger(nameof(SubtitleManager));
|
||||||
_fileSystem = fileSystem;
|
_fileSystem = fileSystem;
|
||||||
_monitor = monitor;
|
_monitor = monitor;
|
||||||
_mediaSourceManager = mediaSourceManager;
|
_mediaSourceManager = mediaSourceManager;
|
||||||
_config = config;
|
|
||||||
_localization = localizationManager;
|
_localization = localizationManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -134,11 +130,6 @@ namespace MediaBrowser.Providers.Subtitles
|
||||||
return results.SelectMany(i => i).ToArray();
|
return results.SelectMany(i => i).ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
private SubtitleOptions GetOptions()
|
|
||||||
{
|
|
||||||
return _config.GetConfiguration<SubtitleOptions>("subtitles");
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task DownloadSubtitles(Video video, string subtitleId, CancellationToken cancellationToken)
|
public Task DownloadSubtitles(Video video, string subtitleId, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var libraryOptions = BaseItem.LibraryManager.GetLibraryOptions(video);
|
var libraryOptions = BaseItem.LibraryManager.GetLibraryOptions(video);
|
||||||
|
|
Loading…
Reference in New Issue