From cb31c847d5e261e3c2176dc35ffca61e78a8f27c Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Sun, 13 Apr 2025 22:00:04 -0700
Subject: [PATCH] map-tool: code clean ups
---
map-tool/src/roblox.rs | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/map-tool/src/roblox.rs b/map-tool/src/roblox.rs
index 6c691a4..a62b1eb 100644
--- a/map-tool/src/roblox.rs
+++ b/map-tool/src/roblox.rs
@@ -165,16 +165,16 @@ enum DownloadType{
impl DownloadType{
fn path(&self)->PathBuf{
match self{
- DownloadType::Texture(asset_id)=>format!("downloaded_textures/{}",asset_id.0.to_string()).into(),
- DownloadType::Mesh(asset_id)=>format!("meshes/{}",asset_id.0.to_string()).into(),
- DownloadType::Union(asset_id)=>format!("unions/{}",asset_id.0.to_string()).into(),
+ DownloadType::Texture(RobloxAssetId(asset_id))=>format!("downloaded_textures/{asset_id}").into(),
+ DownloadType::Mesh(RobloxAssetId(asset_id))=>format!("meshes/{asset_id}").into(),
+ DownloadType::Union(RobloxAssetId(asset_id))=>format!("unions/{asset_id}").into(),
}
}
fn asset_id(&self)->u64{
match self{
- DownloadType::Texture(asset_id)=>asset_id.0,
- DownloadType::Mesh(asset_id)=>asset_id.0,
- DownloadType::Union(asset_id)=>asset_id.0,
+ &DownloadType::Texture(RobloxAssetId(asset_id))=>asset_id,
+ &DownloadType::Mesh(RobloxAssetId(asset_id))=>asset_id,
+ &DownloadType::Union(RobloxAssetId(asset_id))=>asset_id,
}
}
}
@@ -193,7 +193,6 @@ struct Stats{
}
async fn download_retry(stats:&mut Stats,context:&rbx_asset::cookie::Context,download_instruction:DownloadType)->Result<DownloadResult,std::io::Error>{
stats.total_assets+=1;
- let download_instruction=download_instruction;
// check if file exists on disk
let path=download_instruction.path();
if tokio::fs::try_exists(path.as_path()).await?{
@@ -253,7 +252,7 @@ enum ConvertTextureError{
#[error("DDS write error {0:?}")]
DDSWrite(#[from]image_dds::ddsfile::Error),
}
-async fn convert_texture(asset_id:RobloxAssetId,download_result:DownloadResult)->Result<(),ConvertTextureError>{
+async fn convert_texture(RobloxAssetId(asset_id):RobloxAssetId,download_result:DownloadResult)->Result<(),ConvertTextureError>{
let data=match download_result{
DownloadResult::Cached(path)=>tokio::fs::read(path).await?,
DownloadResult::Data(data)=>data,
@@ -278,7 +277,7 @@ async fn convert_texture(asset_id:RobloxAssetId,download_result:DownloadResult)-
image_dds::Mipmaps::GeneratedAutomatic,
)?;
- let file_name=format!("textures/{}.dds",asset_id.0);
+ let file_name=format!("textures/{asset_id}.dds");
let mut file=std::fs::File::create(file_name)?;
dds.write(&mut file)?;
Ok(())