From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 57974613B6 for ; Fri, 18 Feb 2022 13:49:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4A8A429B4A for ; Fri, 18 Feb 2022 13:48:53 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 52B9329B1B for ; Fri, 18 Feb 2022 13:48:52 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 26B9B4498B for ; Fri, 18 Feb 2022 13:48:52 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 18 Feb 2022 13:48:50 +0100 Message-Id: <20220218124850.573252-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218124850.573252-1-d.csapak@proxmox.com> References: <20220218124850.573252-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.157 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup 1/1] depend on new 'proxmox-compression' crate X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Feb 2022 12:49:23 -0000 the compression utilities live there now Signed-off-by: Dominik Csapak --- pbs-client/Cargo.toml | 1 + pbs-client/src/pxar/extract.rs | 2 +- proxmox-rest-server/Cargo.toml | 1 + proxmox-rest-server/src/rest.rs | 2 +- proxmox-restore-daemon/Cargo.toml | 1 + proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pbs-client/Cargo.toml b/pbs-client/Cargo.toml index 60dc32d3..a61777a6 100644 --- a/pbs-client/Cargo.toml +++ b/pbs-client/Cargo.toml @@ -31,6 +31,7 @@ xdg = "2.2" pathpatterns = "0.1.2" proxmox-async = "0.3" +proxmox-compression = "0.1" proxmox-fuse = "0.1.1" proxmox-http = { version = "0.6", features = [ "client", "http-helpers", "websocket" ] } proxmox-io = { version = "1.0.1", features = [ "tokio" ] } diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs index 8c85dd02..b1f8718e 100644 --- a/pbs-client/src/pxar/extract.rs +++ b/pbs-client/src/pxar/extract.rs @@ -25,7 +25,7 @@ use proxmox_sys::c_result; use proxmox_sys::fs::{create_path, CreateOptions}; use proxmox_io::{sparse_copy, sparse_copy_async}; -use proxmox_async::zip::{ZipEncoder, ZipEntry}; +use proxmox_compression::zip::{ZipEncoder, ZipEntry}; use crate::pxar::dir_stack::PxarDirStack; use crate::pxar::metadata; diff --git a/proxmox-rest-server/Cargo.toml b/proxmox-rest-server/Cargo.toml index 8fbbe8c0..ce863926 100644 --- a/proxmox-rest-server/Cargo.toml +++ b/proxmox-rest-server/Cargo.toml @@ -32,6 +32,7 @@ url = "2.1" #proxmox = "0.15.3" proxmox-async = "0.3" +proxmox-compression = "0.1" proxmox-io = "1" proxmox-lang = "1" proxmox-http = { version = "0.6", features = [ "client" ] } diff --git a/proxmox-rest-server/src/rest.rs b/proxmox-rest-server/src/rest.rs index 093e6226..5194151c 100644 --- a/proxmox-rest-server/src/rest.rs +++ b/proxmox-rest-server/src/rest.rs @@ -30,7 +30,7 @@ use proxmox_schema::{ObjectSchemaType, ParameterSchema}; use proxmox_http::client::RateLimitedStream; -use proxmox_async::compression::{DeflateEncoder, Level}; +use proxmox_compression::{DeflateEncoder, Level}; use proxmox_async::stream::AsyncReaderStream; use crate::{ diff --git a/proxmox-restore-daemon/Cargo.toml b/proxmox-restore-daemon/Cargo.toml index e25f12f7..088372be 100644 --- a/proxmox-restore-daemon/Cargo.toml +++ b/proxmox-restore-daemon/Cargo.toml @@ -27,6 +27,7 @@ pathpatterns = "0.1.2" pxar = { version = "0.10.1", features = [ "tokio-io" ] } proxmox-async = "0.3" +proxmox-compression = "0.1" proxmox-router = { version = "1.1", features = [ "cli" ] } proxmox-schema = { version = "1.1", features = [ "api-macro" ] } proxmox-time = "1" diff --git a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs index 4c755210..1333590d 100644 --- a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs +++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs @@ -18,7 +18,7 @@ use proxmox_router::{ ApiHandler, ApiMethod, ApiResponseFuture, Permission, Router, RpcEnvironment, SubdirMap, }; use proxmox_schema::*; -use proxmox_async::zip::zip_directory; +use proxmox_compression::zip::zip_directory; use proxmox_sys::fs::read_subdir; use proxmox_sys::sortable; -- 2.30.2