Translate fields on the backend

(cherry picked from commit 48b12f5b00429a7cd218d23f0544641b0da62a06)
pull/4397/head
Stevie Robinson 12 months ago committed by Bogdan
parent 25d69b94c4
commit 61c8e6d3b5

@ -3,11 +3,13 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text.Json; using System.Text.Json;
using DryIoc;
using NzbDrone.Common.EnsureThat; using NzbDrone.Common.EnsureThat;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Common.Reflection; using NzbDrone.Common.Reflection;
using NzbDrone.Common.Serializer; using NzbDrone.Common.Serializer;
using NzbDrone.Core.Annotations; using NzbDrone.Core.Annotations;
using NzbDrone.Core.Localization;
namespace Lidarr.Http.ClientSchema namespace Lidarr.Http.ClientSchema
{ {
@ -15,6 +17,12 @@ namespace Lidarr.Http.ClientSchema
{ {
private const string PRIVATE_VALUE = "********"; private const string PRIVATE_VALUE = "********";
private static Dictionary<Type, FieldMapping[]> _mappings = new Dictionary<Type, FieldMapping[]>(); private static Dictionary<Type, FieldMapping[]> _mappings = new Dictionary<Type, FieldMapping[]>();
private static ILocalizationService _localizationService;
public static void Initialize(IContainer container)
{
_localizationService = container.Resolve<ILocalizationService>();
}
public static List<Field> ToSchema(object model) public static List<Field> ToSchema(object model)
{ {
@ -106,13 +114,27 @@ namespace Lidarr.Http.ClientSchema
if (propertyInfo.PropertyType.IsSimpleType()) if (propertyInfo.PropertyType.IsSimpleType())
{ {
var fieldAttribute = property.Item2; var fieldAttribute = property.Item2;
var label = fieldAttribute.Label.IsNotNullOrWhiteSpace()
? _localizationService.GetLocalizedString(fieldAttribute.Label,
GetTokens(type, fieldAttribute.Label, TokenField.Label))
: fieldAttribute.Label;
var helpText = fieldAttribute.HelpText.IsNotNullOrWhiteSpace()
? _localizationService.GetLocalizedString(fieldAttribute.HelpText,
GetTokens(type, fieldAttribute.Label, TokenField.HelpText))
: fieldAttribute.HelpText;
var helpTextWarning = fieldAttribute.HelpTextWarning.IsNotNullOrWhiteSpace()
? _localizationService.GetLocalizedString(fieldAttribute.HelpTextWarning,
GetTokens(type, fieldAttribute.Label, TokenField.HelpTextWarning))
: fieldAttribute.HelpTextWarning;
var field = new Field var field = new Field
{ {
Name = prefix + GetCamelCaseName(propertyInfo.Name), Name = prefix + GetCamelCaseName(propertyInfo.Name),
Label = fieldAttribute.Label, Label = label,
Unit = fieldAttribute.Unit, Unit = fieldAttribute.Unit,
HelpText = fieldAttribute.HelpText, HelpText = helpText,
HelpTextWarning = fieldAttribute.HelpTextWarning, HelpTextWarning = helpTextWarning,
HelpLink = fieldAttribute.HelpLink, HelpLink = fieldAttribute.HelpLink,
Order = fieldAttribute.Order, Order = fieldAttribute.Order,
Advanced = fieldAttribute.Advanced, Advanced = fieldAttribute.Advanced,
@ -172,6 +194,24 @@ namespace Lidarr.Http.ClientSchema
.ToArray(); .ToArray();
} }
private static Dictionary<string, object> GetTokens(Type type, string label, TokenField field)
{
var tokens = new Dictionary<string, object>();
foreach (var propertyInfo in type.GetProperties())
{
foreach (var attribute in propertyInfo.GetCustomAttributes(true))
{
if (attribute is FieldTokenAttribute fieldTokenAttribute && fieldTokenAttribute.Field == field && fieldTokenAttribute.Label == label)
{
tokens.Add(fieldTokenAttribute.Token, fieldTokenAttribute.Value);
}
}
}
return tokens;
}
private static List<SelectOption> GetSelectOptions(Type selectOptions) private static List<SelectOption> GetSelectOptions(Type selectOptions)
{ {
if (selectOptions.IsEnum) if (selectOptions.IsEnum)

@ -1,7 +1,10 @@
using System.Collections.Generic;
using FluentAssertions; using FluentAssertions;
using Lidarr.Http.ClientSchema; using Lidarr.Http.ClientSchema;
using Moq;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Core.Annotations; using NzbDrone.Core.Annotations;
using NzbDrone.Core.Localization;
using NzbDrone.Test.Common; using NzbDrone.Test.Common;
namespace NzbDrone.Api.Test.ClientSchemaTests namespace NzbDrone.Api.Test.ClientSchemaTests
@ -9,6 +12,16 @@ namespace NzbDrone.Api.Test.ClientSchemaTests
[TestFixture] [TestFixture]
public class SchemaBuilderFixture : TestBase public class SchemaBuilderFixture : TestBase
{ {
[SetUp]
public void Setup()
{
Mocker.GetMock<ILocalizationService>()
.Setup(s => s.GetLocalizedString(It.IsAny<string>(), It.IsAny<Dictionary<string, object>>()))
.Returns<string, Dictionary<string, object>>((s, d) => s);
SchemaBuilder.Initialize(Mocker.Container);
}
[Test] [Test]
public void should_return_field_for_every_property() public void should_return_field_for_every_property()
{ {

@ -41,6 +41,23 @@ namespace NzbDrone.Core.Annotations
public string Hint { get; set; } public string Hint { get; set; }
} }
[AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
public class FieldTokenAttribute : Attribute
{
public FieldTokenAttribute(TokenField field, string label = "", string token = "", object value = null)
{
Label = label;
Field = field;
Token = token;
Value = value?.ToString();
}
public string Label { get; set; }
public TokenField Field { get; set; }
public string Token { get; set; }
public string Value { get; set; }
}
public class FieldSelectOption public class FieldSelectOption
{ {
public int Value { get; set; } public int Value { get; set; }
@ -86,4 +103,11 @@ namespace NzbDrone.Core.Annotations
ApiKey, ApiKey,
UserName UserName
} }
public enum TokenField
{
Label,
HelpText,
HelpTextWarning
}
} }

@ -8,6 +8,7 @@ using System.Security.Cryptography.X509Certificates;
using System.Text; using System.Text;
using DryIoc; using DryIoc;
using DryIoc.Microsoft.DependencyInjection; using DryIoc.Microsoft.DependencyInjection;
using Lidarr.Http.ClientSchema;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -150,6 +151,8 @@ namespace NzbDrone.Host
.AddNzbDroneLogger() .AddNzbDroneLogger()
.AddDatabase() .AddDatabase()
.AddStartupContext(context); .AddStartupContext(context);
SchemaBuilder.Initialize(c);
}) })
.ConfigureServices(services => .ConfigureServices(services =>
{ {

@ -1,5 +1,6 @@
using System;
using System.Linq;
using System.Threading; using System.Threading;
using Lidarr.Http.ClientSchema;
using NLog; using NLog;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
@ -50,17 +51,20 @@ namespace NzbDrone.Integration.Test
// Make sure tasks have been initialized so the config put below doesn't cause errors // Make sure tasks have been initialized so the config put below doesn't cause errors
WaitForCompletion(() => Tasks.All().SelectList(x => x.TaskName).Contains("RssSync"), 30000); WaitForCompletion(() => Tasks.All().SelectList(x => x.TaskName).Contains("RssSync"), 30000);
Indexers.Post(new Lidarr.Api.V1.Indexers.IndexerResource var indexer = Indexers.Schema().FirstOrDefault(i => i.Implementation == nameof(Newznab));
if (indexer == null)
{ {
EnableRss = false, throw new NullReferenceException("Expected valid indexer schema, found null");
EnableInteractiveSearch = false, }
EnableAutomaticSearch = false,
ConfigContract = nameof(NewznabSettings), indexer.EnableRss = false;
Implementation = nameof(Newznab), indexer.EnableInteractiveSearch = false;
Name = "NewznabTest", indexer.EnableAutomaticSearch = false;
Protocol = Core.Indexers.DownloadProtocol.Usenet, indexer.ConfigContract = nameof(NewznabSettings);
Fields = SchemaBuilder.ToSchema(new NewznabSettings()) indexer.Implementation = nameof(Newznab);
}); indexer.Name = "NewznabTest";
indexer.Protocol = Core.Indexers.DownloadProtocol.Usenet;
// Change Console Log Level to Debug so we get more details. // Change Console Log Level to Debug so we get more details.
var config = HostConfig.Get(1); var config = HostConfig.Get(1);

@ -29,6 +29,8 @@ namespace NzbDrone.Test.Common.AutoMoq
AssemblyLoader.RegisterSQLiteResolver(); AssemblyLoader.RegisterSQLiteResolver();
} }
public IContainer Container => _container;
public virtual T Resolve<T>() public virtual T Resolve<T>()
{ {
var result = _container.Resolve<T>(); var result = _container.Resolve<T>();

Loading…
Cancel
Save