From c7bce99fae6be5b32dc2cca820d093aa324ad52d Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Wed, 28 Aug 2024 22:43:52 -0700 Subject: [PATCH 1/4] app_store: use fixed vfs::open_dir --- Cargo.lock | 62 +++++++++---------- kinode/packages/app_store/chain/Cargo.toml | 2 +- .../packages/app_store/downloads/Cargo.toml | 2 +- .../packages/app_store/downloads/src/lib.rs | 4 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 044df8212..ddcc76f6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,7 +78,7 @@ name = "alias" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "wit-bindgen", @@ -983,7 +983,7 @@ dependencies = [ "alloy-sol-types", "anyhow", "bincode", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "rand 0.8.5", "serde", "serde_json", @@ -1353,7 +1353,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "url", @@ -1516,7 +1516,7 @@ name = "cat" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "wit-bindgen", @@ -1580,7 +1580,7 @@ dependencies = [ "alloy-sol-types", "anyhow", "bincode", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?branch=develop)", + "kinode_process_lib 0.9.0", "rand 0.8.5", "serde", "serde_json", @@ -1598,7 +1598,7 @@ version = "0.2.1" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "pleco", "serde", "serde_json", @@ -2333,7 +2333,7 @@ name = "download" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "wit-bindgen", @@ -2344,7 +2344,7 @@ name = "downloads" version = "0.5.0" dependencies = [ "anyhow", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?branch=develop)", + "kinode_process_lib 0.9.1", "rand 0.8.5", "serde", "serde_json", @@ -2380,7 +2380,7 @@ dependencies = [ name = "echo" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "wit-bindgen", ] @@ -2609,7 +2609,7 @@ version = "0.2.0" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "rand 0.8.5", "serde", "serde_json", @@ -2762,7 +2762,7 @@ dependencies = [ name = "get_block" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "wit-bindgen", @@ -2825,7 +2825,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" name = "globe" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "url", @@ -2952,7 +2952,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" name = "help" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "wit-bindgen", ] @@ -2981,7 +2981,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" name = "hi" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "wit-bindgen", @@ -3002,7 +3002,7 @@ version = "0.1.1" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "wit-bindgen", @@ -3330,7 +3330,7 @@ name = "install" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "wit-bindgen", @@ -3506,7 +3506,7 @@ name = "kfetch" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "rmp-serde", "serde", "serde_json", @@ -3518,7 +3518,7 @@ name = "kill" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "wit-bindgen", @@ -3635,8 +3635,8 @@ dependencies = [ [[package]] name = "kinode_process_lib" -version = "0.9.0" -source = "git+https://github.com/kinode-dao/process_lib?branch=develop#5c1d8ed36cf10688808c09357ef0e43225396097" +version = "0.9.1" +source = "git+https://github.com/kinode-dao/process_lib?rev=631d346#631d346ccf879b854ebc9b47f4c2cd71cf2f1771" dependencies = [ "alloy 0.1.4", "alloy-primitives", @@ -3727,7 +3727,7 @@ dependencies = [ "alloy-sol-types", "anyhow", "hex", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "rmp-serde", "serde", "serde_json", @@ -3943,7 +3943,7 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "regex", "serde", "serde_json", @@ -4104,7 +4104,7 @@ dependencies = [ name = "net_diagnostics" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "rmp-serde", "serde", "wit-bindgen", @@ -4417,7 +4417,7 @@ dependencies = [ name = "peer" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "rmp-serde", "serde", "wit-bindgen", @@ -4427,7 +4427,7 @@ dependencies = [ name = "peers" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "rmp-serde", "serde", "wit-bindgen", @@ -5442,7 +5442,7 @@ dependencies = [ "anyhow", "base64 0.22.1", "bincode", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "rmp-serde", "serde", "serde_json", @@ -5660,7 +5660,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" name = "state" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "wit-bindgen", @@ -5854,7 +5854,7 @@ version = "0.1.1" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "rand 0.8.5", "regex", "serde", @@ -5868,7 +5868,7 @@ version = "0.1.1" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "process_macros", "serde", "serde_json", @@ -6125,7 +6125,7 @@ version = "0.2.0" dependencies = [ "anyhow", "clap", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "wit-bindgen", @@ -6442,7 +6442,7 @@ name = "uninstall" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.9.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.9.0)", + "kinode_process_lib 0.9.0", "serde", "serde_json", "wit-bindgen", diff --git a/kinode/packages/app_store/chain/Cargo.toml b/kinode/packages/app_store/chain/Cargo.toml index 58baae62b..ab5568342 100644 --- a/kinode/packages/app_store/chain/Cargo.toml +++ b/kinode/packages/app_store/chain/Cargo.toml @@ -11,7 +11,7 @@ alloy-primitives = "0.7.6" alloy-sol-types = "0.7.6" anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", branch = "develop" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.9.0" } rand = "0.8" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/kinode/packages/app_store/downloads/Cargo.toml b/kinode/packages/app_store/downloads/Cargo.toml index 83961220e..ea15c9d35 100644 --- a/kinode/packages/app_store/downloads/Cargo.toml +++ b/kinode/packages/app_store/downloads/Cargo.toml @@ -8,7 +8,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", branch = "develop" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "631d346" } rand = "0.8" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/kinode/packages/app_store/downloads/src/lib.rs b/kinode/packages/app_store/downloads/src/lib.rs index 4048bede4..4c702d904 100644 --- a/kinode/packages/app_store/downloads/src/lib.rs +++ b/kinode/packages/app_store/downloads/src/lib.rs @@ -553,9 +553,9 @@ fn open_or_create_file(path: &str) -> anyhow::Result { /// helper function for vfs directories, open if exists, if not create fn open_or_create_dir(path: &str) -> anyhow::Result { - match vfs::open_dir(path, true, None) { + match vfs::open_dir(path, false, None) { Ok(dir) => Ok(dir), - Err(_) => match vfs::open_dir(path, false, None) { + Err(_) => match vfs::open_dir(path, true, None) { Ok(dir) => Ok(dir), Err(_) => Err(anyhow::anyhow!("could not create dir")), }, From 24ee4376d54b4997df570634c46d6ad57e02466d Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Wed, 28 Aug 2024 22:45:51 -0700 Subject: [PATCH 2/4] app_store: fix ft_worker as well --- kinode/packages/app_store/ft_worker/Cargo.toml | 2 +- kinode/packages/app_store/ft_worker/src/lib.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kinode/packages/app_store/ft_worker/Cargo.toml b/kinode/packages/app_store/ft_worker/Cargo.toml index a0dc30f46..14d33036a 100644 --- a/kinode/packages/app_store/ft_worker/Cargo.toml +++ b/kinode/packages/app_store/ft_worker/Cargo.toml @@ -9,7 +9,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.9.0" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "631d346" } rand = "0.8" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/kinode/packages/app_store/ft_worker/src/lib.rs b/kinode/packages/app_store/ft_worker/src/lib.rs index ae21f1458..60a67fd6c 100644 --- a/kinode/packages/app_store/ft_worker/src/lib.rs +++ b/kinode/packages/app_store/ft_worker/src/lib.rs @@ -313,9 +313,9 @@ fn open_or_create_file(path: &str) -> anyhow::Result { /// helper function for vfs directories, open if exists, if not create fn open_or_create_dir(path: &str) -> anyhow::Result { - match open_dir(path, true, None) { + match vfs::open_dir(path, false, None) { Ok(dir) => Ok(dir), - Err(_) => match open_dir(path, false, None) { + Err(_) => match vfs::open_dir(path, true, None) { Ok(dir) => Ok(dir), Err(_) => Err(anyhow::anyhow!("could not create dir")), }, From b7dd9716461166b212653030a3a7620d4889cf3f Mon Sep 17 00:00:00 2001 From: bitful-pannul Date: Thu, 29 Aug 2024 22:58:47 +0300 Subject: [PATCH 3/4] app_store: use new fixed vfs processlib --- Cargo.lock | 4 +-- .../packages/app_store/downloads/Cargo.toml | 2 +- .../packages/app_store/downloads/src/lib.rs | 34 ++++--------------- .../packages/app_store/ft_worker/Cargo.toml | 2 +- .../packages/app_store/ft_worker/src/lib.rs | 34 ++++--------------- 5 files changed, 16 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ddcc76f6b..f6a873dd8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2609,7 +2609,7 @@ version = "0.2.0" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.9.0", + "kinode_process_lib 0.9.1", "rand 0.8.5", "serde", "serde_json", @@ -3636,7 +3636,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.9.1" -source = "git+https://github.com/kinode-dao/process_lib?rev=631d346#631d346ccf879b854ebc9b47f4c2cd71cf2f1771" +source = "git+https://github.com/kinode-dao/process_lib?rev=1c495ad#1c495ad8687dd580aa2aa2222f8e7958679220a6" dependencies = [ "alloy 0.1.4", "alloy-primitives", diff --git a/kinode/packages/app_store/downloads/Cargo.toml b/kinode/packages/app_store/downloads/Cargo.toml index ea15c9d35..5831a7711 100644 --- a/kinode/packages/app_store/downloads/Cargo.toml +++ b/kinode/packages/app_store/downloads/Cargo.toml @@ -8,7 +8,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "631d346" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "1c495ad" } rand = "0.8" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/kinode/packages/app_store/downloads/src/lib.rs b/kinode/packages/app_store/downloads/src/lib.rs index 4c702d904..0d46459cf 100644 --- a/kinode/packages/app_store/downloads/src/lib.rs +++ b/kinode/packages/app_store/downloads/src/lib.rs @@ -14,7 +14,7 @@ use kinode_process_lib::{ await_message, call_init, get_blob, get_state, http::client, print_to_terminal, println, set_state, - vfs::{self, Directory, File}, + vfs::{self, Directory}, Address, Message, PackageId, ProcessId, Request, Response, }; use serde::{Deserialize, Serialize}; @@ -74,8 +74,8 @@ fn init(our: Address) { .expect("could not create /downloads drive"); let mut downloads = - open_or_create_dir("/app_store:sys/downloads").expect("could not open downloads"); - let mut tmp = open_or_create_dir("/app_store:sys/downloads/tmp").expect("could not open tmp"); + vfs::open_dir("/app_store:sys/downloads", true, None).expect("could not open downloads"); + let mut tmp = vfs::open_dir("/app_store:sys/downloads/tmp", true, None).expect("could not open tmp"); let mut auto_updates: HashSet<(PackageId, String)> = HashSet::new(); @@ -291,7 +291,7 @@ fn handle_message( downloads.path, add_req.package_id.clone().to_process_lib().to_string() ); - let _ = open_or_create_dir(&package_dir)?; + let _ = vfs::open_dir(&package_dir, true, None)?; // Write the zip file let zip_path = format!("{}/{}.zip", package_dir, add_req.version_hash); @@ -439,7 +439,7 @@ fn handle_receive_http_download( let bytes = get_blob().ok_or(DownloadError::BlobNotFound)?.bytes; let package_dir = format!("{}/{}", "/app_store:sys/downloads", package_id.to_string()); - let _ = open_or_create_dir(&package_dir).map_err(|_| DownloadError::VfsError)?; + let _ = vfs::open_dir(&package_dir, true, None).map_err(|_| DownloadError::VfsError)?; let calculated_hash = format!("{:x}", Sha256::digest(&bytes)); if calculated_hash != version_hash { @@ -519,7 +519,7 @@ fn extract_and_write_manifest(file_contents: &[u8], manifest_path: &str) -> anyh let mut contents = String::new(); file.read_to_string(&mut contents)?; - let manifest_file = open_or_create_file(&manifest_path)?; + let manifest_file = vfs::open_file(&manifest_path, true, None)?; manifest_file.write(contents.as_bytes())?; print_to_terminal(1, &format!("Extracted and wrote manifest.json")); @@ -540,28 +540,6 @@ fn get_manifest_hash(package_id: PackageId, version_hash: String) -> anyhow::Res Ok(manifest_hash) } -/// helper function for vfs files, open if exists, if not create -fn open_or_create_file(path: &str) -> anyhow::Result { - match vfs::open_file(path, false, None) { - Ok(file) => Ok(file), - Err(_) => match vfs::open_file(path, true, None) { - Ok(file) => Ok(file), - Err(_) => Err(anyhow::anyhow!("could not create file")), - }, - } -} - -/// helper function for vfs directories, open if exists, if not create -fn open_or_create_dir(path: &str) -> anyhow::Result { - match vfs::open_dir(path, false, None) { - Ok(dir) => Ok(dir), - Err(_) => match vfs::open_dir(path, true, None) { - Ok(dir) => Ok(dir), - Err(_) => Err(anyhow::anyhow!("could not create dir")), - }, - } -} - /// generate a Keccak-256 hash string (with 0x prefix) of the metadata bytes pub fn keccak_256_hash(bytes: &[u8]) -> String { use sha3::{Digest, Keccak256}; diff --git a/kinode/packages/app_store/ft_worker/Cargo.toml b/kinode/packages/app_store/ft_worker/Cargo.toml index 14d33036a..a15e0bc0c 100644 --- a/kinode/packages/app_store/ft_worker/Cargo.toml +++ b/kinode/packages/app_store/ft_worker/Cargo.toml @@ -9,7 +9,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "631d346" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "1c495ad" } rand = "0.8" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/kinode/packages/app_store/ft_worker/src/lib.rs b/kinode/packages/app_store/ft_worker/src/lib.rs index 60a67fd6c..a3e96762f 100644 --- a/kinode/packages/app_store/ft_worker/src/lib.rs +++ b/kinode/packages/app_store/ft_worker/src/lib.rs @@ -5,7 +5,7 @@ use crate::kinode::process::downloads::{ use kinode_process_lib::*; use kinode_process_lib::{ print_to_terminal, println, timer, - vfs::{open_dir, open_file, Directory, File, SeekFrom}, + vfs::{File, SeekFrom}, }; use sha2::{Digest, Sha256}; use std::io::Read; @@ -102,7 +102,7 @@ fn handle_sender(worker: &str, package_id: &PackageId, version_hash: &str) -> an package_id.package_name, package_id.publisher_node, version_hash ); - let mut file = open_file(&filename, false, None)?; + let mut file = vfs::open_file(&filename, false, None)?; let size = file.metadata()?.len; let num_chunks = (size as f64 / CHUNK_SIZE as f64).ceil() as u64; @@ -129,15 +129,15 @@ fn handle_receiver( ) -> anyhow::Result<()> { // TODO: write to a temporary location first, then check hash as we go, then rename to final location. - let package_dir = open_or_create_dir(&format!( + let package_dir = vfs::open_dir(&format!( "/app_store:sys/downloads/{}:{}/", package_id.package_name, package_id.publisher(), - ))?; + ), true, None)?; let timer_address = Address::from_str("our@timer:distro:sys")?; - let mut file = open_or_create_file(&format!("{}{}.zip", &package_dir.path, version_hash))?; + let mut file = vfs::open_file(&format!("{}{}.zip", &package_dir.path, version_hash), true, None)?; let mut size: Option = None; let mut hasher = Sha256::new(); @@ -289,7 +289,7 @@ fn extract_and_write_manifest(file_contents: &[u8], manifest_path: &str) -> anyh let mut contents = String::new(); file.read_to_string(&mut contents)?; - let manifest_file = open_or_create_file(&manifest_path)?; + let manifest_file = vfs::open_file(&manifest_path, true, None)?; manifest_file.write(contents.as_bytes())?; print_to_terminal(1, "Extracted and wrote manifest.json"); @@ -300,28 +300,6 @@ fn extract_and_write_manifest(file_contents: &[u8], manifest_path: &str) -> anyh Ok(()) } -/// helper function for vfs files, open if exists, if not create -fn open_or_create_file(path: &str) -> anyhow::Result { - match open_file(path, false, None) { - Ok(file) => Ok(file), - Err(_) => match open_file(path, true, None) { - Ok(file) => Ok(file), - Err(_) => Err(anyhow::anyhow!("could not create file")), - }, - } -} - -/// helper function for vfs directories, open if exists, if not create -fn open_or_create_dir(path: &str) -> anyhow::Result { - match vfs::open_dir(path, false, None) { - Ok(dir) => Ok(dir), - Err(_) => match vfs::open_dir(path, true, None) { - Ok(dir) => Ok(dir), - Err(_) => Err(anyhow::anyhow!("could not create dir")), - }, - } -} - impl crate::kinode::process::main::PackageId { pub fn to_process_lib(&self) -> kinode_process_lib::PackageId { kinode_process_lib::PackageId::new(&self.package_name, &self.publisher_node) From eb7138e6deec273ebacc853dee4ba3cea7a9e28f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:59:14 +0000 Subject: [PATCH 4/4] Format Rust code using rustfmt --- .../packages/app_store/downloads/src/lib.rs | 3 ++- .../packages/app_store/ft_worker/src/lib.rs | 20 +++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/kinode/packages/app_store/downloads/src/lib.rs b/kinode/packages/app_store/downloads/src/lib.rs index 0d46459cf..d5b2dc1fd 100644 --- a/kinode/packages/app_store/downloads/src/lib.rs +++ b/kinode/packages/app_store/downloads/src/lib.rs @@ -75,7 +75,8 @@ fn init(our: Address) { let mut downloads = vfs::open_dir("/app_store:sys/downloads", true, None).expect("could not open downloads"); - let mut tmp = vfs::open_dir("/app_store:sys/downloads/tmp", true, None).expect("could not open tmp"); + let mut tmp = + vfs::open_dir("/app_store:sys/downloads/tmp", true, None).expect("could not open tmp"); let mut auto_updates: HashSet<(PackageId, String)> = HashSet::new(); diff --git a/kinode/packages/app_store/ft_worker/src/lib.rs b/kinode/packages/app_store/ft_worker/src/lib.rs index a3e96762f..ce2deeebf 100644 --- a/kinode/packages/app_store/ft_worker/src/lib.rs +++ b/kinode/packages/app_store/ft_worker/src/lib.rs @@ -129,15 +129,23 @@ fn handle_receiver( ) -> anyhow::Result<()> { // TODO: write to a temporary location first, then check hash as we go, then rename to final location. - let package_dir = vfs::open_dir(&format!( - "/app_store:sys/downloads/{}:{}/", - package_id.package_name, - package_id.publisher(), - ), true, None)?; + let package_dir = vfs::open_dir( + &format!( + "/app_store:sys/downloads/{}:{}/", + package_id.package_name, + package_id.publisher(), + ), + true, + None, + )?; let timer_address = Address::from_str("our@timer:distro:sys")?; - let mut file = vfs::open_file(&format!("{}{}.zip", &package_dir.path, version_hash), true, None)?; + let mut file = vfs::open_file( + &format!("{}{}.zip", &package_dir.path, version_hash), + true, + None, + )?; let mut size: Option = None; let mut hasher = Sha256::new();