Skip to content

Usenet streaming with a WebDAV server and a SABnzbd-compatible API

C#

Improved reliability of 'Remove Orphaned Files` maintenance task.

nzbdav-dev7e3dcab10fc9
diff --git a/backend/Api/Controllers/RemoveUnlinkedFiles/RemoveUnlinkedFilesController.cs b/backend/Api/Controllers/RemoveUnlinkedFiles/RemoveUnlinkedFilesController.cs
index fd5715a1..9f5a5e51 100644
--- a/backend/Api/Controllers/RemoveUnlinkedFiles/RemoveUnlinkedFilesController.cs
+++ b/backend/Api/Controllers/RemoveUnlinkedFiles/RemoveUnlinkedFilesController.cs
@@ -10,13 +10,12 @@ namespace NzbWebDAV.Api.Controllers.RemoveUnlinkedFiles;
[Route("api/remove-unlinked-files")]
public class RemoveUnlinkedFilesController(
ConfigManager configManager,
- DavDatabaseClient dbClient,
WebsocketManager websocketManager
) : BaseApiController
{
protected override async Task<IActionResult> HandleRequest()
{
- var task = new RemoveUnlinkedFilesTask(configManager, dbClient, websocketManager, isDryRun: false);
+ var task = new RemoveUnlinkedFilesTask(configManager, websocketManager, isDryRun: false);
var executed = await task.Execute().ConfigureAwait(false);
return Ok(executed);
}
diff --git a/backend/Api/Controllers/RemoveUnlinkedFiles/RemoveUnlinkedFilesDryRunController.cs b/backend/Api/Controllers/RemoveUnlinkedFiles/RemoveUnlinkedFilesDryRunController.cs
index 99fa9566..f071fee0 100644
--- a/backend/Api/Controllers/RemoveUnlinkedFiles/RemoveUnlinkedFilesDryRunController.cs
+++ b/backend/Api/Controllers/RemoveUnlinkedFiles/RemoveUnlinkedFilesDryRunController.cs
@@ -10,13 +10,12 @@ namespace NzbWebDAV.Api.Controllers.RemoveUnlinkedFiles;
[Route("api/remove-unlinked-files/dry-run")]
public class RemoveUnlinkedFilesDryRunController(
ConfigManager configManager,
- DavDatabaseClient dbClient,
WebsocketManager websocketManager
) : BaseApiController
{
protected override async Task<IActionResult> HandleRequest()
{
- var task = new RemoveUnlinkedFilesTask(configManager, dbClient, websocketManager, isDryRun: true);
+ var task = new RemoveUnlinkedFilesTask(configManager, websocketManager, isDryRun: true);
var executed = await task.Execute().ConfigureAwait(false);
return Ok(executed);
}
diff --git a/backend/Database/DavDatabaseContext.cs b/backend/Database/DavDatabaseContext.cs
index b1d46a27..b93dfb2c 100644
--- a/backend/Database/DavDatabaseContext.cs
+++ b/backend/Database/DavDatabaseContext.cs
@@ -132,10 +132,12 @@ public sealed class DavDatabaseContext() : DbContext(Options.Value)
.IsUnique();
e.HasIndex(i => new { i.IdPrefix, i.Type });
-
+
e.HasIndex(i => new { i.Type, i.HistoryItemId, i.NextHealthCheck, i.ReleaseDate, i.Id });
-
- e.HasIndex(i => new { i.HistoryItemId });
+
+ e.HasIndex(i => new { i.HistoryItemId, i.Type, i.CreatedAt });
+
+ e.HasIndex(i => new { i.HistoryItemId, i.SubType, i.CreatedAt });
});
// DavNzbFile
diff --git a/backend/Database/Migrations/20260202005856_Add-Type-CreatedAt-Index-To-DavItems-Table.Designer.cs b/backend/Database/Migrations/20260202005856_Add-Type-CreatedAt-Index-To-DavItems-Table.Designer.cs
new file mode 100644
index 00000000..fadf16a0
--- /dev/null
+++ b/backend/Database/Migrations/20260202005856_Add-Type-CreatedAt-Index-To-DavItems-Table.Designer.cs
@@ -0,0 +1,417 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NzbWebDAV.Database;
+
+#nullable disable
+
+namespace NzbWebDAV.Database.Migrations
+{
+ [DbContext(typeof(DavDatabaseContext))]
+ [Migration("20260202005856_Add-Type-CreatedAt-Index-To-DavItems-Table")]
+ partial class AddTypeCreatedAtIndexToDavItemsTable
+ {
+ /// <inheritdoc />
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder.HasAnnotation("ProductVersion", "10.0.1");
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.Account", b =>
+ {
+ b.Property<int>("Type")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Username")
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("PasswordHash")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("RandomSalt")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Type", "Username");
+
+ b.ToTable("Accounts", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.BlobCleanupItem", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("BlobCleanupItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.ConfigItem", b =>
+ {
+ b.Property<string>("ConfigName")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("ConfigValue")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("ConfigName");
+
+ b.ToTable("ConfigItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavItem", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid?>("FileBlobId")
+ .HasColumnType("TEXT");
+
+ b.Property<long?>("FileSize")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid?>("HistoryItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("IdPrefix")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<long?>("LastHealthCheck")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Name")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<long?>("NextHealthCheck")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid?>("ParentId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Path")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<long?>("ReleaseDate")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("SubType")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Type")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.HasIndex("IdPrefix", "Type");
+
+ b.HasIndex("ParentId", "Name")
+ .IsUnique();
+
+ b.HasIndex("HistoryItemId", "Type", "CreatedAt");
+
+ b.HasIndex("Type", "HistoryItemId", "NextHealthCheck", "ReleaseDate", "Id");
+
+ b.ToTable("DavItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavMultipartFile", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Metadata")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("DavMultipartFiles", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavNzbFile", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("SegmentIds")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("DavNzbFiles", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavRarFile", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("RarParts")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("DavRarFiles", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.HealthCheckResult", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<long>("CreatedAt")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("DavItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Message")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Path")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<int>("RepairStatus")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Result")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedAt");
+
+ b.HasIndex("DavItemId")
+ .HasFilter("\"RepairStatus\" = 3");
+
+ b.HasIndex("Result", "RepairStatus", "CreatedAt");
+
+ b.ToTable("HealthCheckResults", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.HealthCheckStat", b =>
+ {
+ b.Property<long>("DateStartInclusive")
+ .HasColumnType("INTEGER");
+
+ b.Property<long>("DateEndExclusive")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Result")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("RepairStatus")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Count")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("DateStartInclusive", "DateEndExclusive", "Result", "RepairStatus");
+
+ b.ToTable("HealthCheckStats", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.HistoryCleanupItem", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("HistoryCleanupItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.HistoryItem", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Category")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid?>("DownloadDirId")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("DownloadStatus")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("DownloadTimeSeconds")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("FailMessage")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("FileName")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("JobName")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<long>("TotalSegmentBytes")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.HasIndex("Category");
+
+ b.HasIndex("CreatedAt");
+
+ b.HasIndex("Category", "CreatedAt");
+
+ b.HasIndex("Category", "DownloadDirId");
+
+ b.ToTable("HistoryItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.QueueItem", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Category")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("FileName")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("JobName")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<long>("NzbFileSize")
+ .HasColumnType("INTEGER");
+
+ b.Property<DateTime?>("PauseUntil")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("PostProcessing")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Priority")
+ .HasColumnType("INTEGER");
+
+ b.Property<long>("TotalSegmentBytes")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.HasIndex("Category");
+
+ b.HasIndex("CreatedAt");
+
+ b.HasIndex("FileName")
+ .IsUnique();
+
+ b.HasIndex("Priority");
+
+ b.HasIndex("Priority", "CreatedAt");
+
+ b.HasIndex("Category", "Priority", "CreatedAt");
+
+ b.ToTable("QueueItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.QueueNzbContents", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("NzbContents")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("QueueNzbContents", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavItem", b =>
+ {
+ b.HasOne("NzbWebDAV.Database.Models.DavItem", "Parent")
+ .WithMany("Children")
+ .HasForeignKey("ParentId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.Navigation("Parent");
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavMultipartFile", b =>
+ {
+ b.HasOne("NzbWebDAV.Database.Models.DavItem", "DavItem")
+ .WithOne()
+ .HasForeignKey("NzbWebDAV.Database.Models.DavMultipartFile", "Id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("DavItem");
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavNzbFile", b =>
+ {
+ b.HasOne("NzbWebDAV.Database.Models.DavItem", "DavItem")
+ .WithOne()
+ .HasForeignKey("NzbWebDAV.Database.Models.DavNzbFile", "Id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("DavItem");
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavRarFile", b =>
+ {
+ b.HasOne("NzbWebDAV.Database.Models.DavItem", "DavItem")
+ .WithOne()
+ .HasForeignKey("NzbWebDAV.Database.Models.DavRarFile", "Id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("DavItem");
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.QueueNzbContents", b =>
+ {
+ b.HasOne("NzbWebDAV.Database.Models.QueueItem", "QueueItem")
+ .WithOne()
+ .HasForeignKey("NzbWebDAV.Database.Models.QueueNzbContents", "Id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("QueueItem");
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavItem", b =>
+ {
+ b.Navigation("Children");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/backend/Database/Migrations/20260202005856_Add-Type-CreatedAt-Index-To-DavItems-Table.cs b/backend/Database/Migrations/20260202005856_Add-Type-CreatedAt-Index-To-DavItems-Table.cs
new file mode 100644
index 00000000..20d6428b
--- /dev/null
+++ b/backend/Database/Migrations/20260202005856_Add-Type-CreatedAt-Index-To-DavItems-Table.cs
@@ -0,0 +1,36 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NzbWebDAV.Database.Migrations
+{
+ /// <inheritdoc />
+ public partial class AddTypeCreatedAtIndexToDavItemsTable : Migration
+ {
+ /// <inheritdoc />
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropIndex(
+ name: "IX_DavItems_HistoryItemId",
+ table: "DavItems");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_DavItems_HistoryItemId_Type_CreatedAt",
+ table: "DavItems",
+ columns: new[] { "HistoryItemId", "Type", "CreatedAt" });
+ }
+
+ /// <inheritdoc />
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropIndex(
+ name: "IX_DavItems_HistoryItemId_Type_CreatedAt",
+ table: "DavItems");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_DavItems_HistoryItemId",
+ table: "DavItems",
+ column: "HistoryItemId");
+ }
+ }
+}
diff --git a/backend/Database/Migrations/20260202094106_Add-SubType-CreatedAt-Index-To-DavItems-Table.Designer.cs b/backend/Database/Migrations/20260202094106_Add-SubType-CreatedAt-Index-To-DavItems-Table.Designer.cs
new file mode 100644
index 00000000..c5f6a564
--- /dev/null
+++ b/backend/Database/Migrations/20260202094106_Add-SubType-CreatedAt-Index-To-DavItems-Table.Designer.cs
@@ -0,0 +1,419 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NzbWebDAV.Database;
+
+#nullable disable
+
+namespace NzbWebDAV.Database.Migrations
+{
+ [DbContext(typeof(DavDatabaseContext))]
+ [Migration("20260202094106_Add-SubType-CreatedAt-Index-To-DavItems-Table")]
+ partial class AddSubTypeCreatedAtIndexToDavItemsTable
+ {
+ /// <inheritdoc />
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder.HasAnnotation("ProductVersion", "10.0.1");
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.Account", b =>
+ {
+ b.Property<int>("Type")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Username")
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<string>("PasswordHash")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("RandomSalt")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Type", "Username");
+
+ b.ToTable("Accounts", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.BlobCleanupItem", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("BlobCleanupItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.ConfigItem", b =>
+ {
+ b.Property<string>("ConfigName")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("ConfigValue")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("ConfigName");
+
+ b.ToTable("ConfigItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavItem", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid?>("FileBlobId")
+ .HasColumnType("TEXT");
+
+ b.Property<long?>("FileSize")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid?>("HistoryItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("IdPrefix")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<long?>("LastHealthCheck")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("Name")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property<long?>("NextHealthCheck")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid?>("ParentId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Path")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<long?>("ReleaseDate")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("SubType")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Type")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.HasIndex("IdPrefix", "Type");
+
+ b.HasIndex("ParentId", "Name")
+ .IsUnique();
+
+ b.HasIndex("HistoryItemId", "SubType", "CreatedAt");
+
+ b.HasIndex("HistoryItemId", "Type", "CreatedAt");
+
+ b.HasIndex("Type", "HistoryItemId", "NextHealthCheck", "ReleaseDate", "Id");
+
+ b.ToTable("DavItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavMultipartFile", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Metadata")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("DavMultipartFiles", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavNzbFile", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("SegmentIds")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("DavNzbFiles", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavRarFile", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("RarParts")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("DavRarFiles", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.HealthCheckResult", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<long>("CreatedAt")
+ .HasColumnType("INTEGER");
+
+ b.Property<Guid>("DavItemId")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Message")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Path")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<int>("RepairStatus")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Result")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedAt");
+
+ b.HasIndex("DavItemId")
+ .HasFilter("\"RepairStatus\" = 3");
+
+ b.HasIndex("Result", "RepairStatus", "CreatedAt");
+
+ b.ToTable("HealthCheckResults", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.HealthCheckStat", b =>
+ {
+ b.Property<long>("DateStartInclusive")
+ .HasColumnType("INTEGER");
+
+ b.Property<long>("DateEndExclusive")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Result")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("RepairStatus")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Count")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("DateStartInclusive", "DateEndExclusive", "Result", "RepairStatus");
+
+ b.ToTable("HealthCheckStats", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.HistoryCleanupItem", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("HistoryCleanupItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.HistoryItem", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Category")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<Guid?>("DownloadDirId")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("DownloadStatus")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("DownloadTimeSeconds")
+ .HasColumnType("INTEGER");
+
+ b.Property<string>("FailMessage")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("FileName")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("JobName")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<long>("TotalSegmentBytes")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.HasIndex("Category");
+
+ b.HasIndex("CreatedAt");
+
+ b.HasIndex("Category", "CreatedAt");
+
+ b.HasIndex("Category", "DownloadDirId");
+
+ b.ToTable("HistoryItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.QueueItem", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("Category")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<DateTime>("CreatedAt")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("FileName")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<string>("JobName")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property<long>("NzbFileSize")
+ .HasColumnType("INTEGER");
+
+ b.Property<DateTime?>("PauseUntil")
+ .HasColumnType("TEXT");
+
+ b.Property<int>("PostProcessing")
+ .HasColumnType("INTEGER");
+
+ b.Property<int>("Priority")
+ .HasColumnType("INTEGER");
+
+ b.Property<long>("TotalSegmentBytes")
+ .HasColumnType("INTEGER");
+
+ b.HasKey("Id");
+
+ b.HasIndex("Category");
+
+ b.HasIndex("CreatedAt");
+
+ b.HasIndex("FileName")
+ .IsUnique();
+
+ b.HasIndex("Priority");
+
+ b.HasIndex("Priority", "CreatedAt");
+
+ b.HasIndex("Category", "Priority", "CreatedAt");
+
+ b.ToTable("QueueItems", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.QueueNzbContents", b =>
+ {
+ b.Property<Guid>("Id")
+ .HasColumnType("TEXT");
+
+ b.Property<string>("NzbContents")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.ToTable("QueueNzbContents", (string)null);
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavItem", b =>
+ {
+ b.HasOne("NzbWebDAV.Database.Models.DavItem", "Parent")
+ .WithMany("Children")
+ .HasForeignKey("ParentId")
+ .OnDelete(DeleteBehavior.Cascade);
+
+ b.Navigation("Parent");
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavMultipartFile", b =>
+ {
+ b.HasOne("NzbWebDAV.Database.Models.DavItem", "DavItem")
+ .WithOne()
+ .HasForeignKey("NzbWebDAV.Database.Models.DavMultipartFile", "Id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("DavItem");
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavNzbFile", b =>
+ {
+ b.HasOne("NzbWebDAV.Database.Models.DavItem", "DavItem")
+ .WithOne()
+ .HasForeignKey("NzbWebDAV.Database.Models.DavNzbFile", "Id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("DavItem");
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavRarFile", b =>
+ {
+ b.HasOne("NzbWebDAV.Database.Models.DavItem", "DavItem")
+ .WithOne()
+ .HasForeignKey("NzbWebDAV.Database.Models.DavRarFile", "Id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("DavItem");
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.QueueNzbContents", b =>
+ {
+ b.HasOne("NzbWebDAV.Database.Models.QueueItem", "QueueItem")
+ .WithOne()
+ .HasForeignKey("NzbWebDAV.Database.Models.QueueNzbContents", "Id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("QueueItem");
+ });
+
+ modelBuilder.Entity("NzbWebDAV.Database.Models.DavItem", b =>
+ {
+ b.Navigation("Children");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/backend/Database/Migrations/20260202094106_Add-SubType-CreatedAt-Index-To-DavItems-Table.cs b/backend/Database/Migrations/20260202094106_Add-SubType-CreatedAt-Index-To-DavItems-Table.cs
new file mode 100644
index 00000000..8e232472
--- /dev/null
+++ b/backend/Database/Migrations/20260202094106_Add-SubType-CreatedAt-Index-To-DavItems-Table.cs
@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NzbWebDAV.Database.Migrations
+{
+ /// <inheritdoc />
+ public partial class AddSubTypeCreatedAtIndexToDavItemsTable : Migration
+ {
+ /// <inheritdoc />
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.CreateIndex(
+ name: "IX_DavItems_HistoryItemId_SubType_CreatedAt",
+ table: "DavItems",
+ columns: new[] { "HistoryItemId", "SubType", "CreatedAt" });
+ }
+
+ /// <inheritdoc />
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropIndex(
+ name: "IX_DavItems_HistoryItemId_SubType_CreatedAt",
+ table: "DavItems");
+ }
+ }
+}
diff --git a/backend/Database/Migrations/DavDatabaseContextModelSnapshot.cs b/backend/Database/Migrations/DavDatabaseContextModelSnapshot.cs
index 3f254605..3b3ba936 100644
--- a/backend/Database/Migrations/DavDatabaseContextModelSnapshot.cs
+++ b/backend/Database/Migrations/DavDatabaseContextModelSnapshot.cs
@@ -113,13 +113,15 @@ namespace NzbWebDAV.Database.Migrations
b.HasKey("Id");
- b.HasIndex("HistoryItemId");
-
b.HasIndex("IdPrefix", "Type");
b.HasIndex("ParentId", "Name")
.IsUnique();
+ b.HasIndex("HistoryItemId", "SubType", "CreatedAt");
+
+ b.HasIndex("HistoryItemId", "Type", "CreatedAt");
+
b.HasIndex("Type", "HistoryItemId", "NextHealthCheck", "ReleaseDate", "Id");
b.ToTable("DavItems", (string)null);
diff --git a/backend/Tasks/BaseTask.cs b/backend/Tasks/BaseTask.cs
index 2055cce6..4adcfae3 100644
--- a/backend/Tasks/BaseTask.cs
+++ b/backend/Tasks/BaseTask.cs
@@ -1,15 +1,19 @@
-namespace NzbWebDAV.Tasks;
+using NzbWebDAV.Utils;
+
+namespace NzbWebDAV.Tasks;
public abstract class BaseTask
{
protected abstract Task ExecuteInternal();
-
+
private static readonly SemaphoreSlim Semaphore = new(1, 1);
private static Task? _runningTask;
+ protected readonly CancellationToken CancellationToken = SigtermUtil.GetCancellationToken();
+
public async Task<bool> Execute()
{
- await Semaphore.WaitAsync().ConfigureAwait(false);
+ await Semaphore.WaitAsync(CancellationToken).ConfigureAwait(false);
Task? task;
try
{
@@ -18,7 +22,7 @@ public abstract class BaseTask
return false;
// otherwise, run the task.
- _runningTask = Task.Run(ExecuteInternal);
+ _runningTask = Task.Run(ExecuteInternal, CancellationToken);
task = _runningTask;
}
finally
diff --git a/backend/Tasks/RemoveUnlinkedFilesTask.cs b/backend/Tasks/RemoveUnlinkedFilesTask.cs
index 7cad6791..bfa0836a 100644
--- a/backend/Tasks/RemoveUnlinkedFilesTask.cs
+++ b/backend/Tasks/RemoveUnlinkedFilesTask.cs
@@ -11,13 +11,14 @@ namespace NzbWebDAV.Tasks;
public class RemoveUnlinkedFilesTask(
ConfigManager configManager,
- DavDatabaseClient dbClient,
WebsocketManager websocketManager,
bool isDryRun
) : BaseTask
{
private static List<string> _allRemovedPaths = [];
+ private record UnlinkedItemInfo(string Id, string Path);
+
protected override async Task ExecuteInternal()
{
try
@@ -33,16 +34,11 @@ public class RemoveUnlinkedFilesTask(
private async Task RemoveUnlinkedFiles()
{
- var removedItems = new HashSet<Guid>();
- var dryRun = isDryRun ? "Dry Run - " : string.Empty;
-
- Report(dryRun + "Enumerating all webdav files...");
- var allDavItems = await dbClient.Ctx.Items.ToListAsync().ConfigureAwait(false);
-
// get linked file paths
- Report(dryRun + $"Found {allDavItems.Count} webdav files.\nEnumerating all linked files...");
- var linkedIds = GetLinkedIds();
- if (linkedIds.Count < 5)
+ Report("Scanning all linked files...");
+ var startTime = DateTime.Now;
+ var linkedIdCount = await WriteLinkedIdsToTable();
+ if (linkedIdCount < 5)
{
Report($"Aborted: " +
$"There are less than five linked files found in your library. " +
@@ -50,70 +46,190 @@ public class RemoveUnlinkedFilesTask(
return;
}
- // determine paths to delete
- // only delete paths that have existed longer than a day
- var minExistance = TimeSpan.FromDays(1);
- var dateThreshold = DateTime.Now.Subtract(minExistance);
- var allEmptyDirectories = allDavItems
- .Where(x => x.Type == DavItem.ItemType.Directory)
- .Where(x => x.CreatedAt < dateThreshold)
- .Where(x => x.Children.All(y => removedItems.Contains(y.Id)));
- var allUnlinkedFiles = allDavItems
- .Where(x => x.Type is DavItem.ItemType.UsenetFile)
- .Where(x => x.CreatedAt < dateThreshold)
- .Where(x => !linkedIds.Contains(x.Id));
-
- // remove all empty directories
- Report(dryRun + "Removing all empty directories...");
- foreach (var emptyDirectory in allEmptyDirectories)
- RemoveItem(emptyDirectory, removedItems);
-
- // remove all unlinked files
- Report(dryRun + "Removing all unlinked files...");
- foreach (var unlinkedFile in allUnlinkedFiles)
- RemoveItem(unlinkedFile, removedItems);
-
- // save changes to database
- if (!isDryRun) await dbClient.Ctx.SaveChangesAsync().ConfigureAwait(false);
-
- // return all removed paths
- _allRemovedPaths = allDavItems
- .Where(x => removedItems.Contains(x.Id))
- .Select(x => x.Path)
- .ToList();
-
- Report(!isDryRun
- ? $"Done. Removed {_allRemovedPaths.Count} orphaned items."
- : $"Done. The task would remove {_allRemovedPaths.Count} orphaned items.");
+ Report("Searching for unlinked webdav items...");
+ var unlinkedItems = await CountUnlinkedItems(startTime);
+ Report($"Found {unlinkedItems} webdav items to remove.");
+
+ if (isDryRun)
+ {
+ await DryRunIdentifyUnlinkedFiles(startTime);
+ Report($"Done. Identified {_allRemovedPaths.Count} unlinked files.");
+ }
+ else
+ {
+ await RemoveUnlinkedItems(startTime, unlinkedItems);
+ await RemoveEmptyDirectories(startTime);
+ Report($"Done. Removed {_allRemovedPaths.Count} unlinked files.");
+ }
}
- private void RemoveItem(DavItem item, HashSet<Guid> removedItems)
+ private async Task<int> WriteLinkedIdsToTable()
{
- // ignore protected folders
- if (item.IsProtected()) return;
+ var dbContext = new DavDatabaseContext();
+
+ // Create a new table "TMP_LINKED_FILES", dropping old one if it already exists.
+ // No index initially for fast writes.
+ await dbContext.Database.ExecuteSqlRawAsync(
+ """
+ DROP TABLE IF EXISTS TMP_LINKED_FILES;
+ CREATE TABLE TMP_LINKED_FILES (Id TEXT NOT NULL);
+ """);
+
+ var count = 0;
+ var batches = GetLinkedIds().ToBatches(100);
+ foreach (var batch in batches)
+ {
+ var values = string.Join(",", batch.Select(id => $"('{id.ToString().ToUpper()}')"));
+ await dbContext.Database.ExecuteSqlRawAsync(
+ $"INSERT INTO TMP_LINKED_FILES (Id) VALUES {values}");
+ count += batch.Count;
+ }
+
+ // Remove duplicates and add primary key index.
+ // Create a new table with unique constraint, copy distinct values, then swap.
+ Report($"Indexing {count} linked files...");
+ await dbContext.Database.ExecuteSqlRawAsync(
+ """
+ CREATE TABLE TMP_LINKED_FILES_UNIQUE (Id TEXT NOT NULL PRIMARY KEY);
+ INSERT OR IGNORE INTO TMP_LINKED_FILES_UNIQUE (Id) SELECT Id FROM TMP_LINKED_FILES;
+ DROP TABLE TMP_LINKED_FILES;
+ ALTER TABLE TMP_LINKED_FILES_UNIQUE RENAME TO TMP_LINKED_FILES;
+ """);
+
+ return count;
+ }
- // ignore already removed items
- if (removedItems.Contains(item.Id)) return;
+ private IEnumerable<Guid> GetLinkedIds()
+ {
+ var debounce = DebounceUtil.CreateDebounce(TimeSpan.FromMilliseconds(500));
+ var linkedIds = OrganizedLinksUtil
+ .GetLibraryDavItemLinks(configManager)
+ .Select(x => x.DavItemId);
- // remove the item
- if (!isDryRun) dbClient.Ctx.Items.Remove(item);
- removedItems.Add(item.Id);
+ var count = 0;
+ foreach (var linkedId in linkedIds)
+ {
+ count++;
+ debounce(() => Report($"Scanning all linked files...\nFound {count}..."));
+ yield return linkedId;
+ }
- // remove the parent directory, if it is empty.
- if (item.Parent!.Children.All(x => removedItems.Contains(x.Id)))
- RemoveItem(item.Parent!, removedItems);
+ Report($"Scanning all linked files...\nFound {count}...");
}
- private HashSet<Guid> GetLinkedIds()
+ private async Task<int> CountUnlinkedItems(DateTime createdBefore)
{
- return OrganizedLinksUtil.GetLibraryDavItemLinks(configManager)
- .Select(x => x.DavItemId)
- .ToHashSet();
+ var dbContext = new DavDatabaseContext();
+ var createdBeforeStr = createdBefore.ToString("yyyy-MM-dd HH:mm:ss");
+ var usenetFileType = (int)DavItem.ItemType.UsenetFile;
+
+ var count = await dbContext.Database
+ .SqlQueryRaw<int>(
+ $"""
+ SELECT COUNT(i.Id) AS Value FROM DavItems i
+ LEFT JOIN TMP_LINKED_FILES t ON i.Id = t.Id
+ WHERE i.Type = {usenetFileType}
+ AND i.HistoryItemId IS NULL
+ AND i.CreatedAt < '{createdBeforeStr}'
+ AND t.Id IS NULL
+ """)
+ .FirstAsync();
+
+ return count;
+ }
+
+ private async Task RemoveUnlinkedItems(DateTime createdBefore, int totalCount)
+ {
+ Report("Removing unlinked items...");
+ _allRemovedPaths.Clear();
+ var dbContext = new DavDatabaseContext();
+ var removed = 0;
+
+ while (true)
+ {
+ // Select items to delete (batch of 100)
+ var itemsToDelete = await dbContext.Database
+ .SqlQueryRaw<UnlinkedItemInfo>(
+ $"""
+ SELECT Id, Path FROM DavItems
+ WHERE Type = {(int)DavItem.ItemType.UsenetFile}
+ AND HistoryItemId IS NULL
+ AND CreatedAt < '{createdBefore:yyyy-MM-dd HH:mm:ss}'
+ AND Id NOT IN (SELECT Id FROM TMP_LINKED_FILES)
+ LIMIT 100
+ """)
+ .ToListAsync();
+
+ // If there are no more items to delete, we're done.
+ if (itemsToDelete.Count == 0)
+ break;
+
+ // Delete the items.
+ var idsToDelete = string.Join(",", itemsToDelete.Select(x => $"'{x.Id}'"));
+ await dbContext.Database.ExecuteSqlRawAsync($"DELETE FROM DavItems WHERE Id IN ({idsToDelete})");
+
+ // Track removed paths
+ _allRemovedPaths.AddRange(itemsToDelete.Select(x => x.Path));
+ removed += itemsToDelete.Count;
+
+ Report($"Removing unlinked items...\nRemoved {removed}/{totalCount}...");
+ }
+
+ Report($"Removing unlinked items...\nRemoved {removed} of {removed}...");
+ }
+
+ private async Task RemoveEmptyDirectories(DateTime createdBefore)
+ {
+ Report($"Removing empty directories...");
+ var dbContext = new DavDatabaseContext();
+ var removed = 0;
+
+ while (true)
+ {
+ // Delete directories that have no children.
+ // Only delete regular directories (SubType = Directory), not root folders.
+ var deletedCount = await dbContext.Database.ExecuteSqlRawAsync(
+ $"""
+ DELETE FROM DavItems
+ WHERE Id IN (
+ SELECT d.Id FROM DavItems d
+ LEFT JOIN DavItems c ON c.ParentId = d.Id
+ WHERE d.SubType = {(int)DavItem.ItemSubType.Directory}
+ AND d.CreatedAt < '{createdBefore:yyyy-MM-dd HH:mm:ss}'
+ AND c.Id IS NULL
+ LIMIT 100
+ )
+ """);
+
+ if (deletedCount == 0)
+ break;
+
+ removed += deletedCount;
+ Report($"Removing empty directories...\nRemoved {removed}...");
+ }
+ }
+
+ private async Task DryRunIdentifyUnlinkedFiles(DateTime createdBefore)
+ {
+ var dbContext = new DavDatabaseContext();
+ var unlinkedFiles = await dbContext.Database
+ .SqlQueryRaw<UnlinkedItemInfo>(
+ $"""
+ SELECT Id, Path FROM DavItems
+ WHERE Type = {(int)DavItem.ItemType.UsenetFile}
+ AND HistoryItemId IS NULL
+ AND CreatedAt < '{createdBefore:yyyy-MM-dd HH:mm:ss}'
+ AND Id NOT IN (SELECT Id FROM TMP_LINKED_FILES)
+ """)
+ .ToListAsync();
+
+ _allRemovedPaths = unlinkedFiles.Select(x => x.Path).ToList();
}
private void Report(string message)
{
- _ = websocketManager.SendMessage(WebsocketTopic.CleanupTaskProgress, message);
+ var dryRun = isDryRun ? "Dry Run - " : string.Empty;
+ _ = websocketManager.SendMessage(WebsocketTopic.CleanupTaskProgress, $"{dryRun}{message}");
}
public static string GetAuditReport()
diff --git a/frontend/app/routes/settings/maintenance/remove-unlinked-files/remove-unlinked-files.tsx b/frontend/app/routes/settings/maintenance/remove-unlinked-files/remove-unlinked-files.tsx
index fc787611..34677f1a 100644
--- a/frontend/app/routes/settings/maintenance/remove-unlinked-files/remove-unlinked-files.tsx
+++ b/frontend/app/routes/settings/maintenance/remove-unlinked-files/remove-unlinked-files.tsx
@@ -14,11 +14,12 @@ export function RemoveUnlinkedFiles({ savedConfig }: RemoveUnlinkedFilesProps) {
const [connected, setConnected] = useState<boolean>(false);
const [progress, setProgress] = useState<string | null>(null);
const [isFetching, setIsFetching] = useState<boolean>(false);
+ const progressMessage = progress?.replace('Dry Run - ', '');
// derived variables
const libraryDir = savedConfig["media.library-dir"];
- const isDone = progress?.startsWith("Done");
- const isFinished = progress?.startsWith("Done") || progress?.startsWith("Failed") || progress?.startsWith("Aborted");
+ const isDone = progressMessage?.startsWith("Done");
+ const isFinished = progressMessage?.startsWith("Done") || progressMessage?.startsWith("Failed") || progressMessage?.startsWith("Aborted");
const isRunning = !isFinished && (isFetching || progress !== null);
const isRunButtonEnabled = !!libraryDir && connected && !isRunning;
const runButtonVariant = isRunButtonEnabled ? 'success' : 'secondary';