StrafesNET/maps-service
7
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

presumptuously rename error

Browse Source
This commit is contained in:
Quaternions 2024-12-06 19:36:10 -08:00
parent c77a34804d
commit 1a5e6e90c6
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
validation/api/src/lib.rs
View File

@ -1,15 +1,14 @@
#[derive(Debug)] #[derive(Debug)]
pub enum GetError{ pub enum Error{
ParseError(url::ParseError), ParseError(url::ParseError),
Reqwest(reqwest::Error), Reqwest(reqwest::Error),
JSON(serde_json::Error),
} }
impl std::fmt::Display for GetError{ impl std::fmt::Display for Error{
fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{ fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
write!(f,"{self:?}") write!(f,"{self:?}")
} }
} }
impl std::error::Error for GetError{} impl std::error::Error for Error{}
#[derive(serde::Deserialize)] #[derive(serde::Deserialize)]
pub struct ScriptID(i64); pub struct ScriptID(i64);
@ -88,25 +87,25 @@ impl Context{
self.client.patch(url) self.client.patch(url)
.send().await .send().await
} }
pub async fn get_script(&self,config:GetScriptRequest)->Result<ScriptResponse,GetError>{ pub async fn get_script(&self,config:GetScriptRequest)->Result<ScriptResponse,Error>{
let url_raw=format!("{}/scripts/{}",self.base_url,config.ScriptID.0); let url_raw=format!("{}/scripts/{}",self.base_url,config.ScriptID.0);
let url=reqwest::Url::parse(url_raw.as_str()).map_err(GetError::ParseError)?; let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::ParseError)?;
self.get(url).await.map_err(GetError::Reqwest)? self.get(url).await.map_err(Error::Reqwest)?
.error_for_status().map_err(GetError::Reqwest)? .error_for_status().map_err(Error::Reqwest)?
.json().await.map_err(GetError::Reqwest) .json().await.map_err(Error::Reqwest)
} }
pub async fn get_script_policy_from_hash(&self,config:ScriptPolicyHashRequest)->Result<ScriptPolicyResponse,GetError>{ pub async fn get_script_policy_from_hash(&self,config:ScriptPolicyHashRequest)->Result<ScriptPolicyResponse,Error>{
let url_raw=format!("{}/script-policy/hash/{}",self.base_url,config.hash); let url_raw=format!("{}/script-policy/hash/{}",self.base_url,config.hash);
let url=reqwest::Url::parse(url_raw.as_str()).map_err(GetError::ParseError)?; let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::ParseError)?;
self.get(url).await.map_err(GetError::Reqwest)? self.get(url).await.map_err(Error::Reqwest)?
.error_for_status().map_err(GetError::Reqwest)? .error_for_status().map_err(Error::Reqwest)?
.json().await.map_err(GetError::Reqwest) .json().await.map_err(Error::Reqwest)
} }
pub async fn update_submission_model(&self,config:UpdateSubmissionModelRequest)->Result<(),GetError>{ pub async fn update_submission_model(&self,config:UpdateSubmissionModelRequest)->Result<(),Error>{
let url_raw=format!("{}/submissions/{}/model",self.base_url,config.ID); let url_raw=format!("{}/submissions/{}/model",self.base_url,config.ID);
let mut url=reqwest::Url::parse(url_raw.as_str()).map_err(GetError::ParseError)?; let mut url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::ParseError)?;
{ {
url.query_pairs_mut() url.query_pairs_mut()
@ -114,8 +113,8 @@ impl Context{
.append_pair("ModelVersion",config.ModelVersion.to_string().as_str()); .append_pair("ModelVersion",config.ModelVersion.to_string().as_str());
} }
self.patch(url).await.map_err(GetError::Reqwest)? self.patch(url).await.map_err(Error::Reqwest)?
.error_for_status().map_err(GetError::Reqwest)?; .error_for_status().map_err(Error::Reqwest)?;
Ok(()) Ok(())
} }

4
validation/src/validator.rs
View File

@ -28,8 +28,8 @@ enum ValidateError{
Get(rbx_asset::cookie::GetError), Get(rbx_asset::cookie::GetError),
Json(serde_json::Error), Json(serde_json::Error),
ReadDom(ReadDomError), ReadDom(ReadDomError),
ApiGetScriptPolicy(api::GetError), ApiGetScriptPolicy(api::Error),
ApiGetScript(api::GetError), ApiGetScript(api::Error),
WriteDom(rbx_binary::EncodeError), WriteDom(rbx_binary::EncodeError),
Upload(rbx_asset::cookie::UploadError), Upload(rbx_asset::cookie::UploadError),
Create(rbx_asset::cookie::CreateError), Create(rbx_asset::cookie::CreateError),