Add setting to skip downloading the files to the host.
This commit is contained in:
parent
95306264fd
commit
187a428ba7
16 changed files with 561 additions and 14 deletions
|
|
@ -5,8 +5,8 @@ This is a web interface to manage your torrents on Real-Debrid or AllDebrid. It
|
||||||
- Add new torrents through magnets or files
|
- Add new torrents through magnets or files
|
||||||
- Download all files from Real-Debrid or AllDebrid to your local machine automatically
|
- Download all files from Real-Debrid or AllDebrid to your local machine automatically
|
||||||
- Unpack all files when finished downloading
|
- Unpack all files when finished downloading
|
||||||
- Implements a fake qBittorrent API so you can hook up other applications like Sonarr or Couchpotato.
|
- Implements a fake qBittorrent API so you can hook up other applications like Sonarr, Radarr or Couchpotato.
|
||||||
- Built with Angular 13 and .NET 6
|
- Built with Angular 14 and .NET 6
|
||||||
|
|
||||||
**You will need a Premium service at Real-Debrid or AllDebrid!**
|
**You will need a Premium service at Real-Debrid or AllDebrid!**
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,21 @@
|
||||||
<hr />
|
<hr />
|
||||||
|
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<label class="label">Download action</label>
|
<label class="label">Post Download Action</label>
|
||||||
|
<div class="control select is-fullwidth">
|
||||||
|
<select [(ngModel)]="hostDownloadAction">
|
||||||
|
<option [ngValue]="0">Download all files to host</option>
|
||||||
|
<option [ngValue]="1">Don't download any files to host</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<p class="help">
|
||||||
|
When a torrent is finished downloading on the provider, perform this action. Use this setting if you only want
|
||||||
|
to add files to Real-Debrid but not download them to the host.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<label class="label">Post Torrent Download Action</label>
|
||||||
<div class="control select is-fullwidth">
|
<div class="control select is-fullwidth">
|
||||||
<select [(ngModel)]="downloadAction" [disabled]="provider === 'AllDebrid'">
|
<select [(ngModel)]="downloadAction" [disabled]="provider === 'AllDebrid'">
|
||||||
<option [ngValue]="0">Download all files</option>
|
<option [ngValue]="0">Download all files</option>
|
||||||
|
|
@ -45,6 +59,7 @@
|
||||||
<option [ngValue]="2">Manually pick files</option>
|
<option [ngValue]="2">Manually pick files</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
<p class="help">When a torrent is fully downloaded on the provider, perform this action.</p>
|
||||||
<p class="help" *ngIf="provider === 'AllDebrid'">
|
<p class="help" *ngIf="provider === 'AllDebrid'">
|
||||||
This option is only available for RealDebrid. AllDebrid will always download the full torrent.
|
This option is only available for RealDebrid. AllDebrid will always download the full torrent.
|
||||||
</p>
|
</p>
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ export class AddNewTorrentComponent implements OnInit {
|
||||||
public provider: string;
|
public provider: string;
|
||||||
|
|
||||||
public category: string;
|
public category: string;
|
||||||
|
public hostDownloadAction: number = 0;
|
||||||
public downloadAction: number = 0;
|
public downloadAction: number = 0;
|
||||||
public finishedAction: number = 0;
|
public finishedAction: number = 0;
|
||||||
public downloadMinSize: number = 0;
|
public downloadMinSize: number = 0;
|
||||||
|
|
@ -47,6 +48,8 @@ export class AddNewTorrentComponent implements OnInit {
|
||||||
this.provider = providerSetting.enumValues[providerSetting.value as number];
|
this.provider = providerSetting.enumValues[providerSetting.value as number];
|
||||||
|
|
||||||
this.category = settings.first((m) => m.key === 'Gui:Default:Category')?.value as string;
|
this.category = settings.first((m) => m.key === 'Gui:Default:Category')?.value as string;
|
||||||
|
this.hostDownloadAction = this.downloadAction = settings.first((m) => m.key === 'Gui:Default:HostDownloadAction')
|
||||||
|
?.value as number;
|
||||||
this.downloadAction =
|
this.downloadAction =
|
||||||
settings.first((m) => m.key === 'Gui:Default:OnlyDownloadAvailableFiles')?.value === true ? 1 : 0;
|
settings.first((m) => m.key === 'Gui:Default:OnlyDownloadAvailableFiles')?.value === true ? 1 : 0;
|
||||||
this.finishedAction = settings.first((m) => m.key === 'Gui:Default:FinishedAction')?.value as number;
|
this.finishedAction = settings.first((m) => m.key === 'Gui:Default:FinishedAction')?.value as number;
|
||||||
|
|
@ -119,6 +122,7 @@ export class AddNewTorrentComponent implements OnInit {
|
||||||
|
|
||||||
const torrent = new Torrent();
|
const torrent = new Torrent();
|
||||||
torrent.category = this.category;
|
torrent.category = this.category;
|
||||||
|
torrent.hostDownloadAction = this.hostDownloadAction;
|
||||||
torrent.downloadAction = this.downloadAction;
|
torrent.downloadAction = this.downloadAction;
|
||||||
torrent.finishedAction = this.finishedAction;
|
torrent.finishedAction = this.finishedAction;
|
||||||
torrent.downloadMinSize = this.downloadMinSize;
|
torrent.downloadMinSize = this.downloadMinSize;
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ export class Torrent {
|
||||||
public torrentId: string;
|
public torrentId: string;
|
||||||
public hash: string;
|
public hash: string;
|
||||||
public category: string;
|
public category: string;
|
||||||
|
public hostDownloadAction: number;
|
||||||
public downloadAction: number;
|
public downloadAction: number;
|
||||||
public finishedAction: number;
|
public finishedAction: number;
|
||||||
public downloadMinSize: number;
|
public downloadMinSize: number;
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,14 @@
|
||||||
{{ torrent.category || "(no category set)" }}
|
{{ torrent.category || "(no category set)" }}
|
||||||
</div>
|
</div>
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<label class="label">Download action</label>
|
<label class="label">Post Download Action</label>
|
||||||
|
<ng-container [ngSwitch]="torrent.hostDownloadAction">
|
||||||
|
<ng-container *ngSwitchCase="0">Download all files to host</ng-container>
|
||||||
|
<ng-container *ngSwitchCase="1">Don't download files to host</ng-container>
|
||||||
|
</ng-container>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label class="label">Post Torrent Download Action</label>
|
||||||
<ng-container [ngSwitch]="torrent.downloadAction">
|
<ng-container [ngSwitch]="torrent.downloadAction">
|
||||||
<ng-container *ngSwitchCase="0">Download all files above a certain size</ng-container>
|
<ng-container *ngSwitchCase="0">Download all files above a certain size</ng-container>
|
||||||
<ng-container *ngSwitchCase="1"
|
<ng-container *ngSwitchCase="1"
|
||||||
|
|
|
||||||
|
|
@ -88,6 +88,7 @@ public class TorrentData
|
||||||
RdId = realDebridId,
|
RdId = realDebridId,
|
||||||
Hash = hash.ToLower(),
|
Hash = hash.ToLower(),
|
||||||
Category = torrent.Category,
|
Category = torrent.Category,
|
||||||
|
HostDownloadAction = torrent.HostDownloadAction,
|
||||||
DownloadAction = torrent.DownloadAction,
|
DownloadAction = torrent.DownloadAction,
|
||||||
FinishedAction = torrent.FinishedAction,
|
FinishedAction = torrent.FinishedAction,
|
||||||
DownloadMinSize = torrent.DownloadMinSize,
|
DownloadMinSize = torrent.DownloadMinSize,
|
||||||
|
|
|
||||||
12
server/RdtClient.Data/Enums/TorrentHostDownloadAction.cs
Normal file
12
server/RdtClient.Data/Enums/TorrentHostDownloadAction.cs
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
using System.ComponentModel;
|
||||||
|
|
||||||
|
namespace RdtClient.Data.Enums;
|
||||||
|
|
||||||
|
public enum TorrentHostDownloadAction
|
||||||
|
{
|
||||||
|
[Description("Download all files to host")]
|
||||||
|
DownloadAll = 0,
|
||||||
|
|
||||||
|
[Description("Don't download any files to host")]
|
||||||
|
DownloadNone = 1,
|
||||||
|
}
|
||||||
463
server/RdtClient.Data/Migrations/20221018174415_Torrents_Add_HostDownloadAction.Designer.cs
generated
Normal file
463
server/RdtClient.Data/Migrations/20221018174415_Torrents_Add_HostDownloadAction.Designer.cs
generated
Normal file
|
|
@ -0,0 +1,463 @@
|
||||||
|
// <auto-generated />
|
||||||
|
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("20221018174415_Torrents_Add_HostDownloadAction")]
|
||||||
|
partial class Torrents_Add_HostDownloadAction
|
||||||
|
{
|
||||||
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
|
{
|
||||||
|
#pragma warning disable 612, 618
|
||||||
|
modelBuilder.HasAnnotation("ProductVersion", "6.0.10");
|
||||||
|
|
||||||
|
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("Id")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("ConcurrencyStamp")
|
||||||
|
.IsConcurrencyToken()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.HasMaxLength(256)
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("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<string>", b =>
|
||||||
|
{
|
||||||
|
b.Property<int>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("ClaimType")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("ClaimValue")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("RoleId")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("RoleId");
|
||||||
|
|
||||||
|
b.ToTable("AspNetRoleClaims", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("Id")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("AccessFailedCount")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("ConcurrencyStamp")
|
||||||
|
.IsConcurrencyToken()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Email")
|
||||||
|
.HasMaxLength(256)
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<bool>("EmailConfirmed")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<bool>("LockoutEnabled")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("LockoutEnd")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("NormalizedEmail")
|
||||||
|
.HasMaxLength(256)
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("NormalizedUserName")
|
||||||
|
.HasMaxLength(256)
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("PasswordHash")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("PhoneNumber")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<bool>("PhoneNumberConfirmed")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("SecurityStamp")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<bool>("TwoFactorEnabled")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("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<string>", b =>
|
||||||
|
{
|
||||||
|
b.Property<int>("Id")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("ClaimType")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("ClaimValue")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("UserId")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("UserId");
|
||||||
|
|
||||||
|
b.ToTable("AspNetUserClaims", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("LoginProvider")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("ProviderKey")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("ProviderDisplayName")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("UserId")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.HasKey("LoginProvider", "ProviderKey");
|
||||||
|
|
||||||
|
b.HasIndex("UserId");
|
||||||
|
|
||||||
|
b.ToTable("AspNetUserLogins", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("UserId")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("RoleId")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.HasKey("UserId", "RoleId");
|
||||||
|
|
||||||
|
b.HasIndex("RoleId");
|
||||||
|
|
||||||
|
b.ToTable("AspNetUserRoles", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("UserId")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("LoginProvider")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Name")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Value")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.HasKey("UserId", "LoginProvider", "Name");
|
||||||
|
|
||||||
|
b.ToTable("AspNetUserTokens", (string)null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("RdtClient.Data.Models.Data.Download", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("DownloadId")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset>("Added")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("Completed")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("DownloadFinished")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("DownloadQueued")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("DownloadStarted")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Error")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Link")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Path")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("RemoteId")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("RetryCount")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<Guid>("TorrentId")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("UnpackingFinished")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("UnpackingQueued")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("UnpackingStarted")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.HasKey("DownloadId");
|
||||||
|
|
||||||
|
b.HasIndex("TorrentId");
|
||||||
|
|
||||||
|
b.ToTable("Downloads");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("RdtClient.Data.Models.Data.Setting", b =>
|
||||||
|
{
|
||||||
|
b.Property<string>("SettingId")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Value")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.HasKey("SettingId");
|
||||||
|
|
||||||
|
b.ToTable("Settings");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("RdtClient.Data.Models.Data.Torrent", b =>
|
||||||
|
{
|
||||||
|
b.Property<Guid>("TorrentId")
|
||||||
|
.ValueGeneratedOnAdd()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset>("Added")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("Category")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("Completed")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("DeleteOnError")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<int>("DownloadAction")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("DownloadManualFiles")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("DownloadMinSize")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<int>("DownloadRetryAttempts")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("Error")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("FileOrMagnet")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("FilesSelected")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("FinishedAction")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("Hash")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("HostDownloadAction")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<bool>("IsFile")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<int>("Lifetime")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<int?>("Priority")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("RdAdded")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("RdEnded")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("RdFiles")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("RdHost")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("RdId")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<string>("RdName")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<long?>("RdProgress")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<long?>("RdSeeders")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<long?>("RdSize")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<long?>("RdSpeed")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<long?>("RdSplit")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<int?>("RdStatus")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<string>("RdStatusRaw")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset?>("Retry")
|
||||||
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("RetryCount")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.Property<int>("TorrentRetryAttempts")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
b.HasKey("TorrentId");
|
||||||
|
|
||||||
|
b.ToTable("Torrents");
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("RoleId")
|
||||||
|
.OnDelete(DeleteBehavior.Restrict)
|
||||||
|
.IsRequired();
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("UserId")
|
||||||
|
.OnDelete(DeleteBehavior.Restrict)
|
||||||
|
.IsRequired();
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
|
||||||
|
{
|
||||||
|
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("UserId")
|
||||||
|
.OnDelete(DeleteBehavior.Restrict)
|
||||||
|
.IsRequired();
|
||||||
|
});
|
||||||
|
|
||||||
|
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", 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<string>", 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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace RdtClient.Data.Migrations
|
||||||
|
{
|
||||||
|
public partial class Torrents_Add_HostDownloadAction : Migration
|
||||||
|
{
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<int>(
|
||||||
|
name: "HostDownloadAction",
|
||||||
|
table: "Torrents",
|
||||||
|
type: "INTEGER",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "HostDownloadAction",
|
||||||
|
table: "Torrents");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -15,7 +15,7 @@ namespace RdtClient.Data.Migrations
|
||||||
protected override void BuildModel(ModelBuilder modelBuilder)
|
protected override void BuildModel(ModelBuilder modelBuilder)
|
||||||
{
|
{
|
||||||
#pragma warning disable 612, 618
|
#pragma warning disable 612, 618
|
||||||
modelBuilder.HasAnnotation("ProductVersion", "6.0.5");
|
modelBuilder.HasAnnotation("ProductVersion", "6.0.10");
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
|
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
|
||||||
{
|
{
|
||||||
|
|
@ -324,6 +324,9 @@ namespace RdtClient.Data.Migrations
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasColumnType("TEXT");
|
.HasColumnType("TEXT");
|
||||||
|
|
||||||
|
b.Property<int>("HostDownloadAction")
|
||||||
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
b.Property<bool>("IsFile")
|
b.Property<bool>("IsFile")
|
||||||
.HasColumnType("INTEGER");
|
.HasColumnType("INTEGER");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ public class Torrent
|
||||||
|
|
||||||
public TorrentDownloadAction DownloadAction { get; set; }
|
public TorrentDownloadAction DownloadAction { get; set; }
|
||||||
public TorrentFinishedAction FinishedAction { get; set; }
|
public TorrentFinishedAction FinishedAction { get; set; }
|
||||||
|
public TorrentHostDownloadAction HostDownloadAction { get; set; }
|
||||||
public Int32 DownloadMinSize { get; set; }
|
public Int32 DownloadMinSize { get; set; }
|
||||||
public String? DownloadManualFiles { get; set; }
|
public String? DownloadManualFiles { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -147,12 +147,12 @@ or
|
||||||
|
|
||||||
public class DbSettingsIntegrations
|
public class DbSettingsIntegrations
|
||||||
{
|
{
|
||||||
public DbSettingsDefaults Default { get; set; } = new();
|
public DbSettingsDefaultsWithDownload Default { get; set; } = new();
|
||||||
}
|
}
|
||||||
|
|
||||||
public class DbSettingsGui
|
public class DbSettingsGui
|
||||||
{
|
{
|
||||||
public DbSettingsDefaultsWithCategory Default { get; set; } = new();
|
public DbSettingsDefaultsWithDownload Default { get; set; } = new();
|
||||||
}
|
}
|
||||||
|
|
||||||
public class DbSettingsWatch
|
public class DbSettingsWatch
|
||||||
|
|
@ -166,7 +166,14 @@ public class DbSettingsWatch
|
||||||
public Int32 Interval { get; set; } = 60;
|
public Int32 Interval { get; set; } = 60;
|
||||||
|
|
||||||
[DisplayName("Import Defaults")]
|
[DisplayName("Import Defaults")]
|
||||||
public DbSettingsDefaultsWithCategory Default { get; set; } = new();
|
public DbSettingsDefaultsWithDownload Default { get; set; } = new();
|
||||||
|
}
|
||||||
|
|
||||||
|
public class DbSettingsDefaultsWithDownload : DbSettingsDefaultsWithCategory
|
||||||
|
{
|
||||||
|
[DisplayName("Post Torrent Download Action")]
|
||||||
|
[Description("When a torrent is finished downloading on the provider, perform this action. Use this setting if you only want to add files to Real-Debrid but not download them to the host.")]
|
||||||
|
public TorrentHostDownloadAction HostDownloadAction { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class DbSettingsDefaultsWithCategory : DbSettingsDefaults
|
public class DbSettingsDefaultsWithCategory : DbSettingsDefaults
|
||||||
|
|
@ -175,8 +182,8 @@ public class DbSettingsDefaultsWithCategory : DbSettingsDefaults
|
||||||
[Description("When a torrent is imported assign it this category.")]
|
[Description("When a torrent is imported assign it this category.")]
|
||||||
public String? Category { get; set; } = null;
|
public String? Category { get; set; } = null;
|
||||||
|
|
||||||
[DisplayName("Finished Action")]
|
[DisplayName("Post Download Action")]
|
||||||
[Description("When a torrent is finished, perform this action.")]
|
[Description("When all files are downloaded from the provider to the host, perform this action.")]
|
||||||
public TorrentFinishedAction FinishedAction { get; set; } = TorrentFinishedAction.RemoveAllTorrents;
|
public TorrentFinishedAction FinishedAction { get; set; } = TorrentFinishedAction.RemoveAllTorrents;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -81,6 +81,7 @@ public class WatchFolderChecker : BackgroundService
|
||||||
var torrent = new Torrent
|
var torrent = new Torrent
|
||||||
{
|
{
|
||||||
Category = Settings.Get.Watch.Default.Category,
|
Category = Settings.Get.Watch.Default.Category,
|
||||||
|
HostDownloadAction = Settings.Get.Watch.Default.HostDownloadAction,
|
||||||
DownloadAction = Settings.Get.Watch.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
|
DownloadAction = Settings.Get.Watch.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
|
||||||
FinishedAction = Settings.Get.Watch.Default.FinishedAction,
|
FinishedAction = Settings.Get.Watch.Default.FinishedAction,
|
||||||
DownloadMinSize = Settings.Get.Watch.Default.MinFileSize,
|
DownloadMinSize = Settings.Get.Watch.Default.MinFileSize,
|
||||||
|
|
|
||||||
|
|
@ -420,6 +420,7 @@ public class QBittorrent
|
||||||
var torrent = new Torrent
|
var torrent = new Torrent
|
||||||
{
|
{
|
||||||
Category = category,
|
Category = category,
|
||||||
|
HostDownloadAction = Settings.Get.Integrations.Default.HostDownloadAction,
|
||||||
DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
|
DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
|
||||||
FinishedAction = TorrentFinishedAction.None,
|
FinishedAction = TorrentFinishedAction.None,
|
||||||
DownloadMinSize = Settings.Get.Integrations.Default.MinFileSize,
|
DownloadMinSize = Settings.Get.Integrations.Default.MinFileSize,
|
||||||
|
|
@ -438,6 +439,7 @@ public class QBittorrent
|
||||||
var torrent = new Torrent
|
var torrent = new Torrent
|
||||||
{
|
{
|
||||||
Category = category,
|
Category = category,
|
||||||
|
HostDownloadAction = Settings.Get.Integrations.Default.HostDownloadAction,
|
||||||
DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
|
DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
|
||||||
FinishedAction = TorrentFinishedAction.None,
|
FinishedAction = TorrentFinishedAction.None,
|
||||||
DownloadMinSize = Settings.Get.Integrations.Default.MinFileSize,
|
DownloadMinSize = Settings.Get.Integrations.Default.MinFileSize,
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,7 @@ public class RealDebridTorrentClient : ITorrentClient
|
||||||
{
|
{
|
||||||
Filename = m.First().Filename!,
|
Filename = m.First().Filename!,
|
||||||
Filesize = m.First().Filesize
|
Filesize = m.First().Filesize
|
||||||
} ).ToList();
|
}).ToList();
|
||||||
|
|
||||||
return torrentClientAvailableFiles;
|
return torrentClientAvailableFiles;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -501,12 +501,16 @@ public class TorrentRunner
|
||||||
{
|
{
|
||||||
Log($"Creating downloads", torrent);
|
Log($"Creating downloads", torrent);
|
||||||
|
|
||||||
await _torrents.CreateDownloads(torrent.TorrentId);
|
if (torrent.HostDownloadAction == TorrentHostDownloadAction.DownloadAll)
|
||||||
|
{
|
||||||
|
await _torrents.CreateDownloads(torrent.TorrentId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if torrent is complete
|
// Check if torrent is complete, or if we don't want to download any files to the host.
|
||||||
if (torrent.Downloads.Count > 0)
|
if ((torrent.Downloads.Count > 0) ||
|
||||||
|
torrent.RdStatus == TorrentStatus.Finished && torrent.HostDownloadAction == TorrentHostDownloadAction.DownloadNone)
|
||||||
{
|
{
|
||||||
var allComplete = torrent.Downloads.Count(m => m.Completed != null);
|
var allComplete = torrent.Downloads.Count(m => m.Completed != null);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue