Skip to content

Commit f408d00

Browse files
committed
Run rustfmt manually, the hook didn't execute
1 parent 37f8472 commit f408d00

File tree

3 files changed

+52
-24
lines changed

3 files changed

+52
-24
lines changed

mcmeta/src/download/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pub mod mojang;
1+
pub mod mojang;

mcmeta/src/download/mojang.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use custom_error::custom_error;
2-
use libmcmeta::models::mojang::{MojangVersionManifest, MinecraftVersion};
2+
use libmcmeta::models::mojang::{MinecraftVersion, MojangVersionManifest};
33
use serde::Deserialize;
44

55
custom_error! {pub MojangMetadataError
@@ -23,9 +23,8 @@ impl DownloadConfig {
2323
let config = config::Config::builder()
2424
.add_source(config::Environment::with_prefix("MCMETA_MOJANG"))
2525
.build()?;
26-
27-
config.try_deserialize::<'_, Self>()
28-
.map_err(Into::into)
26+
27+
config.try_deserialize::<'_, Self>().map_err(Into::into)
2928
}
3029
}
3130

@@ -40,11 +39,13 @@ pub async fn load_manifest() -> Result<MojangVersionManifest, MojangMetadataErro
4039
.error_for_status()?
4140
.json::<MojangVersionManifest>()
4241
.await?;
43-
42+
4443
Ok(response)
4544
}
4645

47-
pub async fn load_version_manifest(version_url: &str) -> Result<MinecraftVersion, MojangMetadataError> {
46+
pub async fn load_version_manifest(
47+
version_url: &str,
48+
) -> Result<MinecraftVersion, MojangMetadataError> {
4849
let client = reqwest::Client::new();
4950

5051
let response = client
@@ -54,6 +55,6 @@ pub async fn load_version_manifest(version_url: &str) -> Result<MinecraftVersion
5455
.error_for_status()?
5556
.json::<MinecraftVersion>()
5657
.await?;
57-
58+
5859
Ok(response)
59-
}
60+
}

mcmeta/src/main.rs

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
use std::{path::Path as StdPath, sync::Arc};
22

3-
use axum::{Router, response::IntoResponse, Extension, routing::get, extract::{Query, Path}};
3+
use axum::{
4+
extract::{Path, Query},
5+
response::IntoResponse,
6+
routing::get,
7+
Extension, Router,
8+
};
49
use custom_error::custom_error;
510
use libmcmeta::models::mojang::MojangVersionManifest;
611
use serde::Deserialize;
@@ -39,9 +44,8 @@ impl ServerConfig {
3944
let config = config::Config::builder()
4045
.add_source(config::Environment::with_prefix("MCMETA"))
4146
.build()?;
42-
43-
config.try_deserialize::<'_, Self>()
44-
.map_err(Into::into)
47+
48+
config.try_deserialize::<'_, Self>().map_err(Into::into)
4549
}
4650
}
4751

@@ -50,7 +54,10 @@ async fn initialize_mojang_metadata(metadata_dir: &StdPath) -> Result<(), MetaMC
5054
let mojang_meta_dir = metadata_dir.join("mojang");
5155

5256
if !mojang_meta_dir.exists() {
53-
info!("Mojang metadata directory at {} does not exist, creating it", mojang_meta_dir.display());
57+
info!(
58+
"Mojang metadata directory at {} does not exist, creating it",
59+
mojang_meta_dir.display()
60+
);
5461
std::fs::create_dir_all(&mojang_meta_dir)?;
5562
}
5663

