Backup_Repos/Lidarr
1
0
Fork 0
mirror of https://github.com/Lidarr/Lidarr synced 2026-05-08 20:59:57 +02:00
Code Issues Projects Releases Wiki Activity

Rename fields from Tv to Music in download clients settings

Browse source
This commit is contained in:
Bogdan 2023-05-12 20:16:21 +03:00
parent 3a580eaf5b
commit 35248c277d
30 changed files with 279 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
src/NzbDrone.Core.Test/Datastore/Migration/067_download_clients_rename_tv_to_musicFixture.cs Normal file
View file

@ -0,0 +1,107 @@
using System.Linq;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Common.Serializer;
using NzbDrone.Core.Datastore.Migration;
using NzbDrone.Core.Test.Framework;
using RestSharp;
namespace NzbDrone.Core.Test.Datastore.Migration
{
[TestFixture]
public class download_clients_rename_tv_to_musicFixture : MigrationTest<download_clients_rename_tv_to_music>
{
[Test]
public void should_rename_settings_for_deluge()
{
var db = WithMigrationTestDb(c =>
{
c.Insert.IntoTable("DownloadClients").Row(new
{
Enable = true,
Name = "Deluge",
Implementation = "Deluge",
Priority = 1,
Settings = new
{
Host = "127.0.0.1",
UrlBase = "/my/",
TvDirectory = "abc",
RecentTvPriority = 1,
OlderTvPriority = 1
}.ToJson(),
ConfigContract = "DelugeSettings"
});
});
var items = db.Query<DownloadClientDefinition67>("SELECT * FROM \"DownloadClients\"");
items.Should().HaveCount(1);
items.First().Settings.Should().NotContainKey("tvDirectory");
items.First().Settings.Should().ContainKey("musicDirectory");
items.First().Settings["musicDirectory"].Should().Be("abc");
items.First().Settings.Should().NotContainKey("recentTvPriority");
items.First().Settings.Should().ContainKey("recentMusicPriority");
items.First().Settings["recentMusicPriority"].Should().Be(1);
items.First().Settings.Should().NotContainKey("olderTvPriority");
items.First().Settings.Should().ContainKey("olderMusicPriority");
items.First().Settings["olderMusicPriority"].Should().Be(1);
}
[Test]
public void should_rename_settings_for_qbittorrent()
{
var db = WithMigrationTestDb(c =>
{
c.Insert.IntoTable("DownloadClients").Row(new
{
Enable = true,
Name = "QBittorrent",
Implementation = "QBittorrent",
Priority = 1,
Settings = new
{
Host = "127.0.0.1",
UrlBase = "/my/",
TvDirectory = "abc",
RecentTvPriority = 1,
OlderTvPriority = 1
}.ToJson(),
ConfigContract = "QBittorrentSettings"
});
});
var items = db.Query<DownloadClientDefinition67>("SELECT * FROM \"DownloadClients\"");
items.Should().HaveCount(1);
items.First().Settings.Should().NotContainKey("tvDirectory");
items.First().Settings.Should().ContainKey("musicDirectory");
items.First().Settings["musicDirectory"].Should().Be("abc");
items.First().Settings.Should().NotContainKey("recentTvPriority");
items.First().Settings.Should().ContainKey("recentMusicPriority");
items.First().Settings["recentMusicPriority"].Should().Be(1);
items.First().Settings.Should().NotContainKey("olderTvPriority");
items.First().Settings.Should().ContainKey("olderMusicPriority");
items.First().Settings["olderMusicPriority"].Should().Be(1);
}
}
public class DownloadClientDefinition67
{
public int Id { get; set; }
public bool Enable { get; set; }
public int Priority { get; set; }
public string Name { get; set; }
public string Implementation { get; set; }
public JsonObject Settings { get; set; }
public string ConfigContract { get; set; }
public bool RemoveCompletedDownloads { get; set; }
public bool RemoveFailedDownloads { get; set; }
}
}

14
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs
View file

