Compare commits
2 Commits
f983655908
...
b352707b99
| Author | SHA1 | Date | |
|---|---|---|---|
| b352707b99 | |||
| 81f411272f |
4
Cargo.lock
generated
4
Cargo.lock
generated
@@ -110,7 +110,7 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
|
||||
|
||||
[[package]]
|
||||
name = "asset-tool"
|
||||
version = "0.4.7"
|
||||
version = "0.4.8"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
@@ -1278,7 +1278,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rbx_asset"
|
||||
version = "0.2.3"
|
||||
version = "0.2.5"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"flate2",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
workspace = { members = ["rbx_asset", "rox_compiler"] }
|
||||
[package]
|
||||
name = "asset-tool"
|
||||
version = "0.4.7"
|
||||
version = "0.4.8"
|
||||
edition = "2021"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "rbx_asset"
|
||||
version = "0.2.3"
|
||||
version = "0.2.5"
|
||||
edition = "2021"
|
||||
publish = ["strafesnet"]
|
||||
repository = "https://git.itzana.me/StrafesNET/asset-tool"
|
||||
|
||||
@@ -58,7 +58,12 @@ impl std::fmt::Display for UploadError{
|
||||
}
|
||||
}
|
||||
impl std::error::Error for UploadError{}
|
||||
type UploadResponse=u64;
|
||||
type RobloxUploadResponse=u64;
|
||||
#[derive(Debug,serde::Deserialize,serde::Serialize)]
|
||||
#[allow(nonstandard_style,dead_code)]
|
||||
pub struct UploadResponse{
|
||||
pub AssetId:u64,
|
||||
}
|
||||
|
||||
#[allow(nonstandard_style,dead_code)]
|
||||
pub struct GetAssetRequest{
|
||||
@@ -267,11 +272,14 @@ impl CookieContext{
|
||||
query.append_pair("groupId",group_id.to_string().as_str());
|
||||
}
|
||||
}
|
||||
|
||||
crate::response_ok(
|
||||
let asset_id=crate::response_ok(
|
||||
self.post(url,body).await.map_err(CreateError::PostError)?
|
||||
).await.map_err(CreateError::Response)?
|
||||
.json::<UploadResponse>().await.map_err(CreateError::Reqwest)
|
||||
.json::<RobloxUploadResponse>().await.map_err(CreateError::Reqwest)?;
|
||||
|
||||
Ok(UploadResponse{
|
||||
AssetId:asset_id,
|
||||
})
|
||||
}
|
||||
pub async fn upload(&self,config:UploadRequest,body:impl Into<reqwest::Body>+Clone)->Result<UploadResponse,UploadError>{
|
||||
let mut url=reqwest::Url::parse("https://data.roblox.com/Data/Upload.ashx?json=1&type=Model&genreTypeId=1").map_err(UploadError::ParseError)?;
|
||||
@@ -299,11 +307,14 @@ impl CookieContext{
|
||||
query.append_pair("groupId",group_id.to_string().as_str());
|
||||
}
|
||||
}
|
||||
|
||||
crate::response_ok(
|
||||
let asset_id=crate::response_ok(
|
||||
self.post(url,body).await.map_err(UploadError::PostError)?
|
||||
).await.map_err(UploadError::Response)?
|
||||
.json::<UploadResponse>().await.map_err(UploadError::Reqwest)
|
||||
.json::<RobloxUploadResponse>().await.map_err(UploadError::Reqwest)?;
|
||||
|
||||
Ok(UploadResponse{
|
||||
AssetId:asset_id,
|
||||
})
|
||||
}
|
||||
pub async fn get_asset(&self,config:GetAssetRequest)->Result<Vec<u8>,GetError>{
|
||||
let mut url=reqwest::Url::parse("https://assetdelivery.roblox.com/v1/asset/").map_err(GetError::ParseError)?;
|
||||
|
||||
Reference in New Issue
Block a user