mirror of
https://github.com/Radarr/Radarr
synced 2025-12-06 16:32:36 +01:00
Compare commits
6 commits
v6.0.4.102
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b59ff0a3b1 | ||
|
|
b9c2563c9b | ||
|
|
949922b9a1 | ||
|
|
1b9662d588 | ||
|
|
005c870f69 | ||
|
|
90cd8df1ae |
8 changed files with 20 additions and 14 deletions
|
|
@ -9,7 +9,7 @@ variables:
|
||||||
testsFolder: './_tests'
|
testsFolder: './_tests'
|
||||||
yarnCacheFolder: $(Pipeline.Workspace)/.yarn
|
yarnCacheFolder: $(Pipeline.Workspace)/.yarn
|
||||||
nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
|
nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
|
||||||
majorVersion: '6.0.4'
|
majorVersion: '6.1.0'
|
||||||
minorVersion: $[counter('minorVersion', 2000)]
|
minorVersion: $[counter('minorVersion', 2000)]
|
||||||
radarrVersion: '$(majorVersion).$(minorVersion)'
|
radarrVersion: '$(majorVersion).$(minorVersion)'
|
||||||
buildName: '$(Build.SourceBranchName).$(radarrVersion)'
|
buildName: '$(Build.SourceBranchName).$(radarrVersion)'
|
||||||
|
|
@ -18,9 +18,9 @@ variables:
|
||||||
dotnetVersion: '8.0.405'
|
dotnetVersion: '8.0.405'
|
||||||
nodeVersion: '20.X'
|
nodeVersion: '20.X'
|
||||||
innoVersion: '6.2.2'
|
innoVersion: '6.2.2'
|
||||||
windowsImage: 'windows-2022'
|
windowsImage: 'windows-2025'
|
||||||
linuxImage: 'ubuntu-22.04'
|
linuxImage: 'ubuntu-24.04'
|
||||||
macImage: 'macOS-13'
|
macImage: 'macOS-15'
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
branches:
|
branches:
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
|
|
@ -23,14 +23,6 @@ function Donations() {
|
||||||
/>
|
/>
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<div className={styles.logoContainer} title="Readarr">
|
|
||||||
<Link to="https://readarr.com/donate">
|
|
||||||
<img
|
|
||||||
className={styles.logo}
|
|
||||||
src={`${window.Radarr.urlBase}/Content/Images/Icons/logo-readarr.png`}
|
|
||||||
/>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
<div className={styles.logoContainer} title="Prowlarr">
|
<div className={styles.logoContainer} title="Prowlarr">
|
||||||
<Link to="https://prowlarr.com/donate">
|
<Link to="https://prowlarr.com/donate">
|
||||||
<img
|
<img
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@
|
||||||
namespace NzbDrone.Core.Test.Http
|
namespace NzbDrone.Core.Test.Http
|
||||||
{
|
{
|
||||||
[TestFixture]
|
[TestFixture]
|
||||||
|
[Platform(Exclude = "MacOsX")]
|
||||||
public class HttpProxySettingsProviderFixture : TestBase<HttpProxySettingsProvider>
|
public class HttpProxySettingsProviderFixture : TestBase<HttpProxySettingsProvider>
|
||||||
{
|
{
|
||||||
private HttpProxySettings GetProxySettings()
|
private HttpProxySettings GetProxySettings()
|
||||||
|
|
|
||||||
|
|
@ -1340,11 +1340,13 @@
|
||||||
"NotificationsPushoverSettingsDevices": "Devices",
|
"NotificationsPushoverSettingsDevices": "Devices",
|
||||||
"NotificationsPushoverSettingsDevicesHelpText": "List of device names (leave blank to send to all devices)",
|
"NotificationsPushoverSettingsDevicesHelpText": "List of device names (leave blank to send to all devices)",
|
||||||
"NotificationsPushoverSettingsExpire": "Expire",
|
"NotificationsPushoverSettingsExpire": "Expire",
|
||||||
"NotificationsPushoverSettingsExpireHelpText": "Maximum time to retry Emergency alerts, maximum 86400 seconds\"",
|
"NotificationsPushoverSettingsExpireHelpText": "Maximum time to retry Emergency alerts, maximum 86400 seconds",
|
||||||
"NotificationsPushoverSettingsRetry": "Retry",
|
"NotificationsPushoverSettingsRetry": "Retry",
|
||||||
"NotificationsPushoverSettingsRetryHelpText": "Interval to retry Emergency alerts, minimum 30 seconds",
|
"NotificationsPushoverSettingsRetryHelpText": "Interval to retry Emergency alerts, minimum 30 seconds",
|
||||||
"NotificationsPushoverSettingsSound": "Sound",
|
"NotificationsPushoverSettingsSound": "Sound",
|
||||||
"NotificationsPushoverSettingsSoundHelpText": "Notification sound, leave blank to use the default",
|
"NotificationsPushoverSettingsSoundHelpText": "Notification sound, leave blank to use the default",
|
||||||
|
"NotificationsPushoverSettingsTtl": "Time To Live",
|
||||||
|
"NotificationsPushoverSettingsTtlHelpText": "Time in seconds before the message expires. Set to 0 for unlimited duration",
|
||||||
"NotificationsPushoverSettingsUserKey": "User Key",
|
"NotificationsPushoverSettingsUserKey": "User Key",
|
||||||
"NotificationsSendGridSettingsApiKeyHelpText": "The API Key generated by SendGrid",
|
"NotificationsSendGridSettingsApiKeyHelpText": "The API Key generated by SendGrid",
|
||||||
"NotificationsSettingsUpdateLibrary": "Update Library",
|
"NotificationsSettingsUpdateLibrary": "Update Library",
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,11 @@ public void SendNotification(string title, string message, PushoverSettings sett
|
||||||
requestBuilder.AddFormParameter("expire", settings.Expire);
|
requestBuilder.AddFormParameter("expire", settings.Expire);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (settings.Ttl > 0)
|
||||||
|
{
|
||||||
|
requestBuilder.AddFormParameter("ttl", settings.Ttl);
|
||||||
|
}
|
||||||
|
|
||||||
if (!settings.Sound.IsNullOrWhiteSpace())
|
if (!settings.Sound.IsNullOrWhiteSpace())
|
||||||
{
|
{
|
||||||
requestBuilder.AddFormParameter("sound", settings.Sound);
|
requestBuilder.AddFormParameter("sound", settings.Sound);
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ public PushoverSettingsValidator()
|
||||||
RuleFor(c => c.UserKey).NotEmpty();
|
RuleFor(c => c.UserKey).NotEmpty();
|
||||||
RuleFor(c => c.Retry).GreaterThanOrEqualTo(30).LessThanOrEqualTo(86400).When(c => (PushoverPriority)c.Priority == PushoverPriority.Emergency);
|
RuleFor(c => c.Retry).GreaterThanOrEqualTo(30).LessThanOrEqualTo(86400).When(c => (PushoverPriority)c.Priority == PushoverPriority.Emergency);
|
||||||
RuleFor(c => c.Retry).GreaterThanOrEqualTo(0).LessThanOrEqualTo(86400).When(c => (PushoverPriority)c.Priority == PushoverPriority.Emergency);
|
RuleFor(c => c.Retry).GreaterThanOrEqualTo(0).LessThanOrEqualTo(86400).When(c => (PushoverPriority)c.Priority == PushoverPriority.Emergency);
|
||||||
|
RuleFor(c => c.Ttl).GreaterThanOrEqualTo(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -44,7 +45,10 @@ public PushoverSettings()
|
||||||
[FieldDefinition(5, Label = "NotificationsPushoverSettingsExpire", Type = FieldType.Textbox, HelpText = "NotificationsPushoverSettingsExpireHelpText")]
|
[FieldDefinition(5, Label = "NotificationsPushoverSettingsExpire", Type = FieldType.Textbox, HelpText = "NotificationsPushoverSettingsExpireHelpText")]
|
||||||
public int Expire { get; set; }
|
public int Expire { get; set; }
|
||||||
|
|
||||||
[FieldDefinition(6, Label = "NotificationsPushoverSettingsSound", Type = FieldType.Textbox, HelpText = "NotificationsPushoverSettingsSoundHelpText", HelpLink = "https://pushover.net/api#sounds")]
|
[FieldDefinition(6, Label = "NotificationsPushoverSettingsTtl", Type = FieldType.Textbox, HelpText = "NotificationsPushoverSettingsTtlHelpText", Advanced = true)]
|
||||||
|
public int Ttl { get; set; }
|
||||||
|
|
||||||
|
[FieldDefinition(7, Label = "NotificationsPushoverSettingsSound", Type = FieldType.Textbox, HelpText = "NotificationsPushoverSettingsSoundHelpText", HelpLink = "https://pushover.net/api#sounds")]
|
||||||
public string Sound { get; set; }
|
public string Sound { get; set; }
|
||||||
|
|
||||||
public bool IsValid => !string.IsNullOrWhiteSpace(UserKey) && Priority >= -1 && Priority <= 2;
|
public bool IsValid => !string.IsNullOrWhiteSpace(UserKey) && Priority >= -1 && Priority <= 2;
|
||||||
|
|
|
||||||
|
|
@ -65,6 +65,8 @@ public void ConfigureServices(IServiceCollection services)
|
||||||
options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("10.0.0.0"), 8));
|
options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("10.0.0.0"), 8));
|
||||||
options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("172.16.0.0"), 12));
|
options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("172.16.0.0"), 12));
|
||||||
options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("192.168.0.0"), 16));
|
options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("192.168.0.0"), 16));
|
||||||
|
options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fc00::"), 7));
|
||||||
|
options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fe80::"), 10));
|
||||||
});
|
});
|
||||||
|
|
||||||
services.AddRouting(options => options.LowercaseUrls = true);
|
services.AddRouting(options => options.LowercaseUrls = true);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue