Merge pull request 'use old api for compile-upload-asset' (#3) from staging into master

Reviewed-on: #3

Cargo.lock

@@ -110,7 +110,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "asset-tool"
-version = "0.4.1"
+version = "0.4.3"
 dependencies = [
  "anyhow",
  "clap",

Cargo.toml

@@ -1,7 +1,7 @@
 workspace = { members = ["rbx_asset", "rox_compiler"] }
 [package]
 name = "asset-tool"
-version = "0.4.1"
+version = "0.4.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/main.rs

@@ -25,7 +25,9 @@ enum Commands{
 	DownloadDecompile(DownloadDecompileSubcommand),
 	DownloadGroupInventoryJson(DownloadGroupInventoryJsonSubcommand),
 	CreateAsset(CreateAssetSubcommand),
+	CreateAssetMedia(CreateAssetMediaSubcommand),
 	UploadAsset(UpdateAssetSubcommand),
+	UploadAssetMedia(UpdateAssetMediaSubcommand),
 	UploadPlace(UpdatePlaceSubcommand),
 	Compile(CompileSubcommand),
 	CompileUploadAsset(CompileUploadAssetSubcommand),
@@ -82,6 +84,27 @@ struct DownloadGroupInventoryJsonSubcommand{
 }
 #[derive(Args)]
 struct CreateAssetSubcommand{
+	#[arg(long,group="cookie",required=true)]
+	cookie_literal:Option<String>,
+	#[arg(long,group="cookie",required=true)]
+	cookie_envvar:Option<String>,
+	#[arg(long,group="cookie",required=true)]
+	cookie_file:Option<PathBuf>,
+	#[arg(long)]
+	group_id:Option<u64>,
+	#[arg(long)]
+	input_file:PathBuf,
+	#[arg(long)]
+	model_name:String,
+	#[arg(long)]
+	description:Option<String>,
+	#[arg(long)]
+	free_model:Option<bool>,
+	#[arg(long)]
+	allow_comments:Option<bool>,
+}
+#[derive(Args)]
+struct CreateAssetMediaSubcommand{
 	#[arg(long,group="api_key",required=true)]
 	api_key_literal:Option<String>,
 	#[arg(long,group="api_key",required=true)]
@@ -95,12 +118,40 @@ struct CreateAssetSubcommand{
 	#[arg(long)]
 	input_file:PathBuf,
 	#[arg(long)]
+	asset_type:AssetType,
+	#[arg(long)]
 	creator_user_id:u64,
 	#[arg(long)]
 	creator_group_id:Option<u64>,
+	/// Expected price limits how much robux can be spent to create the asset (defaults to 0)
+	#[arg(long)]
+	expected_price:Option<u64>,
 }
 #[derive(Args)]
 struct UpdateAssetSubcommand{
+	#[arg(long)]
+	asset_id:AssetID,
+	#[arg(long,group="cookie",required=true)]
+	cookie_literal:Option<String>,
+	#[arg(long,group="cookie",required=true)]
+	cookie_envvar:Option<String>,
+	#[arg(long,group="cookie",required=true)]
+	cookie_file:Option<PathBuf>,
+	#[arg(long)]
+	group_id:Option<u64>,
+	#[arg(long)]
+	input_file:PathBuf,
+	#[arg(long)]
+	change_name:Option<String>,
+	#[arg(long)]
+	change_description:Option<String>,
+	#[arg(long)]
+	change_free_model:Option<bool>,
+	#[arg(long)]
+	change_allow_comments:Option<bool>,
+}
+#[derive(Args)]
+struct UpdateAssetMediaSubcommand{
 	#[arg(long)]
 	asset_id:AssetID,
 	#[arg(long,group="api_key",required=true)]
@@ -142,12 +193,14 @@ struct CompileSubcommand{
 struct CompileUploadAssetSubcommand{
 	#[arg(long)]
 	asset_id:AssetID,
-	#[arg(long,group="api_key",required=true)]
-	api_key_literal:Option<String>,
-	#[arg(long,group="api_key",required=true)]
-	api_key_envvar:Option<String>,
-	#[arg(long,group="api_key",required=true)]
-	api_key_file:Option<PathBuf>,
+	#[arg(long,group="cookie",required=true)]
+	cookie_literal:Option<String>,
+	#[arg(long,group="cookie",required=true)]
+	cookie_envvar:Option<String>,
+	#[arg(long,group="cookie",required=true)]
+	cookie_file:Option<PathBuf>,
+	#[arg(long)]
+	group_id:Option<u64>,
 	#[arg(long)]
 	input_folder:Option<PathBuf>,
 	#[arg(long)]
@@ -270,6 +323,21 @@ impl Style{
 		}
 	}
 }
+#[derive(Clone,Copy,Debug,clap::ValueEnum)]
+enum AssetType{
+	Audio,
+	Decal,
+	Model,
+}
+impl AssetType{
+	fn cloud(&self)->rbx_asset::cloud::AssetType{
+		match self{
+			AssetType::Audio=>rbx_asset::cloud::AssetType::Audio,
+			AssetType::Decal=>rbx_asset::cloud::AssetType::Decal,
+			AssetType::Model=>rbx_asset::cloud::AssetType::Model,
+		}
+	}
+}
 
 #[tokio::main]
 async fn main()->AResult<()>{
@@ -326,7 +394,20 @@ async fn main()->AResult<()>{
 			subcommand.group,
 			subcommand.output_folder.unwrap_or_else(||std::env::current_dir().unwrap()),
 		).await,
-		Commands::CreateAsset(subcommand)=>create(CreateConfig{
+		Commands::CreateAsset(subcommand)=>create_asset(CreateAssetConfig{
+			cookie:cookie_from_args(
+					subcommand.cookie_literal,
+					subcommand.cookie_envvar,
+					subcommand.cookie_file,
+				).await?,
+			group:subcommand.group_id,
+			input_file:subcommand.input_file,
+			model_name:subcommand.model_name,
+			description:subcommand.description.unwrap_or_else(||String::with_capacity(0)),
+			free_model:subcommand.free_model.unwrap_or(false),
+			allow_comments:subcommand.allow_comments.unwrap_or(false),
+		}).await,
+		Commands::CreateAssetMedia(subcommand)=>create_asset_media(CreateAssetMediaConfig{
 			api_key:api_key_from_args(
 				subcommand.api_key_literal,
 				subcommand.api_key_envvar,
@@ -335,10 +416,26 @@ async fn main()->AResult<()>{
 			creator_user_id:subcommand.creator_user_id,
 			creator_group_id:subcommand.creator_group_id,
 			input_file:subcommand.input_file,
+			asset_type:subcommand.asset_type.cloud(),
 			model_name:subcommand.model_name,
 			description:subcommand.description.unwrap_or_else(||String::with_capacity(0)),
+			expected_price:subcommand.expected_price,
 		}).await,
 		Commands::UploadAsset(subcommand)=>upload_asset(UploadAssetConfig{
+			cookie:cookie_from_args(
+					subcommand.cookie_literal,
+					subcommand.cookie_envvar,
+					subcommand.cookie_file,
+				).await?,
+			asset_id:subcommand.asset_id,
+			group_id:subcommand.group_id,
+			input_file:subcommand.input_file,
+			change_name:subcommand.change_name,
+			change_description:subcommand.change_description,
+			change_free_model:subcommand.change_free_model,
+			change_allow_comments:subcommand.change_allow_comments,
+		}).await,
+		Commands::UploadAssetMedia(subcommand)=>upload_asset_media(UploadAssetMediaConfig{
 			api_key:api_key_from_args(
 				subcommand.api_key_literal,
 				subcommand.api_key_envvar,
@@ -367,12 +464,13 @@ async fn main()->AResult<()>{
 			input_folder:subcommand.input_folder.unwrap_or_else(||std::env::current_dir().unwrap()),
 			template:subcommand.template,
 			style:subcommand.style.map(|s|s.rox()),
-			api_key:api_key_from_args(
-				subcommand.api_key_literal,
-				subcommand.api_key_envvar,
-				subcommand.api_key_file,
+			cookie:cookie_from_args(
+				subcommand.cookie_literal,
+				subcommand.cookie_envvar,
+				subcommand.cookie_file,
 			).await?,
 			asset_id:subcommand.asset_id,
+			group_id:subcommand.group_id,
 		}).await,
 		Commands::CompileUploadPlace(subcommand)=>compile_upload_place(CompileUploadPlaceConfig{
 			input_folder:subcommand.input_folder.unwrap_or_else(||std::env::current_dir().unwrap()),
@@ -427,7 +525,7 @@ async fn cookie_from_args(literal:Option<String>,environment:Option<String>,file
 		(Some(cookie_literal),None,None)=>cookie_literal,
 		(None,Some(cookie_environment),None)=>std::env::var(cookie_environment)?,
 		(None,None,Some(cookie_file))=>tokio::fs::read_to_string(cookie_file).await?,
-		_=>Err(anyhow::Error::msg("Illegal api key argument triple"))?,
+		_=>Err(anyhow::Error::msg("Illegal cookie argument triple"))?,
 	};
 	Ok(Cookie::new(format!(".ROBLOSECURITY={cookie}")))
 }
@@ -441,20 +539,44 @@ async fn api_key_from_args(literal:Option<String>,environment:Option<String>,fil
 	Ok(ApiKey::new(api_key))
 }
 
-struct CreateConfig{
+struct CreateAssetConfig{
+	cookie:Cookie,
+	model_name:String,
+	description:String,
+	input_file:PathBuf,
+	group:Option<u64>,
+	free_model:bool,
+	allow_comments:bool,
+}
+
+async fn create_asset(config:CreateAssetConfig)->AResult<()>{
+	let resp=CookieContext::new(config.cookie)
+	.create(rbx_asset::cookie::CreateRequest{
+		name:config.model_name,
+		description:config.description,
+		ispublic:config.free_model,
+		allowComments:config.allow_comments,
+		groupId:config.group,
+	},tokio::fs::read(config.input_file).await?).await?;
+	println!("UploadResponse={:?}",resp);
+	Ok(())
+}
+
+struct CreateAssetMediaConfig{
 	api_key:ApiKey,
+	asset_type:rbx_asset::cloud::AssetType,
 	model_name:String,
 	description:String,
 	input_file:PathBuf,
 	creator_user_id:u64,
 	creator_group_id:Option<u64>,
+	expected_price:Option<u64>,
 }
 
-///This is hardcoded to create models atm
-async fn create(config:CreateConfig)->AResult<()>{
+async fn create_asset_media(config:CreateAssetMediaConfig)->AResult<()>{
 	let resp=CloudContext::new(config.api_key)
 	.create_asset(rbx_asset::cloud::CreateAssetRequest{
-		assetType:rbx_asset::cloud::AssetType::Model,
+		assetType:config.asset_type,
 		displayName:config.model_name,
 		description:config.description,
 		creationContext:rbx_asset::cloud::CreationContext{
@@ -462,7 +584,7 @@ async fn create(config:CreateConfig)->AResult<()>{
 				userId:config.creator_user_id,
 				groupId:config.creator_group_id.unwrap_or(0),
 			},
-			expectedPrice:0,
+			expectedPrice:config.expected_price.unwrap_or(0),
 		}
 	},tokio::fs::read(config.input_file).await?).await?;
 	println!("CreateResponse={:?}",resp);
@@ -470,11 +592,35 @@ async fn create(config:CreateConfig)->AResult<()>{
 }
 
 struct UploadAssetConfig{
+	cookie:Cookie,
+	asset_id:AssetID,
+	change_name:Option<String>,
+	change_description:Option<String>,
+	change_free_model:Option<bool>,
+	change_allow_comments:Option<bool>,
+	group_id:Option<u64>,
+	input_file:PathBuf,
+}
+async fn upload_asset(config:UploadAssetConfig)->AResult<()>{
+	let context=CookieContext::new(config.cookie);
+	let resp=context.upload(rbx_asset::cookie::UploadRequest{
+		assetid:config.asset_id,
+		name:config.change_name,
+		description:config.change_description,
+		ispublic:config.change_free_model,
+		allowComments:config.change_allow_comments,
+		groupId:config.group_id,
+	},tokio::fs::read(config.input_file).await?).await?;
+	println!("UploadResponse={:?}",resp);
+	Ok(())
+}
+
+struct UploadAssetMediaConfig{
 	api_key:ApiKey,
 	asset_id:u64,
 	input_file:PathBuf,
 }
-async fn upload_asset(config:UploadAssetConfig)->AResult<()>{
+async fn upload_asset_media(config:UploadAssetMediaConfig)->AResult<()>{
 	let context=CloudContext::new(config.api_key);
 	let resp=context.update_asset(rbx_asset::cloud::UpdateAssetRequest{
 		assetId:config.asset_id,
@@ -994,7 +1140,8 @@ struct CompileUploadAssetConfig{
 	input_folder:PathBuf,
 	template:Option<PathBuf>,
 	style:Option<rox_compiler::Style>,
-	api_key:ApiKey,
+	cookie:Cookie,
+	group_id:Option<u64>,
 	asset_id:AssetID,
 }
 async fn compile_upload_asset(config:CompileUploadAssetConfig)->AResult<()>{
@@ -1014,11 +1161,14 @@ async fn compile_upload_asset(config:CompileUploadAssetConfig)->AResult<()>{
 	rbx_binary::to_writer(std::io::Cursor::new(&mut data),&dom,dom.root().children())?;
 
 	//upload it
-	let context=CloudContext::new(config.api_key);
-	let resp=context.update_asset(rbx_asset::cloud::UpdateAssetRequest{
-		assetId:config.asset_id,
-		displayName:None,
+	let context=CookieContext::new(config.cookie);
+	let resp=context.upload(rbx_asset::cookie::UploadRequest{
+		groupId:config.group_id,
+		assetid:config.asset_id,
+		name:None,
 		description:None,
+		ispublic:None,
+		allowComments:None,
 	},data).await?;
 	println!("UploadResponse={:?}",resp);
 	Ok(())