diff --git a/rbx_asset/src/cloud.rs b/rbx_asset/src/cloud.rs index 3e743a6..f52fff2 100644 --- a/rbx_asset/src/cloud.rs +++ b/rbx_asset/src/cloud.rs @@ -31,7 +31,7 @@ pub struct AssetOperation{ operation:RobloxOperation, } impl AssetOperation{ - pub async fn try_get_asset(&self,context:&CloudContext)->Result<AssetResponse,AssetOperationError>{ + pub async fn try_get_asset(&self,context:&Context)->Result<AssetResponse,AssetOperationError>{ serde_json::from_value( self.operation .try_get_reponse(context).await @@ -286,7 +286,7 @@ impl RobloxOperation{ None=>self.path.as_deref()?.get(11..), } } - pub async fn try_get_reponse(&self,context:&CloudContext)->Result<serde_json::Value,OperationError>{ + pub async fn try_get_reponse(&self,context:&Context)->Result<serde_json::Value,OperationError>{ context.get_asset_operation(GetAssetOperationRequest{ operation_id:self.operation_id() .ok_or(OperationError::NoOperationId)? @@ -327,12 +327,12 @@ impl ApiKey{ } #[derive(Clone)] -pub struct CloudContext{ +pub struct Context{ api_key:String, client:reqwest::Client, } -impl CloudContext{ +impl Context{ pub fn new(api_key:ApiKey)->Self{ Self{ api_key:api_key.get(), diff --git a/rbx_asset/src/cookie.rs b/rbx_asset/src/cookie.rs index 8547086..dbf046d 100644 --- a/rbx_asset/src/cookie.rs +++ b/rbx_asset/src/cookie.rs @@ -337,12 +337,12 @@ impl Cookie{ } } #[derive(Clone)] -pub struct CookieContext{ +pub struct Context{ cookie:String, client:reqwest::Client, } -impl CookieContext{ +impl Context{ pub fn new(cookie:Cookie)->Self{ Self{ cookie:cookie.get(), diff --git a/src/main.rs b/src/main.rs index 9d4c79b..ba89009 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,8 +2,8 @@ use std::{io::Read,path::PathBuf}; use clap::{Args,Parser,Subcommand}; use anyhow::{anyhow,Result as AResult}; use futures::StreamExt; -use rbx_asset::cloud::{ApiKey,CloudContext}; -use rbx_asset::cookie::{Cookie,CookieContext,AssetVersion,CreationsItem}; +use rbx_asset::cloud::{ApiKey,Context as CloudContext}; +use rbx_asset::cookie::{Cookie,Context as CookieContext,AssetVersion,CreationsItem}; type AssetID=u64; type AssetIDFileMap=Vec<(AssetID,PathBuf)>;