Fixed bug with auto adding of AllDebrid torrents.

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.3] - 2022-01-02
+### Changed
+- Fixed automatic adding of AllDebrid torrents.
+### Added
+- Added update notification.
+
 ## [2.0.2] - 2021-11-24
 ### Changed
 - Fixed update timer for providers.

client/src/app/navbar/navbar.component.html

@@ -55,13 +55,13 @@
           <a class="navbar-item"> Profile </a>
           <a class="navbar-item" (click)="logout()"> Logout </a>
           <hr class="navbar-divider" />
-          <div class="navbar-item">Version 2.0.2</div>
+          <div class="navbar-item">Version 2.0.3</div>
         </div>
       </div>
     </div>
   </div>
 </nav>
-<div class="notification is-warning" *ngIf="profile.latestVersion && profile.currentVersion !== profile.latestVersion">
+<div class="notification is-warning" *ngIf="profile && profile.latestVersion && profile.currentVersion !== profile.latestVersion">
   Version {{ profile.latestVersion }} of RealDebrid Client was found. You are currently on version
   {{ profile.currentVersion }}.
 </div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rdt-client",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "This is a web interface to manage your torrents on Real-Debrid.",
   "main": "index.js",
   "dependencies": {

server/RdtClient.Service/RdtClient.Service.csproj

@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AllDebrid.NET" Version="1.0.3" />
+    <PackageReference Include="AllDebrid.NET" Version="1.0.4" />
     <PackageReference Include="Aria2.NET" Version="1.0.4" />
-    <PackageReference Include="Downloader" Version="2.3.0" />
+    <PackageReference Include="Downloader" Version="2.3.1" />
     <PackageReference Include="MonoTorrent" Version="2.0.3" />
     <PackageReference Include="RD.NET" Version="2.1.0" />
     <PackageReference Include="Serilog" Version="2.10.0" />

server/RdtClient.Service/Services/TorrentClients/AllDebridTorrentClient.cs

@@ -6,10 +6,12 @@ using System.Threading.Tasks;
 using AllDebridNET;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using RDNET;
+using RDNET.Exceptions;
 using RdtClient.Data.Enums;
-using RdtClient.Data.Models.Data;
 using RdtClient.Data.Models.TorrentClient;
 using RdtClient.Service.Helpers;
+using Torrent = RdtClient.Data.Models.Data.Torrent;
 
 namespace RdtClient.Service.Services.TorrentClients
 {
@@ -192,9 +194,20 @@ namespace RdtClient.Service.Services.TorrentClients
                     _ => TorrentStatus.Error
                 };
             }
-            catch (Exception ex)
+            catch (AllDebridException ex)
             {
-                if (ex.Message == "Resource not found")
+                if (ex.ErrorCode == "MAGNET_INVALID_ID")
+                {
+                    torrent.RdStatusRaw = "deleted";
+                }
+                else
+                {
+                    throw;
+                }
+            }
+            catch (RealDebridException ex)
+            {
+                if (ex.ErrorCode == 7)
                 {
                     torrent.RdStatusRaw = "deleted";
                 }

server/RdtClient.Service/Services/Torrents.cs

@@ -370,14 +370,14 @@ namespace RdtClient.Service.Services
                             RdId = rdTorrent.Id
                         };
 
-                        await _torrentClient.UpdateData(newTorrent, rdTorrent);
-
                         if (newTorrent.RdStatus == TorrentStatus.WaitingForFileSelection)
                         {
                             continue;
                         }
 
-                        await _torrentData.Add(rdTorrent.Id, rdTorrent.Hash, null, false, newTorrent);
+                        torrent = await _torrentData.Add(rdTorrent.Id, rdTorrent.Hash, null, false, newTorrent);
+
+                        await UpdateTorrentClientData(torrent, rdTorrent);
                     }
                     else
                     {
@@ -624,23 +624,30 @@ namespace RdtClient.Service.Services
 
         private async Task UpdateTorrentClientData(Torrent torrent, TorrentClientTorrent torrentClientTorrent = null)
         {
-            var originalTorrent = JsonSerializer.Serialize(torrent,
+            try
-                                                           new JsonSerializerOptions
-                                                           {
-                                                               ReferenceHandler = ReferenceHandler.IgnoreCycles
-                                                           });
-
-            await _torrentClient.UpdateData(torrent, torrentClientTorrent);
-            
-            var newTorrent = JsonSerializer.Serialize(torrent,
-                                                      new JsonSerializerOptions
-                                                      {
-                                                          ReferenceHandler = ReferenceHandler.IgnoreCycles
-                                                      });
-
-            if (originalTorrent != newTorrent)
             {
-                await _torrentData.UpdateRdData(torrent);
+                var originalTorrent = JsonSerializer.Serialize(torrent,
+                                                               new JsonSerializerOptions
+                                                               {
+                                                                   ReferenceHandler = ReferenceHandler.IgnoreCycles
+                                                               });
+
+                await _torrentClient.UpdateData(torrent, torrentClientTorrent);
+
+                var newTorrent = JsonSerializer.Serialize(torrent,
+                                                          new JsonSerializerOptions
+                                                          {
+                                                              ReferenceHandler = ReferenceHandler.IgnoreCycles
+                                                          });
+
+                if (originalTorrent != newTorrent)
+                {
+                    await _torrentData.UpdateRdData(torrent);
+                }
+            }
+            catch (Exception ex)
+            {
+                // ignored
             }
         }
 

server/RdtClient.Web/RdtClient.Web.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <UserSecretsId>94c24cba-f03f-4453-a671-3640b517c573</UserSecretsId>
-    <Version>2.0.2</Version>
+    <Version>2.0.3</Version>
   </PropertyGroup>
 
   <ItemGroup>