diff --git a/CHANGELOG.md b/CHANGELOG.md index 16d7ce2..ab51618 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased +## [2.0.123] - 2026-02-21 +### Changed +- Reverted SharpCompress to 0.42.1 due to file locking issues. + ## [2.0.122] - 2026-02-21 ### Added - Sort torrents by added date by default, remember sort order in the browser. diff --git a/server/RdtClient.Service.Test/RdtClient.Service.Test.csproj b/server/RdtClient.Service.Test/RdtClient.Service.Test.csproj index a105272..37f006d 100644 --- a/server/RdtClient.Service.Test/RdtClient.Service.Test.csproj +++ b/server/RdtClient.Service.Test/RdtClient.Service.Test.csproj @@ -17,6 +17,7 @@ + diff --git a/server/RdtClient.Service/RdtClient.Service.csproj b/server/RdtClient.Service/RdtClient.Service.csproj index 00172d1..cbe7121 100644 --- a/server/RdtClient.Service/RdtClient.Service.csproj +++ b/server/RdtClient.Service/RdtClient.Service.csproj @@ -21,7 +21,7 @@ - + diff --git a/server/RdtClient.Service/Services/UnpackClient.cs b/server/RdtClient.Service/Services/UnpackClient.cs index 077b45c..fe35dc8 100644 --- a/server/RdtClient.Service/Services/UnpackClient.cs +++ b/server/RdtClient.Service/Services/UnpackClient.cs @@ -5,7 +5,6 @@ using RdtClient.Service.Services.DebridClients; using SharpCompress.Archives; using SharpCompress.Archives.Rar; using SharpCompress.Archives.Zip; -using SharpCompress.Common; namespace RdtClient.Service.Services; @@ -129,11 +128,11 @@ public class UnpackClient(Download download, String destinationPath) if (extension == ".zip") { - archive = ZipArchive.OpenArchive(stream); + archive = ZipArchive.Open(stream); } else { - archive = RarArchive.OpenArchive(stream); + archive = RarArchive.Open(stream); } var entries = archive.Entries @@ -158,18 +157,19 @@ public class UnpackClient(Download download, String destinationPath) if (extension == ".zip") { - archive = ZipArchive.OpenArchive(fi); + archive = ZipArchive.Open(fi); } else { - archive = RarArchive.OpenArchive(fi); + archive = RarArchive.Open(fi); } - archive.WriteToDirectory(extractPath, - new Progress(d => - { - Progess = (Int32)Math.Round(d.PercentComplete ?? 0); - })); + archive.ExtractToDirectory(extractPath, + d => + { + Progess = (Int32)Math.Round(d); + }, + cancellationToken: cancellationToken); archive.Dispose(); diff --git a/server/RdtClient.Web.Test/RdtClient.Web.Test.csproj b/server/RdtClient.Web.Test/RdtClient.Web.Test.csproj index bd21e55..09b60e8 100644 --- a/server/RdtClient.Web.Test/RdtClient.Web.Test.csproj +++ b/server/RdtClient.Web.Test/RdtClient.Web.Test.csproj @@ -12,6 +12,7 @@ + all diff --git a/server/RdtClient.Web/RdtClient.Web.csproj b/server/RdtClient.Web/RdtClient.Web.csproj index ea8be9a..4169c40 100644 --- a/server/RdtClient.Web/RdtClient.Web.csproj +++ b/server/RdtClient.Web/RdtClient.Web.csproj @@ -41,6 +41,7 @@ +