mirror of
https://github.com/a2x/cs2-dumper.git
synced 2025-10-08 02:00:02 +08:00
Some improvements
This commit is contained in:
@@ -2,9 +2,10 @@ use std::io::{Result, Write};
|
||||
|
||||
use super::FileBuilder;
|
||||
|
||||
pub struct CppBuilder;
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct CppFileBuilder;
|
||||
|
||||
impl FileBuilder for CppBuilder {
|
||||
impl FileBuilder for CppFileBuilder {
|
||||
fn extension(&mut self) -> &str {
|
||||
"hpp"
|
||||
}
|
||||
|
@@ -2,9 +2,10 @@ use std::io::{Result, Write};
|
||||
|
||||
use super::FileBuilder;
|
||||
|
||||
pub struct CSharpBuilder;
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct CSharpFileBuilder;
|
||||
|
||||
impl FileBuilder for CSharpBuilder {
|
||||
impl FileBuilder for CSharpFileBuilder {
|
||||
fn extension(&mut self) -> &str {
|
||||
"cs"
|
||||
}
|
||||
|
@@ -1,15 +1,24 @@
|
||||
use std::io::{Result, Write};
|
||||
|
||||
use serde_json::{json, Value};
|
||||
use serde_json::{json, Map, Value};
|
||||
|
||||
use super::FileBuilder;
|
||||
|
||||
#[derive(Default)]
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct JsonFileBuilder {
|
||||
json: Value,
|
||||
namespace: String,
|
||||
}
|
||||
|
||||
impl Default for JsonFileBuilder {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
json: Value::Object(Map::new()),
|
||||
namespace: String::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl FileBuilder for JsonFileBuilder {
|
||||
fn extension(&mut self) -> &str {
|
||||
"json"
|
||||
@@ -32,13 +41,11 @@ impl FileBuilder for JsonFileBuilder {
|
||||
value: usize,
|
||||
_comment: Option<&str>,
|
||||
) -> Result<()> {
|
||||
if let Some(json_as_map) = self.json.as_object_mut() {
|
||||
let namespace_entry = json_as_map
|
||||
.entry(self.namespace.clone())
|
||||
.or_insert_with(|| json!({}));
|
||||
if let Some(map) = self.json.as_object_mut() {
|
||||
let entry = map.entry(&self.namespace).or_insert_with(|| json!({}));
|
||||
|
||||
if let Some(namespace_object) = namespace_entry.as_object_mut() {
|
||||
namespace_object.insert(name.to_string(), json!(value));
|
||||
if let Some(object) = entry.as_object_mut() {
|
||||
object.insert(name.to_string(), json!(value));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,12 +54,7 @@ impl FileBuilder for JsonFileBuilder {
|
||||
|
||||
fn write_closure(&mut self, output: &mut dyn Write, eof: bool) -> Result<()> {
|
||||
if eof {
|
||||
write!(
|
||||
output,
|
||||
"{}",
|
||||
serde_json::to_string_pretty(&self.json).unwrap()
|
||||
)
|
||||
.unwrap();
|
||||
write!(output, "{}", serde_json::to_string_pretty(&self.json)?)?;
|
||||
|
||||
self.json = json!({});
|
||||
}
|
||||
|
@@ -1,7 +1,7 @@
|
||||
pub use std::io::{Result, Write};
|
||||
|
||||
pub use cpp_file_builder::CppBuilder;
|
||||
pub use csharp_file_builder::CSharpBuilder;
|
||||
pub use cpp_file_builder::CppFileBuilder;
|
||||
pub use csharp_file_builder::CSharpFileBuilder;
|
||||
pub use file_builder::FileBuilder;
|
||||
pub use json_file_builder::JsonFileBuilder;
|
||||
pub use rust_file_builder::RustFileBuilder;
|
||||
@@ -12,39 +12,25 @@ pub mod file_builder;
|
||||
pub mod json_file_builder;
|
||||
pub mod rust_file_builder;
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum FileBuilderEnum {
|
||||
CppBuilder(CppBuilder),
|
||||
CSharpBuilder(CSharpBuilder),
|
||||
CppFileBuilder(CppFileBuilder),
|
||||
CSharpFileBuilder(CSharpFileBuilder),
|
||||
JsonFileBuilder(JsonFileBuilder),
|
||||
RustFileBuilder(RustFileBuilder),
|
||||
}
|
||||
|
||||
impl FileBuilder for FileBuilderEnum {
|
||||
fn extension(&mut self) -> &str {
|
||||
match self {
|
||||
FileBuilderEnum::CppBuilder(builder) => builder.extension(),
|
||||
FileBuilderEnum::CSharpBuilder(builder) => builder.extension(),
|
||||
FileBuilderEnum::JsonFileBuilder(builder) => builder.extension(),
|
||||
FileBuilderEnum::RustFileBuilder(builder) => builder.extension(),
|
||||
}
|
||||
self.as_mut().extension()
|
||||
}
|
||||
|
||||
fn write_top_level(&mut self, output: &mut dyn Write) -> Result<()> {
|
||||
match self {
|
||||
FileBuilderEnum::CppBuilder(builder) => builder.write_top_level(output),
|
||||
FileBuilderEnum::CSharpBuilder(builder) => builder.write_top_level(output),
|
||||
FileBuilderEnum::JsonFileBuilder(builder) => builder.write_top_level(output),
|
||||
FileBuilderEnum::RustFileBuilder(builder) => builder.write_top_level(output),
|
||||
}
|
||||
self.as_mut().write_top_level(output)
|
||||
}
|
||||
|
||||
fn write_namespace(&mut self, output: &mut dyn Write, name: &str) -> Result<()> {
|
||||
match self {
|
||||
FileBuilderEnum::CppBuilder(builder) => builder.write_namespace(output, name),
|
||||
FileBuilderEnum::CSharpBuilder(builder) => builder.write_namespace(output, name),
|
||||
FileBuilderEnum::JsonFileBuilder(builder) => builder.write_namespace(output, name),
|
||||
FileBuilderEnum::RustFileBuilder(builder) => builder.write_namespace(output, name),
|
||||
}
|
||||
self.as_mut().write_namespace(output, name)
|
||||
}
|
||||
|
||||
fn write_variable(
|
||||
@@ -54,28 +40,21 @@ impl FileBuilder for FileBuilderEnum {
|
||||
value: usize,
|
||||
comment: Option<&str>,
|
||||
) -> Result<()> {
|
||||
match self {
|
||||
FileBuilderEnum::CppBuilder(builder) => {
|
||||
builder.write_variable(output, name, value, comment)
|
||||
}
|
||||
FileBuilderEnum::CSharpBuilder(builder) => {
|
||||
builder.write_variable(output, name, value, comment)
|
||||
}
|
||||
FileBuilderEnum::JsonFileBuilder(builder) => {
|
||||
builder.write_variable(output, name, value, comment)
|
||||
}
|
||||
FileBuilderEnum::RustFileBuilder(builder) => {
|
||||
builder.write_variable(output, name, value, comment)
|
||||
}
|
||||
}
|
||||
self.as_mut().write_variable(output, name, value, comment)
|
||||
}
|
||||
|
||||
fn write_closure(&mut self, output: &mut dyn Write, eof: bool) -> Result<()> {
|
||||
self.as_mut().write_closure(output, eof)
|
||||
}
|
||||
}
|
||||
|
||||
impl FileBuilderEnum {
|
||||
fn as_mut(&mut self) -> &mut dyn FileBuilder {
|
||||
match self {
|
||||
FileBuilderEnum::CppBuilder(builder) => builder.write_closure(output, eof),
|
||||
FileBuilderEnum::CSharpBuilder(builder) => builder.write_closure(output, eof),
|
||||
FileBuilderEnum::JsonFileBuilder(builder) => builder.write_closure(output, eof),
|
||||
FileBuilderEnum::RustFileBuilder(builder) => builder.write_closure(output, eof),
|
||||
FileBuilderEnum::CppFileBuilder(builder) => builder,
|
||||
FileBuilderEnum::CSharpFileBuilder(builder) => builder,
|
||||
FileBuilderEnum::JsonFileBuilder(builder) => builder,
|
||||
FileBuilderEnum::RustFileBuilder(builder) => builder,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -2,6 +2,7 @@ use std::io::{Result, Write};
|
||||
|
||||
use super::FileBuilder;
|
||||
|
||||
#[derive(Debug, Default, PartialEq)]
|
||||
pub struct RustFileBuilder;
|
||||
|
||||
impl FileBuilder for RustFileBuilder {
|
||||
|
Reference in New Issue
Block a user