Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-08 23:00:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix GetPathValue function

Browse source
This commit is contained in:
Bond-009 2019-11-13 10:11:45 +01:00
parent 0b02c77691
commit b14d6d0417
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
View file

@ -7,7 +7,6 @@ using System.Net.Sockets;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Emby.Server.Implementations.Configuration;
using Emby.Server.Implementations.Net; using Emby.Server.Implementations.Net;
using Emby.Server.Implementations.Services; using Emby.Server.Implementations.Services;
using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Extensions;
@ -16,7 +15,6 @@ using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Events; using MediaBrowser.Model.Events;
using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Serialization; using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Services; using MediaBrowser.Model.Services;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;

13
MediaBrowser.Api/ApiEntryPoint.cs
View file

@ -40,14 +40,13 @@ namespace MediaBrowser.Api
internal IHttpResultFactory ResultFactory { get; private set; } internal IHttpResultFactory ResultFactory { get; private set; }
/// <summary> /// <summary>
/// The application paths /// Gets the configuration manager.
/// </summary> /// </summary>
private readonly IServerConfigurationManager _config; internal IServerConfigurationManager ConfigurationManager { get; }
private readonly ISessionManager _sessionManager; private readonly ISessionManager _sessionManager;
private readonly IFileSystem _fileSystem; private readonly IFileSystem _fileSystem;
private readonly IMediaSourceManager _mediaSourceManager; private readonly IMediaSourceManager _mediaSourceManager;
public readonly IProcessFactory ProcessFactory;
/// <summary> /// <summary>
/// The active transcoding jobs /// The active transcoding jobs
@ -73,15 +72,13 @@ namespace MediaBrowser.Api
IServerConfigurationManager config, IServerConfigurationManager config,
IFileSystem fileSystem, IFileSystem fileSystem,
IMediaSourceManager mediaSourceManager, IMediaSourceManager mediaSourceManager,
IProcessFactory processFactory,
IHttpResultFactory resultFactory) IHttpResultFactory resultFactory)
{ {
Logger = logger; Logger = logger;
_sessionManager = sessionManager; _sessionManager = sessionManager;
_config = config; ConfigurationManager = config;
_fileSystem = fileSystem; _fileSystem = fileSystem;
_mediaSourceManager = mediaSourceManager; _mediaSourceManager = mediaSourceManager;
ProcessFactory = processFactory;
ResultFactory = resultFactory; ResultFactory = resultFactory;
_sessionManager.PlaybackProgress += _sessionManager_PlaybackProgress; _sessionManager.PlaybackProgress += _sessionManager_PlaybackProgress;
@ -162,7 +159,7 @@ namespace MediaBrowser.Api
public EncodingOptions GetEncodingOptions() public EncodingOptions GetEncodingOptions()
{ {
return ConfigurationManagerExtensions.GetConfiguration<EncodingOptions>(_config, "encoding"); return ConfigurationManagerExtensions.GetConfiguration<EncodingOptions>(ConfigurationManager, "encoding");
} }
/// <summary> /// <summary>
@ -170,7 +167,7 @@ namespace MediaBrowser.Api
/// </summary> /// </summary>
private void DeleteEncodedMediaCache() private void DeleteEncodedMediaCache()
{ {
var path = _config.ApplicationPaths.GetTranscodingTempPath(); var path = ConfigurationManager.ApplicationPaths.GetTranscodingTempPath();
if (!Directory.Exists(path)) if (!Directory.Exists(path))
{ {

5
MediaBrowser.Api/BaseApiService.cs
View file

@ -299,8 +299,9 @@ namespace MediaBrowser.Api
var first = pathInfo[0]; var first = pathInfo[0];
// backwards compatibility // backwards compatibility
if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) || if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase)
string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase)) || string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase)
|| string.Equals(first, ApiEntryPoint.Instance.ConfigurationManager.Configuration.BaseUrl))
{ {
index++; index++;
} }