From 1817bd75082e164e5f40c9970ad22a5e01cb06b3 Mon Sep 17 00:00:00 2001 From: Roger Far Date: Sun, 7 Jan 2024 12:09:11 -0700 Subject: [PATCH] Add logging. --- CHANGELOG.md | 11 ++++++++--- client/src/app/navbar/navbar.component.html | 2 +- package.json | 2 +- .../Services/Downloaders/SymlinkDownloader.cs | 5 ++++- .../RdtClient.Service/Services/TorrentRunner.cs | 17 ++++++++++++----- server/RdtClient.Web/RdtClient.Web.csproj | 2 +- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c31b848..66c3b03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,16 +4,21 @@ 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.53] - 2024-01-15 +## [2.0.54] - 2024-01-07 +### Changed +- Added some logging for the symlink downloader to troubleshoot. +- Added some logging when deleting torrents and the symlinker overrides the finish action. + +## [2.0.53] - 2024-01-05 ### Added - Add setting to set the download path on the aria2 instance. -## [2.0.52] - 2024-01-15 +## [2.0.52] - 2024-01-05 ### Added - Add BASE_PATH environment variable for the base path setting. - Expose the Post Torrent Download Action setting on the Provider settings. -## [2.0.51] - 2024-01-15 +## [2.0.51] - 2024-01-05 ### Added - Added setting to store magnets and torrents to a directory after adding. - Added bulk settings change on the index pages. diff --git a/client/src/app/navbar/navbar.component.html b/client/src/app/navbar/navbar.component.html index bd62a68..36b6339 100644 --- a/client/src/app/navbar/navbar.component.html +++ b/client/src/app/navbar/navbar.component.html @@ -55,7 +55,7 @@ Profile Logout - Version 2.0.53 + Version 2.0.54 diff --git a/package.json b/package.json index 6336a54..525049e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rdt-client", - "version": "2.0.53", + "version": "2.0.54", "description": "This is a web interface to manage your torrents on Real-Debrid.", "main": "index.js", "dependencies": { diff --git a/server/RdtClient.Service/Services/Downloaders/SymlinkDownloader.cs b/server/RdtClient.Service/Services/Downloaders/SymlinkDownloader.cs index 70c9708..22d86d7 100644 --- a/server/RdtClient.Service/Services/Downloaders/SymlinkDownloader.cs +++ b/server/RdtClient.Service/Services/Downloaders/SymlinkDownloader.cs @@ -24,7 +24,7 @@ public class SymlinkDownloader : IDownloader public Task Download() { - _logger.Debug($"Starting download of {_uri}, writing to path: {_filePath}"); + _logger.Debug($"Starting symlink resolving of {_uri}, writing to path: {_filePath}"); var fileName = Path.GetFileName(_filePath); @@ -56,10 +56,13 @@ public class SymlinkDownloader : IDownloader { DownloadComplete?.Invoke(this, new DownloadCompleteEventArgs()); + _logger.Information($"File {fileName} found on {Settings.Get.DownloadClient.RcloneMountPath} at {actualFilePath}"); return Task.FromResult(actualFilePath); } } + _logger.Information($"File {fileName} not found on {Settings.Get.DownloadClient.RcloneMountPath}!"); + // Return null and try again next cycle. return Task.FromResult(null); } diff --git a/server/RdtClient.Service/Services/TorrentRunner.cs b/server/RdtClient.Service/Services/TorrentRunner.cs index 333745d..bdddf1c 100644 --- a/server/RdtClient.Service/Services/TorrentRunner.cs +++ b/server/RdtClient.Service/Services/TorrentRunner.cs @@ -541,12 +541,19 @@ public class TorrentRunner if (torrent.DownloadClient == Data.Enums.DownloadClient.Symlink) { - torrent.FinishedAction = torrent.FinishedAction switch + switch (torrent.FinishedAction) { - TorrentFinishedAction.RemoveAllTorrents => TorrentFinishedAction.RemoveClient, - TorrentFinishedAction.RemoveRealDebrid => TorrentFinishedAction.None, - _ => torrent.FinishedAction - }; + case TorrentFinishedAction.RemoveAllTorrents: + Log($"Force setting FinishedAction to RemoveClient as download client is Symlink and FinishedAction is RemoveAllTorrents", torrent); + torrent.FinishedAction = TorrentFinishedAction.RemoveClient; + + break; + case TorrentFinishedAction.RemoveRealDebrid: + Log($"Force setting FinishedAction to TorrentFinishedAction.None as download client is Symlink and FinishedAction is RemoveRealDebrid", torrent); + torrent.FinishedAction = TorrentFinishedAction.None; + + break; + } } switch (torrent.FinishedAction) diff --git a/server/RdtClient.Web/RdtClient.Web.csproj b/server/RdtClient.Web/RdtClient.Web.csproj index b2cbb57..dd6f4ec 100644 --- a/server/RdtClient.Web/RdtClient.Web.csproj +++ b/server/RdtClient.Web/RdtClient.Web.csproj @@ -4,7 +4,7 @@ net8.0 Exe 94c24cba-f03f-4453-a671-3640b517c573 - 2.0.53 + 2.0.54 enable enable latest