@@ -61,16 +68,23 @@ async fn initialize_mojang_metadata(metadata_dir: &StdPath) -> Result<(), MetaMC
6168
let manifest_json = serde_json::to_string_pretty(&manifest)?;
6269
std::fs::write(&local_manifest, manifest_json)?;
6370
}
64-
let manifest = serde_json::from_str::<MojangVersionManifest>(&std::fs::read_to_string(&local_manifest)?)?;
71+
let manifest =
72+
serde_json::from_str::<MojangVersionManifest>(&std::fs::read_to_string(&local_manifest)?)?;
6573
let versions_dir = mojang_meta_dir.join("versions");
6674
if !versions_dir.exists() {
67-
info!("Mojang versions directory at {} does not exist, creating it", versions_dir.display());
75+
info!(
76+
"Mojang versions directory at {} does not exist, creating it",
77+
versions_dir.display()
78+
);
6879
std::fs::create_dir_all(&versions_dir)?;
6980
}
7081
for version in &manifest.versions {
7182
let version_file = versions_dir.join(format!("{}.json", &version.id));
7283
if !version_file.exists() {
73-
info!("Mojang metadata for version {} does not exist, downloading it", &version.id);
84+
info!(
85+
"Mojang metadata for version {} does not exist, downloading it",
86+
&version.id
87+
);
7488
let version_manifest = download::mojang::load_version_manifest(&version.url).await?;
7589
let version_manifest_json = serde_json::to_string_pretty(&version_manifest)?;
7690
std::fs::write(&version_file, version_manifest_json)?;
@@ -84,7 +98,10 @@ async fn initialize_metadata(config: &ServerConfig) -> Result<(), MetaMCError> {
8498
// check if metadata directory exists
8599
let metadata_dir = std::path::Path::new(&config.meta_directory);
86100
if !metadata_dir.exists() {
87-
info!("Metadata directory at {} does not exist, creating it", &config.meta_directory);
101+
info!(
102+
"Metadata directory at {} does not exist, creating it",
103+
&config.meta_directory
104+
);
88105
std::fs::create_dir_all(metadata_dir)?;
89106
}
90107

@@ -97,20 +114,31 @@ async fn raw_mojang_manifest(config: Extension<Arc<ServerConfig>>) -> impl IntoR
97114
let metadata_dir = std::path::Path::new(&config.meta_directory);
98115
let mojang_meta_dir = metadata_dir.join("mojang");
99116
let local_manifest = mojang_meta_dir.join("version_manifest_v2.json");
100-
let manifest = serde_json::from_str::<MojangVersionManifest>(&std::fs::read_to_string(&local_manifest).unwrap()).unwrap();
117+
let manifest = serde_json::from_str::<MojangVersionManifest>(
118+
&std::fs::read_to_string(&local_manifest).unwrap(),
119+
)
120+
.unwrap();
101121

102122
axum::Json(manifest)
103123
}
104124

105-
async fn raw_mojang_version(config: Extension<Arc<ServerConfig>>, Path(version): Path<String>) -> impl IntoResponse {
125+
async fn raw_mojang_version(
126+
config: Extension<Arc<ServerConfig>>,
127+
Path(version): Path<String>,
128+
) -> impl IntoResponse {
106129
let metadata_dir = std::path::Path::new(&config.meta_directory);
107130
let mojang_meta_dir = metadata_dir.join("mojang");
108131
let versions_dir = mojang_meta_dir.join("versions");
109132
let version_file = versions_dir.join(format!("{}.json", version));
110133
if !version_file.exists() {
111-
return (axum::http::StatusCode::NOT_FOUND, axum::Json(json!("Version not found")));
134+
return (
135+
axum::http::StatusCode::NOT_FOUND,
136+
axum::Json(json!("Version not found")),
137+
);
112138
}
113-
let manifest = serde_json::from_str::<serde_json::Value>(&std::fs::read_to_string(&version_file).unwrap()).unwrap();
139+
let manifest =
140+
serde_json::from_str::<serde_json::Value>(&std::fs::read_to_string(&version_file).unwrap())
141+
.unwrap();
114142

115143
(axum::http::StatusCode::OK, axum::Json(manifest))
116144
}
@@ -126,8 +154,7 @@ async fn main() -> Result<(), MetaMCError> {
126154
.route("/", get(raw_mojang_manifest))
127155
.route("/:version", get(raw_mojang_version));
128156

129-
let raw_routes = Router::new()
130-
.nest("/mojang", raw_mojang_routes);
157+
let raw_routes = Router::new().nest("/mojang", raw_mojang_routes);
131158

132159
let http = Router::new()
133160
.nest("/raw", raw_routes)

0 commit comments

Comments
 (0)