Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed up StaticResourceProvider

This commit is contained in:
Mark McDowall 2013-05-17 18:18:02 -07:00
parent 92d913e4ac
commit 1edb1d211b
4 changed files with 33 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NzbDrone.Api/Frontend/IMapHttpRequestsToDisk.cs
View File

@ -8,12 +8,6 @@ namespace NzbDrone.Api.Frontend
public interface IMapHttpRequestsToDisk
{
string Map(string resourceUrl);
RequestType IHandle { get; }
}
public enum RequestType
{
StaticResources,
MediaCovers
bool CanHandle(string resourceUrl);
}
}

5
NzbDrone.Api/Frontend/MediaCoverMapper.cs
View File

@ -20,6 +20,9 @@ namespace NzbDrone.Api.Frontend
return Path.Combine(_environmentProvider.GetAppDataPath(), path);
}
public RequestType IHandle { get { return RequestType.MediaCovers; } }
public bool CanHandle(string resourceUrl)
{
return resourceUrl.StartsWith("/mediacover");
}
}
}

13
NzbDrone.Api/Frontend/StaticResourceMapper.cs
View File

@ -1,9 +1,12 @@
using System.IO;
using System.Linq;
namespace NzbDrone.Api.Frontend
{
public class StaticResourceMapper : IMapHttpRequestsToDisk
{
private static readonly string[] Extensions = new[] { ".css", ".js", ".html", ".htm", ".jpg", ".jpeg", ".icon", ".gif", ".png", ".woff", ".ttf" };
public string Map(string resourceUrl)
{
var path = resourceUrl.Replace('/', Path.DirectorySeparatorChar);
@ -13,6 +16,14 @@ namespace NzbDrone.Api.Frontend
return Path.Combine("ui", path);
}
public RequestType IHandle { get { return RequestType.StaticResources; } }
public bool CanHandle(string resourceUrl)
{
if (string.IsNullOrWhiteSpace(resourceUrl))
{
return false;
}
return Extensions.Any(resourceUrl.EndsWith);
}
}
}

43
NzbDrone.Api/Frontend/StaticResourceProvider.cs
View File

@ -30,45 +30,26 @@ namespace NzbDrone.Api.Frontend
{
var path = context.Request.Url.Path.ToLower();
if (path.StartsWith("/mediacover"))
if (string.IsNullOrWhiteSpace(path))
{
var filePath = _requestMappers.Single(r => r.IHandle == RequestType.MediaCovers).Map(path);
if (_diskProvider.FileExists(filePath))
{
return new StreamResponse(() => File.OpenRead(filePath), "image/jpeg");
}
_logger.Warn("Couldn't find file [{0}] for [{1}]", filePath, path);
}
if (IsStaticResource(path))
{
var filePath = _requestMappers.Single(r => r.IHandle == RequestType.StaticResources).Map(path);
if (_diskProvider.FileExists(filePath))
{
return new GenericFileResponse(filePath);
}
_logger.Warn("Couldn't find file [{0}] for [{1}]", filePath, path);
}
return null;
}
private static readonly string[] Extensions = new[] { ".css", ".js", ".html", ".htm", ".jpg", ".jpeg", ".icon", ".gif", ".png", ".woff", ".ttf" };
private bool IsStaticResource(string path)
foreach (var requestMapper in _requestMappers)
{
if (string.IsNullOrWhiteSpace(path))
if (requestMapper.CanHandle(path))
{
return false;
var filePath = requestMapper.Map(path);
if (_diskProvider.FileExists(filePath))
{
return new StreamResponse(() => File.OpenRead(filePath), MimeTypes.GetMimeType(filePath));
}
}
}
return Extensions.Any(path.EndsWith);
_logger.Warn("Couldn't find a matching file for: {0}", path);
return null;
}
}
}