From 3ddc01e3f4e7a0678d8aa6fa63964794b9b6aa39 Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Sat, 7 Feb 2015 10:41:34 -0800 Subject: [PATCH] Fix: only add cache breaker to css/js files (exclude calendar, apple icons etc) --- src/NzbDrone.Api/Frontend/Mappers/CacheBreakerProvider.cs | 2 +- src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Api/Frontend/Mappers/CacheBreakerProvider.cs b/src/NzbDrone.Api/Frontend/Mappers/CacheBreakerProvider.cs index 78f84d0eb..53ebb2986 100644 --- a/src/NzbDrone.Api/Frontend/Mappers/CacheBreakerProvider.cs +++ b/src/NzbDrone.Api/Frontend/Mappers/CacheBreakerProvider.cs @@ -32,7 +32,7 @@ namespace NzbDrone.Api.Frontend.Mappers var pathToFile = mapper.Map(resourceUrl); var hash = _hashProvider.ComputeMd5(pathToFile).ToBase64(); - return resourceUrl + "?h=" + hash; + return resourceUrl + "?h=" + hash.Trim('='); } private static bool ShouldBreakCache(string path) diff --git a/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs b/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs index 3b09cfdf9..c90fc7381 100644 --- a/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs +++ b/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs @@ -17,7 +17,7 @@ namespace NzbDrone.Api.Frontend.Mappers private readonly IAnalyticsService _analyticsService; private readonly Func _cacheBreakProviderFactory; private readonly string _indexPath; - private static readonly Regex ReplaceRegex = new Regex("(?<=(?:href|src|data-main)=\").*?(?=\")", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex ReplaceRegex = new Regex("(?<=(?:href|src)=\").*?(css|js)(?=\")", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static String API_KEY; private static String URL_BASE;