ResultsController - get BlackHole from ServerConfig without engine

This commit is contained in:
flightlevel
2018-06-18 21:54:39 +10:00
parent 190a415907
commit 1ecafe3667

View File

@@ -173,13 +173,15 @@ namespace Jackett.Server.Controllers
private Logger logger; private Logger logger;
private IServerService serverService; private IServerService serverService;
private ICacheService cacheService; private ICacheService cacheService;
private Common.Models.Config.ServerConfig serverConfig;
public ResultsController(IIndexerManagerService indexerManagerService, IServerService ss, ICacheService c, Logger logger) public ResultsController(IIndexerManagerService indexerManagerService, IServerService ss, ICacheService c, Logger logger, Common.Models.Config.ServerConfig sConfig)
{ {
IndexerService = indexerManagerService; IndexerService = indexerManagerService;
serverService = ss; serverService = ss;
cacheService = c; cacheService = c;
this.logger = logger; this.logger = logger;
serverConfig = sConfig;
} }
[Route("")] [Route("")]
@@ -528,7 +530,7 @@ namespace Jackett.Server.Controllers
var link = result.Link; var link = result.Link;
var file = StringUtil.MakeValidFileName(result.Title, '_', false); var file = StringUtil.MakeValidFileName(result.Title, '_', false);
result.Link = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "dl", file); result.Link = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "dl", file);
if (!string.IsNullOrWhiteSpace(Engine.ServerConfig.BlackholeDir)) if (!string.IsNullOrWhiteSpace(serverConfig.BlackholeDir))
{ {
if (result.Link != null) if (result.Link != null)
result.BlackholeLink = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "bh", file); result.BlackholeLink = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "bh", file);