move src/tools/compression.rs to proxmox-rest-server crate

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/proxmox-rest-server/src/compression.rs b/proxmox-rest-server/src/compression.rs
new file mode 100644 (file)
index 0000000..19626ef
--- /dev/null
+++ b/proxmox-rest-server/src/compression.rs
@@ -0,0 +1,39 @@
+use anyhow::{bail, Error};
+use hyper::header;
+
+/// Possible Compression Methods, order determines preference (later is preferred)
+#[derive(Eq, Ord, PartialEq, PartialOrd, Debug)]
+pub enum CompressionMethod {
+    Deflate,
+//    Gzip,
+//    Brotli,
+}
+
+impl CompressionMethod {
+    pub fn content_encoding(&self) -> header::HeaderValue {
+        header::HeaderValue::from_static(self.extension())
+    }
+
+    pub fn extension(&self) -> &'static str {
+        match *self {
+//            CompressionMethod::Brotli => "br",
+//            CompressionMethod::Gzip => "gzip",
+            CompressionMethod::Deflate => "deflate",
+        }
+    }
+}
+
+impl std::str::FromStr for CompressionMethod {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+//            "br" => Ok(CompressionMethod::Brotli),
+//            "gzip" => Ok(CompressionMethod::Gzip),
+            "deflate" => Ok(CompressionMethod::Deflate),
+            // http accept-encoding allows to give weights with ';q='
+            other if other.starts_with("deflate;q=") => Ok(CompressionMethod::Deflate),
+            _ => bail!("unknown compression format"),
+        }
+    }
+}

diff --git a/proxmox-rest-server/src/lib.rs b/proxmox-rest-server/src/lib.rs
index bc8334ba696cb9f883e83edcc32c167f8344630a..069d80b4e413d2a81eacf665001357d70bb432dc 100644 (file)
--- a/proxmox-rest-server/src/lib.rs
+++ b/proxmox-rest-server/src/lib.rs
@@ -4,6 +4,9 @@ use anyhow::{bail, format_err, Error};
 
 use proxmox::tools::fd::Fd;
 
+mod compression;
+pub use compression::*;
+
 pub mod daemon;
 pub mod formatter;
 

diff --git a/src/server/rest.rs b/src/server/rest.rs
index 8beecb5527568510600a94a38a89e83779fa2681..7e2e645c514a7fd4165a9ac41a1757bf0b44b773 100644 (file)
--- a/src/server/rest.rs
+++ b/src/server/rest.rs
@@ -34,13 +34,15 @@ use proxmox::tools::fs::CreateOptions;
 use pbs_tools::compression::{DeflateEncoder, Level};
 use pbs_tools::stream::AsyncReaderStream;
 use pbs_api_types::{Authid, Userid};
-use proxmox_rest_server::{ApiConfig, FileLogger, FileLogOptions, AuthError, RestEnvironment};
+use proxmox_rest_server::{
+    ApiConfig, FileLogger, FileLogOptions, AuthError, RestEnvironment, CompressionMethod,
+};
 use proxmox_rest_server::formatter::*;
 
-use crate::auth_helpers::*;
 use pbs_config::CachedUserInfo;
+
+use crate::auth_helpers::*;
 use crate::tools;
-use crate::tools::compression::CompressionMethod;
 
 extern "C" {
     fn tzset();

diff --git a/src/tools/compression.rs b/src/tools/compression.rs
deleted file mode 100644 (file)
index 19626ef..0000000
--- a/src/tools/compression.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use anyhow::{bail, Error};
-use hyper::header;
-
-/// Possible Compression Methods, order determines preference (later is preferred)
-#[derive(Eq, Ord, PartialEq, PartialOrd, Debug)]
-pub enum CompressionMethod {
-    Deflate,
-//    Gzip,
-//    Brotli,
-}
-
-impl CompressionMethod {
-    pub fn content_encoding(&self) -> header::HeaderValue {
-        header::HeaderValue::from_static(self.extension())
-    }
-
-    pub fn extension(&self) -> &'static str {
-        match *self {
-//            CompressionMethod::Brotli => "br",
-//            CompressionMethod::Gzip => "gzip",
-            CompressionMethod::Deflate => "deflate",
-        }
-    }
-}
-
-impl std::str::FromStr for CompressionMethod {
-    type Err = Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-//            "br" => Ok(CompressionMethod::Brotli),
-//            "gzip" => Ok(CompressionMethod::Gzip),
-            "deflate" => Ok(CompressionMethod::Deflate),
-            // http accept-encoding allows to give weights with ';q='
-            other if other.starts_with("deflate;q=") => Ok(CompressionMethod::Deflate),
-            _ => bail!("unknown compression format"),
-        }
-    }
-}

diff --git a/src/tools/mod.rs b/src/tools/mod.rs
index 8fd441b5bb699e8a67b29ca3fd852441517e4ded..f2576b08ad1b4b1c9da54635dba4128b8aa2949f 100644 (file)
--- a/src/tools/mod.rs
+++ b/src/tools/mod.rs
@@ -14,7 +14,6 @@ use proxmox_http::{
 
 pub mod apt;
 pub mod async_io;
-pub mod compression;
 pub mod config;
 pub mod disks;