From 431a8b3073e5cb77aee652ffcd73c63cd017d345 Mon Sep 17 00:00:00 2001 From: Joe Date: Mon, 9 Feb 2026 22:45:22 -0600 Subject: [PATCH] Update vscode-rojo submodule and add new rokit.toml configuration - Updated the subproject commit reference for vscode-rojo. - Introduced a new rokit.toml file with dependencies for atlas, selene, and stylua. - Refactored upload asset logging for improved readability. --- assets/project-templates/place/rokit.toml | 4 ++++ src/cli/upload.rs | 13 ++++++------- vscode-rojo | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 assets/project-templates/place/rokit.toml diff --git a/assets/project-templates/place/rokit.toml b/assets/project-templates/place/rokit.toml new file mode 100644 index 00000000..c4026ef0 --- /dev/null +++ b/assets/project-templates/place/rokit.toml @@ -0,0 +1,4 @@ +[tools] +atlas = "UserGeneratedLLC/rojo@{rojo_version}" +selene = "Kampfkarren/selene@0.30.0" +stylua = "JohnnyMorganz/stylua@2.3.1" diff --git a/src/cli/upload.rs b/src/cli/upload.rs index cf8f0e53..3ae4f12b 100644 --- a/src/cli/upload.rs +++ b/src/cli/upload.rs @@ -180,8 +180,7 @@ fn do_upload_asset(buffer: Vec, asset_id: u64, api_key: &str) -> anyhow::Res let form = multipart::Form::new() .part( "request", - multipart::Part::text(request_json) - .mime_str("application/json")?, + multipart::Part::text(request_json).mime_str("application/json")?, ) .part( "fileContent", @@ -230,7 +229,10 @@ fn do_upload_asset(buffer: Vec, asset_id: u64, api_key: &str) -> anyhow::Res .strip_prefix("operations/") .unwrap_or(operation_path); - log::info!("Upload accepted, waiting for processing (operation: {})...", operation_id); + log::info!( + "Upload accepted, waiting for processing (operation: {})...", + operation_id + ); let mut retry_delay = std::time::Duration::from_secs(1); @@ -238,10 +240,7 @@ fn do_upload_asset(buffer: Vec, asset_id: u64, api_key: &str) -> anyhow::Res std::thread::sleep(retry_delay); let op_url = format!("{}/operations/{}", ASSETS_API_BASE, operation_id); - let op_response = client - .get(&op_url) - .header("x-api-key", api_key) - .send()?; + let op_response = client.get(&op_url).header("x-api-key", api_key).send()?; let op_status = op_response.status(); let op_body: Value = op_response diff --git a/vscode-rojo b/vscode-rojo index 89816a68..5e655209 160000 --- a/vscode-rojo +++ b/vscode-rojo @@ -1 +1 @@ -Subproject commit 89816a68a5f6b89f330f5722ae3a880dbe9f8c1d +Subproject commit 5e65520996e34467199d1498f3dc3659dcd93485