From b0823f596d4ecf6bfc5420c585dfd97ddeef94b6 Mon Sep 17 00:00:00 2001 From: Roger Far Date: Mon, 12 Feb 2024 21:39:02 -0700 Subject: [PATCH] Add regex option to include or exclude files. --- .../add-new-torrent.component.html | 41 +- .../add-new-torrent.component.scss | 12 +- .../add-new-torrent.component.ts | 50 +- client/src/app/models/torrent.model.ts | 2 + client/src/app/torrent.service.ts | 22 +- client/src/app/torrent/torrent.component.html | 13 +- server/RdtClient.Data/Data/TorrentData.cs | 2 + ...07_Torrent_Add_Include_Exclude.Designer.cs | 473 ++++++++++++++++++ ...40213025207_Torrent_Add_Include_Exclude.cs | 38 ++ .../Migrations/DataContextModelSnapshot.cs | 8 +- server/RdtClient.Data/Models/Data/Torrent.cs | 2 + .../Models/Internal/DbSettings.cs | 8 + .../BackgroundServices/WatchFolderChecker.cs | 2 + .../RdtClient.Service/Services/QBittorrent.cs | 4 + .../TorrentClients/RealDebridTorrentClient.cs | 48 +- server/RdtClient.Service/Services/Torrents.cs | 2 + .../Controllers/TorrentsController.cs | 99 +++- 17 files changed, 805 insertions(+), 21 deletions(-) create mode 100644 server/RdtClient.Data/Migrations/20240213025207_Torrent_Add_Include_Exclude.Designer.cs create mode 100644 server/RdtClient.Data/Migrations/20240213025207_Torrent_Add_Include_Exclude.cs diff --git a/client/src/app/add-new-torrent/add-new-torrent.component.html b/client/src/app/add-new-torrent/add-new-torrent.component.html index 483537e..575f64c 100644 --- a/client/src/app/add-new-torrent/add-new-torrent.component.html +++ b/client/src/app/add-new-torrent/add-new-torrent.component.html @@ -31,7 +31,7 @@ > - +
-

Settings that are blank do not have the same values for each torrent. Updating a setting with a blank value will not update it.

+

+ Settings that are blank do not have the same values for each torrent. Updating a setting with a blank value will + not update it. +

