hxuanyu/cs2-dumper
1
0
Fork 0
mirror of https://github.com/a2x/cs2-dumper.git synced 2025-10-07 22:50:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue causing missing schema entries

Browse Source
This commit is contained in:
a2x
2024-04-07 03:21:07 +10:00
parent 6d72c517ed
commit 7c9d594ca6
92 changed files with 29707 additions and 3399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/output/interfaces.rs
View File

@@ -17,7 +17,7 @@ impl CodeGen for InterfaceMap {
fmt.block(
&format!(
"public static class {}",
AsPascalCase(Self::sanitize_name(module_name))
AsPascalCase(Self::slugify(module_name))
),
false,
|fmt| {
@@ -52,10 +52,7 @@ impl CodeGen for InterfaceMap {
writeln!(fmt, "// Module: {}", module_name)?;
fmt.block(
&format!(
"namespace {}",
AsSnakeCase(Self::sanitize_name(module_name))
),
&format!("namespace {}", AsSnakeCase(Self::slugify(module_name))),
false,
|fmt| {
for iface in ifaces {
@@ -108,7 +105,7 @@ impl CodeGen for InterfaceMap {
writeln!(fmt, "// Module: {}", module_name)?;
fmt.block(
&format!("pub mod {}", AsSnakeCase(Self::sanitize_name(module_name))),
&format!("pub mod {}", AsSnakeCase(Self::slugify(module_name))),
false,
|fmt| {
for iface in ifaces {

12
src/output/mod.rs
View File

@@ -50,12 +50,13 @@ trait CodeGen {
fn to_rs(&self, results: &Results, indent_size: usize) -> Result<String>;
/// Replaces non-alphanumeric characters in a string with underscores.
#[inline]
fn sanitize_name(name: &str) -> String {
name.replace(|c: char| !c.is_alphanumeric(), "_")
fn slugify(input: &str) -> String {
input.replace(|c: char| !c.is_alphanumeric(), "_")
}
fn write_content<F>(&self, results: &Results, indent_size: usize, callback: F) -> Result<String>
fn write_content<F>(&self, results: &Results, indent_size: usize, f: F) -> Result<String>
where
F: FnOnce(&mut Formatter<'_>) -> Result<()>,
{
@@ -64,7 +65,7 @@ trait CodeGen {
results.write_banner(&mut fmt)?;
callback(&mut fmt)?;
f(&mut fmt)?;
Ok(buf)
}
@@ -148,6 +149,7 @@ impl Results {
out_dir: P,
indent_size: usize,
) -> Result<()> {
// TODO: Make this user-configurable.
const FILE_EXTS: &[&str] = &["cs", "hpp", "json", "rs"];
fs::create_dir_all(&out_dir)?;
@@ -162,8 +164,8 @@ impl Results {
self.dump_item(item, &out_dir, indent_size, FILE_EXTS, file_name)?;
}
self.dump_schemas(&out_dir, indent_size, FILE_EXTS)?;
self.dump_info(process, &out_dir)?;
self.dump_schemas(&out_dir, indent_size, FILE_EXTS)?;
Ok(())
}

9
src/output/offsets.rs
View File

@@ -16,7 +16,7 @@ impl CodeGen for OffsetMap {
fmt.block(
&format!(
"public static class {}",
AsPascalCase(Self::sanitize_name(module_name))
AsPascalCase(Self::slugify(module_name))
),
false,
|fmt| {
@@ -47,10 +47,7 @@ impl CodeGen for OffsetMap {
writeln!(fmt, "// Module: {}", module_name)?;
fmt.block(
&format!(
"namespace {}",
AsSnakeCase(Self::sanitize_name(module_name))
),
&format!("namespace {}", AsSnakeCase(Self::slugify(module_name))),
false,
|fmt| {
for (name, value) in offsets {
@@ -91,7 +88,7 @@ impl CodeGen for OffsetMap {
writeln!(fmt, "// Module: {}", module_name)?;
fmt.block(
&format!("pub mod {}", AsSnakeCase(Self::sanitize_name(module_name))),
&format!("pub mod {}", AsSnakeCase(Self::slugify(module_name))),
false,
|fmt| {
for (name, value) in offsets {

52
src/output/schemas.rs
View File

@@ -27,7 +27,7 @@ impl CodeGen for SchemaMap {
fmt.block(
&format!(
"public static class {}",
AsPascalCase(Self::sanitize_name(module_name))
AsPascalCase(Self::slugify(module_name))
),
false,
|fmt| {
@@ -46,11 +46,13 @@ impl CodeGen for SchemaMap {
fmt.block(
&format!(
"public enum {} : {}",
Self::sanitize_name(&enum_.name),
Self::slugify(&enum_.name),
type_name
),
false,
|fmt| {
// TODO: Handle the case where multiple members share
// the same value.
let members = enum_
.members
.iter()
@@ -69,21 +71,16 @@ impl CodeGen for SchemaMap {
let parent_name = class
.parent
.as_ref()
.map(|parent| Self::sanitize_name(&parent.name))
.map(|parent| Self::slugify(&parent.name))
.unwrap_or_else(|| "None".to_string());
writeln!(fmt, "// Parent: {}", parent_name)?;
writeln!(fmt, "// Fields count: {}", class.fields.len())?;
if let Some(metadata) = &class.metadata {
write_metadata(fmt, metadata)?;
}
write_metadata(fmt, &class.metadata)?;
fmt.block(
&format!(
"public static class {}",
Self::sanitize_name(&class.name)
),
&format!("public static class {}", Self::slugify(&class.name)),
false,
|fmt| {
for field in &class.fields {
@@ -129,10 +126,7 @@ impl CodeGen for SchemaMap {
writeln!(fmt, "// Enums count: {}", enums.len())?;
fmt.block(
&format!(
"namespace {}",
AsSnakeCase(Self::sanitize_name(module_name))
),
&format!("namespace {}", AsSnakeCase(Self::slugify(module_name))),
false,
|fmt| {
for enum_ in enums {
@@ -150,11 +144,13 @@ impl CodeGen for SchemaMap {
fmt.block(
&format!(
"enum class {} : {}",
Self::sanitize_name(&enum_.name),
Self::slugify(&enum_.name),
type_name
),
true,
|fmt| {
// TODO: Handle the case where multiple members share
// the same value.
let members = enum_
.members
.iter()
@@ -173,18 +169,16 @@ impl CodeGen for SchemaMap {
let parent_name = class
.parent
.as_ref()
.map(|parent| Self::sanitize_name(&parent.name))
.map(|parent| Self::slugify(&parent.name))
.unwrap_or_else(|| "None".to_string());
writeln!(fmt, "// Parent: {}", parent_name)?;
writeln!(fmt, "// Fields count: {}", class.fields.len())?;
if let Some(metadata) = &class.metadata {
write_metadata(fmt, metadata)?;
}
write_metadata(fmt, &class.metadata)?;
fmt.block(
&format!("namespace {}", Self::sanitize_name(&class.name)),
&format!("namespace {}", Self::slugify(&class.name)),
false,
|fmt| {
for field in &class.fields {
@@ -228,8 +222,6 @@ impl CodeGen for SchemaMap {
let metadata: Vec<_> = class
.metadata
.as_ref()
.unwrap_or(&vec![])
.iter()
.map(|metadata| match metadata {
ClassMetadata::NetworkChangeCallback { name } => json!({
@@ -249,7 +241,7 @@ impl CodeGen for SchemaMap {
.collect();
(
Self::sanitize_name(&class.name),
Self::slugify(&class.name),
json!({
"parent": class.parent.as_ref().map(|parent| &parent.name),
"fields": fields,
@@ -277,7 +269,7 @@ impl CodeGen for SchemaMap {
};
(
Self::sanitize_name(&enum_.name),
Self::slugify(&enum_.name),
json!({
"alignment": enum_.alignment,
"type": type_name,
@@ -320,7 +312,7 @@ impl CodeGen for SchemaMap {
writeln!(fmt, "// Enums count: {}", enums.len())?;
fmt.block(
&format!("pub mod {}", AsSnakeCase(Self::sanitize_name(module_name))),
&format!("pub mod {}", AsSnakeCase(Self::slugify(module_name))),
false,
|fmt| {
for enum_ in enums {
@@ -339,7 +331,7 @@ impl CodeGen for SchemaMap {
&format!(
"#[repr({})]\npub enum {}",
type_name,
Self::sanitize_name(&enum_.name),
Self::slugify(&enum_.name),
),
false,
|fmt| {
@@ -363,18 +355,16 @@ impl CodeGen for SchemaMap {
let parent_name = class
.parent
.as_ref()
.map(|parent| Self::sanitize_name(&parent.name))
.map(|parent| Self::slugify(&parent.name))
.unwrap_or_else(|| "None".to_string());
writeln!(fmt, "// Parent: {}", parent_name)?;
writeln!(fmt, "// Fields count: {}", class.fields.len())?;
if let Some(metadata) = &class.metadata {
write_metadata(fmt, metadata)?;
}
write_metadata(fmt, &class.metadata)?;
fmt.block(
&format!("pub mod {}", Self::sanitize_name(&class.name)),
&format!("pub mod {}", Self::slugify(&class.name)),
false,
|fmt| {
for field in &class.fields {