tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-17 21:26:22 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: PWA Manifest with URL base

Browse Source 
(cherry picked from commit aedcd046fc4fc621dae4b231cc80d4b269a69177)

Fixed: PWA Manifest images

(cherry picked from commit da7d17f5e826d5273dba0b4f73227ffc8ed8a6c7)

Closes #10317
Closes #10329
This commit is contained in:
Mark McDowall
2024-08-18 18:58:29 -07:00
committed by Bogdan
parent 25d08a67e4
commit 13f10906f1
11 changed files with 138 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Radarr.Http/Frontend/Mappers/BrowserConfig.cs
View File

@@ -1,4 +1,4 @@
using System.IO;
using System.IO;
using NLog;
using NzbDrone.Common.Disk;
using NzbDrone.Common.EnvironmentInfo;
@@ -6,29 +6,22 @@ using NzbDrone.Core.Configuration;
namespace Radarr.Http.Frontend.Mappers
{
public class BrowserConfig : StaticResourceMapperBase
public class BrowserConfig : UrlBaseReplacementResourceMapperBase
{
private readonly IAppFolderInfo _appFolderInfo;
private readonly IConfigFileProvider _configFileProvider;
public BrowserConfig(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IConfigFileProvider configFileProvider, Logger logger)
: base(diskProvider, logger)
: base(diskProvider, configFileProvider, logger)
{
_appFolderInfo = appFolderInfo;
_configFileProvider = configFileProvider;
FilePath = Path.Combine(appFolderInfo.StartUpFolder, configFileProvider.UiFolder, "Content", "browserconfig.xml");
}
public override string Map(string resourceUrl)
{
var path = resourceUrl.Replace('/', Path.DirectorySeparatorChar);
path = path.Trim(Path.DirectorySeparatorChar);
return Path.ChangeExtension(Path.Combine(_appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, path), "xml");
return FilePath;
}
public override bool CanHandle(string resourceUrl)
{
return resourceUrl.StartsWith("/content/images/icons/browserconfig");
return resourceUrl.StartsWith("/Content/browserconfig");
}
}
}

19
src/Radarr.Http/Frontend/Mappers/ManifestMapper.cs
View File

@@ -1,4 +1,4 @@
using System.IO;
using System.IO;
using NLog;
using NzbDrone.Common.Disk;
using NzbDrone.Common.EnvironmentInfo;
@@ -6,29 +6,22 @@ using NzbDrone.Core.Configuration;
namespace Radarr.Http.Frontend.Mappers
{
public class ManifestMapper : StaticResourceMapperBase
public class ManifestMapper : UrlBaseReplacementResourceMapperBase
{
private readonly IAppFolderInfo _appFolderInfo;
private readonly IConfigFileProvider _configFileProvider;
public ManifestMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IConfigFileProvider configFileProvider, Logger logger)
: base(diskProvider, logger)
: base(diskProvider, configFileProvider, logger)
{
_appFolderInfo = appFolderInfo;
_configFileProvider = configFileProvider;
FilePath = Path.Combine(appFolderInfo.StartUpFolder, configFileProvider.UiFolder, "Content", "manifest.json");
}
public override string Map(string resourceUrl)
{
var path = resourceUrl.Replace('/', Path.DirectorySeparatorChar);
path = path.Trim(Path.DirectorySeparatorChar);
return Path.ChangeExtension(Path.Combine(_appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, path), "json");
return FilePath;
}
public override bool CanHandle(string resourceUrl)
{
return resourceUrl.StartsWith("/Content/Images/Icons/manifest");
return resourceUrl.StartsWith("/Content/manifest");
}
}
}

4
src/Radarr.Http/Frontend/Mappers/StaticResourceMapper.cs
View File

@@ -30,8 +30,8 @@ namespace Radarr.Http.Frontend.Mappers
{
resourceUrl = resourceUrl.ToLowerInvariant();
if (resourceUrl.StartsWith("/content/images/icons/manifest") ||
resourceUrl.StartsWith("/content/images/icons/browserconfig"))
if (resourceUrl.StartsWith("/content/manifest") ||
resourceUrl.StartsWith("/content/browserconfig"))
{
return false;
}

58
src/Radarr.Http/Frontend/Mappers/UrlBaseReplacementResourceMapperBase.cs Normal file
View File

@@ -0,0 +1,58 @@
using System.IO;
using NLog;
using NzbDrone.Common.Disk;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.Configuration;
namespace Radarr.Http.Frontend.Mappers
{
public abstract class UrlBaseReplacementResourceMapperBase : StaticResourceMapperBase
{
private readonly IDiskProvider _diskProvider;
private readonly string _urlBase;
private string _generatedContent;
public UrlBaseReplacementResourceMapperBase(IDiskProvider diskProvider, IConfigFileProvider configFileProvider, Logger logger)
: base(diskProvider, logger)
{
_diskProvider = diskProvider;
_urlBase = configFileProvider.UrlBase;
}
protected string FilePath;
public override string Map(string resourceUrl)
{
return FilePath;
}
protected override Stream GetContentStream(string filePath)
{
var text = GetFileText();
var stream = new MemoryStream();
var writer = new StreamWriter(stream);
writer.Write(text);
writer.Flush();
stream.Position = 0;
return stream;
}
protected virtual string GetFileText()
{
if (RuntimeInfo.IsProduction && _generatedContent != null)
{
return _generatedContent;
}
var text = _diskProvider.ReadAllText(FilePath);
text = text.Replace("__URL_BASE__", _urlBase);
_generatedContent = text;
return _generatedContent;
}
}
}