From 91f452a94bf8c07f9ae44d6a4e71b69c7423ab18 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Tue, 9 Jan 2024 17:50:39 -0800
Subject: [PATCH] rewrite duplicated code as closure

---
 src/main.rs | 117 ++++++++++++++++++----------------------------------
 1 file changed, 40 insertions(+), 77 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 7b66ce2..b1c2eb0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1106,85 +1106,48 @@ fn extract_textures(paths:Vec<std::path::PathBuf>,vpk_path:std::path::PathBuf)->
 				texture_file_name2.set_extension("vmt");
 				println!("texture_name={:?}",texture_file_name);
 				let mut found_texture=false;
-				//why can't I write a function for this without importing the ZipArchive lib
-				{
-	if let Some(mut stuff)=match (zippyt.by_name(texture_file_name.to_str().unwrap()),tree.get(texture_file_name.to_str().unwrap())){
-		(Ok(mut zip_file),None)=>{
-			let mut buf=Vec::new();
-			zip_file.read_to_end(&mut buf)?;
-			Some(buf)
-		},
-		(_,Some(vpk_entry))=>Some(vpk_entry.get()?.to_vec()),
-		_=>None,
-	}{
-		found_texture=true;
-		let texture_name=texture_name.clone();
-		thread_handles.push(s.spawn(move||{
-			let image=vtf::from_bytes(&mut stuff)?.highres_image.decode(0)?.to_rgba8();
+				//LMAO imagine having to write type names
+				let mut f=|search_file_name,write_file_name|{
+					if let Some(mut stuff)=match (zippyt.by_name(search_file_name),tree.get(search_file_name)){
+						(Ok(mut zip_file),None)=>{
+							let mut buf=Vec::new();
+							zip_file.read_to_end(&mut buf)?;
+							Some(buf)
+						},
+						(_,Some(vpk_entry))=>Some(vpk_entry.get()?.to_vec()),
+						_=>None,
+					}{
+						found_texture=true;
+						thread_handles.push(s.spawn(move||{
+							let image=vtf::from_bytes(&mut stuff)?.highres_image.decode(0)?.to_rgba8();
 
-			let format=if image.width()%4!=0||image.height()%4!=0{
-				image_dds::ImageFormat::R8G8B8A8Srgb
-			}else{
-				image_dds::ImageFormat::BC7Srgb
-			};
-			//this fails if the image dimensions are not a multiple of 4
-			let dds = image_dds::dds_from_image(
-				&image,
-				format,
-				image_dds::Quality::Slow,
-				image_dds::Mipmaps::GeneratedAutomatic,
-			)?;
+							let format=if image.width()%4!=0||image.height()%4!=0{
+								image_dds::ImageFormat::R8G8B8A8Srgb
+							}else{
+								image_dds::ImageFormat::BC7Srgb
+							};
+							//this fails if the image dimensions are not a multiple of 4
+							let dds = image_dds::dds_from_image(
+								&image,
+								format,
+								image_dds::Quality::Slow,
+								image_dds::Mipmaps::GeneratedAutomatic,
+							)?;
 
-			//write dds
-			let mut dest=std::path::PathBuf::from("textures/dds");
-			dest.push(texture_name);
-			dest.set_extension("dds");
-			std::fs::create_dir_all(dest.parent().unwrap())?;
-			let mut writer = std::io::BufWriter::new(std::fs::File::create(dest)?);
-			dds.write(&mut writer)?;
-			Ok::<(),anyhow::Error>(())
-		}));
-	}
-				}
-				{
-	if let Some(mut stuff)=match (zippyt.by_name(texture_file_name2.to_str().unwrap()),tree.get(texture_file_name2.to_str().unwrap())){
-		(Ok(mut zip_file),None)=>{
-			let mut buf=Vec::new();
-			zip_file.read_to_end(&mut buf)?;
-			Some(buf)
-		},
-		(_,Some(vpk_entry))=>Some(vpk_entry.get()?.to_vec()),
-		_=>None,
-	}{
-		found_texture=true;
-		let texture_name=texture_name.clone();
-		thread_handles.push(s.spawn(move||{
-			let image=vtf::from_bytes(&mut stuff)?.highres_image.decode(0)?.to_rgba8();
-
-			let format=if image.width()%4!=0||image.height()%4!=0{
-				image_dds::ImageFormat::R8G8B8A8Srgb
-			}else{
-				image_dds::ImageFormat::BC7Srgb
-			};
-			//this fails if the image dimensions are not a multiple of 4
-			let dds = image_dds::dds_from_image(
-				&image,
-				format,
-				image_dds::Quality::Slow,
-				image_dds::Mipmaps::GeneratedAutomatic,
-			)?;
-
-			//write dds
-			let mut dest=std::path::PathBuf::from("textures/dds");
-			dest.push(texture_name);
-			dest.set_extension("dds");
-			std::fs::create_dir_all(dest.parent().unwrap())?;
-			let mut writer = std::io::BufWriter::new(std::fs::File::create(dest)?);
-			dds.write(&mut writer)?;
-			Ok::<(),anyhow::Error>(())
-		}));
-	}
-				}
+							//write dds
+							let mut dest=std::path::PathBuf::from("textures/dds");
+							dest.push(write_file_name);
+							dest.set_extension("dds");
+							std::fs::create_dir_all(dest.parent().unwrap())?;
+							let mut writer = std::io::BufWriter::new(std::fs::File::create(dest)?);
+							dds.write(&mut writer)?;
+							Ok::<(),anyhow::Error>(())
+						}));
+					}
+					Ok::<(),anyhow::Error>(())
+				};
+				f(texture_file_name.as_os_str().to_str().unwrap(),texture_name.clone())?;
+				f(texture_file_name2.as_os_str().to_str().unwrap(),texture_name.clone())?;
 				if !found_texture{
 					println!("no data");
 				}