From 58a6fafbc2cbee71e88d7ba1c5dc06332a3a58c2 Mon Sep 17 00:00:00 2001 From: Roger Far Date: Thu, 11 Feb 2021 19:54:08 -0700 Subject: [PATCH] Fixed issue with the filenames not working when unpacking. --- server/RdtClient.Service/Services/TorrentRunner.cs | 4 ++++ server/RdtClient.Service/Services/UnpackClient.cs | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/server/RdtClient.Service/Services/TorrentRunner.cs b/server/RdtClient.Service/Services/TorrentRunner.cs index 5b308db..4494d30 100644 --- a/server/RdtClient.Service/Services/TorrentRunner.cs +++ b/server/RdtClient.Service/Services/TorrentRunner.cs @@ -3,6 +3,7 @@ using System.Collections.Concurrent; using System.IO; using System.Linq; using System.Threading.Tasks; +using System.Web; using RdtClient.Data.Enums; using RdtClient.Service.Helpers; @@ -211,6 +212,9 @@ namespace RdtClient.Service.Services // Check if the unpacking process is even needed var uri = new Uri(download.Link); var fileName = uri.Segments.Last(); + + fileName = HttpUtility.UrlDecode(fileName); + var extension = Path.GetExtension(fileName); if (extension != ".rar") diff --git a/server/RdtClient.Service/Services/UnpackClient.cs b/server/RdtClient.Service/Services/UnpackClient.cs index 246f143..ae0ac96 100644 --- a/server/RdtClient.Service/Services/UnpackClient.cs +++ b/server/RdtClient.Service/Services/UnpackClient.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; +using System.Web; using RdtClient.Data.Models.Data; using SharpCompress.Archives; using SharpCompress.Archives.Rar; @@ -53,6 +54,9 @@ namespace RdtClient.Service.Services var torrentPath = Path.Combine(_destinationPath, _torrent.RdName); var fileName = uri.Segments.Last(); + + fileName = HttpUtility.UrlDecode(fileName); + var filePath = Path.Combine(torrentPath, fileName); if (!File.Exists(filePath))