Merge pull request #896 from winpax/remove-async-vt3

Remove async vt3
winpax · Nov 12, 2024 · ce4132b · ce4132b
2 parents 040fa7f + 802b1aa
commit ce4132b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -100,7 +100,7 @@ sfsu-macros = { version = "0.1.0", path = "./macros" }
 shadow-rs = "0.35"
 sprinkles-rs.workspace = true
 tokio = { version = "1.37", features = ["full"] }
-vt3 = { git = "https://github.com/winpax/vt3.git", version = "0.8", package = "async_vt3" }
+vt3 = "0.7.3"
 which = "7.0"
 windows = { version = "0.58", features = ["Win32_Storage_FileSystem"] }
 windows-version = "0.1"

diff --git a/src/commands/virustotal.rs b/src/commands/virustotal.rs
@@ -197,7 +197,11 @@ impl super::Command for Args {
 
                     let result = match search_type {
                         SearchType::FileHash(hash) => {
-                            let result = client.file_info(&hash.to_string()).await.recoverable();
+                            let result = tokio::task::spawn_blocking(move || {
+                                client.file_info(&hash.to_string())
+                            })
+                            .await?
+                            .recoverable();
 
                             if let Some(result) = result {
                                 serde_json::to_value(result?)?
@@ -206,7 +210,9 @@ impl super::Command for Args {
                             }
                         }
                         SearchType::Url(url) => {
-                            let result = client.url_info(&url).await.recoverable();
+                            let result = tokio::task::spawn_blocking(move || client.url_info(&url))
+                                .await?
+                                .recoverable();
 
                             if let Some(result) = result {
                                 serde_json::to_value(result?)?