Fixed bug where downloads sometimes got added twice.

Added a retry download functionality.

server/RdtClient.Data/Data/DownloadData.cs

@@ -9,9 +9,8 @@ namespace RdtClient.Data.Data
 {
     public interface IDownloadData
     {
-        Task<IList<Download>> Get();
-        Task<IList<Download>> GetForTorrent(Guid torrentId);
         Task<Download> GetById(Guid downloadId);
+        Task<Download> Get(Guid torrentId, String path);
         Task<Download> Add(Guid torrentId, String path);
         Task UpdateUnrestrictedLink(Guid downloadId, String unrestrictedLink);
         Task UpdateDownloadStarted(Guid downloadId, DateTimeOffset? dateTime);
@@ -21,6 +20,7 @@ namespace RdtClient.Data.Data
         Task UpdateUnpackingFinished(Guid downloadId, DateTimeOffset? dateTime);
         Task UpdateCompleted(Guid downloadId, DateTimeOffset? dateTime);
         Task UpdateError(Guid downloadId, String error);
+        Task UpdateRetryCount(Guid downloadId, Int32 retryCount);
         Task DeleteForTorrent(Guid torrentId);
     }
 
@@ -57,6 +57,11 @@ namespace RdtClient.Data.Data
                                      .FirstOrDefaultAsync(m => m.DownloadId == downloadId);
         }
 
+        public async Task<Download> Get(Guid torrentId, String path)
+        {
+            return await _dataContext.Downloads.FirstOrDefaultAsync(m => m.TorrentId == torrentId && m.Path == path);
+        }
+
         public async Task<Download> Add(Guid torrentId, String path)
         {
             var download = new Download
@@ -65,7 +70,8 @@ namespace RdtClient.Data.Data
                 TorrentId = torrentId,
                 Path = path,
                 Added = DateTimeOffset.UtcNow,
-                DownloadQueued = DateTimeOffset.UtcNow
+                DownloadQueued = DateTimeOffset.UtcNow,
+                RetryCount = 0
             };
 
             await _dataContext.Downloads.AddAsync(download);
@@ -160,6 +166,16 @@ namespace RdtClient.Data.Data
             await _dataContext.SaveChangesAsync();
         }
 
+        public async Task UpdateRetryCount(Guid downloadId, Int32 retryCount)
+        {
+            var dbDownload = await _dataContext.Downloads
+                                               .FirstOrDefaultAsync(m => m.DownloadId == downloadId);
+
+            dbDownload.RetryCount = retryCount;
+
+            await _dataContext.SaveChangesAsync();
+        }
+
         public async Task DeleteForTorrent(Guid torrentId)
         {
             var downloads = await _dataContext.Downloads

server/RdtClient.Data/Migrations/20210401211556_Downloads_Add_RetryCount.Designer.cs

@@ -0,0 +1,421 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using RdtClient.Data.Data;
+
+namespace RdtClient.Data.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("20210401211556_Downloads_Add_RetryCount")]
+    partial class Downloads_Add_RetryCount
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "5.0.3");
+
+            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");
+                });
+
+            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");
+                });
+
+            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");
+                });
+
+            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");
+                });
+
+            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");
+                });
+
+            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");
+                });
+
+            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");
+                });
+
+            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")
+                        .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>("Type")
+                        .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<bool>("AutoDelete")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTimeOffset?>("Completed")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FileOrMagnet")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Hash")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsFile")
+                        .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.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
+        }
+    }
+}

server/RdtClient.Data/Migrations/20210401211556_Downloads_Add_RetryCount.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace RdtClient.Data.Migrations
+{
+    public partial class Downloads_Add_RetryCount : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "RetryCount",
+                table: "Downloads",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "RetryCount",
+                table: "Downloads");
+        }
+    }
+}

server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs

@@ -238,6 +238,9 @@ namespace RdtClient.Data.Migrations
                     b.Property<string>("Path")
                         .HasColumnType("TEXT");
 
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("INTEGER");
+
                     b.Property<Guid>("TorrentId")
                         .HasColumnType("TEXT");
 

server/RdtClient.Data/Models/Data/Download.cs

@@ -30,6 +30,8 @@ namespace RdtClient.Data.Models.Data
         public DateTimeOffset? UnpackingFinished { get; set; }
         
         public DateTimeOffset? Completed { get; set; }
+
+        public Int32 RetryCount { get; set; }
         
         public String Error { get; set; }
 

server/RdtClient.Service/Services/Downloads.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using RdtClient.Data.Data;
 using Download = RdtClient.Data.Models.Data.Download;