@ -324,9 +324,9 @@ protected void GivenMusicCategory()
_settings.MusicCategory = _category;
}
protected void GivenTvDirectory()
protected void GivenMusicDirectory()
{
_settings.TvDirectory = _musicDirectory;
_settings.MusicDirectory = _musicDirectory;
}
protected virtual void GivenTasks(List<DownloadStationTask> torrents)
@ -385,10 +385,10 @@ protected int GivenAllKindOfTasks()
}
[Test]
public void Download_with_TvDirectory_should_force_directory()
public void Download_with_MusicDirectory_should_force_directory()
{
GivenSerialNumber();
GivenTvDirectory();
GivenMusicDirectory();
GivenSuccessfulDownload();
var remoteAlbum = CreateRemoteAlbum();
@ -419,7 +419,7 @@ public void Download_with_category_should_force_directory()
}
[Test]
public void Download_without_TvDirectory_and_Category_should_use_default()
public void Download_without_MusicDirectory_and_Category_should_use_default()
{
GivenSerialNumber();
GivenSuccessfulDownload();
@ -459,7 +459,7 @@ public void GetItems_should_return_ignore_tasks_of_unknown_type()
[Test]
public void GetItems_should_ignore_downloads_in_wrong_folder()
{
_settings.TvDirectory = @"/shared/folder/sub";
_settings.MusicDirectory = @"/shared/folder/sub";
GivenSerialNumber();
GivenSharedFolder();
@ -526,7 +526,7 @@ public void GetStatus_should_map_outputpath_when_using_default()
public void GetStatus_should_map_outputpath_when_using_destination()
{
GivenSerialNumber();
GivenTvDirectory();
GivenMusicDirectory();
GivenSharedFolder($"/{_musicDirectory}");
var status = Subject.GetStatus();

14
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs
View file

@ -216,9 +216,9 @@ protected void GivenMusicCategory()
_settings.MusicCategory = _category;
}
protected void GivenTvDirectory()
protected void GivenMusicDirectory()
{
_settings.TvDirectory = _musicDirectory;
_settings.MusicDirectory = _musicDirectory;
}
protected virtual void GivenTasks(List<DownloadStationTask> nzbs)
@ -267,10 +267,10 @@ protected static string CleanFileName(string name)
}
[Test]
public void Download_with_TvDirectory_should_force_directory()
public void Download_with_MusicDirectory_should_force_directory()
{
GivenSerialNumber();
GivenTvDirectory();
GivenMusicDirectory();
GivenSuccessfulDownload();
var remoteAlbum = CreateRemoteAlbum();
@ -301,7 +301,7 @@ public void Download_with_category_should_force_directory()
}
[Test]
public void Download_without_TvDirectory_and_Category_should_use_default()
public void Download_without_MusicDirectory_and_Category_should_use_default()
{
GivenSerialNumber();
GivenSuccessfulDownload();
@ -341,7 +341,7 @@ public void GetItems_should_return_ignore_tasks_of_unknown_type()
[Test]
public void GetItems_should_ignore_downloads_in_wrong_folder()
{
_settings.TvDirectory = @"/shared/folder/sub";
_settings.MusicDirectory = @"/shared/folder/sub";
GivenSerialNumber();
GivenSharedFolder();
@ -408,7 +408,7 @@ public void GetStatus_should_map_outputpath_when_using_default()
public void GetStatus_should_map_outputpath_when_using_destination()
{
GivenSerialNumber();
GivenTvDirectory();
GivenMusicDirectory();
GivenSharedFolder($"/{_musicDirectory}");
var status = Subject.GetStatus();

2
src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs
View file

@ -33,7 +33,7 @@ public void Setup()
Port = 2222,
ApiKey = "1234-ABCD",
MusicCategory = "Music",
RecentTvPriority = (int)NzbgetPriority.High
RecentMusicPriority = (int)NzbgetPriority.High
};
_queued = new NzbVortexQueueItem

2
src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs
View file

@ -34,7 +34,7 @@ public void Setup()
Username = "admin",
Password = "pass",
MusicCategory = "music",
RecentTvPriority = (int)NzbgetPriority.High
RecentMusicPriority = (int)NzbgetPriority.High
};
_queued = new NzbgetQueueItem

4
src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs
View file

@ -103,8 +103,8 @@ protected void GivenSuccessfulDownload()
protected void GivenHighPriority()
{
Subject.Definition.Settings.As<QBittorrentSettings>().OlderTvPriority = (int)QBittorrentPriority.First;
Subject.Definition.Settings.As<QBittorrentSettings>().RecentTvPriority = (int)QBittorrentPriority.First;
Subject.Definition.Settings.As<QBittorrentSettings>().OlderMusicPriority = (int)QBittorrentPriority.First;
Subject.Definition.Settings.As<QBittorrentSettings>().RecentMusicPriority = (int)QBittorrentPriority.First;
}
protected void GivenGlobalSeedLimits(float maxRatio, int maxSeedingTime = -1, QBittorrentMaxRatioAction maxRatioAction = QBittorrentMaxRatioAction.Pause)

2
src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
View file

@ -38,7 +38,7 @@ public void Setup()
Username = "admin",
Password = "pass",
MusicCategory = "tv",
RecentTvPriority = (int)SabnzbdPriority.High
RecentMusicPriority = (int)SabnzbdPriority.High
};
_queued = new SabnzbdQueue
{

8
src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs
View file

@ -67,9 +67,9 @@ public void Download_should_return_unique_id()
}
[Test]
public void Download_with_TvDirectory_should_force_directory()
public void Download_with_MusicDirectory_should_force_directory()
{
GivenTvDirectory();
GivenMusicDirectory();
GivenSuccessfulDownload();
var remoteAlbum = CreateRemoteAlbum();
@ -117,7 +117,7 @@ public void Download_with_category_should_not_have_double_slashes()
}
[Test]
public void Download_without_TvDirectory_and_Category_should_use_default()
public void Download_without_MusicDirectory_and_Category_should_use_default()
{
GivenSuccessfulDownload();
@ -227,7 +227,7 @@ public void should_exclude_items_not_in_category()
[Test]
public void should_exclude_items_not_in_TvDirectory()
{
GivenTvDirectory();
GivenMusicDirectory();
_downloading.DownloadDir = @"C:/Downloads/Finished/Lidarr/subdir";

4
src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixtureBase.cs
View file

@ -117,9 +117,9 @@ protected void GivenMusicCategory()
_settings.MusicCategory = "Lidarr";
}
protected void GivenTvDirectory()
protected void GivenMusicDirectory()
{
_settings.TvDirectory = @"C:/Downloads/Finished/Lidarr";
_settings.MusicDirectory = @"C:/Downloads/Finished/Lidarr";
}
protected void GivenFailedDownload()

8
src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs
View file

@ -75,9 +75,9 @@ public void Download_should_return_unique_id()
}
[Test]
public void Download_with_TvDirectory_should_force_directory()
public void Download_with_MusicDirectory_should_force_directory()
{
GivenTvDirectory();
GivenMusicDirectory();
GivenSuccessfulDownload();
var remoteAlbum = CreateRemoteAlbum();
@ -125,7 +125,7 @@ public void Download_with_category_should_not_have_double_slashes()
}
[Test]
public void Download_without_TvDirectory_and_Category_should_use_default()
public void Download_without_MusicDirectory_and_Category_should_use_default()
{
GivenSuccessfulDownload();
@ -235,7 +235,7 @@ public void should_exclude_items_not_in_category()
[Test]
public void should_exclude_items_not_in_TvDirectory()
{
GivenTvDirectory();
GivenMusicDirectory();
_downloading.DownloadDir = @"C:/Downloads/Finished/Lidarr/subdir";

72
src/NzbDrone.Core/Datastore/Migration/067_download_clients_rename_tv_to_music.cs Normal file
View file

@ -0,0 +1,72 @@
using System.Collections.Generic;
using System.Data;
using Dapper;
using FluentMigrator;
using Newtonsoft.Json.Linq;
using NzbDrone.Common.Serializer;
using NzbDrone.Core.Datastore.Migration.Framework;
namespace NzbDrone.Core.Datastore.Migration
{
[Migration(067)]
public class download_clients_rename_tv_to_music : NzbDroneMigrationBase
{
protected override void MainDbUpgrade()
{
Execute.WithConnection(MigrateSettingsTvToMusic);
}
private void MigrateSettingsTvToMusic(IDbConnection conn, IDbTransaction tran)
{
var updatedClients = new List<object>();
using (var selectCommand = conn.CreateCommand())
{
selectCommand.Transaction = tran;
selectCommand.CommandText = "SELECT \"Id\", \"Settings\" FROM \"DownloadClients\"";
using var reader = selectCommand.ExecuteReader();
while (reader.Read())
{
var id = reader.GetInt32(0);
var settings = reader.GetString(1);
if (!string.IsNullOrWhiteSpace(settings))
{
var jsonObject = Json.Deserialize<JObject>(settings);
if (jsonObject.ContainsKey("recentTvPriority"))
{
jsonObject.Add("recentMusicPriority", jsonObject.Value<int>("recentTvPriority"));
jsonObject.Remove("recentTvPriority");
}
if (jsonObject.ContainsKey("olderTvPriority"))
{
jsonObject.Add("olderMusicPriority", jsonObject.Value<int>("olderTvPriority"));
jsonObject.Remove("olderTvPriority");
}
if (jsonObject.ContainsKey("tvDirectory"))
{
jsonObject.Add("musicDirectory", jsonObject.Value<string>("tvDirectory"));
jsonObject.Remove("tvDirectory");
}
settings = jsonObject.ToJson();
}
updatedClients.Add(new
{
Id = id,
Settings = settings
});
}
}
var updateClientsSql = "UPDATE \"DownloadClients\" SET \"Settings\" = @Settings WHERE \"Id\" = @Id";
conn.Execute(updateClientsSql, updatedClients, transaction: tran);
}
}
}

8
src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs
View file

@ -68,8 +68,8 @@ protected override string AddFromMagnetLink(RemoteAlbum remoteAlbum, string hash
var isRecentAlbum = remoteAlbum.IsRecentAlbum();
if ((isRecentAlbum && Settings.RecentTvPriority == (int)DelugePriority.First) ||
(!isRecentAlbum && Settings.OlderTvPriority == (int)DelugePriority.First))
if ((isRecentAlbum && Settings.RecentMusicPriority == (int)DelugePriority.First) ||
(!isRecentAlbum && Settings.OlderMusicPriority == (int)DelugePriority.First))
{
_proxy.MoveTorrentToTopInQueue(actualHash, Settings);
}
@ -95,8 +95,8 @@ protected override string AddFromTorrentFile(RemoteAlbum remoteAlbum, string has
var isRecentAlbum = remoteAlbum.IsRecentAlbum();
if ((isRecentAlbum && Settings.RecentTvPriority == (int)DelugePriority.First) ||
(!isRecentAlbum && Settings.OlderTvPriority == (int)DelugePriority.First))
if ((isRecentAlbum && Settings.RecentMusicPriority == (int)DelugePriority.First) ||
(!isRecentAlbum && Settings.OlderMusicPriority == (int)DelugePriority.First))
{
_proxy.MoveTorrentToTopInQueue(actualHash, Settings);
}

4
src/NzbDrone.Core/Download/Clients/Deluge/DelugeSettings.cs
View file

@ -51,10 +51,10 @@ public DelugeSettings()
public string MusicImportedCategory { get; set; }
[FieldDefinition(7, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(DelugePriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
public int RecentTvPriority { get; set; }
public int RecentMusicPriority { get; set; }
[FieldDefinition(8, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(DelugePriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
public int OlderTvPriority { get; set; }
public int OlderMusicPriority { get; set; }
[FieldDefinition(9, Label = "Add Paused", Type = FieldType.Checkbox)]
public bool AddPaused { get; set; }

8
src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStationSettings.cs
View file

@ -14,14 +14,14 @@ public DownloadStationSettingsValidator()
RuleFor(c => c.Host).ValidHost();
RuleFor(c => c.Port).InclusiveBetween(1, 65535);
RuleFor(c => c.TvDirectory).Matches(@"^(?!/).+")
.When(c => c.TvDirectory.IsNotNullOrWhiteSpace())
RuleFor(c => c.MusicDirectory).Matches(@"^(?!/).+")
.When(c => c.MusicDirectory.IsNotNullOrWhiteSpace())
.WithMessage("Cannot start with /");
RuleFor(c => c.MusicCategory).Matches(@"^\.?[-a-z]*$", RegexOptions.IgnoreCase).WithMessage("Allowed characters a-z and -");
RuleFor(c => c.MusicCategory).Empty()
.When(c => c.TvDirectory.IsNotNullOrWhiteSpace())
.When(c => c.MusicDirectory.IsNotNullOrWhiteSpace())
.WithMessage("Cannot use Category and Directory");
}
}
@ -49,7 +49,7 @@ public class DownloadStationSettings : IProviderConfig
public string MusicCategory { get; set; }
[FieldDefinition(6, Label = "Directory", Type = FieldType.Textbox, HelpText = "Optional shared folder to put downloads into, leave blank to use the default Download Station location")]
public string TvDirectory { get; set; }
public string MusicDirectory { get; set; }
public DownloadStationSettings()
{

12
src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
View file

@ -68,9 +68,9 @@ public override IEnumerable<DownloadClientItem> GetItems()
{
var outputPath = new OsPath($"/{torrent.Additional.Detail["destination"]}");
if (Settings.TvDirectory.IsNotNullOrWhiteSpace())
if (Settings.MusicDirectory.IsNotNullOrWhiteSpace())
{
if (!new OsPath($"/{Settings.TvDirectory}").Contains(outputPath))
if (!new OsPath($"/{Settings.MusicDirectory}").Contains(outputPath))
{
continue;
}
@ -315,7 +315,7 @@ protected ValidationFailure TestOutputPath()
if (downloadDir == null)
{
return new NzbDroneValidationFailure(nameof(Settings.TvDirectory), "No default destination")
return new NzbDroneValidationFailure(nameof(Settings.MusicDirectory), "No default destination")
{
DetailedDescription = $"You must login into your Diskstation as {Settings.Username} and manually set it up into DownloadStation settings under BT/HTTP/FTP/NZB -> Location."
};
@ -326,7 +326,7 @@ protected ValidationFailure TestOutputPath()
if (downloadDir != null)
{
var sharedFolder = downloadDir.Split('\\', '/')[0];
var fieldName = Settings.TvDirectory.IsNotNullOrWhiteSpace() ? nameof(Settings.TvDirectory) : nameof(Settings.MusicCategory);
var fieldName = Settings.MusicDirectory.IsNotNullOrWhiteSpace() ? nameof(Settings.MusicDirectory) : nameof(Settings.MusicCategory);
var folderInfo = _fileStationProxy.GetInfoFileOrDirectory($"/{downloadDir}", Settings);
@ -449,9 +449,9 @@ protected string GetDefaultDir()
protected string GetDownloadDirectory()
{
if (Settings.TvDirectory.IsNotNullOrWhiteSpace())
if (Settings.MusicDirectory.IsNotNullOrWhiteSpace())
{
return Settings.TvDirectory.TrimStart('/');
return Settings.MusicDirectory.TrimStart('/');
}
var destDir = GetDefaultDir();

12
src/NzbDrone.Core/Download/Clients/DownloadStation/UsenetDownloadStation.cs
View file

@ -78,9 +78,9 @@ public override IEnumerable<DownloadClientItem> GetItems()
totalRemainingSize += taskRemainingSize;
}
if (Settings.TvDirectory.IsNotNullOrWhiteSpace())
if (Settings.MusicDirectory.IsNotNullOrWhiteSpace())
{
if (!new OsPath($"/{Settings.TvDirectory}").Contains(outputPath))
if (!new OsPath($"/{Settings.MusicDirectory}").Contains(outputPath))
{
continue;
}
@ -213,7 +213,7 @@ protected ValidationFailure TestOutputPath()
if (downloadDir == null)
{
return new NzbDroneValidationFailure(nameof(Settings.TvDirectory), "No default destination")
return new NzbDroneValidationFailure(nameof(Settings.MusicDirectory), "No default destination")
{
DetailedDescription = $"You must login into your Diskstation as {Settings.Username} and manually set it up into DownloadStation settings under BT/HTTP/FTP/NZB -> Location."
};
@ -224,7 +224,7 @@ protected ValidationFailure TestOutputPath()
if (downloadDir != null)
{
var sharedFolder = downloadDir.Split('\\', '/')[0];
var fieldName = Settings.TvDirectory.IsNotNullOrWhiteSpace() ? nameof(Settings.TvDirectory) : nameof(Settings.MusicCategory);
var fieldName = Settings.MusicDirectory.IsNotNullOrWhiteSpace() ? nameof(Settings.MusicDirectory) : nameof(Settings.MusicCategory);
var folderInfo = _fileStationProxy.GetInfoFileOrDirectory($"/{downloadDir}", Settings);
@ -425,9 +425,9 @@ protected string GetDefaultDir()
protected string GetDownloadDirectory()
{
if (Settings.TvDirectory.IsNotNullOrWhiteSpace())
if (Settings.MusicDirectory.IsNotNullOrWhiteSpace())
{
return Settings.TvDirectory.TrimStart('/');
return Settings.MusicDirectory.TrimStart('/');
}
var destDir = GetDefaultDir();

2
src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs
View file

@ -32,7 +32,7 @@ public NzbVortex(INzbVortexProxy proxy,
protected override string AddFromNzbFile(RemoteAlbum remoteAlbum, string filename, byte[] fileContent)
{
var priority = remoteAlbum.IsRecentAlbum() ? Settings.RecentTvPriority : Settings.OlderTvPriority;
var priority = remoteAlbum.IsRecentAlbum() ? Settings.RecentMusicPriority : Settings.OlderMusicPriority;
var response = _proxy.DownloadNzb(fileContent, filename, priority, Settings);

8
src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexSettings.cs
View file

@ -32,8 +32,8 @@ public NzbVortexSettings()
Host = "localhost";
Port = 4321;
MusicCategory = "Music";
RecentTvPriority = (int)NzbVortexPriority.Normal;
OlderTvPriority = (int)NzbVortexPriority.Normal;
RecentMusicPriority = (int)NzbVortexPriority.Normal;
OlderMusicPriority = (int)NzbVortexPriority.Normal;
}
[FieldDefinition(0, Label = "Host", Type = FieldType.Textbox)]
@ -52,10 +52,10 @@ public NzbVortexSettings()
public string MusicCategory { get; set; }
[FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(NzbVortexPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
public int RecentTvPriority { get; set; }
public int RecentMusicPriority { get; set; }
[FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(NzbVortexPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
public int OlderTvPriority { get; set; }
public int OlderMusicPriority { get; set; }
public NzbDroneValidationResult Validate()
{

2
src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
View file

@ -37,7 +37,7 @@ public Nzbget(INzbgetProxy proxy,
protected override string AddFromNzbFile(RemoteAlbum remoteAlbum, string filename, byte[] fileContent)
{
var category = Settings.MusicCategory;
var priority = remoteAlbum.IsRecentAlbum() ? Settings.RecentTvPriority : Settings.OlderTvPriority;
var priority = remoteAlbum.IsRecentAlbum() ? Settings.RecentMusicPriority : Settings.OlderMusicPriority;
var addpaused = Settings.AddPaused;
var response = _proxy.DownloadNzb(fileContent, filename, category, priority, addpaused, Settings);

8
src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetSettings.cs
View file

@ -32,8 +32,8 @@ public NzbgetSettings()
MusicCategory = "Music";
Username = "nzbget";
Password = "tegbzn6789";
RecentTvPriority = (int)NzbgetPriority.Normal;
OlderTvPriority = (int)NzbgetPriority.Normal;
RecentMusicPriority = (int)NzbgetPriority.Normal;
OlderMusicPriority = (int)NzbgetPriority.Normal;
}
[FieldDefinition(0, Label = "Host", Type = FieldType.Textbox)]
@ -58,10 +58,10 @@ public NzbgetSettings()
public string MusicCategory { get; set; }
[FieldDefinition(7, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(NzbgetPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
public int RecentTvPriority { get; set; }
public int RecentMusicPriority { get; set; }
[FieldDefinition(8, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(NzbgetPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
public int OlderTvPriority { get; set; }
public int OlderMusicPriority { get; set; }
[FieldDefinition(9, Label = "Add Paused", Type = FieldType.Checkbox, HelpText = "This option requires at least NzbGet version 16.0")]
public bool AddPaused { get; set; }

12
src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
View file

@ -74,7 +74,7 @@ protected override string AddFromMagnetLink(RemoteAlbum remoteAlbum, string hash
var setShareLimits = remoteAlbum.SeedConfiguration != null && (remoteAlbum.SeedConfiguration.Ratio.HasValue || remoteAlbum.SeedConfiguration.SeedTime.HasValue);
var addHasSetShareLimits = setShareLimits && ProxyApiVersion >= new Version(2, 8, 1);
var isRecentAlbum = remoteAlbum.IsRecentAlbum();
var moveToTop = (isRecentAlbum && Settings.RecentTvPriority == (int)QBittorrentPriority.First) || (!isRecentAlbum && Settings.OlderTvPriority == (int)QBittorrentPriority.First);
var moveToTop = (isRecentAlbum && Settings.RecentMusicPriority == (int)QBittorrentPriority.First) || (!isRecentAlbum && Settings.OlderMusicPriority == (int)QBittorrentPriority.First);
var forceStart = (QBittorrentState)Settings.InitialState == QBittorrentState.ForceStart;
Proxy.AddTorrentFromUrl(magnetLink, addHasSetShareLimits && setShareLimits ? remoteAlbum.SeedConfiguration : null, Settings);
@ -131,7 +131,7 @@ protected override string AddFromTorrentFile(RemoteAlbum remoteAlbum, string has
var setShareLimits = remoteAlbum.SeedConfiguration != null && (remoteAlbum.SeedConfiguration.Ratio.HasValue || remoteAlbum.SeedConfiguration.SeedTime.HasValue);
var addHasSetShareLimits = setShareLimits && ProxyApiVersion >= new Version(2, 8, 1);
var isRecentAlbum = remoteAlbum.IsRecentAlbum();
var moveToTop = (isRecentAlbum && Settings.RecentTvPriority == (int)QBittorrentPriority.First) || (!isRecentAlbum && Settings.OlderTvPriority == (int)QBittorrentPriority.First);
var moveToTop = (isRecentAlbum && Settings.RecentMusicPriority == (int)QBittorrentPriority.First) || (!isRecentAlbum && Settings.OlderMusicPriority == (int)QBittorrentPriority.First);
var forceStart = (QBittorrentState)Settings.InitialState == QBittorrentState.ForceStart;
Proxy.AddTorrentFromFile(filename, fileContent, addHasSetShareLimits ? remoteAlbum.SeedConfiguration : null, Settings);
@ -529,8 +529,8 @@ private ValidationFailure TestCategory()
private ValidationFailure TestPrioritySupport()
{
var recentPriorityDefault = Settings.RecentTvPriority == (int)QBittorrentPriority.Last;
var olderPriorityDefault = Settings.OlderTvPriority == (int)QBittorrentPriority.Last;
var recentPriorityDefault = Settings.RecentMusicPriority == (int)QBittorrentPriority.Last;
var olderPriorityDefault = Settings.OlderMusicPriority == (int)QBittorrentPriority.Last;
if (olderPriorityDefault && recentPriorityDefault)
{
@ -545,11 +545,11 @@ private ValidationFailure TestPrioritySupport()
{
if (!recentPriorityDefault)
{
return new NzbDroneValidationFailure(nameof(Settings.RecentTvPriority), "Queueing not enabled") { DetailedDescription = "Torrent Queueing is not enabled in your qBittorrent settings. Enable it in qBittorrent or select 'Last' as priority." };
return new NzbDroneValidationFailure(nameof(Settings.RecentMusicPriority), "Queueing not enabled") { DetailedDescription = "Torrent Queueing is not enabled in your qBittorrent settings. Enable it in qBittorrent or select 'Last' as priority." };
}
else if (!olderPriorityDefault)
{
return new NzbDroneValidationFailure(nameof(Settings.OlderTvPriority), "Queueing not enabled") { DetailedDescription = "Torrent Queueing is not enabled in your qBittorrent settings. Enable it in qBittorrent or select 'Last' as priority." };
return new NzbDroneValidationFailure(nameof(Settings.OlderMusicPriority), "Queueing not enabled") { DetailedDescription = "Torrent Queueing is not enabled in your qBittorrent settings. Enable it in qBittorrent or select 'Last' as priority." };
}
}
}

4
src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentSettings.cs
View file

@ -55,10 +55,10 @@ public QBittorrentSettings()
public string MusicImportedCategory { get; set; }
[FieldDefinition(8, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(QBittorrentPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
public int RecentTvPriority { get; set; }
public int RecentMusicPriority { get; set; }
[FieldDefinition(9, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(QBittorrentPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
public int OlderTvPriority { get; set; }
public int OlderMusicPriority { get; set; }
[FieldDefinition(10, Label = "Initial State", Type = FieldType.Select, SelectOptions = typeof(QBittorrentState), HelpText = "Initial state for torrents added to qBittorrent")]
public int InitialState { get; set; }

2
src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
View file

@ -38,7 +38,7 @@ public Sabnzbd(ISabnzbdProxy proxy,
protected override string AddFromNzbFile(RemoteAlbum remoteAlbum, string filename, byte[] fileContent)
{
var category = Settings.MusicCategory;
var priority = remoteAlbum.IsRecentAlbum() ? Settings.RecentTvPriority : Settings.OlderTvPriority;
var priority = remoteAlbum.IsRecentAlbum() ? Settings.RecentMusicPriority : Settings.OlderMusicPriority;
var response = _proxy.DownloadNzb(fileContent, filename, category, priority, Settings);

8
src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdSettings.cs
View file

@ -41,8 +41,8 @@ public SabnzbdSettings()
Host = "localhost";
Port = 8080;
MusicCategory = "music";
RecentTvPriority = (int)SabnzbdPriority.Default;
OlderTvPriority = (int)SabnzbdPriority.Default;
RecentMusicPriority = (int)SabnzbdPriority.Default;
OlderMusicPriority = (int)SabnzbdPriority.Default;
}
[FieldDefinition(0, Label = "Host", Type = FieldType.Textbox)]
@ -70,10 +70,10 @@ public SabnzbdSettings()
public string MusicCategory { get; set; }
[FieldDefinition(8, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(SabnzbdPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
public int RecentTvPriority { get; set; }
public int RecentMusicPriority { get; set; }
[FieldDefinition(9, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(SabnzbdPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
public int OlderTvPriority { get; set; }
public int OlderMusicPriority { get; set; }
public NzbDroneValidationResult Validate()
{

20
src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs
View file

@ -47,9 +47,9 @@ public override IEnumerable<DownloadClientItem> GetItems()
var outputPath = new OsPath(torrent.DownloadDir);
if (Settings.TvDirectory.IsNotNullOrWhiteSpace())
if (Settings.MusicDirectory.IsNotNullOrWhiteSpace())
{
if (!new OsPath(Settings.TvDirectory).Contains(outputPath))
if (!new OsPath(Settings.MusicDirectory).Contains(outputPath))
{
continue;
}
@ -172,9 +172,9 @@ public override void RemoveItem(DownloadClientItem item, bool deleteData)
public override DownloadClientInfo GetStatus()
{
string destDir;
if (Settings.TvDirectory.IsNotNullOrWhiteSpace())
if (Settings.MusicDirectory.IsNotNullOrWhiteSpace())
{
destDir = Settings.TvDirectory;
destDir = Settings.MusicDirectory;
}
else
{
@ -201,8 +201,8 @@ protected override string AddFromMagnetLink(RemoteAlbum remoteAlbum, string hash
var isRecentAlbum = remoteAlbum.IsRecentAlbum();
if ((isRecentAlbum && Settings.RecentTvPriority == (int)TransmissionPriority.First) ||
(!isRecentAlbum && Settings.OlderTvPriority == (int)TransmissionPriority.First))
if ((isRecentAlbum && Settings.RecentMusicPriority == (int)TransmissionPriority.First) ||
(!isRecentAlbum && Settings.OlderMusicPriority == (int)TransmissionPriority.First))
{
_proxy.MoveTorrentToTopInQueue(hash, Settings);
}
@ -217,8 +217,8 @@ protected override string AddFromTorrentFile(RemoteAlbum remoteAlbum, string has
var isRecentAlbum = remoteAlbum.IsRecentAlbum();
if ((isRecentAlbum && Settings.RecentTvPriority == (int)TransmissionPriority.First) ||
(!isRecentAlbum && Settings.OlderTvPriority == (int)TransmissionPriority.First))
if ((isRecentAlbum && Settings.RecentMusicPriority == (int)TransmissionPriority.First) ||
(!isRecentAlbum && Settings.OlderMusicPriority == (int)TransmissionPriority.First))
{
_proxy.MoveTorrentToTopInQueue(hash, Settings);
}
@ -244,9 +244,9 @@ protected virtual OsPath GetOutputPath(OsPath outputPath, TransmissionTorrent to
protected string GetDownloadDirectory()
{
if (Settings.TvDirectory.IsNotNullOrWhiteSpace())
if (Settings.MusicDirectory.IsNotNullOrWhiteSpace())
{
return Settings.TvDirectory;
return Settings.MusicDirectory;
}
if (!Settings.MusicCategory.IsNotNullOrWhiteSpace())

8
src/NzbDrone.Core/Download/Clients/Transmission/TransmissionSettings.cs
View file

@ -19,7 +19,7 @@ public TransmissionSettingsValidator()
RuleFor(c => c.MusicCategory).Matches(@"^\.?[-a-z]*$", RegexOptions.IgnoreCase).WithMessage("Allowed characters a-z and -");
RuleFor(c => c.MusicCategory).Empty()
.When(c => c.TvDirectory.IsNotNullOrWhiteSpace())
.When(c => c.MusicDirectory.IsNotNullOrWhiteSpace())
.WithMessage("Cannot use Category and Directory");
}
}
@ -57,13 +57,13 @@ public TransmissionSettings()
public string MusicCategory { get; set; }
[FieldDefinition(7, Label = "Directory", Type = FieldType.Textbox, Advanced = true, HelpText = "Optional location to put downloads in, leave blank to use the default Transmission location")]
public string TvDirectory { get; set; }
public string MusicDirectory { get; set; }
[FieldDefinition(8, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(TransmissionPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
public int RecentTvPriority { get; set; }
public int RecentMusicPriority { get; set; }
[FieldDefinition(9, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(TransmissionPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
public int OlderTvPriority { get; set; }
public int OlderMusicPriority { get; set; }
[FieldDefinition(10, Label = "Add Paused", Type = FieldType.Checkbox)]
public bool AddPaused { get; set; }

4
src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs
View file

@ -74,7 +74,7 @@ public override void MarkItemAsImported(DownloadClientItem downloadClientItem)
protected override string AddFromMagnetLink(RemoteAlbum remoteAlbum, string hash, string magnetLink)
{
var priority = (RTorrentPriority)(remoteAlbum.IsRecentAlbum() ? Settings.RecentTvPriority : Settings.OlderTvPriority);
var priority = (RTorrentPriority)(remoteAlbum.IsRecentAlbum() ? Settings.RecentMusicPriority : Settings.OlderMusicPriority);
_proxy.AddTorrentFromUrl(magnetLink, Settings.MusicCategory, priority, Settings.MusicDirectory, Settings);
@ -94,7 +94,7 @@ protected override string AddFromMagnetLink(RemoteAlbum remoteAlbum, string hash
protected override string AddFromTorrentFile(RemoteAlbum remoteAlbum, string hash, string filename, byte[] fileContent)
{
var priority = (RTorrentPriority)(remoteAlbum.IsRecentAlbum() ? Settings.RecentTvPriority : Settings.OlderTvPriority);
var priority = (RTorrentPriority)(remoteAlbum.IsRecentAlbum() ? Settings.RecentMusicPriority : Settings.OlderMusicPriority);
_proxy.AddTorrentFromFile(filename, fileContent, Settings.MusicCategory, priority, Settings.MusicDirectory, Settings);

8
src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentSettings.cs
View file

@ -27,8 +27,8 @@ public RTorrentSettings()
Port = 8080;
UrlBase = "RPC2";
MusicCategory = "lidarr";
OlderTvPriority = (int)RTorrentPriority.Normal;
RecentTvPriority = (int)RTorrentPriority.Normal;
OlderMusicPriority = (int)RTorrentPriority.Normal;
RecentMusicPriority = (int)RTorrentPriority.Normal;
}
[FieldDefinition(0, Label = "Host", Type = FieldType.Textbox)]
@ -59,10 +59,10 @@ public RTorrentSettings()
public string MusicDirectory { get; set; }
[FieldDefinition(9, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(RTorrentPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
public int RecentTvPriority { get; set; }
public int RecentMusicPriority { get; set; }
[FieldDefinition(10, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(RTorrentPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
public int OlderTvPriority { get; set; }
public int OlderMusicPriority { get; set; }
[FieldDefinition(11, Label = "Add Stopped", Type = FieldType.Checkbox, HelpText = "Enabling will add torrents and magnets to rTorrent in a stopped state. This may break magnet files.")]
public bool AddStopped { get; set; }

8
src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs
View file

@ -64,8 +64,8 @@ protected override string AddFromMagnetLink(RemoteAlbum remoteAlbum, string hash
var isRecentAlbum = remoteAlbum.IsRecentAlbum();
if ((isRecentAlbum && Settings.RecentTvPriority == (int)UTorrentPriority.First) ||
(!isRecentAlbum && Settings.OlderTvPriority == (int)UTorrentPriority.First))
if ((isRecentAlbum && Settings.RecentMusicPriority == (int)UTorrentPriority.First) ||
(!isRecentAlbum && Settings.OlderMusicPriority == (int)UTorrentPriority.First))
{
_proxy.MoveTorrentToTopInQueue(hash, Settings);
}
@ -87,8 +87,8 @@ protected override string AddFromTorrentFile(RemoteAlbum remoteAlbum, string has
var isRecentAlbum = remoteAlbum.IsRecentAlbum();
if ((isRecentAlbum && Settings.RecentTvPriority == (int)UTorrentPriority.First) ||
(!isRecentAlbum && Settings.OlderTvPriority == (int)UTorrentPriority.First))
if ((isRecentAlbum && Settings.RecentMusicPriority == (int)UTorrentPriority.First) ||
(!isRecentAlbum && Settings.OlderMusicPriority == (int)UTorrentPriority.First))
{
_proxy.MoveTorrentToTopInQueue(hash, Settings);
}

4
src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentSettings.cs
View file

@ -53,10 +53,10 @@ public UTorrentSettings()
public string MusicImportedCategory { get; set; }
[FieldDefinition(8, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(UTorrentPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
public int RecentTvPriority { get; set; }
public int RecentMusicPriority { get; set; }
[FieldDefinition(9, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(UTorrentPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
public int OlderTvPriority { get; set; }
public int OlderMusicPriority { get; set; }
[FieldDefinition(10, Label = "Initial State", Type = FieldType.Select, SelectOptions = typeof(UTorrentState), HelpText = "Initial state for torrents added to uTorrent")]
public int IntialState { get; set; }