From c925c0bb2425b6f61b04e311716161fed6fd539a Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Mon, 1 Sep 2014 20:46:51 -0700 Subject: [PATCH] fixed: issue where a partially generated index.html would be cached. --- src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs b/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs index 356d3d86d..e59fd0e44 100644 --- a/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs +++ b/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs @@ -74,19 +74,21 @@ namespace NzbDrone.Api.Frontend.Mappers return _generatedContent; } - _generatedContent = _diskProvider.ReadAllText(_indexPath); + var text = _diskProvider.ReadAllText(_indexPath); var cacheBreakProvider = _cacheBreakProviderFactory(); - _generatedContent = ReplaceRegex.Replace(_generatedContent, match => + text = ReplaceRegex.Replace(text, match => { var url = cacheBreakProvider.AddCacheBreakerToPath(match.Value); return URL_BASE + url; }); - _generatedContent = _generatedContent.Replace("API_ROOT", URL_BASE + "/api"); - _generatedContent = _generatedContent.Replace("API_KEY", API_KEY); - _generatedContent = _generatedContent.Replace("APP_VERSION", BuildInfo.Version.ToString()); + text = text.Replace("API_ROOT", URL_BASE + "/api"); + text = text.Replace("API_KEY", API_KEY); + text = text.Replace("APP_VERSION", BuildInfo.Version.ToString()); + + _generatedContent = text; return _generatedContent; }