update to first proxmox crate split

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

pbs-client/Cargo.toml

@@ -28,9 +28,14 @@ tower-service = "0.3.0"
 xdg = "2.2"
 
 pathpatterns = "0.1.2"
-proxmox = { version = "0.14.0", default-features = false, features = [ "cli" ] }
+proxmox = "0.14.0"
 proxmox-fuse = "0.1.1"
 proxmox-http = { version = "0.5.0", features = [ "client", "http-helpers", "websocket" ] }
+proxmox-io = { version = "1", features = [ "tokio" ] }
+proxmox-lang = "1"
+proxmox-router = { version = "1", features = [ "cli" ] }
+proxmox-schema = "1"
+proxmox-time = "1"
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 
 pbs-api-types = { path = "../pbs-api-types" }

pbs-client/src/backup_specification.rs

@@ -1,8 +1,8 @@
 use anyhow::{bail, Error};
 
-use proxmox::api::schema::*;
+use proxmox_schema::*;
 
-proxmox::const_regex! {
+const_regex! {
     BACKUPSPEC_REGEX = r"^([a-zA-Z0-9_-]+\.(pxar|img|conf|log)):(.+)$";
 }
 

pbs-client/src/catalog_shell.rs

@@ -13,9 +13,9 @@ use nix::fcntl::OFlag;
 use nix::sys::stat::Mode;
 
 use pathpatterns::{MatchEntry, MatchList, MatchPattern, MatchType, PatternFlag};
-use proxmox::api::api;
-use proxmox::api::cli::{self, CliCommand, CliCommandMap, CliHelper, CommandLineInterface};
 use proxmox::tools::fs::{create_path, CreateOptions};
+use proxmox_router::cli::{self, CliCommand, CliCommandMap, CliHelper, CommandLineInterface};
+use proxmox_schema::api;
 use pxar::{EntryKind, Metadata};
 
 use pbs_runtime::block_in_place;

pbs-client/src/http_client.rs

@@ -15,10 +15,10 @@ use percent_encoding::percent_encode;
 use xdg::BaseDirectories;
 
 use proxmox::{
-    api::error::HttpError,
     sys::linux::tty,
     tools::fs::{file_get_json, replace_file, CreateOptions},
 };
+use proxmox_router::HttpError;
 
 use proxmox_http::client::HttpsConnector;
 use proxmox_http::uri::build_authority;
@@ -230,7 +230,7 @@ fn store_ticket_info(prefix: &str, server: &str, username: &str, ticket: &str, t
 
     let mut data = file_get_json(&path, Some(json!({})))?;
 
-    let now = proxmox::tools::time::epoch_i64();
+    let now = proxmox_time::epoch_i64();
 
     data[server][username] = json!({ "timestamp": now, "ticket": ticket, "token": token});
 
@@ -261,7 +261,7 @@ fn load_ticket_info(prefix: &str, server: &str, userid: &Userid) -> Option<(Stri
     // usually /run/user/<uid>/...
     let path = base.place_runtime_file("tickets").ok()?;
     let data = file_get_json(&path, None).ok()?;
-    let now = proxmox::tools::time::epoch_i64();
+    let now = proxmox_time::epoch_i64();
     let ticket_lifetime = ticket::TICKET_LIFETIME - 60;
     let uinfo = data[server][userid.as_str()].as_object()?;
     let timestamp = uinfo["timestamp"].as_i64()?;

pbs-client/src/pxar/create.rs

@@ -19,11 +19,11 @@ use pathpatterns::{MatchEntry, MatchFlag, MatchList, MatchType, PatternFlag};
 use pxar::Metadata;
 use pxar::encoder::{SeqWrite, LinkOffset};
 
-use proxmox::c_str;
 use proxmox::sys::error::SysError;
 use proxmox::tools::fd::RawFdNum;
-use proxmox::tools::vec;
 use proxmox::tools::fd::Fd;
+use proxmox_io::vec;
+use proxmox_lang::c_str;
 
 use pbs_datastore::catalog::BackupCatalogWriter;
 use pbs_tools::{acl, fs, xattr};

pbs-client/src/pxar/extract.rs

@@ -22,10 +22,8 @@ use pxar::format::Device;
 use pxar::{Entry, EntryKind, Metadata};
 
 use proxmox::c_result;
-use proxmox::tools::{
-    fs::{create_path, CreateOptions},
-    io::{sparse_copy, sparse_copy_async},
-};
+use proxmox::tools::fs::{create_path, CreateOptions};
+use proxmox_io::{sparse_copy, sparse_copy_async};
 
 use pbs_tools::zip::{ZipEncoder, ZipEntry};
 

pbs-client/src/pxar/fuse.rs

@@ -20,7 +20,7 @@ use futures::select;
 use futures::sink::SinkExt;
 use futures::stream::{StreamExt, TryStreamExt};
 
-use proxmox::tools::vec;
+use proxmox_io::vec;
 use pxar::accessor::{self, EntryRangeInfo, ReadAt};
 
 use proxmox_fuse::requests::{self, FuseRequest};

pbs-client/src/pxar/tools.rs

@@ -115,7 +115,7 @@ fn mode_string(entry: &Entry) -> String {
 }
 
 fn format_mtime(mtime: &StatxTimestamp) -> String {
-    if let Ok(s) = proxmox::tools::time::strftime_local("%Y-%m-%d %H:%M:%S", mtime.secs) {
+    if let Ok(s) = proxmox_time::strftime_local("%Y-%m-%d %H:%M:%S", mtime.secs) {
         return s;
     }
     format!("{}.{}", mtime.secs, mtime.nanos)

pbs-client/src/task_log.rs

@@ -5,7 +5,7 @@ use serde_json::{json, Value};
 use tokio::signal::unix::{signal, SignalKind};
 use futures::*;
 
-use proxmox::api::cli::format_and_print_result;
+use proxmox_router::cli::format_and_print_result;
 
 use pbs_tools::percent_encoding::percent_encode_component;
 

pbs-client/src/tools/key_source.rs

@@ -6,9 +6,9 @@ use std::io::Read;
 use anyhow::{bail, format_err, Error};
 use serde_json::Value;
 
-use proxmox::api::schema::*;
 use proxmox::sys::linux::tty;
 use proxmox::tools::fs::file_get_contents;
+use proxmox_schema::*;
 
 use pbs_api_types::CryptMode;
 

pbs-client/src/tools/mod.rs

@@ -10,11 +10,9 @@ use anyhow::{bail, format_err, Context, Error};
 use serde_json::{json, Value};
 use xdg::BaseDirectories;
 
-use proxmox::{
-    api::schema::*,
-    api::cli::shellword_split,
-    tools::fs::file_get_json,
-};
+use proxmox_schema::*;
+use proxmox_router::cli::shellword_split;
+use proxmox::tools::fs::file_get_json;
 
 use pbs_api_types::{BACKUP_REPO_URL, Authid, UserWithTokens};
 use pbs_datastore::BackupDir;

pbs-client/src/vsock_client.rs

@@ -13,7 +13,7 @@ use serde_json::Value;
 use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt, ReadBuf};
 use tokio::net::UnixStream;
 
-use proxmox::api::error::HttpError;
+use proxmox_router::HttpError;
 
 pub const DEFAULT_VSOCK_PORT: u16 = 807;