From e5c333861c22ab4569efd8278a5f4fb6f6cd98d6 Mon Sep 17 00:00:00 2001 From: Cyrix126 Date: Fri, 11 Oct 2024 17:15:24 +0200 Subject: [PATCH] fix: 0B database size on Windows --- src/helper/node.rs | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/helper/node.rs b/src/helper/node.rs index 96bd0ce..868a64e 100644 --- a/src/helper/node.rs +++ b/src/helper/node.rs @@ -1,15 +1,16 @@ +use enclose::enc; +use log::{debug, error, info, warn}; +use readable::byte::Byte; +use reqwest::Client; +use serde::{Deserialize, Serialize}; +#[cfg(target_os = "windows")] +use std::fs::Metadata; use std::{ path::Path, sync::{Arc, Mutex}, thread, time::{Duration, Instant}, }; - -use enclose::enc; -use log::{debug, error, info, warn}; -use readable::byte::Byte; -use reqwest::Client; -use serde::{Deserialize, Serialize}; use tokio::spawn; use crate::{ @@ -397,6 +398,15 @@ impl PrivNodeApi { state: &Node, ) -> std::result::Result { let adr = format!("http://{}:{}/json_rpc", state.api_ip, state.api_port); + #[cfg(target_os = "windows")] + let mut private = client + .post(adr) + .body(r#"{"jsonrpc":"2.0","id":"0","method":"get_info"}"#) + .send() + .await? + .json::() + .await?; + #[cfg(not(target_os = "windows"))] let private = client .post(adr) .body(r#"{"jsonrpc":"2.0","id":"0","method":"get_info"}"#) @@ -404,6 +414,14 @@ impl PrivNodeApi { .await? .json::() .await?; + #[cfg(target_os = "windows")] + // api returns 0 for DB size for Windows so we read the size directly from the filesystem. + // https://github.com/monero-project/monero/issues/9513 + { + private.result.database_size = std::fs::metadata(state.path_db) + .unwrap_or(".bitmonero") + .st_size(); + } Ok(private) } }