@@ -8,10 +7,9 @@ namespace RdtClient.Service.Services
 {
     public interface IDownloads
     {
-        Task<IList<Download>> Get();
-        Task<IList<Download>> GetForTorrent(Guid torrentId);
         Task<Download> GetById(Guid downloadId);
-        Task<Download> Add(Guid torrentId, String link);
+        Task<Download> Get(Guid torrentId, String path);
+        Task<Download> Add(Guid torrentId, String path);
         Task UpdateUnrestrictedLink(Guid downloadId, String unrestrictedLink);
         Task UpdateDownloadStarted(Guid downloadId, DateTimeOffset? dateTime);
         Task UpdateDownloadFinished(Guid downloadId, DateTimeOffset? dateTime);
@@ -20,6 +18,7 @@ namespace RdtClient.Service.Services
         Task UpdateUnpackingFinished(Guid downloadId, DateTimeOffset? dateTime);
         Task UpdateCompleted(Guid downloadId, DateTimeOffset? dateTime);
         Task UpdateError(Guid downloadId, String error);
+        Task UpdateRetryCount(Guid downloadId, Int32 retryCount);
         Task DeleteForTorrent(Guid torrentId);
     }
 
@@ -31,25 +30,20 @@ namespace RdtClient.Service.Services
         {
             _downloadData = downloadData;
         }
-
-        public async Task<IList<Download>> Get()
-        {
-            return await _downloadData.Get();
-        }
-
-        public async Task<IList<Download>> GetForTorrent(Guid torrentId)
-        {
-            return await _downloadData.GetForTorrent(torrentId);
-        }
-
+        
         public async Task<Download> GetById(Guid downloadId)
         {
             return await _downloadData.GetById(downloadId);
         }
 
-        public async Task<Download> Add(Guid torrentId, String link)
+        public async Task<Download> Get(Guid torrentId, String path)
         {
-            return await _downloadData.Add(torrentId, link);
+            return await _downloadData.Get(torrentId, path);
+        }
+
+        public async Task<Download> Add(Guid torrentId, String path)
+        {
+            return await _downloadData.Add(torrentId, path);
         }
 
         public async Task UpdateUnrestrictedLink(Guid downloadId, String unrestrictedLink)
@@ -92,6 +86,11 @@ namespace RdtClient.Service.Services
             await _downloadData.UpdateError(downloadId, error);
         }
 
+        public async Task UpdateRetryCount(Guid downloadId, Int32 retryCount)
+        {
+            await _downloadData.UpdateRetryCount(downloadId, retryCount);
+        }
+
         public async Task DeleteForTorrent(Guid torrentId)
         {
             await _downloadData.DeleteForTorrent(torrentId);

server/RdtClient.Service/Services/TorrentRunner.cs

@@ -19,6 +19,8 @@ namespace RdtClient.Service.Services
 
     public class TorrentRunner : ITorrentRunner
     {
+        private const Int32 RetryCount = 3;
+
         private static DateTime _nextUpdate = DateTime.UtcNow;
 
         public static readonly ConcurrentDictionary<Guid, DownloadClient> ActiveDownloadClients = new ConcurrentDictionary<Guid, DownloadClient>();
@@ -120,10 +122,24 @@ namespace RdtClient.Service.Services
             {
                 if (downloadClient.Error != null)
                 {
+                    // Retry the download
                     Log.Debug($"Processing active download {downloadId}: error {downloadClient.Error}");
+                    var download = await _downloads.GetById(downloadId);
 
-                    await _downloads.UpdateError(downloadId, downloadClient.Error);
-                    await _downloads.UpdateCompleted(downloadId, DateTimeOffset.UtcNow);
+                    if (download.RetryCount < RetryCount)
+                    {
+                        Log.Debug($"Processing active download {downloadId}: error {downloadClient.Error}, retry count {download.RetryCount}/{RetryCount}");
+
+                        await _downloads.UpdateRetryCount(downloadId, download.RetryCount + 1);
+                        await _torrents.Download(downloadId);
+                    }
+                    else
+                    {
+                        Log.Debug($"Processing active download {downloadId}: error {downloadClient.Error}, not retrying");
+
+                        await _downloads.UpdateError(downloadId, downloadClient.Error);
+                        await _downloads.UpdateCompleted(downloadId, DateTimeOffset.UtcNow);
+                    }
                 }
                 else
                 {
@@ -335,8 +351,8 @@ namespace RdtClient.Service.Services
                 }
 
                 // RealDebrid is waiting for file selection, select which files to download.
-                if (torrent.RdStatus == RealDebridStatus.WaitingForFileSelection || 
-                    (torrent.RdStatus == RealDebridStatus.Finished && torrent.Downloads.Count == 0))
+                if ((torrent.RdStatus == RealDebridStatus.WaitingForFileSelection || torrent.RdStatus == RealDebridStatus.Finished) &&
+                    torrent.Downloads.Count == 0)
                 {
                     Log.Debug($"Torrent {torrent.RdId} selecting files");
 

server/RdtClient.Service/Services/Torrents.cs

@@ -176,7 +176,13 @@ namespace RdtClient.Service.Services
 
             foreach (var file in rdTorrent.Links)
             {
-                await _downloads.Add(torrent.TorrentId, file);
+                // Make sure downloads don't get added multiple times
+                var downloadExists = await _downloads.Get(torrent.TorrentId, file);
+
+                if (downloadExists == null)
+                {
+                    await _downloads.Add(torrent.TorrentId, file);
+                }
             }
         }
 
@@ -201,6 +207,7 @@ namespace RdtClient.Service.Services
 
                 if (deleteData)
                 {
+                    await _torrentData.UpdateComplete(torrent.TorrentId, DateTimeOffset.UtcNow);
                     await _downloads.DeleteForTorrent(torrent.TorrentId);
                     await _torrentData.Delete(torrentId);
                 }