diff --git a/server/RdtClient.Data/Data/TorrentData.cs b/server/RdtClient.Data/Data/TorrentData.cs index 6b325eb..0be04d2 100644 --- a/server/RdtClient.Data/Data/TorrentData.cs +++ b/server/RdtClient.Data/Data/TorrentData.cs @@ -94,6 +94,8 @@ public class TorrentData DownloadAction = torrent.DownloadAction, FinishedAction = torrent.FinishedAction, DownloadMinSize = torrent.DownloadMinSize, + IncludeRegex = torrent.IncludeRegex, + ExcludeRegex = torrent.ExcludeRegex, DownloadManualFiles = torrent.DownloadManualFiles, DownloadClient = downloadClient, FileOrMagnet = fileOrMagnetContents, diff --git a/server/RdtClient.Data/Migrations/20240213025207_Torrent_Add_Include_Exclude.Designer.cs b/server/RdtClient.Data/Migrations/20240213025207_Torrent_Add_Include_Exclude.Designer.cs new file mode 100644 index 0000000..9677434 --- /dev/null +++ b/server/RdtClient.Data/Migrations/20240213025207_Torrent_Add_Include_Exclude.Designer.cs @@ -0,0 +1,473 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using RdtClient.Data.Data; + +#nullable disable + +namespace RdtClient.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20240213025207_Torrent_Add_Include_Exclude")] + partial class Torrent_Add_Include_Exclude + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "8.0.1"); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b => + { + b.Property("Id") + .HasColumnType("TEXT"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("TEXT"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("RdtClient.Data.Models.Data.Download", b => + { + b.Property("DownloadId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Added") + .HasColumnType("TEXT"); + + b.Property("Completed") + .HasColumnType("TEXT"); + + b.Property("DownloadFinished") + .HasColumnType("TEXT"); + + b.Property("DownloadQueued") + .HasColumnType("TEXT"); + + b.Property("DownloadStarted") + .HasColumnType("TEXT"); + + b.Property("Error") + .HasColumnType("TEXT"); + + b.Property("Link") + .HasColumnType("TEXT"); + + b.Property("Path") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RemoteId") + .HasColumnType("TEXT"); + + b.Property("RetryCount") + .HasColumnType("INTEGER"); + + b.Property("TorrentId") + .HasColumnType("TEXT"); + + b.Property("UnpackingFinished") + .HasColumnType("TEXT"); + + b.Property("UnpackingQueued") + .HasColumnType("TEXT"); + + b.Property("UnpackingStarted") + .HasColumnType("TEXT"); + + b.HasKey("DownloadId"); + + b.HasIndex("TorrentId"); + + b.ToTable("Downloads"); + }); + + modelBuilder.Entity("RdtClient.Data.Models.Data.Setting", b => + { + b.Property("SettingId") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("SettingId"); + + b.ToTable("Settings"); + }); + + modelBuilder.Entity("RdtClient.Data.Models.Data.Torrent", b => + { + b.Property("TorrentId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("Added") + .HasColumnType("TEXT"); + + b.Property("Category") + .HasColumnType("TEXT"); + + b.Property("Completed") + .HasColumnType("TEXT"); + + b.Property("DeleteOnError") + .HasColumnType("INTEGER"); + + b.Property("DownloadAction") + .HasColumnType("INTEGER"); + + b.Property("DownloadClient") + .HasColumnType("INTEGER"); + + b.Property("DownloadManualFiles") + .HasColumnType("TEXT"); + + b.Property("DownloadMinSize") + .HasColumnType("INTEGER"); + + b.Property("DownloadRetryAttempts") + .HasColumnType("INTEGER"); + + b.Property("Error") + .HasColumnType("TEXT"); + + b.Property("ExcludeRegex") + .HasColumnType("TEXT"); + + b.Property("FileOrMagnet") + .HasColumnType("TEXT"); + + b.Property("FilesSelected") + .HasColumnType("TEXT"); + + b.Property("FinishedAction") + .HasColumnType("INTEGER"); + + b.Property("Hash") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("HostDownloadAction") + .HasColumnType("INTEGER"); + + b.Property("IncludeRegex") + .HasColumnType("TEXT"); + + b.Property("IsFile") + .HasColumnType("INTEGER"); + + b.Property("Lifetime") + .HasColumnType("INTEGER"); + + b.Property("Priority") + .HasColumnType("INTEGER"); + + b.Property("RdAdded") + .HasColumnType("TEXT"); + + b.Property("RdEnded") + .HasColumnType("TEXT"); + + b.Property("RdFiles") + .HasColumnType("TEXT"); + + b.Property("RdHost") + .HasColumnType("TEXT"); + + b.Property("RdId") + .HasColumnType("TEXT"); + + b.Property("RdName") + .HasColumnType("TEXT"); + + b.Property("RdProgress") + .HasColumnType("INTEGER"); + + b.Property("RdSeeders") + .HasColumnType("INTEGER"); + + b.Property("RdSize") + .HasColumnType("INTEGER"); + + b.Property("RdSpeed") + .HasColumnType("INTEGER"); + + b.Property("RdSplit") + .HasColumnType("INTEGER"); + + b.Property("RdStatus") + .HasColumnType("INTEGER"); + + b.Property("RdStatusRaw") + .HasColumnType("TEXT"); + + b.Property("Retry") + .HasColumnType("TEXT"); + + b.Property("RetryCount") + .HasColumnType("INTEGER"); + + b.Property("TorrentRetryAttempts") + .HasColumnType("INTEGER"); + + b.HasKey("TorrentId"); + + b.ToTable("Torrents"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + }); + + modelBuilder.Entity("RdtClient.Data.Models.Data.Download", b => + { + b.HasOne("RdtClient.Data.Models.Data.Torrent", "Torrent") + .WithMany("Downloads") + .HasForeignKey("TorrentId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Torrent"); + }); + + modelBuilder.Entity("RdtClient.Data.Models.Data.Torrent", b => + { + b.Navigation("Downloads"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/server/RdtClient.Data/Migrations/20240213025207_Torrent_Add_Include_Exclude.cs b/server/RdtClient.Data/Migrations/20240213025207_Torrent_Add_Include_Exclude.cs new file mode 100644 index 0000000..a629e0a --- /dev/null +++ b/server/RdtClient.Data/Migrations/20240213025207_Torrent_Add_Include_Exclude.cs @@ -0,0 +1,38 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace RdtClient.Data.Migrations +{ + /// + public partial class Torrent_Add_Include_Exclude : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "ExcludeRegex", + table: "Torrents", + type: "TEXT", + nullable: true); + + migrationBuilder.AddColumn( + name: "IncludeRegex", + table: "Torrents", + type: "TEXT", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "ExcludeRegex", + table: "Torrents"); + + migrationBuilder.DropColumn( + name: "IncludeRegex", + table: "Torrents"); + } + } +} diff --git a/server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs b/server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs index c9bde97..a3feaa9 100644 --- a/server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs +++ b/server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs @@ -15,7 +15,7 @@ namespace RdtClient.Data.Migrations protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "8.0.0"); + modelBuilder.HasAnnotation("ProductVersion", "8.0.1"); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => { @@ -314,6 +314,9 @@ namespace RdtClient.Data.Migrations b.Property("Error") .HasColumnType("TEXT"); + b.Property("ExcludeRegex") + .HasColumnType("TEXT"); + b.Property("FileOrMagnet") .HasColumnType("TEXT"); @@ -330,6 +333,9 @@ namespace RdtClient.Data.Migrations b.Property("HostDownloadAction") .HasColumnType("INTEGER"); + b.Property("IncludeRegex") + .HasColumnType("TEXT"); + b.Property("IsFile") .HasColumnType("INTEGER"); diff --git a/server/RdtClient.Data/Models/Data/Torrent.cs b/server/RdtClient.Data/Models/Data/Torrent.cs index 210f881..adae1e6 100644 --- a/server/RdtClient.Data/Models/Data/Torrent.cs +++ b/server/RdtClient.Data/Models/Data/Torrent.cs @@ -19,6 +19,8 @@ public class Torrent public TorrentFinishedAction FinishedAction { get; set; } public TorrentHostDownloadAction HostDownloadAction { get; set; } public Int32 DownloadMinSize { get; set; } + public String? IncludeRegex { get; set; } + public String? ExcludeRegex { get; set; } public String? DownloadManualFiles { get; set; } public DownloadClient DownloadClient { get; set; } diff --git a/server/RdtClient.Data/Models/Internal/DbSettings.cs b/server/RdtClient.Data/Models/Internal/DbSettings.cs index 87170a2..b1fcb1f 100644 --- a/server/RdtClient.Data/Models/Internal/DbSettings.cs +++ b/server/RdtClient.Data/Models/Internal/DbSettings.cs @@ -225,6 +225,14 @@ public class DbSettingsDefaults [Description("Files that are smaller than this setting are skipped and not downloaded. When set to 0 all files are downloaded. When downloading from Radarr or Sonarr it's recommended to keep this setting at atleast a few MB to avoid the debrid provider having to re-download the torrent.")] public Int32 MinFileSize { get; set; } = 0; + [DisplayName("Include files")] + [Description("Select only the files that are matching this regular expression. Only use this setting OR the Exclude files setting, not both.")] + public String? IncludeRegex { get; set; } + + [DisplayName("Exclude files")] + [Description("Ignore files that are matching this regular expression. Only use this setting OR the Include files setting, not both.")] + public String? ExcludeRegex { get; set; } + [DisplayName("Automatic retry torrent")] [Description("When a single download has failed multiple times (see setting above) or when the torrent itself received an error it will retry the full torrent this many times before marking it failed.")] public Int32 TorrentRetryAttempts { get; set; } = 1; diff --git a/server/RdtClient.Service/BackgroundServices/WatchFolderChecker.cs b/server/RdtClient.Service/BackgroundServices/WatchFolderChecker.cs index 2f29a3d..a55af0f 100644 --- a/server/RdtClient.Service/BackgroundServices/WatchFolderChecker.cs +++ b/server/RdtClient.Service/BackgroundServices/WatchFolderChecker.cs @@ -96,6 +96,8 @@ public class WatchFolderChecker : BackgroundService : TorrentDownloadAction.DownloadAll, FinishedAction = Settings.Get.Watch.Default.FinishedAction, DownloadMinSize = Settings.Get.Watch.Default.MinFileSize, + IncludeRegex = Settings.Get.Watch.Default.IncludeRegex, + ExcludeRegex = Settings.Get.Watch.Default.ExcludeRegex, TorrentRetryAttempts = Settings.Get.Watch.Default.TorrentRetryAttempts, DownloadRetryAttempts = Settings.Get.Watch.Default.DownloadRetryAttempts, DeleteOnError = Settings.Get.Watch.Default.DeleteOnError, diff --git a/server/RdtClient.Service/Services/QBittorrent.cs b/server/RdtClient.Service/Services/QBittorrent.cs index 5f48116..08b29e0 100644 --- a/server/RdtClient.Service/Services/QBittorrent.cs +++ b/server/RdtClient.Service/Services/QBittorrent.cs @@ -461,6 +461,8 @@ public class QBittorrent DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll, FinishedAction = TorrentFinishedAction.None, DownloadMinSize = Settings.Get.Integrations.Default.MinFileSize, + IncludeRegex = Settings.Get.Integrations.Default.IncludeRegex, + ExcludeRegex = Settings.Get.Integrations.Default.ExcludeRegex, TorrentRetryAttempts = Settings.Get.Integrations.Default.TorrentRetryAttempts, DownloadRetryAttempts = Settings.Get.Integrations.Default.DownloadRetryAttempts, DeleteOnError = Settings.Get.Integrations.Default.DeleteOnError, @@ -483,6 +485,8 @@ public class QBittorrent DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll, FinishedAction = TorrentFinishedAction.None, DownloadMinSize = Settings.Get.Integrations.Default.MinFileSize, + IncludeRegex = Settings.Get.Integrations.Default.IncludeRegex, + ExcludeRegex = Settings.Get.Integrations.Default.ExcludeRegex, TorrentRetryAttempts = Settings.Get.Integrations.Default.TorrentRetryAttempts, DownloadRetryAttempts = Settings.Get.Integrations.Default.DownloadRetryAttempts, DeleteOnError = Settings.Get.Integrations.Default.DeleteOnError, diff --git a/server/RdtClient.Service/Services/TorrentClients/RealDebridTorrentClient.cs b/server/RdtClient.Service/Services/TorrentClients/RealDebridTorrentClient.cs index 62922b2..4ceae39 100644 --- a/server/RdtClient.Service/Services/TorrentClients/RealDebridTorrentClient.cs +++ b/server/RdtClient.Service/Services/TorrentClients/RealDebridTorrentClient.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.Logging; +using System.Text.RegularExpressions; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using RDNET; using RdtClient.Data.Enums; @@ -202,6 +203,51 @@ public class RealDebridTorrentClient : ITorrentClient Log($"Found {files.Count} files that match the minimum file size criterea", torrent); } + if (!String.IsNullOrWhiteSpace(torrent.IncludeRegex)) + { + Log($"Using regular expression {torrent.IncludeRegex} to include only files matching this regex", torrent); + + var newFiles = new List(); + foreach (var file in files) + { + if (Regex.IsMatch(file.Path, torrent.IncludeRegex)) + { + Log($"* Including {file.Path}", torrent); + newFiles.Add(file); + } + else + { + Log($"* Excluding {file.Path}", torrent); + } + } + + files = newFiles; + + Log($"Found {files.Count} files that match the regex", torrent); + } + else if (!String.IsNullOrWhiteSpace(torrent.ExcludeRegex)) + { + Log($"Using regular expression {torrent.IncludeRegex} to ignore files matching this regex", torrent); + + var newFiles = new List(); + foreach (var file in files) + { + if (!Regex.IsMatch(file.Path, torrent.ExcludeRegex)) + { + Log($"* Including {file.Path}", torrent); + newFiles.Add(file); + } + else + { + Log($"* Excluding {file.Path}", torrent); + } + } + + files = newFiles; + + Log($"Found {files.Count} files that match the regex", torrent); + } + if (files.Count == 0) { Log($"Filtered all files out! Downloading ALL files instead!", torrent); diff --git a/server/RdtClient.Service/Services/Torrents.cs b/server/RdtClient.Service/Services/Torrents.cs index 1188556..833cdb8 100644 --- a/server/RdtClient.Service/Services/Torrents.cs +++ b/server/RdtClient.Service/Services/Torrents.cs @@ -425,6 +425,8 @@ public class Torrents DownloadAction = Settings.Get.Provider.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll, FinishedAction = Settings.Get.Provider.Default.FinishedAction, DownloadMinSize = Settings.Get.Provider.Default.MinFileSize, + IncludeRegex = Settings.Get.Provider.Default.IncludeRegex, + ExcludeRegex = Settings.Get.Provider.Default.ExcludeRegex, TorrentRetryAttempts = Settings.Get.Provider.Default.TorrentRetryAttempts, DownloadRetryAttempts = Settings.Get.Provider.Default.DownloadRetryAttempts, DeleteOnError = Settings.Get.Provider.Default.DeleteOnError, diff --git a/server/RdtClient.Web/Controllers/TorrentsController.cs b/server/RdtClient.Web/Controllers/TorrentsController.cs index 4381b84..ab2e893 100644 --- a/server/RdtClient.Web/Controllers/TorrentsController.cs +++ b/server/RdtClient.Web/Controllers/TorrentsController.cs @@ -1,6 +1,8 @@ -using Microsoft.AspNetCore.Authorization; +using System.Text.RegularExpressions; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MonoTorrent; +using RdtClient.Data.Models.TorrentClient; using RdtClient.Service.Helpers; using RdtClient.Service.Services; using Torrent = RdtClient.Data.Models.Data.Torrent; @@ -216,6 +218,94 @@ public class TorrentsController : Controller return Ok(); } + + [HttpPost] + [Route("VerifyRegex")] + public async Task VerifyRegex([FromForm] IFormFile? file, [FromBody] TorrentControllerVerifyRegexRequest? request) + { + if (request == null) + { + return Ok(); + } + + var includeError = ""; + var excludeError = ""; + + IList availableFiles; + + if (!String.IsNullOrWhiteSpace(request.MagnetLink)) + { + var magnet = MagnetLink.Parse(request.MagnetLink); + + availableFiles = await _torrents.GetAvailableFiles(magnet.InfoHash.ToHex()); + } + else if (file != null) + { + var fileStream = file.OpenReadStream(); + + await using var memoryStream = new MemoryStream(); + + await fileStream.CopyToAsync(memoryStream); + + var bytes = memoryStream.ToArray(); + + var torrent = await MonoTorrent.Torrent.LoadAsync(bytes); + + availableFiles = await _torrents.GetAvailableFiles(torrent.InfoHash.ToHex()); + } + else + { + return BadRequest(); + } + + var selectedFiles = new List(); + + if (!String.IsNullOrWhiteSpace(request.IncludeRegex)) + { + foreach (var availableFile in availableFiles) + { + try + { + if (Regex.IsMatch(availableFile.Filename, request.IncludeRegex)) + { + selectedFiles.Add(availableFile); + } + } + catch (Exception ex) + { + includeError = ex.Message; + } + } + } + else if (!String.IsNullOrWhiteSpace(request.ExcludeRegex)) + { + foreach (var availableFile in availableFiles) + { + try + { + if (!Regex.IsMatch(availableFile.Filename, request.ExcludeRegex)) + { + selectedFiles.Add(availableFile); + } + } + catch (Exception ex) + { + excludeError = ex.Message; + } + } + } + else + { + selectedFiles = availableFiles.ToList(); + } + + return Ok(new + { + includeError, + excludeError, + selectedFiles + }); + } } public class TorrentControllerUploadFileRequest @@ -239,4 +329,11 @@ public class TorrentControllerDeleteRequest public class TorrentControllerCheckFilesRequest { public String? MagnetLink { get; set; } +} + +public class TorrentControllerVerifyRegexRequest +{ + public String? IncludeRegex { get; set; } + public String? ExcludeRegex { get; set; } + public String? MagnetLink { get; set;} } \ No newline at end of file