shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-17 17:14:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Log files should not be cached

Browse Source
This commit is contained in:
ta264
2021-05-12 21:00:23 +01:00
parent 953b324df9
commit 42403ac1c3
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Prowlarr.Http/Frontend/Mappers/LogFileMapper.cs
View File

@@ -6,11 +6,11 @@ using NzbDrone.Common.Extensions;
namespace Prowlarr.Http.Frontend.Mappers
{
public class UpdateLogFileMapper : StaticResourceMapperBase
public class LogFileMapper : StaticResourceMapperBase
{
private readonly IAppFolderInfo _appFolderInfo;
public UpdateLogFileMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, Logger logger)
public LogFileMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, Logger logger)
: base(diskProvider, logger)
{
_appFolderInfo = appFolderInfo;
@@ -21,12 +21,12 @@ namespace Prowlarr.Http.Frontend.Mappers
var path = resourceUrl.Replace('/', Path.DirectorySeparatorChar);
path = Path.GetFileName(path);
return Path.Combine(_appFolderInfo.GetUpdateLogFolder(), path);
return Path.Combine(_appFolderInfo.GetLogFolder(), path);
}
public override bool CanHandle(string resourceUrl)
{
return resourceUrl.StartsWith("/updatelogfile/") && resourceUrl.EndsWith(".txt");
return resourceUrl.StartsWith("/logfile/") && resourceUrl.EndsWith(".txt");
}
}
}

8
src/Prowlarr.Http/Frontend/Mappers/UpdateLogFileMapper.cs
View File

@@ -6,11 +6,11 @@ using NzbDrone.Common.Extensions;
namespace Prowlarr.Http.Frontend.Mappers
{
public class LogFileMapper : StaticResourceMapperBase
public class UpdateLogFileMapper : StaticResourceMapperBase
{
private readonly IAppFolderInfo _appFolderInfo;
public LogFileMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, Logger logger)
public UpdateLogFileMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, Logger logger)
: base(diskProvider, logger)
{
_appFolderInfo = appFolderInfo;
@@ -21,12 +21,12 @@ namespace Prowlarr.Http.Frontend.Mappers
var path = resourceUrl.Replace('/', Path.DirectorySeparatorChar);
path = Path.GetFileName(path);
return Path.Combine(_appFolderInfo.GetLogFolder(), path);
return Path.Combine(_appFolderInfo.GetUpdateLogFolder(), path);
}
public override bool CanHandle(string resourceUrl)
{
return resourceUrl.StartsWith("/logfile/") && resourceUrl.EndsWith(".txt");
return resourceUrl.StartsWith("/updatelogfile/") && resourceUrl.EndsWith(".txt");
}
}
}

13
src/Prowlarr.Http/Middleware/CacheableSpecification.cs
View File

@@ -39,23 +39,26 @@ namespace Prowlarr.Http.Middleware
return false;
}
if (request.Path.Value?.EndsWith("/index.js") ?? false)
var path = request.Path.Value ?? "";
if (path.EndsWith("/index.js"))
{
return false;
}
if (request.Path.Value?.EndsWith("/initialize.js") ?? false)
if (path.EndsWith("/initialize.js"))
{
return false;
}
if (request.Path.StartsWithSegments("/feed", StringComparison.CurrentCultureIgnoreCase))
if (path.StartsWith("/feed", StringComparison.CurrentCultureIgnoreCase))
{
return false;
}
if (request.Path.StartsWithSegments("/log", StringComparison.CurrentCultureIgnoreCase) &&
(request.Path.Value?.EndsWith(".txt", StringComparison.CurrentCultureIgnoreCase) ?? false))
if ((path.StartsWith("/logfile", StringComparison.CurrentCultureIgnoreCase) ||
path.StartsWith("/updatelogfile", StringComparison.CurrentCultureIgnoreCase)) &&
path.EndsWith(".txt", StringComparison.CurrentCultureIgnoreCase))
{
return false;
}