From 8777663d73d98432b1bde3f9e3a8311809d9a4c3 Mon Sep 17 00:00:00 2001 From: ea-open-source Date: Fri, 20 May 2022 14:24:25 +0700 Subject: [PATCH 1/2] call movey api after getting dependency --- Cargo.lock | 1 + language/tools/move-package/Cargo.toml | 1 + .../src/resolution/resolution_graph.rs | 27 ++++++++++++++----- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c7cb048f4..aa5d8122cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2690,6 +2690,7 @@ dependencies = [ "petgraph 0.5.1", "ptree", "regex", + "reqwest", "serde 1.0.130", "serde_yaml", "sha2", diff --git a/language/tools/move-package/Cargo.toml b/language/tools/move-package/Cargo.toml index 6b1cbae01e..35d2f87b60 100644 --- a/language/tools/move-package/Cargo.toml +++ b/language/tools/move-package/Cargo.toml @@ -22,6 +22,7 @@ regex = "1.1.9" ptree = "0.4.0" once_cell = "1.7.2" named-lock = "0.1.1" +reqwest = { version = "0.10", features = ["blocking"] } move-binary-format = { path = "../../move-binary-format" } move-compiler = { path = "../../move-compiler" } diff --git a/language/tools/move-package/src/resolution/resolution_graph.rs b/language/tools/move-package/src/resolution/resolution_graph.rs index 1839aaacf7..1fc74f91a2 100644 --- a/language/tools/move-package/src/resolution/resolution_graph.rs +++ b/language/tools/move-package/src/resolution/resolution_graph.rs @@ -19,13 +19,7 @@ use move_core_types::account_address::AccountAddress; use move_symbol_pool::Symbol; use petgraph::{algo, graphmap::DiGraphMap, Outgoing}; use ptree::{print_tree, TreeBuilder}; -use std::{ - cell::RefCell, - collections::{BTreeMap, BTreeSet}, - path::{Path, PathBuf}, - process::Command, - rc::Rc, -}; +use std::{cell::RefCell, collections::{BTreeMap, BTreeSet}, path::{Path, PathBuf}, process::Command, rc::Rc, thread}; pub type ResolvedTable = ResolutionTable; pub type ResolvedPackage = ResolutionPackage; @@ -537,6 +531,25 @@ impl ResolvingGraph { dep_name ) })?; + let git_url = git_info.git_url.clone(); + let git_rev = git_info.git_rev.clone(); + let subdir = git_info.subdir.clone(); + let subdir = subdir + .as_path().to_string_lossy().to_string(); + thread::spawn(move || { + let movey_url: &str; + if cfg!(debug_assertions) { + movey_url = "https://movey-app-staging.herokuapp.com/api/v1/download"; + } else { + movey_url = "https://movey.net/api/v1/download"; + } + reqwest::blocking::get( + format!( + "{}?url={}&rev={}&subdir={}", + movey_url, git_url, git_rev, subdir + ).as_str() + ).unwrap(); + }); } } Ok(()) From 4550330f669353e64c8dac7103a262d0be06e9c2 Mon Sep 17 00:00:00 2001 From: ea-open-source Date: Thu, 23 Jun 2022 17:14:43 +0700 Subject: [PATCH 2/2] Change dev movey_url, send params in post request --- .../src/resolution/resolution_graph.rs | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/language/tools/move-package/src/resolution/resolution_graph.rs b/language/tools/move-package/src/resolution/resolution_graph.rs index 1fc74f91a2..3dfb9cdded 100644 --- a/language/tools/move-package/src/resolution/resolution_graph.rs +++ b/language/tools/move-package/src/resolution/resolution_graph.rs @@ -19,7 +19,14 @@ use move_core_types::account_address::AccountAddress; use move_symbol_pool::Symbol; use petgraph::{algo, graphmap::DiGraphMap, Outgoing}; use ptree::{print_tree, TreeBuilder}; -use std::{cell::RefCell, collections::{BTreeMap, BTreeSet}, path::{Path, PathBuf}, process::Command, rc::Rc, thread}; +use std::{ + cell::RefCell, + collections::{BTreeMap, BTreeSet}, + path::{Path, PathBuf}, + process::Command, + rc::Rc, + thread, +}; pub type ResolvedTable = ResolutionTable; pub type ResolvedPackage = ResolutionPackage; @@ -531,24 +538,20 @@ impl ResolvingGraph { dep_name ) })?; - let git_url = git_info.git_url.clone(); - let git_rev = git_info.git_rev.clone(); + let git_url = git_info.git_url.clone().to_string(); + let git_rev = git_info.git_rev.clone().to_string(); let subdir = git_info.subdir.clone(); - let subdir = subdir - .as_path().to_string_lossy().to_string(); + let subdir = subdir.as_path().to_string_lossy().to_string(); thread::spawn(move || { let movey_url: &str; if cfg!(debug_assertions) { - movey_url = "https://movey-app-staging.herokuapp.com/api/v1/download"; + movey_url = "http://staging.movey.net/api/v1/download"; } else { movey_url = "https://movey.net/api/v1/download"; } - reqwest::blocking::get( - format!( - "{}?url={}&rev={}&subdir={}", - movey_url, git_url, git_rev, subdir - ).as_str() - ).unwrap(); + let params = [("url", git_url), ("rev", git_rev), ("subdir", subdir)]; + let client = reqwest::blocking::Client::new(); + let _ = client.post(movey_url).form(¶ms).send(); }); } }